X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FPageHistory.php;h=43db2a975c107fd1c41ec82289cc726b547b84cf;hb=9d7d1050a3fae1b36dddb703a259e12d14fb4912;hp=f229792d3c8e3c97802ca4cf46e52e5334355a16;hpb=1753353797a85d149d3fdaab7c75bac18f889723;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index f229792d3c..43db2a975c 100644
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -6,13 +6,16 @@
  * @package MediaWiki
  */
 
+include_once ( "SpecialValidate.php" );
+
 /**
  * @todo document
  * @package MediaWiki
  */
+
 class PageHistory {
 	var $mArticle, $mTitle, $mSkin;
-	var $lastline, $lastdate;
+	var $lastdate;
 	var $linesonpage;
 	function PageHistory( $article ) {
 		$this->mArticle =& $article;
@@ -22,7 +25,8 @@ class PageHistory {
 	# This shares a lot of issues (and code) with Recent Changes
 
 	function history() {
-		global $wgUser, $wgOut, $wgLang;
+		global $wgUser, $wgOut, $wgLang, $wgShowUpdatedMarker, $wgRequest,
+			$wgTitle, $wgUseValidation ;
 
 		# If page hasn't changed, client can cache this
 
@@ -39,37 +43,57 @@ class PageHistory {
 		$wgOut->setArticleRelated( true );
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
 
-		if( $this->mTitle->getArticleID() == 0 ) {
+		$id = $this->mTitle->getArticleID();
+		if( $id == 0 ) {
 			$wgOut->addHTML( wfMsg( 'nohistory' ) );
 			wfProfileOut( $fname );
 			return;
 		}
 
-		list( $limit, $offset ) = wfCheckLimits();
+		$limit = $wgRequest->getInt('limit');
+		if (!$limit) $limit = 50;
+		$offset = $wgRequest->getText('offset');
+		if (!isset($offset) || !preg_match("/^[0-9]+$/", $offset)) $offset = 0;
 
-		/* We have to draw the latest revision from 'cur' */
-		$rawlimit = $limit;
-		$rawoffset = $offset - 1;
-		if( 0 == $offset ) {
-			$rawlimit--;
-			$rawoffset = 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();
-
+		$uid = $wgUser->getID();
 		$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 $oldtable $use_index " .
-		  "WHERE old_namespace={$namespace} AND " .
-		  "old_title='" . $db->strencode( $this->mTitle->getDBkey() ) . "' " .
-		  "ORDER BY inverse_timestamp".$db->limitResult($limitplus,$rawoffset);
+		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( 'page_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,rev_deleted ".
+		  "FROM $revision $use_index " .
+		  "WHERE rev_page=$id " .
+		  $offsets .
+		  "ORDER BY rev_timestamp $dirs " .
+		  $limits;
 		$res = $db->query( $sql, $fname );
 
 		$revs = $db->numRows( $res );
@@ -82,68 +106,88 @@ class PageHistory {
 		$atend = ($revs < $limitplus);
 
 		$this->mSkin = $wgUser->getSkin();
-		$numbar = wfViewPrevNext(
-			$offset, $limit,
-			$this->mTitle->getPrefixedText(),
-			'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" />';
+
+		$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;
 		$s .= $this->beginHistoryList();
 		$counter = 1;
-		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++
-			);
-		}
-		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++
-			);
+		foreach($pages as $i => $line) {
+			$first = ($counter == 1 && $offset == 0);
+			$next = isset( $pages[$i + 1] ) ? $pages[$i + 1 ] : null;
+			$s .= $this->historyLine( $line, $next, $counter, $notificationtimestamp, $first );
+			$counter++;
 		}
 		$s .= $this->endHistoryList( !$atend );
 		$s .= $numbar;
+		
+		# Validation line
+		if ( isset ( $wgUseValidation ) && $wgUseValidation ) {
+			$s .= "<p>" . Validation::link2statistics ( $this->mArticle ) . "</p>" ;
+			}
+		
 		$wgOut->addHTML( $s );
 		wfProfileOut( $fname );
 	}
 
 	function beginHistoryList() {
 		global $wgTitle;
-		$this->lastdate = $this->lastline = '';
+		$this->lastdate = '';
 		$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 .= $this->submitButton();
 		$s .= '<ul id="pagehistory">';
 		return $s;
 	}
 
-	function endHistoryList( $skip = false ) {
+	function endHistoryList() {
 		$last = wfMsg( 'last' );
 
-		$s = $skip ? '' : preg_replace( "/!OLDID![0-9]+!/", $last, $this->lastline );
-		$s .= '</ul>';
-		$s .= !empty($this->submitbuttonhtml2) ? $this->submitbuttonhtml2 : '';
+		$s = '</ul>';
+		$s .= $this->submitButton( array( 'id' => 'historysubmit' ) );
 		$s .= '</form>';
 		return $s;
 	}
+	
+	function submitButton( $bits = array() ) {
+		return ( $this->linesonpage > 0 )
+			? wfElement( 'input', array_merge( $bits,
+				array(
+					'class'     => 'historysubmit',
+					'type'      => 'submit',
+					'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
+					'title'     => wfMsg( 'tooltip-compareselectedversions' ),
+					'value'     => wfMsg( 'compareselectedversions' ),
+				) ) )
+			: '';
+	}
 
-	function historyLine( $ts, $u, $ut, $ns, $ttl, $oid, $c, $isminor, $counter = '' ) {
+	function historyLine( $row, $next, $counter = '', $notificationtimestamp = false, $latest = false ) {
 		global $wgLang, $wgContLang;
 
 		static $message;
@@ -153,65 +197,130 @@ class PageHistory {
 			}
 		}
 		
-		if ( $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 = '';
-		}
-		$dt = $wgLang->timeanddate( $ts, true );
-
-		if ( $oid ) {
-			$q = 'oldid='.$oid;
-		} else {
-			$q = '';
-		}
-		$link = $this->mSkin->makeKnownLinkObj( $this->mTitle, $dt, $q );
+		$link = $this->revLink( $row );
 
-		if ( 0 == $u ) {
+		if ( 0 == $row->rev_user ) {
 			$contribsPage =& Title::makeTitle( NS_SPECIAL, 'Contributions' );
 			$ul = $this->mSkin->makeKnownLinkObj( $contribsPage,
-				htmlspecialchars( $ut ), 'target=' . urlencode( $ut ) );
+				htmlspecialchars( $row->rev_user_text ),
+				'target=' . urlencode( $row->rev_user_text ) );
 		} else {
-			$userPage =& Title::makeTitle( NS_USER, $ut );
-			$ul = $this->mSkin->makeLinkObj( $userPage , htmlspecialchars( $ut ) );
+			$userPage =& Title::makeTitle( NS_USER, $row->rev_user_text );
+			$ul = $this->mSkin->makeLinkObj( $userPage , htmlspecialchars( $row->rev_user_text ) );
 		}
 
 		$s = '<li>';
-		if ( $oid ) {
-			$curlink = $this->mSkin->makeKnownLinkObj( $this->mTitle, $message['cur'],
-			  'diff=0&oldid='.$oid );
-		} else {
-			$curlink = $message['cur'];
+		if( $row->rev_deleted ) {
+			$s .= '<span class="deleted">';
 		}
-		$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="'.$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.' />';
+		$curlink = $this->curLink( $row, $latest );
+		$lastlink = $this->lastLink( $row, $next, $counter );
+		$arbitrary = $this->diffButtons( $row, $latest, $counter );
+		$s .= "({$curlink}) ({$lastlink}) $arbitrary {$link} <span class='user'>{$ul}</span>";
+
+		if( $row->rev_minor_edit ) {
+			$s .= ' ' . wfElement( 'span', array( 'class' => 'minor' ), $message['minoreditletter'] );
 		}
-		$s .= "({$curlink}) (!OLDID!{$oid}!) $arbitrary {$link} <span class='user'>{$ul}</span>";
-		$s .= $isminor ? ' <span class="minor">'.$message['minoreditletter'].'</span>': '' ;
 
 
-		if ( '' != $c && '*' != $c ) {
-			$c = $this->mSkin->formatcomment( $c, $this->mTitle );
-			$s .= " <em>($c)</em>";
+		$s .= $this->mSkin->commentBlock( $row->rev_comment, $this->mTitle );
+		if ($notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp)) {
+			$s .= wfMsg( 'updatedmarker' );
+		}
+		if( $row->rev_deleted ) {
+			$s .= "</span> " . htmlspecialchars( wfMsg( 'deletedrev' ) );
 		}
 		$s .= '</li>';
 
-		$this->lastline = $s;
-		return $ret;
+		return $s;
 	}
 
+	function revLink( $row ) {
+		global $wgUser, $wgLang;
+		$date = $wgLang->timeanddate( $row->rev_timestamp, true );
+		if( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) {
+			return $date;
+		} else {
+			return $this->mSkin->makeKnownLinkObj(
+				$this->mTitle,
+				$date,
+				'oldid='.$row->rev_id );
+		}
+	}
+	
+	function curLink( $row, $latest ) {
+		global $wgUser;
+		$cur = htmlspecialchars( wfMsg( 'cur' ) );
+		if( $latest
+			|| ( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) ) {
+			return $cur;
+		} else {
+			return $this->mSkin->makeKnownLinkObj(
+				$this->mTitle,
+				$cur,
+				'diff=0&oldid=' . $row->rev_id );
+		}
+	}
+	
+	function lastLink( $row, $next, $counter ) {
+		global $wgUser;
+		$last = htmlspecialchars( wfMsg( 'last' ) );
+		if( is_null( $next )
+			|| ( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) ) {
+			return $last;
+		} else {
+			return $this->mSkin->makeKnownLinkObj(
+			  $this->mTitle,
+			  $last,
+			  "diff={$row->rev_id}&oldid={$next->rev_id}",
+			  '',
+			  '',
+			  ' tabindex="'.$counter.'"' );
+		}
+	}
+	
+	function diffButtons( $row, $latest, $counter ) {
+		global $wgUser;
+		if( $this->linesonpage > 1) {
+			$radio = array(
+				'type'  => 'radio',
+				'value' => $row->rev_id,
+				'title' => wfMsg( 'selectolderversionfordiff' )
+			);
+			if( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) {
+				$radio['disabled'] = 'disabled';
+			}
+			
+			# XXX: move title texts to javascript
+			if ( $latest ) {
+				$first = wfElement( 'input', array_merge(
+					$radio,
+					array(
+						'style' => 'visibility:hidden',
+						'name'  => 'oldid' ) ) );
+				$checkmark = array( 'checked' => 'checked' );
+			} else {
+				if( $counter == 2 ) {
+					$checkmark = array( 'checked' => 'checked' );
+				} else {
+					$checkmark = array();
+				}
+				$first = wfElement( 'input', array_merge(
+					$radio,
+					$checkmark,
+					array( 'name'  => 'oldid' ) ) );
+				$checkmark = array();
+			}
+			$second = wfElement( 'input', array_merge(
+				$radio,
+				$checkmark,
+				array( 'name'  => 'diff' ) ) );
+			return $first . $second;
+		} else {
+			return '';
+		}
+	}
+	
 }
 
 ?>