X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=thumb.php;h=0bb0b60c34558b40dd30dfd71eb26127b4760635;hb=5e56acb64a25d4f5c8d49b6c4417228362aa229f;hp=61fd788c9b641a6b42ebbc280c198336e90bb783;hpb=1a1e917c86ca9468bd3f0dfece93ba283552c61f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/thumb.php b/thumb.php
index 61fd788c9b..0bb0b60c34 100644
--- a/thumb.php
+++ b/thumb.php
@@ -26,10 +26,12 @@ function wfThumbMain() {
 	$headers = array();
 
 	// Get input parameters
-	if ( get_magic_quotes_gpc() ) {
-		$params = array_map( 'stripslashes', $_REQUEST );
+	if ( defined( 'THUMB_HANDLER' ) ) {
+		$params = $_REQUEST; // called from thumb_handler.php
 	} else {
-		$params = $_REQUEST;
+		$params = get_magic_quotes_gpc()
+			? array_map( 'stripslashes', $_REQUEST )
+			: $_REQUEST;
 	}
 
 	$fileName = isset( $params['f'] ) ? $params['f'] : '';
@@ -46,23 +48,23 @@ function wfThumbMain() {
 	unset( $params['r'] ); // ignore 'r' because we unconditionally pass File::RENDER
 
 	// Is this a thumb of an archived file?
-	$isOld = (isset( $params['archived'] ) && $params['archived']);
+	$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 ) {
+	if ( $isOld ) {
 		// Format is <timestamp>!<name>
 		$bits = explode( '!', $fileName, 2 );
-		if( !isset($bits[1]) ) {
+		if ( count( $bits ) != 2 ) {
 			wfThumbError( 404, wfMsg( 'badtitletext' ) );
 			wfProfileOut( __METHOD__ );
 			return;
 		}
 		$title = Title::makeTitleSafe( NS_FILE, $bits[1] );
-		if( is_null($title) ) {
+		if ( is_null( $title ) ) {
 			wfThumbError( 404, wfMsg( 'badtitletext' ) );
 			wfProfileOut( __METHOD__ );
 			return;
@@ -75,7 +77,7 @@ function wfThumbMain() {
 	// Check permissions if there are read restrictions
 	if ( !in_array( 'read', User::getGroupPermissions( array( '*' ) ), true ) ) {
 		if ( !$img->getTitle()->userCanRead() ) {
-			wfThumbError( 403, 'Access denied. You do not have permission to access ' . 
+			wfThumbError( 403, 'Access denied. You do not have permission to access ' .
 				'the source file.' );
 			wfProfileOut( __METHOD__ );
 			return;
@@ -118,11 +120,11 @@ function wfThumbMain() {
 		}
 	}
 
-	// Stream the file if it exists already
+	// Stream the file if it exists already...
 	try {
-		if ( false != ( $thumbName = $img->thumbName( $params ) ) ) {
+		$thumbName = $img->thumbName( $params );
+		if ( $thumbName !== false ) { // valid params?
 			$thumbPath = $img->getThumbPath( $thumbName );
-
 			if ( is_file( $thumbPath ) ) {
 				StreamFile::stream( $thumbPath, $headers );
 				wfProfileOut( __METHOD__ );
@@ -135,6 +137,7 @@ function wfThumbMain() {
 		return;
 	}
 
+	// Thumbnail isn't already there, so create the new thumbnail...
 	try {
 		$thumb = $img->transform( $params, File::RENDER_NOW );
 	} catch( Exception $ex ) {
@@ -142,6 +145,7 @@ function wfThumbMain() {
 		$thumb = false;
 	}
 
+	// Check for thumbnail generation errors...
 	$errorMsg = false;
 	if ( !$thumb ) {
 		$errorMsg = wfMsgHtml( 'thumbnail_error', 'File::transform() returned false' );
@@ -152,16 +156,22 @@ function wfThumbMain() {
 	} elseif ( $thumb->getPath() == $img->getPath() ) {
 		$errorMsg = wfMsgHtml( 'thumbnail_error', 'Image was not scaled, ' .
 			'is the requested width bigger than the source?' );
-	} else {
-		StreamFile::stream( $thumb->getPath(), $headers );
 	}
+
 	if ( $errorMsg !== false ) {
 		wfThumbError( 500, $errorMsg );
+	} else {
+		// Stream the file if there were no errors
+		StreamFile::stream( $thumb->getPath(), $headers );
 	}
 
 	wfProfileOut( __METHOD__ );
 }
 
+/**
+ * @param $status
+ * @param $msg
+ */
 function wfThumbError( $status, $msg ) {
 	global $wgShowHostnames;
 	header( 'Cache-Control: no-cache' );
@@ -174,7 +184,7 @@ function wfThumbError( $status, $msg ) {
 	} else {
 		header( 'HTTP/1.1 500 Internal server error' );
 	}
-	if( $wgShowHostnames ) {
+	if ( $wgShowHostnames ) {
 		$url = htmlspecialchars( isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : '' );
 		$hostname = htmlspecialchars( wfHostname() );
 		$debug = "<!-- $url -->\n<!-- $hostname -->\n";