*/
use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
require __DIR__ . '/includes/WebStart.php';
function wfStreamThumb( array $params ) {
global $wgVaryOnXFP;
- $headers = array(); // HTTP headers to send
+ $headers = []; // HTTP headers to send
$fileName = isset( $params['f'] ) ? $params['f'] : '';
}
// Check permissions if there are read restrictions
- $varyHeader = array();
- if ( !in_array( 'read', User::getGroupPermissions( array( '*' ) ), true ) ) {
+ $varyHeader = [];
+ if ( !in_array( 'read', User::getGroupPermissions( [ '*' ] ), true ) ) {
if ( !$img->getTitle() || !$img->getTitle()->userCan( 'read' ) ) {
wfThumbError( 403, 'Access denied. You do not have permission to access ' .
'the source file.' );
return;
} catch ( MWException $e ) {
wfThumbError( 500, $e->getHTML(), 'Exception caught while extracting thumb name',
- array( 'exception' => $e ) );
+ [ 'exception' => $e ] );
return;
}
// For 404 handled thumbnails, we only use the base name of the URI
// for the thumb params and the parent directory for the source file name.
// Check that the zone relative path matches up so squid caches won't pick
- // up thumbs that would not be purged on source file deletion (bug 34231).
+ // up thumbs that would not be purged on source file deletion (T36231).
if ( $rel404 !== null ) { // thumbnail was handled via 404
if ( rawurldecode( $rel404 ) === $img->getThumbRel( $thumbName ) ) {
// Request for the canonical thumbnail name
$streamtime = microtime( true ) - $starttime;
if ( $status->isOK() ) {
- RequestContext::getMain()->getStats()->timing( 'media.thumbnail.stream', $streamtime );
+ MediaWikiServices::getInstance()->getStatsdDataFactory()->timing(
+ 'media.thumbnail.stream', $streamtime
+ );
} else {
- wfThumbError( 500, 'Could not stream the file', null, array( 'file' => $thumbName,
- 'path' => $thumbPath, 'error' => $status->getWikiText() ) );
+ wfThumbError( 500, 'Could not stream the file', null, [ 'file' => $thumbName,
+ 'path' => $thumbPath, 'error' => $status->getWikiText( false, false, 'en' ) ] );
}
return;
}
// Check for thumbnail generation errors...
$msg = wfMessage( 'thumbnail_error' );
$errorCode = 500;
+
if ( !$thumb ) {
$errorMsg = $errorMsg ?: $msg->rawParams( 'File::transform() returned false' )->escaped();
if ( $errorMsg instanceof MessageSpecifier &&
}
} elseif ( $thumb->isError() ) {
$errorMsg = $thumb->getHtmlMsg();
+ $errorCode = $thumb->getHttpStatusCode();
} elseif ( !$thumb->hasFile() ) {
$errorMsg = $msg->rawParams( 'No path supplied in thumbnail object' )->escaped();
} elseif ( $thumb->fileIsSource() ) {
}
if ( $errorMsg !== false ) {
- wfThumbError( $errorCode, $errorMsg, null, array( 'file' => $thumbName, 'path' => $thumbPath ) );
+ wfThumbError( $errorCode, $errorMsg, null, [ 'file' => $thumbName, 'path' => $thumbPath ] );
} else {
// Stream the file if there were no errors
$status = $thumb->streamFileWithStatus( $headers );
if ( !$status->isOK() ) {
- wfThumbError( 500, 'Could not stream the file', null, array(
- 'file' => $thumbName, 'path' => $thumbPath, 'error' => $status->getWikiText() ) );
+ wfThumbError( 500, 'Could not stream the file', null, [
+ 'file' => $thumbName, 'path' => $thumbPath,
+ 'error' => $status->getWikiText( false, false, 'en' ) ] );
}
}
}
// Check if this file keeps failing to render
if ( $cache->get( $key ) >= 4 ) {
- return array( false, wfMessage( 'thumbnail_image-failure-limit', 4 ) );
+ return [ false, wfMessage( 'thumbnail_image-failure-limit', 4 ) ];
}
$done = false;
// Thumbnail isn't already there, so create the new thumbnail...
try {
$work = new PoolCounterWorkViaCallback( $poolCounterType, sha1( $file->getName() ),
- array(
+ [
'doWork' => function () use ( $file, $params ) {
return $file->transform( $params, File::RENDER_NOW );
},
'error' => function ( Status $status ) {
return wfMessage( 'generic-pool-error' )->parse() . '<hr>' . $status->getHTML();
}
- )
+ ]
);
$result = $work->execute();
if ( $result instanceof MediaTransformOutput ) {
$cache->incrWithInit( $key, $cache::TTL_HOUR + mt_rand( 0, 300 ) );
}
- return array( $thumb, $errorHtml );
+ return [ $thumb, $errorHtml ];
}
/**
return null; // not a valid looking thumbnail request
}
- $params = array( 'f' => $filename, 'rel404' => $rel );
+ $params = [ 'f' => $filename, 'rel404' => $rel ];
if ( $archOrTemp === 'archive/' ) {
$params['archived'] = 1;
} elseif ( $archOrTemp === 'temp/' ) {
$thumbname = $params['thumbName'];
unset( $params['thumbName'] );
- // Do the hook first for older extensions that rely on it.
- if ( !Hooks::run( 'ExtractThumbParameters', array( $thumbname, &$params ) ) ) {
- // Check hooks if parameters can be extracted
- // Hooks return false if they manage to *resolve* the parameters
- // This hook should be considered deprecated
- wfDeprecated( 'ExtractThumbParameters', '1.22' );
- return $params; // valid thumbnail URL (via extension or config)
- }
-
// FIXME: Files in the temp zone don't set a MIME type, which means
// they don't have a handler. Which means we can't parse the param
// string. However, not a big issue as what good is a param string
* @param array $context Error context, for internal logging. Only used for HTTP 500 errors.
* @return void
*/
-function wfThumbError( $status, $msgHtml, $msgText = null, $context = array() ) {
+function wfThumbError( $status, $msgHtml, $msgText = null, $context = [] ) {
global $wgShowHostnames;
header( 'Cache-Control: no-cache' );