X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=thumb.php;h=b92a6f7ef539e134f6cc068b6bbfa09665783e29;hb=cb38c11c8496b509895e1ff9bcce5b5f42b07bb6;hp=bc794ebfb4b37f15fb6805e51c48b20d43e4be47;hpb=7f7e79022bfd421e49084b089e74c7a16b77bc03;p=lhc%2Fweb%2Fwiklou.git

diff --git a/thumb.php b/thumb.php
index bc794ebfb4..b92a6f7ef5 100644
--- a/thumb.php
+++ b/thumb.php
@@ -5,92 +5,139 @@
  * 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( 'GlobalFunctions.php' );
-require_once( 'ImageFunctions.php' );
+require_once( "$IP/includes/GlobalFunctions.php" );
+require_once( "$IP/includes/ImageFunctions.php" );
 
 $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" );
+require_once( "$IP/includes/AutoLoader.php" );
 
 // Get input parameters
-$p=null;
-
 if ( get_magic_quotes_gpc() ) {
-	$fileName = stripslashes( $_REQUEST['f'] );
-	$width = stripslashes( $_REQUEST['w'] );
-	if ( isset( $_REQUEST['p'] ) ) { // optional page number
-		$page = stripslashes( $_REQUEST['p'] );
-	}
+	$params = array_map( 'stripslashes', $_REQUEST );
 } else {
-	$fileName = $_REQUEST['f'];
-	$width = $_REQUEST['w'];
-	if ( isset( $_REQUEST['p'] ) ) { // optional page number
-		$page =  $_REQUEST['p'] ;
-	}
+	$params = $_REQUEST;
 }
 
-$pre_render= isset($_REQUEST['r']) && $_REQUEST['r']!="0";
+$fileName = isset( $params['f'] ) ? $params['f'] : '';
+unset( $params['f'] );
 
-// Some basic input validation
-
-$width = intval( $width );
-if ( ! is_null( $page ) ) {
-	$page = intval( $page );
+// 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;
-
-if ( is_file( $thumbPath ) && filemtime( $thumbPath ) >= filemtime( $imagePath ) ) {
-	wfStreamFile( $thumbPath );
-	// Can't log profiling data with no Setup.php
+try {
+	$handler = thumbGetHandler( $fileName );
+	if ( $handler ) {
+		$imagePath = wfImageDir( $fileName ) . '/' . $fileName;
+		$thumbName = $handler->makeParamString( $params ) . "-$fileName";
+		$thumbPath = wfImageThumbDir( $fileName ) . '/' . $thumbName;
+
+		if ( is_file( $thumbPath ) && filemtime( $thumbPath ) >= filemtime( $imagePath ) ) {
+			wfStreamFile( $thumbPath );
+			// Can't log profiling data with no Setup.php
+			exit;
+		}
+	}
+} catch ( MWException $e ) {
+	require_once( './includes/Setup.php' );
+	thumbInternalError( $e->getHTML() );
 	exit;
 }
 
+
 // OK, no valid thumbnail, time to get out the heavy machinery
 wfProfileOut( 'thumb.php-start' );
-require_once( 'Setup.php' );
+require_once( './includes/Setup.php' );
 wfProfileIn( 'thumb.php-render' );
 
 $img = Image::newFromName( $fileName );
-if ( $img ) {
-	if ( ! is_null( $page ) ) {
-		$img->selectPage( $page );
+try {
+	if ( $img ) {
+		$thumb = $img->transform( $params, Image::RENDER_NOW );
+	} else {
+		$thumb = false;
 	}
-	$thumb = $img->renderThumb( $width, false );
-} else {
+} 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() );
+} elseif ( $img ) {
+	if ( !$thumb ) {
+		$msg = wfMsgHtml( 'thumbnail_error', 'Image::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 );
 } else {
 	$badtitle = wfMsg( 'badtitle' );
 	$badtitletext = wfMsg( 'badtitletext' );
+	header( 'Cache-Control: no-cache' );
+	header( 'Content-Type: text/html; charset=utf-8' );
+	header( 'HTTP/1.1 500 Internal server error' );
 	echo "<html><head>
 	<title>$badtitle</title>
 	<body>
 <h1>$badtitle</h1>
 <p>$badtitletext</p>
-</body></html>";
+</body></html>
+";
 }
 
 wfProfileOut( 'thumb.php-render' );
 wfProfileOut( 'thumb.php' );
 wfLogProfilingData();
 
+//--------------------------------------------------------------------------
+
+function thumbGetHandler( $fileName ) {
+	// Determine type
+	$magic = MimeMagic::singleton();
+	$extPos = strrpos( $fileName, '.' );
+	if ( $extPos === false ) {
+		return false;
+	}
+	$mime = $magic->guessTypesForExtension( substr( $fileName, $extPos + 1 ) );
+	return MediaHandler::getHandler( $mime );
+}
+
+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 <<<EOT
+<html><head><title>Error generating thumbnail</title></head>
+<body>
+<h1>Error generating thumbnail</h1>
+<p>
+$msg
+</p>
+</body>
+</html>
+
+EOT;
+}
+
 ?>