Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 66 insertions, 112 deletions

diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php
index f53cd386..f047d8d4 100644
--- a/includes/api/ApiQueryFilearchive.php
+++ b/includes/api/ApiQueryFilearchive.php
@@ -33,7 +33,7 @@
  */
 class ApiQueryFilearchive extends ApiQueryBase {
 
-	public function __construct( $query, $moduleName ) {
+	public function __construct( ApiQuery $query, $moduleName ) {
 		parent::__construct( $query, $moduleName, 'fa' );
 	}
 
@@ -41,7 +41,10 @@ class ApiQueryFilearchive extends ApiQueryBase {
 		$user = $this->getUser();
 		// Before doing anything at all, let's check permissions
 		if ( !$user->isAllowed( 'deletedhistory' ) ) {
-			$this->dieUsage( 'You don\'t have permission to view deleted file information', 'permissiondenied' );
+			$this->dieUsage(
+				'You don\'t have permission to view deleted file information',
+				'permissiondenied'
+			);
 		}
 
 		$db = $this->getDB();
@@ -63,9 +66,9 @@ class ApiQueryFilearchive extends ApiQueryBase {
 
 		$this->addTables( 'filearchive' );
 
-		$this->addFields( array( 'fa_name', 'fa_deleted' ) );
+		$this->addFields( ArchivedFile::selectFields() );
+		$this->addFields( array( 'fa_id', 'fa_name', 'fa_timestamp', 'fa_deleted' ) );
 		$this->addFieldsIf( 'fa_sha1', $fld_sha1 );
-		$this->addFieldsIf( 'fa_timestamp', $fld_timestamp );
 		$this->addFieldsIf( array( 'fa_user', 'fa_user_text' ), $fld_user );
 		$this->addFieldsIf( array( 'fa_height', 'fa_width', 'fa_size' ), $fld_dimensions || $fld_size );
 		$this->addFieldsIf( 'fa_description', $fld_description );
@@ -77,22 +80,29 @@ class ApiQueryFilearchive extends ApiQueryBase {
 
 		if ( !is_null( $params['continue'] ) ) {
 			$cont = explode( '|', $params['continue'] );
-			$this->dieContinueUsageIf( count( $cont ) != 1 );
+			$this->dieContinueUsageIf( count( $cont ) != 3 );
 			$op = $params['dir'] == 'descending' ? '<' : '>';
 			$cont_from = $db->addQuotes( $cont[0] );
-			$this->addWhere( "fa_name $op= $cont_from" );
+			$cont_timestamp = $db->addQuotes( $db->timestamp( $cont[1] ) );
+			$cont_id = (int)$cont[2];
+			$this->dieContinueUsageIf( $cont[2] !== (string)$cont_id );
+			$this->addWhere( "fa_name $op $cont_from OR " .
+				"(fa_name = $cont_from AND " .
+				"(fa_timestamp $op $cont_timestamp OR " .
+				"(fa_timestamp = $cont_timestamp AND " .
+				"fa_id $op= $cont_id )))"
+			);
 		}
 
 		// Image filters
 		$dir = ( $params['dir'] == 'descending' ? 'older' : 'newer' );
-		$from = ( is_null( $params['from'] ) ? null : $this->titlePartToKey( $params['from'] ) );
-		if ( !is_null( $params['continue'] ) ) {
-			$from = $params['continue'];
-		}
-		$to = ( is_null( $params['to'] ) ? null : $this->titlePartToKey( $params['to'] ) );
+		$from = ( $params['from'] === null ? null : $this->titlePartToKey( $params['from'], NS_FILE ) );
+		$to = ( $params['to'] === null ? null : $this->titlePartToKey( $params['to'], NS_FILE ) );
 		$this->addWhereRange( 'fa_name', $dir, $from, $to );
 		if ( isset( $params['prefix'] ) ) {
-			$this->addWhere( 'fa_name' . $db->buildLike( $this->titlePartToKey( $params['prefix'] ), $db->anyString() ) );
+			$this->addWhere( 'fa_name' . $db->buildLike(
+				$this->titlePartToKey( $params['prefix'], NS_FILE ),
+				$db->anyString() ) );
 		}
 
 		$sha1Set = isset( $params['sha1'] );
@@ -116,20 +126,26 @@ class ApiQueryFilearchive extends ApiQueryBase {
 			}
 		}
 
-		if ( !$user->isAllowed( 'suppressrevision' ) ) {
-			// Filter out revisions that the user is not allowed to see. There
-			// is no way to indicate that we have skipped stuff because the
-			// continuation parameter is fa_name
-
-			// Note that this field is unindexed. This should however not be
-			// a big problem as files with fa_deleted are rare
-			$this->addWhereFld( 'fa_deleted', 0 );
+		// Exclude files this user can't view.
+		if ( !$user->isAllowed( 'deletedtext' ) ) {
+			$bitmask = File::DELETED_FILE;
+		} elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
+			$bitmask = File::DELETED_FILE | File::DELETED_RESTRICTED;
+		} else {
+			$bitmask = 0;
+		}
+		if ( $bitmask ) {
+			$this->addWhere( $this->getDB()->bitAnd( 'fa_deleted', $bitmask ) . " != $bitmask" );
 		}
 
 		$limit = $params['limit'];
 		$this->addOption( 'LIMIT', $limit + 1 );
 		$sort = ( $params['dir'] == 'descending' ? ' DESC' : '' );
-		$this->addOption( 'ORDER BY', 'fa_name' . $sort );
+		$this->addOption( 'ORDER BY', array(
+			'fa_name' . $sort,
+			'fa_timestamp' . $sort,
+			'fa_id' . $sort,
+		) );
 
 		$res = $this->select( __METHOD__ );
 
@@ -137,26 +153,41 @@ class ApiQueryFilearchive extends ApiQueryBase {
 		$result = $this->getResult();
 		foreach ( $res as $row ) {
 			if ( ++$count > $limit ) {
-				// We've reached the one extra which shows that there are additional pages to be had. Stop here...
-				$this->setContinueEnumParameter( 'continue', $row->fa_name );
+				// We've reached the one extra which shows that there are
+				// additional pages to be had. Stop here...
+				$this->setContinueEnumParameter(
+					'continue', "$row->fa_name|$row->fa_timestamp|$row->fa_id"
+				);
 				break;
 			}
 
 			$file = array();
+			$file['id'] = $row->fa_id;
 			$file['name'] = $row->fa_name;
 			$title = Title::makeTitle( NS_FILE, $row->fa_name );
 			self::addTitleInfo( $file, $title );
 
+			if ( $fld_description &&
+				Revision::userCanBitfield( $row->fa_deleted, File::DELETED_COMMENT, $user )
+			) {
+				$file['description'] = $row->fa_description;
+				if ( isset( $prop['parseddescription'] ) ) {
+					$file['parseddescription'] = Linker::formatComment(
+						$row->fa_description, $title );
+				}
+			}
+			if ( $fld_user &&
+				Revision::userCanBitfield( $row->fa_deleted, File::DELETED_USER, $user )
+			) {
+				$file['userid'] = $row->fa_user;
+				$file['user'] = $row->fa_user_text;
+			}
 			if ( $fld_sha1 ) {
 				$file['sha1'] = wfBaseConvert( $row->fa_sha1, 36, 16, 40 );
 			}
 			if ( $fld_timestamp ) {
 				$file['timestamp'] = wfTimestamp( TS_ISO_8601, $row->fa_timestamp );
 			}
-			if ( $fld_user ) {
-				$file['userid'] = $row->fa_user;
-				$file['user'] = $row->fa_user_text;
-			}
 			if ( $fld_size || $fld_dimensions ) {
 				$file['size'] = $row->fa_size;
 
@@ -168,20 +199,13 @@ class ApiQueryFilearchive extends ApiQueryBase {
 				$file['height'] = $row->fa_height;
 				$file['width'] = $row->fa_width;
 			}
-			if ( $fld_description ) {
-				$file['description'] = $row->fa_description;
-				if ( isset( $prop['parseddescription'] ) ) {
-					$file['parseddescription'] = Linker::formatComment(
-						$row->fa_description, $title );
-				}
-			}
 			if ( $fld_mediatype ) {
 				$file['mediatype'] = $row->fa_media_type;
 			}
 			if ( $fld_metadata ) {
 				$file['metadata'] = $row->fa_metadata
-						? ApiQueryImageInfo::processMetaData( unserialize( $row->fa_metadata ), $result )
-						: null;
+					? ApiQueryImageInfo::processMetaData( unserialize( $row->fa_metadata ), $result )
+					: null;
 			}
 			if ( $fld_bitdepth ) {
 				$file['bitdepth'] = $row->fa_bits;
@@ -209,7 +233,9 @@ class ApiQueryFilearchive extends ApiQueryBase {
 
 			$fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $file );
 			if ( !$fit ) {
-				$this->setContinueEnumParameter( 'continue', $row->fa_name );
+				$this->setContinueEnumParameter(
+					'continue', "$row->fa_name|$row->fa_timestamp|$row->fa_id"
+				);
 				break;
 			}
 		}
@@ -275,7 +301,8 @@ class ApiQueryFilearchive extends ApiQueryBase {
 				' sha1              - Adds SHA-1 hash for the image',
 				' timestamp         - Adds timestamp for the uploaded version',
 				' user              - Adds user who uploaded the image version',
-				' size              - Adds the size of the image in bytes and the height, width and page count (if applicable)',
+				' size              - Adds the size of the image in bytes and the height, ' .
+					'width and page count (if applicable)',
 				' dimensions        - Alias for size',
 				' description       - Adds description the image version',
 				' parseddescription - Parse the description on the version',
@@ -288,81 +315,8 @@ class ApiQueryFilearchive extends ApiQueryBase {
 		);
 	}
 
-	public function getResultProperties() {
-		return array(
-			'' => array(
-				'name' => 'string',
-				'ns' => 'namespace',
-				'title' => 'string',
-				'filehidden' => 'boolean',
-				'commenthidden' => 'boolean',
-				'userhidden' => 'boolean',
-				'suppressed' => 'boolean'
-			),
-			'sha1' => array(
-				'sha1' => 'string'
-			),
-			'timestamp' => array(
-				'timestamp' => 'timestamp'
-			),
-			'user' => array(
-				'userid' => 'integer',
-				'user' => 'string'
-			),
-			'size' => array(
-				'size' => 'integer',
-				'pagecount' => array(
-					ApiBase::PROP_TYPE => 'integer',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'height' => 'integer',
-				'width' => 'integer'
-			),
-			'dimensions' => array(
-				'size' => 'integer',
-				'pagecount' => array(
-					ApiBase::PROP_TYPE => 'integer',
-					ApiBase::PROP_NULLABLE => true
-				),
-				'height' => 'integer',
-				'width' => 'integer'
-			),
-			'description' => array(
-				'description' => 'string'
-			),
-			'parseddescription' => array(
-				'description' => 'string',
-				'parseddescription' => 'string'
-			),
-			'metadata' => array(
-				'metadata' => 'string'
-			),
-			'bitdepth' => array(
-				'bitdepth' => 'integer'
-			),
-			'mime' => array(
-				'mime' => 'string'
-			),
-			'mediatype' => array(
-				'mediatype' => 'string'
-			),
-			'archivename' => array(
-				'archivename' => 'string'
-			),
-		);
-	}
-
 	public function getDescription() {
-		return 'Enumerate all deleted files sequentially';
-	}
-
-	public function getPossibleErrors() {
-		return array_merge( parent::getPossibleErrors(), array(
-			array( 'code' => 'permissiondenied', 'info' => 'You don\'t have permission to view deleted file information' ),
-			array( 'code' => 'hashsearchdisabled', 'info' => 'Search by hash disabled in Miser Mode' ),
-			array( 'code' => 'invalidsha1hash', 'info' => 'The SHA1 hash provided is not valid' ),
-			array( 'code' => 'invalidsha1base36hash', 'info' => 'The SHA1Base36 hash provided is not valid' ),
-		) );
+		return 'Enumerate all deleted files sequentially.';
 	}
 
 	public function getExamples() {