]> scripts.mit.edu Git - autoinstallsdev/mediawiki.git/blobdiff - includes/api/ApiBlock.php
MediaWiki 1.17.4
[autoinstallsdev/mediawiki.git] / includes / api / ApiBlock.php
index 1c0bd5acd08b01591c50dc02980e0f56a9fcf21e..25506ac0a1218a4543b68ad0105b1d18f2bbeaa0 100644 (file)
@@ -1,10 +1,10 @@
 <?php
-
-/*
- * Created on Sep 4, 2007
+/**
  * API for MediaWiki 1.8+
  *
- * Copyright (C) 2007 Roan Kattouw <Firstname>.<Lastname>@home.nl
+ * Created on Sep 4, 2007
+ *
+ * Copyright © 2007 Roan Kattouw <Firstname>.<Lastname>@home.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
  */
 
-if (!defined('MEDIAWIKI')) {
+if ( !defined( 'MEDIAWIKI' ) ) {
        // Eclipse helper - will be ignored in production
-       require_once ("ApiBase.php");
+       require_once( "ApiBase.php" );
 }
 
 /**
@@ -38,8 +40,8 @@ class ApiBlock extends ApiBase {
        /**
         * Std ctor.
         */
-       public function __construct($main, $action) {
-               parent :: __construct($main, $action);
+       public function __construct( $main, $action ) {
+               parent::__construct( $main, $action );
        }
 
        /**
@@ -52,31 +54,34 @@ class ApiBlock extends ApiBase {
                global $wgUser, $wgBlockAllowsUTEdit;
                $params = $this->extractRequestParams();
 
-               if($params['gettoken'])
-               {
+               if ( $params['gettoken'] ) {
                        $res['blocktoken'] = $wgUser->editToken();
-                       $this->getResult()->addValue(null, $this->getModuleName(), $res);
+                       $this->getResult()->addValue( null, $this->getModuleName(), $res );
                        return;
                }
 
-               if(is_null($params['user']))
-                       $this->dieUsageMsg(array('missingparam', 'user'));
-               if(is_null($params['token']))
-                       $this->dieUsageMsg(array('missingparam', 'token'));
-               if(!$wgUser->matchEditToken($params['token']))
-                       $this->dieUsageMsg(array('sessionfailure'));
-               if(!$wgUser->isAllowed('block'))
-                       $this->dieUsageMsg(array('cantblock'));
-               if($params['hidename'] && !$wgUser->isAllowed('hideuser'))
-                       $this->dieUsageMsg(array('canthide'));
-               if($params['noemail'] && !$wgUser->isAllowed('blockemail'))
-                       $this->dieUsageMsg(array('cantblock-email'));
-
-               $form = new IPBlockForm('');
+               if ( !$wgUser->isAllowed( 'block' ) ) {
+                       $this->dieUsageMsg( array( 'cantblock' ) );
+               }
+               # bug 15810: blocked admins should have limited access here
+               if ( $wgUser->isBlocked() ) {
+                       $status = IPBlockForm::checkUnblockSelf( $params['user'] );
+                       if ( $status !== true ) {
+                               $this->dieUsageMsg( array( $status ) );
+                       }
+               }
+               if ( $params['hidename'] && !$wgUser->isAllowed( 'hideuser' ) ) {
+                       $this->dieUsageMsg( array( 'canthide' ) );
+               }
+               if ( $params['noemail'] && !IPBlockForm::canBlockEmail( $wgUser ) ) {
+                       $this->dieUsageMsg( array( 'cantblock-email' ) );
+               }
+
+               $form = new IPBlockForm( '' );
                $form->BlockAddress = $params['user'];
-               $form->BlockReason = (is_null($params['reason']) ? '' : $params['reason']);
+               $form->BlockReason = ( is_null( $params['reason'] ) ? '' : $params['reason'] );
                $form->BlockReasonList = 'other';
-               $form->BlockExpiry = ($params['expiry'] == 'never' ? 'infinite' : $params['expiry']);
+               $form->BlockExpiry = ( $params['expiry'] == 'never' ? 'infinite' : $params['expiry'] );
                $form->BlockOther = '';
                $form->BlockAnonOnly = $params['anononly'];
                $form->BlockCreateAccount = $params['nocreate'];
@@ -87,40 +92,52 @@ class ApiBlock extends ApiBase {
                $form->BlockReblock = $params['reblock'];
 
                $userID = $expiry = null;
-               $retval = $form->doBlock($userID, $expiry);
-               if(count($retval))
+               $retval = $form->doBlock( $userID, $expiry );
+               if ( count( $retval ) ) {
                        // We don't care about multiple errors, just report one of them
-                       $this->dieUsageMsg($retval);
+                       $this->dieUsageMsg( $retval );
+               }
 
                $res['user'] = $params['user'];
-               $res['userID'] = intval($userID);
-               $res['expiry'] = ($expiry == Block::infinity() ? 'infinite' : wfTimestamp(TS_ISO_8601, $expiry));
+               $res['userID'] = intval( $userID );
+               $res['expiry'] = ( $expiry == Block::infinity() ? 'infinite' : wfTimestamp( TS_ISO_8601, $expiry ) );
                $res['reason'] = $params['reason'];
-               if($params['anononly'])
+               if ( $params['anononly'] ) {
                        $res['anononly'] = '';
-               if($params['nocreate'])
+               }
+               if ( $params['nocreate'] ) {
                        $res['nocreate'] = '';
-               if($params['autoblock'])
+               }
+               if ( $params['autoblock'] ) {
                        $res['autoblock'] = '';
-               if($params['noemail'])
+               }
+               if ( $params['noemail'] ) {
                        $res['noemail'] = '';
-               if($params['hidename'])
+               }
+               if ( $params['hidename'] ) {
                        $res['hidename'] = '';
-               if($params['allowusertalk'])
+               }
+               if ( $params['allowusertalk'] ) {
                        $res['allowusertalk'] = '';
+               }
 
-               $this->getResult()->addValue(null, $this->getModuleName(), $res);
+               $this->getResult()->addValue( null, $this->getModuleName(), $res );
        }
 
-       public function mustBePosted() { return true; }
+       public function mustBePosted() {
+               return true;
+       }
 
        public function isWriteMode() {
                return true;
        }
 
        public function getAllowedParams() {
-               return array (
-                       'user' => null,
+               return array(
+                       'user' => array(
+                               ApiBase::PARAM_TYPE => 'string',
+                               ApiBase::PARAM_REQUIRED => true
+                       ),
                        'token' => null,
                        'gettoken' => false,
                        'expiry' => 'never',
@@ -136,7 +153,7 @@ class ApiBlock extends ApiBase {
        }
 
        public function getParamDescription() {
-               return array (
+               return array(
                        'user' => 'Username, IP address or IP range you want to block',
                        'token' => 'A block token previously obtained through the gettoken parameter or prop=info',
                        'gettoken' => 'If set, a block token will be returned, and no other action will be taken',
@@ -153,19 +170,35 @@ class ApiBlock extends ApiBase {
        }
 
        public function getDescription() {
-               return array(
-                       'Block a user.'
-               );
+               return 'Block a user';
+       }
+
+       public function getPossibleErrors() {
+               return array_merge( parent::getPossibleErrors(), array(
+                       array( 'cantblock' ),
+                       array( 'canthide' ),
+                       array( 'cantblock-email' ),
+                       array( 'ipbblocked' ),
+                       array( 'ipbnounblockself' ),
+               ) );
+       }
+
+       public function needsToken() {
+               return true;
+       }
+
+       public function getTokenSalt() {
+               return '';
        }
 
        protected function getExamples() {
-               return array (
+               return array(
                        'api.php?action=block&user=123.5.5.12&expiry=3%20days&reason=First%20strike',
-                       'api.php?action=block&user=Vandal&expiry=never&reason=Vandalism&nocreate&autoblock&noemail'
+                       'api.php?action=block&user=Vandal&expiry=never&reason=Vandalism&nocreate=&autoblock=&noemail='
                );
        }
 
        public function getVersion() {
-               return __CLASS__ . ': $Id: ApiBlock.php 48091 2009-03-06 13:49:44Z catrope $';
+               return __CLASS__ . ': $Id$';
        }
 }