X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FLogEventsList.php;h=a18d84923e11c40c2eaa0cac9b2516d63bd7e141;hb=41ac01dfc839b4f1c32a354fe37ed064b8a31585;hp=49d4dc58f6e37e113b8a56b079999d992978f652;hpb=991c975fd0cca2a56d3f8d4340f14f26dc9ef94c;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php index 49d4dc58f6..a18d84923e 100644 --- a/includes/LogEventsList.php +++ b/includes/LogEventsList.php @@ -1,30 +1,53 @@ , 2008 Aaron Schulz -# http://www.mediawiki.org/ -# -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# 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., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# http://www.gnu.org/copyleft/gpl.html +/** + * Contain classes to list log entries + * + * Copyright © 2004 Brion Vibber , 2008 Aaron Schulz + * http://www.mediawiki.org/ + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * + * @file + */ class LogEventsList { const NO_ACTION_LINK = 1; const NO_EXTRA_USER_LINKS = 2; + /** + * @var Skin + */ private $skin; + + /** + * @var OutputPage + */ private $out; public $flags; + /** + * @var Array + */ + protected $message; + + /** + * @var Array + */ + protected $mDefaultQuery; + public function __construct( $skin, $out, $flags = 0 ) { $this->skin = $skin; $this->out = $out; @@ -41,7 +64,7 @@ class LogEventsList { if( !isset( $this->message ) ) { $messages = array( 'revertmerge', 'protect_change', 'unblocklink', 'change-blocklink', 'revertmove', 'undeletelink', 'undeleteviewlink', 'revdel-restore', 'hist', 'diff', - 'pipe-separator' ); + 'pipe-separator', 'revdel-restore-deleted', 'revdel-restore-visible' ); foreach( $messages as $msg ) { $this->message[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) ); } @@ -65,6 +88,7 @@ class LogEventsList { /** * Show options for the log list + * * @param $types string or Array * @param $user String * @param $page String @@ -74,9 +98,8 @@ class LogEventsList { * @param $filter: array * @param $tagFilter: array? */ - public function showOptions( $types=array(), $user='', $page='', $pattern='', $year='', - $month = '', $filter = null, $tagFilter='' ) - { + public function showOptions( $types=array(), $user='', $page='', $pattern='', $year='', + $month = '', $filter = null, $tagFilter='' ) { global $wgScript, $wgMiserMode; $action = $wgScript; @@ -88,8 +111,7 @@ class LogEventsList { $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter ); - $html = ''; - $html .= Xml::hidden( 'title', $special ); + $html = Html::hidden( 'title', $special ); // Basic selectors $html .= $this->getTypeMenu( $types ) . "\n"; @@ -107,7 +129,7 @@ class LogEventsList { // Tag filter if ($tagSelector) { - $html .= Xml::tags( 'p', null, implode( ' ', $tagSelector ) ); + $html .= Xml::tags( 'p', null, implode( ' ', $tagSelector ) ); } // Filter links @@ -132,7 +154,7 @@ class LogEventsList { * @return String: Formatted HTML */ private function getFilterLinks( $filter ) { - global $wgTitle, $wgLang; + global $wgLang; // show/hide links $messages = array( wfMsgHtml( 'show' ), wfMsgHtml( 'hide' ) ); // Option value -> message mapping @@ -147,8 +169,8 @@ class LogEventsList { $hideVal = 1 - intval($val); $query[$queryKey] = $hideVal; - $link = $this->skin->link( - $wgTitle, + $link = Linker::link( + $this->getDisplayTitle(), $messages[$hideVal], array(), $query, @@ -156,15 +178,17 @@ class LogEventsList { ); $links[$type] = wfMsgHtml( "log-show-hide-{$type}", $link ); - $hiddens .= Xml::hidden( "hide_{$type}_log", $val ) . "\n"; + $hiddens .= Html::hidden( "hide_{$type}_log", $val ) . "\n"; } // Build links return ''.$wgLang->pipeList( $links ) . '' . $hiddens; } private function getDefaultQuery() { + global $wgRequest; + if ( !isset( $this->mDefaultQuery ) ) { - $this->mDefaultQuery = $_GET; + $this->mDefaultQuery = $wgRequest->getQueryValues(); unset( $this->mDefaultQuery['title'] ); unset( $this->mDefaultQuery['dir'] ); unset( $this->mDefaultQuery['offset'] ); @@ -176,6 +200,16 @@ class LogEventsList { return $this->mDefaultQuery; } + /** + * Get the Title object of the page the links should point to. + * This is NOT the Title of the page the entries should be restricted to. + * + * @return Title object + */ + public function getDisplayTitle() { + return $this->out->getTitle(); + } + /** * @param $queryTypes Array * @return String: Formatted HTML @@ -199,6 +233,14 @@ class LogEventsList { // Note the query type $queryType = count($queryTypes) == 1 ? $queryTypes[0] : ''; + + // Always put "All public logs" on top + if ( isset( $typesByName[''] ) ) { + $all = $typesByName['']; + unset( $typesByName[''] ); + $typesByName = array( '' => $all ) + $typesByName; + } + // Third pass generates sorted XHTML content foreach( $typesByName as $type => $text ) { $selected = ($type == $queryType); @@ -298,7 +340,7 @@ class LogEventsList { return Xml::tags( 'li', array( "class" => implode( ' ', $classes ) ), $del . "$time $userLink $action $comment $revert $tagDisplay" ) . "\n"; } - + private function logTimestamp( $row ) { global $wgLang; $time = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->log_timestamp ), true ); @@ -306,15 +348,14 @@ class LogEventsList { } private function logUserLinks( $row ) { - $userLinks = ''; if( self::isDeleted( $row, LogPage::DELETED_USER ) ) { $userLinks = '' . wfMsgHtml( 'rev-deleted-user' ) . ''; } else { - $userLinks = $this->skin->userLink( $row->log_user, $row->user_name ); + $userLinks = Linker::userLink( $row->log_user, $row->user_name ); // Talk|Contribs links... if( !( $this->flags & self::NO_EXTRA_USER_LINKS ) ) { - $userLinks .= $this->skin->userToolLinks( + $userLinks .= Linker::userToolLinks( $row->log_user, $row->user_name, true, 0, $row->user_editcount ); } } @@ -322,7 +363,6 @@ class LogEventsList { } private function logAction( $row, $title, $paramArray ) { - $action = ''; if( self::isDeleted( $row, LogPage::DELETED_ACTION ) ) { $action = '' . wfMsgHtml( 'rev-deleted-event' ) . ''; @@ -332,23 +372,30 @@ class LogEventsList { } return $action; } - + private function logComment( $row ) { - global $wgContLang; - $comment = ''; if( self::isDeleted( $row, LogPage::DELETED_COMMENT ) ) { $comment = '' . wfMsgHtml( 'rev-deleted-comment' ) . ''; } else { - $comment = $wgContLang->getDirMark() . - $this->skin->commentBlock( $row->log_comment ); + global $wgLang; + $comment = $wgLang->getDirMark() . + Linker::commentBlock( $row->log_comment ); } return $comment; } - // @TODO: split up! + /** + * @TODO: split up! + * + * @param $row + * @param Title $title + * @param Array $paramArray + * @param $comment + * @return String + */ private function logActionLinks( $row, $title, $paramArray, &$comment ) { - global $wgUser, $wgLang; + global $wgUser; if( ( $this->flags & self::NO_ACTION_LINK ) // we don't want to see the action || self::isDeleted( $row, LogPage::DELETED_ACTION ) ) // action is hidden { @@ -358,7 +405,7 @@ class LogEventsList { if( self::typeAction( $row, 'move', 'move', 'move' ) && !empty( $paramArray[0] ) ) { $destTitle = Title::newFromText( $paramArray[0] ); if( $destTitle ) { - $revert = '(' . $this->skin->link( + $revert = '(' . Linker::link( SpecialPage::getTitleFor( 'Movepage' ), $this->message['revertmove'], array(), @@ -372,13 +419,13 @@ class LogEventsList { ) . ')'; } // Show undelete link - } else if( self::typeAction( $row, array( 'delete', 'suppress' ), 'delete', 'deletedhistory' ) ) { + } elseif( self::typeAction( $row, array( 'delete', 'suppress' ), 'delete', 'deletedhistory' ) ) { if( !$wgUser->isAllowed( 'undelete' ) ) { $viewdeleted = $this->message['undeleteviewlink']; } else { $viewdeleted = $this->message['undeletelink']; } - $revert = '(' . $this->skin->link( + $revert = '(' . Linker::link( SpecialPage::getTitleFor( 'Undelete' ), $viewdeleted, array(), @@ -386,21 +433,18 @@ class LogEventsList { array( 'known', 'noclasses' ) ) . ')'; // Show unblock/change block link - } else if( self::typeAction( $row, array( 'block', 'suppress' ), array( 'block', 'reblock' ), 'block' ) ) { + } elseif( self::typeAction( $row, array( 'block', 'suppress' ), array( 'block', 'reblock' ), 'block' ) ) { $revert = '(' . - $this->skin->link( - SpecialPage::getTitleFor( 'Ipblocklist' ), + Linker::link( + SpecialPage::getTitleFor( 'Unblock', $row->log_title ), $this->message['unblocklink'], array(), - array( - 'action' => 'unblock', - 'ip' => $row->log_title - ), + array(), 'known' ) . $this->message['pipe-separator'] . - $this->skin->link( - SpecialPage::getTitleFor( 'Blockip', $row->log_title ), + Linker::link( + SpecialPage::getTitleFor( 'Block', $row->log_title ), $this->message['change-blocklink'], array(), array(), @@ -408,9 +452,9 @@ class LogEventsList { ) . ')'; // Show change protection link - } else if( self::typeAction( $row, 'protect', array( 'modify', 'protect', 'unprotect' ) ) ) { + } elseif( self::typeAction( $row, 'protect', array( 'modify', 'protect', 'unprotect' ) ) ) { $revert .= ' (' . - $this->skin->link( $title, + Linker::link( $title, $this->message['hist'], array(), array( @@ -420,7 +464,7 @@ class LogEventsList { ); if( $wgUser->isAllowed( 'protect' ) ) { $revert .= $this->message['pipe-separator'] . - $this->skin->link( $title, + Linker::link( $title, $this->message['protect_change'], array(), array( 'action' => 'protect' ), @@ -428,8 +472,8 @@ class LogEventsList { } $revert .= ')'; // Show unmerge link - } else if( self::typeAction( $row, 'merge', 'merge', 'mergehistory' ) ) { - $revert = '(' . $this->skin->link( + } elseif( self::typeAction( $row, 'merge', 'merge', 'mergehistory' ) ) { + $revert = '(' . Linker::link( SpecialPage::getTitleFor( 'MergeHistory' ), $this->message['revertmerge'], array(), @@ -441,69 +485,19 @@ class LogEventsList { array( 'known', 'noclasses' ) ) . ')'; // If an edit was hidden from a page give a review link to the history - } else if( self::typeAction( $row, array( 'delete', 'suppress' ), 'revision', 'deletedhistory' ) ) { - if( count($paramArray) >= 2 ) { - // Different revision types use different URL params... - $key = $paramArray[0]; - // $paramArray[1] is a CSV of the IDs - $Ids = explode( ',', $paramArray[1] ); - $query = $paramArray[1]; - $revert = array(); - // Diff link for single rev deletions - if( count($Ids) == 1 ) { - // Live revision diffs... - if( in_array( $key, array( 'oldid', 'revision' ) ) ) { - $revert[] = $this->skin->link( - $title, - $this->message['diff'], - array(), - array( - 'diff' => intval( $Ids[0] ), - 'unhide' => 1 - ), - array( 'known', 'noclasses' ) - ); - // Deleted revision diffs... - } else if( in_array( $key, array( 'artimestamp','archive' ) ) ) { - $revert[] = $this->skin->link( - SpecialPage::getTitleFor( 'Undelete' ), - $this->message['diff'], - array(), - array( - 'target' => $title->getPrefixedDBKey(), - 'diff' => 'prev', - 'timestamp' => $Ids[0] - ), - array( 'known', 'noclasses' ) - ); - } - } - // View/modify link... - $revert[] = $this->skin->link( - SpecialPage::getTitleFor( 'Revisiondelete' ), - $this->message['revdel-restore'], - array(), - array( - 'target' => $title->getPrefixedText(), - 'type' => $key, - 'ids' => $query - ), - array( 'known', 'noclasses' ) - ); - // Pipe links - $revert = wfMsg( 'parentheses', $wgLang->pipeList( $revert ) ); - } + } elseif( self::typeAction( $row, array( 'delete', 'suppress' ), 'revision', 'deletedhistory' ) ) { + $revert = RevisionDeleter::getLogLinks( $title, $paramArray, + $this->skin, $this->message ); // Hidden log items, give review link - } else if( self::typeAction( $row, array( 'delete', 'suppress' ), 'event', 'deletedhistory' ) ) { + } elseif( self::typeAction( $row, array( 'delete', 'suppress' ), 'event', 'deletedhistory' ) ) { if( count($paramArray) >= 1 ) { $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); // $paramArray[1] is a CSV of the IDs - $Ids = explode( ',', $paramArray[0] ); $query = $paramArray[0]; // Link to each hidden object ID, $paramArray[1] is the url param - $revert = '(' . $this->skin->link( + $revert = '(' . Linker::link( $revdel, - $this->message['revdel-restore'], + $this->message['revdel-restore'], array(), array( 'target' => $title->getPrefixedText(), @@ -514,15 +508,14 @@ class LogEventsList { ) . ')'; } // Self-created users - } else if( self::typeAction( $row, 'newusers', 'create2' ) ) { + } elseif( self::typeAction( $row, 'newusers', 'create2' ) ) { if( isset( $paramArray[0] ) ) { - $revert = $this->skin->userToolLinks( $paramArray[0], $title->getDBkey(), true ); + $revert = Linker::userToolLinks( $paramArray[0], $title->getDBkey(), true ); } else { # Fall back to a blue contributions link - $revert = $this->skin->userToolLinks( 1, $title->getDBkey() ); + $revert = Linker::userToolLinks( 1, $title->getDBkey() ); } - $ts = wfTimestamp( TS_UNIX, $row->log_timestamp ); - if( $ts < '20080129000000' ) { + if( wfTimestamp( TS_MW, $row->log_timestamp ) < '20080129000000' ) { # Suppress $comment from old entries (before 2008-01-29), # not needed and can contain incorrect links $comment = ''; @@ -545,18 +538,17 @@ class LogEventsList { private function getShowHideLinks( $row ) { global $wgUser; if( ( $this->flags & self::NO_ACTION_LINK ) // we don't want to see the links - || $row->log_type == 'suppress' ) // no one can hide items from the suppress log - { + || $row->log_type == 'suppress' ) { // no one can hide items from the suppress log return ''; } $del = ''; // Don't show useless link to people who cannot hide revisions - if( $wgUser->isAllowed( 'deletedhistory' ) ) { + if( $wgUser->isAllowed( 'deletedhistory' ) && !$wgUser->isBlocked() ) { if( $row->log_deleted || $wgUser->isAllowed( 'deleterevision' ) ) { $canHide = $wgUser->isAllowed( 'deleterevision' ); // If event was hidden from sysops if( !self::userCan( $row, LogPage::DELETED_RESTRICTED ) ) { - $del = $this->skin->revDeleteLinkDisabled( $canHide ); + $del = Linker::revDeleteLinkDisabled( $canHide ); } else { $target = SpecialPage::getTitleFor( 'Log', $row->log_type ); $query = array( @@ -564,7 +556,7 @@ class LogEventsList { 'type' => 'logging', 'ids' => $row->log_id, ); - $del = $this->skin->revDeleteLink( $query, + $del = Linker::revDeleteLink( $query, self::isDeleted( $row, LogPage::DELETED_RESTRICTED ), $canHide ); } } @@ -577,7 +569,7 @@ class LogEventsList { * @param $type Mixed: string/array * @param $action Mixed: string/array * @param $right string - * @return bool + * @return Boolean */ public static function typeAction( $row, $type, $action, $right='' ) { $match = is_array($type) ? @@ -596,6 +588,7 @@ class LogEventsList { /** * Determine if the current user is allowed to view a particular * field of this log row, if it's marked as deleted. + * * @param $row Row * @param $field Integer * @return Boolean @@ -603,10 +596,11 @@ class LogEventsList { public static function userCan( $row, $field ) { return self::userCanBitfield( $row->log_deleted, $field ); } - + /** * Determine if the current user is allowed to view a particular * field of this log row, if it's marked as deleted. + * * @param $bitfield Integer (current field) * @param $field Integer * @return Boolean @@ -614,7 +608,7 @@ class LogEventsList { public static function userCanBitfield( $bitfield, $field ) { if( $bitfield & $field ) { global $wgUser; - $permission = ''; + if ( $bitfield & LogPage::DELETED_RESTRICTED ) { $permission = 'suppressrevision'; } else { @@ -638,7 +632,8 @@ class LogEventsList { /** * Show log extract. Either with text and a box (set $msgKey) or without (don't set $msgKey) - * @param $out OutputPage or String-by-reference + * + * @param $out OutputPage|String-by-reference * @param $types String or Array * @param $page String The page title to show log entries for * @param $user String The user who made the log entries @@ -721,7 +716,7 @@ class LogEventsList { # If there is exactly one log type, we can link to Special:Log?type=foo if ( count( $types ) == 1 ) $urlParam['type'] = $types[0]; - $s .= $wgUser->getSkin()->link( + $s .= Linker::link( SpecialPage::getTitleFor( 'Log' ), wfMsgHtml( 'log-fulllog' ), array(), @@ -747,9 +742,10 @@ class LogEventsList { /** * SQL clause to skip forbidden log types for this user + * * @param $db Database * @param $audience string, public/user - * @return mixed (string or false) + * @return Mixed: string or false */ public static function getExcludeClause( $db, $audience = 'public' ) { global $wgLogRestrictions, $wgUser; @@ -780,19 +776,20 @@ class LogPager extends ReverseChronologicalPager { public $mLogEventsList; /** - * constructor + * Constructor + * * @param $list LogEventsList - * @param $types String or Array log types to show - * @param $user String The user who made the log entries - * @param $title String The page title the log entries are for - * @param $pattern String Do a prefix search rather than an exact title match - * @param $conds Array Extra conditions for the query - * @param $year Integer The year to start from - * @param $month Integer The month to start from + * @param $types String or Array: log types to show + * @param $user String: the user who made the log entries + * @param $title String: the page title the log entries are for + * @param $pattern String: do a prefix search rather than an exact title match + * @param $conds Array: extra conditions for the query + * @param $year Integer: the year to start from + * @param $month Integer: the month to start from + * @param $tagFilter String: tag */ public function __construct( $list, $types = array(), $user = '', $title = '', $pattern = '', - $conds = array(), $year = false, $month = false, $tagFilter = '' ) - { + $conds = array(), $year = false, $month = false, $tagFilter = '' ) { parent::__construct(); $this->mConds = $conds; @@ -814,6 +811,10 @@ class LogPager extends ReverseChronologicalPager { return $query; } + function getTitle() { + return $this->mLogEventsList->getDisplayTitle(); + } + // Call ONLY after calling $this->limitType() already! public function getFilterParams() { global $wgFilterLogTypes, $wgUser, $wgRequest; @@ -836,6 +837,7 @@ class LogPager extends ReverseChronologicalPager { /** * Set the log reader to return only entries of the given type. * Type restrictions enforced here + * * @param $types String or array: Log types ('upload', 'delete', etc); * empty string means no restriction */ @@ -868,6 +870,7 @@ class LogPager extends ReverseChronologicalPager { /** * Set the log reader to return only entries by the given user. + * * @param $name String: (In)valid user name */ private function limitUser( $name ) { @@ -888,9 +891,9 @@ class LogPager extends ReverseChronologicalPager { global $wgUser; $this->mConds['log_user'] = $userid; // Paranoia: avoid brute force searches (bug 17342) - if( !$wgUser->isAllowed( 'deletedhistory' ) ) { + if( !$wgUser->isAllowed( 'deletedhistory' ) || $wgUser->isBlocked() ) { $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::DELETED_USER) . ' = 0'; - } else if( !$wgUser->isAllowed( 'suppressrevision' ) ) { + } elseif( !$wgUser->isAllowed( 'suppressrevision' ) || $wgUser->isBlocked() ) { $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::SUPPRESSED_USER) . ' != ' . LogPage::SUPPRESSED_USER; } @@ -901,6 +904,7 @@ class LogPager extends ReverseChronologicalPager { /** * Set the log reader to return only entries affecting the given page. * (For the block and rights logs, this is a user page.) + * * @param $page String: Title name as text * @param $pattern String */ @@ -908,8 +912,9 @@ class LogPager extends ReverseChronologicalPager { global $wgMiserMode, $wgUser; $title = Title::newFromText( $page ); - if( strlen( $page ) == 0 || !$title instanceof Title ) + if( strlen( $page ) == 0 || !$title instanceof Title ) { return false; + } $this->title = $title->getPrefixedText(); $ns = $title->getNamespace(); @@ -935,35 +940,43 @@ class LogPager extends ReverseChronologicalPager { $this->mConds['log_title'] = $title->getDBkey(); } // Paranoia: avoid brute force searches (bug 17342) - if( !$wgUser->isAllowed( 'deletedhistory' ) ) { + if( !$wgUser->isAllowed( 'deletedhistory' ) || $wgUser->isBlocked() ) { $this->mConds[] = $db->bitAnd('log_deleted', LogPage::DELETED_ACTION) . ' = 0'; - } else if( !$wgUser->isAllowed( 'suppressrevision' ) ) { + } elseif( !$wgUser->isAllowed( 'suppressrevision' ) || $wgUser->isBlocked() ) { $this->mConds[] = $db->bitAnd('log_deleted', LogPage::SUPPRESSED_ACTION) . ' != ' . LogPage::SUPPRESSED_ACTION; } } public function getQueryInfo() { - global $wgOut; $tables = array( 'logging', 'user' ); $this->mConds[] = 'user_id = log_user'; $index = array(); $options = array(); - # Add log_search table if there are conditions on it - if( array_key_exists('ls_field',$this->mConds) ) { + # Add log_search table if there are conditions on it. + # This filters the results to only include log rows that have + # log_search records with the specified ls_field and ls_value values. + if( array_key_exists( 'ls_field', $this->mConds ) ) { $tables[] = 'log_search'; $index['log_search'] = 'ls_field_val'; $index['logging'] = 'PRIMARY'; - $options[] = 'DISTINCT'; + if ( !$this->hasEqualsClause( 'ls_field' ) + || !$this->hasEqualsClause( 'ls_value' ) ) + { + # Since (ls_field,ls_value,ls_logid) is unique, if the condition is + # to match a specific (ls_field,ls_value) tuple, then there will be + # no duplicate log rows. Otherwise, we need to remove the duplicates. + $options[] = 'DISTINCT'; + } # Avoid usage of the wrong index by limiting # the choices of available indexes. This mainly # avoids site-breaking filesorts. - } else if( $this->title || $this->pattern || $this->user ) { + } elseif( $this->title || $this->pattern || $this->user ) { $index['logging'] = array( 'page_time', 'user_time' ); if( count($this->types) == 1 ) { $index['logging'][] = 'log_user_type_time'; } - } else if( count($this->types) == 1 ) { + } elseif( count($this->types) == 1 ) { $index['logging'] = 'type_time'; } else { $index['logging'] = 'times'; @@ -978,7 +991,7 @@ class LogPager extends ReverseChronologicalPager { 'conds' => $this->mConds, 'options' => $options, 'join_conds' => array( - 'user' => array( 'INNER JOIN', 'user_id=log_user' ), + 'user' => array( 'INNER JOIN', 'user_id=log_user' ), 'log_search' => array( 'INNER JOIN', 'ls_log_id=log_id' ) ) ); @@ -988,6 +1001,14 @@ class LogPager extends ReverseChronologicalPager { return $info; } + // Checks if $this->mConds has $field matched to a *single* value + protected function hasEqualsClause( $field ) { + return ( + array_key_exists( $field, $this->mConds ) && + ( !is_array( $this->mConds[$field] ) || count( $this->mConds[$field] ) == 1 ) + ); + } + function getIndexField() { return 'log_timestamp'; } @@ -997,7 +1018,7 @@ class LogPager extends ReverseChronologicalPager { # Do a link batch query if( $this->getNumRows() > 0 ) { $lb = new LinkBatch; - while( $row = $this->mResult->fetchObject() ) { + foreach ( $this->mResult as $row ) { $lb->add( $row->log_namespace, $row->log_title ); $lb->addObj( Title::makeTitleSafe( NS_USER, $row->user_name ) ); $lb->addObj( Title::makeTitleSafe( NS_USER_TALK, $row->user_name ) ); @@ -1049,112 +1070,3 @@ class LogPager extends ReverseChronologicalPager { } } -/** - * @deprecated - * @ingroup SpecialPage - */ -class LogReader { - var $pager; - /** - * @param $request WebRequest: for internal use use a FauxRequest object to pass arbitrary parameters. - */ - function __construct( $request ) { - global $wgUser, $wgOut; - wfDeprecated(__METHOD__); - # Get parameters - $type = $request->getVal( 'type' ); - $user = $request->getText( 'user' ); - $title = $request->getText( 'page' ); - $pattern = $request->getBool( 'pattern' ); - $year = $request->getIntOrNull( 'year' ); - $month = $request->getIntOrNull( 'month' ); - $tagFilter = $request->getVal( 'tagfilter' ); - # Don't let the user get stuck with a certain date - $skip = $request->getText( 'offset' ) || $request->getText( 'dir' ) == 'prev'; - if( $skip ) { - $year = ''; - $month = ''; - } - # Use new list class to output results - $loglist = new LogEventsList( $wgUser->getSkin(), $wgOut, 0 ); - $this->pager = new LogPager( $loglist, $type, $user, $title, $pattern, $year, $month, $tagFilter ); - } - - /** - * Is there at least one row? - * @return bool - */ - public function hasRows() { - return isset($this->pager) ? ($this->pager->getNumRows() > 0) : false; - } -} - -/** - * @deprecated - * @ingroup SpecialPage - */ -class LogViewer { - const NO_ACTION_LINK = 1; - - /** - * LogReader object - */ - var $reader; - - /** - * @param &$reader LogReader: where to get our data from - * @param $flags Integer: Bitwise combination of flags: - * LogEventsList::NO_ACTION_LINK Don't show restore/unblock/block links - */ - function __construct( &$reader, $flags = 0 ) { - wfDeprecated(__METHOD__); - $this->reader =& $reader; - $this->reader->pager->mLogEventsList->flags = $flags; - # Aliases for shorter code... - $this->pager =& $this->reader->pager; - $this->list =& $this->reader->pager->mLogEventsList; - } - - /** - * Take over the whole output page in $wgOut with the log display. - */ - public function show() { - # Set title and add header - $this->list->showHeader( $pager->getType() ); - # Show form options - $this->list->showOptions( $this->pager->getType(), $this->pager->getUser(), $this->pager->getPage(), - $this->pager->getPattern(), $this->pager->getYear(), $this->pager->getMonth() ); - # Insert list - $logBody = $this->pager->getBody(); - if( $logBody ) { - $wgOut->addHTML( - $this->pager->getNavigationBar() . - $this->list->beginLogEventsList() . - $logBody . - $this->list->endLogEventsList() . - $this->pager->getNavigationBar() - ); - } else { - $wgOut->addWikiMsg( 'logempty' ); - } - } - - /** - * Output just the list of entries given by the linked LogReader, - * with extraneous UI elements. Use for displaying log fragments in - * another page (eg at Special:Undelete) - * @param $out OutputPage: where to send output - */ - public function showList( &$out ) { - $logBody = $this->pager->getBody(); - if( $logBody ) { - $out->addHTML( - $this->list->beginLogEventsList() . - $logBody . - $this->list->endLogEventsList() - ); - } else { - $out->addWikiMsg( 'logempty' ); - } - } -}