X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=thumb.php;h=b973cc654bb72207c4466f2d1624f0ede0ba8f62;hb=16bba5546c8a0542f8f6ba85edf9bab85b65a285;hp=545f64435d12894a28a4b85071e1d44bbcbcf110;hpb=bf63ffaa2c7e472181d74829a8bb380ad2ee9735;p=lhc%2Fweb%2Fwiklou.git

diff --git a/thumb.php b/thumb.php
index 545f64435d..b973cc654b 100644
--- a/thumb.php
+++ b/thumb.php
@@ -2,100 +2,168 @@
 
 /**
  * PHP script to stream out an image thumbnail.
- * If the file exists, we make do with abridged MediaWiki initialisation.
+ *
+ * @file
+ * @ingroup 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( 'GlobalFunctions.php' );
-require_once( '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" );
 
-// Get input parameters
-$p=null;
+wfThumbMain();
+wfLogProfilingData();
 
-if ( get_magic_quotes_gpc() ) {
-	$fileName = stripslashes( $_REQUEST['f'] );
-	$width = stripslashes( $_REQUEST['w'] );
-	if ( isset( $_REQUEST['p'] ) ) { // optional page number
-		$page = stripslashes( $_REQUEST['p'] );
-	}
-} else {
-	$fileName = $_REQUEST['f'];
-	$width = $_REQUEST['w'];
-	if ( isset( $_REQUEST['p'] ) ) { // optional page number
-		$page =  $_REQUEST['p'] ;
-	}
-}
+//--------------------------------------------------------------------------
 
-$pre_render= isset($_REQUEST['r']) && $_REQUEST['r']!="0";
+function wfThumbMain() {
+	wfProfileIn( __METHOD__ );
+	// Get input parameters
+	if ( get_magic_quotes_gpc() ) {
+		$params = array_map( 'stripslashes', $_REQUEST );
+	} else {
+		$params = $_REQUEST;
+	}
 
-// Some basic input validation
+	$fileName = isset( $params['f'] ) ? $params['f'] : '';
+	unset( $params['f'] );
 
-$width = intval( $width );
-if ( ! is_null( $page ) ) {
-	$page = intval( $page );
-}
-$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'] );
+
+	// Is this a thumb of an archived file?
+	$isOld = (isset( $params['archived'] ) && $params['archived']);
+	unset( $params['archived'] );
+
+	// Some basic input validation
+	$fileName = strtr( $fileName, '\\/', '__' );
+
+	// Actually fetch the image. Method depends on whether it is archived or not.
+	if( $isOld ) {
+		// Format is <timestamp>!<name>
+		$bits = explode( '!', $fileName, 2 );
+		if( !isset($bits[1]) ) {
+			wfThumbError( 404, wfMsg( 'badtitletext' ) );
+			return;
+		}
+		$title = Title::makeTitleSafe( NS_FILE, $bits[1] );
+		if( is_null($title) ) {
+			wfThumbError( 404, wfMsg( 'badtitletext' ) );
+			return;
+		}
+		$img = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $title, $fileName );
+	} else {
+		$img = wfLocalFile( $fileName );
+	}
 
-// Work out paths, carefully avoiding constructing an Image object because that won't work yet
+	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;
+	}
 
-$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;
+	// 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;
+		}
+	}
 
-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 {
+		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;
+	}
 
-// OK, no valid thumbnail, time to get out the heavy machinery
-wfProfileOut( 'thumb.php-start' );
-require_once( 'Setup.php' );
-wfProfileIn( 'thumb.php-render' );
+	try {
+		$thumb = $img->transform( $params, File::RENDER_NOW );
+	} catch( Exception $ex ) {
+		// Tried to select a page on a non-paged file?
+		$thumb = false;
+	}
 
-$img = Image::newFromName( $fileName );
-if ( $img ) {
-	if ( ! is_null( $page ) ) {
-		$img->selectPage( $page );
+	$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 );
 	}
-	$thumb = $img->renderThumb( $width, false );
-} else {
-	$thumb = false;
-}
 
-if ( $img->lastError && $img->lastError !== true ) {
-	header( 'HTTP/1.0 500 Internal Server Error' );
-	echo "<html><body><h1>Thumbnail generation error</h1><p>" . 
-		htmlspecialchars( $img->lastError ) . "<br>" . wfHostname() .
-		"</p></body></html>";
-} elseif ( $thumb && $thumb->path ) {
-	wfStreamFile( $thumb->path );
-} else {
-	$badtitle = wfMsg( 'badtitle' );
-	$badtitletext = wfMsg( 'badtitletext' );
-	echo "<html><head>
-	<title>$badtitle</title>
-	<body>
-<h1>$badtitle</h1>
-<p>$badtitletext</p>
-</body></html>";
+	wfProfileOut( __METHOD__ );
 }
 
-wfProfileOut( 'thumb.php-render' );
-wfProfileOut( 'thumb.php' );
-wfLogProfilingData();
+function wfThumbError( $status, $msg ) {
+	global $wgShowHostnames;
+	header( 'Cache-Control: no-cache' );
+	header( 'Content-Type: text/html; charset=utf-8' );
+	if ( $status == 404 ) {
+		header( 'HTTP/1.1 404 Not found' );
+	} else {
+		header( 'HTTP/1.1 500 Internal server error' );
+	}
+	if( $wgShowHostnames ) {
+		$url = htmlspecialchars( @$_SERVER['REQUEST_URI'] );
+		$hostname = htmlspecialchars( wfHostname() );
+		$debug = "<!-- $url -->\n<!-- $hostname -->\n";
+	} else {
+		$debug = "";
+	}
+	echo <<<EOT
+<html><head><title>Error generating thumbnail</title></head>
+<body>
+<h1>Error generating thumbnail</h1>
+<p>
+$msg
+</p>
+$debug
+</body>
+</html>
+
+EOT;
+}
 
-?>