Special:Userrights didn't recognize user as self if person didn't capitalize

[lhc/web/wiklou.git] / includes / api / ApiUndelete.php

diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php
index 8a8513d..0637725 100644 (file)
--- a/includes/api/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -24,7 +24,7 @@
 
 if ( !defined( 'MEDIAWIKI' ) ) {
        // Eclipse helper - will be ignored in production
-       require_once ( "ApiBase.php" );
+       require_once( "ApiBase.php" );
 }
 
 /**
@@ -33,7 +33,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 class ApiUndelete extends ApiBase {
 
        public function __construct( $main, $action ) {
-               parent :: __construct( $main, $action );
+               parent::__construct( $main, $action );
        }
 
        public function execute() {
@@ -41,40 +41,48 @@ class ApiUndelete extends ApiBase {
                $params = $this->extractRequestParams();
 
                $titleObj = null;
-               if ( !isset( $params['title'] ) )
+               if ( !isset( $params['title'] ) ) {
                        $this->dieUsageMsg( array( 'missingparam', 'title' ) );
-               if ( !isset( $params['token'] ) )
-                       $this->dieUsageMsg( array( 'missingparam', 'token' ) );
+               }
 
-               if ( !$wgUser->isAllowed( 'undelete' ) )
+               if ( !$wgUser->isAllowed( 'undelete' ) ) {
                        $this->dieUsageMsg( array( 'permdenied-undelete' ) );
-               if ( $wgUser->isBlocked() )
+               }
+
+               if ( $wgUser->isBlocked() ) {
                        $this->dieUsageMsg( array( 'blockedtext' ) );
-               if ( !$wgUser->matchEditToken( $params['token'] ) )
-                       $this->dieUsageMsg( array( 'sessionfailure' ) );
+               }
 
                $titleObj = Title::newFromText( $params['title'] );
-               if ( !$titleObj )
+               if ( !$titleObj ) {
                        $this->dieUsageMsg( array( 'invalidtitle', $params['title'] ) );
+               }
 
                // Convert timestamps
-               if ( !isset( $params['timestamps'] ) )
+               if ( !isset( $params['timestamps'] ) ) {
                        $params['timestamps'] = array();
-               if ( !is_array( $params['timestamps'] ) )
+               }
+               if ( !is_array( $params['timestamps'] ) ) {
                        $params['timestamps'] = array( $params['timestamps'] );
-               foreach ( $params['timestamps'] as $i => $ts )
+               }
+               foreach ( $params['timestamps'] as $i => $ts ) {
                        $params['timestamps'][$i] = wfTimestamp( TS_MW, $ts );
+               }
 
                $pa = new PageArchive( $titleObj );
                $dbw = wfGetDB( DB_MASTER );
                $dbw->begin();
                $retval = $pa->undelete( ( isset( $params['timestamps'] ) ? $params['timestamps'] : array() ), $params['reason'] );
-               if ( !is_array( $retval ) )
+               if ( !is_array( $retval ) ) {
                        $this->dieUsageMsg( array( 'cannotundelete' ) );
+               }
 
-               if ( $retval[1] )
+               if ( $retval[1] ) {
                        wfRunHooks( 'FileUndeleteComplete',
                                array( $titleObj, array(), $wgUser, $params['reason'] ) );
+               }
+
+               $this->setWatch( $params['watchlist'], $titleObj );
 
                $info['title'] = $titleObj->getPrefixedText();
                $info['revisions'] = intval( $retval[0] );
@@ -83,29 +91,41 @@ class ApiUndelete extends ApiBase {
                $this->getResult()->addValue( null, $this->getModuleName(), $info );
        }
 
-       public function mustBePosted() { return true; }
+       public function mustBePosted() {
+               return true;
+       }
 
        public function isWriteMode() {
                return true;
        }
 
        public function getAllowedParams() {
-               return array (
+               return array(
                        'title' => null,
                        'token' => null,
-                       'reason' => "",
+                       'reason' => '',
                        'timestamps' => array(
-                               ApiBase :: PARAM_ISMULTI => true
-                       )
+                               ApiBase::PARAM_ISMULTI => true
+                       ),
+                       'watchlist' => array(
+                               ApiBase::PARAM_DFLT => 'preferences',
+                               ApiBase::PARAM_TYPE => array(
+                                       'watch',
+                                       'unwatch',
+                                       'preferences',
+                                       'nochange'
+                               ),
+                       ),
                );
        }
 
        public function getParamDescription() {
-               return array (
-                       'title' => 'Title of the page you want to restore.',
+               return array(
+                       'title' => 'Title of the page you want to restore',
                        'token' => 'An undelete token previously retrieved through list=deletedrevs',
                        'reason' => 'Reason for restoring (optional)',
-                       'timestamps' => 'Timestamps of the revisions to restore. If not set, all revisions will be restored.'
+                       'timestamps' => 'Timestamps of the revisions to restore. If not set, all revisions will be restored.',
+                       'watchlist' => 'Unconditionally add or remove the page from your watchlist, use preferences or do not change watch',
                );
        }
 
@@ -116,8 +136,22 @@ class ApiUndelete extends ApiBase {
                );
        }
 
+       public function getPossibleErrors() {
+               return array_merge( parent::getPossibleErrors(), array(
+                       array( 'missingparam', 'title' ),
+                       array( 'permdenied-undelete' ),
+                       array( 'blockedtext' ),
+                       array( 'invalidtitle', 'title' ),
+                       array( 'cannotundelete' ),
+               ) );
+       }
+
+       public function getTokenSalt() {
+               return '';
+       }
+
        protected function getExamples() {
-               return array (
+               return array(
                        'api.php?action=undelete&title=Main%20Page&token=123ABC&reason=Restoring%20main%20page',
                        'api.php?action=undelete&title=Main%20Page&token=123ABC&timestamps=20070703220045|20070702194856'
                );