* Fixed unclosed <p> tag

[lhc/web/wiklou.git] / includes / SpecialMovepage.php

diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index 28678e2..70c8a4f 100644 (file)
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -13,7 +13,7 @@ require_once( "LinksUpdate.php" );
 /**
  * Constructor
  */
-function wfSpecialMovepage() {
+function wfSpecialMovepage( $par = null ) {
        global $wgUser, $wgOut, $wgRequest, $action, $wgOnlySysopMayMove;
 
        # check rights. We don't want newbies to move pages to prevents possible attack
@@ -27,7 +27,7 @@ function wfSpecialMovepage() {
                return;
        }
 
-       $f = new MovePageForm();
+       $f = new MovePageForm( $par );
 
        if ( 'success' == $action ) {
                $f->showSuccess();
@@ -48,9 +48,10 @@ class MovePageForm {
        var $oldTitle, $newTitle, $reason; # Text input
        var $moveTalk, $deleteAndMove;
                
-       function MovePageForm() {
+       function MovePageForm( $par ) {
                global $wgRequest;
-               $this->oldTitle = $wgRequest->getText( 'wpOldTitle', $wgRequest->getVal( 'target' ) );
+               $target = isset($par) ? $par : $wgRequest->getVal( 'target' );
+               $this->oldTitle = $wgRequest->getText( 'wpOldTitle', $target );
                $this->newTitle = $wgRequest->getText( 'wpNewTitle' );
                $this->reason = $wgRequest->getText( 'wpReason' );
                $this->moveTalk = $wgRequest->getBool( 'wpMovetalk', true );
@@ -62,19 +63,18 @@ class MovePageForm {
 
                $wgOut->setPagetitle( wfMsg( 'movepage' ) );
 
-               if ( $this->oldTitle == '' ) {
+               $ot = Title::newFromURL( $this->oldTitle );
+               if( is_null( $ot ) ) {
                        $wgOut->errorpage( 'notargettitle', 'notargettext' );
                        return;
                }
-
-               $ot = Title::newFromURL( $this->oldTitle );
                $oldTitle = $ot->getPrefixedText();
                
-               $encOldTitle = htmlspecialchars( $this->oldTitle );
+               $encOldTitle = htmlspecialchars( $oldTitle );
                if( $this->newTitle == '' ) {
                        # Show the current title as a default
                        # when the form is first opened.
-                       $encNewTitle = $oldTitle;
+                       $encNewTitle = $encOldTitle;
                } else {
                        if( $err == '' ) {
                                $nt = Title::newFromURL( $this->newTitle );
@@ -94,12 +94,12 @@ class MovePageForm {
 
                if ( $err == 'articleexists' && $wgUser->isAllowed( 'delete' ) ) {
                        $wgOut->addWikiText( wfMsg( 'delete_and_move_text', $encNewTitle ) );
-                       $movepagebtn = wfMsg( 'delete_and_move' );
+                       $movepagebtn = wfMsgHtml( 'delete_and_move' );
                        $submitVar = 'wpDeleteAndMove';
                        $err = '';
                } else {
                        $wgOut->addWikiText( wfMsg( 'movepagetext' ) );
-                       $movepagebtn = wfMsg( 'movepagebtn' );
+                       $movepagebtn = wfMsgHtml( 'movepagebtn' );
                        $submitVar = 'wpMove';
                }
 
@@ -107,10 +107,10 @@ class MovePageForm {
                        $wgOut->addWikiText( wfMsg( 'movepagetalktext' ) );
                }
 
-               $movearticle = wfMsg( 'movearticle' );
-               $newtitle = wfMsg( 'newtitle' );
-               $movetalk = wfMsg( 'movetalk' );
-               $movereason = wfMsg( 'movereason' );
+               $movearticle = wfMsgHtml( 'movearticle' );
+               $newtitle = wfMsgHtml( 'newtitle' );
+               $movetalk = wfMsgHtml( 'movetalk' );
+               $movereason = wfMsgHtml( 'movereason' );
 
                $titleObj = Title::makeTitle( NS_SPECIAL, 'Movepage' );
                $action = $titleObj->escapeLocalURL( 'action=submit' );
@@ -118,7 +118,7 @@ class MovePageForm {
 
                if ( $err != '' ) {
                        $wgOut->setSubtitle( wfMsg( 'formerror' ) );
-                       $wgOut->addHTML( '<p class="error">' . wfMsg($err) . "</p>\n" );
+                       $wgOut->addWikiText( '<p class="error">' . wfMsg($err) . "</p>\n" );
                }
 
                $moveTalkChecked = $this->moveTalk ? ' checked="checked"' : '';
@@ -140,7 +140,7 @@ class MovePageForm {
                <tr>
                        <td align='right'>{$movereason}:</td>
                        <td align='left'>
-                               <input type='text' size=40 name=\"wpReason\" value=\"{$encReason}\" />
+                               <input type='text' size='40' name=\"wpReason\" value=\"{$encReason}\" />
                        </td>
                </tr>" );
 
@@ -172,6 +172,11 @@ class MovePageForm {
                global  $wgUseSquid, $wgRequest;
                $fname = "MovePageForm::doSubmit";
                
+               if ( $wgUser->pingLimiter( 'move' ) ) {
+                       $wgOut->rateLimited();
+                       return;
+               }
+               
                # Variables beginning with 'o' for old article 'n' for new article
 
                $ot = Title::newFromText( $this->oldTitle );
@@ -195,43 +200,17 @@ class MovePageForm {
                        $this->showForm( $error );
                        return;
                }
-
-               # Update counters if the article got moved into or out of NS_MAIN namespace
-               $ons = $ot->getNamespace();
-               $nns = $nt->getNamespace();
-               
-               # moved out of article namespace?
-               if ( $ons == NS_MAIN and $nns != NS_MAIN ) {
-                       $u = new SiteStatsUpdate( 0, 1, -1); # not viewed, edited, removing
-               }
-               # moved into article namespace?
-               elseif ( $ons != NS_MAIN and $nns == NS_MAIN ) {
-                       $u = new SiteStatsUpdate( 0, 1, +1 ); # not viewed, edited, adding
-               } else {
-                       $u = false;
-               }
-               if ( $u !== false ) {
-                       # save it for later update
-                       array_push( $wgDeferredUpdateList, $u );
-                       unset($u);
-               }
                
                # Move talk page if
                # (1) the checkbox says to,
                # (2) the namespaces are not themselves talk namespaces, and of course
                # (3) it exists.
                if ( ( $wgRequest->getVal('wpMovetalk') == 1 ) &&
-                    ( ! Namespace::isTalk( $ons ) ) &&
-                    ( ! Namespace::isTalk( $nns ) ) ) {
-                       
-                       # get old talk page namespace
-                       $ons = Namespace::getTalk( $ons );
-                       # get new talk page namespace
-                       $nns = Namespace::getTalk( $nns );
+                    !$ot->isTalkPage() &&
+                    !$nt->isTalkPage() ) {
                        
-                       # make talk page title objects
-                       $ott = Title::makeTitle( $ons, $ot->getDBkey() );
-                       $ntt = Title::makeTitle( $nns, $nt->getDBkey() );
+                       $ott = $ot->getTalkPage();
+                       $ntt = $nt->getTalkPage();
 
                        # Attempt the move
                        $error = $ott->moveTo( $ntt, true, $this->reason );
@@ -273,13 +252,13 @@ class MovePageForm {
                $wgRawHtml = $marchingantofdoom;
 
                if ( $talkmoved == 1 ) {
-                       $wgOut->addHTML( "\n<p>" . wfMsg( 'talkpagemoved' ) . "</p>\n" );
+                       $wgOut->addWikiText( wfMsg( 'talkpagemoved' ) );
                } elseif( 'articleexists' == $talkmoved ) {
-                       $wgOut->addHTML( "\n<p><strong>" . wfMsg( 'talkexists' ) . "</strong></p>\n" );
+                       $wgOut->addWikiText( wfMsg( 'talkexists' ) );
                } else {
                        $ot = Title::newFromURL( $oldtitle );
                        if ( ! $ot->isTalkPage() ) {
-                               $wgOut->addHTML( "\n<p>" . wfMsg( 'talkpagenotmoved', wfMsg( $talkmoved ) ) . "</p>\n" );
+                               $wgOut->addWikiText( wfMsg( 'talkpagenotmoved', wfMsg( $talkmoved ) ) );
                        }
                }
        }