diff options
Diffstat (limited to 'includes/LogEventsList.php')
| -rw-r--r-- | includes/LogEventsList.php | 277 |
1 files changed, 109 insertions, 168 deletions
diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php index 128500c5..744a60ce 100644 --- a/includes/LogEventsList.php +++ b/includes/LogEventsList.php @@ -27,10 +27,27 @@ 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; @@ -81,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; @@ -138,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 @@ -153,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, @@ -169,8 +185,10 @@ class LogEventsList { } 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'] ); @@ -183,6 +201,16 @@ class LogEventsList { } /** + * 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 */ @@ -312,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 ); @@ -324,10 +352,10 @@ class LogEventsList { $userLinks = '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>'; } 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 ); } } @@ -344,20 +372,28 @@ class LogEventsList { } return $action; } - + private function logComment( $row ) { - global $wgContLang; if( self::isDeleted( $row, LogPage::DELETED_COMMENT ) ) { $comment = '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-comment' ) . '</span>'; } 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; if( ( $this->flags & self::NO_ACTION_LINK ) // we don't want to see the action @@ -369,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(), @@ -383,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(), @@ -397,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(), @@ -419,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( @@ -431,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' ), @@ -439,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(), @@ -452,19 +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' ) ) { + } 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 $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(), @@ -475,12 +508,12 @@ 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() ); } if( wfTimestamp( TS_MW, $row->log_timestamp ) < '20080129000000' ) { # Suppress $comment from old entries (before 2008-01-29), @@ -505,8 +538,7 @@ 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 = ''; @@ -516,7 +548,7 @@ class LogEventsList { $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( @@ -524,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 ); } } @@ -601,7 +633,7 @@ 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 @@ -684,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(), @@ -757,8 +789,7 @@ class LogPager extends ReverseChronologicalPager { * @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; @@ -780,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; @@ -858,7 +893,7 @@ class LogPager extends ReverseChronologicalPager { // Paranoia: avoid brute force searches (bug 17342) if( !$wgUser->isAllowed( 'deletedhistory' ) ) { $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::DELETED_USER) . ' = 0'; - } else if( !$wgUser->isAllowed( 'suppressrevision' ) ) { + } elseif( !$wgUser->isAllowed( 'suppressrevision' ) ) { $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::SUPPRESSED_USER) . ' != ' . LogPage::SUPPRESSED_USER; } @@ -877,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(); @@ -906,7 +942,7 @@ class LogPager extends ReverseChronologicalPager { // Paranoia: avoid brute force searches (bug 17342) if( !$wgUser->isAllowed( 'deletedhistory' ) ) { $this->mConds[] = $db->bitAnd('log_deleted', LogPage::DELETED_ACTION) . ' = 0'; - } else if( !$wgUser->isAllowed( 'suppressrevision' ) ) { + } elseif( !$wgUser->isAllowed( 'suppressrevision' ) ) { $this->mConds[] = $db->bitAnd('log_deleted', LogPage::SUPPRESSED_ACTION) . ' != ' . LogPage::SUPPRESSED_ACTION; } @@ -917,21 +953,30 @@ class LogPager extends ReverseChronologicalPager { $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'; @@ -946,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' ) ) ); @@ -956,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'; } @@ -1017,115 +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() { - global $wgOut; - # Set title and add header - $this->list->showHeader( $this->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' ); - } - } -} |