X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=blobdiff_plain;f=thumb.php;h=d8ed246f9653ef42bd759b504880196b8693742e;hb=2241e7d26c6555f2d85d0a24e5e160c6946e9e85;hp=89cc834355a061c872af677bc900f7050e0b3908;hpb=96484126651b7f2550df5a8cc4a998d19b27b73c;p=lhc%2Fweb%2Fwiklou.git diff --git a/thumb.php b/thumb.php index 89cc834355..d8ed246f96 100644 --- a/thumb.php +++ b/thumb.php @@ -24,7 +24,7 @@ define( 'MW_NO_OUTPUT_COMPRESSION', 1 ); require __DIR__ . '/includes/WebStart.php'; -// Don't use fancy mime detection, just check the file extension for jpg/gif/png +// Don't use fancy MIME detection, just check the file extension for jpg/gif/png $wgTrivialMimeDetection = true; if ( defined( 'THUMB_HANDLER' ) ) { @@ -376,7 +376,7 @@ function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath $done = false; // Record failures on PHP fatals in addition to caching exceptions - register_shutdown_function( function() use ( &$done, $key ) { + register_shutdown_function( function () use ( &$done, $key ) { if ( !$done ) { // transform() gave a fatal global $wgMemc; // Randomize TTL to reduce stampedes @@ -388,7 +388,8 @@ function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath $errorHtml = false; // guard thumbnail rendering with PoolCounter to avoid stampedes - // expensive files use a separate PoolCounter config so it is possible to set up a global limit on them + // expensive files use a separate PoolCounter config so it is possible + // to set up a global limit on them if ( $file->isExpensiveToThumbnail() ) { $poolCounterType = 'FileRenderExpensive'; } else { @@ -399,17 +400,17 @@ function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath try { $work = new PoolCounterWorkViaCallback( $poolCounterType, sha1( $file->getName() ), array( - 'doWork' => function() use ( $file, $params ) { + 'doWork' => function () use ( $file, $params ) { return $file->transform( $params, File::RENDER_NOW ); }, - 'getCachedWork' => function() use ( $file, $params, $thumbPath ) { + 'getCachedWork' => function () use ( $file, $params, $thumbPath ) { // If the worker that finished made this thumbnail then use it. // Otherwise, it probably made a different thumbnail for this file. return $file->getRepo()->fileExists( $thumbPath ) ? $file->transform( $params, File::RENDER_NOW ) : false; // retry once more in exclusive mode }, - 'fallback' => function() { + 'fallback' => function () { return wfMessage( 'generic-pool-error' )->parse(); }, 'error' => function ( $status ) { @@ -520,7 +521,8 @@ function wfExtractThumbRequestInfo( $thumbRel ) { $repo = RepoGroup::singleton()->getLocalRepo(); $hashDirReg = $subdirReg = ''; - for ( $i = 0; $i < $repo->getHashLevels(); $i++ ) { + $hashLevels = $repo->getHashLevels(); + for ( $i = 0; $i < $hashLevels; $i++ ) { $subdirReg .= '[0-9a-f]'; $hashDirReg .= "$subdirReg/"; } @@ -551,7 +553,7 @@ function wfExtractThumbRequestInfo( $thumbRel ) { * file handler. * * @param File $file File object for file in question - * @param array $param Array of parameters so far + * @param array $params Array of parameters so far * @return array Parameters array with more parameters */ function wfExtractThumbParams( $file, $params ) { @@ -571,7 +573,7 @@ function wfExtractThumbParams( $file, $params ) { return $params; // valid thumbnail URL (via extension or config) } - // FIXME: Files in the temp zone don't set a mime type, which means + // 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 // if you have no handler to make use of the param string and