X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiBlock.php;h=14177edb898b8b7c0ec35da564b77f7bb3316af6;hb=fa0fe8d2940b71950f82f2303acd3a3717b51389;hp=58e3d1c58d2eb3217db570dd06d61bede0c2bebd;hpb=38b0060dc4306291e0cd78acdf45a83d5324e5b3;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiBlock.php b/includes/api/ApiBlock.php
index 58e3d1c58d..14177edb89 100644
--- a/includes/api/ApiBlock.php
+++ b/includes/api/ApiBlock.php
@@ -1,9 +1,5 @@
 <?php
 /**
- *
- *
- * Created on Sep 4, 2007
- *
  * Copyright © 2007 Roan Kattouw "<Firstname>.<Lastname>@gmail.com"
  *
  * This program is free software; you can redistribute it and/or modify
@@ -46,7 +42,7 @@ class ApiBlock extends ApiBase {
 
 		$this->requireOnlyOneParameter( $params, 'user', 'userid' );
 
-		# bug 15810: blocked admins should have limited access here
+		# T17810: blocked admins should have limited access here
 		if ( $user->isBlocked() ) {
 			$status = SpecialBlock::checkUnblockSelf( $params['user'], $user );
 			if ( $status !== true ) {
@@ -58,6 +54,18 @@ class ApiBlock extends ApiBase {
 			}
 		}
 
+		$editingRestriction = 'sitewide';
+		$pageRestrictions = '';
+		$namespaceRestrictions = '';
+		if ( $this->getConfig()->get( 'EnablePartialBlocks' ) ) {
+			if ( $params['partial'] ) {
+				$editingRestriction = 'partial';
+			}
+
+			$pageRestrictions = implode( "\n", (array)$params['pagerestrictions'] );
+			$namespaceRestrictions = implode( "\n", (array)$params['namespacerestrictions'] );
+		}
+
 		if ( $params['userid'] !== null ) {
 			$username = User::whoIs( $params['userid'] );
 
@@ -67,12 +75,12 @@ class ApiBlock extends ApiBase {
 				$params['user'] = $username;
 			}
 		} else {
-			$target = User::newFromName( $params['user'] );
+			list( $target, $type ) = SpecialBlock::getTargetAndType( $params['user'] );
 
-			// Bug 38633 - if the target is a user (not an IP address), but it
+			// T40633 - if the target is a user (not an IP address), but it
 			// doesn't exist or is unusable, error.
-			if ( $target instanceof User &&
-				( $target->isAnon() /* doesn't exist */ || !User::isUsableName( $target->getName() ) )
+			if ( $type === Block::TYPE_USER &&
+				( $target->isAnon() /* doesn't exist */ || !User::isUsableName( $params['user'] ) )
 			) {
 				$this->dieWithError( [ 'nosuchusershort', $params['user'] ], 'nosuchuser' );
 			}
@@ -111,6 +119,9 @@ class ApiBlock extends ApiBase {
 			'Watch' => $params['watchuser'],
 			'Confirm' => true,
 			'Tags' => $params['tags'],
+			'EditingRestriction' => $editingRestriction,
+			'PageRestrictions' => $pageRestrictions,
+			'NamespaceRestrictions' => $namespaceRestrictions,
 		];
 
 		$retval = SpecialBlock::processForm( $data, $this->getContext() );
@@ -128,8 +139,8 @@ class ApiBlock extends ApiBase {
 			$res['id'] = $block->getId();
 		} else {
 			# should be unreachable
-			$res['expiry'] = '';
-			$res['id'] = '';
+			$res['expiry'] = ''; // @codeCoverageIgnore
+			$res['id'] = ''; // @codeCoverageIgnore
 		}
 
 		$res['reason'] = $params['reason'];
@@ -141,6 +152,12 @@ class ApiBlock extends ApiBase {
 		$res['allowusertalk'] = $params['allowusertalk'];
 		$res['watchuser'] = $params['watchuser'];
 
+		if ( $this->getConfig()->get( 'EnablePartialBlocks' ) ) {
+			$res['partial'] = $params['partial'];
+			$res['pagerestrictions'] = $params['pagerestrictions'];
+			$res['namespacerestrictions'] = $params['namespacerestrictions'];
+		}
+
 		$this->getResult()->addValue( null, $this->getModuleName(), $res );
 	}
 
@@ -153,7 +170,7 @@ class ApiBlock extends ApiBase {
 	}
 
 	public function getAllowedParams() {
-		return [
+		$params = [
 			'user' => [
 				ApiBase::PARAM_TYPE => 'user',
 			],
@@ -175,6 +192,21 @@ class ApiBlock extends ApiBase {
 				ApiBase::PARAM_ISMULTI => true,
 			],
 		];
+
+		if ( $this->getConfig()->get( 'EnablePartialBlocks' ) ) {
+			$params['partial'] = false;
+			$params['pagerestrictions'] = [
+				ApiBase::PARAM_ISMULTI => true,
+				ApiBase::PARAM_ISMULTI_LIMIT1 => 10,
+				ApiBase::PARAM_ISMULTI_LIMIT2 => 10,
+			];
+			$params['namespacerestrictions'] = [
+				ApiBase::PARAM_ISMULTI => true,
+				ApiBase::PARAM_TYPE => 'namespace',
+			];
+		}
+
+		return $params;
 	}
 
 	public function needsToken() {
@@ -182,17 +214,17 @@ class ApiBlock extends ApiBase {
 	}
 
 	protected function getExamplesMessages() {
-		// @codingStandardsIgnoreStart Generic.Files.LineLength
+		// phpcs:disable Generic.Files.LineLength
 		return [
 			'action=block&user=192.0.2.5&expiry=3%20days&reason=First%20strike&token=123ABC'
 				=> 'apihelp-block-example-ip-simple',
 			'action=block&user=Vandal&expiry=never&reason=Vandalism&nocreate=&autoblock=&noemail=&token=123ABC'
 				=> 'apihelp-block-example-user-complex',
 		];
-		// @codingStandardsIgnoreEnd
+		// phpcs:enable
 	}
 
 	public function getHelpUrls() {
-		return 'https://www.mediawiki.org/wiki/API:Block';
+		return 'https://www.mediawiki.org/wiki/Special:MyLanguage/API:Block';
 	}
 }