]> scripts.mit.edu Git - autoinstallsdev/mediawiki.git/blobdiff - includes/api/ApiQueryImageInfo.php
MediaWiki 1.30.2
[autoinstallsdev/mediawiki.git] / includes / api / ApiQueryImageInfo.php
index 6853c7d926252fba9b022f9dcd01896ad534a36a..b1df982da745868acc8e8b6f4c9e28814cad9fb6 100644 (file)
@@ -1,10 +1,10 @@
 <?php
 /**
- * API for MediaWiki 1.8+
+ *
  *
  * Created on July 6, 2007
  *
- * Copyright © 2006 Yuri Astrakhan <Firstname><Lastname>@gmail.com
+ * Copyright © 2006 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * @file
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-       // Eclipse helper - will be ignored in production
-       require_once( 'ApiQueryBase.php' );
-}
-
 /**
  * A query action to get image information and upload history.
  *
  * @ingroup API
  */
 class ApiQueryImageInfo extends ApiQueryBase {
+       const TRANSFORM_LIMIT = 50;
+       private static $transformCount = 0;
 
-       public function __construct( $query, $moduleName, $prefix = 'ii' ) {
-               // We allow a subclass to override the prefix, to create a related API module.
-               // Some other parts of MediaWiki construct this with a null $prefix, which used to be ignored when this only took two arguments
+       public function __construct( ApiQuery $query, $moduleName, $prefix = 'ii' ) {
+               // We allow a subclass to override the prefix, to create a related API
+               // module. Some other parts of MediaWiki construct this with a null
+               // $prefix, which used to be ignored when this only took two arguments
                if ( is_null( $prefix ) ) {
                        $prefix = 'ii';
                }
@@ -52,19 +50,32 @@ class ApiQueryImageInfo extends ApiQueryBase {
 
                $scale = $this->getScale( $params );
 
-               $pageIds = $this->getPageSet()->getAllTitlesByNamespace();
+               $opts = [
+                       'version' => $params['metadataversion'],
+                       'language' => $params['extmetadatalanguage'],
+                       'multilang' => $params['extmetadatamultilang'],
+                       'extmetadatafilter' => $params['extmetadatafilter'],
+                       'revdelUser' => $this->getUser(),
+               ];
+
+               if ( isset( $params['badfilecontexttitle'] ) ) {
+                       $badFileContextTitle = Title::newFromText( $params['badfilecontexttitle'] );
+                       if ( !$badFileContextTitle ) {
+                               $this->dieUsage( 'Invalid title in badfilecontexttitle parameter', 'invalid-title' );
+                       }
+               } else {
+                       $badFileContextTitle = false;
+               }
+
+               $pageIds = $this->getPageSet()->getGoodAndMissingTitlesByNamespace();
                if ( !empty( $pageIds[NS_FILE] ) ) {
                        $titles = array_keys( $pageIds[NS_FILE] );
                        asort( $titles ); // Ensure the order is always the same
 
-                       $skip = false;
+                       $fromTitle = null;
                        if ( !is_null( $params['continue'] ) ) {
-                               $skip = true;
                                $cont = explode( '|', $params['continue'] );
-                               if ( count( $cont ) != 2 ) {
-                                       $this->dieUsage( 'Invalid continue param. You should pass the original ' .
-                                                       'value returned by the previous query', '_badcontinue' );
-                               }
+                               $this->dieContinueUsageIf( count( $cont ) != 2 );
                                $fromTitle = strval( $cont[0] );
                                $fromTimestamp = $cont[1];
                                // Filter out any titles before $fromTitle
@@ -77,50 +88,102 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                }
                        }
 
+                       $user = $this->getUser();
+                       $findTitles = array_map( function ( $title ) use ( $user ) {
+                               return [
+                                       'title' => $title,
+                                       'private' => $user,
+                               ];
+                       }, $titles );
+
+                       if ( $params['localonly'] ) {
+                               $images = RepoGroup::singleton()->getLocalRepo()->findFiles( $findTitles );
+                       } else {
+                               $images = RepoGroup::singleton()->findFiles( $findTitles );
+                       }
+
                        $result = $this->getResult();
-                       $images = RepoGroup::singleton()->findFiles( $titles );
-                       foreach ( $images as $img ) {
-                               // Skip redirects
-                               if ( $img->getOriginalTitle()->isRedirect() ) {
-                                       continue;
+                       foreach ( $titles as $title ) {
+                               $info = [];
+                               $pageId = $pageIds[NS_FILE][$title];
+                               $start = $title === $fromTitle ? $fromTimestamp : $params['start'];
+
+                               if ( !isset( $images[$title] ) ) {
+                                       if ( isset( $prop['uploadwarning'] ) || isset( $prop['badfile'] ) ) {
+                                               // uploadwarning and badfile need info about non-existing files
+                                               $images[$title] = wfLocalFile( $title );
+                                               // Doesn't exist, so set an empty image repository
+                                               $info['imagerepository'] = '';
+                                       } else {
+                                               $result->addValue(
+                                                       [ 'query', 'pages', intval( $pageId ) ],
+                                                       'imagerepository', ''
+                                               );
+                                               // The above can't fail because it doesn't increase the result size
+                                               continue;
+                                       }
                                }
 
-                               $start = $skip ? $fromTimestamp : $params['start'];
-                               $pageId = $pageIds[NS_IMAGE][ $img->getOriginalTitle()->getDBkey() ];
+                               /** @var File $img */
+                               $img = $images[$title];
 
-                               $fit = $result->addValue(
-                                       array( 'query', 'pages', intval( $pageId ) ),
-                                       'imagerepository', $img->getRepoName()
-                               );
+                               if ( self::getTransformCount() >= self::TRANSFORM_LIMIT ) {
+                                       if ( count( $pageIds[NS_FILE] ) == 1 ) {
+                                               // See the 'the user is screwed' comment below
+                                               $this->setContinueEnumParameter( 'start',
+                                                       $start !== null ? $start : wfTimestamp( TS_ISO_8601, $img->getTimestamp() )
+                                               );
+                                       } else {
+                                               $this->setContinueEnumParameter( 'continue',
+                                                       $this->getContinueStr( $img, $start ) );
+                                       }
+                                       break;
+                               }
+
+                               if ( !isset( $info['imagerepository'] ) ) {
+                                       $info['imagerepository'] = $img->getRepoName();
+                               }
+                               if ( isset( $prop['badfile'] ) ) {
+                                       $info['badfile'] = (bool)wfIsBadImage( $title, $badFileContextTitle );
+                               }
+
+                               $fit = $result->addValue( [ 'query', 'pages' ], intval( $pageId ), $info );
                                if ( !$fit ) {
-                                       if ( count( $pageIds[NS_IMAGE] ) == 1 ) {
+                                       if ( count( $pageIds[NS_FILE] ) == 1 ) {
                                                // The user is screwed. imageinfo can't be solely
                                                // responsible for exceeding the limit in this case,
                                                // so set a query-continue that just returns the same
                                                // thing again. When the violating queries have been
                                                // out-continued, the result will get through
                                                $this->setContinueEnumParameter( 'start',
-                                                       wfTimestamp( TS_ISO_8601, $img->getTimestamp() ) );
+                                                       $start !== null ? $start : wfTimestamp( TS_ISO_8601, $img->getTimestamp() )
+                                               );
                                        } else {
                                                $this->setContinueEnumParameter( 'continue',
-                                                       $this->getContinueStr( $img ) );
+                                                       $this->getContinueStr( $img, $start ) );
                                        }
                                        break;
                                }
 
+                               // Check if we can make the requested thumbnail, and get transform parameters.
+                               $finalThumbParams = $this->mergeThumbParams( $img, $scale, $params['urlparam'] );
+
                                // Get information about the current version first
                                // Check that the current version is within the start-end boundaries
                                $gotOne = false;
                                if (
                                        ( is_null( $start ) || $img->getTimestamp() <= $start ) &&
                                        ( is_null( $params['end'] ) || $img->getTimestamp() >= $params['end'] )
-                               )
-                               {
+                               ) {
                                        $gotOne = true;
+
                                        $fit = $this->addPageSubItem( $pageId,
-                                               self::getInfo( $img, $prop, $result, $scale ) );
+                                               static::getInfo( $img, $prop, $result,
+                                                       $finalThumbParams, $opts
+                                               )
+                                       );
                                        if ( !$fit ) {
-                                               if ( count( $pageIds[NS_IMAGE] ) == 1 ) {
+                                               if ( count( $pageIds[NS_FILE] ) == 1 ) {
                                                        // See the 'the user is screwed' comment above
                                                        $this->setContinueEnumParameter( 'start',
                                                                wfTimestamp( TS_ISO_8601, $img->getTimestamp() ) );
@@ -136,9 +199,11 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                // Get one more to facilitate query-continue functionality
                                $count = ( $gotOne ? 1 : 0 );
                                $oldies = $img->getHistory( $params['limit'] - $count + 1, $start, $params['end'] );
+                               /** @var File $oldie */
                                foreach ( $oldies as $oldie ) {
                                        if ( ++$count > $params['limit'] ) {
-                                               // We've reached the extra one which shows that there are additional pages to be had. Stop here...
+                                               // We've reached the extra one which shows that there are
+                                               // additional pages to be had. Stop here...
                                                // Only set a query-continue if there was only one title
                                                if ( count( $pageIds[NS_FILE] ) == 1 ) {
                                                        $this->setContinueEnumParameter( 'start',
@@ -146,10 +211,14 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                                }
                                                break;
                                        }
-                                       $fit = $this->addPageSubItem( $pageId,
-                                               self::getInfo( $oldie, $prop, $result ) );
+                                       $fit = self::getTransformCount() < self::TRANSFORM_LIMIT &&
+                                               $this->addPageSubItem( $pageId,
+                                                       static::getInfo( $oldie, $prop, $result,
+                                                               $finalThumbParams, $opts
+                                                       )
+                                               );
                                        if ( !$fit ) {
-                                               if ( count( $pageIds[NS_IMAGE] ) == 1 ) {
+                                               if ( count( $pageIds[NS_FILE] ) == 1 ) {
                                                        $this->setContinueEnumParameter( 'start',
                                                                wfTimestamp( TS_ISO_8601, $oldie->getTimestamp() ) );
                                                } else {
@@ -162,68 +231,192 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                if ( !$fit ) {
                                        break;
                                }
-                               $skip = false;
-                       }
-
-                       $data = $this->getResultData();
-                       foreach ( $data['query']['pages'] as $pageid => $arr ) {
-                               if ( !isset( $arr['imagerepository'] ) ) {
-                                       $result->addValue(
-                                               array( 'query', 'pages', $pageid ),
-                                               'imagerepository', ''
-                                       );
-                               }
-                               // The above can't fail because it doesn't increase the result size
                        }
                }
        }
 
        /**
-        * From parameters, construct a 'scale' array 
-        * @param $params Array: 
-        * @return Array or Null: key-val array of 'width' and 'height', or null
-        */     
+        * From parameters, construct a 'scale' array
+        * @param array $params Parameters passed to api.
+        * @return array|null Key-val array of 'width' and 'height', or null
+        */
        public function getScale( $params ) {
-               $p = $this->getModulePrefix();
-               if ( $params['urlheight'] != -1 && $params['urlwidth'] == -1 ) {
-                       $this->dieUsage( "${p}urlheight cannot be used without {$p}urlwidth", "{$p}urlwidth" );
-               }
-
                if ( $params['urlwidth'] != -1 ) {
-                       $scale = array();
+                       $scale = [];
                        $scale['width'] = $params['urlwidth'];
                        $scale['height'] = $params['urlheight'];
+               } elseif ( $params['urlheight'] != -1 ) {
+                       // Height is specified but width isn't
+                       // Don't set $scale['width']; this signals mergeThumbParams() to fill it with the image's width
+                       $scale = [];
+                       $scale['height'] = $params['urlheight'];
                } else {
-                       $scale = null;
+                       if ( $params['urlparam'] ) {
+                               // Audio files might not have a width/height.
+                               $scale = [];
+                       } else {
+                               $scale = null;
+                       }
                }
+
                return $scale;
        }
 
+       /** Validate and merge scale parameters with handler thumb parameters, give error if invalid.
+        *
+        * We do this later than getScale, since we need the image
+        * to know which handler, since handlers can make their own parameters.
+        * @param File $image Image that params are for.
+        * @param array $thumbParams Thumbnail parameters from getScale
+        * @param string $otherParams String of otherParams (iiurlparam).
+        * @return array Array of parameters for transform.
+        */
+       protected function mergeThumbParams( $image, $thumbParams, $otherParams ) {
+               if ( $thumbParams === null ) {
+                       // No scaling requested
+                       return null;
+               }
+               if ( !isset( $thumbParams['width'] ) && isset( $thumbParams['height'] ) ) {
+                       // We want to limit only by height in this situation, so pass the
+                       // image's full width as the limiting width. But some file types
+                       // don't have a width of their own, so pick something arbitrary so
+                       // thumbnailing the default icon works.
+                       if ( $image->getWidth() <= 0 ) {
+                               $thumbParams['width'] = max( $this->getConfig()->get( 'ThumbLimits' ) );
+                       } else {
+                               $thumbParams['width'] = $image->getWidth();
+                       }
+               }
+
+               if ( !$otherParams ) {
+                       $this->checkParameterNormalise( $image, $thumbParams );
+                       return $thumbParams;
+               }
+               $p = $this->getModulePrefix();
+
+               $h = $image->getHandler();
+               if ( !$h ) {
+                       $this->addWarning( [ 'apiwarn-nothumb-noimagehandler', wfEscapeWikiText( $image->getName() ) ] );
+
+                       return $thumbParams;
+               }
+
+               $paramList = $h->parseParamString( $otherParams );
+               if ( !$paramList ) {
+                       // Just set a warning (instead of dieUsage), as in many cases
+                       // we could still render the image using width and height parameters,
+                       // and this type of thing could happen between different versions of
+                       // handlers.
+                       $this->addWarning( [ 'apiwarn-badurlparam', $p, wfEscapeWikiText( $image->getName() ) ] );
+                       $this->checkParameterNormalise( $image, $thumbParams );
+                       return $thumbParams;
+               }
+
+               if ( isset( $paramList['width'] ) && isset( $thumbParams['width'] ) ) {
+                       if ( intval( $paramList['width'] ) != intval( $thumbParams['width'] ) ) {
+                               $this->addWarning(
+                                       [ 'apiwarn-urlparamwidth', $p, $paramList['width'], $thumbParams['width'] ]
+                               );
+                       }
+               }
+
+               foreach ( $paramList as $name => $value ) {
+                       if ( !$h->validateParam( $name, $value ) ) {
+                               $this->dieWithError(
+                                       [ 'apierror-invalidurlparam', $p, wfEscapeWikiText( $name ), wfEscapeWikiText( $value ) ]
+                               );
+                       }
+               }
+
+               $finalParams = $thumbParams + $paramList;
+               $this->checkParameterNormalise( $image, $finalParams );
+               return $finalParams;
+       }
+
+       /**
+        * Verify that the final image parameters can be normalised.
+        *
+        * This doesn't use the normalised parameters, since $file->transform
+        * expects the pre-normalised parameters, but doing the normalisation
+        * allows us to catch certain error conditions early (such as missing
+        * required parameter).
+        *
+        * @param File $image
+        * @param array $finalParams List of parameters to transform image with
+        */
+       protected function checkParameterNormalise( $image, $finalParams ) {
+               $h = $image->getHandler();
+               if ( !$h ) {
+                       return;
+               }
+               // Note: normaliseParams modifies the array in place, but we aren't interested
+               // in the actual normalised version, only if we can actually normalise them,
+               // so we use the functions scope to throw away the normalisations.
+               if ( !$h->normaliseParams( $image, $finalParams ) ) {
+                       $this->dieWithError( [ 'apierror-urlparamnormal', wfEscapeWikiText( $image->getName() ) ] );
+               }
+       }
 
        /**
         * Get result information for an image revision
         *
-        * @param $file File object
-        * @param $prop Array of properties to get (in the keys)
-        * @param $result ApiResult object
-        * @param $scale Array containing 'width' and 'height' items, or null
-        * @return Array: result array
+        * @param File $file
+        * @param array $prop Array of properties to get (in the keys)
+        * @param ApiResult $result
+        * @param array $thumbParams Containing 'width' and 'height' items, or null
+        * @param array|bool|string $opts Options for data fetching.
+        *   This is an array consisting of the keys:
+        *    'version': The metadata version for the metadata option
+        *    'language': The language for extmetadata property
+        *    'multilang': Return all translations in extmetadata property
+        *    'revdelUser': User to use when checking whether to show revision-deleted fields.
+        * @return array Result array
         */
-       static function getInfo( $file, $prop, $result, $scale = null ) {
-               $vals = array();
+       public static function getInfo( $file, $prop, $result, $thumbParams = null, $opts = false ) {
+               global $wgContLang;
+
+               $anyHidden = false;
+
+               if ( !$opts || is_string( $opts ) ) {
+                       $opts = [
+                               'version' => $opts ?: 'latest',
+                               'language' => $wgContLang,
+                               'multilang' => false,
+                               'extmetadatafilter' => [],
+                               'revdelUser' => null,
+                       ];
+               }
+               $version = $opts['version'];
+               $vals = [
+                       ApiResult::META_TYPE => 'assoc',
+               ];
                // Timestamp is shown even if the file is revdelete'd in interface
                // so do same here.
                if ( isset( $prop['timestamp'] ) ) {
                        $vals['timestamp'] = wfTimestamp( TS_ISO_8601, $file->getTimestamp() );
                }
 
+               // Handle external callers who don't pass revdelUser
+               if ( isset( $opts['revdelUser'] ) && $opts['revdelUser'] ) {
+                       $revdelUser = $opts['revdelUser'];
+                       $canShowField = function ( $field ) use ( $file, $revdelUser ) {
+                               return $file->userCan( $field, $revdelUser );
+                       };
+               } else {
+                       $canShowField = function ( $field ) use ( $file ) {
+                               return !$file->isDeleted( $field );
+                       };
+               }
+
                $user = isset( $prop['user'] );
                $userid = isset( $prop['userid'] );
 
                if ( $user || $userid ) {
                        if ( $file->isDeleted( File::DELETED_USER ) ) {
-                               $vals['userhidden'] = '';
-                       } else {
+                               $vals['userhidden'] = true;
+                               $anyHidden = true;
+                       }
+                       if ( $canShowField( File::DELETED_USER ) ) {
                                if ( $user ) {
                                        $vals['user'] = $file->getUser();
                                }
@@ -231,7 +424,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                        $vals['userid'] = $file->getUser( 'id' );
                                }
                                if ( !$file->getUser( 'id' ) ) {
-                                       $vals['anon'] = '';
+                                       $vals['anon'] = true;
                                }
                        }
                }
@@ -242,11 +435,18 @@ class ApiQueryImageInfo extends ApiQueryBase {
                        $vals['size'] = intval( $file->getSize() );
                        $vals['width'] = intval( $file->getWidth() );
                        $vals['height'] = intval( $file->getHeight() );
-                       
+
                        $pageCount = $file->pageCount();
                        if ( $pageCount !== false ) {
                                $vals['pagecount'] = $pageCount;
                        }
+
+                       // length as in how many seconds long a video is.
+                       $length = $file->getLength();
+                       if ( $length ) {
+                               // Call it duration, because "length" can be ambiguous.
+                               $vals['duration'] = (float)$length;
+                       }
                }
 
                $pcomment = isset( $prop['parsedcomment'] );
@@ -254,41 +454,62 @@ class ApiQueryImageInfo extends ApiQueryBase {
 
                if ( $pcomment || $comment ) {
                        if ( $file->isDeleted( File::DELETED_COMMENT ) ) {
-                               $vals['commenthidden'] = '';
-                       } else {
+                               $vals['commenthidden'] = true;
+                               $anyHidden = true;
+                       }
+                       if ( $canShowField( File::DELETED_COMMENT ) ) {
                                if ( $pcomment ) {
-                                       global $wgUser;
-                                       $vals['parsedcomment'] = $wgUser->getSkin()->formatComment(
-                                               $file->getDescription(), $file->getTitle() );
+                                       $vals['parsedcomment'] = Linker::formatComment(
+                                               $file->getDescription( File::RAW ), $file->getTitle() );
                                }
                                if ( $comment ) {
-                                       $vals['comment'] = $file->getDescription();
+                                       $vals['comment'] = $file->getDescription( File::RAW );
                                }
                        }
                }
 
+               $canonicaltitle = isset( $prop['canonicaltitle'] );
                $url = isset( $prop['url'] );
                $sha1 = isset( $prop['sha1'] );
                $meta = isset( $prop['metadata'] );
+               $extmetadata = isset( $prop['extmetadata'] );
+               $commonmeta = isset( $prop['commonmetadata'] );
                $mime = isset( $prop['mime'] );
+               $mediatype = isset( $prop['mediatype'] );
                $archive = isset( $prop['archivename'] );
                $bitdepth = isset( $prop['bitdepth'] );
+               $uploadwarning = isset( $prop['uploadwarning'] );
 
-               if ( ( $url || $sha1 || $meta || $mime || $archive || $bitdepth )
-                               && $file->isDeleted( File::DELETED_FILE ) ) {
-                       $vals['filehidden'] = '';
+               if ( $uploadwarning ) {
+                       $vals['html'] = SpecialUpload::getExistsWarning( UploadBase::getExistsWarning( $file ) );
+               }
 
-                       //Early return, tidier than indenting all following things one level
+               if ( $file->isDeleted( File::DELETED_FILE ) ) {
+                       $vals['filehidden'] = true;
+                       $anyHidden = true;
+               }
+
+               if ( $anyHidden && $file->isDeleted( File::DELETED_RESTRICTED ) ) {
+                       $vals['suppressed'] = true;
+               }
+
+               if ( !$canShowField( File::DELETED_FILE ) ) {
+                       // Early return, tidier than indenting all following things one level
                        return $vals;
                }
 
+               if ( $canonicaltitle ) {
+                       $vals['canonicaltitle'] = $file->getTitle()->getPrefixedText();
+               }
+
                if ( $url ) {
-                       if ( !is_null( $scale ) && !$file->isOld() ) {
-                               $mto = $file->transform( array( 'width' => $scale['width'], 'height' => $scale['height'] ) );
+                       if ( !is_null( $thumbParams ) ) {
+                               $mto = $file->transform( $thumbParams );
+                               self::$transformCount++;
                                if ( $mto && !$mto->isError() ) {
-                                       $vals['thumburl'] = wfExpandUrl( $mto->getUrl() );
+                                       $vals['thumburl'] = wfExpandUrl( $mto->getUrl(), PROTO_CURRENT );
 
-                                       // bug 23834 - If the URL's are the same, we haven't resized it, so shouldn't give the wanted
+                                       // T25834 - If the URLs are the same, we haven't resized it, so shouldn't give the wanted
                                        // thumbnail sizes for the thumbnail actual size
                                        if ( $mto->getUrl() !== $file->getUrl() ) {
                                                $vals['thumbwidth'] = intval( $mto->getWidth() );
@@ -299,32 +520,65 @@ class ApiQueryImageInfo extends ApiQueryBase {
                                        }
 
                                        if ( isset( $prop['thumbmime'] ) && $file->getHandler() ) {
-                                               list( $ext, $mime ) = $file->getHandler()->getThumbType( 
-                                                       substr( $mto->getPath(), strrpos( $mto->getPath(), '.' ) + 1 ), 
-                                                       $file->getMimeType(), $thumbParams );
+                                               list( , $mime ) = $file->getHandler()->getThumbType(
+                                                       $mto->getExtension(), $file->getMimeType(), $thumbParams );
                                                $vals['thumbmime'] = $mime;
                                        }
-                               } else if ( $mto && $mto->isError() ) {
+                               } elseif ( $mto && $mto->isError() ) {
                                        $vals['thumberror'] = $mto->toText();
                                }
                        }
-                       $vals['url'] = $file->getFullURL();
-                       $vals['descriptionurl'] = wfExpandUrl( $file->getDescriptionUrl() );
+                       $vals['url'] = wfExpandUrl( $file->getFullUrl(), PROTO_CURRENT );
+                       $vals['descriptionurl'] = wfExpandUrl( $file->getDescriptionUrl(), PROTO_CURRENT );
+
+                       $shortDescriptionUrl = $file->getDescriptionShortUrl();
+                       if ( $shortDescriptionUrl !== null ) {
+                               $vals['descriptionshorturl'] = wfExpandUrl( $shortDescriptionUrl, PROTO_CURRENT );
+                       }
                }
-               
+
                if ( $sha1 ) {
-                       $vals['sha1'] = wfBaseConvert( $file->getSha1(), 36, 16, 40 );
+                       $vals['sha1'] = Wikimedia\base_convert( $file->getSha1(), 36, 16, 40 );
                }
 
                if ( $meta ) {
-                       $metadata = $file->getMetadata();
-                       $vals['metadata'] = $metadata ? self::processMetaData( unserialize( $metadata ), $result ) : null;
+                       MediaWiki\suppressWarnings();
+                       $metadata = unserialize( $file->getMetadata() );
+                       MediaWiki\restoreWarnings();
+                       if ( $metadata && $version !== 'latest' ) {
+                               $metadata = $file->convertMetadataVersion( $metadata, $version );
+                       }
+                       $vals['metadata'] = $metadata ? static::processMetaData( $metadata, $result ) : null;
+               }
+               if ( $commonmeta ) {
+                       $metaArray = $file->getCommonMetaArray();
+                       $vals['commonmetadata'] = $metaArray ? static::processMetaData( $metaArray, $result ) : [];
+               }
+
+               if ( $extmetadata ) {
+                       // Note, this should return an array where all the keys
+                       // start with a letter, and all the values are strings.
+                       // Thus there should be no issue with format=xml.
+                       $format = new FormatMetadata;
+                       $format->setSingleLanguage( !$opts['multilang'] );
+                       $format->getContext()->setLanguage( $opts['language'] );
+                       $extmetaArray = $format->fetchExtendedMetadata( $file );
+                       if ( $opts['extmetadatafilter'] ) {
+                               $extmetaArray = array_intersect_key(
+                                       $extmetaArray, array_flip( $opts['extmetadatafilter'] )
+                               );
+                       }
+                       $vals['extmetadata'] = $extmetaArray;
                }
 
                if ( $mime ) {
                        $vals['mime'] = $file->getMimeType();
                }
 
+               if ( $mediatype ) {
+                       $vals['mediatype'] = $file->getMediaType();
+               }
+
                if ( $archive && $file->isOld() ) {
                        $vals['archivename'] = $file->getArchiveName();
                }
@@ -336,145 +590,237 @@ class ApiQueryImageInfo extends ApiQueryBase {
                return $vals;
        }
 
-       /*
+       /**
+        * Get the count of image transformations performed
+        *
+        * If this is >= TRANSFORM_LIMIT, you should probably stop processing images.
+        *
+        * @return int Count
+        */
+       static function getTransformCount() {
+               return self::$transformCount;
+       }
+
+       /**
         *
-        * @param $metadata Array
-        * @param $result ApiResult
-        * @return Array
+        * @param array $metadata
+        * @param ApiResult $result
+        * @return array
         */
        public static function processMetaData( $metadata, $result ) {
-               $retval = array();
+               $retval = [];
                if ( is_array( $metadata ) ) {
                        foreach ( $metadata as $key => $value ) {
-                               $r = array( 'name' => $key );
+                               $r = [
+                                       'name' => $key,
+                                       ApiResult::META_BC_BOOLS => [ 'value' ],
+                               ];
                                if ( is_array( $value ) ) {
-                                       $r['value'] = self::processMetaData( $value, $result );
+                                       $r['value'] = static::processMetaData( $value, $result );
                                } else {
                                        $r['value'] = $value;
                                }
                                $retval[] = $r;
                        }
                }
-               $result->setIndexedTagName( $retval, 'metadata' );
+               ApiResult::setIndexedTagName( $retval, 'metadata' );
+
                return $retval;
        }
 
        public function getCacheMode( $params ) {
+               if ( $this->userCanSeeRevDel() ) {
+                       return 'private';
+               }
+
                return 'public';
        }
 
-       private function getContinueStr( $img ) {
-               return $img->getOriginalTitle()->getText() .
-                       '|' .  $img->getTimestamp();
+       /**
+        * @param File $img
+        * @param null|string $start
+        * @return string
+        */
+       protected function getContinueStr( $img, $start = null ) {
+               if ( $start === null ) {
+                       $start = $img->getTimestamp();
+               }
+
+               return $img->getOriginalTitle()->getDBkey() . '|' . $start;
        }
 
        public function getAllowedParams() {
-               return array(
-                       'prop' => array(
+               global $wgContLang;
+
+               return [
+                       'prop' => [
                                ApiBase::PARAM_ISMULTI => true,
                                ApiBase::PARAM_DFLT => 'timestamp|user',
-                               ApiBase::PARAM_TYPE => self::getPropertyNames()
-                       ),
-                       'limit' => array(
+                               ApiBase::PARAM_TYPE => static::getPropertyNames(),
+                               ApiBase::PARAM_HELP_MSG_PER_VALUE => static::getPropertyMessages(),
+                       ],
+                       'limit' => [
                                ApiBase::PARAM_TYPE => 'limit',
                                ApiBase::PARAM_DFLT => 1,
                                ApiBase::PARAM_MIN => 1,
                                ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
                                ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
-                       ),
-                       'start' => array(
+                       ],
+                       'start' => [
                                ApiBase::PARAM_TYPE => 'timestamp'
-                       ),
-                       'end' => array(
+                       ],
+                       'end' => [
                                ApiBase::PARAM_TYPE => 'timestamp'
-                       ),
-                       'urlwidth' => array(
+                       ],
+                       'urlwidth' => [
                                ApiBase::PARAM_TYPE => 'integer',
-                               ApiBase::PARAM_DFLT => -1
-                       ),
-                       'urlheight' => array(
+                               ApiBase::PARAM_DFLT => -1,
+                               ApiBase::PARAM_HELP_MSG => [
+                                       'apihelp-query+imageinfo-param-urlwidth',
+                                       self::TRANSFORM_LIMIT,
+                               ],
+                       ],
+                       'urlheight' => [
                                ApiBase::PARAM_TYPE => 'integer',
                                ApiBase::PARAM_DFLT => -1
-                       ),
-                       'continue' => null,
-               );
+                       ],
+                       'metadataversion' => [
+                               ApiBase::PARAM_TYPE => 'string',
+                               ApiBase::PARAM_DFLT => '1',
+                       ],
+                       'extmetadatalanguage' => [
+                               ApiBase::PARAM_TYPE => 'string',
+                               ApiBase::PARAM_DFLT => $wgContLang->getCode(),
+                       ],
+                       'extmetadatamultilang' => [
+                               ApiBase::PARAM_TYPE => 'boolean',
+                               ApiBase::PARAM_DFLT => false,
+                       ],
+                       'extmetadatafilter' => [
+                               ApiBase::PARAM_TYPE => 'string',
+                               ApiBase::PARAM_ISMULTI => true,
+                       ],
+                       'urlparam' => [
+                               ApiBase::PARAM_DFLT => '',
+                               ApiBase::PARAM_TYPE => 'string',
+                       ],
+                       'badfilecontexttitle' => [
+                               ApiBase::PARAM_TYPE => 'string',
+                       ],
+                       'continue' => [
+                               ApiBase::PARAM_HELP_MSG => 'api-help-param-continue',
+                       ],
+                       'localonly' => false,
+               ];
        }
 
        /**
         * Returns all possible parameters to iiprop
+        *
+        * @param array $filter List of properties to filter out
+        * @return array
         */
-       public static function getPropertyNames() {
-               return array(
-                       'timestamp',
-                       'user',
-                       'userid',
-                       'comment',
-                       'parsedcomment',
-                       'url',
-                       'size',
-                       'dimensions', // For backwards compatibility with Allimages
-                       'sha1',
-                       'mime',
-                       'thumbmime',
-                       'metadata',
-                       'archivename',
-                       'bitdepth',
-               );
+       public static function getPropertyNames( $filter = [] ) {
+               return array_keys( static::getPropertyMessages( $filter ) );
        }
 
-
        /**
-        * Return the API documentation for the parameters. 
-        * @return {Array} parameter documentation.
+        * Returns messages for all possible parameters to iiprop
+        *
+        * @param array $filter List of properties to filter out
+        * @return array
         */
-       public function getParamDescription() {
-               $p = $this->getModulePrefix();
-               return array(
-                       'prop' => array(
-                               'What image information to get:',
-                               ' timestamp     - Adds timestamp for the uploaded version',
-                               ' user          - Adds the user who uploaded the image version',
-                               ' userid        - Add the user id that uploaded the image version',
-                               ' comment       - Comment on the version',
-                               ' parsedcomment - Parse the comment on the version',
-                               ' url           - Gives URL to the image and the description page',
-                               ' size          - Adds the size of the image in bytes and the height and width',
-                               ' dimensions    - Alias for size',
-                               ' sha1          - Adds sha1 hash for the image',
-                               ' mime          - Adds MIME of the image',
-                               ' thumbmime     - Adss MIME of the image thumbnail (requires url)',
-                               ' metadata      - Lists EXIF metadata for the version of the image',
-                               ' archivename   - Adds the file name of the archive version for non-latest versions',
-                               ' bitdepth      - Adds the bit depth of the version',
-                       ),
-                       'urlwidth' => array( "If {$p}prop=url is set, a URL to an image scaled to this width will be returned.",
-                                           'Only the current version of the image can be scaled' ),
-                       'urlheight' => "Similar to {$p}urlwidth. Cannot be used without {$p}urlwidth",
-                       'limit' => 'How many image revisions to return',
-                       'start' => 'Timestamp to start listing from',
-                       'end' => 'Timestamp to stop listing at',
-                       'continue' => 'If the query response includes a continue value, use it here to get another page of results'
+       public static function getPropertyMessages( $filter = [] ) {
+               return array_diff_key(
+                       [
+                               'timestamp' => 'apihelp-query+imageinfo-paramvalue-prop-timestamp',
+                               'user' => 'apihelp-query+imageinfo-paramvalue-prop-user',
+                               'userid' => 'apihelp-query+imageinfo-paramvalue-prop-userid',
+                               'comment' => 'apihelp-query+imageinfo-paramvalue-prop-comment',
+                               'parsedcomment' => 'apihelp-query+imageinfo-paramvalue-prop-parsedcomment',
+                               'canonicaltitle' => 'apihelp-query+imageinfo-paramvalue-prop-canonicaltitle',
+                               'url' => 'apihelp-query+imageinfo-paramvalue-prop-url',
+                               'size' => 'apihelp-query+imageinfo-paramvalue-prop-size',
+                               'dimensions' => 'apihelp-query+imageinfo-paramvalue-prop-dimensions',
+                               'sha1' => 'apihelp-query+imageinfo-paramvalue-prop-sha1',
+                               'mime' => 'apihelp-query+imageinfo-paramvalue-prop-mime',
+                               'thumbmime' => 'apihelp-query+imageinfo-paramvalue-prop-thumbmime',
+                               'mediatype' => 'apihelp-query+imageinfo-paramvalue-prop-mediatype',
+                               'metadata' => 'apihelp-query+imageinfo-paramvalue-prop-metadata',
+                               'commonmetadata' => 'apihelp-query+imageinfo-paramvalue-prop-commonmetadata',
+                               'extmetadata' => 'apihelp-query+imageinfo-paramvalue-prop-extmetadata',
+                               'archivename' => 'apihelp-query+imageinfo-paramvalue-prop-archivename',
+                               'bitdepth' => 'apihelp-query+imageinfo-paramvalue-prop-bitdepth',
+                               'uploadwarning' => 'apihelp-query+imageinfo-paramvalue-prop-uploadwarning',
+                               'badfile' => 'apihelp-query+imageinfo-paramvalue-prop-badfile',
+                       ],
+                       array_flip( $filter )
                );
        }
 
-       public function getDescription() {
-               return 'Returns image information and upload history';
+       /**
+        * Returns array key value pairs of properties and their descriptions
+        *
+        * @deprecated since 1.25
+        * @param string $modulePrefix
+        * @return array
+        */
+       private static function getProperties( $modulePrefix = '' ) {
+               return [
+                       'timestamp' => ' timestamp     - Adds timestamp for the uploaded version',
+                       'user' => ' user          - Adds the user who uploaded the image version',
+                       'userid' => ' userid        - Add the user ID that uploaded the image version',
+                       'comment' => ' comment       - Comment on the version',
+                       'parsedcomment' => ' parsedcomment - Parse the comment on the version',
+                       'canonicaltitle' => ' canonicaltitle - Adds the canonical title of the image file',
+                       'url' => ' url           - Gives URL to the image and the description page',
+                       'size' => ' size          - Adds the size of the image in bytes, ' .
+                               'its height and its width. Page count and duration are added if applicable',
+                       'dimensions' => ' dimensions    - Alias for size', // B/C with Allimages
+                       'sha1' => ' sha1          - Adds SHA-1 hash for the image',
+                       'mime' => ' mime          - Adds MIME type of the image',
+                       'thumbmime' => ' thumbmime     - Adds MIME type of the image thumbnail' .
+                               ' (requires url and param ' . $modulePrefix . 'urlwidth)',
+                       'mediatype' => ' mediatype     - Adds the media type of the image',
+                       'metadata' => ' metadata      - Lists Exif metadata for the version of the image',
+                       'commonmetadata' => ' commonmetadata - Lists file format generic metadata ' .
+                               'for the version of the image',
+                       'extmetadata' => ' extmetadata   - Lists formatted metadata combined ' .
+                               'from multiple sources. Results are HTML formatted.',
+                       'archivename' => ' archivename   - Adds the file name of the archive ' .
+                               'version for non-latest versions',
+                       'bitdepth' => ' bitdepth      - Adds the bit depth of the version',
+                       'uploadwarning' => ' uploadwarning - Used by the Special:Upload page to ' .
+                               'get information about an existing file. Not intended for use outside MediaWiki core',
+               ];
        }
 
-       public function getPossibleErrors() {
-               return array_merge( parent::getPossibleErrors(), array(
-                       array( 'code' => 'iiurlwidth', 'info' => 'iiurlheight cannot be used without iiurlwidth' ),
-               ) );
+       /**
+        * Returns the descriptions for the properties provided by getPropertyNames()
+        *
+        * @deprecated since 1.25
+        * @param array $filter List of properties to filter out
+        * @param string $modulePrefix
+        * @return array
+        */
+       public static function getPropertyDescriptions( $filter = [], $modulePrefix = '' ) {
+               return array_merge(
+                       [ 'What image information to get:' ],
+                       array_values( array_diff_key( static::getProperties( $modulePrefix ), array_flip( $filter ) ) )
+               );
        }
 
-       protected function getExamples() {
-               return array(
-                       'api.php?action=query&titles=File:Albert%20Einstein%20Head.jpg&prop=imageinfo',
-                       'api.php?action=query&titles=File:Test.jpg&prop=imageinfo&iilimit=50&iiend=20071231235959&iiprop=timestamp|user|url',
-               );
+       protected function getExamplesMessages() {
+               return [
+                       'action=query&titles=File:Albert%20Einstein%20Head.jpg&prop=imageinfo'
+                               => 'apihelp-query+imageinfo-example-simple',
+                       'action=query&titles=File:Test.jpg&prop=imageinfo&iilimit=50&' .
+                               'iiend=2007-12-31T23:59:59Z&iiprop=timestamp|user|url'
+                               => 'apihelp-query+imageinfo-example-dated',
+               ];
        }
 
-       public function getVersion() {
-               return __CLASS__ . ': $Id$';
+       public function getHelpUrls() {
+               return 'https://www.mediawiki.org/wiki/Special:MyLanguage/API:Imageinfo';
        }
 }