Followup r71831, it's not mutually exclusive!

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

diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php
index 6c43b46..1841db6 100644 (file)
--- a/includes/api/ApiProtect.php
+++ b/includes/api/ApiProtect.php
@@ -1,9 +1,9 @@
 <?php
-
 /**
- * Created on Sep 1, 2007
  * API for MediaWiki 1.8+
  *
+ * Created on Sep 1, 2007
+ *
  * Copyright © 2007 Roan Kattouw <Firstname>.<Lastname>@home.nl
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,8 +18,10 @@
  *
  * 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' ) ) {
@@ -37,16 +39,10 @@ class ApiProtect extends ApiBase {
        }
 
        public function execute() {
-               global $wgUser, $wgRestrictionTypes, $wgRestrictionLevels;
+               global $wgUser, $wgRestrictionLevels;
                $params = $this->extractRequestParams();
 
                $titleObj = null;
-               if ( !isset( $params['title'] ) ) {
-                       $this->dieUsageMsg( array( 'missingparam', 'title' ) );
-               }
-               if ( empty( $params['protections'] ) ) {
-                       $this->dieUsageMsg( array( 'missingparam', 'protections' ) );
-               }
 
                $titleObj = Title::newFromText( $params['title'] );
                if ( !$titleObj ) {
@@ -95,7 +91,7 @@ class ApiProtect extends ApiBase {
                                $expiryarray[$p[0]] = Block::infinity();
                        } else {
                                $exp = strtotime( $expiry[$i] );
-                               if ( $exp < 0 || $exp == false ) {
+                               if ( $exp < 0 || !$exp ) {
                                        $this->dieUsageMsg( array( 'invalidexpiry', $expiry[$i] ) );
                                }
 
@@ -149,10 +145,14 @@ class ApiProtect extends ApiBase {
 
        public function getAllowedParams() {
                return array(
-                       'title' => null,
+                       'title' => array(
+                               ApiBase::PARAM_TYPE => 'string',
+                               ApiBase::PARAM_REQUIRED => true
+                       ),
                        'token' => null,
                        'protections' => array(
-                               ApiBase::PARAM_ISMULTI => true
+                               ApiBase::PARAM_ISMULTI => true,
+                               ApiBase::PARAM_REQUIRED => true,
                        ),
                        'expiry' => array(
                                ApiBase::PARAM_ISMULTI => true,
@@ -193,15 +193,11 @@ class ApiProtect extends ApiBase {
        }
 
        public function getDescription() {
-               return array(
-                       'Change the protection level of a page'
-               );
+               return 'Change the protection level of a page';
        }
 
        public function getPossibleErrors() {
                return array_merge( parent::getPossibleErrors(), array(
-                       array( 'missingparam', 'title' ),
-                       array( 'missingparam', 'protections' ),
                        array( 'invalidtitle', 'title' ),
                        array( 'toofewexpiries', 'noofexpiries', 'noofprotections' ),
                        array( 'create-titleexists' ),