Update auf 1.13.0

1 files changed, 47 insertions, 34 deletions

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index e055b3c5..dd0e98a8 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -30,8 +30,8 @@ if (!defined('MEDIAWIKI')) {
 
 /**
  * Query module to enumerate all registered users.
- * 
- * @addtogroup API
+ *
+ * @ingroup API
  */
 class ApiQueryAllUsers extends ApiQueryBase {
 
@@ -46,26 +46,27 @@ class ApiQueryAllUsers extends ApiQueryBase {
 		$prop = $params['prop'];
 		if (!is_null($prop)) {
 			$prop = array_flip($prop);
+			$fld_blockinfo = isset($prop['blockinfo']);
 			$fld_editcount = isset($prop['editcount']);
 			$fld_groups = isset($prop['groups']);
 			$fld_registration = isset($prop['registration']);
-		} else {
-			$fld_editcount = $fld_groups = $fld_registration = false;
+		} else { 
+			$fld_blockinfo = $fld_editcount = $fld_groups = $fld_registration = false;
 		}
 
 		$limit = $params['limit'];
-		$tables = $db->tableName('user');
-		
+		$this->addTables('user', 'u1');
+
 		if( !is_null( $params['from'] ) )
-			$this->addWhere( 'user_name >= ' . $db->addQuotes( self::keyToTitle( $params['from'] ) ) );
-		
+			$this->addWhere( 'u1.user_name >= ' . $db->addQuotes( $this->keyToTitle( $params['from'] ) ) );
+
 		if( isset( $params['prefix'] ) )
-			$this->addWhere( 'user_name LIKE "' . $db->escapeLike( self::keyToTitle( $params['prefix'] ) ) . '%"' );
+			$this->addWhere( 'u1.user_name LIKE "' . $db->escapeLike( $this->keyToTitle( $params['prefix'] ) ) . '%"' );
 
 		if (!is_null($params['group'])) {
 			// Filter only users that belong to a given group
-			$tblName = $db->tableName('user_groups');
-			$tables = "$tables INNER JOIN $tblName ug1 ON ug1.ug_user=user_id";
+			$this->addTables('user_groups', 'ug1');
+			$this->addWhere('ug1.ug_user=u1.user_id');
 			$this->addWhereFld('ug1.ug_group', $params['group']);
 		}
 
@@ -75,23 +76,30 @@ class ApiQueryAllUsers extends ApiQueryBase {
 			$groupCount = count(User::getAllGroups());
 			$sqlLimit = $limit+$groupCount+1;
 
-			$tblName = $db->tableName('user_groups');
-			$tables = "$tables LEFT JOIN $tblName ug2 ON ug2.ug_user=user_id";
+			$this->addTables('user_groups', 'ug2');
+			$tname = $this->getAliasedName('user_groups', 'ug2');
+			$this->addJoinConds(array($tname => array('LEFT JOIN', 'ug2.ug_user=u1.user_id')));
 			$this->addFields('ug2.ug_group ug_group2');
 		} else {
 			$sqlLimit = $limit+1;
 		}
-		
-		if ($fld_registration)
-			$this->addFields('user_registration');
+		if ($fld_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 blocker_name'));
+		}
 
 		$this->addOption('LIMIT', $sqlLimit);
-		$this->addTables($tables);
 
-		$this->addFields('user_name');
-		$this->addFieldsIf('user_editcount', $fld_editcount);
+		$this->addFields('u1.user_name');
+		$this->addFieldsIf('u1.user_editcount', $fld_editcount);
+		$this->addFieldsIf('u1.user_registration', $fld_registration);
 
-		$this->addOption('ORDER BY', 'user_name');
+		$this->addOption('ORDER BY', 'u1.user_name');
 
 		$res = $this->select(__METHOD__);
 
@@ -100,7 +108,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
 		$lastUserData = false;
 		$lastUser = false;
 		$result = $this->getResult();
-				
+
 		//
 		// This loop keeps track of the last entry.
 		// For each new row, if the new row is for different user then the last, the last entry is added to results.
@@ -109,49 +117,53 @@ class ApiQueryAllUsers extends ApiQueryBase {
 		// to make sure all rows that belong to the same user are received.
 		//
 		while (true) {
-			
+
 			$row = $db->fetchObject($res);
 			$count++;
-			
+
 			if (!$row || $lastUser != $row->user_name) {
 				// Save the last pass's user data
 				if (is_array($lastUserData))
 					$data[] = $lastUserData;
-				
+
 				// No more rows left
 				if (!$row)
 					break;
 
 				if ($count > $limit) {
 					// We've reached the one extra which shows that there are additional pages to be had. Stop here...
-					$this->setContinueEnumParameter('from', ApiQueryBase :: keyToTitle($row->user_name));
+					$this->setContinueEnumParameter('from', $this->keyToTitle($row->user_name));
 					break;
 				}
 
 				// Record new user's data
 				$lastUser = $row->user_name;
 				$lastUserData = array( 'name' => $lastUser );
+				if ($fld_blockinfo) {
+					$lastUserData['blockedby'] = $row->blocker_name;
+					$lastUserData['blockreason'] = $row->ipb_reason;
+				}
 				if ($fld_editcount)
 					$lastUserData['editcount'] = intval($row->user_editcount);
 				if ($fld_registration)
 					$lastUserData['registration'] = wfTimestamp(TS_ISO_8601, $row->user_registration);
-					
+
 			}
-			
+
 			if ($sqlLimit == $count) {
 				// BUG!  database contains group name that User::getAllGroups() does not return
 				// TODO: should handle this more gracefully
-				ApiBase :: dieDebug(__METHOD__, 
+				ApiBase :: dieDebug(__METHOD__,
 					'MediaWiki configuration error: the database contains more user groups than known to User::getAllGroups() function');
 			}
-								
+
 			// Add user's group info
 			if ($fld_groups && !is_null($row->ug_group2)) {
 				$lastUserData['groups'][] = $row->ug_group2;
 				$result->setIndexedTagName($lastUserData['groups'], 'g');
 			}
 		}
-		
+
 		$db->freeResult($res);
 
 		$result->setIndexedTagName($data, 'u');
@@ -166,11 +178,12 @@ class ApiQueryAllUsers extends ApiQueryBase {
 				ApiBase :: PARAM_TYPE => User::getAllGroups()
 			),
 			'prop' => array (
-				ApiBase :: PARAM_ISMULTI => true, 
+				ApiBase :: PARAM_ISMULTI => true,
 				ApiBase :: PARAM_TYPE => array (
-					'editcount',
+					'blockinfo',
 					'groups',
-					'registration',
+					'editcount',
+					'registration'
 				)
 			),
 			'limit' => array (
@@ -206,6 +219,6 @@ class ApiQueryAllUsers extends ApiQueryBase {
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiQueryAllUsers.php 30222 2008-01-28 19:05:26Z catrope $';
+		return __CLASS__ . ': $Id: ApiQueryAllUsers.php 36790 2008-06-29 22:26:23Z catrope $';
 	}
 }