HTML 2???

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

diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php
index f94e04d..351ac6b 100644 (file)
--- a/includes/api/ApiBlock.php
+++ b/includes/api/ApiBlock.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * API for MediaWiki 1.8+
+ *
  *
  * Created on Sep 4, 2007
  *
@@ -24,11 +24,6 @@
  * @file
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-       // Eclipse helper - will be ignored in production
-       require_once( "ApiBase.php" );
-}
-
 /**
 * API module that facilitates the blocking of users. Requires API write mode
 * to be enabled.
@@ -37,9 +32,6 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  */
 class ApiBlock extends ApiBase {
 
-       /**
-        * Std ctor.
-        */
        public function __construct( $main, $action ) {
                parent::__construct( $main, $action );
        }
@@ -51,56 +43,71 @@ class ApiBlock extends ApiBase {
         * of success. If it fails, the result will specify the nature of the error.
         */
        public function execute() {
-               global $wgUser, $wgBlockAllowsUTEdit;
+               $user = $this->getUser();
                $params = $this->extractRequestParams();
 
                if ( $params['gettoken'] ) {
-                       $res['blocktoken'] = $wgUser->editToken();
+                       $res['blocktoken'] = $user->getEditToken( '', $this->getMain()->getRequest() );
                        $this->getResult()->addValue( null, $this->getModuleName(), $res );
                        return;
                }
 
-               if ( !$wgUser->isAllowed( 'block' ) ) {
-                       $this->dieUsageMsg( array( 'cantblock' ) );
+               if ( !$user->isAllowed( 'block' ) ) {
+                       $this->dieUsageMsg( 'cantblock' );
                }
                # bug 15810: blocked admins should have limited access here
-               if ( $wgUser->isBlocked() ) {
-                       $status = IPBlockForm::checkUnblockSelf( $params['user'] );
+               if ( $user->isBlocked() ) {
+                       $status = SpecialBlock::checkUnblockSelf( $params['user'], $user );
                        if ( $status !== true ) {
                                $this->dieUsageMsg( array( $status ) );
                        }
                }
-               if ( $params['hidename'] && !$wgUser->isAllowed( 'hideuser' ) ) {
-                       $this->dieUsageMsg( array( 'canthide' ) );
+               if ( $params['hidename'] && !$user->isAllowed( 'hideuser' ) ) {
+                       $this->dieUsageMsg( 'canthide' );
                }
-               if ( $params['noemail'] && !IPBlockForm::canBlockEmail( $wgUser ) ) {
-                       $this->dieUsageMsg( array( 'cantblock-email' ) );
+               if ( $params['noemail'] && !SpecialBlock::canBlockEmail( $user ) ) {
+                       $this->dieUsageMsg( 'cantblock-email' );
                }
 
-               $form = new IPBlockForm( '' );
-               $form->BlockAddress = $params['user'];
-               $form->BlockReason = ( is_null( $params['reason'] ) ? '' : $params['reason'] );
-               $form->BlockReasonList = 'other';
-               $form->BlockExpiry = ( $params['expiry'] == 'never' ? 'infinite' : $params['expiry'] );
-               $form->BlockOther = '';
-               $form->BlockAnonOnly = $params['anononly'];
-               $form->BlockCreateAccount = $params['nocreate'];
-               $form->BlockEnableAutoblock = $params['autoblock'];
-               $form->BlockEmail = $params['noemail'];
-               $form->BlockHideName = $params['hidename'];
-               $form->BlockAllowUsertalk = $params['allowusertalk'] && $wgBlockAllowsUTEdit;
-               $form->BlockReblock = $params['reblock'];
-
-               $userID = $expiry = null;
-               $retval = $form->doBlock( $userID, $expiry );
-               if ( count( $retval ) ) {
+               $data = array(
+                       'Target' => $params['user'],
+                       'Reason' => array(
+                               is_null( $params['reason'] ) ? '' : $params['reason'],
+                               'other',
+                               is_null( $params['reason'] ) ? '' : $params['reason']
+                       ),
+                       'Expiry' => $params['expiry'] == 'never' ? 'infinite' : $params['expiry'],
+                       'HardBlock' => !$params['anononly'],
+                       'CreateAccount' => $params['nocreate'],
+                       'AutoBlock' => $params['autoblock'],
+                       'DisableEmail' => $params['noemail'],
+                       'HideUser' => $params['hidename'],
+                       'DisableUTEdit' => !$params['allowusertalk'],
+                       'AlreadyBlocked' => $params['reblock'],
+                       'Watch' => $params['watchuser'],
+                       'Confirm' => true,
+               );
+
+               $retval = SpecialBlock::processForm( $data, $this->getContext() );
+               if ( $retval !== true ) {
                        // We don't care about multiple errors, just report one of them
                        $this->dieUsageMsg( $retval );
                }
 
+               list( $target, /*...*/ ) = SpecialBlock::getTargetAndType( $params['user'] );
                $res['user'] = $params['user'];
-               $res['userID'] = intval( $userID );
-               $res['expiry'] = ( $expiry == Block::infinity() ? 'infinite' : wfTimestamp( TS_ISO_8601, $expiry ) );
+               $res['userID'] = $target instanceof User ? $target->getId() : 0;
+
+               $block = Block::newFromTarget( $target );
+               if( $block instanceof Block ){
+                       $res['expiry'] = $block->mExpiry == wfGetDB( DB_SLAVE )->getInfinity()
+                               ? 'infinite'
+                               : wfTimestamp( TS_ISO_8601, $block->mExpiry );
+               } else {
+                       # should be unreachable
+                       $res['expiry'] = '';
+               }
+
                $res['reason'] = $params['reason'];
                if ( $params['anononly'] ) {
                        $res['anononly'] = '';
@@ -120,6 +127,9 @@ class ApiBlock extends ApiBase {
                if ( $params['allowusertalk'] ) {
                        $res['allowusertalk'] = '';
                }
+               if ( $params['watchuser'] ) {
+                       $res['watchuser'] = '';
+               }
 
                $this->getResult()->addValue( null, $this->getModuleName(), $res );
        }
@@ -149,6 +159,7 @@ class ApiBlock extends ApiBase {
                        'hidename' => false,
                        'allowusertalk' => false,
                        'reblock' => false,
+                       'watchuser' => false,
                );
        }
 
@@ -166,6 +177,7 @@ class ApiBlock extends ApiBase {
                        'hidename' => 'Hide the username from the block log. (Requires the "hideuser" right.)',
                        'allowusertalk' => 'Allow the user to edit their own talk page (depends on $wgBlockAllowsUTEdit)',
                        'reblock' => 'If the user is already blocked, overwrite the existing block',
+                       'watchuser' => 'Watch the user/IP\'s user and talk pages',
                );
        }
 
@@ -191,13 +203,17 @@ class ApiBlock extends ApiBase {
                return '';
        }
 
-       protected function getExamples() {
+       public function getExamples() {
                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='
                );
        }
 
+       public function getHelpUrls() {
+               return 'https://www.mediawiki.org/wiki/API:Block';
+       }
+
        public function getVersion() {
                return __CLASS__ . ': $Id$';
        }