X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FLogEventsList.php;h=711dec24bde0715da18367d87f2917fba0e6fe60;hb=2a103ae8d7b6bcd04c57aedb2f307df75567d2e9;hp=dfe6fa6aeafa15bdb2c9275eac5ee1e05ffe1c32;hpb=666a5526948e91f77e8d5cedeb3f46258b415c8d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index dfe6fa6aea..711dec24bd 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -1,24 +1,31 @@
 <?php
-# Copyright (C) 2004 Brion Vibber <brion@pobox.com>, 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 <brion@pobox.com>, 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;
 
 	private $skin;
 	private $out;
@@ -39,8 +46,8 @@ class LogEventsList {
 		// Precache various messages
 		if( !isset( $this->message ) ) {
 			$messages = array( 'revertmerge', 'protect_change', 'unblocklink', 'change-blocklink',
-				'revertmove', 'undeletelink', 'undeleteviewlink', 'revdel-restore', 'rev-delundel', 'hist', 'diff',
-				'pipe-separator' );
+				'revertmove', 'undeletelink', 'undeleteviewlink', 'revdel-restore', 'hist', 'diff',
+				'pipe-separator', 'revdel-restore-deleted', 'revdel-restore-visible' );
 			foreach( $messages as $msg ) {
 				$this->message[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) );
 			}
@@ -64,6 +71,7 @@ class LogEventsList {
 
 	/**
 	 * Show options for the log list
+	 *
 	 * @param $types string or Array
 	 * @param $user String
 	 * @param $page String
@@ -77,54 +85,55 @@ class LogEventsList {
 		$month = '', $filter = null, $tagFilter='' )
 	{
 		global $wgScript, $wgMiserMode;
-		
+
 		$action = $wgScript;
 		$title = SpecialPage::getTitleFor( 'Log' );
 		$special = $title->getPrefixedDBkey();
-		
+
 		// For B/C, we take strings, but make sure they are converted...
 		$types = ($types === '') ? array() : (array)$types;
 
 		$tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter );
-		
+
 		$html = '';
 		$html .= Xml::hidden( 'title', $special );
-		
+
 		// Basic selectors
 		$html .= $this->getTypeMenu( $types ) . "\n";
 		$html .= $this->getUserInput( $user ) . "\n";
 		$html .= $this->getTitleInput( $page ) . "\n";
+		$html .= $this->getExtraInputs( $types ) . "\n";
 
 		// Title pattern, if allowed
 		if (!$wgMiserMode) {
 			$html .= $this->getTitlePattern( $pattern ) . "\n";
 		}
-		
+
 		// date menu
 		$html .= Xml::tags( 'p', null, Xml::dateMenu( $year, $month ) );
-		
+
 		// Tag filter
 		if ($tagSelector) {
-			$html .= Xml::tags( 'p', null, implode( '&nbsp;', $tagSelector ) );
+			$html .= Xml::tags( 'p', null, implode( '&#160;', $tagSelector ) );
 		}
-		
+
 		// Filter links
 		if ($filter) {
 			$html .= Xml::tags( 'p', null, $this->getFilterLinks( $filter ) );
 		}
-		
+
 		// Submit button
 		$html .= Xml::submitButton( wfMsg( 'allpagessubmit' ) );
-		
+
 		// Fieldset
 		$html = Xml::fieldset( wfMsg( 'log' ), $html );
-		
+
 		// Form wrapping
 		$html = Xml::tags( 'form', array( 'action' => $action, 'method' => 'get' ), $html );
 
 		$this->out->addHTML( $html );
 	}
-	
+
 	/**
 	 * @param $filter Array
 	 * @return String: Formatted HTML
@@ -159,7 +168,7 @@ class LogEventsList {
 		// Build links
 		return '<small>'.$wgLang->pipeList( $links ) . '</small>' . $hiddens;
 	}
-	
+
 	private function getDefaultQuery() {
 		if ( !isset( $this->mDefaultQuery ) ) {
 			$this->mDefaultQuery = $_GET;
@@ -189,16 +198,24 @@ class LogEventsList {
 		// First pass to load the log names
 		foreach( $validTypes as $type ) {
 			$text = LogPage::logName( $type );
-			$typesByName[$text] = $type;
+			$typesByName[$type] = $text;
 		}
 
 		// Second pass to sort by name
-		ksort($typesByName);
+		asort($typesByName);
 
 		// 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 $text => $type ) {
+		foreach( $typesByName as $type => $text ) {
 			$selected = ($type == $queryType);
 			// Restricted types
 			if ( isset($wgLogRestrictions[$type]) ) {
@@ -219,7 +236,9 @@ class LogEventsList {
 	 * @return String: Formatted HTML
 	 */
 	private function getUserInput( $user ) {
-		return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'mw-log-user', 15, $user );
+		return '<span style="white-space: nowrap">' .
+			Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'mw-log-user', 15, $user ) .
+			'</span>';
 	}
 
 	/**
@@ -227,7 +246,9 @@ class LogEventsList {
 	 * @return String: Formatted HTML
 	 */
 	private function getTitleInput( $title ) {
-		return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'mw-log-page', 20, $title );
+		return '<span style="white-space: nowrap">' .
+			Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'mw-log-page', 20, $title ) .
+			'</span>';
 	}
 
 	/**
@@ -239,6 +260,20 @@ class LogEventsList {
 			'</span>';
 	}
 
+	private function getExtraInputs( $types ) {
+		global $wgRequest;
+		$offender = $wgRequest->getVal('offender');
+		$user = User::newFromName( $offender, false );
+		if( !$user || ($user->getId() == 0 && !IP::isIPAddress($offender) ) ) {
+			$offender = ''; // Blank field if invalid
+		}
+		if( count($types) == 1 && $types[0] == 'suppress' ) {
+			return Xml::inputLabel( wfMsg('revdelete-offender'), 'offender',
+				'mw-log-offender', 20, $offender );
+		}
+		return '';
+	}
+
 	public function beginLogEventsList() {
 		return "<ul>\n";
 	}
@@ -252,35 +287,87 @@ 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 = '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
+		$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 ) {
+		if( self::isDeleted( $row, LogPage::DELETED_USER ) ) {
+			$userLinks = '<span class="history-deleted">' .
+				wfMsgHtml( 'rev-deleted-user' ) . '</span>';
 		} 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 = '<span class="history-deleted">' . wfMsgHtml('rev-deleted-comment') . '</span>';
+		return $userLinks;
+	}
+
+	private function logAction( $row, $title, $paramArray ) {
+		if( self::isDeleted( $row, LogPage::DELETED_ACTION ) ) {
+			$action = '<span class="history-deleted">' .
+				wfMsgHtml( 'rev-deleted-event' ) . '</span>';
 		} 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;
+		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 );
 		}
-		// 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]) ) {
+		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 '';
+		}
+		$revert = '';
+		if( self::typeAction( $row, 'move', 'move', 'move' ) && !empty( $paramArray[0] ) ) {
 			$destTitle = Title::newFromText( $paramArray[0] );
 			if( $destTitle ) {
 				$revert = '(' . $this->skin->link(
@@ -290,20 +377,19 @@ class LogEventsList {
 					array(
 						'wpOldTitle' => $destTitle->getPrefixedDBkey(),
 						'wpNewTitle' => $title->getPrefixedDBkey(),
-						'wpReason' => wfMsgForContent( 'revertmove' ),
+						'wpReason'   => wfMsgForContent( 'revertmove' ),
 						'wpMovetalk' => 0
 					),
 					array( 'known', 'noclasses' )
 				) . ')';
 			}
 		// Show undelete link
-		} else if( self::typeAction($row,array('delete','suppress'),'delete','deletedhistory') ) {
+		} 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,
@@ -312,7 +398,7 @@ class LogEventsList {
 				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' ),
@@ -335,7 +421,7 @@ class LogEventsList {
 				')';
 		// Show change protection link
 		} else if( self::typeAction( $row, 'protect', array( 'modify', 'protect', 'unprotect' ) ) ) {
-			$revert .= ' (' . 
+			$revert .= ' (' .
 				$this->skin->link( $title,
 					$this->message['hist'],
 					array(),
@@ -354,74 +440,24 @@ class LogEventsList {
 			}
 			$revert .= ')';
 		// Show unmerge link
-		} else if( self::typeAction($row,'merge','merge','mergehistory') ) {
-			$merge = SpecialPage::getTitleFor( 'Mergehistory' );
-			$revert = '(' .  $this->skin->link(
-				$merge,
+		} 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(), 
+					'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 ) {
-				// 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 ) );
-			}
+		} 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 CSV of the IDs
@@ -441,14 +477,15 @@ class LogEventsList {
 				) . ')';
 			}
 		// 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 = '';
@@ -458,26 +495,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 = '<span class="history-deleted">' . wfMsgHtml('rev-deleted-event') . '</span>';
-		} 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 = '<span class="mw-logevent-actionlink">' . $revert . '</span>';
 		}
-
-		$time = htmlspecialchars( $time );
-
-		return Xml::tags( 'li', array( "class" => implode( ' ', $classes ) ),
-			$del . $time . ' ' . $userLink . ' ' . $action . ' ' . $comment . ' ' . $revert . " $tagDisplay" ) . "\n";
+		return $revert;
 	}
 
 	/**
@@ -485,22 +506,31 @@ class LogEventsList {
 	 * @return string
 	 */
 	private function getShowHideLinks( $row ) {
-		// 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(),
-				'type' => 'logging',
-				'ids' => $row->log_id, 
-			);
-			$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;
 	}
@@ -510,14 +540,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 );
@@ -529,17 +559,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" );
+
+			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;
@@ -552,38 +598,83 @@ class LogEventsList {
 	 * @return Boolean
 	 */
 	public static function isDeleted( $row, $field ) {
-		return ($row->log_deleted & $field) == $field;
+		return ( $row->log_deleted & $field ) == $field;
 	}
 
 	/**
 	 * 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 Limit of items to show, default is 50
-	 * @param $conds Array
-	 * @param $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
-	 * @param $msgKey String if you want a nice box with a message, set this to the key of the message
+	 * @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 "<div ...>$1</div>").
+	 * - 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(), $showIfEmpty = true, $msgKey = '' ) {
+	public static function showLogExtract(
+		&$out, $types=array(), $page='', $user='', $param = array()
+	) {
 		global $wgUser, $wgOut;
-		# Insert list of top 50 or so items
-		$loglist = new LogEventsList( $wgUser->getSkin(), $wgOut, 0 );
+		$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 ) {
-			if ( $msgKey )
-				$s = '<div class="mw-warning-with-logexcerpt">' . wfMsg( $msgKey ) ;
+			if ( $msgKey[0] ) {
+				$s = '<div class="mw-warning-with-logexcerpt">';
+
+				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 = wfMsgExt( 'logempty', array('parse') );
+				$s = Html::rawElement( 'div', array( 'class' => 'mw-warning-logempty' ),
+					wfMsgExt( 'logempty', array( 'parseinline' ) ) );
 		}
 		if( $pager->getNumRows() > $pager->mLimit ) { # Show "Full log" link
 			$urlParam = array();
@@ -602,11 +693,16 @@ class LogEventsList {
 				array(),
 				$urlParam
 			);
-
 		}
-		if ( $logBody && $msgKey )
+		if ( $logBody && $msgKey[0] ) {
 			$s .= '</div>';
+		}
 
+		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 {
@@ -617,9 +713,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;
@@ -650,15 +747,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 = '' ) 
@@ -706,6 +805,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
 	 */
@@ -715,10 +815,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';
@@ -727,7 +830,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];
@@ -736,6 +838,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 ) {
@@ -756,7 +859,7 @@ class LogPager extends ReverseChronologicalPager {
 			global $wgUser;
 			$this->mConds['log_user'] = $userid;
 			// Paranoia: avoid brute force searches (bug 17342)
-			if( !$wgUser->isAllowed( 'deleterevision' ) ) {
+			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) .
@@ -769,6 +872,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
 	 */
@@ -776,11 +880,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
@@ -793,20 +899,18 @@ 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( 'deleterevision' ) ) {
-			$this->mConds[] = $this->mDb->bitAnd('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[] = $this->mDb->bitAnd('log_deleted', LogPage::SUPPRESSED_ACTION) .
+			$this->mConds[] = $db->bitAnd('log_deleted', LogPage::SUPPRESSED_ACTION) .
 				' != ' . LogPage::SUPPRESSED_ACTION;
 		}
 	}
@@ -814,23 +918,29 @@ class LogPager extends ReverseChronologicalPager {
 	public function getQueryInfo() {
 		$tables = array( 'logging', 'user' );
 		$this->mConds[] = 'user_id = log_user';
-		$groupBy = false;
+		$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 = array( 'log_search' => 'ls_field_val', 'logging' => 'PRIMARY' );
-			$groupBy = 'ls_log_id';
-		# Don't use the wrong logging index
+			$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 = array( 'logging' => array('page_time','user_time') );
-		} else if( $this->types ) {
-			$index = array( 'logging' => 'type_time' );
+			$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( 'logging' => 'times' );
+			$index['logging'] = 'times';
 		}
-		$options = array( 'USE INDEX' => $index );
+		$options['USE INDEX'] = $index;
 		# Don't show duplicate rows when using log_search
-		if( $groupBy ) $options['GROUP BY'] = $groupBy;
 		$info = array(
 			'tables'     => $tables,
 			'fields'     => array( 'log_type', 'log_action', 'log_user', 'log_namespace',
@@ -838,7 +948,7 @@ class LogPager extends ReverseChronologicalPager {
 				'log_timestamp', 'user_name', 'user_editcount' ),
 			'conds'      => $this->mConds,
 			'options'    => $options,
-			'join_conds' => array( 
+			'join_conds' => array(
 				'user' => array( 'INNER JOIN', 'user_id=log_user' ),
 				'log_search' => array( 'INNER JOIN', 'ls_log_id=log_id' )
 			)
@@ -846,7 +956,6 @@ class LogPager extends ReverseChronologicalPager {
 		# Add ChangeTags filter query
 		ChangeTags::modifyDisplayQuery( $info['tables'], $info['fields'], $info['conds'],
 			$info['join_conds'], $info['options'], $this->mTagFilter );
-
 		return $info;
 	}
 
@@ -859,7 +968,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 ) );
@@ -917,6 +1026,7 @@ class LogPager extends ReverseChronologicalPager {
  */
 class LogReader {
 	var $pager;
+
 	/**
 	 * @param $request WebRequest: for internal use use a FauxRequest object to pass arbitrary parameters.
 	 */
@@ -981,6 +1091,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
@@ -1005,6 +1116,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 ) {