Special:Userrights didn't recognize user as self if person didn't capitalize

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

diff --git a/includes/api/ApiUserrights.php b/includes/api/ApiUserrights.php
index a8ccb32..9686217 100644 (file)
--- a/includes/api/ApiUserrights.php
+++ b/includes/api/ApiUserrights.php
@@ -1,10 +1,10 @@
 <?php
 
-/*
+/**
  * Created on Mar 24, 2009
  * API for MediaWiki 1.8+
  *
- * Copyright (C) 2009 Roan Kattouw <Firstname>.<Lastname>@home.nl
+ * Copyright © 2009 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
@@ -24,7 +24,7 @@
 
 if ( !defined( 'MEDIAWIKI' ) ) {
        // Eclipse helper - will be ignored in production
-       require_once ( "ApiBase.php" );
+       require_once( "ApiBase.php" );
 }
 
 /**
@@ -33,26 +33,17 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 class ApiUserrights extends ApiBase {
 
        public function __construct( $main, $action ) {
-               parent :: __construct( $main, $action );
+               parent::__construct( $main, $action );
        }
 
+       private $mUser = null;
+
        public function execute() {
-               global $wgUser;
                $params = $this->extractRequestParams();
-               if ( is_null( $params['user'] ) )
-                       $this->dieUsageMsg( array( 'missingparam', 'user' ) );
-               if ( is_null( $params['token'] ) )
-                       $this->dieUsageMsg( array( 'missingparam', 'token' ) );
+
+               $user = $this->getUser();
 
                $form = new UserrightsPage;
-               $user = $form->fetchUser( $params['user'] );
-               if ( $user instanceof WikiErrorMsg )
-                       $this->dieUsageMsg( array_merge(
-                               (array)$user->getMessageKey(), $user->getMessageArgs() ) );
-
-               if ( !$wgUser->matchEditToken( $params['token'], $user->getName() ) )
-                       $this->dieUsageMsg( array( 'sessionfailure' ) );
-               
                $r['user'] = $user->getName();
                list( $r['added'], $r['removed'] ) =
                        $form->doSaveUserGroups(
@@ -63,6 +54,29 @@ class ApiUserrights extends ApiBase {
                $this->getResult()->setIndexedTagName( $r['removed'], 'group' );
                $this->getResult()->addValue( null, $this->getModuleName(), $r );
        }
+       
+       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;
+       }
 
        public function mustBePosted() {
                return true;
@@ -76,22 +90,22 @@ class ApiUserrights extends ApiBase {
                return array (
                        'user' => null,
                        'add' => array(
-                               ApiBase :: PARAM_TYPE => User::getAllGroups(),
-                               ApiBase :: PARAM_ISMULTI => true
+                               ApiBase::PARAM_TYPE => User::getAllGroups(),
+                               ApiBase::PARAM_ISMULTI => true
                        ),
                        'remove' => array(
-                               ApiBase :: PARAM_TYPE => User::getAllGroups(),
-                               ApiBase :: PARAM_ISMULTI => true
+                               ApiBase::PARAM_TYPE => User::getAllGroups(),
+                               ApiBase::PARAM_ISMULTI => true
                        ),
                        'token' => null,
                        'reason' => array(
-                               ApiBase :: PARAM_DFLT => ''
+                               ApiBase::PARAM_DFLT => ''
                        )
                );
        }
 
        public function getParamDescription() {
-               return array (
+               return array(
                        'user' => 'User name',
                        'add' => 'Add the user to these groups',
                        'remove' => 'Remove the user from these groups',
@@ -106,8 +120,18 @@ class ApiUserrights extends ApiBase {
                );
        }
 
+       public function getPossibleErrors() {
+               return array_merge( parent::getPossibleErrors(), array(
+                       array( 'missingparam', 'user' ),
+               ) );
+       }
+
+       public function getTokenSalt() {
+               return $this->getUser()->getName();
+       }
+
        protected function getExamples() {
-               return array (
+               return array(
                        'api.php?action=userrights&user=FooBot&add=bot&remove=sysop|bureaucrat&token=123ABC'
                );
        }