X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FImage.php;h=18449a1d97e41316f4f31c8344a10221a0b5decf;hb=c0401123da9d021f4cfe2244bbd349bddeb02be8;hp=c1ec8c783764acb7ea9dc779ccc665829775dd27;hpb=f90c740f915a825acbecf64017b226a3761720d9;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Image.php b/includes/Image.php index c1ec8c7837..18449a1d97 100644 --- a/includes/Image.php +++ b/includes/Image.php @@ -3,6 +3,23 @@ * @package MediaWiki */ +/** + * NOTE FOR WINDOWS USERS: + * To enable EXIF functions, add the folloing lines to the + * "Windows extensions" section of php.ini: + * + * extension=extensions/php_mbstring.dll + * extension=extensions/php_exif.dll + */ + +if ($wgShowEXIF) + require_once('Exif.php'); + +/** + * Bump this number when serialized cache records may be incompatible. + */ +define( 'MW_IMAGE_VERSION', 1 ); + /** * Class to represent an image * @@ -26,9 +43,11 @@ class Image $width, # \ $height, # | $bits, # --- returned by getimagesize (loadFromXxx) - $type, # | $attr, # / + $type, # MEDIATYPE_xxx (bitmap, drawing, audio...) + $mime, # MIME type, determined by MimeMagic::guessMimeType $size, # Size in bytes (loadFromXxx) + $metadata, # Metadata $dataLoaded; # Whether or not all this has been loaded from the database (loadFromXxx) @@ -53,8 +72,14 @@ class Image } function Image( $title ) { + global $wgShowEXIF; + + if( !is_object( $title ) ) { + wfDebugDieBacktrace( 'Image constructor given bogus title.' ); + } $this->title =& $title; $this->name = $title->getDBkey(); + $this->metadata = serialize ( array() ) ; $n = strrpos( $this->name, '.' ); $this->extension = strtolower( $n ? substr( $this->name, $n + 1 ) : '' ); @@ -91,13 +116,20 @@ class Image $cachedValues = $wgMemc->get( $keys[0] ); // Check if the key existed and belongs to this version of MediaWiki - if (!empty($cachedValues) && is_array($cachedValues) && isset($cachedValues['width']) && $cachedValues['fileExists']) { + if (!empty($cachedValues) && is_array($cachedValues) + && isset($cachedValues['version']) && ( $cachedValues['version'] == MW_IMAGE_VERSION ) + && $cachedValues['fileExists'] && isset( $cachedValues['mime'] ) && isset( $cachedValues['metadata'] ) ) + { if ( $wgUseSharedUploads && $cachedValues['fromShared']) { # if this is shared file, we need to check if image # in shared repository has not changed if ( isset( $keys[1] ) ) { $commonsCachedValues = $wgMemc->get( $keys[1] ); - if (!empty($commonsCachedValues) && is_array($commonsCachedValues) && isset($commonsCachedValues['width'])) { + if (!empty($commonsCachedValues) && is_array($commonsCachedValues) + && isset($commonsCachedValues['version']) + && ( $commonsCachedValues['version'] == MW_IMAGE_VERSION ) + && isset($commonsCachedValues['mime'])) { + wfDebug( "Pulling image metadata from shared repository cache\n" ); $this->name = $commonsCachedValues['name']; $this->imagePath = $commonsCachedValues['imagePath']; $this->fileExists = $commonsCachedValues['fileExists']; @@ -105,13 +137,16 @@ class Image $this->height = $commonsCachedValues['height']; $this->bits = $commonsCachedValues['bits']; $this->type = $commonsCachedValues['type']; + $this->mime = $commonsCachedValues['mime']; + $this->metadata = $commonsCachedValues['metadata']; $this->size = $commonsCachedValues['size']; $this->fromSharedDirectory = true; $this->dataLoaded = true; + $this->imagePath = $this->getFullPath(true); } } - } - else { + } else { + wfDebug( "Pulling image metadata from local cache\n" ); $this->name = $cachedValues['name']; $this->imagePath = $cachedValues['imagePath']; $this->fileExists = $cachedValues['fileExists']; @@ -119,11 +154,19 @@ class Image $this->height = $cachedValues['height']; $this->bits = $cachedValues['bits']; $this->type = $cachedValues['type']; + $this->mime = $cachedValues['mime']; + $this->metadata = $cachedValues['metadata']; $this->size = $cachedValues['size']; $this->fromSharedDirectory = false; $this->dataLoaded = true; + $this->imagePath = $this->getFullPath(); } } + if ( $this->dataLoaded ) { + wfIncrStats( 'image_cache_hit' ); + } else { + wfIncrStats( 'image_cache_miss' ); + } wfProfileOut( $fname ); return $this->dataLoaded; @@ -135,22 +178,30 @@ class Image function saveToCache() { global $wgMemc; $this->load(); - // We can't cache metadata for non-existent files, because if the file later appears - // in commons, the local keys won't be purged. + $keys = $this->getCacheKeys(); if ( $this->fileExists ) { - $keys = $this->getCacheKeys(); - - $cachedValues = array('name' => $this->name, - 'imagePath' => $this->imagePath, - 'fileExists' => $this->fileExists, - 'fromShared' => $this->fromSharedDirectory, - 'width' => $this->width, - 'height' => $this->height, - 'bits' => $this->bits, - 'type' => $this->type, - 'size' => $this->size); + // We can't cache negative metadata for non-existent files, + // because if the file later appears in commons, the local + // keys won't be purged. + $cachedValues = array( + 'version' => MW_IMAGE_VERSION, + 'name' => $this->name, + 'imagePath' => $this->imagePath, + 'fileExists' => $this->fileExists, + 'fromShared' => $this->fromSharedDirectory, + 'width' => $this->width, + 'height' => $this->height, + 'bits' => $this->bits, + 'type' => $this->type, + 'mime' => $this->mime, + 'metadata' => $this->metadata, + 'size' => $this->size ); $wgMemc->set( $keys[0], $cachedValues ); + } else { + // However we should clear them, so they aren't leftover + // if we've deleted the file. + $wgMemc->delete( $keys[0] ); } } @@ -158,12 +209,16 @@ class Image * Load metadata from the file itself */ function loadFromFile() { - global $wgUseSharedUploads, $wgSharedUploadDirectory, $wgLang; + global $wgUseSharedUploads, $wgSharedUploadDirectory, $wgLang, + $wgShowEXIF; $fname = 'Image::loadFromFile'; wfProfileIn( $fname ); $this->imagePath = $this->getFullPath(); $this->fileExists = file_exists( $this->imagePath ); - $gis = false; + $this->fromSharedDirectory = false; + $gis = array(); + + if (!$this->fileExists) wfDebug("$fname: ".$this->imagePath." not found locally!\n"); # If the file is not found, and a shared upload directory is used, look for it there. if (!$this->fileExists && $wgUseSharedUploads && $wgSharedUploadDirectory) { @@ -174,46 +229,72 @@ class Image $this->fileExists = file_exists( $sharedImage->getFullPath(true) ); if ( $this->fileExists ) { $this->name = $sharedImage->name; - $this->imagePath = $this->getFulPath(true); + $this->imagePath = $this->getFullPath(true); $this->fromSharedDirectory = true; } } + if ( $this->fileExists ) { + $magic=& wfGetMimeMagic(); + + $this->mime = $magic->guessMimeType($this->imagePath,true); + $this->type = $magic->getMediaType($this->imagePath,$this->mime); + # Get size in bytes - $s = stat( $this->imagePath ); - $this->size = $s['size']; + $this->size = filesize( $this->imagePath ); + $magic=& wfGetMimeMagic(); + # Height and width - # Don't try to get the width and height of sound and video files, that's bad for performance - if ( !Image::isKnownImageExtension( $this->extension ) ) { - $gis = false; - } elseif( $this->extension == 'svg' ) { + if( $this->mime == 'image/svg' ) { wfSuppressWarnings(); $gis = wfGetSVGsize( $this->imagePath ); wfRestoreWarnings(); - } else { + } + elseif ( !$magic->isPHPImageType( $this->mime ) ) { + # Don't try to get the width and height of sound and video files, that's bad for performance + $gis[0]= 0; //width + $gis[1]= 0; //height + $gis[2]= 0; //unknown + $gis[3]= ""; //width height string + } + else { wfSuppressWarnings(); $gis = getimagesize( $this->imagePath ); wfRestoreWarnings(); } + + wfDebug("$fname: ".$this->imagePath." loaded, ".$this->size." bytes, ".$this->mime.".\n"); } - if( $gis === false ) { - $this->width = 0; - $this->height = 0; - $this->bits = 0; - $this->type = 0; - } else { - $this->width = $gis[0]; - $this->height = $gis[1]; - $this->type = $gis[2]; - if ( isset( $gis['bits'] ) ) { - $this->bits = $gis['bits']; - } else { - $this->bits = 0; - } + else { + $gis[0]= 0; //width + $gis[1]= 0; //height + $gis[2]= 0; //unknown + $gis[3]= ""; //width height string + + $this->mime = NULL; + $this->type = MEDIATYPE_UNKNOWN; + wfDebug("$fname: ".$this->imagePath." NOT FOUND!\n"); } + + $this->width = $gis[0]; + $this->height = $gis[1]; + + #NOTE: $gis[2] contains a code for the image type. This is no longer used. + + #NOTE: we have to set this flag early to avoid load() to be called + # be some of the functions below. This may lead to recursion or other bad things! + # as ther's only one thread of execution, this should be safe anyway. $this->dataLoaded = true; + + + if ($this->fileExists && $wgShowEXIF) $this->metadata = serialize ( $this->retrieveExifData() ) ; + else $this->metadata = serialize ( array() ) ; + + if ( isset( $gis['bits'] ) ) $this->bits = $gis['bits']; + else $this->bits = 0; + wfProfileOut( $fname ); } @@ -221,34 +302,49 @@ class Image * Load image metadata from the DB */ function loadFromDB() { - global $wgUseSharedUploads, $wgSharedUploadDBname, $wgLang; + global $wgUseSharedUploads, $wgSharedUploadDBname, $wgSharedUploadDBprefix, $wgLang; $fname = 'Image::loadFromDB'; wfProfileIn( $fname ); $dbr =& wfGetDB( DB_SLAVE ); + + $this->checkDBSchema($dbr); + $row = $dbr->selectRow( 'image', - array( 'img_size', 'img_width', 'img_height', 'img_bits', 'img_type' ), + array( 'img_size', 'img_width', 'img_height', 'img_bits', + 'img_media_type', 'img_major_mime', 'img_minor_mime', 'img_metadata' ), array( 'img_name' => $this->name ), $fname ); if ( $row ) { $this->fromSharedDirectory = false; $this->fileExists = true; $this->loadFromRow( $row ); $this->imagePath = $this->getFullPath(); + // Check for rows from a previous schema, quietly upgrade them + if ( is_null($this->type) ) { + $this->upgradeRow(); + } } elseif ( $wgUseSharedUploads && $wgSharedUploadDBname ) { # In case we're on a wgCapitalLinks=false wiki, we # capitalize the first letter of the filename before # looking it up in the shared repository. $name = $wgLang->ucfirst($this->name); - $row = $dbr->selectRow( "`$wgSharedUploadDBname`.image", - array( 'img_size', 'img_width', 'img_height', 'img_bits', 'img_type' ), + $row = $dbr->selectRow( "`$wgSharedUploadDBname`.{$wgSharedUploadDBprefix}image", + array( + 'img_size', 'img_width', 'img_height', 'img_bits', + 'img_media_type', 'img_major_mime', 'img_minor_mime', 'img_metadata' ), array( 'img_name' => $name ), $fname ); if ( $row ) { $this->fromSharedDirectory = true; $this->fileExists = true; - $this->imagePath = ''; + $this->imagePath = $this->getFullPath(true); $this->name = $name; $this->loadFromRow( $row ); + + // Check for rows from a previous schema, quietly upgrade them + if ( is_null($this->type) ) { + $this->upgradeRow(); + } } } @@ -260,10 +356,12 @@ class Image $this->type = 0; $this->fileExists = false; $this->fromSharedDirectory = false; + $this->metadata = serialize ( array() ) ; } # Unconditionally set loaded=true, we don't want the accessors constantly rechecking $this->dataLoaded = true; + wfProfileOut( $fname ); } /* @@ -274,7 +372,20 @@ class Image $this->width = $row->img_width; $this->height = $row->img_height; $this->bits = $row->img_bits; - $this->type = $row->img_type; + $this->type = $row->img_media_type; + + $major= $row->img_major_mime; + $minor= $row->img_minor_mime; + + if (!$major) $this->mime = "unknown/unknown"; + else { + if (!$minor) $minor= "unknown"; + $this->mime = $major.'/'.$minor; + } + + $this->metadata = $row->img_metadata; + if ( $this->metadata == "" ) $this->metadata = serialize ( array() ) ; + $this->dataLoaded = true; } @@ -282,10 +393,13 @@ class Image * Load image metadata from cache or DB, unless already loaded */ function load() { + global $wgSharedUploadDBname, $wgUseSharedUploads; if ( !$this->dataLoaded ) { if ( !$this->loadFromCache() ) { $this->loadFromDB(); - if ( $this->fileExists ) { + if ( !$wgSharedUploadDBname && $wgUseSharedUploads ) { + $this->loadFromFile(); + } elseif ( $this->fileExists ) { $this->saveToCache(); } } @@ -293,6 +407,58 @@ class Image } } + /** + * Metadata was loaded from the database, but the row had a marker indicating it needs to be + * upgraded from the 1.4 schema, which had no width, height, bits or type. Upgrade the row. + */ + function upgradeRow() { + global $wgDBname, $wgSharedUploadDBname; + $fname = 'Image::upgradeRow'; + wfProfileIn( $fname ); + + $this->loadFromFile(); + $dbw =& wfGetDB( DB_MASTER ); + + if ( $this->fromSharedDirectory ) { + if ( !$wgSharedUploadDBname ) { + wfProfileOut( $fname ); + return; + } + + // Write to the other DB using selectDB, not database selectors + // This avoids breaking replication in MySQL + $dbw->selectDB( $wgSharedUploadDBname ); + } + + $this->checkDBSchema($dbw); + + if (strpos($this->mime,'/')!==false) { + list($major,$minor)= explode('/',$this->mime,2); + } + else { + $major= $this->mime; + $minor= "unknown"; + } + + wfDebug("$fname: upgrading ".$this->name." to 1.5 schema\n"); + + $dbw->update( 'image', + array( + 'img_width' => $this->width, + 'img_height' => $this->height, + 'img_bits' => $this->bits, + 'img_media_type' => $this->type, + 'img_major_mime' => $major, + 'img_minor_mime' => $minor, + 'img_metadata' => $this->metadata, + ), array( 'img_name' => $this->name ), $fname + ); + if ( $this->fromSharedDirectory ) { + $dbw->selectDB( $wgDBname ); + } + wfProfileOut( $fname ); + } + /** * Return the name of this image * @access public @@ -326,8 +492,14 @@ class Image } function getViewURL() { - if( $this->mustRender() ) { - return $this->createThumb( $this->getWidth() ); + if( $this->mustRender()) { + if( $this->canRender() ) { + return $this->createThumb( $this->getWidth() ); + } + else { + wfDebug('Image::getViewURL(): supposed to render '.$this->name.' ('.$this->mime."), but can't!\n"); + return $this->getURL(); #hm... return NULL? + } } else { return $this->getURL(); } @@ -375,19 +547,159 @@ class Image } /** - * Return the type of the image - * - * - 1 GIF - * - 2 JPG - * - 3 PNG - * - 15 WBMP - * - 16 XBM + * Returns the mime type of the file. */ - function getType() { + function getMimeType() { + $this->load(); + return $this->mime; + } + + /** + * Return the type of the media in the file. + * Use the value returned by this function with the MEDIATYPE_xxx constants. + */ + function getMediaType() { $this->load(); return $this->type; } + /** + * Checks if the file can be presented to the browser as a bitmap. + * + * Currently, this checks if the file is an image format + * that can be converted to a format + * supported by all browsers (namely GIF, PNG and JPEG), + * or if it is an SVG image and SVG conversion is enabled. + * + * @todo remember the result of this check. + */ + function canRender() { + global $wgUseImageMagick; + + if( $this->getWidth()<=0 || $this->getHeight()<=0 ) return false; + + $mime= $this->getMimeType(); + + if (!$mime || $mime==='unknown' || $mime==='unknown/unknown') return false; + + #if it's SVG, check if ther's a converter enabled + if ($mime === 'image/svg') { + global $wgSVGConverters, $wgSVGConverter; + + if ($wgSVGConverter && isset( $wgSVGConverters[$wgSVGConverter])) { + return true; + } + } + + #image formats available on ALL browsers + if ( $mime === 'image/gif' + || $mime === 'image/png' + || $mime === 'image/jpeg' ) return true; + + #image formats that can be converted to the above formats + if ($wgUseImageMagick) { + #convertable by ImageMagick (there are more...) + if ( $mime === 'image/vnd.wap.wbmp' + || $mime === 'image/x-xbitmap' + || $mime === 'image/x-xpixmap' + #|| $mime === 'image/x-icon' #file may be split into multiple parts + || $mime === 'image/x-portable-anymap' + || $mime === 'image/x-portable-bitmap' + || $mime === 'image/x-portable-graymap' + || $mime === 'image/x-portable-pixmap' + #|| $mime === 'image/x-photoshop' #this takes a lot of CPU and RAM! + || $mime === 'image/x-rgb' + || $mime === 'image/x-bmp' + || $mime === 'image/tiff' ) return true; + } + else { + #convertable by the PHP GD image lib + if ( $mime === 'image/vnd.wap.wbmp' + || $mime === 'image/x-xbitmap' ) return true; + } + + return false; + } + + + /** + * Return true if the file is of a type that can't be directly + * rendered by typical browsers and needs to be re-rasterized. + * + * This returns true for everything but the bitmap types + * supported by all browsers, i.e. JPEG; GIF and PNG. It will + * also return true for any non-image formats. + * + * @return bool + */ + function mustRender() { + $mime= $this->getMimeType(); + + if ( $mime === "image/gif" + || $mime === "image/png" + || $mime === "image/jpeg" ) return false; + + return true; + } + + /** + * Determines if this media file may be shown inline on a page. + * + * This is currently synonymous to canRender(), but this could be + * extended to also allow inline display of other media, + * like flash animations or videos. If you do so, please keep in mind that + * that could be a security risk. + */ + function allowInlineDisplay() { + return $this->canRender(); + } + + /** + * Determines if this media file is in a format that is unlikely to + * contain viruses or malicious content. It uses the global + * $wgTrustedMediaFormats list to determine if the file is safe. + * + * This is used to show a warning on the description page of non-safe files. + * It may also be used to disallow direct [[media:...]] links to such files. + * + * Note that this function will always return ture if allowInlineDisplay() + * or isTrustedFile() is true for this file. + */ + function isSafeFile() { + if ($this->allowInlineDisplay()) return true; + if ($this->isTrustedFile()) return true; + + global $wgTrustedMediaFormats; + + $type= $this->getMediaType(); + $mime= $this->getMimeType(); + #wfDebug("Image::isSafeFile: type= $type, mime= $mime\n"); + + if (!$type || $type===MEDIATYPE_UNKNOWN) return false; #unknown type, not trusted + if ( in_array( $type, $wgTrustedMediaFormats) ) return true; + + if ($mime==="unknown/unknown") return false; #unknown type, not trusted + if ( in_array( $mime, $wgTrustedMediaFormats) ) return true; + + return false; + } + + /** Returns true if the file is flagegd as trusted. Files flagged that way + * can be linked to directly, even if that is not allowed for this type of + * file normally. + * + * This is a dummy function right now and always returns false. It could be + * implemented to extract a flag from the database. The trusted flag could be + * set on upload, if the user has sufficient privileges, to bypass script- + * and html-filters. It may even be coupeled with cryptographics signatures + * or such. + */ + function isTrustedFile() { + #this could be implemented to check a flag in the databas, + #look for signatures, etc + return false; + } + /** * Return the escapeLocalURL of this image * @access public @@ -411,6 +723,7 @@ class Image * * @param string $name Name of the image, without the leading "Image:" * @param boolean $fromSharedDirectory Should this be in $wgSharedUploadPath? + * @return string URL of $name image * @access public * @static */ @@ -429,7 +742,7 @@ class Image /** * Returns true if the image file exists on disk. - * + * @return boolean Whether image file exist on disk. * @access public */ function exists() { @@ -438,24 +751,51 @@ class Image } /** - * + * @todo document * @access private */ function thumbUrl( $width, $subdir='thumb') { global $wgUploadPath, $wgUploadBaseUrl, - $wgSharedUploadPath,$wgSharedUploadDirectory; - $name = $this->thumbName( $width ); - if($this->fromSharedDirectory) { - $base = ''; - $path = $wgSharedUploadPath; + $wgSharedUploadPath,$wgSharedUploadDirectory, + $wgSharedThumbnailScriptPath, $wgThumbnailScriptPath; + + // Generate thumb.php URL if possible + $script = false; + $url = false; + + if ( $this->fromSharedDirectory ) { + if ( $wgSharedThumbnailScriptPath ) { + $script = $wgSharedThumbnailScriptPath; + } } else { - $base = $wgUploadBaseUrl; - $path = $wgUploadPath; + if ( $wgThumbnailScriptPath ) { + $script = $wgThumbnailScriptPath; + } } - $url = "{$base}{$path}/{$subdir}" . - wfGetHashPath($name, $this->fromSharedDirectory) - . "{$name}"; - return wfUrlencode($url); + if ( $script ) { + $url = $script . '?f=' . urlencode( $this->name ) . '&w=' . urlencode( $width ); + if( $this->mustRender() ) { + $url.= '&r=1'; + } + } else { + $name = $this->thumbName( $width ); + if($this->fromSharedDirectory) { + $base = ''; + $path = $wgSharedUploadPath; + } else { + $base = $wgUploadBaseUrl; + $path = $wgUploadPath; + } + if ( Image::isHashed( $this->fromSharedDirectory ) ) { + $url = "{$base}{$path}/{$subdir}" . + wfGetHashPath($this->name, $this->fromSharedDirectory) + . $this->name.'/'.$name; + $url = wfUrlencode( $url ); + } else { + $url = "{$base}{$path}/{$subdir}/{$name}"; + } + } + return array( $script !== false, $url ); } /** @@ -465,11 +805,19 @@ class Image * @param boolean $shared Does the thumbnail come from the shared repository? * @access private */ - function thumbName( $width, $shared=false ) { + function thumbName( $width ) { $thumb = $width."px-".$this->name; - if( $this->extension == 'svg' ) { - # Rasterize SVG vector images to PNG - $thumb .= '.png'; + + if( $this->mustRender() ) { + if( $this->canRender() ) { + # Rasterize to PNG (for SVG vector images, etc) + $thumb .= '.png'; + } + else { + #should we use iconThumb here to get a symbolic thumbnail? + #or should we fail with an internal error? + return NULL; //can't make bitmap + } } return $thumb; } @@ -506,23 +854,29 @@ class Image * @return ThumbnailImage * @access public */ - function &getThumbnail( $width, $height=-1 ) { + function getThumbnail( $width, $height=-1 ) { if ( $height == -1 ) { return $this->renderThumb( $width ); } $this->load(); - if ( $width < $this->width ) { - $thumbheight = $this->height * $width / $this->width; - $thumbwidth = $width; - } else { - $thumbheight = $this->height; - $thumbwidth = $this->width; - } - if ( $thumbheight > $height ) { - $thumbwidth = $thumbwidth * $height / $thumbheight; - $thumbheight = $height; + + if ($this->canRender()) { + if ( $width < $this->width ) { + $thumbheight = $this->height * $width / $this->width; + $thumbwidth = $width; + } else { + $thumbheight = $this->height; + $thumbwidth = $this->width; + } + if ( $thumbheight > $height ) { + $thumbwidth = $thumbwidth * $height / $thumbheight; + $thumbheight = $height; + } + + $thumb = $this->renderThumb( $thumbwidth ); } - $thumb = $this->renderThumb( $thumbwidth ); + else $thumb= NULL; #not a bitmap or renderable image, don't try. + if( is_null( $thumb ) ) { $thumb = $this->iconThumb(); } @@ -537,7 +891,7 @@ class Image $try = array( 'fileicon-' . $this->extension . '.png', 'fileicon.png' ); foreach( $try as $icon ) { - $path = '/common/images/' . $icon; + $path = '/common/images/icons/' . $icon; $filepath = $wgStyleDirectory . $path; if( file_exists( $filepath ) ) { return new ThumbnailImage( $wgStylePath . $path, 120, 120 ); @@ -558,169 +912,260 @@ class Image * @return ThumbnailImage * @access private */ - function /* private */ renderThumb( $width, $useScript = true ) { - global $wgImageMagickConvertCommand; - global $wgUseImageMagick; + function renderThumb( $width, $useScript = true ) { global $wgUseSquid, $wgInternalServer; global $wgThumbnailScriptPath, $wgSharedThumbnailScriptPath; + + $fname = 'Image::renderThumb'; + wfProfileIn( $fname ); - $width = IntVal( $width ); + $width = intval( $width ); $this->load(); - $thumbName = $this->thumbName( $width, $this->fromSharedDirectory ); - $thumbPath = wfImageThumbDir( $thumbName, 'thumb', $this->fromSharedDirectory ).'/'.$thumbName; - $thumbUrl = $this->thumbUrl( $width ); - #wfDebug ( "Render name: $thumbName path: $thumbPath url: $thumbUrl\n"); if ( ! $this->exists() ) { # If there is no image, there will be no thumbnail + wfProfileOut( $fname ); return null; } # Sanity check $width - if( $width <= 0 ) { + if( $width <= 0 || $this->width <= 0) { # BZZZT + wfProfileOut( $fname ); return null; } - if( $width > $this->width && !$this->mustRender() ) { + if( $width >= $this->width && !$this->mustRender() ) { # Don't make an image bigger than the source - return new ThumbnailImage( $this->getViewURL(), $this->getWidth(), $this->getHeight() ); + $thumb = new ThumbnailImage( $this->getViewURL(), $this->getWidth(), $this->getHeight() ); + wfProfileOut( $fname ); + return $thumb; } $height = floor( $this->height * ( $width/$this->width ) ); - // Generate thumb.php URL if possible - $thumbScript = false; - $scriptUrl = false; + list( $isScriptUrl, $url ) = $this->thumbUrl( $width ); + if ( $isScriptUrl && $useScript ) { + // Use thumb.php to render the image + $thumb = new ThumbnailImage( $url, $width, $height ); + wfProfileOut( $fname ); + return $thumb; + } - if ( $this->fromSharedDirectory ) { - if ( $wgSharedThumbnailScriptPath ) { - $thumbScript = $wgSharedThumbnailScriptPath; + $thumbName = $this->thumbName( $width, $this->fromSharedDirectory ); + $thumbPath = wfImageThumbDir( $this->name, $this->fromSharedDirectory ).'/'.$thumbName; + + if ( !file_exists( $thumbPath ) ) { + $oldThumbPath = wfDeprecatedThumbDir( $thumbName, 'thumb', $this->fromSharedDirectory ). + '/'.$thumbName; + $done = false; + if ( file_exists( $oldThumbPath ) ) { + if ( filemtime($oldThumbPath) >= filemtime($this->imagePath) ) { + rename( $oldThumbPath, $thumbPath ); + $done = true; + } else { + unlink( $oldThumbPath ); + } + } + if ( !$done ) { + $this->reallyRenderThumb( $thumbPath, $width, $height ); + + # Purge squid + # This has to be done after the image is updated and present for all machines on NFS, + # or else the old version might be stored into the squid again + if ( $wgUseSquid ) { + if ( substr( $url, 0, 4 ) == 'http' ) { + $urlArr = array( $url ); + } else { + $urlArr = array( $wgInternalServer.$url ); + } + wfPurgeSquidServers($urlArr); + } + } + } + + $thumb = new ThumbnailImage( $url, $width, $height, $thumbPath ); + wfProfileOut( $fname ); + return $thumb; + } // END OF function renderThumb + + /** + * Really render a thumbnail + * Call this only for images for which canRender() returns true. + * + * @access private + */ + function reallyRenderThumb( $thumbPath, $width, $height ) { + global $wgSVGConverters, $wgSVGConverter, + $wgUseImageMagick, $wgImageMagickConvertCommand; + + $this->load(); + + if( $this->mime === "image/svg" ) { + #Right now we have only SVG + + global $wgSVGConverters, $wgSVGConverter; + if( isset( $wgSVGConverters[$wgSVGConverter] ) ) { + global $wgSVGConverterPath; + $cmd = str_replace( + array( '$path/', '$width', '$input', '$output' ), + array( $wgSVGConverterPath, + $width, + wfEscapeShellArg( $this->imagePath ), + wfEscapeShellArg( $thumbPath ) ), + $wgSVGConverters[$wgSVGConverter] ); + $conv = shell_exec( $cmd ); + } else { + $conv = false; } + } elseif ( $wgUseImageMagick ) { + # use ImageMagick + # Specify white background color, will be used for transparent images + # in Internet Explorer/Windows instead of default black. + $cmd = $wgImageMagickConvertCommand . + " -quality 85 -background white -geometry {$width} ". + wfEscapeShellArg($this->imagePath) . " " . + wfEscapeShellArg($thumbPath); + wfDebug("reallyRenderThumb: running ImageMagick: $cmd"); + $conv = shell_exec( $cmd ); } else { - if ( $wgThumbnailScriptPath ) { - $thumbScript = $wgThumbnailScriptPath; + # Use PHP's builtin GD library functions. + # + # First find out what kind of file this is, and select the correct + # input routine for this. + + $typemap = array( + 'image/gif' => array( 'imagecreatefromgif', 'palette', 'imagegif' ), + 'image/jpeg' => array( 'imagecreatefromjpeg', 'truecolor', array( &$this, 'imageJpegWrapper' ) ), + 'image/png' => array( 'imagecreatefrompng', 'bits', 'imagepng' ), + 'image/vnd.wap.wmbp' => array( 'imagecreatefromwbmp', 'palette', 'imagewbmp' ), + 'image/xbm' => array( 'imagecreatefromxbm', 'palette', 'imagexbm' ), + ); + if( !isset( $typemap[$this->mime] ) ) { + $err = 'Image type not supported'; + wfDebug( "$err\n" ); + return $err; + } + list( $loader, $colorStyle, $saveType ) = $typemap[$this->mime]; + + if( !function_exists( $loader ) ) { + $err = "Incomplete GD library configuration: missing function $loader"; + wfDebug( "$err\n" ); + return $err; + } + if( $colorStyle == 'palette' ) { + $truecolor = false; + } elseif( $colorStyle == 'truecolor' ) { + $truecolor = true; + } elseif( $colorStyle == 'bits' ) { + $truecolor = ( $this->bits > 8 ); + } + + $src_image = call_user_func( $loader, $this->imagePath ); + if ( $truecolor ) { + $dst_image = imagecreatetruecolor( $width, $height ); + } else { + $dst_image = imagecreate( $width, $height ); } + imagecopyresampled( $dst_image, $src_image, + 0,0,0,0, + $width, $height, $this->width, $this->height ); + call_user_func( $saveType, $dst_image, $thumbPath ); + imagedestroy( $dst_image ); + imagedestroy( $src_image ); } - if ( $thumbScript ) { - $scriptUrl = $thumbScript . '?f=' . urlencode( $this->name ) . '&w=' . urlencode( $width ); - if ( $useScript ) { - // Use thumb.php to render the image - return new ThumbnailImage( $scriptUrl, $width, $height ); + + # + # Check for zero-sized thumbnails. Those can be generated when + # no disk space is available or some other error occurs + # + if( file_exists( $thumbPath ) ) { + $thumbstat = stat( $thumbPath ); + if( $thumbstat['size'] == 0 ) { + unlink( $thumbPath ); } } + } - if ( (! file_exists( $thumbPath ) ) || ( filemtime($thumbPath) < filemtime($this->imagePath) ) ) { - if( $this->extension == 'svg' ) { - global $wgSVGConverters, $wgSVGConverter; - if( isset( $wgSVGConverters[$wgSVGConverter] ) ) { - global $wgSVGConverterPath; - $cmd = str_replace( - array( '$path/', '$width', '$input', '$output' ), - array( $wgSVGConverterPath, - $width, - escapeshellarg( $this->imagePath ), - escapeshellarg( $thumbPath ) ), - $wgSVGConverters[$wgSVGConverter] ); - $conv = shell_exec( $cmd ); - } else { - $conv = false; - } - } elseif ( $wgUseImageMagick ) { - # use ImageMagick - # Specify white background color, will be used for transparent images - # in Internet Explorer/Windows instead of default black. - $cmd = $wgImageMagickConvertCommand . - " -quality 85 -background white -geometry {$width} ". - escapeshellarg($this->imagePath) . " " . - escapeshellarg($thumbPath); - $conv = shell_exec( $cmd ); - } else { - # Use PHP's builtin GD library functions. - # - # First find out what kind of file this is, and select the correct - # input routine for this. + function imageJpegWrapper( $dst_image, $thumbPath ) { + imageinterlace( $dst_image ); + imagejpeg( $dst_image, $thumbPath, 95 ); + } + + /** + * Get all thumbnail names previously generated for this image + */ + function getThumbnails( $shared = false ) { + if ( Image::isHashed( $shared ) ) { + $this->load(); + $files = array(); + $dir = wfImageThumbDir( $this->name, $shared ); - $truecolor = false; - - switch( $this->type ) { - case 1: # GIF - $src_image = imagecreatefromgif( $this->imagePath ); - break; - case 2: # JPG - $src_image = imagecreatefromjpeg( $this->imagePath ); - $truecolor = true; - break; - case 3: # PNG - $src_image = imagecreatefrompng( $this->imagePath ); - $truecolor = ( $this->bits > 8 ); - break; - case 15: # WBMP for WML - $src_image = imagecreatefromwbmp( $this->imagePath ); - break; - case 16: # XBM - $src_image = imagecreatefromxbm( $this->imagePath ); - break; - default: - return 'Image type not supported'; - break; - } - if ( $truecolor ) { - $dst_image = imagecreatetruecolor( $width, $height ); - } else { - $dst_image = imagecreate( $width, $height ); - } - imagecopyresampled( $dst_image, $src_image, - 0,0,0,0, - $width, $height, $this->width, $this->height ); - switch( $this->type ) { - case 1: # GIF - case 3: # PNG - case 15: # WBMP - case 16: # XBM - #$thumbUrl .= ".png"; - #$thumbPath .= ".png"; - imagepng( $dst_image, $thumbPath ); - break; - case 2: # JPEG - #$thumbUrl .= ".jpg"; - #$thumbPath .= ".jpg"; - imageinterlace( $dst_image ); - imagejpeg( $dst_image, $thumbPath, 95 ); - break; - default: - break; + // This generates an error on failure, hence the @ + $handle = @opendir( $dir ); + + if ( $handle ) { + while ( false !== ( $file = readdir($handle) ) ) { + if ( $file{0} != '.' ) { + $files[] = $file; + } } - imagedestroy( $dst_image ); - imagedestroy( $src_image ); + closedir( $handle ); } - # - # Check for zero-sized thumbnails. Those can be generated when - # no disk space is available or some other error occurs - # - if( file_exists( $thumbPath ) ) { - $thumbstat = stat( $thumbPath ); - if( $thumbstat['size'] == 0 ) { - unlink( $thumbPath ); - } + } else { + $files = array(); + } + + return $files; + } + + /** + * Delete all previously generated thumbnails, refresh metadata in memcached and purge the squid + */ + function purgeCache( $archiveFiles = array(), $shared = false ) { + global $wgInternalServer, $wgUseSquid; + + // Refresh metadata cache + clearstatcache(); + $this->loadFromFile(); + $this->saveToCache(); + + // Delete thumbnails + $files = $this->getThumbnails( $shared ); + $dir = wfImageThumbDir( $this->name, $shared ); + $urls = array(); + foreach ( $files as $file ) { + if ( preg_match( '/^(\d+)px/', $file, $m ) ) { + $urls[] = $wgInternalServer . $this->thumbUrl( $m[1], $this->fromSharedDirectory ); + @unlink( "$dir/$file" ); } + } - # Purge squid - # This has to be done after the image is updated and present for all machines on NFS, - # or else the old version might be stored into the squid again - if ( $wgUseSquid ) { - $urlArr = Array( - $wgInternalServer.$thumbUrl - ); - if ( $scriptUrl ) { - $urlArr[] = $scriptUrl; - } - wfPurgeSquidServers($urlArr); + // Purge the squid + if ( $wgUseSquid ) { + $urls[] = $wgInternalServer . $this->getViewURL(); + foreach ( $archiveFiles as $file ) { + $urls[] = $wgInternalServer . wfImageArchiveUrl( $file ); } + wfPurgeSquidServers( $urls ); + } + } + + function checkDBSchema(&$db) { + # img_name must be unique + if ( !$db->indexUnique( 'image', 'img_name' ) && !$db->indexExists('image','PRIMARY') ) { + wfDebugDieBacktrace( 'Database schema not up to date, please run maintenance/archives/patch-image_name_unique.sql' ); + } + + #new fields must exist + if ( !$db->fieldExists( 'image', 'img_media_type' ) + || !$db->fieldExists( 'image', 'img_metadata' ) + || !$db->fieldExists( 'image', 'img_width' ) ) { + + wfDebugDieBacktrace( 'Database schema not up to date, please run maintenance/update.php' ); } - return new ThumbnailImage( $thumbUrl, $width, $height ); - } // END OF function createThumb + } /** * Return the image history of this image, line by line. @@ -735,6 +1180,9 @@ class Image function nextHistoryLine() { $fname = 'Image::nextHistoryLine()'; $dbr =& wfGetDB( DB_SLAVE ); + + $this->checkDBSchema($dbr); + if ( $this->historyLine == 0 ) {// called for the first time, return line from cur $this->historyRes = $dbr->select( 'image', array( 'img_size','img_description','img_user','img_user_text','img_timestamp', "'' AS oi_archive_name" ), @@ -763,16 +1211,6 @@ class Image function resetHistory() { $this->historyLine = 0; } - - /** - * Return true if the file is of a type that can't be directly - * rendered by typical browsers and needs to be re-rasterized. - * @return bool - */ - function mustRender() { - $this->load(); - return ( $this->extension == 'svg' ); - } /** * Return the full filesystem path to the file. Note that this does @@ -794,41 +1232,44 @@ class Image $dir = $fromSharedRepository ? $wgSharedUploadDirectory : $wgUploadDirectory; - $name = $this->name; - $fullpath = $dir . wfGetHashPath($name, $fromSharedRepository) . $name; + + // $wgSharedUploadDirectory may be false, if thumb.php is used + if ( $dir ) { + $fullpath = $dir . wfGetHashPath($this->name, $fromSharedRepository) . $this->name; + } else { + $fullpath = false; + } + return $fullpath; } - + /** * @return bool * @static */ - function isKnownImageExtension( $ext ) { - static $extensions = array( 'svg', 'png', 'jpg', 'jpeg', 'gif', 'bmp', 'xbm' ); - return in_array( $ext, $extensions ); + function isHashed( $shared ) { + global $wgHashedUploadDirectory, $wgHashedSharedUploadDirectory; + return $shared ? $wgHashedSharedUploadDirectory : $wgHashedUploadDirectory; } - + /** * Record an image upload in the upload log and the image table */ function recordUpload( $oldver, $desc, $copyStatus = '', $source = '' ) { - global $wgUser, $wgLang, $wgTitle, $wgOut, $wgDeferredUpdateList; - global $wgUseCopyrightUpload; + global $wgUser, $wgLang, $wgTitle, $wgDeferredUpdateList; + global $wgUseCopyrightUpload, $wgUseSquid, $wgPostCommitUpdateList; $fname = 'Image::recordUpload'; $dbw =& wfGetDB( DB_MASTER ); - # img_name must be unique - if ( !$dbw->indexUnique( 'image', 'img_name' ) && !$dbw->indexExists('image','PRIMARY') ) { - wfDebugDieBacktrace( 'Database schema not up to date, please run maintenance/archives/patch-image_name_unique.sql' ); - } + $this->checkDBSchema($dbw); - // Fill metadata fields by querying the file - $this->loadFromFile(); - $this->saveToCache(); + // Delete thumbnails and refresh the metadata cache + $this->purgeCache(); // Fail now if the image isn't there if ( !$this->fileExists || $this->fromSharedDirectory ) { + wfDebug( "Image::recordUpload: File ".$this->imagePath." went missing!\n" ); return false; } @@ -840,8 +1281,17 @@ class Image $textdesc = $desc; } - $now = wfTimestampNow(); + $now = $dbw->timestamp(); + #split mime type + if (strpos($this->mime,'/')!==false) { + list($major,$minor)= explode('/',$this->mime,2); + } + else { + $major= $this->mime; + $minor= "unknown"; + } + # Test to see if the row exists using INSERT IGNORE # This avoids race conditions by locking the row until the commit, and also # doesn't deadlock. SELECT FOR UPDATE causes a deadlock for every race condition. @@ -849,17 +1299,21 @@ class Image array( 'img_name' => $this->name, 'img_size'=> $this->size, - 'img_width' => $this->width, - 'img_height' => $this->height, + 'img_width' => intval( $this->width ), + 'img_height' => intval( $this->height ), 'img_bits' => $this->bits, - 'img_type' => $this->type, - 'img_timestamp' => $dbw->timestamp($now), + 'img_media_type' => $this->type, + 'img_major_mime' => $major, + 'img_minor_mime' => $minor, + 'img_timestamp' => $now, 'img_description' => $desc, 'img_user' => $wgUser->getID(), 'img_user_text' => $wgUser->getName(), + 'img_metadata' => $this->metadata, ), $fname, 'IGNORE' ); $descTitle = $this->getTitle(); + $purgeURLs = array(); if ( $dbw->affectedRows() ) { # Successfully inserted, this is a new image @@ -880,26 +1334,28 @@ class Image 'oi_width' => 'img_width', 'oi_height' => 'img_height', 'oi_bits' => 'img_bits', - 'oi_type' => 'img_type', 'oi_timestamp' => 'img_timestamp', 'oi_description' => 'img_description', 'oi_user' => 'img_user', 'oi_user_text' => 'img_user_text', ), array( 'img_name' => $this->name ), $fname ); - + # Update the current image row $dbw->update( 'image', array( /* SET */ 'img_size' => $this->size, - 'img_width' => $this->width, - 'img_height' => $this->height, + 'img_width' => intval( $this->width ), + 'img_height' => intval( $this->height ), 'img_bits' => $this->bits, - 'img_type' => $this->type, - 'img_timestamp' => $dbw->timestamp(), + 'img_media_type' => $this->type, + 'img_major_mime' => $major, + 'img_minor_mime' => $minor, + 'img_timestamp' => $now, + 'img_description' => $desc, 'img_user' => $wgUser->getID(), 'img_user_text' => $wgUser->getName(), - 'img_description' => $desc, + 'img_metadata' => $this->metadata, ), array( /* WHERE */ 'img_name' => $this->name ), $fname @@ -907,14 +1363,120 @@ class Image # Invalidate the cache for the description page $descTitle->invalidateCache(); + $purgeURLs[] = $descTitle->getInternalURL(); } + # Invalidate cache for all pages using this image + $linksTo = $this->getLinksTo(); + + if ( $wgUseSquid ) { + $u = SquidUpdate::newFromTitles( $linksTo, $purgeURLs ); + array_push( $wgPostCommitUpdateList, $u ); + } + Title::touchArray( $linksTo ); + $log = new LogPage( 'upload' ); $log->addEntry( 'upload', $descTitle, $desc ); return true; } - + + /** + * Get an array of Title objects which are articles which use this image + * Also adds their IDs to the link cache + * + * This is mostly copied from Title::getLinksTo() + */ + function getLinksTo( $options = '' ) { + global $wgLinkCache; + $fname = 'Image::getLinksTo'; + wfProfileIn( $fname ); + + if ( $options ) { + $db =& wfGetDB( DB_MASTER ); + } else { + $db =& wfGetDB( DB_SLAVE ); + } + + extract( $db->tableNames( 'page', 'imagelinks' ) ); + $encName = $db->addQuotes( $this->name ); + $sql = "SELECT page_namespace,page_title,page_id FROM $page,$imagelinks WHERE page_id=il_from AND il_to=$encName $options"; + $res = $db->query( $sql, $fname ); + + $retVal = array(); + if ( $db->numRows( $res ) ) { + while ( $row = $db->fetchObject( $res ) ) { + if ( $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title ) ) { + $wgLinkCache->addGoodLinkObj( $row->page_id, $titleObj ); + $retVal[] = $titleObj; + } + } + } + $db->freeResult( $res ); + return $retVal; + } + /** + * Retrive Exif data from the database + * + * Retrive Exif data from the database and prune unrecognized tags + * and/or tags with invalid contents + * + * @return array + */ + function retrieveExifData () { + if ( $this->getMimeType() !== "image/jpeg" ) return array (); + + $exif = new Exif( $this->imagePath ); + return $exif->getFilteredData(); + } + + function getExifData () { + global $wgRequest; + if ( $this->metadata === '0' ) + return array(); + + $purge = $wgRequest->getVal( 'action' ) == 'purge'; + $ret = unserialize ( $this->metadata ); + + $oldver = isset( $ret['MEDIAWIKI_EXIF_VERSION'] ) ? $ret['MEDIAWIKI_EXIF_VERSION'] : 0; + $newver = Exif::version(); + + if ( !count( $ret ) || $purge || $oldver != $newver ) { + $this->updateExifData( $newver ); + } + if ( isset( $ret['MEDIAWIKI_EXIF_VERSION'] ) ) + unset( $ret['MEDIAWIKI_EXIF_VERSION'] ); + $format = new FormatExif( $ret ); + return $format->getFormattedData(); + } + + function updateExifData( $version ) { + $fname = 'Image:updateExifData'; + + if ( $this->getImagePath() === false ) # Not a local image + return; + + # Get EXIF data from image + $exif = $this->retrieveExifData(); + if ( count( $exif ) ) { + $exif['MEDIAWIKI_EXIF_VERSION'] = $version; + $this->metadata = serialize( $exif ); + } else { + $this->metadata = '0'; + } + + # Update EXIF data in database + $dbw =& wfGetDB( DB_MASTER ); + + $this->checkDBSchema($dbw); + + $dbw->update( 'image', + array( 'img_metadata' => $this->metadata ), + array( 'img_name' => $this->name ), + $fname + ); + } + } //class @@ -951,13 +1513,39 @@ function wfImageDir( $fname ) { * * This function is called from thumb.php before Setup.php is included * - * @param string $fname file name of the thumbnail file, including file size prefix + * @param string $fname file name of the original image file * @param string $subdir (optional) subdirectory of the image upload directory that should be used for storing the thumbnail. Default is 'thumb' * @param boolean $shared (optional) use the shared upload directory * @access public */ -function wfImageThumbDir( $fname , $subdir='thumb', $shared=false) { - return wfImageArchiveDir( $fname, $subdir, $shared ); +function wfImageThumbDir( $fname, $shared = false ) { + $base = wfImageArchiveDir( $fname, 'thumb', $shared ); + if ( Image::isHashed( $shared ) ) { + $dir = "$base/$fname"; + + if ( !is_dir( $base ) ) { + $oldumask = umask(0); + @mkdir( $base, 0777 ); + umask( $oldumask ); + } + + if ( ! is_dir( $dir ) ) { + $oldumask = umask(0); + @mkdir( $dir, 0777 ); + umask( $oldumask ); + } + } else { + $dir = $base; + } + + return $dir; +} + +/** + * Old thumbnail directory, kept for conversion + */ +function wfDeprecatedThumbDir( $thumbName , $subdir='thumb', $shared=false) { + return wfImageArchiveDir( $thumbName, $subdir, $shared ); } /** @@ -980,15 +1568,19 @@ function wfImageArchiveDir( $fname , $subdir='archive', $shared=false ) { if (!$hashdir) { return $dir.'/'.$subdir; } $hash = md5( $fname ); $oldumask = umask(0); + # Suppress warning messages here; if the file itself can't # be written we'll worry about it then. + wfSuppressWarnings(); + $archive = $dir.'/'.$subdir; - if ( ! is_dir( $archive ) ) { @mkdir( $archive, 0777 ); } + if ( ! is_dir( $archive ) ) { mkdir( $archive, 0777 ); } $archive .= '/' . $hash{0}; - if ( ! is_dir( $archive ) ) { @mkdir( $archive, 0777 ); } + if ( ! is_dir( $archive ) ) { mkdir( $archive, 0777 ); } $archive .= '/' . substr( $hash, 0, 2 ); - if ( ! is_dir( $archive ) ) { @mkdir( $archive, 0777 ); } + if ( ! is_dir( $archive ) ) { mkdir( $archive, 0777 ); } + wfRestoreWarnings(); umask( $oldumask ); return $archive; } @@ -1006,9 +1598,7 @@ function wfGetHashPath ( $dbkey, $fromSharedDirectory = false ) { global $wgHashedSharedUploadDirectory, $wgSharedUploadDirectory; global $wgHashedUploadDirectory; - $ishashed = $fromSharedDirectory ? $wgHashedSharedUploadDirectory : - $wgHashedUploadDirectory; - if($ishashed) { + if( Image::isHashed( $fromSharedDirectory ) ) { $hash = md5($dbkey); return '/' . $hash{0} . '/' . substr( $hash, 0, 2 ) . '/'; } else { @@ -1055,12 +1645,12 @@ function wfScaleSVGUnit( $length ) { '%' => 2.0, // Fake it! ); if( preg_match( '/^(\d+)(em|ex|px|pt|pc|cm|mm|in|%|)$/', $length, $matches ) ) { - $length = FloatVal( $matches[1] ); + $length = floatval( $matches[1] ); $unit = $matches[2]; return round( $length * $unitLength[$unit] ); } else { // Assume pixels - return round( FloatVal( $length ) ); + return round( floatval( $length ) ); } } @@ -1100,23 +1690,29 @@ function wfGetSVGsize( $filename ) { } /** - * Is an image on the bad image list? + * Determine if an image exists on the 'bad image list' + * + * @param string $name The image to check + * @return bool */ function wfIsBadImage( $name ) { - global $wgLang; - - $lines = explode("\n", wfMsgForContent( 'bad_image_list' )); - foreach ( $lines as $line ) { - if ( preg_match( '/^\*\s*\[\[:(' . $wgLang->getNsText( NS_IMAGE ) . ':.*(?=]]))\]\]/', $line, $m ) ) { - $t = Title::newFromText( $m[1] ); - if ( $t->getDBkey() == $name ) { - return true; + global $wgContLang; + static $titleList = false; + if ( $titleList === false ) { + $titleList = array(); + + $lines = explode("\n", wfMsgForContent( 'bad_image_list' )); + foreach ( $lines as $line ) { + if ( preg_match( '/^\*\s*\[{2}:(' . $wgContLang->getNsText( NS_IMAGE ) . ':.*?)\]{2}/', $line, $m ) ) { + $t = Title::newFromText( $m[1] ); + $titleList[$t->getDBkey()] = 1; } } } - return false; + + return array_key_exists( $name, $titleList ); } - + /** @@ -1129,10 +1725,11 @@ class ThumbnailImage { * @param string $url URL path to the thumb * @access private */ - function ThumbnailImage( $url, $width, $height ) { + function ThumbnailImage( $url, $width, $height, $path = false ) { $this->url = $url; $this->width = $width; $this->height = $height; + $this->path = $path; } /**