API: Make it possible to fetch userrights tokens for interwiki users; make Userrights...

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index d3d4b60..9ae63c4 100644 (file)
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -170,9 +170,26 @@ if (!defined('MEDIAWIKI')) {
                }
                // Second pass: add result data to $retval
                foreach($goodNames as $u) {
-                       if(!isset($data[$u]))
-                               $data[$u] = array('name' => $u, 'missing' => '');
-                       else {
+                       if(!isset($data[$u])) {
+                               $data[$u] = array('name' => $u);
+                               $iwUser = UserrightsPage::fetchUser($u);
+                               if($iwUser instanceof UserRightsProxy) {
+                                       $data[$u]['interwiki'] = '';
+                                       if(!is_null($params['token']))
+                                       {
+                                               $tokenFunctions = $this->getTokenFunctions();
+                                               foreach($params['token'] as $t)
+                                               {
+                                                       $val = call_user_func($tokenFunctions[$t], $iwUser);
+                                                       if($val === false)
+                                                               $this->setWarning("Action '$t' is not allowed for the current user");
+                                                       else
+                                                               $data[$u][$t . 'token'] = $val;
+                                               }
+                                       }
+                               } else 
+                                       $data[$u]['missing'] = '';
+                       } else {
                                if(isset($this->prop['groups']) && isset($data[$u]['groups']))
                                        $this->getResult()->setIndexedTagName($data[$u]['groups'], 'g');
                        }

diff --git a/includes/api/ApiUserrights.php b/includes/api/ApiUserrights.php
index 47eb60f..b2a2825 100644 (file)
--- a/includes/api/ApiUserrights.php
+++ b/includes/api/ApiUserrights.php
@@ -45,8 +45,7 @@ class ApiUserrights extends ApiBase {
                if(is_null($params['token']))
                        $this->dieUsageMsg(array('missingparam', 'token'));
                
-               $form = new UserrightsPage;
-               $user = $form->fetchUser($params['user']);
+               $user = UserrightsPage::fetchUser($params['user']);
                if($user instanceof WikiErrorMsg)
                        $this->dieUsageMsg(array_merge(
                                (array)$user->getMessageKey(),

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 10c5dd3..ac12191 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -272,7 +272,7 @@ class UserrightsPage extends SpecialPage {
         * Side effects: error output for invalid access
         * @return mixed User, UserRightsProxy, or WikiErrorMsg
         */
-       function fetchUser( $username ) {
+       public static function fetchUser( $username ) {
                global $wgUser, $wgUserrightsInterwikiDelimiter;
 
                $parts = explode( $wgUserrightsInterwikiDelimiter, $username );