X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FRevision.php;h=05a4a68ade5ead3f15226a5544716740823753b0;hb=5a502478246c435f7a0672ea63ddf67eb22a412d;hp=7908d5643673ead3e5f290b1f8507e7d1ce701d8;hpb=cede31f8926cf870a6bf0fa019c8433722caacad;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Revision.php b/includes/Revision.php
index 7908d56436..05a4a68ade 100644
--- a/includes/Revision.php
+++ b/includes/Revision.php
@@ -1,27 +1,26 @@
 <?php
 /**
- * @package MediaWiki
  * @todo document
  */
 
-/** */
-require_once( 'Database.php' );
-require_once( 'Article.php' );
-
 /**
- * @package MediaWiki
  * @todo document
  */
 class Revision {
+	const DELETED_TEXT = 1;
+	const DELETED_COMMENT = 2;
+	const DELETED_USER = 4;
+	const DELETED_RESTRICTED = 8;
+
 	/**
 	 * Load a page revision from a given revision ID number.
 	 * Returns null if no such revision can be found.
 	 *
 	 * @param int $id
-	 * @static
 	 * @access public
+	 * @static
 	 */
-	function newFromId( $id ) {
+	public static function newFromId( $id ) {
 		return Revision::newFromConds(
 			array( 'page_id=rev_page',
 			       'rev_id' => intval( $id ) ) );
@@ -38,7 +37,7 @@ class Revision {
 	 * @access public
 	 * @static
 	 */
-	function newFromTitle( &$title, $id = 0 ) {
+	public static function newFromTitle( &$title, $id = 0 ) {
 		if( $id ) {
 			$matchId = intval( $id );
 		} else {
@@ -48,7 +47,22 @@ class Revision {
 			array( "rev_id=$matchId",
 			       'page_id=rev_page',
 			       'page_namespace' => $title->getNamespace(),
-			       'page_title'     => $title->getDbkey() ) );
+			       'page_title'     => $title->getDBkey() ) );
+	}
+
+	/**
+	 * Load a page revision from a given revision ID number.
+	 * Returns null if no such revision can be found.
+	 *
+	 * @param Database $db
+	 * @param int $id
+	 * @access public
+	 * @static
+	 */
+	public static function loadFromId( &$db, $id ) {
+		return Revision::loadFromConds( $db,
+			array( 'page_id=rev_page',
+			       'rev_id' => intval( $id ) ) );
 	}
 
 	/**
@@ -61,8 +75,9 @@ class Revision {
 	 * @param int $id
 	 * @return Revision
 	 * @access public
+	 * @static
 	 */
-	function loadFromPageId( &$db, $pageid, $id = 0 ) {
+	public static function loadFromPageId( $db, $pageid, $id = 0 ) {
 		$conds=array('page_id=rev_page','rev_page'=>intval( $pageid ), 'page_id'=>intval( $pageid ));
 		if( $id ) {
 			$conds['rev_id']=intval($id);
@@ -82,8 +97,9 @@ class Revision {
 	 * @param int $id
 	 * @return Revision
 	 * @access public
+	 * @static
 	 */
-	function loadFromTitle( &$db, $title, $id = 0 ) {
+	public static function loadFromTitle( &$db, $title, $id = 0 ) {
 		if( $id ) {
 			$matchId = intval( $id );
 		} else {
@@ -94,7 +110,7 @@ class Revision {
 			array( "rev_id=$matchId",
 			       'page_id=rev_page',
 			       'page_namespace' => $title->getNamespace(),
-			       'page_title'     => $title->getDbkey() ) );
+			       'page_title'     => $title->getDBkey() ) );
 	}
 
 	/**
@@ -109,13 +125,13 @@ class Revision {
 	 * @access public
 	 * @static
 	 */
-	function loadFromTimestamp( &$db, &$title, $timestamp ) {
+	public static function loadFromTimestamp( &$db, &$title, $timestamp ) {
 		return Revision::loadFromConds(
 			$db,
 			array( 'rev_timestamp'  => $db->timestamp( $timestamp ),
 			       'page_id=rev_page',
 			       'page_namespace' => $title->getNamespace(),
-			       'page_title'     => $title->getDbkey() ) );
+			       'page_title'     => $title->getDBkey() ) );
 	}
 
 	/**
@@ -123,14 +139,14 @@ class Revision {
 	 *
 	 * @param array $conditions
 	 * @return Revision
-	 * @static
 	 * @access private
+	 * @static
 	 */
-	function newFromConds( $conditions ) {
-		$db =& wfGetDB( DB_SLAVE );
+	private static function newFromConds( $conditions ) {
+		$db = wfGetDB( DB_SLAVE );
 		$row = Revision::loadFromConds( $db, $conditions );
 		if( is_null( $row ) ) {
-			$dbw =& wfGetDB( DB_MASTER );
+			$dbw = wfGetDB( DB_MASTER );
 			$row = Revision::loadFromConds( $dbw, $conditions );
 		}
 		return $row;
@@ -143,10 +159,10 @@ class Revision {
 	 * @param Database $db
 	 * @param array $conditions
 	 * @return Revision
-	 * @static
 	 * @access private
+	 * @static
 	 */
-	function loadFromConds( &$db, $conditions ) {
+	private static function loadFromConds( $db, $conditions ) {
 		$res = Revision::fetchFromConds( $db, $conditions );
 		if( $res ) {
 			$row = $res->fetchObject();
@@ -167,14 +183,14 @@ class Revision {
 	 *
 	 * @param Title $title
 	 * @return ResultWrapper
-	 * @static
 	 * @access public
+	 * @static
 	 */
-	function fetchAllRevisions( &$title ) {
+	public static function fetchAllRevisions( &$title ) {
 		return Revision::fetchFromConds(
 			wfGetDB( DB_SLAVE ),
 			array( 'page_namespace' => $title->getNamespace(),
-			       'page_title'     => $title->getDbkey(),
+			       'page_title'     => $title->getDBkey(),
 			       'page_id=rev_page' ) );
 	}
 
@@ -185,15 +201,15 @@ class Revision {
 	 *
 	 * @param Title $title
 	 * @return ResultWrapper
-	 * @static
 	 * @access public
+	 * @static
 	 */
-	function fetchRevision( &$title ) {
+	public static function fetchRevision( &$title ) {
 		return Revision::fetchFromConds(
 			wfGetDB( DB_SLAVE ),
 			array( 'rev_id=page_latest',
 			       'page_namespace' => $title->getNamespace(),
-			       'page_title'     => $title->getDbkey(),
+			       'page_title'     => $title->getDBkey(),
 			       'page_id=rev_page' ) );
 	}
 
@@ -205,10 +221,10 @@ class Revision {
 	 * @param Database $db
 	 * @param array $conditions
 	 * @return ResultWrapper
-	 * @static
 	 * @access private
+	 * @static
 	 */
-	function fetchFromConds( &$db, $conditions ) {
+	private static function fetchFromConds( $db, $conditions ) {
 		$res = $db->select(
 			array( 'page', 'revision' ),
 			array( 'page_namespace',
@@ -222,7 +238,8 @@ class Revision {
 			       'rev_user',
 			       'rev_minor_edit',
 			       'rev_timestamp',
-			       'rev_deleted' ),
+			       'rev_deleted',
+			       'rev_len' ),
 			$conditions,
 			'Revision::fetchRow',
 			array( 'LIMIT' => 1 ) );
@@ -230,6 +247,25 @@ class Revision {
 		return $ret;
 	}
 
+	/**
+	 * Return the list of revision fields that should be selected to create 
+	 * a new revision.
+	 */
+	static function selectFields() {
+		return array( 
+			'rev_id',
+			'rev_page',
+			'rev_text_id',
+			'rev_timestamp',
+			'rev_comment',
+			'rev_minor_edit',
+			'rev_user',
+			'rev_user_text,'.
+			'rev_deleted',
+			'rev_len'
+		);
+	}
+
 	/**
 	 * @param object $row
 	 * @access private
@@ -245,15 +281,28 @@ class Revision {
 			$this->mMinorEdit = intval( $row->rev_minor_edit );
 			$this->mTimestamp =         $row->rev_timestamp;
 			$this->mDeleted   = intval( $row->rev_deleted );
+			
+			if( !isset( $row->rev_len ) || is_null( $row->rev_len ) )
+				$this->mSize = null;
+			else
+				$this->mSize = intval( $row->rev_len ); 
+
+			if( isset( $row->page_latest ) ) {
+				$this->mCurrent   = ( $row->rev_id == $row->page_latest );
+				$this->mTitle     = Title::makeTitle( $row->page_namespace,
+				                                      $row->page_title );
+			} else {
+				$this->mCurrent = false;
+				$this->mTitle = null;
+			}
 
-			$this->mCurrent   = ( $row->rev_id == $row->page_latest );
-			$this->mTitle     = Title::makeTitle( $row->page_namespace,
-			                                      $row->page_title );
-
+			// Lazy extraction...
+			$this->mText      = null;
 			if( isset( $row->old_text ) ) {
-				$this->mText  = $this->getRevisionText( $row );
+				$this->mTextRow = $row;
 			} else {
-				$this->mText  = null;
+				// 'text' table row entry will be lazy-loaded
+				$this->mTextRow = null;
 			}
 		} elseif( is_array( $row ) ) {
 			// Build a new revision to be saved...
@@ -267,15 +316,20 @@ class Revision {
 			$this->mMinorEdit = isset( $row['minor_edit'] ) ? intval( $row['minor_edit'] ) : 0;
 			$this->mTimestamp = isset( $row['timestamp']  ) ? strval( $row['timestamp']  ) : wfTimestamp( TS_MW );
 			$this->mDeleted   = isset( $row['deleted']    ) ? intval( $row['deleted']    ) : 0;
-
+			$this->mSize      = isset( $row['len']        ) ? intval( $row['len']        ) : null;
+			
 			// Enforce spacing trimming on supplied text
 			$this->mComment   = isset( $row['comment']    ) ?  trim( strval( $row['comment'] ) ) : null;
 			$this->mText      = isset( $row['text']       ) ? rtrim( strval( $row['text']    ) ) : null;
+			$this->mTextRow   = null;
 
 			$this->mTitle     = null; # Load on demand if needed
 			$this->mCurrent   = false;
+			# If we still have no len_size, see it we have the text to figure it out
+			if ( !$this->mSize )
+				$this->mSize      = is_null($this->mText) ? null : strlen($this->mText);
 		} else {
-			wfDebugDieBacktrace( 'Revision constructor passed invalid row format.' );
+			throw new MWException( 'Revision constructor passed invalid row format.' );
 		}
 	}
 
@@ -297,6 +351,13 @@ class Revision {
 		return $this->mTextId;
 	}
 
+	/**
+	 * Returns the length of the text in this revision, or null if unknown.
+	 */
+	function getSize() {
+		return $this->mSize;
+	}
+
 	/**
 	 * Returns the title of the page associated with this entry.
 	 * @return Title
@@ -305,13 +366,13 @@ class Revision {
 		if( isset( $this->mTitle ) ) {
 			return $this->mTitle;
 		}
-		$dbr =& wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 		$row = $dbr->selectRow(
 			array( 'page', 'revision' ),
 			array( 'page_namespace', 'page_title' ),
 			array( 'page_id=rev_page',
 			       'rev_id' => $this->mId ),
-			'Revision::getTItle' );
+			'Revision::getTitle' );
 		if( $row ) {
 			$this->mTitle = Title::makeTitle( $row->page_namespace,
 			                                   $row->page_title );
@@ -319,6 +380,14 @@ class Revision {
 		return $this->mTitle;
 	}
 
+	/**
+	 * Set the title of the revision
+	 * @param Title $title
+	 */
+	function setTitle( $title ) {
+		$this->mTitle = $title;
+	}
+
 	/**
 	 * @return int
 	 */
@@ -327,23 +396,62 @@ class Revision {
 	}
 
 	/**
+	 * Fetch revision's user id if it's available to all users
 	 * @return int
 	 */
 	function getUser() {
+		if( $this->isDeleted( self::DELETED_USER ) ) {
+			return 0;
+		} else {
+			return $this->mUser;
+		}
+	}
+
+	/**
+	 * Fetch revision's user id without regard for the current user's permissions
+	 * @return string
+	 */
+	function getRawUser() {
 		return $this->mUser;
 	}
 
 	/**
+	 * Fetch revision's username if it's available to all users
 	 * @return string
 	 */
 	function getUserText() {
-		return $this->mUserText;
+		if( $this->isDeleted( self::DELETED_USER ) ) {
+			return "";
+		} else {
+			return $this->mUserText;
+		}
 	}
 
 	/**
+	 * Fetch revision's username without regard for view restrictions
+	 * @return string
+	 */
+	function getRawUserText() {
+		return $this->mUserText;
+	}
+	
+	/**
+	 * Fetch revision comment if it's available to all users
 	 * @return string
 	 */
 	function getComment() {
+		if( $this->isDeleted( self::DELETED_COMMENT ) ) {
+			return "";
+		} else {
+			return $this->mComment;
+		}
+	}
+
+	/**
+	 * Fetch revision comment without regard for the current user's permissions
+	 * @return string
+	 */
+	function getRawComment() {
 		return $this->mComment;
 	}
 
@@ -355,22 +463,48 @@ class Revision {
 	}
 
 	/**
+	 * int $field one of DELETED_* bitfield constants
 	 * @return bool
 	 */
-	function isDeleted() {
-		return (bool)$this->mDeleted;
+	function isDeleted( $field ) {
+		return ($this->mDeleted & $field) == $field;
 	}
 
 	/**
+	 * Fetch revision text if it's available to all users
 	 * @return string
 	 */
 	function getText() {
+		if( $this->isDeleted( self::DELETED_TEXT ) ) {
+			return "";
+		} else {
+			return $this->getRawText();
+		}
+	}
+	
+	/**
+	 * Fetch revision text without regard for view restrictions
+	 * @return string
+	 */
+	function getRawText() {
 		if( is_null( $this->mText ) ) {
 			// Revision text is immutable. Load on demand:
 			$this->mText = $this->loadText();
 		}
 		return $this->mText;
 	}
+	
+	/**
+	 * Fetch revision text if it's available to THIS user
+	 * @return string
+	 */
+	function revText() {
+		if( !$this->userCan( self::DELETED_TEXT ) ) {
+			return "";
+		} else {
+			return $this->getRawText();
+		}
+	}
 
 	/**
 	 * @return string
@@ -420,7 +554,7 @@ class Revision {
 	  * @param string $prefix table prefix (default 'old_')
 	  * @return string $text|false the text requested
 	  */
-	function getRevisionText( $row, $prefix = 'old_' ) {
+	public static function getRevisionText( $row, $prefix = 'old_' ) {
 		$fname = 'Revision::getRevisionText';
 		wfProfileIn( $fname );
 
@@ -444,12 +578,11 @@ class Revision {
 		# Use external methods for external objects, text in table is URL-only then
 		if ( in_array( 'external', $flags ) ) {
 			$url=$text;
-			@list($proto,$path)=explode('://',$url,2);
+			@list(/* $proto */,$path)=explode('://',$url,2);
 			if ($path=="") {
 				wfProfileOut( $fname );
 				return false;
 			}
-			require_once('ExternalStore.php');
 			$text=ExternalStore::fetchFromURL($url);
 		}
 
@@ -465,6 +598,11 @@ class Revision {
 			if( in_array( 'object', $flags ) ) {
 				# Generic compressed storage
 				$obj = unserialize( $text );
+				if ( !is_object( $obj ) ) {
+					// Invalid object
+					wfProfileOut( $fname );
+					return false;
+				}
 				$text = $obj->getText();
 			}
 
@@ -473,7 +611,7 @@ class Revision {
 				# Old revisions kept around in a legacy encoding?
 				# Upconvert on demand.
 				global $wgInputEncoding, $wgContLang;
-				$text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding . '//IGNORE', $text );
+				$text = $wgContLang->iconv( $wgLegacyEncoding, $wgInputEncoding, $text );
 			}
 		}
 		wfProfileOut( $fname );
@@ -528,12 +666,17 @@ class Revision {
 
 		# Write to external storage if required
 		if ( $wgDefaultExternalStore ) {
-			require_once('ExternalStore.php');
+			if ( is_array( $wgDefaultExternalStore ) ) {
+				// Distribute storage across multiple clusters
+				$store = $wgDefaultExternalStore[mt_rand(0, count( $wgDefaultExternalStore ) - 1)];
+			} else {
+				$store = $wgDefaultExternalStore;
+			}
 			// Store and get the URL
-			$data = ExternalStore::insert( $wgDefaultExternalStore, $data );
+			$data = ExternalStore::insert( $store, $data );
 			if ( !$data ) {
 				# This should only happen in the case of a configuration error, where the external store is not valid
-				wfDebugDieBacktrace( "Unable to store text to external storage $wgDefaultExternalStore" );
+				throw new MWException( "Unable to store text to external storage $store" );
 			}
 			if ( $flags ) {
 				$flags .= ',';
@@ -569,11 +712,11 @@ class Revision {
 				'rev_user_text'  => $this->mUserText,
 				'rev_timestamp'  => $dbw->timestamp( $this->mTimestamp ),
 				'rev_deleted'    => $this->mDeleted,
+				'rev_len'	     => $this->mSize,
 			), $fname
 		);
 
 		$this->mId = !is_null($rev_id) ? $rev_id : $dbw->insertId();
-
 		wfProfileOut( $fname );
 		return $this->mId;
 	}
@@ -588,15 +731,38 @@ class Revision {
 	function loadText() {
 		$fname = 'Revision::loadText';
 		wfProfileIn( $fname );
-
-		$dbr =& wfGetDB( DB_SLAVE );
-		$row = $dbr->selectRow( 'text',
-			array( 'old_text', 'old_flags' ),
-			array( 'old_id' => $this->getTextId() ),
-			$fname);
+		
+		// Caching may be beneficial for massive use of external storage
+		global $wgRevisionCacheExpiry, $wgMemc;
+		$key = wfMemcKey( 'revisiontext', 'textid', $this->getTextId() );
+		if( $wgRevisionCacheExpiry ) {
+			$text = $wgMemc->get( $key );
+			if( is_string( $text ) ) {
+				wfProfileOut( $fname );
+				return $text;
+			}
+		}
+		
+		// If we kept data for lazy extraction, use it now...
+		if ( isset( $this->mTextRow ) ) {
+			$row = $this->mTextRow;
+			$this->mTextRow = null;
+		} else {
+			$row = null;
+		}
+		
+		if( !$row ) {
+			// Text data is immutable; check slaves first.
+			$dbr = wfGetDB( DB_SLAVE );
+			$row = $dbr->selectRow( 'text',
+				array( 'old_text', 'old_flags' ),
+				array( 'old_id' => $this->getTextId() ),
+				$fname);
+		}
 
 		if( !$row ) {
-			$dbw =& wfGetDB( DB_MASTER );
+			// Possible slave lag!
+			$dbw = wfGetDB( DB_MASTER );
 			$row = $dbw->selectRow( 'text',
 				array( 'old_text', 'old_flags' ),
 				array( 'old_id' => $this->getTextId() ),
@@ -604,6 +770,11 @@ class Revision {
 		}
 
 		$text = Revision::getRevisionText( $row );
+		
+		if( $wgRevisionCacheExpiry ) {
+			$wgMemc->set( $key, $text, $wgRevisionCacheExpiry );
+		}
+		
 		wfProfileOut( $fname );
 
 		return $text;
@@ -623,9 +794,8 @@ class Revision {
 	 * @param bool     $minor
 	 * @return Revision
 	 */
-	function newNullRevision( &$dbw, $pageId, $summary, $minor ) {
-		$fname = 'Revision::newNullRevision';
-		wfProfileIn( $fname );
+	public static function newNullRevision( &$dbw, $pageId, $summary, $minor ) {
+		wfProfileIn( __METHOD__ );
 
 		$current = $dbw->selectRow(
 			array( 'page', 'revision' ),
@@ -634,7 +804,7 @@ class Revision {
 				'page_id' => $pageId,
 				'page_latest=rev_id',
 				),
-			$fname );
+			__METHOD__ );
 
 		if( $current ) {
 			$revision = new Revision( array(
@@ -647,9 +817,74 @@ class Revision {
 			$revision = null;
 		}
 
-		wfProfileOut( $fname );
+		wfProfileOut( __METHOD__ );
 		return $revision;
 	}
+	
+	/**
+	 * Determine if the current user is allowed to view a particular
+	 * field of this revision, if it's marked as deleted.
+	 * @param int $field one of self::DELETED_TEXT,
+	 *                          self::DELETED_COMMENT,
+	 *                          self::DELETED_USER
+	 * @return bool
+	 */
+	function userCan( $field ) {
+		if( ( $this->mDeleted & $field ) == $field ) {
+			global $wgUser;
+			$permission = ( $this->mDeleted & self::DELETED_RESTRICTED ) == self::DELETED_RESTRICTED
+				? 'hiderevision'
+				: 'deleterevision';
+			wfDebug( "Checking for $permission due to $field match on $this->mDeleted\n" );
+			return $wgUser->isAllowed( $permission );
+		} else {
+			return true;
+		}
+	}
 
+
+	/**
+	 * Get rev_timestamp from rev_id, without loading the rest of the row
+	 * @param integer $id
+	 */
+	static function getTimestampFromID( $id ) {
+		$dbr = wfGetDB( DB_SLAVE );
+		$timestamp = $dbr->selectField( 'revision', 'rev_timestamp', 
+			array( 'rev_id' => $id ), __METHOD__ );
+		if ( $timestamp === false ) {
+			# Not in slave, try master
+			$dbw = wfGetDB( DB_MASTER );
+			$timestamp = $dbw->selectField( 'revision', 'rev_timestamp', 
+				array( 'rev_id' => $id ), __METHOD__ );
+		}
+		return $timestamp;
+	}
+	
+	static function countByPageId( $db, $id ) {
+		$row = $db->selectRow( 'revision', 'COUNT(*) AS revCount',
+			array( 'rev_page' => $id ), __METHOD__ );
+		if( $row ) {
+			return $row->revCount;
+		}
+		return 0;
+	}
+	
+	static function countByTitle( $db, $title ) {
+		$id = $title->getArticleId();
+		if( $id ) {
+			return Revision::countByPageId( $db, $id );
+		}
+		return 0;
+	}
 }
-?>
+
+/**
+ * Aliases for backwards compatibility with 1.6
+ */
+define( 'MW_REV_DELETED_TEXT', Revision::DELETED_TEXT );
+define( 'MW_REV_DELETED_COMMENT', Revision::DELETED_COMMENT );
+define( 'MW_REV_DELETED_USER', Revision::DELETED_USER );
+define( 'MW_REV_DELETED_RESTRICTED', Revision::DELETED_RESTRICTED );
+
+
+