X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=thumb.php;h=bd14e417a6f9a16ad8a8b3cd8c1e1bb10e10fda1;hp=d39d43bc461916c493886dca455d4a8513ec5feb;hb=fa16b9fddf3ae05601b335c8709fa28b1d5430e6;hpb=02ec1ea797cf014cd007d81dfeec545f6e560f2d diff --git a/thumb.php b/thumb.php index d39d43bc46..bd14e417a6 100644 --- a/thumb.php +++ b/thumb.php @@ -38,7 +38,7 @@ if ( defined( 'THUMB_HANDLER' ) ) { $mediawiki = new MediaWiki(); $mediawiki->doPostOutputShutdown( 'fast' ); -//-------------------------------------------------------------------------- +// -------------------------------------------------------------------------- /** * Handle a thumbnail request via thumbnail file URL @@ -250,11 +250,16 @@ function wfStreamThumb( array $params ) { try { $thumbName = $img->thumbName( $params ); if ( !strlen( $thumbName ) ) { // invalid params? - throw new MediaTransformInvalidParametersException( 'Empty return from File::thumbName' ); + throw new MediaTransformInvalidParametersException( + 'Empty return from File::thumbName' + ); } $thumbName2 = $img->thumbName( $params, File::THUMB_FULL_NAME ); // b/c; "long" style } catch ( MediaTransformInvalidParametersException $e ) { - wfThumbError( 400, 'The specified thumbnail parameters are not valid: ' . $e->getMessage() ); + wfThumbError( + 400, + 'The specified thumbnail parameters are not valid: ' . $e->getMessage() + ); return; } catch ( MWException $e ) { wfThumbError( 500, $e->getHTML() ); @@ -294,7 +299,8 @@ function wfStreamThumb( array $params ) { $dispositionType = isset( $params['download'] ) ? 'attachment' : 'inline'; // Suggest a good name for users downloading this thumbnail - $headers[] = "Content-Disposition: {$img->getThumbDisposition( $thumbName, $dispositionType )}"; + $headers[] = + "Content-Disposition: {$img->getThumbDisposition( $thumbName, $dispositionType )}"; if ( count( $varyHeader ) ) { $headers[] = 'Vary: ' . implode( ', ', $varyHeader ); @@ -333,7 +339,9 @@ function wfStreamThumb( array $params ) { $errorCode = 500; if ( !$thumb ) { $errorMsg = $errorMsg ?: $msg->rawParams( 'File::transform() returned false' )->escaped(); - if ( $errorMsg instanceof MessageSpecifier && $errorMsg->getKey() === 'thumbnail_image-failure-limit' ) { + if ( $errorMsg instanceof MessageSpecifier && + $errorMsg->getKey() === 'thumbnail_image-failure-limit' + ) { $errorCode = 429; } } elseif ( $thumb->isError() ) { @@ -341,8 +349,9 @@ function wfStreamThumb( array $params ) { } elseif ( !$thumb->hasFile() ) { $errorMsg = $msg->rawParams( 'No path supplied in thumbnail object' )->escaped(); } elseif ( $thumb->fileIsSource() ) { - $errorMsg = $msg-> - rawParams( 'Image was not scaled, is the requested width bigger than the source?' )->escaped(); + $errorMsg = $msg + ->rawParams( 'Image was not scaled, is the requested width bigger than the source?' ) + ->escaped(); $errorCode = 400; } @@ -585,7 +594,9 @@ function wfThumbError( $status, $msgHtml ) { } if ( $wgShowHostnames ) { header( 'X-MW-Thumbnail-Renderer: ' . wfHostname() ); - $url = htmlspecialchars( isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : '' ); + $url = htmlspecialchars( + isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : '' + ); $hostname = htmlspecialchars( wfHostname() ); $debug = "\n\n"; } else {