X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPageHistory.php;h=0f42b6f5e30b5da029793c06ace144d2ca788a4c;hb=37b73a88820fda845e73f6a03f7406bad1e1d3b6;hp=3e1ff45a921e2b1d01d5b3cef38e749a99ee136b;hpb=b59ce2294385403bf4da644a0323aa7ba01b8a66;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index 3e1ff45a92..0f42b6f5e3 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,36 +18,35 @@ class PageHistory {
 		$this->mArticle =& $article;
 		$this->mTitle =& $article->mTitle;
 	}
-	
+
 	# This shares a lot of issues (and code) with Recent Changes
 
-	function history()
-	{
+	function history() {
 		global $wgUser, $wgOut, $wgLang;
 
 		# 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" ) );
+			$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;
@@ -51,49 +56,64 @@ class PageHistory {
 		}
 		/* Check one extra row to see whether we need to show 'next' and diff links */
 		$limitplus = $rawlimit + 1;
-		
+
 		$namespace = $this->mTitle->getNamespace();
 		$title = $this->mTitle->getText();
+
+		$db =& wfGetDB( DB_SLAVE );
+		$use_index = $db->useIndexClause( 'name_title_timestamp' );
+		$oldtable = $db->tableName( 'old' );
+
 		$sql = "SELECT old_id,old_user," .
 		  "old_comment,old_user_text,old_timestamp,old_minor_edit ".
-		  "FROM old USE INDEX (name_title_timestamp) " .
+		  "FROM $oldtable $use_index " .
 		  "WHERE old_namespace={$namespace} AND " .
-		  "old_title='" . wfStrencode( $this->mTitle->getDBkey() ) . "' " .
-		  "ORDER BY inverse_timestamp LIMIT $rawoffset, $limitplus";
-		$res = wfQuery( $sql, DB_READ, $fname );
+		  "old_title='" . $db->strencode( $this->mTitle->getDBkey() ) . "' " .
+		  "ORDER BY inverse_timestamp".$db->limitResult($limitplus,$rawoffset);
+		$res = $db->query( $sql, $fname );
+
+		$revs = $db->numRows( $res );
 
-		$revs = wfNumRows( $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 );
+			'action=history', $atend );
 		$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();
-
+		$counter = 1;
 		if( $offset == 0 ){
 			$this->linesonpage++;
-			$s .= $this->historyLine( 
-				$this->mArticle->getTimestamp(), 
+			$s .= $this->historyLine(
+				$this->mArticle->getTimestamp(),
 				$this->mArticle->getUser(),
 				$this->mArticle->getUserText(), $namespace,
-		  		$title, 0, $this->mArticle->getComment(),
-				( $this->mArticle->getMinorEdit() > 0 ) 
+				$title, 0, $this->mArticle->getComment(),
+				( $this->mArticle->getMinorEdit() > 0 ),
+				$counter++
 			);
 		}
-		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 ) );
+		while ( $line = $db->fetchObject( $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 +121,89 @@ class PageHistory {
 		wfProfileOut( $fname );
 	}
 
-	function beginHistoryList()
-	{
+	function beginHistoryList() {
 		global $wgTitle;
-		$this->lastdate = $this->lastline = "";
-		$s = "\n<p>" . wfMsg( "histlegend" ) . "\n<ul>";
-		$url = $wgTitle->getLocalURL("-");
-		$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;
+	function historyLine( $ts, $u, $ut, $ns, $ttl, $oid, $c, $isminor, $counter = '' ) {
+		global $wgLang, $wgContLang;
 
 		$artname = Title::makeName( $ns, $ttl );
-		$last = wfMsg( "last" );
-		$cur = wfMsg( "cur" );
-		$cr = wfMsg( "currentrev" );
+		$last = wfMsg( 'last' );
+		$cur = wfMsg( 'cur' );
+		$cr = wfMsg( 'currentrev' );
 
 		if ( $oid && $this->lastline ) {
 			$ret = preg_replace( "/!OLDID!([0-9]+)!/", $this->mSkin->makeKnownLink(
-			  $artname, $last, "diff=\\1&oldid={$oid}" ), $this->lastline );
+			  $artname, $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 );
 
 		if ( 0 == $u ) {
-			$ul = $this->mSkin->makeKnownLink( $wgLang->specialPage( "Contributions" ),
-				$ut, "target=" . $ut );
-		} else { 
-			$ul = $this->mSkin->makeLink( $wgLang->getNsText(
-				Namespace::getUser() ) . ":{$ut}", $ut );
+			$ul = $this->mSkin->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
+				htmlspecialchars( $ut ), 'target=' . urlencode( $ut ) );
+		} else {
+			$ul = $this->mSkin->makeLink( $wgContLang->getNsText(
+				Namespace::getUser() ) . ':'.$ut , htmlspecialchars( $ut ) );
 		}
 
-		$s = "<li>";
+		$s = '<li>';
 		if ( $oid ) {
 			$curlink = $this->mSkin->makeKnownLink( $artname, $cur,
-			  "diff=0&oldid={$oid}" );
+			  'diff=0&oldid='.$oid );
 		} else {
 			$curlink = $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 ) {
+				$arbitrary = '<input type="radio" style="visibility:hidden" name="oldid" value="'.$oid.'" title="'.wfMsg('selectolderversionfordiff').'" />';
+				$checkmark = ' checked="checked"';
+			} else {
+				if( $counter == 2 ) $checkmark = ' checked="checked"';
+				$arbitrary = '<input type="radio" name="oldid" value="'.$oid.'" title="'.wfMsg('selectolderversionfordiff').'"'.$checkmark.' />';
+				$checkmark = '';
+			}
+			$arbitrary .= '<input type="radio" name="diff" value="'.$oid.'" title="'.wfMsg('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">'.wfMsg( "minoreditletter" ).'</span>': '' ;
+
 
-		if ( "" != $c && "*" != $c ) {
-			$s .= " <em>(" . wfEscapeHTML($c) . ")</em>";
+		if ( '' != $c && '*' != $c ) {
+			$c = $this->mSkin->formatcomment($c,$this->mTitle);
+			$s .= " <em>($c)</em>";
 		}
-		$s .= "</li>\n";
+		$s .= '</li>';
 
 		$this->lastline = $s;
 		return $ret;