X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=thumb-handler.php;h=6d18bab3e03005006363e3dd809373165f3e00ff;hb=40f19e6def591fc6fe4626d862bc0c744e3aad9f;hp=2d9fd420c5b371438b24015398e709df85addb2c;hpb=9907c91477f5a5ccddd438ec708c438ade2dd93a;p=lhc%2Fweb%2Fwiklou.git
diff --git a/thumb-handler.php b/thumb-handler.php
index 2d9fd420c5..6d18bab3e0 100644
--- a/thumb-handler.php
+++ b/thumb-handler.php
@@ -8,11 +8,15 @@ define( 'THUMB_HANDLER', true );
$configPath = dirname( __FILE__ ) . "/thumb.config.php";
if ( !file_exists( $configPath ) ) {
die( "Thumb-handler.php is not enabled for this wiki.\n" );
+} elseif ( !extension_loaded( 'curl' ) ) {
+ die( "cURL is not enabled for PHP on this wiki.\n" ); // sanity
}
require( $configPath );
-function wfHandleThumb404() {
- global $thgThumb404File;
+wfHandleThumb404Main();
+
+function wfHandleThumb404Main() {
+ global $thgThumbCallbacks, $thgThumb404File;
# lighttpd puts the original request in REQUEST_URI, while
# sjs sets that to the 404 handler, and puts the original
@@ -24,34 +28,33 @@ function wfHandleThumb404() {
$uri = $_SERVER['REQUEST_URI'];
}
- # Extract thumb.php params from the URI.
- if ( function_exists( 'wfCustomExtractThumbParams' ) ) {
- $params = wfCustomExtractThumbParams( $uri ); // overridden by configuration
+ # Extract thumb.php params from the URI...
+ if ( isset( $thgThumbCallbacks['extractParams'] )
+ && is_callable( $thgThumbCallbacks['extractParams'] ) ) // overridden by configuration?
+ {
+ $params = call_user_func_array( $thgThumbCallbacks['extractParams'], array( $uri ) );
} else {
$params = wfExtractThumbParams( $uri ); // basic wiki URL param extracting
}
- if ( $params === null ) { // not a valid thumb request
+
+ # Show 404 error if this is not a valid thumb request...
+ if ( !is_array( $params ) ) {
header( 'X-Debug: no regex match' ); // useful for debugging
- require_once( $thgThumb404File ); // standard 404 message
+ if ( $thgThumb404File ) { // overridden by configuration?
+ require( $thgThumb404File );
+ } else {
+ wfDisplay404Error(); // standard 404 message
+ }
return;
}
- # Do some basic checks on the filename...
- if ( preg_match( '/[\x80-\xff]/', $uri ) ) {
- header( 'HTTP/1.0 400 Bad request' );
- header( 'Content-Type: text/html' );
- echo "Bad request" .
- "The URI contained bytes with the high bit set, this is not allowed." .
- "";
- return;
- } elseif ( strpos( $params['f'], '%20' ) !== false ) {
- header( 'HTTP/1.0 404 Not found' );
- header( 'Content-Type: text/html' );
- header( 'X-Debug: filename contains a space' ); // useful for debugging
- echo "Not found" .
- "The URL contained spaces, we don't have any thumbnail files with spaces." .
- "";
- return;
+ # Check any backend caches for the thumbnail...
+ if ( isset( $thgThumbCallbacks['checkCache'] )
+ && is_callable( $thgThumbCallbacks['checkCache'] ) )
+ {
+ if ( call_user_func_array( $thgThumbCallbacks['checkCache'], array( $uri, $params ) ) ) {
+ return; // file streamed from backend thumb cache
+ }
}
wfStreamThumbViaCurl( $params, $uri );
@@ -69,11 +72,10 @@ function wfExtractThumbParams( $uri ) {
$thumbRegex = '!^(?:' . preg_quote( $thgThumbServer ) . ')?/' .
preg_quote( $thgThumbFragment ) . '(/archive|/temp|)/' .
- $thgThumbHashFragment . '([^/]*)/' . '(page(\d*)-)*(\d*)px-([^/]*)$!';
+ $thgThumbHashFragment . '([^/]*)/(page(\d*)-)*(\d*)px-[^/]*$!';
- # Is this a thumbnail?
if ( preg_match( $thumbRegex, $uri, $matches ) ) {
- list( $all, $archOrTemp, $filename, $pagefull, $pagenum, $size, $fn2 ) = $matches;
+ list( $all, $archOrTemp, $filename, $pagefull, $pagenum, $size ) = $matches;
$params = array( 'f' => $filename, 'width' => $size );
if ( $pagenum ) {
$params['page'] = $pagenum;
@@ -84,7 +86,7 @@ function wfExtractThumbParams( $uri ) {
$params['temp'] = 1;
}
} else {
- $params = null;
+ $params = null; // not a valid thumbnail URL
}
return $params;
@@ -98,17 +100,7 @@ function wfExtractThumbParams( $uri ) {
* @return void
*/
function wfStreamThumbViaCurl( array $params, $uri ) {
- global $thgThumbScriptPath, $thgThumbCurlProxy, $thgThumbCurlTimeout;
-
- if ( !function_exists( 'curl_init' ) ) {
- header( 'HTTP/1.0 404 Not found' );
- header( 'Content-Type: text/html' );
- header( 'X-Debug: cURL is not enabled' ); // useful for debugging
- echo "Not found" .
- "cURL is not enabled for PHP on this wiki. Unable to send request thumb.php." .
- "";
- return;
- }
+ global $thgThumbCallbacks, $thgThumbScriptPath, $thgThumbCurlProxy, $thgThumbCurlTimeout;
# Build up the request URL to use with CURL...
$reqURL = "{$thgThumbScriptPath}?";
@@ -119,24 +111,22 @@ function wfStreamThumbViaCurl( array $params, $uri ) {
} else {
$reqURL .= '&';
}
- // Note: value is already urlencoded
- $reqURL .= "$name=$value";
- }
-
- $ch = curl_init( $reqURL );
- if ( $thgThumbCurlProxy ) {
- curl_setopt( $ch, CURLOPT_PROXY, $thgThumbCurlProxy );
+ $reqURL .= "$name=$value"; // Note: value is already urlencoded
}
- $headers = array(); // HTTP headers
- # Set certain headers...
+ # Set relevant HTTP headers...
+ $headers = array();
$headers[] = "X-Original-URI: " . str_replace( "\n", '', $uri );
- if ( function_exists( 'wfCustomThumbRequestHeaders' ) ) {
- wfCustomThumbRequestHeaders( $headers ); // add on any custom headers (like XFF)
+ if ( isset( $thgThumbCallbacks['curlHeaders'] )
+ && is_callable( $thgThumbCallbacks['curlHeaders'] ) )
+ {
+ # Add on any custom headers (like XFF)
+ call_user_func_array( $thgThumbCallbacks['curlHeaders'], array( &$headers ) );
}
+
# Pass through some other headers...
- $passthrough = array( 'If-Modified-Since', 'Referer', 'User-Agent' );
- foreach ( $passthrough as $headerName ) {
+ $passThrough = array( 'If-Modified-Since', 'Referer', 'User-Agent' );
+ foreach ( $passThrough as $headerName ) {
$serverVarName = 'HTTP_' . str_replace( '-', '_', strtoupper( $headerName ) );
if ( !empty( $_SERVER[$serverVarName] ) ) {
$headers[] = $headerName . ': ' .
@@ -144,6 +134,11 @@ function wfStreamThumbViaCurl( array $params, $uri ) {
}
}
+ $ch = curl_init( $reqURL );
+ if ( $thgThumbCurlProxy ) {
+ curl_setopt( $ch, CURLOPT_PROXY, $thgThumbCurlProxy );
+ }
+
curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers );
curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
curl_setopt( $ch, CURLOPT_TIMEOUT, $thgThumbCurlTimeout );
@@ -151,32 +146,38 @@ function wfStreamThumbViaCurl( array $params, $uri ) {
# Actually make the request
$text = curl_exec( $ch );
- # Send it on to the client
+ # Send it on to the client...
$errno = curl_errno( $ch );
$contentType = curl_getinfo( $ch, CURLINFO_CONTENT_TYPE );
$httpCode = curl_getinfo( $ch, CURLINFO_HTTP_CODE );
if ( $errno ) {
header( 'HTTP/1.1 500 Internal server error' );
header( 'Cache-Control: no-cache' );
- list( $text, $contentType ) = wfCurlErrorText( $ch );
- } elseif ( $httpCode == 304 ) {
+ $contentType = 'text/html';
+ $text = wfCurlErrorText( $ch );
+ } elseif ( $httpCode == 304 ) { // OK
header( 'HTTP/1.1 304 Not modified' );
$contentType = '';
$text = '';
} elseif ( strval( $text ) == '' ) {
header( 'HTTP/1.1 500 Internal server error' );
header( 'Cache-Control: no-cache' );
- list( $text, $contentType ) = wfCurlEmptyText( $ch );
+ $contentType = 'text/html';
+ $text = wfCurlEmptyText( $ch );
} elseif ( $httpCode == 404 ) {
header( 'HTTP/1.1 404 Not found' );
header( 'Cache-Control: s-maxage=300, must-revalidate, max-age=0' );
- } elseif ( $httpCode != 200
- || substr( $contentType, 0, 9 ) == 'text/html'
- || substr( $text, 0, 5 ) == '
Thumbnail error
Error retrieving thumbnail from scaling server: $error