X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=thumb.php;h=51f7ec60d6e5b102e5821a71bc83b14a4f04c633;hb=631847513cb6b370bdf3ecca42f271a8ac9ec5db;hp=15a866630812bed8d3c8720ba11399b866e40f6f;hpb=12b7bfe2333db4a6cd68c5372ac866ad7593ebf6;p=lhc%2Fweb%2Fwiklou.git diff --git a/thumb.php b/thumb.php index 15a8666308..51f7ec60d6 100644 --- a/thumb.php +++ b/thumb.php @@ -8,30 +8,74 @@ */ define( 'MW_NO_OUTPUT_COMPRESSION', 1 ); if ( isset( $_SERVER['MW_COMPILED'] ) ) { - require ( 'phase3/includes/WebStart.php' ); + require( 'phase3/includes/WebStart.php' ); } else { - require ( dirname( __FILE__ ) . '/includes/WebStart.php' ); + require( dirname( __FILE__ ) . '/includes/WebStart.php' ); } -$wgTrivialMimeDetection = true; //don't use fancy mime detection, just check the file extension for jpg/gif/png. +// Don't use fancy mime detection, just check the file extension for jpg/gif/png +$wgTrivialMimeDetection = true; -wfThumbMain(); +if ( defined( 'THUMB_HANDLER' ) ) { + // Called from thumb_handler.php via 404; extract params from the URI... + wfThumbHandle404(); +} else { + // Called directly, use $_REQUEST params + wfThumbHandleRequest(); +} wfLogProfilingData(); //-------------------------------------------------------------------------- -function wfThumbMain() { - wfProfileIn( __METHOD__ ); +/** + * Handle a thumbnail request via query parameters + * + * @return void + */ +function wfThumbHandleRequest() { + $params = get_magic_quotes_gpc() + ? array_map( 'stripslashes', $_REQUEST ) + : $_REQUEST; - $headers = array(); + wfStreamThumb( $params ); // stream the thumbnail +} - // Get input parameters - if ( get_magic_quotes_gpc() ) { - $params = array_map( 'stripslashes', $_REQUEST ); +/** + * Handle a thumbnail request via thumbnail file URL + * + * @return void + */ +function wfThumbHandle404() { + # lighttpd puts the original request in REQUEST_URI, while + # sjs sets that to the 404 handler, and puts the original + # request in REDIRECT_URL. + if ( isset( $_SERVER['REDIRECT_URL'] ) ) { + # The URL is un-encoded, so put it back how it was. + $uri = str_replace( "%2F", "/", urlencode( $_SERVER['REDIRECT_URL'] ) ); } else { - $params = $_REQUEST; + $uri = $_SERVER['REQUEST_URI']; } + $params = wfExtractThumbParams( $uri ); // basic wiki URL param extracting + if ( $params == null ) { + wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' ); + return; + } + + wfStreamThumb( $params ); // stream the thumbnail +} + +/** + * Stream a thumbnail specified by parameters + * + * @param $params Array + * @return void + */ +function wfStreamThumb( array $params ) { + wfProfileIn( __METHOD__ ); + + $headers = array(); // HTTP headers to send + $fileName = isset( $params['f'] ) ? $params['f'] : ''; unset( $params['f'] ); @@ -62,7 +106,7 @@ function wfThumbMain() { return; } $title = Title::makeTitleSafe( NS_FILE, $bits[1] ); - if ( is_null( $title ) ) { + if ( !$title ) { wfThumbError( 404, wfMsg( 'badtitletext' ) ); wfProfileOut( __METHOD__ ); return; @@ -74,7 +118,7 @@ function wfThumbMain() { // Check permissions if there are read restrictions if ( !in_array( 'read', User::getGroupPermissions( array( '*' ) ), true ) ) { - if ( !$img->getTitle()->userCanRead() ) { + if ( !$img->getTitle()->userCan( 'read' ) ) { wfThumbError( 403, 'Access denied. You do not have permission to access ' . 'the source file.' ); wfProfileOut( __METHOD__ ); @@ -84,6 +128,7 @@ function wfThumbMain() { $headers[] = 'Vary: Cookie'; } + // Check the source file storage path if ( !$img ) { wfThumbError( 404, wfMsg( 'badtitletext' ) ); wfProfileOut( __METHOD__ ); @@ -109,9 +154,9 @@ function wfThumbMain() { // Calculate time wfSuppressWarnings(); $imsUnix = strtotime( $imsString ); - $stat = stat( $sourcePath ); wfRestoreWarnings(); - if ( $stat['mtime'] <= $imsUnix ) { + $sourceTsUnix = wfTimestamp( TS_UNIX, $img->getTimestamp() ); + if ( $sourceTsUnix <= $imsUnix ) { header( 'HTTP/1.1 304 Not Modified' ); wfProfileOut( __METHOD__ ); return; @@ -121,10 +166,10 @@ function wfThumbMain() { // Stream the file if it exists already... try { $thumbName = $img->thumbName( $params ); - if ( $thumbName !== false ) { // valid params? + if ( strlen( $thumbName ) ) { // valid params? $thumbPath = $img->getThumbPath( $thumbName ); - if ( is_file( $thumbPath ) ) { - StreamFile::stream( $thumbPath, $headers ); + if ( $img->getRepo()->fileExists( $thumbPath ) ) { + $img->getRepo()->streamFile( $thumbPath, $headers ); wfProfileOut( __METHOD__ ); return; } @@ -138,7 +183,7 @@ function wfThumbMain() { // Thumbnail isn't already there, so create the new thumbnail... try { $thumb = $img->transform( $params, File::RENDER_NOW ); - } catch( Exception $ex ) { + } catch ( Exception $ex ) { // Tried to select a page on a non-paged file? $thumb = false; } @@ -149,29 +194,83 @@ function wfThumbMain() { $errorMsg = wfMsgHtml( 'thumbnail_error', 'File::transform() returned false' ); } elseif ( $thumb->isError() ) { $errorMsg = $thumb->getHtmlMsg(); - } elseif ( !$thumb->getPath() ) { + } elseif ( !$thumb->hasFile() ) { $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?' ); + } elseif ( $thumb->fileIsSource() ) { + $errorMsg = wfMsgHtml( 'thumbnail_error', + 'Image was not scaled, is the requested width bigger than the source?' ); } if ( $errorMsg !== false ) { wfThumbError( 500, $errorMsg ); } else { // Stream the file if there were no errors - StreamFile::stream( $thumb->getPath(), $headers ); + $thumb->streamFile( $headers ); } wfProfileOut( __METHOD__ ); } /** - * @param $status - * @param $msg + * Extract the required params for thumb.php from the thumbnail request URI. + * At least 'width' and 'f' should be set if the result is an array. + * + * @param $uri String Thumbnail request URI + * @return Array|null associative params array or null + */ +function wfExtractThumbParams( $uri ) { + $repo = RepoGroup::singleton()->getLocalRepo(); + + $hashDirRegex = $subdirRegex = ''; + for ( $i = 0; $i < $repo->getHashLevels(); $i++ ) { + $subdirRegex .= '[0-9a-f]'; + $hashDirRegex .= "$subdirRegex/"; + } + $zoneUrlRegex = preg_quote( $repo->getZoneUrl( 'thumb' ) ); + + $thumbUrlRegex = "!^$zoneUrlRegex(/archive|/temp|)/$hashDirRegex([^/]*)/([^/]*)$!"; + + // Check if this is a valid looking thumbnail request... + if ( preg_match( $thumbUrlRegex, $uri, $matches ) ) { + list( /* all */, $archOrTemp, $filename, $thumbname ) = $matches; + $filename = urldecode( $filename ); + $thumbname = urldecode( $thumbname ); + + $params = array( 'f' => $filename ); + if ( $archOrTemp == '/archive' ) { + $params['archived'] = 1; + } elseif ( $archOrTemp == '/temp' ) { + $params['temp'] = 1; + } + + // Check if the parameters can be extracted from the thumbnail name... + // @TODO: remove 'page' stuff and make ProofreadPage handle it via hook. + if ( preg_match( '!^(page(\d*)-)*(\d*)px-[^/]*$!', $thumbname, $matches ) ) { + list( /* all */, $pagefull, $pagenum, $size ) = $matches; + $params['width'] = $size; + if ( $pagenum ) { + $params['page'] = $pagenum; + } + return $params; // valid thumbnail URL + // Hooks return false if they manage to *resolve* the parameters + } elseif ( !wfRunHooks( 'ExtractThumbParameters', array( $thumbname, &$params ) ) ) { + return $params; // valid thumbnail URL (via extension or config) + } + } + + return null; // not a valid thumbnail URL +} + +/** + * Output a thumbnail generation error message + * + * @param $status integer + * @param $msg string + * @return void */ function wfThumbError( $status, $msg ) { global $wgShowHostnames; + header( 'Cache-Control: no-cache' ); header( 'Content-Type: text/html; charset=utf-8' ); if ( $status == 404 ) { @@ -202,4 +301,3 @@ $debug EOT; } -