* @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');
+
+
/**
* Class to represent an 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)
- $exif, # EXIF data
+ $metadata, # Metadata
+ $exif, # The Exif class
$dataLoaded; # Whether or not all this has been loaded from the database (loadFromXxx)
}
function Image( $title ) {
+ global $wgShowEXIF;
+
$this->title =& $title;
$this->name = $title->getDBkey();
- $this->exif = serialize ( array() ) ;
+ $this->metadata = serialize ( array() ) ;
$n = strrpos( $this->name, '.' );
$this->extension = strtolower( $n ? substr( $this->name, $n + 1 ) : '' );
$this->historyLine = 0;
$this->dataLoaded = false;
+
+ if ($wgShowEXIF)
+ $this->exif = new Exif;
}
/**
$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['width'])
+ && $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['mime'])) {
$this->name = $commonsCachedValues['name'];
$this->imagePath = $commonsCachedValues['imagePath'];
$this->fileExists = $commonsCachedValues['fileExists'];
$this->height = $commonsCachedValues['height'];
$this->bits = $commonsCachedValues['bits'];
$this->type = $commonsCachedValues['type'];
- $this->exif = $commonsCachedValues['exif'];
+ $this->mime = $commonsCachedValues['mime'];
+ $this->metadata = $commonsCachedValues['metadata'];
$this->size = $commonsCachedValues['size'];
$this->fromSharedDirectory = true;
$this->dataLoaded = true;
$this->height = $cachedValues['height'];
$this->bits = $cachedValues['bits'];
$this->type = $cachedValues['type'];
- $this->exif = $cachedValues['exif'];
+ $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;
'height' => $this->height,
'bits' => $this->bits,
'type' => $this->type,
- 'exif' => $this->exif,
+ 'mime' => $this->mime,
+ 'metadata' => $this->metadata,
'size' => $this->size);
$wgMemc->set( $keys[0], $cachedValues );
* 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) {
}
}
+
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->exif = serialize ( array() ) ;
- } else {
- $this->width = $gis[0];
- $this->height = $gis[1];
- $this->type = $gis[2];
- $this->exif = 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 );
}
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;
$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 ) {
$name = $wgLang->ucfirst($this->name);
$row = $dbr->selectRow( "`$wgSharedUploadDBname`.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' => $name ), $fname );
if ( $row ) {
$this->fromSharedDirectory = true;
$this->loadFromRow( $row );
// Check for rows from a previous schema, quietly upgrade them
- if ( $this->type == -1 ) {
+ if ( is_null($this->type) ) {
$this->upgradeRow();
}
}
$this->type = 0;
$this->fileExists = false;
$this->fromSharedDirectory = false;
- $this->exif = serialize ( array() ) ;
+ $this->metadata = serialize ( array() ) ;
}
# Unconditionally set loaded=true, we don't want the accessors constantly rechecking
$this->dataLoaded = true;
+ wfProfileOut( $fname );
}
/*
$this->width = $row->img_width;
$this->height = $row->img_height;
$this->bits = $row->img_bits;
- $this->type = $row->img_type;
- $this->exif = $row->img_metadata;
- if ( $this->exif == "" ) $this->exif = serialize ( array() ) ;
+ $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;
}
function upgradeRow() {
global $wgDBname, $wgSharedUploadDBname;
$fname = 'Image::upgradeRow';
+ wfProfileIn( $fname );
+
$this->loadFromFile();
$dbw =& wfGetDB( DB_MASTER );
if ( $this->fromSharedDirectory ) {
if ( !$wgSharedUploadDBname ) {
+ wfProfileOut( $fname );
return;
}
// 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_metadata' => $this->exif,
+ '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 );
}
/**
}
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();
}
}
/**
- * 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 scurity risc.
+ */
+ 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
}
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) {
*/
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;
}
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();
}
$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 );
* @return ThumbnailImage
* @access private
*/
- function /* private */ renderThumb( $width, $useScript = true ) {
+ function renderThumb( $width, $useScript = true ) {
global $wgUseSquid, $wgInternalServer;
global $wgThumbnailScriptPath, $wgSharedThumbnailScriptPath;
}
# Sanity check $width
- if( $width <= 0 ) {
+ if( $width <= 0 || $this->width <= 0) {
# BZZZT
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() );
}
}
}
}
+
return new ThumbnailImage( $url, $width, $height, $thumbPath );
} // END OF function renderThumb
/**
* Really render a thumbnail
+ * Call this only for images for which canRender() returns true.
*
* @access private
*/
- function /*private*/ reallyRenderThumb( $thumbPath, $width, $height ) {
+ function reallyRenderThumb( $thumbPath, $width, $height ) {
global $wgSVGConverters, $wgSVGConverter,
$wgUseImageMagick, $wgImageMagickConvertCommand;
$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;
array( '$path/', '$width', '$input', '$output' ),
array( $wgSVGConverterPath,
$width,
- escapeshellarg( $this->imagePath ),
- escapeshellarg( $thumbPath ) ),
+ wfEscapeShellArg( $this->imagePath ),
+ wfEscapeShellArg( $thumbPath ) ),
$wgSVGConverters[$wgSVGConverter] );
$conv = shell_exec( $cmd );
} else {
# in Internet Explorer/Windows instead of default black.
$cmd = $wgImageMagickConvertCommand .
" -quality 85 -background white -geometry {$width} ".
- escapeshellarg($this->imagePath) . " " .
- escapeshellarg($thumbPath);
+ wfEscapeShellArg($this->imagePath) . " " .
+ wfEscapeShellArg($thumbPath);
+ wfDebug("reallyRenderThumb: running ImageMagick: $cmd");
$conv = shell_exec( $cmd );
} else {
# Use PHP's builtin GD library functions.
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
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.
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" ),
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
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
*/
$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;
}
$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.
'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_timestamp' => $now,
'img_description' => $desc,
'img_user' => $wgUser->getID(),
'img_user_text' => $wgUser->getName(),
- 'img_metadata' => $this->exif,
+ 'img_metadata' => $this->metadata,
), $fname, 'IGNORE'
);
$descTitle = $this->getTitle();
'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_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_timestamp' => $now,
+ 'img_description' => $desc,
'img_user' => $wgUser->getID(),
'img_user_text' => $wgUser->getName(),
- 'img_description' => $desc,
- 'img_metadata' => $this->exif,
+ 'img_metadata' => $this->metadata,
), array( /* WHERE */
'img_name' => $this->name
), $fname
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 );
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 () {
- global $wgShowEXIF ;
- if ( ! $wgShowEXIF ) return array ();
- if ( $this->type !== '2' ) return array ();
+ if ( $this->getMimeType() !== "image/jpeg" ) return array ();
+ wfSuppressWarnings();
$exif = exif_read_data( $this->imagePath );
- $exif = $this->stripExifData( $exif );
- return $exif ;
+ wfRestoreWarnings();
+
+ foreach($exif as $k => $v) {
+ if ( !in_array($k, array_keys($this->exif->mFlatExif)) ) {
+ 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;
}
function getExifData () {
- global $wgRequest, $wgShowEXIF;
+ global $wgRequest;
+ if ( $this->metadata === '0' )
+ return array();
- if ( ! $wgShowEXIF ) return array ();
+ $purge = $wgRequest->getVal( 'action' ) == 'purge';
+ $ret = unserialize ( $this->metadata );
- $action = $wgRequest->getVal( 'action' ); # Allow forced updates
+ $oldver = isset( $ret['MEDIAWIKI_EXIF_VERSION'] ) ? $ret['MEDIAWIKI_EXIF_VERSION'] : 0;
+ $newver = $this->exif->version();
- $ret = unserialize ( $this->exif );
-
- if ( count( $ret) == 0 || $action == 'purge' ) { # No EXIF data was stored for this image
- $this->updateExifData() ;
- $ret = unserialize ( $this->exif ) ;
+ if ( !count( $ret ) || $purge || $oldver != $newver ) {
+ $this->updateExifData( $newver );
+ }
+ if ( isset( $ret['MEDIAWIKI_EXIF_VERSION'] ) )
+ unset( $ret['MEDIAWIKI_EXIF_VERSION'] );
+
+ foreach($ret as $k => $v) {
+ $ret[$k] = $this->exif->format($k, $v);
}
- return $ret ;
+ return $ret;
}
- function updateExifData () {
- global $wgShowEXIF ;
- if ( ! $wgShowEXIF ) return ;
- if ( false === $this->getImagePath() ) return ; # Not a local image
+ function updateExifData( $version ) {
+ $fname = 'Image:updateExifData';
- $fname = "Image:updateExifData" ;
+ if ( $this->getImagePath() === false ) # Not a local image
+ return;
# Get EXIF data from image
- $exif = $this->retrieveExifData () ;
- $this->exif = serialize ( $exif ) ;
+ $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->exif ),
+ array( 'img_metadata' => $this->metadata ),
array( 'img_name' => $this->name ),
$fname
);
}
- /**
- * Strip out potentially nasty exif data such as raw binaries
- * (thumbnails), these values are from version 2.2 of the EXIF
- * specification, note that I've commented some of them out, this is
- * because their Type is "UNDEFINED", meaning that they potentially
- * contain binary data.
- *
- * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- * @link http://exif.org/specifications.html
- * @link http://exif.org/Exif2-2.PDF (see page 22 and 30)
- *
- * @param array $exif
- * @return array
- */
- function stripExifData( $exif = array() ) {
- $whitelist = array(
- # Other tags
- 'Make', # Image input equipment manufacturer
- 'Model', # Image input equipment model
- 'Software', # Software used
- 'Artist', # Person who created the image
- 'Copyright', # Copyright holder
-
- # Tags relating to image structure
- 'ImageWidth', # Image width
- 'ImageLength', # Image height
- 'Orientation', # Orientation of image
- 'SamplesPerPixel', # Number of components
- 'PlanarConfiguration', # Image data arrangement
- 'YCbCrSubSampling', # Subsampling ratio of Y to C
- 'YCbCrPositioning', # Y and C positioning
- 'XResolution', # Image resolution in width direction
- 'YResolution', # Image resolution in height direction
- 'ResolutionUnit', # Unit of X and Y resolution
-
- # Tags relating to recording offset
- 'StripOffsets', # Image data location
- 'RowsPerStrip', # Number of rows per strip
- 'StripByteCounts', # Bytes per compressed strip
- 'JPEGInterchangeFormat', # Offset to JPEG SOI
- 'JPEGInterchangeFormatLength', # Bytes of JPEG data
-
- # Tags relating to image data characteristics
- 'TransferFunction', # Transfer function
- 'WhitePoint', # White point chromaticity
- 'PrimaryChromaticities', # Chromaticities of primarities
- 'YCbCrCoefficients', # Color space transformation matrix coefficients
- 'ReferenceBlackWhite', # Pair of black and white reference values
-
- # Tags relating to version
- #'ExifVersion', # Exif version
- #'FlashpixVersion', # Supported Flashpix version
-
- # Tags relating to Image Data Characteristics
- 'ColorSpace', # Color space information
- #'ComponentsConfiguration', # Meaning of each component
- 'CompressedBitsPerPixel', # Image compression mode
- 'PixelYDimension', # Valid image width
- 'PixelXDimension', # Valind image height
-
- # Tags relating to User Information
- #'MakerNote', # Manufacturer notes
- #'UserComment', # User commentss
-
- # Tag relating to related file information
- #'RelatedSoundFile', # Related audio file
-
- # Other tags
- 'ImageUniqueID', # Unique image ID
-
- # Tags relating to picture-taking conditions
- 'ExposureTime', # Exposure time
- 'FNumber', # F Number
- 'ExposureProgram', # Exposure Program
- 'SpectralSensitivity', # Spectral sensitivity
- 'ISOSpeedRatings', # ISO speed rating
- #'OECF', # Optoelectronic conversion factor
- 'ShutterSpeedValue', # Shutter speed
- 'ApertureValue', # Aperture
- 'BrightnessValue', # Brightness
- 'ExposureBiasValue', # Exposure bias
- 'MaxApertureValue', # Maximum land aperture
- 'SubjectDistance', # Subject distance
- 'MeteringMode', # Metering mode
- 'LightSource', # Light source
- 'Flash', # Flash
- 'FocalLength', # Lens focal length
- 'SubjectArea', # Subject area
- 'FlashEnergy', # Flash energy
- #'SpartialFrequencyResponse', # Spartial frequency response
- 'FocalPlaneXRessolution', # Focal plane X resolution
- 'FocalPlaneYRessolution', # Focal plane Y resolution
- 'FocalPlaneResolutionUnit', # Focal plane resolution unit
- 'SubjectLocation', # Subject location
- 'ExposureIndex', # Exposure index
- 'SensingMethod', # Sensing method
- #'FileSource', # File source
- #'SceneType', # Scene type
- #'CFAPattern', # CFA pattern
- 'CustomRendered', # Custom image processing
- 'ExposureMode', # Exposure mode
- 'WhiteBalance', # White Balance
- 'DigitalZoomRatio', # Digital zoom ration
- 'FocalLengthIn35mmFilm', # Focal length in 35 mm film
- 'SceneCaptureType', # Scene capture type
- 'GainControl', # Scene control
- 'Contrast', # Contrast
- 'Saturation', # Saturation
- 'Sharpness', # Sharpness
- #'DeviceSettingDescription', # Desice settings description
- 'SubjectDistanceRange', # Subject distance range
-
- # TODO: GPS attribute information on page 52 of the spec
- );
-
- $new = array();
- foreach ($whitelist as $tag) {
- if ( array_key_exists($tag, $exif) ) {
- $new[$tag] = $exif[$tag];
- }
- }
- unset($exif);
- return $new;
- }
-
-
} //class
}
/**
- * 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 );
}
-
+
/**
dépôts / lhc / web / wiklou.git / blobdiff