X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FLogEventsList.php;h=7c209f9a24c2221a9349f5bf4ec9cb23bdca9d4f;hb=89870efc549169eb6c2094e162027e92060e07d6;hp=aae44585ab26f359b4100d48f6af02f86e3c91bd;hpb=847a92ac9e034f5b394646f91c84f7a3c376e47f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index aae44585ab..7c209f9a24 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -38,72 +38,127 @@ class LogEventsList {
 	private function preCacheMessages() {
 		// Precache various messages
 		if( !isset( $this->message ) ) {
-			$messages = array('revertmerge','protect_change','unblocklink','change-blocklink',
-				'revertmove','undeletelink','revdel-restore','rev-delundel','hist');
+			$messages = array( 'revertmerge', 'protect_change', 'unblocklink', 'change-blocklink',
+				'revertmove', 'undeletelink', 'undeleteviewlink', 'revdel-restore', 'rev-delundel', 'hist', 'diff',
+				'pipe-separator' );
 			foreach( $messages as $msg ) {
-				$this->message[$msg] = wfMsgExt( $msg, array( 'escape') );
+				$this->message[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) );
 			}
 		}
 	}
 
 	/**
 	 * Set page title and show header for this log type
-	 * @param $type String
+	 * @param $type Array
 	 */
 	public function showHeader( $type ) {
-		if( LogPage::isLogType( $type ) ) {
-			$this->out->setPageTitle( LogPage::logName( $type ) );
-			$this->out->addHTML( LogPage::logHeader( $type ) );
+		// If only one log type is used, then show a special message...
+		$headerType = (count($type) == 1) ? $type[0] : '';
+		if( LogPage::isLogType( $headerType ) ) {
+			$this->out->setPageTitle( LogPage::logName( $headerType ) );
+			$this->out->addHTML( LogPage::logHeader( $headerType ) );
+		} else {
+			$this->out->addHTML( wfMsgExt('alllogstext',array('parseinline')) );
 		}
 	}
 
 	/**
 	 * Show options for the log list
-	 * @param $type String
+	 * @param $types string or Array
 	 * @param $user String
 	 * @param $page String
 	 * @param $pattern String
 	 * @param $year Integer: year
 	 * @param $month Integer: month
-	 * @param $filter Boolean
+	 * @param $filter: array
+	 * @param $tagFilter: array?
 	 */
-	public function showOptions( $type = '', $user = '', $page = '', $pattern = '', $year = '', 
-			$month = '', $filter = null ) 
+	public function showOptions( $types=array(), $user='', $page='', $pattern='', $year='', 
+		$month = '', $filter = null, $tagFilter='' )
 	{
 		global $wgScript, $wgMiserMode;
-		$action = htmlspecialchars( $wgScript );
+		
+		$action = $wgScript;
 		$title = SpecialPage::getTitleFor( 'Log' );
-		$special = htmlspecialchars( $title->getPrefixedDBkey() );
-
-		$this->out->addHTML( "<form action=\"$action\" method=\"get\"><fieldset>" .
-			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") : "" ) .
-			"<p>" . $this->getDateMenu( $year, $month ) . "\n" .
-			( $filter ? "</p><p>".$this->getFilterLinks( $type, $filter )."\n" : "" ) .
-			Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "</p>\n" .
-			"</fieldset></form>"
-		);
+		$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 ) );
+		}
+		
+		// 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 );
 	}
 	
-	private function getFilterLinks( $logType, $filter ) {
-		global $wgTitle;
+	/**
+	 * @param $filter Array
+	 * @return String: Formatted HTML
+	 */
+	private function getFilterLinks( $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 ) {
+			// Should the below assignment be outside the foreach?
+			// Then it would have to be copied. Not certain what is more expensive.
+			$query = $this->getDefaultQuery();
+			$queryKey = "hide_{$type}_log";
+
 			$hideVal = 1 - intval($val);
-			$link = $this->skin->makeKnownLinkObj( $wgTitle, $messages[$hideVal],
-				wfArrayToCGI( array( "hide_{$type}_log" => $hideVal ), $this->getDefaultQuery() )
+			$query[$queryKey] = $hideVal;
+
+			$link = $this->skin->link(
+				$wgTitle,
+				$messages[$hideVal],
+				array(),
+				$query,
+				array( 'known', 'noclasses' )
 			);
+
 			$links[$type] = wfMsgHtml( "log-show-hide-{$type}", $link );
+			$hiddens .= Xml::hidden( "hide_{$type}_log", $val ) . "\n";
 		}
 		// Build links
-		return implode( ' | ', $links );
+		return '<small>'.$wgLang->pipeList( $links ) . '</small>' . $hiddens;
 	}
 	
 	private function getDefaultQuery() {
@@ -121,10 +176,10 @@ class LogEventsList {
 	}
 
 	/**
-	 * @param $queryType String
+	 * @param $queryTypes Array
 	 * @return String: Formatted HTML
 	 */
-	private function getTypeMenu( $queryType ) {
+	private function getTypeMenu( $queryTypes ) {
 		global $wgLogRestrictions, $wgUser;
 
 		$html = "<select name='type'>\n";
@@ -141,6 +196,8 @@ class LogEventsList {
 		// Second pass to sort by name
 		ksort($typesByName);
 
+		// Note the query type
+		$queryType = count($queryTypes) == 1 ? $queryTypes[0] : '';
 		// Third pass generates sorted XHTML content
 		foreach( $typesByName as $text => $type ) {
 			$selected = ($type == $queryType);
@@ -163,7 +220,7 @@ class LogEventsList {
 	 * @return String: Formatted HTML
 	 */
 	private function getUserInput( $user ) {
-		return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'user', 15, $user );
+		return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'mw-log-user', 15, $user );
 	}
 
 	/**
@@ -171,38 +228,7 @@ class LogEventsList {
 	 * @return String: Formatted HTML
 	 */
 	private function getTitleInput( $title ) {
-		return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'page', 20, $title );
-	}
-
-	/**
-	 * @param $year Integer
-	 * @param $month Integer
-	 * @return string Formatted HTML
-	 */
-	private function getDateMenu( $year, $month ) {
-		# Offset overrides year/month selection
-		if( $month && $month !== -1 ) {
-			$encMonth = intval( $month );
-		} else {
-			$encMonth = '';
-		}
-		if ( $year ) {
-			$encYear = intval( $year );
-		} else if( $encMonth ) {
-			$thisMonth = intval( gmdate( 'n' ) );
-			$thisYear = intval( gmdate( 'Y' ) );
-			if( intval($encMonth) > $thisMonth ) {
-				$thisYear--;
-			}
-			$encYear = $thisYear;
-		} else {
-			$encYear = '';
-		}
-		return Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
-			Xml::input( 'year', 4, $encYear, array('id' => 'year', 'maxlength' => 4) ) .
-			' '.
-			Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
-			Xml::monthSelector( $encMonth, -1 );
+		return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'mw-log-page', 20, $title );
 	}
 
 	/**
@@ -213,6 +239,15 @@ class LogEventsList {
 			Xml::checkLabel( wfMsg( 'log-title-wildcard' ), 'pattern', 'pattern', $pattern ) .
 			'</span>';
 	}
+	
+	private function getExtraInputs( $types ) {
+		global $wgRequest;
+		if( count($types) == 1 && $types[0] == 'suppress' ) {
+			return Xml::inputLabel( wfMsg('revdelete-offender'), 'offender',
+				'mw-log-offender', 20, $wgRequest->getVal('offender') );
+		}
+		return '';
+	}
 
 	public function beginLogEventsList() {
 		return "<ul>\n";
@@ -230,6 +265,7 @@ class LogEventsList {
 		global $wgLang, $wgUser, $wgContLang;
 
 		$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 );
 		// User links
 		if( self::isDeleted($row,LogPage::DELETED_USER) ) {
@@ -248,7 +284,7 @@ class LogEventsList {
 		$paramArray = LogPage::extractParams( $row->log_params );
 		$revert = $del = '';
 		// Some user can hide log items and have review links
-		if( $wgUser->isAllowed( 'deleterevision' ) ) {
+		if( !($this->flags & self::NO_ACTION_LINK) && $wgUser->isAllowed( 'deleterevision' ) ) {
 			$del = $this->getShowHideLinks( $row ) . ' ';
 		}
 		// Add review links and such...
@@ -257,71 +293,162 @@ class LogEventsList {
 		} 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' ),
+				$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') ) {
 			$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' ) 
-				. ' ' . wfMsg( '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 .= ' (' .  $this->skin->makeKnownLinkObj( $title, $this->message['hist'], 
-				'action=history&offset=' . urlencode($row->log_timestamp) ) . ')';
-			if( $wgUser->isAllowed('protect') && $row->log_action != 'unprotect' ) {
-				$revert .= ' (' .  $this->skin->makeKnownLinkObj( $title, $this->message['protect_change'], 
-					'action=unprotect' ) . ')';
+		} 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] ) ) ) . ')';
+			$revert = '(' .  $this->skin->link(
+				$merge,
+				$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' );
+			if( count($paramArray) >= 2 ) {
 				// Different revision types use different URL params...
 				$key = $paramArray[0];
-				// Link to each hidden object ID, $paramArray[1] is the url param
+				// $paramArray[1] is a CSV of the IDs
 				$Ids = explode( ',', $paramArray[1] );
-				$revParams = '';
-				foreach( $Ids as $n => $id ) {
-					$revParams .= '&' . urlencode($key) . '[]=' . urlencode($id);
+				$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' )
+						);
+					}
 				}
-				$revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], 
-					'target=' . $title->getPrefixedUrl() . $revParams ) . ')';
+				// 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 ) );
 			}
 		// Hidden log items, give review link
 		} else if( self::typeAction($row,array('delete','suppress'),'event','deleterevision') ) {
-			if( count($paramArray) == 1 ) {
+			if( count($paramArray) >= 1 ) {
 				$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+				// $paramArray[1] is a CSV of the IDs
 				$Ids = explode( ',', $paramArray[0] );
+				$query = $paramArray[0];
 				// Link to each hidden object ID, $paramArray[1] is the url param
-				$logParams = '';
-				foreach( $Ids as $n => $id ) {
-					$logParams .= '&logid[]=' . intval($id);
-				}
-				$revert = '(' . $this->skin->makeKnownLinkObj( $revdel, $this->message['revdel-restore'], 
-					'target=' . $title->getPrefixedUrl() . $logParams ) . ')';
+				$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') ) {
@@ -349,11 +476,18 @@ class LogEventsList {
 				$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>';
 		}
 
-		return "<li>$del$time $userLink $action $comment $revert</li>\n";
+		$time = htmlspecialchars( $time );
+
+		return Xml::tags( 'li', array( "class" => implode( ' ', $classes ) ),
+			$del . $time . ' ' . $userLink . ' ' . $action . ' ' . $comment . ' ' . $revert . " $tagDisplay" ) . "\n";
 	}
 
 	/**
@@ -361,22 +495,24 @@ 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 = $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 = ''; // No one should be hiding from the oversight log
 		} else {
 			$target = SpecialPage::getTitleFor( 'Log', $row->log_type );
-			$del = $this->skin->makeKnownLinkObj( $revdel, $this->message['rev-delundel'],
-				'target=' . $target->getPrefixedUrl() . '&logid='.$row->log_id );
-			// Bolden oversighted content
-			if( self::isDeleted( $row, LogPage::DELETED_RESTRICTED ) )
-				$del = "<strong>$del</strong>";
+			$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 ) );
 		}
-		return "<tt>(<small>$del</small>)</tt>";
+		return $del;
 	}
 
 	/**
@@ -387,7 +523,8 @@ class LogEventsList {
 	 * @return bool
 	 */
 	public static function typeAction( $row, $type, $action, $right='' ) {
-		$match = is_array($type) ? in_array($row->log_type,$type) : $row->log_type == $type;
+		$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;
@@ -429,29 +566,62 @@ class LogEventsList {
 	}
 
 	/**
-	 * Quick function to show a short log extract
-	 * @param $out OutputPage
-	 * @param $type String
+	 * 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 $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
+	 * @return Integer Number of total log items (not limited by $lim)
 	 */
-	public static function showLogExtract( $out, $type='', $page='', $user='', $lim=0, $conds=array() ) {
-		global $wgUser;
+	public static function showLogExtract( &$out, $types=array(), $page='', $user='', $lim=0, $conds=array(), $showIfEmpty = true, $msgKey = '' ) {
+		global $wgUser, $wgOut;
 		# Insert list of top 50 or so items
-		$loglist = new LogEventsList( $wgUser->getSkin(), $out, 0 );
-		$pager = new LogPager( $loglist, $type, $user, $page, '', $conds );
+		$loglist = new LogEventsList( $wgUser->getSkin(), $wgOut, 0 );
+		$pager = new LogPager( $loglist, $types, $user, $page, '', $conds );
 		if( $lim > 0 ) $pager->mLimit = $lim;
 		$logBody = $pager->getBody();
+		$s = '';
 		if( $logBody ) {
-			$out->addHTML(
-				$loglist->beginLogEventsList() .
-				$logBody .
-				$loglist->endLogEventsList()
+			if ( $msgKey )
+				$s = '<div class="mw-warning-with-logexcerpt">' . wfMsgExt( $msgKey, array('parse') ) ;
+			$s .= $loglist->beginLogEventsList() .
+				 $logBody .
+				 $loglist->endLogEventsList();
+		} else {
+			if ( $showIfEmpty )
+				$s = wfMsgExt( 'logempty', array('parse') );
+		}
+		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 )
+			$s .= '</div>';
+
+		if( $out instanceof OutputPage ){
+			$out->addHTML( $s );
 		} else {
-			$out->addWikiMsg( 'logempty' );
+			$out = $s;
 		}
 		return $pager->getNumRows();
 	}
@@ -459,15 +629,16 @@ 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)
 	 */
-	public static function getExcludeClause( $db ) {
+	public static function getExcludeClause( $db, $audience = 'public' ) {
 		global $wgLogRestrictions, $wgUser;
 		// Reset the array, clears extra "where" clauses when $par is used
 		$hiddenLogs = array();
 		// Don't show private logs to unprivileged users
 		foreach( $wgLogRestrictions as $logType => $right ) {
-			if( !$wgUser->isAllowed($right) ) {
+			if( $audience == 'public' || !$wgUser->isAllowed($right) ) {
 				$safeType = $db->strencode( $logType );
 				$hiddenLogs[] = $safeType;
 			}
@@ -485,13 +656,14 @@ class LogEventsList {
  * @ingroup Pager
  */
 class LogPager extends ReverseChronologicalPager {
-	private $type = '', $user = '', $title = '', $pattern = '';
+	private $types = array(), $user = '', $title = '', $pattern = '';
+	private $typeCGI = '';
 	public $mLogEventsList;
 
 	/**
 	 * constructor
 	 * @param $list LogEventsList
-	 * @param $type String
+	 * @param $types String or Array
 	 * @param $user String
 	 * @param $title String
 	 * @param $pattern String
@@ -499,32 +671,35 @@ class LogPager extends ReverseChronologicalPager {
 	 * @param $year Integer
 	 * @param $month Integer
 	 */
-	public function __construct( $list, $type = '', $user = '', $title = '', $pattern = '', 
-		$conds = array(), $year = false, $month = false ) 
+	public function __construct( $list, $types = array(), $user = '', $title = '', $pattern = '',
+		$conds = array(), $year = false, $month = false, $tagFilter = '' ) 
 	{
 		parent::__construct();
 		$this->mConds = $conds;
 
 		$this->mLogEventsList = $list;
 
-		$this->limitType( $type );
+		$this->limitType( $types ); // 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['type'] = $this->typeCGI; // arrays won't work here
+		$query['user'] = $this->user;
 		$query['month'] = $this->mMonth;
 		$query['year'] = $this->mYear;
 		return $query;
 	}
 
+	// Call ONLY after calling $this->limitType() already!
 	public function getFilterParams() {
 		global $wgFilterLogTypes, $wgUser, $wgRequest;
 		$filters = array();
-		if( $this->type ) {
+		if( count($this->types) ) {
 			return $filters;
 		}
 		foreach( $wgFilterLogTypes as $type => $default ) {
@@ -542,24 +717,32 @@ class LogPager extends ReverseChronologicalPager {
 	/**
 	 * Set the log reader to return only entries of the given type.
 	 * Type restrictions enforced here
-	 * @param $type String: A log type ('upload', 'delete', etc)
+	 * @param $types String or array: Log types ('upload', 'delete', etc);
+	 *   empty string means no restriction
 	 */
-	private function limitType( $type ) {
+	private function limitType( $types ) {
 		global $wgLogRestrictions, $wgUser;
+		// If $types is not an array, make it an array
+		$types = ($types === '') ? array() : (array)$types;
 		// Don't even show header for private logs; don't recognize it...
-		if( isset($wgLogRestrictions[$type]) && !$wgUser->isAllowed($wgLogRestrictions[$type]) ) {
-			$type = '';
+		foreach ( $types as $type ) {
+			if( isset( $wgLogRestrictions[$type] ) && !$wgUser->isAllowed($wgLogRestrictions[$type]) ) {
+				$types = array_diff( $types, array( $type ) );
+			}
 		}
-		// Don't show private logs to unpriviledged users
-		$hideLogs = LogEventsList::getExcludeClause( $this->mDb );
+		// Don't show private logs to unprivileged users.
+		// Also, only show them upon specific request to avoid suprises.
+		$audience = $types ? 'user' : 'public';
+		$hideLogs = LogEventsList::getExcludeClause( $this->mDb, $audience );
 		if( $hideLogs !== false ) {
 			$this->mConds[] = $hideLogs;
 		}
-		if( !$type ) {
-			return false;
+		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];
 		}
-		$this->type = $type;
-		$this->mConds['log_type'] = $type;
 	}
 
 	/**
@@ -581,7 +764,15 @@ class LogPager extends ReverseChronologicalPager {
 			   but for now it won't pass anywhere behind the optimizer */
 			$this->mConds[] = "NULL";
 		} else {
+			global $wgUser;
 			$this->mConds['log_user'] = $userid;
+			// Paranoia: avoid brute force searches (bug 17342)
+			if( !$wgUser->isAllowed( 'deleterevision' ) ) {
+				$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();
 		}
 	}
@@ -593,7 +784,7 @@ class LogPager extends ReverseChronologicalPager {
 	 * @param $pattern String
 	 */
 	private function limitTitle( $page, $pattern ) {
-		global $wgMiserMode;
+		global $wgMiserMode, $wgUser;
 
 		$title = Title::newFromText( $page );
 		if( strlen($page) == 0 || !$title instanceof Title )
@@ -622,25 +813,52 @@ class LogPager extends ReverseChronologicalPager {
 			$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';
+		} else if( !$wgUser->isAllowed( 'suppressrevision' ) ) {
+			$this->mConds[] = $this->mDb->bitAnd('log_deleted', LogPage::SUPPRESSED_ACTION) .
+				' != ' . LogPage::SUPPRESSED_ACTION;
+		}
 	}
 
 	public function getQueryInfo() {
+		$tables = array( 'logging', 'user' );
 		$this->mConds[] = 'user_id = log_user';
+		$groupBy = false;
+		# 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
-		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 if( $this->title || $this->pattern || $this->user ) {
+			$index = array( 'logging' => array('page_time','user_time') );
+		} else if( $this->types ) {
+			$index = array( 'logging' => 'type_time' );
 		} else {
-			$index = array( 'USE INDEX' => array( 'logging' => 'times' ) );
-		}
-		return 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
+			$index = array( 'logging' => 'times' );
+		}
+		$options = array( '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',
+				'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;
 	}
 
 	function getIndexField() {
@@ -669,7 +887,7 @@ class LogPager extends ReverseChronologicalPager {
 	}
 
 	public function getType() {
-		return $this->type;
+		return $this->types;
 	}
 
 	public function getUser() {
@@ -691,6 +909,17 @@ class LogPager extends ReverseChronologicalPager {
 	public function getMonth() {
 		return $this->mMonth;
 	}
+
+	public function getTagFilter() {
+		return $this->mTagFilter;
+	}
+
+	public function doQuery() {
+		// Workaround MySQL optimizer bug
+		$this->mDb->setBigSelects();
+		parent::doQuery();
+		$this->mDb->setBigSelects( 'default' );
+	}
 }
 
 /**
@@ -704,7 +933,7 @@ class LogReader {
 	 */
 	function __construct( $request ) {
 		global $wgUser, $wgOut;
-		wfDeprecated(__FUNCTION__);
+		wfDeprecated(__METHOD__);
 		# Get parameters
 		$type = $request->getVal( 'type' );
 		$user = $request->getText( 'user' );
@@ -712,6 +941,7 @@ class LogReader {
 		$pattern = $request->getBool( 'pattern' );
 		$year = $request->getIntOrNull( 'year' );
 		$month = $request->getIntOrNull( 'month' );
+		$tagFilter = $request->getVal( 'tagfilter' );
 		# Don't let the user get stuck with a certain date
 		$skip = $request->getText( 'offset' ) || $request->getText( 'dir' ) == 'prev';
 		if( $skip ) {
@@ -720,7 +950,7 @@ class LogReader {
 		}
 		# 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 );
+		$this->pager = new LogPager( $loglist, $type, $user, $title, $pattern, $year, $month, $tagFilter );
 	}
 
 	/**
@@ -750,8 +980,7 @@ class LogViewer {
 	 *     LogEventsList::NO_ACTION_LINK   Don't show restore/unblock/block links
 	 */
 	function __construct( &$reader, $flags = 0 ) {
-		global $wgUser;
-		wfDeprecated(__FUNCTION__);
+		wfDeprecated(__METHOD__);
 		$this->reader =& $reader;
 		$this->reader->pager->mLogEventsList->flags = $flags;
 		# Aliases for shorter code...