\n";
}
@@ -211,68 +281,152 @@ class LogEventsList {
* @return String: Formatted HTML list item
*/
public function logLine( $row ) {
- global $wgLang, $wgUser, $wgContLang;
-
+ $classes = array( 'mw-logline-' . $row->log_type );
$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 );
+ // Log time
+ $time = $this->logTimestamp( $row );
// User links
- if( self::isDeleted($row,LogPage::DELETED_USER) ) {
- $userLink = '' . wfMsgHtml( 'rev-deleted-user' ) . '';
+ $userLink = $this->logUserLinks( $row );
+ // Extract extra parameters
+ $paramArray = LogPage::extractParams( $row->log_params );
+ // Event description
+ $action = $this->logAction( $row, $title, $paramArray );
+ // Log comment
+ $comment = $this->logComment( $row );
+ // Add review/revert links and such...
+ $revert = $this->logActionLinks( $row, $title, $paramArray, $comment );
+
+ // Some user can hide log items and have review links
+ $del = $this->getShowHideLinks( $row );
+ if( $del != '' ) $del .= ' ';
+
+ // Any tags...
+ list( $tagDisplay, $newClasses ) = ChangeTags::formatSummaryRow( $row->ts_tags, 'logevent' );
+ $classes = array_merge( $classes, $newClasses );
+
+ 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 );
+ return htmlspecialchars( $time );
+ }
+
+ private function logUserLinks( $row ) {
+ $userLinks = '';
+ if( self::isDeleted( $row, LogPage::DELETED_USER ) ) {
+ $userLinks = '' .
+ wfMsgHtml( 'rev-deleted-user' ) . '';
} else {
- $userLink = $this->skin->userLink( $row->log_user, $row->user_name ) .
- $this->skin->userToolLinks( $row->log_user, $row->user_name, true, 0, $row->user_editcount );
+ $userLinks = $this->skin->userLink( $row->log_user, $row->user_name );
+ // Talk|Contribs links...
+ if( !( $this->flags & self::NO_EXTRA_USER_LINKS ) ) {
+ $userLinks .= $this->skin->userToolLinks(
+ $row->log_user, $row->user_name, true, 0, $row->user_editcount );
+ }
}
- // Comment
- if( self::isDeleted($row,LogPage::DELETED_COMMENT) ) {
- $comment = '' . wfMsgHtml('rev-deleted-comment') . '';
+ return $userLinks;
+ }
+
+ private function logAction( $row, $title, $paramArray ) {
+ $action = '';
+ if( self::isDeleted( $row, LogPage::DELETED_ACTION ) ) {
+ $action = '' .
+ wfMsgHtml( 'rev-deleted-event' ) . '';
} else {
- $comment = $wgContLang->getDirMark() . $this->skin->commentBlock( $row->log_comment );
+ $action = LogPage::actionText(
+ $row->log_type, $row->log_action, $title, $this->skin, $paramArray, true );
}
- // Extract extra parameters
- $paramArray = LogPage::extractParams( $row->log_params );
- $revert = $del = '';
- // Some user can hide log items and have review links
- if( !($this->flags & self::NO_ACTION_LINK) && $wgUser->isAllowed( 'deleterevision' ) ) {
- $del = $this->getShowHideLinks( $row ) . ' ';
+ 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 );
+ }
+ return $comment;
+ }
+
+ // @TODO: split up!
+ private function logActionLinks( $row, $title, $paramArray, &$comment ) {
+ 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
+ {
+ return '';
}
- // Add review links and such...
- 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]) ) {
+ $revert = '';
+ if( self::typeAction( $row, 'move', 'move', 'move' ) && !empty( $paramArray[0] ) ) {
$destTitle = Title::newFromText( $paramArray[0] );
if( $destTitle ) {
- $revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ),
+ $revert = '(' . $this->skin->link(
+ SpecialPage::getTitleFor( 'Movepage' ),
$this->message['revertmove'],
- 'wpOldTitle=' . urlencode( $destTitle->getPrefixedDBkey() ) .
- '&wpNewTitle=' . urlencode( $title->getPrefixedDBkey() ) .
- '&wpReason=' . urlencode( wfMsgForContent( 'revertmove' ) ) .
- '&wpMovetalk=0' ) . ')';
+ array(),
+ array(
+ 'wpOldTitle' => $destTitle->getPrefixedDBkey(),
+ 'wpNewTitle' => $title->getPrefixedDBkey(),
+ 'wpReason' => wfMsgForContent( 'revertmove' ),
+ 'wpMovetalk' => 0
+ ),
+ array( 'known', 'noclasses' )
+ ) . ')';
}
// 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() ) ) . ')';
+ } else if( 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(
+ SpecialPage::getTitleFor( 'Undelete' ),
+ $viewdeleted,
+ array(),
+ array( 'target' => $title->getPrefixedDBkey() ),
+ array( 'known', 'noclasses' )
+ ) . ')';
// Show unblock/change block link
- } else if( self::typeAction($row,array('block','suppress'),array('block','reblock'),'block') ) {
+ } else if( self::typeAction( $row, array( 'block', 'suppress' ), array( 'block', 'reblock' ), 'block' ) ) {
$revert = '(' .
- $this->skin->link( SpecialPage::getTitleFor( 'Ipblocklist' ),
+ $this->skin->link(
+ SpecialPage::getTitleFor( 'Ipblocklist' ),
$this->message['unblocklink'],
array(),
- array( 'action' => 'unblock', 'ip' => $row->log_title ),
- 'known' )
- . $this->message['pipe-separator'] .
- $this->skin->link( SpecialPage::getTitleFor( 'Blockip', $row->log_title ),
+ 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' ) .
+ array(),
+ array(),
+ 'known'
+ ) .
')';
// Show change protection link
} else if( self::typeAction( $row, 'protect', array( 'modify', 'protect', 'unprotect' ) ) ) {
- $revert .= ' (' .
+ $revert .= ' (' .
$this->skin->link( $title,
$this->message['hist'],
array(),
- array( 'action' => 'history', 'offset' => $row->log_timestamp ) );
+ array(
+ 'action' => 'history',
+ 'offset' => $row->log_timestamp
+ )
+ );
if( $wgUser->isAllowed( 'protect' ) ) {
$revert .= $this->message['pipe-separator'] .
$this->skin->link( $title,
@@ -283,53 +437,52 @@ class LogEventsList {
}
$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] ) ) ) . ')';
+ } else if( self::typeAction( $row, 'merge', 'merge', 'mergehistory' ) ) {
+ $revert = '(' . $this->skin->link(
+ SpecialPage::getTitleFor( 'MergeHistory' ),
+ $this->message['revertmerge'],
+ array(),
+ array(
+ 'target' => $paramArray[0],
+ 'dest' => $title->getPrefixedDBkey(),
+ 'mergepoint' => $paramArray[1]
+ ),
+ 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','deleterevision') ) {
- if( count($paramArray) >= 2 ) {
- $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
- // Different revision types use different URL params...
- $key = $paramArray[0];
- // $paramArray[1] is a CVS of the IDs
- $Ids = explode( ',', $paramArray[1] );
- $query = urlencode($paramArray[1]);
- $revert = array();
- // Diff link for single rev deletions
- if( $key === 'oldid' && count($Ids) == 1 ) {
- $token = urlencode( $wgUser->editToken( intval($Ids[0]) ) );
- $revert[] = $this->skin->makeKnownLinkObj( $title, $this->message['diff'],
- 'diff='.intval($Ids[0])."&unhide=1&token=$token" );
- }
- // View/modify link...
- $revert[] = $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'],
- 'target='.$title->getPrefixedUrl()."&$key=$query" );
- // Pipe links
- $revert = '(' . implode(' | ',$revert) . ')';
- }
+ } else if( 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','deleterevision') ) {
+ } else if( self::typeAction( $row, array( 'delete', 'suppress' ), 'event', 'deletedhistory' ) ) {
if( count($paramArray) >= 1 ) {
$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
- // $paramArray[1] is a CVS of the IDs
+ // $paramArray[1] is a CSV of the IDs
$Ids = explode( ',', $paramArray[0] );
- $query = urlencode($paramArray[0]);
+ $query = $paramArray[0];
// Link to each hidden object ID, $paramArray[1] is the url param
- $revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'],
- 'target='.$title->getPrefixedUrl()."&logid=$query" ) . ')';
+ $revert = '(' . $this->skin->link(
+ $revdel,
+ $this->message['revdel-restore'],
+ array(),
+ array(
+ 'target' => $title->getPrefixedText(),
+ 'type' => 'logging',
+ 'ids' => $query
+ ),
+ array( 'known', 'noclasses' )
+ ) . ')';
}
// Self-created users
- } else if( self::typeAction($row,'newusers','create2') ) {
+ } else if( self::typeAction( $row, 'newusers', 'create2' ) ) {
if( isset( $paramArray[0] ) ) {
$revert = $this->skin->userToolLinks( $paramArray[0], $title->getDBkey(), true );
} else {
# Fall back to a blue contributions link
$revert = $this->skin->userToolLinks( 1, $title->getDBkey() );
}
- if( $time < '20080129000000' ) {
+ $ts = wfTimestamp( TS_UNIX, $row->log_timestamp );
+ if( $ts < '20080129000000' ) {
# Suppress $comment from old entries (before 2008-01-29),
# not needed and can contain incorrect links
$comment = '';
@@ -339,24 +492,10 @@ class LogEventsList {
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 );
- }
-
- // 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";
+ return $revert;
}
/**
@@ -364,20 +503,31 @@ class LogEventsList {
* @return string
*/
private function getShowHideLinks( $row ) {
- $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
- // If event was hidden from sysops
- if( !self::userCan( $row, LogPage::DELETED_RESTRICTED ) ) {
- $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ),
- '('.$this->message['rev-delundel'].')' );
- } else if( $row->log_type == 'suppress' ) {
- $del = ''; // No one should be hiding from the oversight log
- } else {
- $target = SpecialPage::getTitleFor( 'Log', $row->log_type );
- $page = Title::makeTitle( $row->log_namespace, $row->log_title );
- $query = array( 'target' => $target->getPrefixedDBkey(),
- 'logid' => $row->log_id, 'page' => $page->getPrefixedDBkey() );
- $del = $this->skin->revDeleteLink( $query,
- self::isDeleted( $row, LogPage::DELETED_RESTRICTED ) );
+ 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
+ {
+ return '';
+ }
+ $del = '';
+ // Don't show useless link to people who cannot hide revisions
+ if( $wgUser->isAllowed( 'deletedhistory' ) ) {
+ 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 );
+ } else {
+ $target = SpecialPage::getTitleFor( 'Log', $row->log_type );
+ $query = array(
+ 'target' => $target->getPrefixedDBkey(),
+ 'type' => 'logging',
+ 'ids' => $row->log_id,
+ );
+ $del = $this->skin->revDeleteLink( $query,
+ self::isDeleted( $row, LogPage::DELETED_RESTRICTED ), $canHide );
+ }
+ }
}
return $del;
}
@@ -387,14 +537,14 @@ 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) ?
- in_array($row->log_type,$type) : $row->log_type == $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;
+ $match = is_array( $action ) ?
+ in_array( $row->log_action, $action ) : $row->log_action == $action;
if( $match && $right ) {
global $wgUser;
$match = $wgUser->isAllowed( $right );
@@ -406,17 +556,33 @@ 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
*/
public static function userCan( $row, $field ) {
- if( ( $row->log_deleted & $field ) == $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
+ */
+ public static function userCanBitfield( $bitfield, $field ) {
+ if( $bitfield & $field ) {
global $wgUser;
- $permission = ( $row->log_deleted & LogPage::DELETED_RESTRICTED ) == LogPage::DELETED_RESTRICTED
- ? 'suppressrevision'
- : 'deleterevision';
- wfDebug( "Checking for $permission due to $field match on $row->log_deleted\n" );
+ $permission = '';
+ if ( $bitfield & LogPage::DELETED_RESTRICTED ) {
+ $permission = 'suppressrevision';
+ } else {
+ $permission = 'deletedhistory';
+ }
+ wfDebug( "Checking for $permission due to $field match on $bitfield\n" );
return $wgUser->isAllowed( $permission );
} else {
return true;
@@ -429,42 +595,125 @@ class LogEventsList {
* @return Boolean
*/
public static function isDeleted( $row, $field ) {
- return ($row->log_deleted & $field) == $field;
+ return ( $row->log_deleted & $field ) == $field;
}
/**
- * Quick function to show a short log extract
- * @param $out OutputPage
+ * 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 $types String or Array
- * @param $page String
- * @param $user String
- * @param $lim Integer
- * @param $conds Array
+ * @param $page String The page title to show log entries for
+ * @param $user String The user who made the log entries
+ * @param $param Associative Array with the following additional options:
+ * - lim Integer Limit of items to show, default is 50
+ * - conds Array Extra conditions for the query (e.g. "log_action != 'revision'")
+ * - showIfEmpty boolean Set to false if you don't want any output in case the loglist is empty
+ * if set to true (default), "No matching items in log" is displayed if loglist is empty
+ * - msgKey Array If you want a nice box with a message, set this to the key of the message.
+ * First element is the message key, additional optional elements are parameters for the key
+ * that are processed with wgMsgExt and option 'parse'
+ * - offset Set to overwrite offset parameter in $wgRequest
+ * set to '' to unset offset
+ * - wrap String Wrap the message in html (usually something like "$1
").
+ * - flags Integer display flags (NO_ACTION_LINK,NO_EXTRA_USER_LINKS)
+ * @return Integer Number of total log items (not limited by $lim)
*/
- public static function showLogExtract( $out, $types=array(), $page='', $user='', $lim=0, $conds=array() ) {
- global $wgUser;
- # Insert list of top 50 or so items
- $loglist = new LogEventsList( $wgUser->getSkin(), $out, 0 );
+ public static function showLogExtract(
+ &$out, $types=array(), $page='', $user='', $param = array()
+ ) {
+ global $wgUser, $wgOut;
+ $defaultParameters = array(
+ 'lim' => 25,
+ 'conds' => array(),
+ 'showIfEmpty' => true,
+ 'msgKey' => array(''),
+ 'wrap' => "$1",
+ 'flags' => 0
+ );
+ # The + operator appends elements of remaining keys from the right
+ # handed array to the left handed, whereas duplicated keys are NOT overwritten.
+ $param += $defaultParameters;
+ # Convert $param array to individual variables
+ $lim = $param['lim'];
+ $conds = $param['conds'];
+ $showIfEmpty = $param['showIfEmpty'];
+ $msgKey = $param['msgKey'];
+ $wrap = $param['wrap'];
+ $flags = $param['flags'];
+ if ( !is_array( $msgKey ) ) {
+ $msgKey = array( $msgKey );
+ }
+ # Insert list of top 50 (or top $lim) items
+ $loglist = new LogEventsList( $wgUser->getSkin(), $wgOut, $flags );
$pager = new LogPager( $loglist, $types, $user, $page, '', $conds );
+ if ( isset( $param['offset'] ) ) { # Tell pager to ignore $wgRequest offset
+ $pager->setOffset( $param['offset'] );
+ }
if( $lim > 0 ) $pager->mLimit = $lim;
$logBody = $pager->getBody();
+ $s = '';
if( $logBody ) {
- $out->addHTML(
- $loglist->beginLogEventsList() .
- $logBody .
- $loglist->endLogEventsList()
+ if ( $msgKey[0] ) {
+ $s = '';
+
+ if ( count( $msgKey ) == 1 ) {
+ $s .= wfMsgExt( $msgKey[0], array( 'parse' ) );
+ } else { // Process additional arguments
+ $args = $msgKey;
+ array_shift( $args );
+ $s .= wfMsgExt( $msgKey[0], array( 'parse' ), $args );
+ }
+ }
+ $s .= $loglist->beginLogEventsList() .
+ $logBody .
+ $loglist->endLogEventsList();
+ } else {
+ if ( $showIfEmpty )
+ $s = Html::rawElement( 'div', array( 'class' => 'mw-warning-logempty' ),
+ wfMsgExt( 'logempty', array( 'parseinline' ) ) );
+ }
+ if( $pager->getNumRows() > $pager->mLimit ) { # Show "Full log" link
+ $urlParam = array();
+ if ( $page != '')
+ $urlParam['page'] = $page;
+ if ( $user != '')
+ $urlParam['user'] = $user;
+ if ( !is_array( $types ) ) # Make it an array, if it isn't
+ $types = array( $types );
+ # 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(
+ SpecialPage::getTitleFor( 'Log' ),
+ wfMsgHtml( 'log-fulllog' ),
+ array(),
+ $urlParam
);
+ }
+ if ( $logBody && $msgKey[0] ) {
+ $s .= '
';
+ }
+
+ if ( $wrap!='' ) { // Wrap message in html
+ $s = str_replace( '$1', $s, $wrap );
+ }
+
+ // $out can be either an OutputPage object or a String-by-reference
+ if( $out instanceof OutputPage ){
+ $out->addHTML( $s );
} else {
- $out->addWikiMsg( 'logempty' );
+ $out = $s;
}
return $pager->getNumRows();
}
/**
* 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;
@@ -495,15 +744,17 @@ class LogPager extends ReverseChronologicalPager {
public $mLogEventsList;
/**
- * constructor
+ * Constructor
+ *
* @param $list LogEventsList
- * @param $types String or Array
- * @param $user String
- * @param $title String
- * @param $pattern String
- * @param $conds Array
- * @param $year Integer
- * @param $month Integer
+ * @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 = '' )
@@ -551,7 +802,9 @@ 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)
+ *
+ * @param $types String or array: Log types ('upload', 'delete', etc);
+ * empty string means no restriction
*/
private function limitType( $types ) {
global $wgLogRestrictions, $wgUser;
@@ -559,10 +812,13 @@ class LogPager extends ReverseChronologicalPager {
$types = ($types === '') ? array() : (array)$types;
// Don't even show header for private logs; don't recognize it...
foreach ( $types as $type ) {
- if( isset( $wgLogRestrictions[$type] ) && !$wgUser->isAllowed($wgLogRestrictions[$type]) ) {
+ if( isset( $wgLogRestrictions[$type] )
+ && !$wgUser->isAllowed($wgLogRestrictions[$type])
+ ) {
$types = array_diff( $types, array( $type ) );
}
}
+ $this->types = $types;
// Don't show private logs to unprivileged users.
// Also, only show them upon specific request to avoid suprises.
$audience = $types ? 'user' : 'public';
@@ -571,7 +827,6 @@ class LogPager extends ReverseChronologicalPager {
$this->mConds[] = $hideLogs;
}
if( count($types) ) {
- $this->types = $types;
$this->mConds['log_type'] = $types;
// Set typeCGI; used in url param for paging
if( count($types) == 1 ) $this->typeCGI = $types[0];
@@ -580,6 +835,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 ) {
@@ -600,8 +856,11 @@ class LogPager extends ReverseChronologicalPager {
global $wgUser;
$this->mConds['log_user'] = $userid;
// Paranoia: avoid brute force searches (bug 17342)
- if( !$wgUser->isAllowed( 'suppressrevision' ) ) {
- $this->mConds[] = 'log_deleted & ' . LogPage::DELETED_USER . ' = 0';
+ if( !$wgUser->isAllowed( 'deletedhistory' ) ) {
+ $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::DELETED_USER) . ' = 0';
+ } else if( !$wgUser->isAllowed( 'suppressrevision' ) ) {
+ $this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::SUPPRESSED_USER) .
+ ' != ' . LogPage::SUPPRESSED_USER;
}
$this->user = $usertitle->getText();
}
@@ -610,6 +869,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
*/
@@ -617,11 +877,13 @@ 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();
+ $db = $this->mDb;
+
# 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
@@ -634,43 +896,63 @@ class LogPager extends ReverseChronologicalPager {
# 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->mConds[] = 'log_title ' . $db->buildLike( $title->getDBkey(), $db->anyString() );
$this->pattern = $pattern;
} else {
$this->mConds['log_namespace'] = $ns;
$this->mConds['log_title'] = $title->getDBkey();
}
// Paranoia: avoid brute force searches (bug 17342)
- if( !$wgUser->isAllowed( 'suppressrevision' ) ) {
- $this->mConds[] = 'log_deleted & ' . LogPage::DELETED_ACTION . ' = 0';
+ if( !$wgUser->isAllowed( 'deletedhistory' ) ) {
+ $this->mConds[] = $db->bitAnd('log_deleted', LogPage::DELETED_ACTION) . ' = 0';
+ } else if( !$wgUser->isAllowed( 'suppressrevision' ) ) {
+ $this->mConds[] = $db->bitAnd('log_deleted', LogPage::SUPPRESSED_ACTION) .
+ ' != ' . LogPage::SUPPRESSED_ACTION;
}
}
public function getQueryInfo() {
+ $tables = array( 'logging', 'user' );
$this->mConds[] = 'user_id = log_user';
- # 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->types ) {
- $index = array( 'USE INDEX' => array( 'logging' => 'type_time' ) );
+ $index = array();
+ $options = array();
+ # Add log_search table if there are conditions on it
+ if( array_key_exists('ls_field',$this->mConds) ) {
+ $tables[] = 'log_search';
+ $index['log_search'] = 'ls_field_val';
+ $index['logging'] = 'PRIMARY';
+ $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 ) {
+ $index['logging'] = array( 'page_time', 'user_time' );
+ if( count($this->types) == 1 ) {
+ $index['logging'][] = 'log_user_type_time';
+ }
+ } else if( count($this->types) == 1 ) {
+ $index['logging'] = 'type_time';
} else {
- $index = array( 'USE INDEX' => array( 'logging' => 'times' ) );
+ $index['logging'] = 'times';
}
+ $options['USE INDEX'] = $index;
+ # Don't show duplicate rows when using log_search
$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', 'user_editcount' ),
- 'conds' => $this->mConds,
- 'options' => $index,
- 'join_conds' => array( 'user' => array( 'INNER JOIN', 'user_id=log_user' ) ),
+ 'tables' => $tables,
+ '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' => $options,
+ 'join_conds' => array(
+ 'user' => array( 'INNER JOIN', 'user_id=log_user' ),
+ 'log_search' => array( 'INNER JOIN', 'ls_log_id=log_id' )
+ )
);
-
+ # Add ChangeTags filter query
ChangeTags::modifyDisplayQuery( $info['tables'], $info['fields'], $info['conds'],
$info['join_conds'], $info['options'], $this->mTagFilter );
-
return $info;
}
@@ -728,14 +1010,10 @@ class LogPager extends ReverseChronologicalPager {
}
public function doQuery() {
- // Work around MySQL optimizer bug
- if ( in_array( get_class( $this->mDb ), array( 'Database', 'DatabaseMysql' ) ) ) {
- $this->mDb->query( 'SET SQL_BIG_SELECTS=1' );
- parent::doQuery();
- $this->mDb->query( 'SET SQL_BIG_SELECTS=0' );
- } else {
- parent::doQuery();
- }
+ // Workaround MySQL optimizer bug
+ $this->mDb->setBigSelects();
+ parent::doQuery();
+ $this->mDb->setBigSelects( 'default' );
}
}
@@ -745,6 +1023,7 @@ class LogPager extends ReverseChronologicalPager {
*/
class LogReader {
var $pager;
+
/**
* @param $request WebRequest: for internal use use a FauxRequest object to pass arbitrary parameters.
*/
@@ -809,6 +1088,7 @@ class LogViewer {
* 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( $pager->getType() );
# Show form options
@@ -833,6 +1113,7 @@ 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 $out OutputPage: where to send output
*/
public function showList( &$out ) {