Fixes r110484.

[lhc/web/wiklou.git] / thumb.php

diff --git a/thumb.php b/thumb.php
index f9b58b9..e5fcf3a 100644 (file)
--- a/thumb.php
+++ b/thumb.php
@@ -46,12 +46,18 @@ function wfThumbHandleRequest() {
  * @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.
+       # 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.
+               # The URL is un-encoded, so put it back how it was
                $uri = str_replace( "%2F", "/", urlencode( $_SERVER['REDIRECT_URL'] ) );
+               # Just get the URI path (REDIRECT_URL is either a full URL or a path)
+               if ( $uri[0] !== '/' ) {
+                       $bits = wfParseUrl( $uri );
+                       if ( $bits && isset( $bits['path'] ) ) {
+                               $uri = $bits['path'];
+                       }
+               }
        } else {
                $uri = $_SERVER['REQUEST_URI'];
        }
@@ -118,7 +124,7 @@ function wfStreamThumb( array $params ) {
 
        // 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__ );
@@ -128,6 +134,7 @@ function wfStreamThumb( array $params ) {
                $headers[] = 'Vary: Cookie';
        }
 
+       // Check the source file storage path
        if ( !$img ) {
                wfThumbError( 404, wfMsg( 'badtitletext' ) );
                wfProfileOut( __METHOD__ );
@@ -153,9 +160,9 @@ function wfStreamThumb( array $params ) {
                // 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;
@@ -165,10 +172,10 @@ function wfStreamThumb( array $params ) {
        // 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;
                        }
@@ -182,7 +189,7 @@ function wfStreamThumb( array $params ) {
        // 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;
        }
@@ -193,18 +200,18 @@ function wfStreamThumb( array $params ) {
                $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__ );
@@ -214,24 +221,36 @@ function wfStreamThumb( array $params ) {
  * 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
+ * @param $uri String Thumbnail request URI path
  * @return Array|null associative params array or null
  */
 function wfExtractThumbParams( $uri ) {
        $repo = RepoGroup::singleton()->getLocalRepo();
 
+       $zoneURI = $repo->getZoneUrl( 'thumb' );
+       if ( substr( $zoneURI, 0, 1 ) !== '/' ) {
+               $bits = wfParseUrl( $zoneURI );
+               if ( $bits && isset( $bits['path'] ) ) {
+                       $zoneURI = $bits['path'];
+               } else {
+                       return null;
+               }
+       }
+       $zoneUrlRegex = preg_quote( $zoneURI );
+
        $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' ) {
@@ -298,4 +317,3 @@ $debug
 
 EOT;
 }
-