X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=thumb.php;h=2159d2ee65584f6e3e98bfcbf7d289f71f6cc2db;hb=f9f9da61baa8dec0eb23fefc0edc3030b86a7c93;hp=f4765d6c01a01029cfedf277ba363dc917b8cc86;hpb=7bbe971aec2d548de981a12ed08a7b56a536dcdb;p=lhc%2Fweb%2Fwiklou.git
diff --git a/thumb.php b/thumb.php
index f4765d6c01..2159d2ee65 100644
--- a/thumb.php
+++ b/thumb.php
@@ -2,82 +2,111 @@
/**
* PHP script to stream out an image thumbnail.
- * If the file exists, we make do with abridged MediaWiki initialisation.
+ *
+ * @addtogroup Media
*/
-
-define( 'MEDIAWIKI', true );
-unset( $IP );
-if ( isset( $_REQUEST['GLOBALS'] ) ) {
- die( '$GLOBALS overwrite vulnerability');
-}
-
-$wgNoOutputBuffer = true;
-
-require_once( './includes/Defines.php' );
-require_once( './LocalSettings.php' );
-require_once( 'GlobalFunctions.php' );
+define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
+require_once( './includes/WebStart.php' );
+wfProfileIn( 'thumb.php' );
+wfProfileIn( 'thumb.php-start' );
$wgTrivialMimeDetection = true; //don't use fancy mime detection, just check the file extension for jpg/gif/png.
-require_once( 'Image.php' );
-require_once( 'StreamFile.php' );
+require_once( "$IP/includes/StreamFile.php" );
// Get input parameters
-
if ( get_magic_quotes_gpc() ) {
- $fileName = stripslashes( $_REQUEST['f'] );
- $width = stripslashes( $_REQUEST['w'] );
+ $params = array_map( 'stripslashes', $_REQUEST );
} else {
- $fileName = $_REQUEST['f'];
- $width = $_REQUEST['w'];
+ $params = $_REQUEST;
}
-$pre_render= isset($_REQUEST['r']) && $_REQUEST['r']!="0";
+$fileName = isset( $params['f'] ) ? $params['f'] : '';
+unset( $params['f'] );
-// Some basic input validation
+// 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'] );
-$width = intval( $width );
+// 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 ( $pre_render ) {
- $thumbName .= '.png';
-}
-$thumbPath = wfImageThumbDir( $fileName ) . '/' . $thumbName;
-
-if ( file_exists( $thumbPath ) && filemtime( $thumbPath ) >= filemtime( $imagePath ) ) {
- wfStreamFile( $thumbPath );
+// 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 ) ) {
+ wfStreamFile( $thumbPath );
+ wfLogProfilingData();
+ exit;
+ }
+ }
+} catch ( MWException $e ) {
+ thumbInternalError( $e->getHTML() );
+ wfLogProfilingData();
exit;
}
-// OK, no valid thumbnail, time to get out the heavy machinery
-require_once( 'Setup.php' );
-wfProfileIn( 'thumb.php' );
-
-$img = Image::newFromName( $fileName );
-if ( $img ) {
- $thumb = $img->renderThumb( $width, false );
-} else {
+wfProfileOut( 'thumb.php-start' );
+wfProfileIn( 'thumb.php-render' );
+
+try {
+ if ( $img ) {
+ $thumb = $img->transform( $params, File::RENDER_NOW );
+ } else {
+ $thumb = false;
+ }
+} catch( Exception $ex ) {
+ // Tried to select a page on a non-paged file?
$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' );
- 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;
+}
-?>