Update auf MediaWiki 1.12.0

1 files changed, 93 insertions, 69 deletions

diff --git a/thumb.php b/thumb.php
index dbc07c21..62c33820 100644
--- a/thumb.php
+++ b/thumb.php
@@ -7,97 +7,122 @@
  */
 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( "$IP/includes/StreamFile.php" );
 
-// Get input parameters
-if ( get_magic_quotes_gpc() ) {
-	$params = array_map( 'stripslashes', $_REQUEST );
-} else {
-	$params = $_REQUEST;
-}
+wfThumbMain();
+wfLogProfilingData();
 
-$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'] );
+function wfThumbMain() {
+	wfProfileIn( __METHOD__ );
+	// Get input parameters
+	if ( get_magic_quotes_gpc() ) {
+		$params = array_map( 'stripslashes', $_REQUEST );
+	} else {
+		$params = $_REQUEST;
+	}
+
+	$fileName = isset( $params['f'] ) ? $params['f'] : '';
+	unset( $params['f'] );
 
-// Some basic input validation
-$fileName = strtr( $fileName, '\\/', '__' );
+	// 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, '\\/', '__' );
 
-// Stream the file if it exists already
-try {
 	$img = wfLocalFile( $fileName );
-	if ( $img && false != ( $thumbName = $img->thumbName( $params ) ) ) {
-		$thumbPath = $img->getThumbPath( $thumbName );
+	if ( !$img ) {
+		wfThumbError( 404, wfMsg( 'badtitletext' ) );
+		return;
+	}
+	if ( !$img->exists() ) {
+		wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
+		return;
+	}
+	$sourcePath = $img->getPath();
+	if ( $sourcePath === false ) {
+		wfThumbError( 500, 'The source file is not locally accessible.' );
+		return;
+	}
 
-		if ( is_file( $thumbPath ) ) {
-			wfStreamFile( $thumbPath );
-			wfLogProfilingData();
-			exit;
+	// Check IMS against the source file
+	// This means that clients can keep a cached copy even after it has been deleted on the server
+	if ( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
+		// Fix IE brokenness
+		$imsString = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
+		// Calculate time
+		wfSuppressWarnings();
+		$imsUnix = strtotime( $imsString );
+		wfRestoreWarnings();
+		$stat = @stat( $sourcePath );
+		if ( $stat['mtime'] <= $imsUnix ) {
+			header( 'HTTP/1.1 304 Not Modified' );
+			return;
 		}
 	}
-} catch ( MWException $e ) {
-	thumbInternalError( $e->getHTML() );
-	wfLogProfilingData();
-	exit;
-}
 
-wfProfileOut( 'thumb.php-start' );
-wfProfileIn( 'thumb.php-render' );
+	// Stream the file if it exists already
+	try {
+		if ( false != ( $thumbName = $img->thumbName( $params ) ) ) {
+			$thumbPath = $img->getThumbPath( $thumbName );
+
+			if ( is_file( $thumbPath ) ) {
+				wfStreamFile( $thumbPath );
+				return;
+			}
+		}
+	} catch ( MWException $e ) {
+		wfThumbError( 500, $e->getHTML() );
+		return;
+	}
 
-try {
-	if ( $img ) {
+	try {
 		$thumb = $img->transform( $params, File::RENDER_NOW );
-	} else {
+	} catch( Exception $ex ) {
+		// Tried to select a page on a non-paged file?
 		$thumb = false;
 	}
-} catch( Exception $ex ) {
-	// Tried to select a page on a non-paged file?
-	$thumb = false;
-}
 
-$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() );
-}
-if ( $errorMsg !== false ) {
-	thumbInternalError( $errorMsg );
-}
-
-wfProfileOut( 'thumb.php-render' );
-wfProfileOut( 'thumb.php' );
-wfLogProfilingData();
+	$errorMsg = false;
+	if ( !$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() );
+	}
+	if ( $errorMsg !== false ) {
+		wfThumbError( 500, $errorMsg );
+	}
 
-//--------------------------------------------------------------------------
+	wfProfileOut( __METHOD__ );
+}
 
-function thumbInternalError( $msg ) {
+function wfThumbError( $status, $msg ) {
 	header( 'Cache-Control: no-cache' );
 	header( 'Content-Type: text/html; charset=utf-8' );
-	header( 'HTTP/1.1 500 Internal server error' );
+	if ( $status == 404 ) {
+		header( 'HTTP/1.1 404 Not found' );
+	} else {
+		header( 'HTTP/1.1 500 Internal server error' );
+	}
 	echo <<<EOT
 <html><head><title>Error generating thumbnail</title></head>
 <body>
@@ -111,4 +136,3 @@ $msg
 EOT;
 }
 
-