Localisation updates for core and extension messages from translatewiki.net (2010...

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

diff --git a/includes/api/ApiUserrights.php b/includes/api/ApiUserrights.php
index dfb5f19..5f253ce 100644 (file)
--- a/includes/api/ApiUserrights.php
+++ b/includes/api/ApiUserrights.php
@@ -1,9 +1,10 @@
 <?php
 
 /**
- * Created on Mar 24, 2009
  * API for MediaWiki 1.8+
  *
+ * Created on Mar 24, 2009
+ *
  * Copyright © 2009 Roan Kattouw <Firstname>.<Lastname>@home.nl
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,8 +19,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' ) ) {
@@ -55,6 +58,26 @@ class ApiUserrights extends ApiBase {
                $this->getResult()->addValue( null, $this->getModuleName(), $r );
        }
 
+       private function getUser() {
+               if ( $this->mUser !== null ) {
+                       return $this->mUser;
+               }
+
+               $params = $this->extractRequestParams();
+
+               $form = new UserrightsPage;
+               $status = $form->fetchUser( $params['user'] );
+               if ( !$status->isOK() ) {
+                       $errors = $status->getErrorsArray();
+                       $this->dieUsageMsg( $errors[0] );
+               } else {
+                       $user = $status->value;
+               }
+
+               $this->mUser = $user;
+               return $user;
+       }
+
        public function mustBePosted() {
                return true;
        }
@@ -65,7 +88,10 @@ class ApiUserrights extends ApiBase {
 
        public function getAllowedParams() {
                return array (
-                       'user' => null,
+                       'user' => array(
+                               ApiBase::PARAM_TYPE => 'string',
+                               ApiBase::PARAM_REQUIRED => true
+                       ),
                        'add' => array(
                                ApiBase::PARAM_TYPE => User::getAllGroups(),
                                ApiBase::PARAM_ISMULTI => true
@@ -92,9 +118,7 @@ class ApiUserrights extends ApiBase {
        }
 
        public function getDescription() {
-               return array(
-                       'Add/remove a user to/from groups',
-               );
+               return 'Add/remove a user to/from groups';
        }
 
        public function getPossibleErrors() {
@@ -107,29 +131,6 @@ class ApiUserrights extends ApiBase {
                return $this->getUser()->getName();
        }
 
-       private function getUser() {
-               if ( $this->mUser !== null ) {
-                       return $this->mUser;
-               }
-
-               $params = $this->extractRequestParams();
-               if ( is_null( $params['user'] ) ) {
-                       $this->dieUsageMsg( array( 'missingparam', 'user' ) );
-               }
-
-               $form = new UserrightsPage;
-               $status = $form->fetchUser( $params['user'] );
-               if ( !$status->isOK() ) {
-                       $errors = $status->getErrorsArray();
-                       $this->dieUsageMsg( $errors[0] );
-               } else {
-                       $user = $status->value;
-               }
-
-               $this->mUser = $user;
-               return $user;
-       }
-
        protected function getExamples() {
                return array(
                        'api.php?action=userrights&user=FooBot&add=bot&remove=sysop|bureaucrat&token=123ABC'