If 'tables' is a string that starts with a space, treat it as user-enforced FROM...

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

diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index 0593be5..6a3e03e 100644 (file)
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -1,22 +1,28 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
 /**
  * Constructor
  */
 function wfSpecialMovepage( $par = null ) {
-       global $wgUser, $wgOut, $wgRequest, $action, $wgOnlySysopMayMove;
+       global $wgUser, $wgOut, $wgRequest, $action;
 
-       # check rights. We don't want newbies to move pages to prevents possible attack
-       if ( !$wgUser->isAllowed( 'move' ) or $wgUser->isBlocked() or ($wgOnlySysopMayMove and $wgUser->isNewbie())) {
-               $wgOut->showErrorPage( "movenologin", "movenologintext" );
+       # Check rights
+       if ( !$wgUser->isAllowed( 'move' ) ) {
+               $wgOut->showErrorPage( 'movenologin', 'movenologintext' );
                return;
        }
-       # We don't move protected pages
+
+       # Don't allow blocked users to move pages
+       if ( $wgUser->isBlocked() ) {
+               $wgOut->blockedPage();
+               return;
+       }
+
+       # Check for database lock
        if ( wfReadOnly() ) {
                $wgOut->readOnlyPage();
                return;
@@ -36,12 +42,13 @@ function wfSpecialMovepage( $par = null ) {
 
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 class MovePageForm {
        var $oldTitle, $newTitle, $reason; # Text input
        var $moveTalk, $deleteAndMove;
+       
+       private $watch = false;
 
        function MovePageForm( $par ) {
                global $wgRequest;
@@ -49,8 +56,13 @@ class MovePageForm {
                $this->oldTitle = $wgRequest->getText( 'wpOldTitle', $target );
                $this->newTitle = $wgRequest->getText( 'wpNewTitle' );
                $this->reason = $wgRequest->getText( 'wpReason' );
-               $this->moveTalk = $wgRequest->getBool( 'wpMovetalk', true );
+               if ( $wgRequest->wasPosted() ) {
+                       $this->moveTalk = $wgRequest->getBool( 'wpMovetalk', false );
+               } else {
+                       $this->moveTalk = $wgRequest->getBool( 'wpMovetalk', true );
+               }
                $this->deleteAndMove = $wgRequest->getBool( 'wpDeleteAndMove' ) && $wgRequest->getBool( 'wpConfirm' );
+               $this->watch = $wgRequest->getCheck( 'wpWatch' );
        }
 
        function showForm( $err ) {
@@ -119,7 +131,7 @@ class MovePageForm {
                $movetalk = wfMsgHtml( 'movetalk' );
                $movereason = wfMsgHtml( 'movereason' );
 
-               $titleObj = Title::makeTitle( NS_SPECIAL, 'Movepage' );
+               $titleObj = SpecialPage::getTitleFor( 'Movepage' );
                $action = $titleObj->escapeLocalURL( 'action=submit' );
                $token = htmlspecialchars( $wgUser->editToken() );
 
@@ -160,6 +172,14 @@ class MovePageForm {
                        <td><label for=\"wpMovetalk\">{$movetalk}</label></td>
                </tr>" );
                }
+               
+               $watchChecked = $this->watch || $wgUser->getBoolOption( 'watchmoves' ) || $ot->userIsWatching();
+               $watch  = '<tr>';
+               $watch .= '<td align="right">' . Xml::check( 'wpWatch', $watchChecked, array( 'id' => 'watch' ) ) . '</td>';
+               $watch .= '<td>' . Xml::label( wfMsg( 'move-watch' ), 'watch' ) . '</td>';
+               $watch .= '</tr>';
+               $wgOut->addHtml( $watch );
+               
                $wgOut->addHTML( "
                {$confirm}
                <tr>
@@ -178,7 +198,6 @@ class MovePageForm {
 
        function doSubmit() {
                global $wgOut, $wgUser, $wgRequest;
-               $fname = "MovePageForm::doSubmit";
 
                if ( $wgUser->pingLimiter( 'move' ) ) {
                        $wgOut->rateLimited();
@@ -214,7 +233,7 @@ class MovePageForm {
                # Move the talk page if relevant, if it exists, and if we've been told to
                $ott = $ot->getTalkPage();
                if( $ott->exists() ) {
-                       if( $wgRequest->getVal( 'wpMovetalk' ) == 1 && !$ot->isTalkPage() && !$nt->isTalkPage() ) {
+                       if( $this->moveTalk && !$ot->isTalkPage() && !$nt->isTalkPage() ) {
                                $ntt = $nt->getTalkPage();
        
                                # Attempt the move
@@ -232,9 +251,18 @@ class MovePageForm {
                } else {
                        $talkmoved = 'notalkpage';
                }
+               
+               # Deal with watches
+               if( $this->watch ) {
+                       $wgUser->addWatch( $ot );
+                       $wgUser->addWatch( $nt );
+               } else {
+                       $wgUser->removeWatch( $ot );
+                       $wgUser->removeWatch( $nt );
+               }
 
                # Give back result to user.
-               $titleObj = Title::makeTitle( NS_SPECIAL, 'Movepage' );
+               $titleObj = SpecialPage::getTitleFor( 'Movepage' );
                $success = $titleObj->getFullURL(
                  'action=success&oldtitle=' . wfUrlencode( $ot->getPrefixedText() ) .
                  '&newtitle=' . wfUrlencode( $nt->getPrefixedText() ) .