X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=thumb.php;h=e6ad8e59984ce919ceef65b7ff8b0ba09a4dc1e1;hb=3b5fa6f103fc5cda8e12367bd8b76d96dbea1858;hp=42bc5497a553704bbd4534c739f4dc59e535d487;hpb=2d5ac3c276413fe42ebda673019c7fcdf4b2c878;p=lhc%2Fweb%2Fwiklou.git
diff --git a/thumb.php b/thumb.php
index 42bc5497a5..e6ad8e5998 100644
--- a/thumb.php
+++ b/thumb.php
@@ -2,65 +2,63 @@
/**
* PHP script to stream out an image thumbnail.
- * If the file exists, we make do with abridged MediaWiki initialisation.
*/
-define( 'MW_NO_SETUP', 1 );
define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
require_once( './includes/WebStart.php' );
wfProfileIn( 'thumb.php' );
wfProfileIn( 'thumb.php-start' );
-require_once( './includes/GlobalFunctions.php' );
-require_once( './includes/ImageFunctions.php' );
$wgTrivialMimeDetection = true; //don't use fancy mime detection, just check the file extension for jpg/gif/png.
-require_once( './includes/Image.php' );
-require_once( './includes/StreamFile.php' );
+require_once( "$IP/includes/StreamFile.php" );
// Get input parameters
-$fileName = isset( $_REQUEST['f'] ) ? $_REQUEST['f'] : '';
-$width = isset( $_REQUEST['w'] ) ? intval( $_REQUEST['w'] ) : 0;
-$page = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : null;
-
if ( get_magic_quotes_gpc() ) {
- $fileName = stripslashes( $fileName );
+ $params = array_map( 'stripslashes', $_REQUEST );
+} else {
+ $params = $_REQUEST;
}
-$pre_render= isset($_REQUEST['r']) && $_REQUEST['r']!="0";
+$fileName = isset( $params['f'] ) ? $params['f'] : '';
+unset( $params['f'] );
+
+// Backwards compatibility parameters
+if ( isset( $params['w'] ) ) {
+ $params['width'] = $params['w'];
+ unset( $params['w'] );
+}
+if ( isset( $params['p'] ) ) {
+ $params['page'] = $params['p'];
+}
+unset( $params['r'] );
// Some basic input validation
$fileName = strtr( $fileName, '\\/', '__' );
-// Work out paths, carefully avoiding constructing an Image object because that won't work yet
-
-$imagePath = wfImageDir( $fileName ) . '/' . $fileName;
-$thumbName = "{$width}px-$fileName";
-if ( ! is_null( $page ) ) {
- $thumbName = 'page' . $page . '-' . $thumbName;
-}
-if ( $pre_render ) {
- $thumbName .= '.png';
-}
-$thumbPath = wfImageThumbDir( $fileName ) . '/' . $thumbName;
+// Stream the file if it exists already
+try {
+ $img = wfLocalFile( $fileName );
+ if ( $img && false != ( $thumbName = $img->thumbName( $params ) ) ) {
+ $thumbPath = $img->getThumbPath( $thumbName );
-if ( is_file( $thumbPath ) && filemtime( $thumbPath ) >= filemtime( $imagePath ) ) {
- wfStreamFile( $thumbPath );
- // Can't log profiling data with no Setup.php
+ if ( is_file( $thumbPath ) ) {
+ wfStreamFile( $thumbPath );
+ wfLogProfilingData();
+ exit;
+ }
+ }
+} catch ( MWException $e ) {
+ thumbInternalError( $e->getHTML() );
+ wfLogProfilingData();
exit;
}
-// OK, no valid thumbnail, time to get out the heavy machinery
wfProfileOut( 'thumb.php-start' );
-require_once( './includes/Setup.php' );
wfProfileIn( 'thumb.php-render' );
-$img = Image::newFromName( $fileName );
try {
if ( $img ) {
- if ( ! is_null( $page ) ) {
- $img->selectPage( $page );
- }
- $thumb = $img->renderThumb( $width, false );
+ $thumb = $img->transform( $params, File::RENDER_NOW );
} else {
$thumb = false;
}
@@ -69,24 +67,44 @@ try {
$thumb = false;
}
-if ( $thumb && $thumb->path ) {
- wfStreamFile( $thumb->path );
+if ( $thumb && $thumb->getPath() && file_exists( $thumb->getPath() ) ) {
+ wfStreamFile( $thumb->getPath() );
} else {
- $badtitle = wfMsg( 'badtitle' );
- $badtitletext = wfMsg( 'badtitletext' );
- header( 'Cache-Control: no-cache' );
- header( 'Content-Type: text/html; charset=utf-8' );
- echo "
- $badtitle
-
-$badtitle
-$badtitletext
-
-";
+ if ( !$img ) {
+ $msg = wfMsg( 'badtitletext' );
+ } elseif ( !$thumb ) {
+ $msg = wfMsgHtml( 'thumbnail_error', 'File::transform() returned false' );
+ } elseif ( $thumb->isError() ) {
+ $msg = $thumb->getHtmlMsg();
+ } elseif ( !$thumb->getPath() ) {
+ $msg = wfMsgHtml( 'thumbnail_error', 'No path supplied in thumbnail object' );
+ } else {
+ $msg = wfMsgHtml( 'thumbnail_error', 'Output file missing' );
+ }
+ thumbInternalError( $msg );
}
wfProfileOut( 'thumb.php-render' );
wfProfileOut( 'thumb.php' );
wfLogProfilingData();
+//--------------------------------------------------------------------------
+
+function thumbInternalError( $msg ) {
+ header( 'Cache-Control: no-cache' );
+ header( 'Content-Type: text/html; charset=utf-8' );
+ header( 'HTTP/1.1 500 Internal server error' );
+ echo <<Error generating thumbnail
+
+Error generating thumbnail
+
+$msg
+
+
+
+
+EOT;
+}
+
?>