$fld_editcount = isset($prop['editcount']);
$fld_groups = isset($prop['groups']);
$fld_registration = isset($prop['registration']);
+ $fld_blockinfo = isset($prop['blockinfo']);
} else {
- $fld_editcount = $fld_groups = $fld_registration = false;
+ $fld_editcount = $fld_groups = $fld_registration = $fld_blockinfo = false;
}
$limit = $params['limit'];
if( !is_null( $params['from'] ) )
- $this->addWhere( 'user_name >= ' . $db->addQuotes( self::keyToTitle( $params['from'] ) ) );
+ $this->addWhere( 'u1.user_name >= ' . $db->addQuotes( self::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( self::keyToTitle( $params['prefix'] ) ) . '%"' );
+ $join = false;
+ $tables = array('user');
+ $types = array();
+ $conds = array();
+ $aliases = array('u1');
if (!is_null($params['group'])) {
// Filter only users that belong to a given group
$this->addTables('user_groups', 'ug1');
- $this->addWhere('ug1.ug_user=user_id');
+ $this->addWhere('ug1.ug_user=u1.user_id');
$this->addWhereFld('ug1.ug_group', $params['group']);
}
if ($fld_groups) {
// request more than needed to avoid not getting all rows that belong to one user
$groupCount = count(User::getAllGroups());
$sqlLimit = $limit+$groupCount+1;
- $this->addJoin(
- array('user', 'user_groups'),
- array(ApiQueryBase::LEFT_JOIN),
- array('ug2.ug_user=user_id'),
- array(null, 'ug2'));
+
+ $join = true;
+ $tables[] = 'user_groups';
+ $types[] = ApiQueryBase::LEFT_JOIN;
+ $conds[] = 'ug2.ug_user=u1.user_id';
+ $aliases[] = 'ug2';
$this->addFields('ug2.ug_group ug_group2');
} else {
- $this->addTables('user');
$sqlLimit = $limit+1;
}
-
- if ($fld_registration)
- $this->addFields('user_registration');
+ if ($fld_blockinfo) {
+ $join = true;
+ $tables[] = 'ipblocks';
+ $types[] = ApiQueryBase::LEFT_JOIN;
+ $conds[] = 'ipb_user=u1.user_id';
+ $aliases[] = null;
+
+ $tables[] = 'user';
+ $types[] = ApiQueryBase::LEFT_JOIN;
+ $conds[] = 'ipb_by=u2.user_id';
+ $aliases[] = 'u2';
+ $this->addFields(array('ipb_reason', 'u2.user_name AS blocker_name'));
+ }
+
+ if ($join) {
+ $this->addJoin($tables, $types, $conds, $aliases);
+ } else {
+ $this->addTables('user', 'u1');
+ }
$this->addOption('LIMIT', $sqlLimit);
- $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__);
$lastUserData['editcount'] = intval($row->user_editcount);
if ($fld_registration)
$lastUserData['registration'] = wfTimestamp(TS_ISO_8601, $row->user_registration);
+ if ($fld_blockinfo && !is_null($row->blocker_name)) {
+ $lastUserData['blockedby'] = $row->blocker_name;
+ $lastUserData['blockreason'] = $row->ipb_reason;
+ }
}
'editcount',
'groups',
'registration',
+ 'blockinfo'
)
),
'limit' => array (
$this->addFields('u1.user_name');
$this->addWhereFld('u1.user_name', $goodNames);
$this->addFieldsIf('u1.user_editcount', isset($this->prop['editcount']));
+ $this->addFieldsIf('u1.user_registration', isset($this->prop['registration']));
$join = false;
$tables = array('user');
$data[$r->user_name]['name'] = $r->user_name;
if(isset($this->prop['editcount']))
$data[$r->user_name]['editcount'] = $r->user_editcount;
+ if(isset($this->prop['registration']))
+ $data[$r->user_name]['registration'] = wfTimestamp(TS_ISO_8601, $r->user_registration);
if(isset($this->prop['groups']))
// This row contains only one group, others will be added from other rows
if(!is_null($r->ug_group))
ApiBase :: PARAM_TYPE => array (
'blockinfo',
'groups',
- 'editcount'
+ 'editcount',
+ 'registration'
)
),
'users' => array(