X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FImage.php;h=786d1d27ffe7553547aafb3f74ab4ddf3d5b8575;hb=4a4ea11b9bba387913695d77579d12e9594c9828;hp=105c4269eec9f33dc2e5bab7ab7a696e9ea399fa;hpb=04b79884fbeedf786b3c3bfd099a8215fc1c5f84;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Image.php b/includes/Image.php index 105c4269ee..786d1d27ff 100644 --- a/includes/Image.php +++ b/includes/Image.php @@ -3,16 +3,22 @@ * @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 +/** + * 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 @@ -37,11 +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 - $exif, # The Exif class $dataLoaded; # Whether or not all this has been loaded from the database (loadFromXxx) @@ -55,7 +61,11 @@ class Image */ function newFromName( $name ) { $title = Title::makeTitleSafe( NS_IMAGE, $name ); - return new Image( $title ); + if ( is_object( $title ) ) { + return new Image( $title ); + } else { + return NULL; + } } /** @@ -66,8 +76,9 @@ 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() ) ; @@ -77,9 +88,6 @@ class Image $this->historyLine = 0; $this->dataLoaded = false; - - if ($wgShowEXIF) - $this->exif = new Exif; } /** @@ -110,13 +118,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']; @@ -124,6 +139,7 @@ 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; @@ -131,8 +147,8 @@ class Image $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']; @@ -140,6 +156,7 @@ 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; @@ -147,6 +164,11 @@ class Image $this->imagePath = $this->getFullPath(); } } + if ( $this->dataLoaded ) { + wfIncrStats( 'image_cache_hit' ); + } else { + wfIncrStats( 'image_cache_miss' ); + } wfProfileOut( $fname ); return $this->dataLoaded; @@ -158,23 +180,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, - 'metadata' => $this->metadata, - 'size' => $this->size); - - $wgMemc->set( $keys[0], $cachedValues ); + // 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, 60 * 60 * 24 * 7 ); // A week + } else { + // However we should clear them, so they aren't leftover + // if we've deleted the file. + $wgMemc->delete( $keys[0] ); } } @@ -182,13 +211,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 ); $this->fromSharedDirectory = false; - $gis = 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) { @@ -196,7 +228,7 @@ class Image # capitalize the first letter of the filename before # looking it up in the shared repository. $sharedImage = Image::newFromName( $wgLang->ucfirst($this->name) ); - $this->fileExists = file_exists( $sharedImage->getFullPath(true) ); + $this->fileExists = $sharedImage && file_exists( $sharedImage->getFullPath(true) ); if ( $this->fileExists ) { $this->name = $sharedImage->name; $this->imagePath = $this->getFullPath(true); @@ -204,42 +236,67 @@ class Image } } + if ( $this->fileExists ) { + $magic=& wfGetMimeMagic(); + + $this->mime = $magic->guessMimeType($this->imagePath,true); + $this->type = $magic->getMediaType($this->imagePath,$this->mime); + # Get size in bytes $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; - $this->metadata = serialize ( array() ) ; - } else { - $this->width = $gis[0]; - $this->height = $gis[1]; - $this->type = $gis[2]; - $this->metadata = serialize ( $this->retrieveExifData() ) ; - 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 ); } @@ -247,13 +304,17 @@ 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' , 'img_metadata' ), + 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; @@ -261,7 +322,7 @@ class Image $this->loadFromRow( $row ); $this->imagePath = $this->getFullPath(); // Check for rows from a previous schema, quietly upgrade them - if ( $this->type == -1 ) { + if ( is_null($this->type) ) { $this->upgradeRow(); } } elseif ( $wgUseSharedUploads && $wgSharedUploadDBname ) { @@ -270,8 +331,10 @@ class Image # 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; @@ -281,7 +344,7 @@ class Image $this->loadFromRow( $row ); // Check for rows from a previous schema, quietly upgrade them - if ( $this->type == -1 ) { + if ( is_null($this->type) ) { $this->upgradeRow(); } } @@ -300,6 +363,7 @@ class Image # Unconditionally set loaded=true, we don't want the accessors constantly rechecking $this->dataLoaded = true; + wfProfileOut( $fname ); } /* @@ -310,9 +374,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; } @@ -341,11 +416,14 @@ class Image function upgradeRow() { global $wgDBname, $wgSharedUploadDBname; $fname = 'Image::upgradeRow'; + wfProfileIn( $fname ); + $this->loadFromFile(); $dbw =& wfGetDB( DB_MASTER ); if ( $this->fromSharedDirectory ) { if ( !$wgSharedUploadDBname ) { + wfProfileOut( $fname ); return; } @@ -353,18 +431,34 @@ class Image // 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_type' => $this->type, + '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 ); } /** @@ -400,8 +494,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(); } @@ -449,19 +549,162 @@ 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 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 getType() { + 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 there's a converter enabled + if ($mime === 'image/svg') { + global $wgSVGConverters, $wgSVGConverter; + + if ($wgSVGConverter && isset( $wgSVGConverters[$wgSVGConverter])) { + wfDebug( "Image::canRender: SVG is ready!\n" ); + return true; + } else { + wfDebug( "Image::canRender: SVG renderer missing\n" ); + } + } + + #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 true 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 flagged 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 coupled 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 @@ -485,6 +728,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 */ @@ -503,7 +747,7 @@ class Image /** * Returns true if the image file exists on disk. - * + * @return boolean Whether image file exist on disk. * @access public */ function exists() { @@ -512,7 +756,7 @@ class Image } /** - * + * @todo document * @access private */ function thumbUrl( $width, $subdir='thumb') { @@ -535,6 +779,9 @@ class Image } 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) { @@ -565,9 +812,17 @@ class Image */ 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; } @@ -604,23 +859,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(); } @@ -635,7 +896,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 ); @@ -659,25 +920,36 @@ class Image function renderThumb( $width, $useScript = true ) { global $wgUseSquid, $wgInternalServer; global $wgThumbnailScriptPath, $wgSharedThumbnailScriptPath; + + $fname = 'Image::renderThumb'; + wfProfileIn( $fname ); - $width = IntVal( $width ); + $width = intval( $width ); $this->load(); 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() ) { + global $wgSVGMaxSize; + $maxsize = $this->mustRender() + ? max( $this->width, $wgSVGMaxSize ) + : $this->width - 1; + if( $width > $maxsize ) { # 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 ) ); @@ -685,7 +957,9 @@ class Image list( $isScriptUrl, $url ) = $this->thumbUrl( $width ); if ( $isScriptUrl && $useScript ) { // Use thumb.php to render the image - return new ThumbnailImage( $url, $width, $height ); + $thumb = new ThumbnailImage( $url, $width, $height ); + wfProfileOut( $fname ); + return $thumb; } $thumbName = $this->thumbName( $width, $this->fromSharedDirectory ); @@ -719,11 +993,15 @@ class Image } } } - return new ThumbnailImage( $url, $width, $height, $thumbPath ); + + $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 */ @@ -733,17 +1011,21 @@ class Image $this->load(); - if( $this->extension == 'svg' ) { + 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, - escapeshellarg( $this->imagePath ), - escapeshellarg( $thumbPath ) ), + array( '$path/', '$width', '$height', '$input', '$output' ), + array( $wgSVGConverterPath ? "$wgSVGConverterPath/" : "", + intval( $width ), + intval( $height ), + wfEscapeShellArg( $this->imagePath ), + wfEscapeShellArg( $thumbPath ) ), $wgSVGConverters[$wgSVGConverter] ); + wfDebug( "reallyRenderThumb SVG: $cmd\n" ); $conv = shell_exec( $cmd ); } else { $conv = false; @@ -753,9 +1035,10 @@ class Image # 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); + " -quality 85 -background white -size {$width}x{$height} ". + wfEscapeShellArg($this->imagePath) . " -resize {$width}x{$height} " . + wfEscapeShellArg($thumbPath); + wfDebug("reallyRenderThumb: running ImageMagick: $cmd\n"); $conv = shell_exec( $cmd ); } else { # Use PHP's builtin GD library functions. @@ -763,30 +1046,34 @@ class Image # First find out what kind of file this is, and select the correct # input routine for this. - $truecolor = false; + $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]; - 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( !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 { @@ -795,23 +1082,11 @@ class Image 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 - imagepng( $dst_image, $thumbPath ); - break; - case 2: # JPEG - imageinterlace( $dst_image ); - imagejpeg( $dst_image, $thumbPath, 95 ); - break; - default: - break; - } + call_user_func( $saveType, $dst_image, $thumbPath ); imagedestroy( $dst_image ); imagedestroy( $src_image ); } + # # Check for zero-sized thumbnails. Those can be generated when # no disk space is available or some other error occurs @@ -824,6 +1099,11 @@ class Image } } + function imageJpegWrapper( $dst_image, $thumbPath ) { + imageinterlace( $dst_image ); + imagejpeg( $dst_image, $thumbPath, 95 ); + } + /** * Get all thumbnail names previously generated for this image */ @@ -882,6 +1162,21 @@ class Image 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 the image history of this image, line by line. @@ -896,9 +1191,20 @@ 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" ), + array( + 'img_size', + 'img_description', + 'img_user','img_user_text', + 'img_timestamp', + 'img_width', + 'img_height', + "'' AS oi_archive_name" + ), array( 'img_name' => $this->title->getDBkey() ), $fname ); @@ -907,9 +1213,19 @@ class Image } } else if ( $this->historyLine == 1 ) { $this->historyRes = $dbr->select( 'oldimage', - array( 'oi_size AS img_size', 'oi_description AS img_description', 'oi_user AS img_user', - 'oi_user_text AS img_user_text', 'oi_timestamp AS img_timestamp', 'oi_archive_name' - ), array( 'oi_name' => $this->title->getDBkey() ), $fname, array( 'ORDER BY' => 'oi_timestamp DESC' ) + array( + 'oi_size AS img_size', + 'oi_description AS img_description', + 'oi_user AS img_user', + 'oi_user_text AS img_user_text', + 'oi_timestamp AS img_timestamp', + 'oi_width as img_width', + 'oi_height as img_height', + 'oi_archive_name' + ), + array( 'oi_name' => $this->title->getDBkey() ), + $fname, + array( 'ORDER BY' => 'oi_timestamp DESC' ) ); } $this->historyLine ++; @@ -924,16 +1240,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 @@ -975,48 +1281,56 @@ class Image return $shared ? $wgHashedSharedUploadDirectory : $wgHashedUploadDirectory; } - /** - * @return bool - * @static - */ - function isKnownImageExtension( $ext ) { - static $extensions = array( 'svg', 'png', 'jpg', 'jpeg', 'gif', 'bmp', 'xbm' ); - return in_array( $ext, $extensions ); - } - /** * Record an image upload in the upload log and the image table */ - function recordUpload( $oldver, $desc, $copyStatus = '', $source = '' ) { - global $wgUser, $wgLang, $wgTitle, $wgOut, $wgDeferredUpdateList; + function recordUpload( $oldver, $desc, $license = '', $copyStatus = '', $source = '', $watch = false ) { + 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); // 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; } if ( $wgUseCopyrightUpload ) { + if ( $license != '' ) { + $licensetxt = '== ' . wfMsg( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; + } $textdesc = '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $desc . "\n" . '== ' . wfMsg ( 'filestatus' ) . " ==\n" . $copyStatus . "\n" . + "$licensetxt" . '== ' . wfMsg ( 'filesource' ) . " ==\n" . $source ; } else { - $textdesc = $desc; + if ( $license != '' ) { + $filedesc = $desc == '' ? '' : '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $desc . "\n"; + $textdesc = $filedesc . + '== ' . wfMsg ( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; + } else { + $textdesc = $desc; + } } $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. @@ -1024,29 +1338,25 @@ 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_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' + ), + $fname, + 'IGNORE' ); $descTitle = $this->getTitle(); $purgeURLs = array(); - if ( $dbw->affectedRows() ) { - # Successfully inserted, this is a new image - $id = $descTitle->getArticleID(); - - if ( $id == 0 ) { - $article = new Article( $descTitle ); - $article->insertNewArticle( $textdesc, $desc, false, false, true ); - } - } else { + if( $dbw->affectedRows() == 0 ) { # Collision, this is an update of an image # Insert previous contents into oldimage $dbw->insertSelect( 'oldimage', 'image', @@ -1057,37 +1367,53 @@ 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_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 ); + } + + $article = new Article( $descTitle ); + $minor = false; + $watch = $watch || $wgUser->isWatched( $descTitle ); + $suppressRC = true; // There's already a log entry, so don't double the RC load + + if( $descTitle->exists() ) { + // TODO: insert a null revision into the page history for this update. + if( $watch ) { + $wgUser->addWatch( $descTitle ); + } # Invalidate the cache for the description page $descTitle->invalidateCache(); $purgeURLs[] = $descTitle->getInternalURL(); + } else { + // New image; create the description page. + $article->insertNewArticle( $textdesc, $desc, $minor, $watch, $suppressRC ); } - + # Invalidate cache for all pages using this image $linksTo = $this->getLinksTo(); @@ -1129,12 +1455,13 @@ class Image if ( $db->numRows( $res ) ) { while ( $row = $db->fetchObject( $res ) ) { if ( $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title ) ) { - $wgLinkCache->addGoodLink( $row->page_id, $titleObj->getPrefixedDBkey() ); + $wgLinkCache->addGoodLinkObj( $row->page_id, $titleObj ); $retVal[] = $titleObj; } } } $db->freeResult( $res ); + wfProfileOut( $fname ); return $retVal; } /** @@ -1145,74 +1472,72 @@ class Image * * @return array */ - function retrieveExifData () { - global $wgShowEXIF ; - if ( ! $wgShowEXIF ) return array (); - if ( $this->type !== '2' ) return array (); - - $exif = exif_read_data( $this->imagePath ); + function retrieveExifData() { + if ( $this->getMimeType() !== "image/jpeg" ) + return array(); - foreach($exif as $k => $v) { - if ( !in_array($k, $this->exif->mValidExif) ) { - wfDebug( "Image::retrieveExifData: '$k' is not a valid Exif tag (type: '" . gettype($v) . "'; data: '$v')\n"); - unset($exif[$k]); - } - } - - foreach($exif as $k => $v) { - if ( !$this->exif->validate($k, $v) ) { - wfDebug( "Image::retrieveExifData: '$k' contained invalid data (type: '" . gettype($v) . "'; data: '$v')\n"); - unset($exif[$k]); - } - } - return $exif; + $exif = new Exif( $this->imagePath ); + return $exif->getFilteredData(); } - function getExifData () { + function getExifData() { global $wgRequest; + if ( $this->metadata === '0' ) + return array(); $purge = $wgRequest->getVal( 'action' ) == 'purge'; - $ret = unserialize ( $this->metadata ); + $ret = unserialize( $this->metadata ); $oldver = isset( $ret['MEDIAWIKI_EXIF_VERSION'] ) ? $ret['MEDIAWIKI_EXIF_VERSION'] : 0; - $newver = $this->exif->version(); + $newver = Exif::version(); if ( !count( $ret ) || $purge || $oldver != $newver ) { - echo "old: $oldver; new: $newver\n"; - echo "updating\n"; + $this->purgeCache(); $this->updateExifData( $newver ); - $ret = unserialize( $this->metadata ); } if ( isset( $ret['MEDIAWIKI_EXIF_VERSION'] ) ) unset( $ret['MEDIAWIKI_EXIF_VERSION'] ); + $format = new FormatExif( $ret ); - foreach($ret as $k => $v) { - $ret[$k] = $this->exif->format($k, $v); - } - - return $ret; + return $format->getFormattedData(); } function updateExifData( $version ) { - global $wgShowEXIF; $fname = 'Image:updateExifData'; - if ( ! $wgShowEXIF || $this->getImagePath() === false ) # Not a local image + if ( $this->getImagePath() === false ) # Not a local image return; # Get EXIF data from image $exif = $this->retrieveExifData(); - $exif['MEDIAWIKI_EXIF_VERSION'] = $version; - $this->metadata = serialize( $exif ); + 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 ); } + + /** + * Returns true if the image does not come from the shared + * image repository. + * + * @return bool + */ + function isLocal() { + return !$this->fromSharedDirectory; + } } //class @@ -1381,13 +1706,13 @@ function wfScaleSVGUnit( $length ) { '' => 1.0, // "User units" pixels by default '%' => 2.0, // Fake it! ); - if( preg_match( '/^(\d+)(em|ex|px|pt|pc|cm|mm|in|%|)$/', $length, $matches ) ) { - $length = FloatVal( $matches[1] ); + if( preg_match( '/^(\d+(?:\.\d+)?)(em|ex|px|pt|pc|cm|mm|in|%|)$/', $length, $matches ) ) { + $length = floatval( $matches[1] ); $unit = $matches[2]; return round( $length * $unitLength[$unit] ); } else { // Assume pixels - return round( FloatVal( $length ) ); + return round( floatval( $length ) ); } } @@ -1449,7 +1774,7 @@ function wfIsBadImage( $name ) { return array_key_exists( $name, $titleList ); } - + /**