*/
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' );
}
// Don't use fancy mime detection, just check the file extension for jpg/gif/png
* @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'];
}
// Check permissions if there are read restrictions
if ( !in_array( 'read', User::getGroupPermissions( array( '*' ) ), true ) ) {
- if ( !$img->getTitle()->userCanRead() ) {
+ if ( !$img->getTitle() || !$img->getTitle()->userCan( 'read' ) ) {
wfThumbError( 403, 'Access denied. You do not have permission to access ' .
'the source file.' );
wfProfileOut( __METHOD__ );
$headers[] = 'Vary: Cookie';
}
+ // Check the source file storage path
if ( !$img ) {
wfThumbError( 404, wfMsg( 'badtitletext' ) );
wfProfileOut( __METHOD__ );
// 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;
// Stream the file if it exists already...
try {
$thumbName = $img->thumbName( $params );
- if ( $thumbName !== false ) { // valid params?
+ if ( strlen( $thumbName ) ) { // valid params?
+ // For 404 handled thumbnails, we only use the the base name of the URI
+ // for the thumb params and the parent directory for the source file name.
+ // Check that the zone relative path matches up so squid caches won't pick
+ // up thumbs that would not be purged on source file deletion (bug 34231).
+ if ( isset( $params['rel404'] ) // thumbnail was handled via 404
+ && urldecode( $params['rel404'] ) !== $img->getThumbRel( $thumbName ) )
+ {
+ wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
+ wfProfileOut( __METHOD__ );
+ return;
+ }
$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;
}
// 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;
}
$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__ );
* 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([^/]*)/([^/]*)$!";
+ $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;
+ list( /* all */, $rel, $archOrTemp, $filename, $thumbname ) = $matches;
+ $filename = urldecode( $filename );
+ $thumbname = urldecode( $thumbname );
- $params = array( 'f' => $filename );
- if ( $archOrTemp == '/archive' ) {
+ $params = array( 'f' => $filename, 'rel404' => $rel );
+ if ( $archOrTemp == 'archive/' ) {
$params['archived'] = 1;
- } elseif ( $archOrTemp == '/temp' ) {
+ } 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;
EOT;
}
-
dépôts / lhc / web / wiklou.git / blobdiff