X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPageHistory.php;h=d79172cf7ba88e65b85f1bda1a18e13aa6ee8f5a;hb=66de4821dd4923fd6f597468cb327479956d75d4;hp=e3a3be70dd33a63df81c21d31bd6033deb6a6b2f;hpb=1b9e4b99926e3719991cb00f7ebf536f51b84134;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index e3a3be70dd..d79172cf7b 100644
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -1,9 +1,15 @@
 <?php
-
-/* Page history
-   Split off from Article.php and Skin.php, 2003-12-22
-*/
-
+/**
+ * Page history
+ * 
+ * Split off from Article.php and Skin.php, 2003-12-22
+ * @package MediaWiki
+ */
+
+/**
+ * @todo document
+ * @package MediaWiki
+ */
 class PageHistory {
 	var $mArticle, $mTitle, $mSkin;
 	var $lastline, $lastdate;
@@ -12,88 +18,137 @@ class PageHistory {
 		$this->mArticle =& $article;
 		$this->mTitle =& $article->mTitle;
 	}
-	
+
 	# This shares a lot of issues (and code) with Recent Changes
 
-	function history()
-	{
-		global $wgUser, $wgOut, $wgLang;
+	function history() {
+		global $wgUser, $wgOut, $wgLang, $wgShowUpdatedMarker, $wgRequest,
+			$wgTitle;
 
 		# If page hasn't changed, client can cache this
-		
+
 		if( $wgOut->checkLastModified( $this->mArticle->getTimestamp() ) ){
 			# Client cache fresh and headers sent, nothing more to do.
 			return;
 		}
-		$fname = "PageHistory::history";
+		$fname = 'PageHistory::history';
 		wfProfileIn( $fname );
 
 		$wgOut->setPageTitle( $this->mTitle->getPRefixedText() );
-		$wgOut->setSubtitle( wfMsg( "revhistory" ) );
+		$wgOut->setSubtitle( wfMsg( 'revhistory' ) );
 		$wgOut->setArticleFlag( false );
 		$wgOut->setArticleRelated( true );
-		$wgOut->setRobotpolicy( "noindex,nofollow" );
+		$wgOut->setRobotpolicy( 'noindex,nofollow' );
 
-		if( $this->mTitle->getArticleID() == 0 ) {
-			$wgOut->addHTML( wfMsg( "nohistory" ) );
+		$id = $this->mTitle->getArticleID();
+		if( $id == 0 ) {
+			$wgOut->addHTML( wfMsg( 'nohistory' ) );
 			wfProfileOut( $fname );
 			return;
 		}
-		
-		list( $limit, $offset ) = wfCheckLimits();
-		
-		/* We have to draw the latest revision from 'cur' */
-		$rawlimit = $limit;
-		$rawoffset = $offset - 1;
-		if( 0 == $offset ) {
-			$rawlimit--;
-			$rawoffset = 0;
-		}
+
+		$limit = $wgRequest->getInt('limit');
+		if (!$limit) $limit = 50;
+		$offset = $wgRequest->getText('offset');
+		if (!isset($offset) || !preg_match("/^[0-9]+$/", $offset)) $offset = 0;
+
 		/* Check one extra row to see whether we need to show 'next' and diff links */
-		$limitplus = $rawlimit + 1;
-		
+		$limitplus = $limit + 1;
+
 		$namespace = $this->mTitle->getNamespace();
 		$title = $this->mTitle->getText();
-		$sql = "SELECT old_id,old_user," .
-		  "old_comment,old_user_text,old_timestamp,old_minor_edit ".
-		  "FROM old USE INDEX (name_title_timestamp) " .
-		  "WHERE old_namespace={$namespace} AND " .
-		  "old_title='" . wfStrencode( $this->mTitle->getDBkey() ) . "' " .
-		  "ORDER BY inverse_timestamp LIMIT $rawoffset, $limitplus";
-		$res = wfQuery( $sql, DB_READ, $fname );
-
-		$revs = wfNumRows( $res );
-		
+		$uid = $wgUser->getID();
+		$db =& wfGetDB( DB_SLAVE );
+		if ($uid && $wgShowUpdatedMarker && $wgUser->getOption( 'showupdated' ))
+			$notificationtimestamp = $db->selectField( 'watchlist',
+				'wl_notificationtimestamp',
+				array( 'wl_namespace' => $namespace, 'wl_title' => $this->mTitle->getDBkey(), 'wl_user' => $uid ),
+				$fname );
+		else $notificationtimestamp = false;
+
+		$use_index = $db->useIndexClause( 'rev_timestamp' );
+		$revision = $db->tableName( 'revision' );
+
+		$limits = $offsets = "";
+		$dir = 0;
+		if ($wgRequest->getText("dir") == "prev")
+			$dir = 1;
+
+		list($dirs, $oper) = array("DESC", "<");
+		if ($dir) {
+			list($dirs, $oper) = array("ASC", ">");
+		}
+
+		if ($offset)
+			$offsets .= " AND rev_timestamp $oper '$offset' ";
+		if ($limit)
+			$limits .= " LIMIT $limitplus ";
+
+		$sql = "SELECT rev_id,rev_user," .
+		  "rev_comment,rev_user_text,rev_timestamp,rev_minor_edit ".
+		  "FROM $revision $use_index " .
+		  "WHERE rev_page=$id " .
+		  $offsets .
+		  "ORDER BY rev_timestamp $dirs " .
+		  $limits;
+		$res = $db->query( $sql, $fname );
+
+		$revs = $db->numRows( $res );
+
 		if( $revs < $limitplus ) // the sql above tries to fetch one extra
 			$this->linesonpage = $revs;
 		else
 			$this->linesonpage = $revs - 1;
 
 		$atend = ($revs < $limitplus);
-		
+
 		$this->mSkin = $wgUser->getSkin();
-		$numbar = wfViewPrevNext(
-			$offset, $limit,
-			$this->mTitle->getPrefixedText(),
-			"action=history", $atend );
+
+		$pages = array();
+		$lowts = 0;
+		while ($line = $db->fetchObject($res)) {
+			$pages[] = $line;
+		}
+		if ($dir) $pages = array_reverse($pages);
+		if (count($pages) > 1)
+			$lowts = $pages[count($pages) - 2]->rev_timestamp;
+		else
+			$lowts = $pages[count($pages) - 1]->rev_timestamp;
+
+
+		$prevurl = $wgTitle->escapeLocalURL("action=history&dir=prev&offset={$offset}&limit={$limit}");
+		$nexturl = $wgTitle->escapeLocalURL("action=history&offset={$lowts}&limit={$limit}");
+		$urls = array();
+		foreach (array(20, 50, 100, 250, 500) as $num) {
+			$urls[] = "<a href=\"".$wgTitle->escapeLocalURL(
+				"action=history&offset={$offset}&limit={$num}")."\">".$wgLang->formatNum($num)."</a>";
+		}
+		$bits = implode($urls, ' | ');
+		$numbar = wfMsg("viewprevnext", 
+				"<a href=\"$prevurl\">".wfMsg("prevn", $limit)."</a>", 
+				"<a href=\"$nexturl\">".wfMsg("nextn", $limit)."</a>", 
+				$bits);
+
 		$s = $numbar;
+		if($this->linesonpage > 0) {
+			$submitpart1 = '<input class="historysubmit" type="submit" accesskey="'.wfMsg('accesskey-compareselectedversions').
+			'" title="'.wfMsg('tooltip-compareselectedversions').'" value="'.wfMsg('compareselectedversions').'"';
+			$this->submitbuttonhtml1 = $submitpart1 . ' />';
+			$this->submitbuttonhtml2 = $submitpart1 . ' id="historysubmit" />';
+		}
 		$s .= $this->beginHistoryList();
-
-		if( $offset == 0 ){
-			$this->linesonpage++;
-			$s .= $this->historyLine( 
-				$this->mArticle->getTimestamp(), 
-				$this->mArticle->getUser(),
-				$this->mArticle->getUserText(), $namespace,
-		  		$title, 0, $this->mArticle->getComment(),
-				( $this->mArticle->getMinorEdit() > 0 ) 
+		$counter = 1;
+		foreach($pages as $line) {
+			$s .= $this->historyLine(
+				$line->rev_timestamp, $line->rev_user,
+				$line->rev_user_text, $namespace,
+				$title, $line->rev_id,
+				$line->rev_comment, ( $line->rev_minor_edit > 0 ),
+				$counter,
+				$notificationtimestamp,
+				($counter == 1 && $offset == 0)
 			);
-		}
-		while ( $line = wfFetchObject( $res ) ) {
-			$s .= $this->historyLine( $line->old_timestamp, $line->old_user,
-			  $line->old_user_text, $namespace,
-			  $title, $line->old_id,
-			  $line->old_comment, ( $line->old_minor_edit > 0 ) );
+			$counter++;
 		}
 		$s .= $this->endHistoryList( !$atend );
 		$s .= $numbar;
@@ -101,105 +156,92 @@ class PageHistory {
 		wfProfileOut( $fname );
 	}
 
-	function beginHistoryList()
-	{
+	function beginHistoryList() {
 		global $wgTitle;
-		$this->lastdate = $this->lastline = "";
-		$s = "\n<p>" . wfMsg( "histlegend" ) . "\n<ul>";
-		$url = wfLocalUrl( $wgTitle->getPrefixedText(), "dummy=1");
-		$s .= "<SCRIPT>
-			var sel = -1;
-			function anysel(oid){ 
-				row = document.getElementById(\"ver\" + oid);
-				if( row.selected ){
-					row.style.backgroundColor=row.oldbg; 
-					row.selected = 0;
-					sel = -1;
-				} else {
-					row.oldbg = row.style.backgroundColor;
-					row.style.backgroundColor=\"lightgrey\"; 
-					row.selected = 1;
-					if( sel == -1){
-						sel = oid;
-					} else {
-						dodiff(sel, oid);
-					}
-				}
-				return false; 
-			} 
-			function dodiff(oldid, diff){
-				if( (diff < oldid && diff != 0) || oldid == 0 ){ 
-					tmp = oldid; oldid = diff; diff = tmp; 
-				}
-				u = \"{$url}&diff=\" + diff + \"&oldid=\" + oldid;
-				location.href=u;
-			}
-		</SCRIPT>";
+		$this->lastdate = $this->lastline = '';
+		$s = '<p>' . wfMsg( 'histlegend' ) . '</p>';
+		$s .= '<form action="' . $wgTitle->escapeLocalURL( '-' ) . '" method="get">';
+		$prefixedkey = htmlspecialchars($wgTitle->getPrefixedDbKey());
+		$s .= "<input type='hidden' name='title' value=\"{$prefixedkey}\" />\n";
+		$s .= !empty($this->submitbuttonhtml1) ? $this->submitbuttonhtml1."\n":'';
+		$s .= '<ul id="pagehistory">';
 		return $s;
 	}
 
-	function endHistoryList( $skip = false )
-	{
-		$last = wfMsg( "last" );
+	function endHistoryList( $skip = false ) {
+		$last = wfMsg( 'last' );
 
-		$s = $skip ? "" : preg_replace( "/!OLDID![0-9]+!/", $last, $this->lastline );
-		$s .= "</ul>\n";
+		$s = $skip ? '' : preg_replace( "/!OLDID![0-9]+!/", $last, $this->lastline );
+		$s .= '</ul>';
+		$s .= !empty($this->submitbuttonhtml2) ? $this->submitbuttonhtml2 : '';
+		$s .= '</form>';
 		return $s;
 	}
 
-	function historyLine( $ts, $u, $ut, $ns, $ttl, $oid, $c, $isminor )
-	{
-		global $wgLang;
-
-		$artname = Title::makeName( $ns, $ttl );
-		$last = wfMsg( "last" );
-		$cur = wfMsg( "cur" );
-		$cr = wfMsg( "currentrev" );
+	function historyLine( $ts, $u, $ut, $ns, $ttl, $oid, $c, $isminor, $counter = '', $notificationtimestamp = false, $latest = false ) {
+		global $wgLang, $wgContLang;
 
+		static $message;
+		if( !isset( $message ) ) {
+			foreach( explode( ' ', 'cur last selectolderversionfordiff selectnewerversionfordiff minoreditletter' ) as $msg ) {
+				$message[$msg] = wfMsg( $msg );
+			}
+		}
+		
 		if ( $oid && $this->lastline ) {
-			$ret = preg_replace( "/!OLDID!([0-9]+)!/", $this->mSkin->makeKnownLink(
-			  $artname, $last, "diff=\\1&oldid={$oid}" ), $this->lastline );
+			$ret = preg_replace( "/!OLDID!([0-9]+)!/", $this->mSkin->makeKnownLinkObj(
+			  $this->mTitle, $message['last'], "diff=\\1&oldid={$oid}",'' ,'' ,' tabindex="'.$counter.'"' ), $this->lastline );
 		} else {
-			$ret = "";
+			$ret = '';
 		}
 		$dt = $wgLang->timeanddate( $ts, true );
 
 		if ( $oid ) {
-			$q = "oldid={$oid}";
+			$q = 'oldid='.$oid;
 		} else {
-			$q = "";
+			$q = '';
 		}
-		$link = $this->mSkin->makeKnownLink( $artname, $dt, $q );
+		$link = $this->mSkin->makeKnownLinkObj( $this->mTitle, $dt, $q );
 
 		if ( 0 == $u ) {
-			$ul = $this->mSkin->makeKnownLink( $wgLang->specialPage( "Contributions" ),
-				$ut, "target=" . $ut );
-		} else { 
-			$ul = $this->mSkin->makeLink( $wgLang->getNsText(
-				Namespace::getUser() ) . ":{$ut}", $ut );
+			$contribsPage =& Title::makeTitle( NS_SPECIAL, 'Contributions' );
+			$ul = $this->mSkin->makeKnownLinkObj( $contribsPage,
+				htmlspecialchars( $ut ), 'target=' . urlencode( $ut ) );
+		} else {
+			$userPage =& Title::makeTitle( NS_USER, $ut );
+			$ul = $this->mSkin->makeLinkObj( $userPage , htmlspecialchars( $ut ) );
 		}
 
-		$s = "<li>";
-		if ( $oid ) {
-			$curlink = $this->mSkin->makeKnownLink( $artname, $cur,
-			  "diff=0&oldid={$oid}" );
+		$s = '<li>';
+		if ( $oid && !$latest ) {
+			$curlink = $this->mSkin->makeKnownLinkObj( $this->mTitle, $message['cur'],
+			  'diff=0&oldid='.$oid );
 		} else {
-			$curlink = $cur;
+			$curlink = $message['cur'];
 		}
-		$arbitrary = "";
-		if( $this->linesonpage > 1)
-			$arbitrary = "<INPUT TYPE=CHECKBOX onClick='anysel($oid)' TITLE='Select any two versions to diff them'>";
-		$s .= "({$curlink}) (!OLDID!{$oid}!) $arbitrary . .";
-		$M = wfMsg( "minoreditletter" );
-		if ( $isminor ) {
-			$s .= " <strong>{$M}</strong>";
+		$arbitrary = '';
+		if( $this->linesonpage > 1) {
+			# XXX: move title texts to javascript
+			$checkmark = '';
+			if ( !$oid || $latest ) {
+				$arbitrary = '<input type="radio" style="visibility:hidden" name="oldid" value="'.$oid.'" title="'.$message['selectolderversionfordiff'].'" />';
+				$checkmark = ' checked="checked"';
+			} else {
+				if( $counter == 2 ) $checkmark = ' checked="checked"';
+				$arbitrary = '<input type="radio" name="oldid" value="'.$oid.'" title="'.$message['selectolderversionfordiff'].'"'.$checkmark.' />';
+				$checkmark = '';
+			}
+			$arbitrary .= '<input type="radio" name="diff" value="'.$oid.'" title="'.$message['selectnewerversionfordiff'].'"'.$checkmark.' />';
 		}
-		$s .= " <span ID='ver$oid'>{$link} . . {$ul}</span>";
+		$s .= "({$curlink}) (!OLDID!{$oid}!) $arbitrary {$link} <span class='user'>{$ul}</span>";
+		$s .= $isminor ? ' <span class="minor">'.$message['minoreditletter'].'</span>': '' ;
+
 
-		if ( "" != $c && "*" != $c ) {
-			$s .= " <em>(" . wfEscapeHTML($c) . ")</em>";
+		$s .= $this->mSkin->commentBlock( $c, $this->mTitle );
+		if ($notificationtimestamp && ($ts >= $notificationtimestamp)) {
+			$s .= wfMsg( 'updatedmarker' );
 		}
-		$s .= "</li>\n";
+		$s .= '</li>';
 
 		$this->lastline = $s;
 		return $ret;