From 8f416baead93a48e5799e44b8bd2e2c4859f4e04 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 14 Sep 2007 13:18:58 +0200
Subject: auf Version 1.11 aktualisiert; Login-Bug behoben

---
 thumb.php | 104 ++++++++++++++++++++++++++------------------------------------
 1 file changed, 43 insertions(+), 61 deletions(-)

(limited to 'thumb.php')

diff --git a/thumb.php b/thumb.php
index 4ca24ed7..dbc07c21 100644
--- a/thumb.php
+++ b/thumb.php
@@ -2,20 +2,17 @@
 
 /**
  * PHP script to stream out an image thumbnail.
- * If the file exists, we make do with abridged MediaWiki initialisation.
+ *
+ * @addtogroup Media
  */
-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( "$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( "$IP/includes/StreamFile.php" );
-require_once( "$IP/includes/AutoLoader.php" );
 
 // Get input parameters
 if ( get_magic_quotes_gpc() ) {
@@ -40,29 +37,30 @@ 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
-$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;
+// 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
 wfProfileOut( 'thumb.php-start' );
-require_once( './includes/Setup.php' );
 wfProfileIn( 'thumb.php-render' );
 
-$img = Image::newFromName( $fileName );
 try {
 	if ( $img ) {
-		$thumb = $img->transform( $params, Image::RENDER_NOW );
+		$thumb = $img->transform( $params, File::RENDER_NOW );
 	} else {
 		$thumb = false;
 	}
@@ -71,21 +69,35 @@ try {
 	$thumb = false;
 }
 
-if ( $thumb && $thumb->getPath() && file_exists( $thumb->getPath() ) ) {
+$errorMsg = false;
+if ( !$img ) {
+	$errorMsg = wfMsg( 'badtitletext' );
+} elseif ( !$thumb ) {
+	$errorMsg = wfMsgHtml( 'thumbnail_error', 'File::transform() returned false' );
+} elseif ( $thumb->isError() ) {
+	$errorMsg = $thumb->getHtmlMsg();
+} elseif ( !$thumb->getPath() ) {
+	$errorMsg = wfMsgHtml( 'thumbnail_error', 'No path supplied in thumbnail object' );
+} elseif ( $thumb->getPath() == $img->getPath() ) {
+	$errorMsg = wfMsgHtml( 'thumbnail_error', 'Image was not scaled, ' .
+		'is the requested width bigger than the source?' );
+} else {
 	wfStreamFile( $thumb->getPath() );
-} elseif ( $img ) {
+}
+if ( $errorMsg !== false ) {
+	thumbInternalError( $errorMsg );
+}
+
+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' );
-	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' );
-	}
 	echo <<<EOT
 <html><head><title>Error generating thumbnail</title></head>
 <body>
@@ -97,36 +109,6 @@ $msg
 </html>
 
 EOT;
-} 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>
-";
 }
 
-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 );
-}
 
-?>
-- 
cgit v1.2.2