X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FHistoryPage.php;h=27c115339536e613145f954a772298c19ffcca45;hb=b29514b0b3f71e4794e8d9810b20911f3ff420db;hp=ebbc4003349f573ba79c3dd1a2f6dbc2dac50aa3;hpb=a6b30d6b82fa997dacfdd54b109b39b80bf5e22d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/HistoryPage.php b/includes/HistoryPage.php
index ebbc400334..27c1153395 100644
--- a/includes/HistoryPage.php
+++ b/includes/HistoryPage.php
@@ -24,8 +24,7 @@ class HistoryPage {
 	/**
 	 * Construct a new HistoryPage.
 	 *
-	 * @param Article $article
-	 * @returns nothing
+	 * @param $article Article
 	 */
 	function __construct( $article ) {
 		global $wgUser;
@@ -59,8 +58,7 @@ class HistoryPage {
 
 	/**
 	 * Print the history page for an article.
-	 *
-	 * @returns nothing
+	 * @return nothing
 	 */
 	function history() {
 		global $wgOut, $wgRequest, $wgScript;
@@ -83,7 +81,7 @@ class HistoryPage {
 		$wgOut->setRobotPolicy( 'noindex,nofollow' );
 		$wgOut->setSyndicated( true );
 		$wgOut->setFeedAppendQuery( 'action=history' );
-		$wgOut->addScriptFile( 'history.js' );
+		$wgOut->addModules( array( 'mediawiki.legacy.history' ) );
 
 		$logPage = SpecialPage::getTitleFor( 'Log' );
 		$logLink = $this->skin->link(
@@ -131,18 +129,14 @@ class HistoryPage {
 		$tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter );
 		/**
 		 * Option to show only revisions that have been (partially) hidden via RevisionDelete
-		 * Note that this can run a *long* time if there are many revisions to look at.
-		 * We use "isBigDeletion" to determine if the history is too big to go through.
-		 * Additionally, only users with 'deleterevision' right can filter for deleted edits.
 		 */
-		if ( $this->title->userCan( 'deleterevision' ) && ( !$this->article->isBigDeletion() || $this->title->userCan( 'bigdelete' ) ) ) {
-			$conds = ( $wgRequest->getBool( 'deleted' ) ) ? array("rev_deleted != '0'") : array();
-			$checkDeleted = Xml::checkLabel( wfMsg( 'history-show-deleted' ), 'deleted', '', $wgRequest->getBool( 'deleted' ) ) . "\n";
-		}
-		else { # Don't filter and don't add the checkbox for filtering
+		if ( $wgRequest->getBool( 'deleted' ) ) {
+			$conds = array("rev_deleted != '0'");
+		} else {
 			$conds = array();
-			$checkDeleted = '';
 		}
+		$checkDeleted = Xml::checkLabel( wfMsg( 'history-show-deleted' ),
+			'deleted', 'mw-show-deleted-only', $wgRequest->getBool( 'deleted' ) ) . "\n";
 
 		$action = htmlspecialchars( $wgScript );
 		$wgOut->addHTML(
@@ -154,8 +148,8 @@ class HistoryPage {
 			) .
 			Xml::hidden( 'title', $this->title->getPrefixedDBKey() ) . "\n" .
 			Xml::hidden( 'action', 'history' ) . "\n" .
-			Xml::dateMenu( $year, $month ) . ' ' .
-			( $tagSelector ? ( implode( ' ', $tagSelector ) . ' ' ) : '' ) .
+			Xml::dateMenu( $year, $month ) . ' ' .
+			( $tagSelector ? ( implode( ' ', $tagSelector ) . ' ' ) : '' ) .
 			$checkDeleted .
 			Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
 			'</fieldset></form>'
@@ -180,8 +174,13 @@ class HistoryPage {
 	 * Fetch an array of revisions, specified by a given limit, offset and
 	 * direction. This is now only used by the feeds. It was previously
 	 * used by the main UI but that's now handled by the pager.
+	 *
+	 * @param $limit Integer: the limit number of revisions to get
+	 * @param $offset Integer
+	 * @param $direction Integer: either HistoryPage::DIR_PREV or HistoryPage::DIR_NEXT
+	 * @return ResultWrapper
 	 */
-	function fetchRevisions($limit, $offset, $direction) {
+	function fetchRevisions( $limit, $offset, $direction ) {
 		$dbr = wfGetDB( DB_SLAVE );
 
 		if( $direction == HistoryPage::DIR_PREV )
@@ -207,7 +206,8 @@ class HistoryPage {
 
 	/**
 	 * Output a subscription feed listing recent edits to this page.
-	 * @param string $type
+	 *
+	 * @param $type String: feed type
 	 */
 	function feed( $type ) {
 		global $wgFeedClasses, $wgRequest, $wgFeedLimit;
@@ -258,7 +258,7 @@ class HistoryPage {
 	 * Borrows Recent Changes' feed generation functions for formatting;
 	 * includes a diff to the previous revision (if any).
 	 *
-	 * @param $row
+	 * @param $row Object: database row
 	 * @return FeedItem
 	 */
 	function feedItem( $row ) {
@@ -316,11 +316,21 @@ class HistoryPager extends ReverseChronologicalPager {
 		return $this->historyPage->getArticle();
 	}
 
+	function getSqlComment() {
+		if ( $this->conds ) {
+			return 'history page filtered'; // potentially slow, see CR r58153
+		} else {
+			return 'history page unfiltered';
+		}
+	}
+
 	function getQueryInfo() {
 		$queryInfo = array(
 			'tables'  => array('revision'),
-			'fields'  => array_merge( Revision::selectFields()),
-			'conds'   => array_merge( array('rev_page' => $this->historyPage->title->getArticleID() ), $this->conds ),
+			'fields'  => Revision::selectFields(),
+			'conds'   => array_merge(
+				array( 'rev_page' => $this->historyPage->title->getArticleID() ),
+				$this->conds ),
 			'options' => array( 'USE INDEX' => array('revision' => 'page_timestamp') ),
 			'join_conds' => array( 'tag_summary' => array( 'LEFT JOIN', 'ts_rev_id=rev_id' ) ),
 		);
@@ -364,17 +374,25 @@ class HistoryPager extends ReverseChronologicalPager {
 		$this->counter = 1;
 		$this->oldIdChecked = 0;
 
-		$wgOut->wrapWikiMsg( "<div class='mw-history-legend'>\n$1</div>", 'histlegend' );
-		$s = Xml::openElement( 'form', array( 'action' => $wgScript,
+		$wgOut->wrapWikiMsg( "<div class='mw-history-legend'>\n$1\n</div>", 'histlegend' );
+		$s = Html::openElement( 'form', array( 'action' => $wgScript,
 			'id' => 'mw-history-compare' ) ) . "\n";
-		$s .= Xml::hidden( 'title', $this->title->getPrefixedDbKey() ) . "\n";
-		$s .= Xml::hidden( 'action', 'historysubmit' ) . "\n";
+		$s .= Html::hidden( 'title', $this->title->getPrefixedDbKey() ) . "\n";
+		$s .= Html::hidden( 'action', 'historysubmit' ) . "\n";
 
+		$s .= '<div>' . $this->submitButton( wfMsg( 'compareselectedversions'),
+			array( 'class' => 'historysubmit' ) ) . "\n";
+		
 		$this->buttons = '<div>';
+		$this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions'),
+			array( 'class' => 'historysubmit' )
+				+ $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'compareselectedversions' )
+		) . "\n";
+		
 		if( $wgUser->isAllowed('deleterevision') ) {
 			$float = $wgContLang->alignEnd();
 			# Note bug #20966, <button> is non-standard in IE<8
-			$this->buttons .= Xml::element( 'button',
+			$element = Html::element( 'button',
 				array(
 					'type' => 'submit',
 					'name' => 'revisiondelete',
@@ -384,16 +402,27 @@ class HistoryPager extends ReverseChronologicalPager {
 				),
 				wfMsg( 'showhideselectedversions' )
 			) . "\n";
+			$s .= $element;
+			$this->buttons .= $element;
+		}
+		if( $wgUser->isAllowed( 'revisionmove' ) ) {
+			$float = $wgContLang->alignEnd();
+			# Note bug #20966, <button> is non-standard in IE<8
+			$element = Html::element( 'button',
+				array(
+					'type' => 'submit',
+					'name' => 'revisionmove',
+					'value' => '1',
+					'style' => "float: $float;",
+					'class' => 'mw-history-revisionmove-button',
+				),
+				wfMsg( 'revisionmoveselectedversions' )
+			) . "\n";
+			$s .= $element;
+			$this->buttons .= $element;
 		}
-		$this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions'),
-			array(
-				'class'     => 'historysubmit',
-				'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
-				'title'     => wfMsg( 'tooltip-compareselectedversions' ),
-			)
-		) . "\n";
 		$this->buttons .= '</div>';
-		$s .= $this->buttons . '<ul id="pagehistory">' . "\n";
+		$s .= '</div><ul id="pagehistory">' . "\n";
 		return $s;
 	}
 
@@ -429,10 +458,11 @@ class HistoryPager extends ReverseChronologicalPager {
 	/**
 	 * Creates a submit button
 	 *
-	 * @param array $attributes attributes
-	 * @return string HTML output for the submit button
+	 * @param $message String: text of the submit button, will be escaped
+	 * @param $attributes Array: attributes
+	 * @return String: HTML output for the submit button
 	 */
-	function submitButton($message, $attributes = array() ) {
+	function submitButton( $message, $attributes = array() ) {
 		# Disable submit button if history has 1 revision only
 		if( $this->getNumRows() > 1 ) {
 			return Xml::submitButton( $message , $attributes );
@@ -446,13 +476,13 @@ class HistoryPager extends ReverseChronologicalPager {
 	 *
 	 * @todo document some more, and maybe clean up the code (some params redundant?)
 	 *
-	 * @param Row $row The database row corresponding to the previous line.
-	 * @param mixed $next The database row corresponding to the next line.
-	 * @param int $counter Apparently a counter of what row number we're at, counted from the top row = 1.
+	 * @param $row Object: the database row corresponding to the previous line.
+	 * @param $next Mixed: the database row corresponding to the next line.
+	 * @param $counter Integer: apparently a counter of what row number we're at, counted from the top row = 1.
 	 * @param $notificationtimestamp
-	 * @param bool $latest Whether this row corresponds to the page's latest revision.
-	 * @param bool $firstInList Whether this row corresponds to the first displayed on this history page.
-	 * @return string HTML output for the row
+	 * @param $latest Boolean: whether this row corresponds to the page's latest revision.
+	 * @param $firstInList Boolean: whether this row corresponds to the first displayed on this history page.
+	 * @return String: HTML output for the row
 	 */
 	function historyLine( $row, $next, $counter = '', $notificationtimestamp = false,
 		$latest = false, $firstInList = false )
@@ -475,14 +505,16 @@ class HistoryPager extends ReverseChronologicalPager {
 		$classes = array();
 
 		$del = '';
-		// User can delete revisions...
-		if( $wgUser->isAllowed( 'deleterevision' ) ) {
+		// Show checkboxes for each revision
+		if( $wgUser->isAllowed( 'deleterevision' ) || $wgUser->isAllowed( 'revisionmove' ) ) {
 			// If revision was hidden from sysops, disable the checkbox
-			if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
+			// However, if the user has revisionmove rights, we cannot disable the checkbox
+			if( !$rev->userCan( Revision::DELETED_RESTRICTED ) && !$wgUser->isAllowed( 'revisionmove' ) ) {
 				$del = Xml::check( 'deleterevisions', false, array( 'disabled' => 'disabled' ) );
 			// Otherwise, enable the checkbox...
 			} else {
-				$del = Xml::check( 'showhiderevisions', false, array( 'name' => 'ids['.$rev->getId().']' ) );
+				$del = Xml::check( 'showhiderevisions', false,
+					array( 'name' => 'ids['.$rev->getId().']' ) );
 			}
 		// User can only view deleted revisions...
 		} else if( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) {
@@ -500,7 +532,8 @@ class HistoryPager extends ReverseChronologicalPager {
 		if( $del ) $s .= " $del ";
 
 		$s .= " $link";
-		$s .= " <span class='history-user'>" . $this->getSkin()->revUserTools( $rev, true ) . "</span>";
+		$s .= " <span class='history-user'>" .
+			$this->getSkin()->revUserTools( $rev, true ) . "</span>";
 
 		if( $rev->isMinor() ) {
 			$s .= ' ' . ChangesList::flag( 'minor' );
@@ -557,7 +590,7 @@ class HistoryPager extends ReverseChronologicalPager {
 		$classes = array_merge( $classes, $newClasses );
 		$s .= " $tagSummary";
 
-		wfRunHooks( 'PageHistoryLineEnding', array( $this, &$row , &$s ) );
+		wfRunHooks( 'PageHistoryLineEnding', array( $this, &$row , &$s, &$classes ) );
 
 		$attribs = array();
 		if ( $classes ) {
@@ -569,14 +602,15 @@ class HistoryPager extends ReverseChronologicalPager {
 
 	/**
 	 * Create a link to view this revision of the page
-	 * @param Revision $rev
-	 * @returns string
+	 *
+	 * @param $rev Revision
+	 * @return String
 	 */
 	function revLink( $rev ) {
 		global $wgLang;
 		$date = $wgLang->timeanddate( wfTimestamp(TS_MW, $rev->getTimestamp()), true );
 		$date = htmlspecialchars( $date );
-		if( !$rev->isDeleted( Revision::DELETED_TEXT ) ) {
+		if ( $rev->userCan( Revision::DELETED_TEXT ) ) {
 			$link = $this->getSkin()->link(
 				$this->title,
 				$date,
@@ -585,16 +619,20 @@ class HistoryPager extends ReverseChronologicalPager {
 				array( 'known', 'noclasses' )
 			);
 		} else {
-			$link = "<span class=\"history-deleted\">$date</span>";
+			$link = $date;
+		}
+		if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+			$link = "<span class=\"history-deleted\">$link</span>";
 		}
 		return $link;
 	}
 
 	/**
 	 * Create a diff-to-current link for this revision for this page
-	 * @param Revision $rev
-	 * @param Bool $latest, this is the latest revision of the page?
-	 * @returns string
+	 *
+	 * @param $rev Revision
+	 * @param $latest Boolean: this is the latest revision of the page?
+	 * @return String
 	 */
 	function curLink( $rev, $latest ) {
 		$cur = $this->historyPage->message['cur'];
@@ -616,10 +654,11 @@ class HistoryPager extends ReverseChronologicalPager {
 
 	/**
 	 * Create a diff-to-previous link for this revision for this page.
-	 * @param Revision $prevRev, the previous revision
-	 * @param mixed $next, the newer revision
-	 * @param int $counter, what row on the history list this is
-	 * @returns string
+	 *
+	 * @param $prevRev Revision: the previous revision
+	 * @param $next Mixed: the newer revision
+	 * @param $counter Integer: what row on the history list this is
+	 * @return String
 	 */
 	function lastLink( $prevRev, $next, $counter ) {
 		$last = $this->historyPage->message['last'];
@@ -640,7 +679,9 @@ class HistoryPager extends ReverseChronologicalPager {
 				),
 				array( 'known', 'noclasses' )
 			);
-		} elseif( !$prevRev->userCan(Revision::DELETED_TEXT) || !$nextRev->userCan(Revision::DELETED_TEXT) ) {
+		} elseif( !$prevRev->userCan(Revision::DELETED_TEXT)
+			|| !$nextRev->userCan(Revision::DELETED_TEXT) )
+		{
 			return $last;
 		} else {
 			return $this->getSkin()->link(
@@ -659,10 +700,10 @@ class HistoryPager extends ReverseChronologicalPager {
 	/**
 	 * Create radio buttons for page history
 	 *
-	 * @param object $rev Revision
-	 * @param bool $firstInList Is this version the first one?
-	 * @param int $counter A counter of what row number we're at, counted from the top row = 1.
-	 * @return string HTML output for the radio buttons
+	 * @param $rev Revision object
+	 * @param $firstInList Boolean: is this version the first one?
+	 * @param $counter Integer: a counter of what row number we're at, counted from the top row = 1.
+	 * @return String: HTML output for the radio buttons
 	 */
 	function diffButtons( $rev, $firstInList, $counter ) {
 		if( $this->getNumRows() > 1 ) {
@@ -682,7 +723,7 @@ class HistoryPager extends ReverseChronologicalPager {
 				if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
 					$radio['disabled'] = 'disabled';
 					$checkmark = array(); // We will check the next possible one
-				} else if( $counter == 2 || !$this->oldIdChecked ) {
+				} else if( !$this->oldIdChecked ) {
 					$checkmark = array( 'checked' => 'checked' );
 					$this->oldIdChecked = $id;
 				} else {