Follow-up r90742: the parser should call getFunctionLang()

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

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index e685e77..336c494 100644 (file)
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -85,15 +85,35 @@ class ApiQueryAllUsers extends ApiQueryBase {
                        }
                }
 
-               if ( !is_null( $params['group'] ) ) {
+               if ( !is_null( $params['group'] ) && !is_null( $params['excludegroup'] ) ) {
+                       $this->dieUsage( 'group and excludegroup cannot be used together', 'group-excludegroup' );
+               }
+
+               if ( !is_null( $params['group'] ) && count( $params['group'] ) ) {
                        $useIndex = false;
                        // Filter only users that belong to a given group
                        $this->addTables( 'user_groups', 'ug1' );
-                       $ug1 = $this->getAliasedName( 'user_groups', 'ug1' );
-                       $this->addJoinConds( array( $ug1 => array( 'INNER JOIN', array( 'ug1.ug_user=user_id',
+                       $this->addJoinConds( array( 'ug1' => array( 'INNER JOIN', array( 'ug1.ug_user=user_id',
                                        'ug1.ug_group' => $params['group'] ) ) ) );
                }
 
+               if ( !is_null( $params['excludegroup'] ) && count( $params['excludegroup'] ) ) {
+                       $useIndex = false;
+                       // Filter only users don't belong to a given group
+                       $this->addTables( 'user_groups', 'ug1' );
+
+                       if ( count( $params['excludegroup'] ) == 1 ) {
+                               $exclude = array( 'ug1.ug_group' => $params['excludegroup'][0] );
+                       } else {
+                               $exclude = array( $db->makeList( array( 'ug1.ug_group' => $params['excludegroup'] ), LIST_OR ) );
+                       }
+                       $this->addJoinConds( array( 'ug1' => array( 'LEFT OUTER JOIN',
+                               array_merge( array( 'ug1.ug_user=user_id' ), $exclude )
+                               )
+                       ) );
+                       $this->addWhere( 'ug1.ug_user IS NULL' );
+               }
+
                if ( $params['witheditsonly'] ) {
                        $this->addWhere( 'user_editcount > 0' );
                }
@@ -107,8 +127,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
                        $sqlLimit = $limit + $groupCount + 1;
 
                        $this->addTables( 'user_groups', 'ug2' );
-                       $tname = $this->getAliasedName( 'user_groups', 'ug2' );
-                       $this->addJoinConds( array( $tname => array( 'LEFT JOIN', 'ug2.ug_user=user_id' ) ) );
+                       $this->addJoinConds( array( 'ug2' => array( 'LEFT JOIN', 'ug2.ug_user=user_id' ) ) );
                        $this->addFields( 'ug2.ug_group ug_group2' );
                } else {
                        $sqlLimit = $limit + 1;
@@ -119,7 +138,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
                        $this->addTables( 'recentchanges' );
 
                        $this->addJoinConds( array( 'recentchanges' => array(
-                               'INNER JOIN', 'rc_user=user_id'
+                               'INNER JOIN', 'rc_user_text=user_name'
                        ) ) );
 
                        $this->addFields( 'COUNT(*) AS recentedits' );
@@ -216,22 +235,25 @@ class ApiQueryAllUsers extends ApiQueryBase {
                        }
 
                        // Add user's group info
-                       if ( $fld_groups && !is_null( $row->ug_group2 ) ) {
+                       if ( $fld_groups ) {
                                if ( !isset( $lastUserData['groups'] ) ) {
                                        $lastUserData['groups'] = ApiQueryUsers::getAutoGroups( User::newFromName( $lastUser ) );
                                }
 
-                               $lastUserData['groups'][] = $row->ug_group2;
+                               if ( !is_null( $row->ug_group2 ) ) {
+                                       $lastUserData['groups'][] = $row->ug_group2;
+                               }
                                $result->setIndexedTagName( $lastUserData['groups'], 'g' );
                        }
 
-                       if ( $fld_rights && !is_null( $row->ug_group2 ) ) {
+                       if ( $fld_rights ) {
                                if ( !isset( $lastUserData['rights'] ) ) {
-                                       $lastUserData['rights'] = User::getGroupPermissions( User::getImplicitGroups() );
+                                       $lastUserData['rights'] =  User::getGroupPermissions( User::getImplicitGroups() );
+                               }
+                               if ( !is_null( $row->ug_group2 ) ) {
+                                       $lastUserData['rights'] = array_unique( array_merge( $lastUserData['rights'],
+                                                                               User::getGroupPermissions( array( $row->ug_group2 ) ) ) );
                                }
-
-                               $lastUserData['rights'] = array_unique( array_merge( $lastUserData['rights'],
-                                       User::getGroupPermissions( array( $row->ug_group2 ) ) ) );
                                $result->setIndexedTagName( $lastUserData['rights'], 'r' );
                        }
                }
@@ -253,6 +275,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
        }
 
        public function getAllowedParams() {
+               $userGroups = User::getAllGroups();
                return array(
                        'from' => null,
                        'to' => null,
@@ -265,7 +288,11 @@ class ApiQueryAllUsers extends ApiQueryBase {
                                ),
                        ),
                        'group' => array(
-                               ApiBase::PARAM_TYPE => User::getAllGroups(),
+                               ApiBase::PARAM_TYPE => $userGroups,
+                               ApiBase::PARAM_ISMULTI => true,
+                       ),
+                       'excludegroup' => array(
+                               ApiBase::PARAM_TYPE => $userGroups,
                                ApiBase::PARAM_ISMULTI => true,
                        ),
                        'rights' => array(
@@ -302,6 +329,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
                        'prefix' => 'Search for all users that begin with this value',
                        'dir' => 'Direction to sort in',
                        'group' => 'Limit users to given group name(s)',
+                       'excludegroup' => 'Exclude users in given group name(s)',
                        'rights' => 'Limit users to given right(s)',
                        'prop' => array(
                                'What pieces of information to include.',
@@ -309,7 +337,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
                                ' groups        - Lists groups that the user is in. This uses more server resources and may return fewer results than the limit',
                                ' rights        - Lists rights that the user has',
                                ' editcount     - Adds the edit count of the user',
-                               ' registration  - Adds the timestamp of when the user registered',
+                               ' registration  - Adds the timestamp of when the user registered if available (may be blank)',
                                ),
                        'limit' => 'How many total user names to return',
                        'witheditsonly' => 'Only list users who have made edits',
@@ -321,6 +349,12 @@ class ApiQueryAllUsers extends ApiQueryBase {
                return 'Enumerate all registered users';
        }
 
+       public function getPossibleErrors() {
+               return array_merge( parent::getPossibleErrors(), array(
+                       array( 'code' => 'group-excludegroup', 'info' => 'group and excludegroup cannot be used together' ),
+               ) );
+       }
+
        protected function getExamples() {
                return array(
                        'api.php?action=query&list=allusers&aufrom=Y',