From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 8 Dec 2013 09:55:49 +0100 Subject: Update to MediaWiki 1.22.0 --- includes/specials/SpecialActiveusers.php | 74 +++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 26 deletions(-) (limited to 'includes/specials/SpecialActiveusers.php') diff --git a/includes/specials/SpecialActiveusers.php b/includes/specials/SpecialActiveusers.php index c9c82ada..705dab55 100644 --- a/includes/specials/SpecialActiveusers.php +++ b/includes/specials/SpecialActiveusers.php @@ -62,7 +62,7 @@ class ActiveUsersPager extends UsersPager { $this->requestedUser = ''; if ( $un != '' ) { $username = Title::makeTitleSafe( NS_USER, $un ); - if( !is_null( $username ) ) { + if ( !is_null( $username ) ) { $this->requestedUser = $username->getText(); } } @@ -91,42 +91,62 @@ class ActiveUsersPager extends UsersPager { } function getQueryInfo() { - $dbr = wfGetDB( DB_SLAVE ); + $dbr = $this->getDatabase(); + $conds = array( 'rc_user > 0' ); // Users - no anons - if( !$this->getUser()->isAllowed( 'hideuser' ) ) { - $conds[] = 'ipb_deleted IS NULL OR ipb_deleted = 0'; // don't show hidden names - } $conds[] = 'rc_log_type IS NULL OR rc_log_type != ' . $dbr->addQuotes( 'newusers' ); $conds[] = 'rc_timestamp >= ' . $dbr->addQuotes( - $dbr->timestamp( wfTimestamp( TS_UNIX ) - $this->RCMaxAge*24*3600 ) ); + $dbr->timestamp( wfTimestamp( TS_UNIX ) - $this->RCMaxAge * 24 * 3600 ) ); - if( $this->requestedUser != '' ) { + if ( $this->requestedUser != '' ) { $conds[] = 'rc_user_text >= ' . $dbr->addQuotes( $this->requestedUser ); } + if ( !$this->getUser()->isAllowed( 'hideuser' ) ) { + $conds[] = 'NOT EXISTS (' . $dbr->selectSQLText( + 'ipblocks', '1', array( 'rc_user=ipb_user', 'ipb_deleted' => 1 ) + ) . ')'; + } + return array( - 'tables' => array( 'recentchanges', 'ipblocks' ), + 'tables' => array( 'recentchanges' ), 'fields' => array( 'user_name' => 'rc_user_text', // for Pager inheritance 'rc_user_text', // for Pager - 'user_id' => 'rc_user', - 'recentedits' => 'COUNT(*)', - 'ipb_deleted' => 'MAX(ipb_deleted)' + 'user_id' => 'MAX(rc_user)', // Postgres + 'recentedits' => 'COUNT(*)' ), 'options' => array( - 'GROUP BY' => array( 'rc_user_text', 'user_id' ), + 'GROUP BY' => array( 'rc_user_text' ), 'USE INDEX' => array( 'recentchanges' => 'rc_user_text' ) ), - 'join_conds' => array( // check for suppression blocks - 'ipblocks' => array( 'LEFT JOIN', array( - 'rc_user=ipb_user', - 'ipb_auto' => 0 # avoid duplicate blocks - )), - ), 'conds' => $conds ); } + function doBatchLookups() { + $uids = array(); + foreach ( $this->mResult as $row ) { + $uids[] = $row->user_id; + } + // Fetch the block status of the user for showing "(blocked)" text and for + // striking out names of suppressed users when privileged user views the list. + // Although the first query already hits the block table for un-privileged, this + // is done in two queries to avoid huge quicksorts and to make COUNT(*) correct. + $dbr = $this->getDatabase(); + $res = $dbr->select( 'ipblocks', + array( 'ipb_user', 'MAX(ipb_deleted) AS block_status' ), + array( 'ipb_user' => $uids ), + __METHOD__, + array( 'GROUP BY' => array( 'ipb_user' ) ) + ); + $this->blockStatusByUid = array(); + foreach ( $res as $row ) { + $this->blockStatusByUid[$row->ipb_user] = $row->block_status; // 0 or 1 + } + $this->mResult->seek( 0 ); + } + function formatRow( $row ) { $userName = $row->user_name; @@ -139,7 +159,7 @@ class ActiveUsersPager extends UsersPager { $user = User::newFromId( $row->user_id ); // User right filter - foreach( $this->hideRights as $right ) { + foreach ( $this->hideRights as $right ) { // Calling User::getRights() within the loop so that // if the hideRights() filter is empty, we don't have to // trigger the lazy-init of the big userrights array in the @@ -153,7 +173,7 @@ class ActiveUsersPager extends UsersPager { // Note: This is a different loop than for user rights, // because we're reusing it to build the group links // at the same time - foreach( $user->getGroups() as $group ) { + foreach ( $user->getGroups() as $group ) { if ( in_array( $group, $this->hideGroups ) ) { return ''; } @@ -163,12 +183,14 @@ class ActiveUsersPager extends UsersPager { $groups = $lang->commaList( $list ); $item = $lang->specialList( $ulinks, $groups ); - if( $row->ipb_deleted ) { + + $isBlocked = isset( $this->blockStatusByUid[$row->user_id] ); + if ( $isBlocked && $this->blockStatusByUid[$row->user_id] == 1 ) { $item = "$item"; } $count = $this->msg( 'activeusers-count' )->numParams( $row->recentedits ) ->params( $userName )->numParams( $this->RCMaxAge )->escaped(); - $blocked = !is_null( $row->ipb_deleted ) ? ' ' . $this->msg( 'listusers-blocked', $userName )->escaped() : ''; + $blocked = $isBlocked ? ' ' . $this->msg( 'listusers-blocked', $userName )->escaped() : ''; return Html::rawElement( 'li', array(), "{$item} [{$count}]{$blocked}" ); } @@ -184,15 +206,15 @@ class ActiveUsersPager extends UsersPager { $out .= Html::hidden( 'title', $self->getPrefixedDBkey() ) . $limit . "\n"; $out .= Xml::inputLabel( $this->msg( 'activeusers-from' )->text(), - 'username', 'offset', 20, $this->requestedUser ) . '
';# Username field + 'username', 'offset', 20, $this->requestedUser, array( 'tabindex' => 1 ) ) . '
';# Username field $out .= Xml::checkLabel( $this->msg( 'activeusers-hidebots' )->text(), - 'hidebots', 'hidebots', $this->opts->getValue( 'hidebots' ) ); + 'hidebots', 'hidebots', $this->opts->getValue( 'hidebots' ), array( 'tabindex' => 2 ) ); $out .= Xml::checkLabel( $this->msg( 'activeusers-hidesysops' )->text(), - 'hidesysops', 'hidesysops', $this->opts->getValue( 'hidesysops' ) ) . '
'; + 'hidesysops', 'hidesysops', $this->opts->getValue( 'hidesysops' ), array( 'tabindex' => 3 ) ) . '
'; - $out .= Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . "\n";# Submit button and form bottom + $out .= Xml::submitButton( $this->msg( 'allpagessubmit' )->text(), array( 'tabindex' => 4 ) ) . "\n";# Submit button and form bottom $out .= Xml::closeElement( 'fieldset' ); $out .= Xml::closeElement( 'form' ); -- cgit v1.2.2