X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FLogEventsList.php;h=29a54c6f314d927628b72d89acbfeb66a1c6ec6f;hb=c4a604a984f26bb2b044bf7d152bd7b9c535f97c;hp=28b0ea4f1a41bea61624c4d347d5ff84d7030073;hpb=7c7951f78fac944934a18bf34b1e12cd8ec3c850;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 28b0ea4f1a..29a54c6f31 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -24,7 +24,7 @@ class LogEventsList {
 	private $out;
 	public $flags;
 
-	function __construct( $skin, $out, $flags = 0 ) {
+	public function __construct( $skin, $out, $flags = 0 ) {
 		$this->skin = $skin;
 		$this->out = $out;
 		$this->flags = $flags;
@@ -38,74 +38,168 @@ class LogEventsList {
 	private function preCacheMessages() {
 		// Precache various messages
 		if( !isset( $this->message ) ) {
-			$messages = 'revertmerge protect_change unblocklink revertmove undeletelink revdel-restore rev-delundel hist';
-			foreach( explode(' ', $messages ) as $msg ) {
-				$this->message[$msg] = wfMsgExt( $msg, array( 'escape') );
+			$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( 'escapenoentities' ) );
 			}
 		}
 	}
 
 	/**
 	 * Set page title and show header for this log type
-	 * @param string $type
+	 * @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 string $type,
-	 * @param string $user,
-	 * @param string $page,
-	 * @param string $pattern
-	 * @param int $year
-	 * @parm int $month
+	 * @param $types string or Array
+	 * @param $user String
+	 * @param $page String
+	 * @param $pattern String
+	 * @param $year Integer: year
+	 * @param $month Integer: month
+	 * @param $filter: array
+	 * @param $tagFilter: array?
 	 */
-	public function showOptions( $type='', $user='', $page='', $pattern='', $year='', $month='' ) {
+	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() );
+		$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( ' ', $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( "<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" .
-			Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "</p>\n" .
-			"</fieldset></form>" );
+		$this->out->addHTML( $html );
+	}
+	
+	/**
+	 * @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);
+			$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 '<small>'.$wgLang->pipeList( $links ) . '</small>' . $hiddens;
+	}
+	
+	private function getDefaultQuery() {
+		if ( !isset( $this->mDefaultQuery ) ) {
+			$this->mDefaultQuery = $_GET;
+			unset( $this->mDefaultQuery['title'] );
+			unset( $this->mDefaultQuery['dir'] );
+			unset( $this->mDefaultQuery['offset'] );
+			unset( $this->mDefaultQuery['limit'] );
+			unset( $this->mDefaultQuery['order'] );
+			unset( $this->mDefaultQuery['month'] );
+			unset( $this->mDefaultQuery['year'] );
+		}
+		return $this->mDefaultQuery;
 	}
 
 	/**
-	 * @return string Formatted HTML
-	 * @param string $queryType
+	 * @param $queryTypes Array
+	 * @return String: Formatted HTML
 	 */
-	private function getTypeMenu( $queryType ) {
+	private function getTypeMenu( $queryTypes ) {
 		global $wgLogRestrictions, $wgUser;
 
 		$html = "<select name='type'>\n";
 
 		$validTypes = LogPage::validTypes();
-		$m = array(); // Temporary array
+		$typesByName = array(); // Temporary array
 
 		// First pass to load the log names
 		foreach( $validTypes as $type ) {
 			$text = LogPage::logName( $type );
-			$m[$text] = $type;
+			$typesByName[$text] = $type;
 		}
 
 		// Second pass to sort by name
-		ksort($m);
+		ksort($typesByName);
 
+		// Note the query type
+		$queryType = count($queryTypes) == 1 ? $queryTypes[0] : '';
 		// Third pass generates sorted XHTML content
-		foreach( $m as $text => $type ) {
+		foreach( $typesByName as $text => $type ) {
 			$selected = ($type == $queryType);
 			// Restricted types
 			if ( isset($wgLogRestrictions[$type]) ) {
@@ -122,50 +216,19 @@ class LogEventsList {
 	}
 
 	/**
-	 * @return string Formatted HTML
-	 * @param string $user
+	 * @param $user String
+	 * @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 );
 	}
 
 	/**
-	 * @return string Formatted HTML
-	 * @param string $title
+	 * @param $title String
+	 * @return String: Formatted HTML
 	 */
 	private function getTitleInput( $title ) {
-		return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'page', 20, $title );
-	}
-
-	/**
-	 * @return string Formatted HTML
-	 * @param int $year
-	 * @param int $month
-	 */
-	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 );
 	}
 
 	/**
@@ -176,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";
@@ -185,15 +257,15 @@ class LogEventsList {
 		return "</ul>\n";
 	}
 
-		/**
-	 * @param Row $row a single row from the result set
-	 * @return string Formatted HTML list item
-	 * @private
+	/**
+	 * @param $row Row: a single row from the result set
+	 * @return String: Formatted HTML list item
 	 */
 	public function logLine( $row ) {
 		global $wgLang, $wgUser, $wgContLang;
 
 		$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) ) {
@@ -212,121 +284,254 @@ class LogEventsList {
 		$paramArray = LogPage::extractParams( $row->log_params );
 		$revert = $del = '';
 		// Some user can hide log items and have review links
-		if( $wgUser->isAllowed( 'deleterevision' ) ) {
-			$del = $this->showhideLinks( $row ) . ' ';
+		if( !($this->flags & self::NO_ACTION_LINK) && $wgUser->isAllowed( 'deleterevision' ) ) {
+			$del = $this->getShowHideLinks( $row ) . ' ';
 		}
 		// 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') && !empty($paramArray[0]) && $wgUser->isAllowed( 'move' ) ) {
+		} 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') && $wgUser->isAllowed( 'delete' ) ) {
-			$revert = '(' . $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Undelete' ),
-				$this->message['undeletelink'], 'target='. urlencode( $title->getPrefixedDBkey() ) ) . ')';
-		// Show unblock link
-		} else if( self::typeAction($row,array('block','suppress'),'block') && $wgUser->isAllowed( 'block' ) ) {
-			$revert = '(' .  $this->skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Ipblocklist' ),
-				$this->message['unblocklink'],
-				'action=unblock&ip=' . urlencode( $row->log_title ) ) . ')';
+		} 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->message['unblocklink'],
+					array(),
+					array(
+						'action' => 'unblock',
+						'ip' => $row->log_title
+					),
+					'known'
+				) .
+				$this->message['pipe-separator'] .
+				$this->skin->link(
+					SpecialPage::getTitleFor( 'Blockip', $row->log_title ),
+					$this->message['change-blocklink'],
+					array(),
+					array(),
+					'known'
+				) .
+				')';
 		// Show change protection link
-		} else if( self::typeAction($row,'protect',array('modify','protect','unprotect')) ) {
-			$revert = '(' .  $this->skin->makeKnownLinkObj( $title, $this->message['hist'], 
-				'action=history&offset=' . urlencode($row->log_timestamp) ) . ')';
-			if( self::typeAction($row,'protect','modify') && $wgUser->isAllowed('protect') ) {
-				$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') ) {
+		} 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') && $wgUser->isAllowed( 'deleterevision' ) ) {
-			if( count($paramArray) == 2 ) {
-				$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+		} else if( self::typeAction($row,array('delete','suppress'),'revision','deleterevision') ) {
+			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') && $wgUser->isAllowed( 'deleterevision' ) ) {
-			if( count($paramArray) == 1 ) {
+		} else if( self::typeAction($row,array('delete','suppress'),'event','deleterevision') ) {
+			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') ) {
+			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' ) {
+				# Suppress $comment from old entries (before 2008-01-29),
+				# not needed and can contain incorrect links
+				$comment = '';
 			}
+		// Do nothing. The implementation is handled by the hook modifiying the passed-by-ref parameters.
 		} else {
 			wfRunHooks( 'LogLine', array( $row->log_type, $row->log_action, $title, $paramArray,
 				&$comment, &$revert, $row->log_timestamp ) );
-			// Do nothing. The implementation is handled by the hook modifiying the passed-by-ref parameters.
 		}
 		// 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 );
+			$action = LogPage::actionText( $row->log_type, $row->log_action, $title,
+				$this->skin, $paramArray, true );
 		}
 
-		return "<li>$del$time $userLink $action $comment $revert</li>\n";
+		// 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";
 	}
 
 	/**
-	 * @param Row $row
+	 * @param $row Row
 	 * @return string
 	 */
-	private function showhideLinks( $row ) {
-		$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+	private function getShowHideLinks( $row ) {
 		// 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;
 	}
 
 	/**
-	 * @param Row $row
-	 * @param mixed $type (string/array)
-	 * @param mixed $action (string/array)
+	 * @param $row Row
+	 * @param $type Mixed: string/array
+	 * @param $action Mixed: string/array
+	 * @param $right string
 	 * @return bool
 	 */
-	public static function typeAction( $row, $type, $action ) {
-		$match = is_array($type) ? in_array($row->log_type,$type) : $row->log_type == $type;
+	public static function typeAction( $row, $type, $action, $right='' ) {
+		$match = is_array($type) ?
+			in_array($row->log_type,$type) : $row->log_type == $type;
 		if( $match ) {
-			$match = is_array($action) ? in_array($row->log_action,$action) : $row->log_action == $action;
+			$match = is_array($action) ?
+				in_array($row->log_action,$action) : $row->log_action == $action;
+			if( $match && $right ) {
+				global $wgUser;
+				$match = $wgUser->isAllowed( $right );
+			}
 		}
 		return $match;
 	}
@@ -334,9 +539,9 @@ 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 int $field
-	 * @return bool
+	 * @param $row Row
+	 * @param $field Integer
+	 * @return Boolean
 	 */
 	public static function userCan( $row, $field ) {
 		if( ( $row->log_deleted & $field ) == $field ) {
@@ -352,58 +557,128 @@ class LogEventsList {
 	}
 
 	/**
-	 * @param Row $row
-	 * @param int $field one of DELETED_* bitfield constants
-	 * @return bool
+	 * @param $row Row
+	 * @param $field Integer: one of DELETED_* bitfield constants
+	 * @return Boolean
 	 */
 	public static function isDeleted( $row, $field ) {
 		return ($row->log_deleted & $field) == $field;
 	}
 
 	/**
-	 * Quick function to show a short log extract
-	 * @param OutputPage $out
-	 * @param string $type
-	 * @param string $page
-	 * @param string $user
+	 * 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 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'
+	 * @return Integer Number of total log items (not limited by $lim)
 	 */
-	public static function showLogExtract( $out, $type='', $page='', $user='', $limit = NULL ) {
-		global $wgUser;
-		# Insert list of top 50 or so items
-		$loglist = new LogEventsList( $wgUser->getSkin(), $out, 0 );
-		$pager = new LogPager( $loglist, $type, $user, $page, '' );
-		if( $limit ) $pager->mLimit = $limit;
+	public static function showLogExtract( &$out, $types=array(), $page='', $user='', 
+			$param = array() ) {
+
+		$defaultParameters = array(
+			'lim' => 0,
+			'conds' => array(),
+			'showIfEmpty' => true,
+			'msgKey' => array('')
+		);
+	
+		# The + operator appends elements of remaining keys from the right
+		# handed array to the left handed, whereas duplicated keys are NOT overwritten.
+		$param += $defaultParameters;
+
+		global $wgUser, $wgOut;
+		# Convert $param array to individual variables
+		$lim = $param['lim'];
+		$conds = $param['conds'];
+		$showIfEmpty = $param['showIfEmpty'];
+		$msgKey = $param['msgKey'];
+		if ( !is_array($msgKey) )
+			$msgKey = array( $msgKey );
+		# Insert list of top 50 (or top $lim) items
+		$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[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') );
+		}
+		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 .= '</div>';
+
+		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 Database $db
-	 * @returns mixed (string or false)
+	 * @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) ) {
-				$safetype = $db->strencode( $logtype );
-				$hiddenLogs[] = $safetype;
+		foreach( $wgLogRestrictions as $logType => $right ) {
+			if( $audience == 'public' || !$wgUser->isAllowed($right) ) {
+				$safeType = $db->strencode( $logType );
+				$hiddenLogs[] = $safeType;
 			}
 		}
 		if( count($hiddenLogs) == 1 ) {
 			return 'log_type != ' . $db->addQuotes( $hiddenLogs[0] );
-		} elseif( !empty( $hiddenLogs ) ) {
+		} elseif( $hiddenLogs ) {
 			return 'log_type NOT IN (' . $db->makeList($hiddenLogs) . ')';
 		}
 		return false;
@@ -414,67 +689,100 @@ 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 LogEventsList $loglist,
-	* @param string $type,
-	* @param string $user,
-	* @param string $page,
-	* @param string $pattern
-	* @param array $conds
-	*/
-	function __construct( $list, $type='', $user='', $title='', $pattern='', $conds=array(), $y=false, $m=false ) {
+	 * constructor
+	 * @param $list LogEventsList
+	 * @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
+	 */
+	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( $y, $m );
+		$this->getDateCond( $year, $month );
+		$this->mTagFilter = $tagFilter;
 	}
 
-	function getDefaultQuery() {
+	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( count($this->types) ) {
+			return $filters;
+		}
+		foreach( $wgFilterLogTypes as $type => $default ) {
+			// Avoid silly filtering
+			if( $type !== 'patrol' || $wgUser->useNPPatrol() ) {
+				$hide = $wgRequest->getInt( "hide_{$type}_log", $default );
+				$filters[$type] = $hide;
+				if( $hide )
+					$this->mConds[] = 'log_type != ' . $this->mDb->addQuotes( $type );
+			}
+		}
+		return $filters;
+	}
+
 	/**
 	 * Set the log reader to return only entries of the given type.
 	 * Type restrictions enforced here
-	 * @param string $type A log type ('upload', 'delete', etc)
-	 * @private
+	 * @param $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( empty($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;
 	}
 
 	/**
 	 * Set the log reader to return only entries by the given user.
-	 * @param string $name (In)valid user name
-	 * @private
+	 * @param $name String: (In)valid user name
 	 */
-	function limitUser( $name ) {
+	private function limitUser( $name ) {
 		if( $name == '' ) {
 			return false;
 		}
@@ -489,7 +797,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();
 		}
 	}
@@ -497,11 +813,11 @@ 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 string $page Title name as text
-	 * @private
+	 * @param $page String: Title name as text
+	 * @param $pattern String
 	 */
-	function limitTitle( $page, $pattern ) {
-		global $wgMiserMode;
+	private function limitTitle( $page, $pattern ) {
+		global $wgMiserMode, $wgUser;
 
 		$title = Title::newFromText( $page );
 		if( strlen($page) == 0 || !$title instanceof Title )
@@ -530,32 +846,59 @@ 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;
+		}
 	}
 
-	function getQueryInfo() {
+	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() {
 		return 'log_timestamp';
 	}
 
-	function getStartBody() {
+	public function getStartBody() {
 		wfProfileIn( __METHOD__ );
 		# Do a link batch query
 		if( $this->getNumRows() > 0 ) {
@@ -572,12 +915,12 @@ class LogPager extends ReverseChronologicalPager {
 		return '';
 	}
 
-	function formatRow( $row ) {
+	public function formatRow( $row ) {
 		return $this->mLogEventsList->logLine( $row );
 	}
 
 	public function getType() {
-		return $this->type;
+		return $this->types;
 	}
 
 	public function getUser() {
@@ -599,6 +942,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' );
+	}
 }
 
 /**
@@ -608,26 +962,28 @@ class LogPager extends ReverseChronologicalPager {
 class LogReader {
 	var $pager;
 	/**
-	 * @param WebRequest $request For internal use use a FauxRequest object to pass arbitrary parameters.
+	 * @param $request WebRequest: for internal use use a FauxRequest object to pass arbitrary parameters.
 	 */
 	function __construct( $request ) {
 		global $wgUser, $wgOut;
+		wfDeprecated(__METHOD__);
 		# Get parameters
 		$type = $request->getVal( 'type' );
 		$user = $request->getText( 'user' );
 		$title = $request->getText( 'page' );
 		$pattern = $request->getBool( 'pattern' );
-		$y = $request->getIntOrNull( 'year' );
-		$m = $request->getIntOrNull( 'month' );
+		$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 ) {
-			$y = '';
-			$m = '';
+			$year = '';
+			$month = '';
 		}
 		# Use new list class to output results
 		$loglist = new LogEventsList( $wgUser->getSkin(), $wgOut, 0 );
-		$this->pager = new LogPager( $loglist, $type, $user, $title, $pattern, $y, $m );
+		$this->pager = new LogPager( $loglist, $type, $user, $title, $pattern, $year, $month, $tagFilter );
 	}
 
 	/**
@@ -645,17 +1001,19 @@ class LogReader {
  */
 class LogViewer {
 	const NO_ACTION_LINK = 1;
+
 	/**
-	 * @var LogReader $reader
+	 * LogReader object
 	 */
 	var $reader;
+
 	/**
-	 * @param LogReader &$reader where to get our data from
-	 * @param integer $flags Bitwise combination of flags:
+	 * @param &$reader LogReader: where to get our data from
+	 * @param $flags Integer: Bitwise combination of flags:
 	 *     LogEventsList::NO_ACTION_LINK   Don't show restore/unblock/block links
 	 */
 	function __construct( &$reader, $flags = 0 ) {
-		global $wgUser;
+		wfDeprecated(__METHOD__);
 		$this->reader =& $reader;
 		$this->reader->pager->mLogEventsList->flags = $flags;
 		# Aliases for shorter code...
@@ -691,7 +1049,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 OutputPage $out where to send output
+	 * @param $out OutputPage: where to send output
 	 */
 	public function showList( &$out ) {
 		$logBody = $this->pager->getBody();