$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)
+ $metadata, # Metadata
+ $dataLoaded, # Whether or not all this has been loaded from the database (loadFromXxx)
+ $lastError; # Error string associated with a thumbnail display error
/**#@-*/
function newFromTitle( $title ) {
return new Image( $title );
}
-
+
function Image( $title ) {
if( !is_object( $title ) ) {
wfDebugDieBacktrace( 'Image constructor given bogus title.' );
*/
function getCacheKeys( $shared = false ) {
global $wgDBname, $wgUseSharedUploads, $wgSharedUploadDBname, $wgCacheSharedUploads;
-
+
$foundCached = false;
$hashedName = md5($this->name);
$keys = array( "$wgDBname:Image:$hashedName" );
}
return $keys;
}
-
+
/**
* Try to load image metadata from memcached. Returns true on success.
*/
$wgMemc->delete( $keys[0] );
}
}
-
+
/**
* Load metadata from the file itself
*/
function loadFromFile() {
- global $wgUseSharedUploads, $wgSharedUploadDirectory, $wgContLang,
- $wgShowEXIF;
+ global $wgUseSharedUploads, $wgSharedUploadDirectory, $wgContLang, $wgShowEXIF;
$fname = 'Image::loadFromFile';
wfProfileIn( $fname );
$this->imagePath = $this->getFullPath();
$this->fileExists = file_exists( $this->imagePath );
$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) {
+ if (!$this->fileExists && $wgUseSharedUploads && $wgSharedUploadDirectory) {
# 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.
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
if( $this->mime == 'image/svg' ) {
wfSuppressWarnings();
$gis = getimagesize( $this->imagePath );
wfRestoreWarnings();
}
-
+
wfDebug("$fname: ".$this->imagePath." loaded, ".$this->size." bytes, ".$this->mime.".\n");
}
else {
$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 );
}
global $wgUseSharedUploads, $wgSharedUploadDBname, $wgSharedUploadDBprefix, $wgContLang;
$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_media_type', 'img_major_mime', 'img_minor_mime', 'img_metadata' ),
$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();
}
}
}
-
+
if ( !$row ) {
$this->size = 0;
$this->width = 0;
$this->height = $row->img_height;
$this->bits = $row->img_bits;
$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;
}
// This avoids breaking replication in MySQL
$dbw->selectDB( $wgSharedUploadDBname );
}
-
+
$this->checkDBSchema($dbw);
-
+
if (strpos($this->mime,'/')!==false) {
list($major,$minor)= explode('/',$this->mime,2);
}
$major= $this->mime;
$minor= "unknown";
}
-
+
wfDebug("$fname: upgrading ".$this->name." to 1.5 schema\n");
-
+
$dbw->update( 'image',
array(
'img_width' => $this->width,
}
wfProfileOut( $fname );
}
-
+
/**
* Return the name of this image
* @access public
function getURL() {
if ( !$this->url ) {
$this->load();
- if($this->fileExists) {
+ if($this->fileExists) {
$this->url = Image::imageUrl( $this->name, $this->fromSharedDirectory );
} else {
$this->url = '';
}
return $this->url;
}
-
+
function getViewURL() {
if( $this->mustRender()) {
if( $this->canRender() ) {
$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 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;
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' ) return true;
}
-
+
return false;
}
-
+
/**
* Return true if the file is of a type that can't be directly
*/
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.
*
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
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.
* Return the URL of an image, provided its name.
*
* @param string $name Name of the image, without the leading "Image:"
- * @param boolean $fromSharedDirectory Should this be in $wgSharedUploadPath?
+ * @param boolean $fromSharedDirectory Should this be in $wgSharedUploadPath?
* @return string URL of $name image
* @access public
* @static
} else {
$base = $wgUploadBaseUrl;
$path = $wgUploadPath;
- }
- $url = "{$base}{$path}" . wfGetHashPath($name, $fromSharedDirectory) . "{$name}";
- return wfUrlencode( $url );
+ }
+ $url = "{$base}{$path}" . wfGetHashPath($name, $fromSharedDirectory) . "{$name}";
+ return wfUrlencode( $url );
}
/**
$url.= '&r=1';
}
} else {
- $name = $this->thumbName( $width );
+ $name = $this->thumbName( $width );
if($this->fromSharedDirectory) {
$base = '';
$path = $wgSharedUploadPath;
*/
function thumbName( $width ) {
$thumb = $width."px-".$this->name;
-
+
if( $this->mustRender() ) {
if( $this->canRender() ) {
# Rasterize to PNG (for SVG vector images, etc)
if( is_null( $thumb ) ) return '';
return $thumb->getUrl();
}
-
+
/**
* As createThumb, but returns a ThumbnailImage object. This can
* provide access to the actual file, the real size of the thumb,
return $this->renderThumb( $width );
}
$this->load();
-
+
if ($this->canRender()) {
if ( $width > $this->width * $height / $this->height )
- $width = floor( $this->width * $height / $this->height );
- # Note this is the largest width such that the thumbnail's
- # height is at most $height.
-
+ $width = wfFitBoxWidth( $this->width, $this->height, $height );
$thumb = $this->renderThumb( $width );
}
else $thumb= NULL; #not a bitmap or renderable image, don't try.
-
+
if( is_null( $thumb ) ) {
$thumb = $this->iconThumb();
}
return $thumb;
}
-
+
/**
* @return ThumbnailImage
*/
function iconThumb() {
global $wgStylePath, $wgStyleDirectory;
-
+
$try = array( 'fileicon-' . $this->extension . '.png', 'fileicon.png' );
foreach( $try as $icon ) {
$path = '/common/images/icons/' . $icon;
}
return null;
}
-
+
/**
* Create a thumbnail of the image having the specified width.
* The thumbnail will not be created if the width is larger than the
*/
function renderThumb( $width, $useScript = true ) {
global $wgUseSquid, $wgInternalServer;
- global $wgThumbnailScriptPath, $wgSharedThumbnailScriptPath;
global $wgSVGMaxSize, $wgMaxImageArea, $wgThumbnailEpoch;
$fname = 'Image::renderThumb';
wfProfileIn( $fname );
-
+
$width = intval( $width );
$this->load();
wfProfileOut( $fname );
return null;
}
-
+
# Sanity check $width
if( $width <= 0 || $this->width <= 0) {
# BZZZT
return null;
}
- $maxsize = $this->mustRender()
- ? max( $this->width, $wgSVGMaxSize )
- : $this->width - 1;
- if( $width > $maxsize ) {
- # Don't make an image bigger than the source
- $thumb = new ThumbnailImage( $this->getViewURL(), $this->getWidth(), $this->getHeight() );
+ # Don't make an image bigger than the source, or wgMaxSVGSize for SVGs
+ if ( $this->mustRender() ) {
+ $width = min( $width, $wgSVGMaxSize );
+ } elseif ( $width > $this->width - 1 ) {
+ $thumb = new ThumbnailImage( $this->getURL(), $this->getWidth(), $this->getHeight() );
wfProfileOut( $fname );
return $thumb;
}
-
+
$height = round( $this->height * $width / $this->width );
-
+
list( $isScriptUrl, $url ) = $this->thumbUrl( $width );
if ( $isScriptUrl && $useScript ) {
// Use thumb.php to render the image
$thumbName = $this->thumbName( $width, $this->fromSharedDirectory );
$thumbPath = wfImageThumbDir( $this->name, $this->fromSharedDirectory ).'/'.$thumbName;
+ if ( is_dir( $thumbPath ) ) {
+ // Directory where file should be
+ // This happened occasionally due to broken migration code in 1.5
+ // Rename to broken-*
+ global $wgUploadDirectory;
+ for ( $i = 0; $i < 100 ; $i++ ) {
+ $broken = "$wgUploadDirectory/broken-$i-$thumbName";
+ if ( !file_exists( $broken ) ) {
+ rename( $thumbPath, $broken );
+ break;
+ }
+ }
+ // Code below will ask if it exists, and the answer is now no
+ clearstatcache();
+ }
+
+ $done = true;
if ( !file_exists( $thumbPath ) ||
filemtime( $thumbPath ) < wfTimestamp( TS_UNIX, $wgThumbnailEpoch ) ) {
$oldThumbPath = wfDeprecatedThumbDir( $thumbName, 'thumb', $this->fromSharedDirectory ).
'/'.$thumbName;
$done = false;
- if ( file_exists( $oldThumbPath ) ) {
+
+ // Migration from old directory structure
+ if ( is_file( $oldThumbPath ) ) {
if ( filemtime($oldThumbPath) >= filemtime($this->imagePath) ) {
+ if ( file_exists( $thumbPath ) ) {
+ if ( !is_dir( $thumbPath ) ) {
+ // Old image in the way of rename
+ unlink( $thumbPath );
+ } else {
+ // This should have been dealt with already
+ wfDebugDieBacktrace( "Directory where image should be: $thumbPath" );
+ }
+ }
+ // Rename the old image into the new location
rename( $oldThumbPath, $thumbPath );
$done = true;
} else {
}
}
if ( !$done ) {
- $this->reallyRenderThumb( $thumbPath, $width, $height );
+ $this->lastError = $this->reallyRenderThumb( $thumbPath, $width, $height );
+ if ( $this->lastError === true ) {
+ $done = true;
+ }
# Purge squid
# This has to be done after the image is updated and present for all machines on NFS,
}
}
}
-
- $thumb = new ThumbnailImage( $url, $width, $height, $thumbPath );
+
+ if ( $done ) {
+ $thumb = new ThumbnailImage( $url, $width, $height, $thumbPath );
+ } else {
+ $thumb = null;
+ }
wfProfileOut( $fname );
return $thumb;
} // END OF function renderThumb
* Really render a thumbnail
* Call this only for images for which canRender() returns true.
*
+ * @param string $thumbPath Path to thumbnail
+ * @param int $width Desired width in pixels
+ * @param int $height Desired height in pixels
+ * @return bool True on error, false or error string on failure.
* @access private
*/
function reallyRenderThumb( $thumbPath, $width, $height ) {
- global $wgSVGConverters, $wgSVGConverter,
- $wgUseImageMagick, $wgImageMagickConvertCommand;
-
+ global $wgSVGConverters, $wgSVGConverter;
+ global $wgUseImageMagick, $wgImageMagickConvertCommand;
+
$this->load();
-
+
+ $err = false;
if( $this->mime === "image/svg" ) {
#Right now we have only SVG
-
+
global $wgSVGConverters, $wgSVGConverter;
if( isset( $wgSVGConverters[$wgSVGConverter] ) ) {
global $wgSVGConverterPath;
$wgSVGConverters[$wgSVGConverter] );
wfProfileIn( 'rsvg' );
wfDebug( "reallyRenderThumb SVG: $cmd\n" );
- $conv = wfShellExec( $cmd );
+ $err = wfShellExec( $cmd );
wfProfileOut( 'rsvg' );
- } else {
- $conv = false;
}
} elseif ( $wgUseImageMagick ) {
# use ImageMagick
+
+ if ( $this->mime == 'image/jpeg' ) {
+ $quality = "-quality 80"; // 80%
+ } elseif ( $this->mime == 'image/png' ) {
+ $quality = "-quality 95"; // zlib 9, adaptive filtering
+ } else {
+ $quality = ''; // default
+ }
+
# Specify white background color, will be used for transparent images
# in Internet Explorer/Windows instead of default black.
# Note, we specify "-size {$width}" and NOT "-size {$width}x{$height}".
# It seems that ImageMagick has a bug wherein it produces thumbnails of
# the wrong size in the second case.
- $cmd = $wgImageMagickConvertCommand .
- " -quality 85 -background white -size {$width} ".
- wfEscapeShellArg($this->imagePath) . " -resize {$width}x{$height} " .
- wfEscapeShellArg($thumbPath);
+
+ $cmd = wfEscapeShellArg($wgImageMagickConvertCommand) .
+ " {$quality} -background white -size {$width} ".
+ wfEscapeShellArg($this->imagePath) .
+ // For the -resize option a "!" is needed to force exact size,
+ // or ImageMagick may decide your ratio is wrong and slice off
+ // a pixel.
+ " -resize " . wfEscapeShellArg( "{$width}x{$height}!" ) .
+ " -depth 8 " .
+ wfEscapeShellArg($thumbPath) . " 2>&1";
wfDebug("reallyRenderThumb: running ImageMagick: $cmd\n");
wfProfileIn( 'convert' );
- $conv = wfShellExec( $cmd );
+ $err = wfShellExec( $cmd );
wfProfileOut( 'convert' );
} else {
# Use PHP's builtin GD library functions.
return $err;
}
list( $loader, $colorStyle, $saveType ) = $typemap[$this->mime];
-
+
if( !function_exists( $loader ) ) {
$err = "Incomplete GD library configuration: missing function $loader";
wfDebug( "$err\n" );
} elseif( $colorStyle == 'bits' ) {
$truecolor = ( $this->bits > 8 );
}
-
+
$src_image = call_user_func( $loader, $this->imagePath );
if ( $truecolor ) {
$dst_image = imagecreatetruecolor( $width, $height );
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
$thumbstat = stat( $thumbPath );
if( $thumbstat['size'] == 0 ) {
unlink( $thumbPath );
+ } else {
+ // All good
+ $err = true;
}
}
+ if ( $err !== true ) {
+ return wfMsg( 'thumbnail_error', $err );
+ } else {
+ return true;
+ }
+ }
+
+ function getLastError() {
+ return $this->lastError;
}
function imageJpegWrapper( $dst_image, $thumbPath ) {
imageinterlace( $dst_image );
imagejpeg( $dst_image, $thumbPath, 95 );
}
-
+
/**
* Get all thumbnail names previously generated for this image
*/
// This generates an error on failure, hence the @
$handle = @opendir( $dir );
-
+
if ( $handle ) {
while ( false !== ( $file = readdir($handle) ) ) {
if ( $file{0} != '.' ) {
} else {
$files = array();
}
-
+
return $files;
}
wfPurgeSquidServers( $urls );
}
}
-
+
function checkDBSchema(&$db) {
+ global $wgCheckDBSchema;
+ if (!$wgCheckDBSchema) {
+ return;
+ }
# 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' );
}
}
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(
function resetHistory() {
$this->historyLine = 0;
}
-
+
/**
* Return the full filesystem path to the file. Note that this does
* not mean that a file actually exists under that location.
*/
function getFullPath( $fromSharedRepository = false ) {
global $wgUploadDirectory, $wgSharedUploadDirectory;
-
+
$dir = $fromSharedRepository ? $wgSharedUploadDirectory :
$wgUploadDirectory;
-
+
// $wgSharedUploadDirectory may be false, if thumb.php is used
if ( $dir ) {
- $fullpath = $dir . wfGetHashPath($this->name, $fromSharedRepository) . $this->name;
+ $fullpath = $dir . wfGetHashPath($this->name, $fromSharedRepository) . $this->name;
} else {
$fullpath = false;
}
global $wgHashedUploadDirectory, $wgHashedSharedUploadDirectory;
return $shared ? $wgHashedSharedUploadDirectory : $wgHashedUploadDirectory;
}
-
+
/**
* Record an image upload in the upload log and the image table
*/
if ( $license != '' ) {
$filedesc = $desc == '' ? '' : '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $desc . "\n";
$textdesc = $filedesc .
- '== ' . wfMsgForContent ( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n";
+ '== ' . wfMsgForContent ( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n";
} else {
$textdesc = $desc;
}
$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.
'oi_user_text' => 'img_user_text',
), array( 'img_name' => $this->name ), $fname
);
-
+
# Update the current image row
$dbw->update( 'image',
array( /* SET */
$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();
// New image; create the description page.
$article->insertNewArticle( $textdesc, $desc, $minor, $watch, $suppressRC );
}
-
+
# 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 );
function getLinksTo( $options = '' ) {
$fname = 'Image::getLinksTo';
wfProfileIn( $fname );
-
+
if ( $options ) {
$db =& wfGetDB( DB_MASTER );
} else {
$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 ) ) {
$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->purgeMetadataCache();
$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 ) ) {
} 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.
*/
function wfImageDir( $fname ) {
global $wgUploadDirectory, $wgHashedUploadDirectory;
-
+
if (!$wgHashedUploadDirectory) { return $wgUploadDirectory; }
$hash = md5( $fname );
}
if ( ! is_dir( $dir ) ) {
+ if ( is_file( $dir ) ) {
+ // Old thumbnail in the way of directory creation, kill it
+ unlink( $dir );
+ }
$oldumask = umask(0);
@mkdir( $dir, 0777 );
umask( $oldumask );
* @access public
*/
function wfImageArchiveDir( $fname , $subdir='archive', $shared=false ) {
- global $wgUploadDirectory, $wgHashedUploadDirectory,
- $wgSharedUploadDirectory, $wgHashedSharedUploadDirectory;
+ global $wgUploadDirectory, $wgHashedUploadDirectory;
+ global $wgSharedUploadDirectory, $wgHashedSharedUploadDirectory;
$dir = $shared ? $wgSharedUploadDirectory : $wgUploadDirectory;
- $hashdir = $shared ? $wgHashedSharedUploadDirectory : $wgHashedUploadDirectory;
+ $hashdir = $shared ? $wgHashedSharedUploadDirectory : $wgHashedUploadDirectory;
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 ); }
$archive .= '/' . $hash{0};
function wfGetSVGsize( $filename ) {
$width = 256;
$height = 256;
-
+
// Read a chunk of the file
$f = fopen( $filename, "rt" );
if( !$f ) return false;
$chunk = fread( $f, 4096 );
fclose( $f );
-
+
// Uber-crappy hack! Run through a real XML parser.
if( !preg_match( '/<svg\s*([^>]*)\s*>/s', $chunk, $matches ) ) {
return false;
if( preg_match( '/\bheight\s*=\s*("[^"]+"|\'[^\']+\')/s', $tag, $matches ) ) {
$height = wfScaleSVGUnit( trim( substr( $matches[1], 1, -1 ) ) );
}
-
+
return array( $width, $height, 'SVG',
"width=\"$width\" height=\"$height\"" );
}
/**
* @return string The thumbnail URL
- */
+ */
function getUrl() {
return $this->url;
}
-
+
/**
* Return HTML <img ... /> tag for the thumbnail, will include
* width and height attributes and a blank alt text (as required).
}
}
+
+/**
+ * Calculate the largest thumbnail width for a given original file size
+ * such that the thumbnail's height is at most $maxHeight.
+ * @param int $boxWidth
+ * @param int $boxHeight
+ * @param int $maxHeight
+ * @return int
+ */
+function wfFitBoxWidth( $boxWidth, $boxHeight, $maxHeight ) {
+ $idealWidth = $boxWidth * $maxHeight / $boxHeight;
+ $roundedUp = ceil( $idealWidth );
+ if( round( $roundedUp * $boxHeight / $boxWidth ) > $maxHeight )
+ return floor( $idealWidth );
+ else
+ return $roundedUp;
+}
+
?>
dépôts / lhc / web / wiklou.git / blobdiff