Merge "(bug 19195) Make user IDs more readily available with the API"
[lhc/web/wiklou.git] / includes / api / ApiQueryUsers.php
index 12e5391..a07ee7f 100644 (file)
@@ -1,11 +1,10 @@
 <?php
-
 /**
- * Created on July 30, 2007
  *
- * API for MediaWiki 1.8+
  *
- * Copyright © 2007 Roan Kattouw <Firstname>.<Lastname>@home.nl
+ * Created on July 30, 2007
+ *
+ * Copyright © 2007 Roan Kattouw <Firstname>.<Lastname>@gmail.com
  *
  * 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
  *
  * 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' ) ) {
-       // Eclipse helper - will be ignored in production
-       require_once( 'ApiQueryBase.php' );
-}
-
 /**
  * Query module to get information about a list of users
  *
  * @ingroup API
  */
- class ApiQueryUsers extends ApiQueryBase {
+class ApiQueryUsers extends ApiQueryBase {
+
+       private $tokenFunctions, $prop;
 
        public function __construct( $query, $moduleName ) {
                parent::__construct( $query, $moduleName, 'us' );
@@ -43,7 +41,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
         * Get an array mapping token names to their handler functions.
         * The prototype for a token function is func($user)
         * it should return a token or false (permission denied)
-        * @return array(tokenname => function)
+        * @return Array tokenname => function
         */
        protected function getTokenFunctions() {
                // Don't call the hooks twice
@@ -63,17 +61,19 @@ if ( !defined( 'MEDIAWIKI' ) ) {
                return $this->tokenFunctions;
        }
 
+       /**
+        * @param $user User
+        * @return String
+        */
        public static function getUserrightsToken( $user ) {
                global $wgUser;
                // Since the permissions check for userrights is non-trivial,
                // don't bother with it here
-               return $wgUser->editToken( $user->getName() );
+               return $wgUser->getEditToken( $user->getName() );
        }
 
        public function execute() {
                $params = $this->extractRequestParams();
-               $result = $this->getResult();
-               $r = array();
 
                if ( !is_null( $params['prop'] ) ) {
                        $this->prop = array_flip( $params['prop'] );
@@ -103,32 +103,29 @@ if ( !defined( 'MEDIAWIKI' ) ) {
                        }
                }
 
+               $result = $this->getResult();
+
                if ( count( $goodNames ) ) {
-                       $db = $this->getDb();
-                       $this->addTables( 'user', 'u1' );
-                       $this->addFields( 'u1.*' );
-                       $this->addWhereFld( 'u1.user_name', $goodNames );
+                       $this->addTables( 'user' );
+                       $this->addFields( '*' );
+                       $this->addWhereFld( 'user_name', $goodNames );
 
-                       if ( isset( $this->prop['groups'] ) ) {
+                       if ( isset( $this->prop['groups'] ) || isset( $this->prop['rights'] ) ) {
                                $this->addTables( 'user_groups' );
-                               $this->addJoinConds( array( 'user_groups' => array( 'LEFT JOIN', 'ug_user=u1.user_id' ) ) );
+                               $this->addJoinConds( array( 'user_groups' => array( 'LEFT JOIN', 'ug_user=user_id' ) ) );
                                $this->addFields( 'ug_group' );
                        }
-                       if ( isset( $this->prop['blockinfo'] ) ) {
-                               $this->addTables( 'ipblocks' );
-                               $this->addTables( 'user', 'u2' );
-                               $u2 = $this->getAliasedName( 'user', 'u2' );
-                               $this->addJoinConds( array(
-                                       'ipblocks' => array( 'LEFT JOIN', 'ipb_user=u1.user_id' ),
-                                       $u2 => array( 'LEFT JOIN', 'ipb_by=u2.user_id' ) ) );
-                               $this->addFields( array( 'ipb_reason', 'u2.user_name AS blocker_name' ) );
-                       }
+
+                       $this->showHiddenUsersAddBlockInfo( isset( $this->prop['blockinfo'] ) );
 
                        $data = array();
                        $res = $this->select( __METHOD__ );
-                       while ( ( $r = $db->fetchObject( $res ) ) ) {
-                               $user = User::newFromRow( $r );
+
+                       foreach ( $res as $row ) {
+                               $user = User::newFromRow( $row );
                                $name = $user->getName();
+
+                               $data[$name]['userid'] = $user->getId();
                                $data[$name]['name'] = $name;
 
                                if ( isset( $this->prop['editcount'] ) ) {
@@ -139,14 +136,40 @@ if ( !defined( 'MEDIAWIKI' ) ) {
                                        $data[$name]['registration'] = wfTimestampOrNull( TS_ISO_8601, $user->getRegistration() );
                                }
 
-                               if ( isset( $this->prop['groups'] ) && !is_null( $r->ug_group ) ) {
-                                       // This row contains only one group, others will be added from other rows
-                                       $data[$name]['groups'][] = $r->ug_group;
+                               if ( isset( $this->prop['groups'] ) ) {
+                                       if ( !isset( $data[$name]['groups'] ) ) {
+                                               $data[$name]['groups'] = self::getAutoGroups( $user );
+                                       }
+
+                                       if ( !is_null( $row->ug_group ) ) {
+                                               // This row contains only one group, others will be added from other rows
+                                               $data[$name]['groups'][] = $row->ug_group;
+                                       }
+                               }
+
+                               if ( isset( $this->prop['implicitgroups'] ) && !isset( $data[$name]['implicitgroups'] ) ) {
+                                       $data[$name]['implicitgroups'] =  self::getAutoGroups( $user );
                                }
 
-                               if ( isset( $this->prop['blockinfo'] ) && !is_null( $r->blocker_name ) ) {
-                                       $data[$name]['blockedby'] = $r->blocker_name;
-                                       $data[$name]['blockreason'] = $r->ipb_reason;
+                               if ( isset( $this->prop['rights'] ) ) {
+                                       if ( !isset( $data[$name]['rights'] ) ) {
+                                               $data[$name]['rights'] = User::getGroupPermissions( $user->getAutomaticGroups() );
+                                       }
+
+                                       if ( !is_null( $row->ug_group ) ) {
+                                               $data[$name]['rights'] = array_unique( array_merge( $data[$name]['rights'],
+                                                       User::getGroupPermissions( array( $row->ug_group ) ) ) );
+                                       }
+                               }
+                               if ( $row->ipb_deleted ) {
+                                       $data[$name]['hidden'] = '';
+                               }
+                               if ( isset( $this->prop['blockinfo'] ) && !is_null( $row->ipb_by_text ) ) {
+                                       $data[$name]['blockid'] = $row->ipb_id;
+                                       $data[$name]['blockedby'] = $row->ipb_by_text;
+                                       $data[$name]['blockedbyid'] = $row->ipb_by;
+                                       $data[$name]['blockreason'] = $row->ipb_reason;
+                                       $data[$name]['blockexpiry'] = $row->ipb_expiry;
                                }
 
                                if ( isset( $this->prop['emailable'] ) && $user->canReceiveEmail() ) {
@@ -174,6 +197,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
                                }
                        }
                }
+
                // Second pass: add result data to $retval
                foreach ( $goodNames as $u ) {
                        if ( !isset( $data[$u] ) ) {
@@ -201,17 +225,16 @@ if ( !defined( 'MEDIAWIKI' ) ) {
                                }
                        } else {
                                if ( isset( $this->prop['groups'] ) && isset( $data[$u]['groups'] ) ) {
-                                       $autolist = array();
-                                       $autolist[] = "*";
-                                       foreach( Autopromote::getAutopromoteGroups( User::newFromName( $u ) ) as $group ) {
-                                               $autolist[] = $group;
-                                       }
-                                       
-                                       $data[$u]['groups'] = array_merge( $autolist, $data[$u]['groups'] );
-                               
-                                       $this->getResult()->setIndexedTagName( $data[$u]['groups'], 'g' );
+                                       $result->setIndexedTagName( $data[$u]['groups'], 'g' );
+                               }
+                               if ( isset( $this->prop['implicitgroups'] ) && isset( $data[$u]['implicitgroups'] ) ) {
+                                       $result->setIndexedTagName( $data[$u]['implicitgroups'], 'g' );
+                               }
+                               if ( isset( $this->prop['rights'] ) && isset( $data[$u]['rights'] ) ) {
+                                       $result->setIndexedTagName( $data[$u]['rights'], 'r' );
                                }
                        }
+
                        $fit = $result->addValue( array( 'query', $this->getModuleName() ),
                                        null, $data[$u] );
                        if ( !$fit ) {
@@ -221,7 +244,31 @@ if ( !defined( 'MEDIAWIKI' ) ) {
                        }
                        $done[] = $u;
                }
-               return $this->getResult()->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'user' );
+               return $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'user' );
+       }
+
+       /**
+       * Gets all the groups that a user is automatically a member of (implicit groups)
+       * @param $user User
+       * @return array
+       */
+       public static function getAutoGroups( $user ) {
+               $groups = array();
+               $groups[] = '*';
+
+               if ( !$user->isAnon() ) {
+                       $groups[] = 'user';
+               }
+
+               return array_merge( $groups, Autopromote::getAutopromoteGroups( $user ) );
+       }
+
+       public function getCacheMode( $params ) {
+               if ( isset( $params['token'] ) ) {
+                       return 'private';
+               } else {
+                       return 'anon-public-user-private';
+               }
        }
 
        public function getAllowedParams() {
@@ -232,6 +279,8 @@ if ( !defined( 'MEDIAWIKI' ) ) {
                                ApiBase::PARAM_TYPE => array(
                                        'blockinfo',
                                        'groups',
+                                       'implicitgroups',
+                                       'rights',
                                        'editcount',
                                        'registration',
                                        'emailable',
@@ -252,12 +301,14 @@ if ( !defined( 'MEDIAWIKI' ) ) {
                return array(
                        'prop' => array(
                                'What pieces of information to include',
-                               '  blockinfo    - tags if the user is blocked, by whom, and for what reason',
-                               '  groups       - lists all the groups the user belongs to',
-                               '  editcount    - adds the user\'s edit count',
-                               '  registration - adds the user\'s registration timestamp',
-                               '  emailable    - tags if the user can and wants to receive e-mail through [[Special:Emailuser]]',
-                               '  gender       - tags the gender of the user. Returns "male", "female", or "unknown"',
+                               '  blockinfo      - Tags if the user is blocked, by whom, and for what reason',
+                               '  groups         - Lists all the groups the user(s) belongs to',
+                               '  implicitgroups - Lists all the groups a user is automatically a member of',
+                               '  rights         - Lists all the rights the user(s) has',
+                               '  editcount      - Adds the user\'s edit count',
+                               '  registration   - Adds the user\'s registration timestamp',
+                               '  emailable      - Tags if the user can and wants to receive e-mail through [[Special:Emailuser]]',
+                               '  gender         - Tags the gender of the user. Returns "male", "female", or "unknown"',
                        ),
                        'users' => 'A list of users to obtain the same information for',
                        'token' => 'Which tokens to obtain for each user',
@@ -268,10 +319,14 @@ if ( !defined( 'MEDIAWIKI' ) ) {
                return 'Get information about a list of users';
        }
 
-       protected function getExamples() {
+       public function getExamples() {
                return 'api.php?action=query&list=users&ususers=brion|TimStarling&usprop=groups|editcount|gender';
        }
 
+       public function getHelpUrls() {
+               return 'https://www.mediawiki.org/wiki/API:Users';
+       }
+
        public function getVersion() {
                return __CLASS__ . ': $Id$';
        }