X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FLogEventsList.php;h=e8d437910ee8a1fd27482c36ae11fe6287559944;hb=004b81ff4eb72d26b3515c4461aac36db8b95f6d;hp=5aac65469813e7f0bfd81f5dc4c3715c86f5ba50;hpb=4cc0115d865e65dcd997a7e4bb08303564a472b8;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php index 5aac654698..e8d437910e 100644 --- a/includes/LogEventsList.php +++ b/includes/LogEventsList.php @@ -19,12 +19,14 @@ class LogEventsList { const NO_ACTION_LINK = 1; - + private $skin; + private $out; public $flags; - function __construct( &$skin, $flags = 0 ) { - $this->skin =& $skin; + public function __construct( $skin, $out, $flags = 0 ) { + $this->skin = $skin; + $this->out = $out; $this->flags = $flags; $this->preCacheMessages(); } @@ -36,95 +38,143 @@ class LogEventsList { private function preCacheMessages() { // Precache various messages if( !isset( $this->message ) ) { - $messages = 'revertmerge protect_change unblocklink revertmove undeletelink revdel-restore rev-delundel'; - foreach( explode(' ', $messages ) as $msg ) { - $this->message[$msg] = wfMsgExt( $msg, array( 'escape') ); + $messages = array( 'revertmerge', 'protect_change', 'unblocklink', 'change-blocklink', + 'revertmove', 'undeletelink', 'revdel-restore', 'rev-delundel', 'hist', 'pipe-separator' ); + foreach( $messages as $msg ) { + $this->message[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) ); } } } - + /** * Set page title and show header for this log type - * @param OutputPage $out where to send output - * @param strin $type + * @param $type String */ - public function showHeader( $out, $type ) { + public function showHeader( $type ) { if( LogPage::isLogType( $type ) ) { - $out->setPageTitle( LogPage::logName( $type ) ); - $out->addWikiText( LogPage::logHeader( $type ) ); + $this->out->setPageTitle( LogPage::logName( $type ) ); + $this->out->addHTML( LogPage::logHeader( $type ) ); } } /** * Show options for the log list - * @param OutputPage $out where to send output - * @param string $type, - * @param string $user, - * @param string $page, - * @param string $pattern + * @param $type String + * @param $user String + * @param $page String + * @param $pattern String + * @param $year Integer: year + * @param $month Integer: month + * @param $filter: array + * @param $tagFilter: array? */ - public function showOptions( $out, $type, $user, $page, $pattern ) { + public function showOptions( $type = '', $user = '', $page = '', $pattern = '', $year = '', + $month = '', $filter = null, $tagFilter='' ) + { global $wgScript, $wgMiserMode; $action = htmlspecialchars( $wgScript ); $title = SpecialPage::getTitleFor( 'Log' ); $special = htmlspecialchars( $title->getPrefixedDBkey() ); - $out->addHTML( "
" . + + $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter ); + + $this->out->addHTML( "
" . Xml::element( 'legend', array(), wfMsg( 'log' ) ) . Xml::hidden( 'title', $special ) . "\n" . $this->getTypeMenu( $type ) . "\n" . $this->getUserInput( $user ) . "\n" . $this->getTitleInput( $page ) . "\n" . ( !$wgMiserMode ? ($this->getTitlePattern( $pattern )."\n") : "" ) . - Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" . - "
" ); + "

" . Xml::dateMenu( $year, $month ) . "\n" . + ( $tagSelector ? Xml::tags( 'p', null, implode( ' ', $tagSelector ) ) :'' ). "\n" . + ( $filter ? "

".$this->getFilterLinks( $type, $filter )."\n" : "" ) . "\n" . + Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "

\n" . + "
" + ); + } + + private function getFilterLinks( $logType, $filter ) { + global $wgTitle, $wgLang; + // show/hide links + $messages = array( wfMsgHtml( 'show' ), wfMsgHtml( 'hide' ) ); + // Option value -> message mapping + $links = array(); + $hiddens = ''; // keep track for "go" button + foreach( $filter as $type => $val ) { + $hideVal = 1 - intval($val); + $link = $this->skin->makeKnownLinkObj( $wgTitle, $messages[$hideVal], + wfArrayToCGI( array( "hide_{$type}_log" => $hideVal ), $this->getDefaultQuery() ) + ); + $links[$type] = wfMsgHtml( "log-show-hide-{$type}", $link ); + $hiddens .= Xml::hidden( "hide_{$type}_log", $val ) . "\n"; + } + // Build links + return ''.$wgLang->pipeList( $links ) . '' . $hiddens; + } + + private function getDefaultQuery() { + if ( !isset( $this->mDefaultQuery ) ) { + $this->mDefaultQuery = $_GET; + unset( $this->mDefaultQuery['title'] ); + unset( $this->mDefaultQuery['dir'] ); + unset( $this->mDefaultQuery['offset'] ); + unset( $this->mDefaultQuery['limit'] ); + unset( $this->mDefaultQuery['order'] ); + unset( $this->mDefaultQuery['month'] ); + unset( $this->mDefaultQuery['year'] ); + } + return $this->mDefaultQuery; } /** - * @return string Formatted HTML + * @param $queryType String + * @return String: Formatted HTML */ private function getTypeMenu( $queryType ) { global $wgLogRestrictions, $wgUser; - - $out = "\n"; $validTypes = LogPage::validTypes(); - $m = array(); // Temporary array + $typesByName = array(); // Temporary array // First pass to load the log names foreach( $validTypes as $type ) { $text = LogPage::logName( $type ); - $m[$text] = $type; + $typesByName[$text] = $type; } // Second pass to sort by name - ksort($m); + ksort($typesByName); // Third pass generates sorted XHTML content - foreach( $m as $text => $type ) { + foreach( $typesByName as $text => $type ) { $selected = ($type == $queryType); // Restricted types if ( isset($wgLogRestrictions[$type]) ) { if ( $wgUser->isAllowed( $wgLogRestrictions[$type] ) ) { - $out .= Xml::option( $text, $type, $selected ) . "\n"; + $html .= Xml::option( $text, $type, $selected ) . "\n"; } } else { - $out .= Xml::option( $text, $type, $selected ) . "\n"; + $html .= Xml::option( $text, $type, $selected ) . "\n"; } } - $out .= ''; - return $out; + $html .= ''; + return $html; } /** - * @return string Formatted HTML + * @param $user String + * @return String: Formatted HTML */ private function getUserInput( $user ) { - return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'user', 12, $user ); + return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'user', 15, $user ); } /** - * @return string Formatted HTML + * @param $title String + * @return String: Formatted HTML */ private function getTitleInput( $title ) { return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'page', 20, $title ); @@ -134,37 +184,35 @@ class LogEventsList { * @return boolean Checkbox */ private function getTitlePattern( $pattern ) { - return Xml::checkLabel( wfMsg( 'log-title-wildcard' ), 'pattern', 'pattern', $pattern ); + return '' . + Xml::checkLabel( wfMsg( 'log-title-wildcard' ), 'pattern', 'pattern', $pattern ) . + ''; } - + public function beginLogEventsList() { return "\n"; } - - /** - * @param Row $row a single row from the result set - * @return string Formatted HTML list item - * @private + + /** + * @param $row Row: a single row from the result set + * @return String: Formatted HTML list item */ public function logLine( $row ) { global $wgLang, $wgUser, $wgContLang; - $skin = $wgUser->getSkin(); + $title = Title::makeTitle( $row->log_namespace, $row->log_title ); + $classes = array( "mw-logline-{$row->log_type}" ); $time = $wgLang->timeanddate( wfTimestamp(TS_MW, $row->log_timestamp), true ); - // Enter the existence or non-existence of this page into the link cache, - // for faster makeLinkObj() in LogPage::actionText() - $linkCache =& LinkCache::singleton(); - $linkCache->addLinkObj( $title ); // User links if( self::isDeleted($row,LogPage::DELETED_USER) ) { $userLink = '' . wfMsgHtml( 'rev-deleted-user' ) . ''; } else { - $userLink = $this->skin->userLink( $row->log_user, $row->user_name ) . - $this->skin->userToolLinksRedContribs( $row->log_user, $row->user_name ); + $userLink = $this->skin->userLink( $row->log_user, $row->user_name ) . + $this->skin->userToolLinks( $row->log_user, $row->user_name, true, 0, $row->user_editcount ); } // Comment if( self::isDeleted($row,LogPage::DELETED_COMMENT) ) { @@ -177,129 +225,180 @@ class LogEventsList { $revert = $del = ''; // Some user can hide log items and have review links if( $wgUser->isAllowed( 'deleterevision' ) ) { - $del = $this->showhideLinks( $row ) . ' '; + $del = $this->getShowHideLinks( $row ) . ' '; } // Add review links and such... - if( !($this->flags & self::NO_ACTION_LINK) && !($row->log_deleted & LogPage::DELETED_ACTION) ) { - if( $row->log_type == 'move' && isset( $paramArray[0] ) && $wgUser->isAllowed( 'move' ) ) { - $destTitle = Title::newFromText( $paramArray[0] ); - if( $destTitle ) { - $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ), - $this->message['revertmove'], - 'wpOldTitle=' . urlencode( $destTitle->getPrefixedDBkey() ) . - '&wpNewTitle=' . urlencode( $title->getPrefixedDBkey() ) . - '&wpReason=' . urlencode( wfMsgForContent( 'revertmove' ) ) . - '&wpMovetalk=0' ) . ')'; - } - // Show undelete link - } else if( $row->log_action == 'delete' && $wgUser->isAllowed( 'delete' ) ) { - $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Undelete' ), - $this->message['undeletelink'], 'target='. urlencode( $title->getPrefixedDBkey() ) ) . ')'; - // Show unblock link - } else if( $row->log_action == 'block' && $wgUser->isAllowed( 'block' ) ) { - $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Ipblocklist' ), + if( ($this->flags & self::NO_ACTION_LINK) || ($row->log_deleted & LogPage::DELETED_ACTION) ) { + // Action text is suppressed... + } else if( self::typeAction($row,'move','move','move') && !empty($paramArray[0]) ) { + $destTitle = Title::newFromText( $paramArray[0] ); + if( $destTitle ) { + $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ), + $this->message['revertmove'], + 'wpOldTitle=' . urlencode( $destTitle->getPrefixedDBkey() ) . + '&wpNewTitle=' . urlencode( $title->getPrefixedDBkey() ) . + '&wpReason=' . urlencode( wfMsgForContent( 'revertmove' ) ) . + '&wpMovetalk=0' ) . ')'; + } + // Show undelete link + } else if( self::typeAction($row,array('delete','suppress'),'delete','delete') ) { + $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Undelete' ), + $this->message['undeletelink'], 'target='. urlencode( $title->getPrefixedDBkey() ) ) . ')'; + // Show unblock/change block link + } else if( self::typeAction($row,array('block','suppress'),array('block','reblock'),'block') ) { + $revert = '(' . + $this->skin->link( SpecialPage::getTitleFor( 'Ipblocklist' ), $this->message['unblocklink'], - 'action=unblock&ip=' . urlencode( $row->log_title ) ) . ')'; - // Show change protection link - } else if( ( $row->log_action == 'protect' || $row->log_action == 'modify' ) && $wgUser->isAllowed( 'protect' ) ) { - $revert = '(' . $this->skin->makeKnownLinkObj( $title, $this->message['protect_change'], 'action=unprotect' ) . ')'; - // Show unmerge link - } else if ( $row->log_action == 'merge' ) { - $merge = SpecialPage::getTitleFor( 'Mergehistory' ); - $revert = '(' . $this->skin->makeKnownLinkObj( $merge, $this->message['revertmerge'], - wfArrayToCGI( - array('target' => $paramArray[0], 'dest' => $title->getPrefixedText(), 'mergepoint' => $paramArray[1] ) - ) - ) . ')'; - // If an edit was hidden from a page give a review link to the history - } else if( $row->log_action == 'revision' && $wgUser->isAllowed( 'deleterevision' ) && isset($paramArray[2]) ) { + array(), + array( 'action' => 'unblock', 'ip' => $row->log_title ), + 'known' ) + . $this->message['pipe-separator'] . + $this->skin->link( SpecialPage::getTitleFor( 'Blockip', $row->log_title ), + $this->message['change-blocklink'], + array(), array(), 'known' ) . + ')'; + // Show change protection link + } else if( self::typeAction( $row, 'protect', array( 'modify', 'protect', 'unprotect' ) ) ) { + $revert .= ' (' . + $this->skin->link( $title, + $this->message['hist'], + array(), + array( 'action' => 'history', 'offset' => $row->log_timestamp ) ); + if( $wgUser->isAllowed( 'protect' ) ) { + $revert .= $this->message['pipe-separator'] . + $this->skin->link( $title, + $this->message['protect_change'], + array(), + array( 'action' => 'protect' ), + 'known' ); + } + $revert .= ')'; + // Show unmerge link + } else if( self::typeAction($row,'merge','merge','mergehistory') ) { + $merge = SpecialPage::getTitleFor( 'Mergehistory' ); + $revert = '(' . $this->skin->makeKnownLinkObj( $merge, $this->message['revertmerge'], + wfArrayToCGI( array('target' => $paramArray[0], 'dest' => $title->getPrefixedDBkey(), + 'mergepoint' => $paramArray[1] ) ) ) . ')'; + // If an edit was hidden from a page give a review link to the history + } else if( self::typeAction($row,array('delete','suppress'),'revision','deleterevision') ) { + if( count($paramArray) == 2 ) { $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); // Different revision types use different URL params... - $subtype = isset($paramArray[2]) ? $paramArray[1] : ''; - // Link to each hidden object ID, $paramArray[1] is the url param. List if several... - $Ids = explode( ',', $paramArray[2] ); - if( count($Ids) == 1 ) { - $revert = $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], - wfArrayToCGI( array('target' => $paramArray[0], $paramArray[1] => $Ids[0] ) ) ); - } else { - $revert .= $this->message['revdel-restore'].':'; - foreach( $Ids as $n => $id ) { - $revert .= ' '.$this->skin->makeKnownLinkObj( $revdel, '#'.($n+1), - wfArrayToCGI( array('target' => $paramArray[0], $paramArray[1] => $id ) ) ); - } + $key = $paramArray[0]; + // Link to each hidden object ID, $paramArray[1] is the url param + $Ids = explode( ',', $paramArray[1] ); + $revParams = ''; + foreach( $Ids as $n => $id ) { + $revParams .= '&' . urlencode($key) . '[]=' . urlencode($id); } - $revert = "($revert)"; - // Hidden log items, give review link - } else if( $row->log_action == 'event' && $wgUser->isAllowed( 'deleterevision' ) && isset($paramArray[2]) ) { + $revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], + 'target=' . $title->getPrefixedUrl() . $revParams ) . ')'; + } + // Hidden log items, give review link + } else if( self::typeAction($row,array('delete','suppress'),'event','deleterevision') ) { + if( count($paramArray) == 1 ) { $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); - $revert .= $this->message['revdel-restore']; $Ids = explode( ',', $paramArray[0] ); - // Link to each hidden object ID, $paramArray[1] is the url param. List if several... - if( count($Ids) == 1 ) { - $revert = $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], - wfArrayToCGI( array('logid' => $Ids[0] ) ) ); - } else { - foreach( $Ids as $n => $id ) { - $revert .= $this->skin->makeKnownLinkObj( $revdel, '#'.($n+1), - wfArrayToCGI( array('logid' => $id ) ) ); - } + // Link to each hidden object ID, $paramArray[1] is the url param + $logParams = ''; + foreach( $Ids as $n => $id ) { + $logParams .= '&logid[]=' . intval($id); } - $revert = "($revert)"; + $revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], + 'target=' . $title->getPrefixedUrl() . $logParams ) . ')'; + } + // Self-created users + } else if( self::typeAction($row,'newusers','create2') ) { + if( isset( $paramArray[0] ) ) { + $revert = $this->skin->userToolLinks( $paramArray[0], $title->getDBkey(), true ); } else { - wfRunHooks( 'LogLine', array( $row->log_type, $row->log_action, $title, $paramArray, - &$comment, &$revert, $row->log_timestamp ) ); - // wfDebug( "Invoked LogLine hook for " $row->log_type . ", " . $row->log_action . "\n" ); - // Do nothing. The implementation is handled by the hook modifiying the passed-by-ref parameters. + # Fall back to a blue contributions link + $revert = $this->skin->userToolLinks( 1, $title->getDBkey() ); + } + if( $time < '20080129000000' ) { + # Suppress $comment from old entries (before 2008-01-29), + # not needed and can contain incorrect links + $comment = ''; } + // Do nothing. The implementation is handled by the hook modifiying the passed-by-ref parameters. + } else { + wfRunHooks( 'LogLine', array( $row->log_type, $row->log_action, $title, $paramArray, + &$comment, &$revert, $row->log_timestamp ) ); } // Event description if( self::isDeleted($row,LogPage::DELETED_ACTION) ) { $action = '' . wfMsgHtml('rev-deleted-event') . ''; } else { - $action = LogPage::actionText( $row->log_type, $row->log_action, $title, $this->skin, $paramArray, true ); + $action = LogPage::actionText( $row->log_type, $row->log_action, $title, + $this->skin, $paramArray, true ); } - - return "
  • $del$time $userLink $action $comment $revert
    • \n"; + + // Any tags... + list($tagDisplay, $newClasses) = ChangeTags::formatSummaryRow( $row->ts_tags, 'logevent' ); + $classes = array_merge( $classes, $newClasses ); + + if( $revert != '' ) { + $revert = '' . $revert . ''; + } + + return Xml::tags( 'li', array( "class" => implode( ' ', $classes ) ), + $del . $time . ' ' . $userLink . ' ' . $action . ' ' . $comment . ' ' . $revert . " $tagDisplay" ) . "\n"; } - + /** - * @param Row $row - * @private + * @param $row Row + * @return string */ - private function showhideLinks( $row ) { - global $wgAllowLogDeletion; - - if( !$wgAllowLogDeletion ) - return ""; - + private function getShowHideLinks( $row ) { $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); // If event was hidden from sysops if( !self::userCan( $row, LogPage::DELETED_RESTRICTED ) ) { - $del = $this->message['rev-delundel']; + $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.$this->message['rev-delundel'].')' ); } else if( $row->log_type == 'suppress' ) { // No one should be hiding from the oversight log - $del = $this->message['rev-delundel']; + $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.$this->message['rev-delundel'].')' ); } else { - $del = $this->skin->makeKnownLinkObj( $revdel, $this->message['rev-delundel'], 'logid='.$row->log_id ); - // Bolden oversighted content - if( self::isDeleted( $row, LogPage::DELETED_RESTRICTED ) ) - $del = "$del"; + $target = SpecialPage::getTitleFor( 'Log', $row->log_type ); + $query = array( 'target' => $target->getPrefixedDBkey(), + 'logid' => $row->log_id + ); + $del = $this->skin->revDeleteLink( $query, self::isDeleted( $row, LogPage::DELETED_RESTRICTED ) ); } - return "($del)"; + return $del; } - + + /** + * @param $row Row + * @param $type Mixed: string/array + * @param $action Mixed: string/array + * @param $right string + * @return bool + */ + public static function typeAction( $row, $type, $action, $right='' ) { + $match = is_array($type) ? in_array($row->log_type,$type) : $row->log_type == $type; + if( $match ) { + $match = is_array($action) ? + in_array($row->log_action,$action) : $row->log_action == $action; + if( $match && $right ) { + global $wgUser; + $match = $wgUser->isAllowed( $right ); + } + } + return $match; + } + /** * 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 int $field - * @return bool + * @param $row Row + * @param $field Integer + * @return Boolean */ public static function userCan( $row, $field ) { if( ( $row->log_deleted & $field ) == $field ) { global $wgUser; $permission = ( $row->log_deleted & LogPage::DELETED_RESTRICTED ) == LogPage::DELETED_RESTRICTED - ? 'hiderevision' + ? 'suppressrevision' : 'deleterevision'; wfDebug( "Checking for $permission due to $field match on $row->log_deleted\n" ); return $wgUser->isAllowed( $permission ); @@ -309,25 +408,29 @@ class LogEventsList { } /** - * @param Row $row - * @param int $field one of DELETED_* bitfield constants - * @return bool + * @param $row Row + * @param $field Integer: one of DELETED_* bitfield constants + * @return Boolean */ public static function isDeleted( $row, $field ) { return ($row->log_deleted & $field) == $field; } - + /** * Quick function to show a short log extract - * @param OutputPage $out - * @param string $type - * @param string $page + * @param $out OutputPage + * @param $type String + * @param $page String + * @param $user String + * @param $lim Integer + * @param $conds Array */ - public static function showLogExtract( $out, $type='', $page='', $user='' ) { + public static function showLogExtract( $out, $type='', $page='', $user='', $lim=0, $conds=array() ) { global $wgUser; # Insert list of top 50 or so items - $loglist = new LogEventsList( $wgUser->getSkin() ); - $pager = new LogPager( $loglist, $type, $user, $page, '' ); + $loglist = new LogEventsList( $wgUser->getSkin(), $out, 0 ); + $pager = new LogPager( $loglist, $type, $user, $page, '', $conds ); + if( $lim > 0 ) $pager->mLimit = $lim; $logBody = $pager->getBody(); if( $logBody ) { $out->addHTML( @@ -338,62 +441,98 @@ class LogEventsList { } else { $out->addWikiMsg( 'logempty' ); } - } - - /** + return $pager->getNumRows(); + } + + /** * SQL clause to skip forbidden log types for this user - * @param Database $db - * @returns mixed (string or false) + * @param $db Database + * @return mixed (string or false) */ public static function getExcludeClause( $db ) { global $wgLogRestrictions, $wgUser; // Reset the array, clears extra "where" clauses when $par is used $hiddenLogs = array(); - // Don't show private logs to unpriviledged users - foreach( $wgLogRestrictions as $logtype => $right ) { + // Don't show private logs to unprivileged users + foreach( $wgLogRestrictions as $logType => $right ) { if( !$wgUser->isAllowed($right) ) { - $safetype = $db->strencode( $logtype ); - $hiddenLogs[] = "'$safetype'"; + $safeType = $db->strencode( $logType ); + $hiddenLogs[] = $safeType; } } - if( !empty($hiddenLogs) ) { - return 'log_type NOT IN(' . implode(',',$hiddenLogs) . ')'; + if( count($hiddenLogs) == 1 ) { + return 'log_type != ' . $db->addQuotes( $hiddenLogs[0] ); + } elseif( $hiddenLogs ) { + return 'log_type NOT IN (' . $db->makeList($hiddenLogs) . ')'; } return false; } } /** - * @addtogroup Pager + * @ingroup Pager */ class LogPager extends ReverseChronologicalPager { private $type = '', $user = '', $title = '', $pattern = ''; public $mLogEventsList; + /** - * constructor - * @param LogEventsList $loglist, - * @param string $type, - * @param string $user, - * @param string $page, - * @param string $pattern - * @param array $conds - */ - function __construct( $loglist, $type='', $user='', $title='', $pattern='', $conds = array() ) { + * constructor + * @param $list LogEventsList + * @param $type String + * @param $user String + * @param $title String + * @param $pattern String + * @param $conds Array + * @param $year Integer + * @param $month Integer + */ + public function __construct( $list, $type = '', $user = '', $title = '', $pattern = '', + $conds = array(), $year = false, $month = false, $tagFilter = '' ) + { parent::__construct(); $this->mConds = $conds; - - $this->mLogEventsList = $loglist; - - $this->limitType( $type ); + + $this->mLogEventsList = $list; + + $this->limitType( $type ); // also excludes hidden types $this->limitUser( $user ); $this->limitTitle( $title, $pattern ); + $this->getDateCond( $year, $month ); + $this->mTagFilter = $tagFilter; } - + + public function getDefaultQuery() { + $query = parent::getDefaultQuery(); + $query['type'] = $this->type; + $query['user'] = $this->user; + $query['month'] = $this->mMonth; + $query['year'] = $this->mYear; + return $query; + } + + public function getFilterParams() { + global $wgFilterLogTypes, $wgUser, $wgRequest; + $filters = array(); + if( $this->type ) { + return $filters; + } + foreach( $wgFilterLogTypes as $type => $default ) { + // Avoid silly filtering + if( $type !== 'patrol' || $wgUser->useNPPatrol() ) { + $hide = $wgRequest->getInt( "hide_{$type}_log", $default ); + $filters[$type] = $hide; + if( $hide ) + $this->mConds[] = 'log_type != ' . $this->mDb->addQuotes( $type ); + } + } + return $filters; + } + /** * Set the log reader to return only entries of the given type. * Type restrictions enforced here - * @param string $type A log type ('upload', 'delete', etc) - * @private + * @param $type String: A log type ('upload', 'delete', etc) */ private function limitType( $type ) { global $wgLogRestrictions, $wgUser; @@ -406,19 +545,18 @@ class LogPager extends ReverseChronologicalPager { if( $hideLogs !== false ) { $this->mConds[] = $hideLogs; } - if( empty($type) ) { + if( !$type ) { return false; } $this->type = $type; $this->mConds['log_type'] = $type; } - + /** * Set the log reader to return only entries by the given user. - * @param string $name (In)valid user name - * @private + * @param $name String: (In)valid user name */ - function limitUser( $name ) { + private function limitUser( $name ) { if( $name == '' ) { return false; } @@ -426,105 +564,169 @@ class LogPager extends ReverseChronologicalPager { if( is_null($usertitle) ) { return false; } - $this->user = $usertitle->getText(); /* Fetch userid at first, if known, provides awesome query plan afterwards */ - $userid = User::idFromName( $this->user ); + $userid = User::idFromName( $name ); if( !$userid ) { - /* It should be nicer to abort query at all, + /* It should be nicer to abort query at all, but for now it won't pass anywhere behind the optimizer */ $this->mConds[] = "NULL"; } else { $this->mConds['log_user'] = $userid; + // Paranoia: avoid brute force searches (bug 17342) + $this->mConds[] = 'log_deleted & ' . LogPage::DELETED_USER . ' = 0'; + $this->user = $usertitle->getText(); } } /** * Set the log reader to return only entries affecting the given page. * (For the block and rights logs, this is a user page.) - * @param string $page Title name as text - * @private + * @param $page String: Title name as text + * @param $pattern String */ - function limitTitle( $page, $pattern ) { + private function limitTitle( $page, $pattern ) { global $wgMiserMode; - + $title = Title::newFromText( $page ); if( strlen($page) == 0 || !$title instanceof Title ) return false; - + $this->title = $title->getPrefixedText(); - $this->pattern = $pattern; $ns = $title->getNamespace(); + # Using the (log_namespace, log_title, log_timestamp) index with a + # range scan (LIKE) on the first two parts, instead of simple equality, + # makes it unusable for sorting. Sorted retrieval using another index + # would be possible, but then we might have to scan arbitrarily many + # nodes of that index. Therefore, we need to avoid this if $wgMiserMode + # is on. + # + # This is not a problem with simple title matches, because then we can + # use the page_time index. That should have no more than a few hundred + # log entries for even the busiest pages, so it can be safely scanned + # in full to satisfy an impossible condition on user or similar. if( $pattern && !$wgMiserMode ) { # use escapeLike to avoid expensive search patterns like 't%st%' $safetitle = $this->mDb->escapeLike( $title->getDBkey() ); $this->mConds['log_namespace'] = $ns; $this->mConds[] = "log_title LIKE '$safetitle%'"; + $this->pattern = $pattern; } else { $this->mConds['log_namespace'] = $ns; $this->mConds['log_title'] = $title->getDBkey(); } + // Paranoia: avoid brute force searches (bug 17342) + $this->mConds[] = 'log_deleted & ' . LogPage::DELETED_ACTION . ' = 0'; } - function getQueryInfo() { + public function getQueryInfo() { $this->mConds[] = 'user_id = log_user'; - # Hack this until live - global $wgAllowLogDeletion; - $log_id = $wgAllowLogDeletion ? 'log_id' : '0 AS log_id'; - return array( + # Don't use the wrong logging index + if( $this->title || $this->pattern || $this->user ) { + $index = array( 'USE INDEX' => array( 'logging' => array('page_time','user_time') ) ); + } else if( $this->type ) { + $index = array( 'USE INDEX' => array( 'logging' => 'type_time' ) ); + } else { + $index = array( 'USE INDEX' => array( 'logging' => 'times' ) ); + } + $info = array( 'tables' => array( 'logging', 'user' ), - 'fields' => array( 'log_type', 'log_action', 'log_user', 'log_namespace', 'log_title', - 'log_params', 'log_comment', $log_id, 'log_deleted', 'log_timestamp', 'user_name' ), + 'fields' => array( 'log_type', 'log_action', 'log_user', 'log_namespace', 'log_title', 'log_params', + 'log_comment', 'log_id', 'log_deleted', 'log_timestamp', 'user_name', 'user_editcount' ), 'conds' => $this->mConds, - 'options' => array() + 'options' => $index, + 'join_conds' => array( 'user' => array( 'INNER JOIN', 'user_id=log_user' ) ), ); + + ChangeTags::modifyDisplayQuery( $info['tables'], $info['fields'], $info['conds'], $info['join_conds'], $this->mTagFilter ); + + return $info; } function getIndexField() { return 'log_timestamp'; } - function formatRow( $row ) { + public function getStartBody() { + wfProfileIn( __METHOD__ ); + # Do a link batch query + if( $this->getNumRows() > 0 ) { + $lb = new LinkBatch; + while( $row = $this->mResult->fetchObject() ) { + $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 ) ); + } + $lb->execute(); + $this->mResult->seek( 0 ); + } + wfProfileOut( __METHOD__ ); + return ''; + } + + public function formatRow( $row ) { return $this->mLogEventsList->logLine( $row ); } - + public function getType() { return $this->type; } - + public function getUser() { return $this->user; } - + public function getPage() { return $this->title; } - + public function getPattern() { return $this->pattern; } + + public function getYear() { + return $this->mYear; + } + + public function getMonth() { + return $this->mMonth; + } + + public function getTagFilter() { + return $this->mTagFilter; + } } /** - * - * @addtogroup SpecialPage + * @deprecated + * @ingroup SpecialPage */ class LogReader { var $pager; /** - * @param WebRequest $request For internal use use a FauxRequest object to pass arbitrary parameters. + * @param $request WebRequest: for internal use use a FauxRequest object to pass arbitrary parameters. */ function __construct( $request ) { - global $wgUser; + global $wgUser, $wgOut; + wfDeprecated(__METHOD__); # Get parameters $type = $request->getVal( 'type' ); $user = $request->getText( 'user' ); $title = $request->getText( 'page' ); $pattern = $request->getBool( 'pattern' ); - - $loglist = new LogEventsList( $wgUser->getSkin() ); - $this->pager = new LogPager( $loglist, $type, $user, $title, $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 @@ -535,47 +737,49 @@ class LogReader { } /** - * - * @addtogroup SpecialPage + * @deprecated + * @ingroup SpecialPage */ class LogViewer { const NO_ACTION_LINK = 1; + /** - * @var LogReader $reader + * LogReader object */ var $reader; + /** - * @param LogReader &$reader where to get our data from - * @param integer $flags Bitwise combination of flags: + * @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 ) { global $wgUser; + wfDeprecated(__METHOD__); $this->reader =& $reader; $this->reader->pager->mLogEventsList->flags = $flags; # Aliases for shorter code... $this->pager =& $this->reader->pager; - $this->logEventsList =& $this->reader->pager->mLogEventsList; + $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->logEventsList->showHeader( $wgOut, $pager->getType() ); + $this->list->showHeader( $pager->getType() ); # Show form options - $this->logEventsList->showOptions( $wgOut, $this->pager->getType(), $this->pager->getUser(), - $this->pager->getPage(), $this->pager->getPattern() ); + $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->logEventsList->beginLogEventsList() . + $this->pager->getNavigationBar() . + $this->list->beginLogEventsList() . $logBody . - $this->logEventsList->endLogEventsList() . + $this->list->endLogEventsList() . $this->pager->getNavigationBar() ); } else { @@ -587,19 +791,18 @@ class LogViewer { * 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 OutputPage $out where to send output + * @param $out OutputPage: where to send output */ public function showList( &$out ) { $logBody = $this->pager->getBody(); if( $logBody ) { $out->addHTML( - $this->logEventsList->beginLogEventsList() . + $this->list->beginLogEventsList() . $logBody . - $this->logEventsList->endLogEventsList() + $this->list->endLogEventsList() ); } else { $out->addWikiMsg( 'logempty' ); } } } -