X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FImage.php;h=405213511fcd5b258d249ccefe833bf7e9e800b2;hb=a0d8fb6e3d8c4fd31d34f6825a253870b2557710;hp=e5704d6d24a2c3879ea55fc6d9d8e55e5a59ece8;hpb=1e4ad78a721a97b68884ec342da489ec48000c55;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/Image.php b/includes/Image.php
index e5704d6d24..405213511f 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -1,7 +1,6 @@
name = $name;
- $this->title = Title::makeTitleSafe( NS_IMAGE, $this->name );
- $this->fromSharedDirectory = false;
- if ($wgHashedUploadDirectory) {
- $hash = md5( $this->title->getDBkey() );
- $this->imagePath = $wgUploadDirectory . '/' . $hash{0} . '/' .
- substr( $hash, 0, 2 ) . "/{$name}";
- } else {
- $this->imagePath = $wgUploadDirectory . '/' . $name;
+ function newFromName( $name ) {
+ $title = Title::makeTitleSafe( NS_IMAGE, $name );
+ return new Image( $title );
+ }
+
+ /**
+ * Obsolete factory function, use constructor
+ */
+ function newFromTitle( $title ) {
+ return new Image( $title );
+ }
+
+ function Image( $title ) {
+ $this->title =& $title;
+ $this->name = $title->getDBkey();
+ $this->exif = serialize ( array() ) ;
+
+ $n = strrpos( $this->name, '.' );
+ $this->extension = strtolower( $n ? substr( $this->name, $n + 1 ) : '' );
+ $this->historyLine = 0;
+
+ $this->dataLoaded = false;
+ }
+
+ /**
+ * Get the memcached keys
+ * Returns an array, first element is the local cache key, second is the shared cache key, if there is one
+ */
+ function getCacheKeys( $shared = false ) {
+ global $wgDBname, $wgUseSharedUploads, $wgSharedUploadDBname, $wgCacheSharedUploads;
+
+ $foundCached = false;
+ $hashedName = md5($this->name);
+ $keys = array( "$wgDBname:Image:$hashedName" );
+ if ( $wgUseSharedUploads && $wgSharedUploadDBname && $wgCacheSharedUploads ) {
+ $keys[] = "$wgSharedUploadDBname:Image:$hashedName";
+ }
+ return $keys;
+ }
+
+ /**
+ * Try to load image metadata from memcached. Returns true on success.
+ */
+ function loadFromCache() {
+ global $wgUseSharedUploads, $wgMemc;
+ $fname = 'Image::loadFromMemcached';
+ wfProfileIn( $fname );
+ $this->dataLoaded = false;
+ $keys = $this->getCacheKeys();
+ $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 ( $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'])) {
+ $this->name = $commonsCachedValues['name'];
+ $this->imagePath = $commonsCachedValues['imagePath'];
+ $this->fileExists = $commonsCachedValues['fileExists'];
+ $this->width = $commonsCachedValues['width'];
+ $this->height = $commonsCachedValues['height'];
+ $this->bits = $commonsCachedValues['bits'];
+ $this->type = $commonsCachedValues['type'];
+ $this->exif = $commonsCachedValues['exif'];
+ $this->size = $commonsCachedValues['size'];
+ $this->fromSharedDirectory = true;
+ $this->dataLoaded = true;
+ $this->imagePath = $this->getFullPath(true);
+ }
+ }
+ }
+ else {
+ $this->name = $cachedValues['name'];
+ $this->imagePath = $cachedValues['imagePath'];
+ $this->fileExists = $cachedValues['fileExists'];
+ $this->width = $cachedValues['width'];
+ $this->height = $cachedValues['height'];
+ $this->bits = $cachedValues['bits'];
+ $this->type = $cachedValues['type'];
+ $this->exif = $cachedValues['exif'];
+ $this->size = $cachedValues['size'];
+ $this->fromSharedDirectory = false;
+ $this->dataLoaded = true;
+ $this->imagePath = $this->getFullPath();
+ }
}
- $this->fileExists = file_exists( $this->imagePath);
+
+ wfProfileOut( $fname );
+ return $this->dataLoaded;
+ }
+
+ /**
+ * Save the image metadata to memcached
+ */
+ 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.
+ if ( $this->fileExists ) {
+ $keys = $this->getCacheKeys();
- # If the file is not found, and a shared upload directory
- # like the Wikimedia Commons is used, look for it there.
- if (!$this->fileExists && $wgUseSharedUploads) {
- # in case we're running a capitallinks=false wiki
- $sharedname=ucfirst($name);
- $sharedtitle=$this->title->getDBkey();
- if($wgUseLatin1 && !$wgSharedLatin1) {
- $sharedname=utf8_encode($sharedname);
- $sharedtitle=utf8_encode($sharedtitle);
+ $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,
+ 'exif' => $this->exif,
+ 'size' => $this->size);
+
+ $wgMemc->set( $keys[0], $cachedValues );
+ }
+ }
+
+ /**
+ * Load metadata from the file itself
+ */
+ function loadFromFile() {
+ global $wgUseSharedUploads, $wgSharedUploadDirectory, $wgLang;
+ $fname = 'Image::loadFromFile';
+ wfProfileIn( $fname );
+ $this->imagePath = $this->getFullPath();
+ $this->fileExists = file_exists( $this->imagePath );
+ $this->fromSharedDirectory = false;
+ $gis = false;
+
+ # If the file is not found, and a shared upload directory is used, look for it there.
+ 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.
+ $sharedImage = Image::newFromName( $wgLang->ucfirst($this->name) );
+ $this->fileExists = file_exists( $sharedImage->getFullPath(true) );
+ if ( $this->fileExists ) {
+ $this->name = $sharedImage->name;
+ $this->imagePath = $this->getFullPath(true);
+ $this->fromSharedDirectory = true;
}
-
- if($wgHashedSharedUploadDirectory) {
- $hash = md5( $sharedtitle );
- $this->imagePath = $wgSharedUploadDirectory . '/' . $hash{0} . '/' .
- substr( $hash, 0, 2 ) . "/".$sharedname;
+ }
+
+ if ( $this->fileExists ) {
+ # Get size in bytes
+ $this->size = filesize( $this->imagePath );
+
+ # 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' ) {
+ wfSuppressWarnings();
+ $gis = wfGetSVGsize( $this->imagePath );
+ wfRestoreWarnings();
} else {
- $this->imagePath = $wgSharedUploadDirectory . '/' . $sharedname;
+ wfSuppressWarnings();
+ $gis = getimagesize( $this->imagePath );
+ wfRestoreWarnings();
}
- $this->fileExists = file_exists( $this->imagePath);
- $this->fromSharedDirectory = true;
- #wfDebug ("File from shared directory: ".$this->imagePath."\n");
- }
- if($this->fileExists) {
- $this->url = $this->wfImageUrl( $name, $this->fromSharedDirectory );
+ }
+ if( $gis === false ) {
+ $this->width = 0;
+ $this->height = 0;
+ $this->bits = 0;
+ $this->type = 0;
+ $this->exif = serialize ( array() ) ;
} else {
- $this->url='';
+ $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;
+ }
}
-
- $n = strrpos( $name, '.' );
- $this->extension = strtolower( $n ? substr( $name, $n + 1 ) : '' );
-
+ $this->dataLoaded = true;
+ wfProfileOut( $fname );
+ }
- if ( $this->fileExists )
- {
- if( $this->extension == 'svg' ) {
- @$gis = getSVGsize( $this->imagePath );
- } else {
- @$gis = getimagesize( $this->imagePath );
+ /**
+ * Load image metadata from the DB
+ */
+ function loadFromDB() {
+ global $wgUseSharedUploads, $wgSharedUploadDBname, $wgLang;
+ $fname = 'Image::loadFromDB';
+ wfProfileIn( $fname );
+
+ $dbr =& wfGetDB( DB_SLAVE );
+ $row = $dbr->selectRow( 'image',
+ array( 'img_size', 'img_width', 'img_height', 'img_bits', 'img_type' , 'img_exif' ),
+ array( 'img_name' => $this->name ), $fname );
+ if ( $row ) {
+ $this->fromSharedDirectory = false;
+ $this->fileExists = true;
+ $this->loadFromRow( $row );
+ $this->imagePath = $this->getFullPath();
+ // Check for rows from a previous schema, quietly upgrade them
+ if ( $this->type == -1 ) {
+ $this->upgradeRow();
}
- if( $gis !== false ) {
- $this->width = $gis[0];
- $this->height = $gis[1];
- $this->type = $gis[2];
- $this->attr = $gis[3];
- if ( isset( $gis['bits'] ) ) {
- $this->bits = $gis['bits'];
- } else {
- $this->bits = 0;
+ } elseif ( $wgUseSharedUploads && $wgSharedUploadDBname ) {
+ # In case we're on a wgCapitalLinks=false wiki, we
+ # capitalize the first letter of the filename before
+ # looking it up in the shared repository.
+ $name = $wgLang->ucfirst($this->name);
+
+ $row = $dbr->selectRow( "`$wgSharedUploadDBname`.image",
+ array( 'img_size', 'img_width', 'img_height', 'img_bits', 'img_type' ),
+ array( 'img_name' => $name ), $fname );
+ if ( $row ) {
+ $this->fromSharedDirectory = true;
+ $this->fileExists = true;
+ $this->imagePath = $this->getFullPath(true);
+ $this->name = $name;
+ $this->loadFromRow( $row );
+
+ // Check for rows from a previous schema, quietly upgrade them
+ if ( $this->type == -1 ) {
+ $this->upgradeRow();
}
}
}
- $this->historyLine = 0;
+
+ if ( !$row ) {
+ $this->size = 0;
+ $this->width = 0;
+ $this->height = 0;
+ $this->bits = 0;
+ $this->type = 0;
+ $this->fileExists = false;
+ $this->fromSharedDirectory = false;
+ $this->exif = serialize ( array() ) ;
+ }
+
+ # Unconditionally set loaded=true, we don't want the accessors constantly rechecking
+ $this->dataLoaded = true;
+ }
+
+ /*
+ * Load image metadata from a DB result row
+ */
+ function loadFromRow( &$row ) {
+ $this->size = $row->img_size;
+ $this->width = $row->img_width;
+ $this->height = $row->img_height;
+ $this->bits = $row->img_bits;
+ $this->type = $row->img_type;
+ $this->exif = $row->img_exif;
+ if ( $this->exif == "" ) $this->exif = serialize ( array() ) ;
+ $this->dataLoaded = true;
}
/**
- * Factory function
- *
- * Create a new image object from a title object.
- *
- * @param Title $nt Title object. Must be from namespace "image"
- * @access public
+ * Load image metadata from cache or DB, unless already loaded
*/
- function newFromTitle( $nt )
- {
- $img = new Image( $nt->getDBKey() );
- $img->title = $nt;
- return $img;
+ function load() {
+ global $wgSharedUploadDBname, $wgUseSharedUploads;
+ if ( !$this->dataLoaded ) {
+ if ( !$this->loadFromCache() ) {
+ $this->loadFromDB();
+ if ( !$wgSharedUploadDBname && $wgUseSharedUploads ) {
+ $this->loadFromFile();
+ } elseif ( $this->fileExists ) {
+ $this->saveToCache();
+ }
+ }
+ $this->dataLoaded = true;
+ }
}
+ /**
+ * Metadata was loaded from the database, but the row had a marker indicating it needs to be
+ * upgraded from the 1.4 schema, which had no width, height, bits or type. Upgrade the row.
+ */
+ function upgradeRow() {
+ global $wgDBname, $wgSharedUploadDBname;
+ $fname = 'Image::upgradeRow';
+ $this->loadFromFile();
+ $dbw =& wfGetDB( DB_MASTER );
+
+ if ( $this->fromSharedDirectory ) {
+ if ( !$wgSharedUploadDBname ) {
+ return;
+ }
+
+ // Write to the other DB using selectDB, not database selectors
+ // This avoids breaking replication in MySQL
+ $dbw->selectDB( $wgSharedUploadDBname );
+ }
+ $dbw->update( '`image`',
+ array(
+ 'img_width' => $this->width,
+ 'img_height' => $this->height,
+ 'img_bits' => $this->bits,
+ 'img_type' => $this->type,
+ 'img_exif' => $this->exif,
+ ), array( 'img_name' => $this->name ), $fname
+ );
+ if ( $this->fromSharedDirectory ) {
+ $dbw->selectDB( $wgDBname );
+ }
+ }
+
/**
* Return the name of this image
* @access public
*/
- function getName()
- {
+ function getName() {
return $this->name;
}
@@ -140,8 +362,7 @@ class Image
* Return the associated title object
* @access public
*/
- function getTitle()
- {
+ function getTitle() {
return $this->title;
}
@@ -149,8 +370,15 @@ class Image
* Return the URL of the image file
* @access public
*/
- function getURL()
- {
+ function getURL() {
+ if ( !$this->url ) {
+ $this->load();
+ if($this->fileExists) {
+ $this->url = Image::imageUrl( $this->name, $this->fromSharedDirectory );
+ } else {
+ $this->url = '';
+ }
+ }
return $this->url;
}
@@ -167,8 +395,8 @@ class Image
* local file system as an absolute path
* @access public
*/
- function getImagePath()
- {
+ function getImagePath() {
+ $this->load();
return $this->imagePath;
}
@@ -178,8 +406,8 @@ class Image
* Returns -1 if the file specified is not a known image type
* @access public
*/
- function getWidth()
- {
+ function getWidth() {
+ $this->load();
return $this->width;
}
@@ -189,8 +417,8 @@ class Image
* Returns -1 if the file specified is not a known image type
* @access public
*/
- function getHeight()
- {
+ function getHeight() {
+ $this->load();
return $this->height;
}
@@ -198,10 +426,9 @@ class Image
* Return the size of the image file, in bytes
* @access public
*/
- function getSize()
- {
- $st = stat( $this->getImagePath() );
- return $st['size'];
+ function getSize() {
+ $this->load();
+ return $this->size;
}
/**
@@ -213,8 +440,8 @@ class Image
* - 15 WBMP
* - 16 XBM
*/
- function getType()
- {
+ function getType() {
+ $this->load();
return $this->type;
}
@@ -222,8 +449,8 @@ class Image
* Return the escapeLocalURL of this image
* @access public
*/
- function getEscapeLocalURL()
- {
+ function getEscapeLocalURL() {
+ $this->getTitle();
return $this->title->escapeLocalURL();
}
@@ -231,8 +458,8 @@ class Image
* Return the escapeFullURL of this image
* @access public
*/
- function getEscapeFullURL()
- {
+ function getEscapeFullURL() {
+ $this->getTitle();
return $this->title->escapeFullURL();
}
@@ -242,41 +469,28 @@ class Image
* @param string $name Name of the image, without the leading "Image:"
* @param boolean $fromSharedDirectory Should this be in $wgSharedUploadPath?
* @access public
+ * @static
*/
- function wfImageUrl( $name, $fromSharedDirectory = false )
- {
- global $wgUploadPath,$wgUploadBaseUrl,$wgHashedUploadDirectory,
- $wgHashedSharedUploadDirectory,$wgSharedUploadPath,
- $wgUseLatin1, $wgSharedLatin1;
+ function imageUrl( $name, $fromSharedDirectory = false ) {
+ global $wgUploadPath,$wgUploadBaseUrl,$wgSharedUploadPath;
if($fromSharedDirectory) {
- $hash = $wgHashedSharedUploadDirectory;
$base = '';
$path = $wgSharedUploadPath;
- if($wgUseLatin1 && !$wgSharedLatin1) {
- $name=utf8_encode($name);
- }
} else {
- $hash = $wgHashedUploadDirectory;
$base = $wgUploadBaseUrl;
$path = $wgUploadPath;
}
- if ( $hash ) {
- $hash = md5( $name );
- $url = "{$base}{$path}/" . $hash{0} . "/" .
- substr( $hash, 0, 2 ) . "/{$name}";
- } else {
- $url = "{$base}{$path}/{$name}";
- }
+ $url = "{$base}{$path}" . wfGetHashPath($name, $fromSharedDirectory) . "{$name}";
return wfUrlencode( $url );
}
/**
- * Returns true iff the image file exists on disk.
+ * Returns true if the image file exists on disk.
*
* @access public
*/
- function exists()
- {
+ function exists() {
+ $this->load();
return $this->fileExists;
}
@@ -285,31 +499,44 @@ class Image
* @access private
*/
function thumbUrl( $width, $subdir='thumb') {
- global $wgUploadPath,$wgHashedUploadDirectory, $wgUploadBaseUrl,
+ global $wgUploadPath, $wgUploadBaseUrl,
$wgSharedUploadPath,$wgSharedUploadDirectory,
- $wgHashedSharedUploadDirectory,$wgUseLatin1,$wgSharedLatin1;
- $name = $this->thumbName( $width );
- if($this->fromSharedDirectory) {
- $hashdir = $wgHashedSharedUploadDirectory;
- $base = '';
- $path = $wgSharedUploadPath;
- if($wgUseLatin1 && !$wgSharedLatin1) {
- $name=utf8_encode($name);
- }
+ $wgSharedThumbnailScriptPath, $wgThumbnailScriptPath;
+
+ // Generate thumb.php URL if possible
+ $script = false;
+ $url = false;
+
+ if ( $this->fromSharedDirectory ) {
+ if ( $wgSharedThumbnailScriptPath ) {
+ $script = $wgSharedThumbnailScriptPath;
+ }
} else {
- $hashdir = $wgHashedUploadDirectory;
- $base = $wgUploadBaseUrl;
- $path = $wgUploadPath;
+ if ( $wgThumbnailScriptPath ) {
+ $script = $wgThumbnailScriptPath;
+ }
}
- if ($hashdir) {
- $hash = md5( $name );
- $url = "{$base}{$path}/{$subdir}/" . $hash{0} . "/" .
- substr( $hash, 0, 2 ) . "/{$name}";
- } else {
- $url = "{$base}{$path}/{$subdir}/{$name}";
+ if ( $script ) {
+ $url = $script . '?f=' . urlencode( $this->name ) . '&w=' . urlencode( $width );
+ } else {
+ $name = $this->thumbName( $width );
+ if($this->fromSharedDirectory) {
+ $base = '';
+ $path = $wgSharedUploadPath;
+ } else {
+ $base = $wgUploadBaseUrl;
+ $path = $wgUploadPath;
+ }
+ if ( Image::isHashed( $this->fromSharedDirectory ) ) {
+ $url = "{$base}{$path}/{$subdir}" .
+ wfGetHashPath($this->name, $this->fromSharedDirectory)
+ . $this->name.'/'.$name;
+ $url = wfUrlencode( $url );
+ } else {
+ $url = "{$base}{$path}/{$subdir}/{$name}";
+ }
}
-
- return wfUrlencode($url);
+ return array( $script !== false, $url );
}
/**
@@ -319,16 +546,12 @@ class Image
* @param boolean $shared Does the thumbnail come from the shared repository?
* @access private
*/
- function thumbName( $width, $shared=false ) {
- global $wgUseLatin1,$wgSharedLatin1;
+ function thumbName( $width ) {
$thumb = $width."px-".$this->name;
if( $this->extension == 'svg' ) {
# Rasterize SVG vector images to PNG
$thumb .= '.png';
}
- if( $shared && $wgUseLatin1 && !$wgSharedLatin1) {
- $thumb=utf8_encode($thumb);
- }
return $thumb;
}
@@ -349,9 +572,26 @@ class Image
* @access public
*/
function createThumb( $width, $height=-1 ) {
+ $thumb = $this->getThumbnail( $width, $height );
+ 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,
+ * and can produce a convenient ![]()
tag for you.
+ *
+ * @param integer $width maximum width of the generated thumbnail
+ * @param integer $height maximum height of the image (optional)
+ * @return ThumbnailImage
+ * @access public
+ */
+ 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;
@@ -363,7 +603,28 @@ class Image
$thumbwidth = $thumbwidth * $height / $thumbheight;
$thumbheight = $height;
}
- return $this->renderThumb( $thumbwidth );
+ $thumb = $this->renderThumb( $thumbwidth );
+ 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/' . $icon;
+ $filepath = $wgStyleDirectory . $path;
+ if( file_exists( $filepath ) ) {
+ return new ThumbnailImage( $wgStylePath . $path, 120, 120 );
+ }
+ }
+ return null;
}
/**
@@ -372,147 +633,238 @@ class Image
* image's width. Let the browser do the scaling in this case.
* The thumbnail is stored on disk and is only computed if the thumbnail
* file does not exist OR if it is older than the image.
- * Returns the URL.
+ * Returns an object which can return the pathname, URL, and physical
+ * pixel size of the thumbnail -- or null on failure.
*
+ * @return ThumbnailImage
* @access private
*/
- function /* private */ renderThumb( $width ) {
- global $wgImageMagickConvertCommand;
- global $wgUseImageMagick;
+ function /* private */ renderThumb( $width, $useScript = true ) {
global $wgUseSquid, $wgInternalServer;
-
+ global $wgThumbnailScriptPath, $wgSharedThumbnailScriptPath;
+
$width = IntVal( $width );
- $thumbName = $this->thumbName( $width, $this->fromSharedDirectory );
- $thumbPath = wfImageThumbDir( $thumbName, 'thumb', $this->fromSharedDirectory ).'/'.$thumbName;
- $thumbUrl = $this->thumbUrl( $width );
- #wfDebug ( "Render name: $thumbName path: $thumbPath url: $thumbUrl\n");
+ $this->load();
if ( ! $this->exists() )
{
# If there is no image, there will be no thumbnail
- return '';
+ return null;
}
# Sanity check $width
if( $width <= 0 ) {
# BZZZT
- return '';
+ return null;
}
if( $width > $this->width && !$this->mustRender() ) {
# Don't make an image bigger than the source
- return $this->getViewURL();
- }
-
- if ( (! file_exists( $thumbPath ) ) || ( filemtime($thumbPath) < filemtime($this->imagePath) ) ) {
- if( $this->extension == 'svg' ) {
- global $wgSVGConverters, $wgSVGConverter;
- if( isset( $wgSVGConverters[$wgSVGConverter] ) ) {
- global $wgSVGConverterPath;
- $cmd = str_replace(
- array( '$path/', '$width', '$input', '$output' ),
- array( $wgSVGConverterPath,
- $width,
- escapeshellarg( $this->imagePath ),
- escapeshellarg( $thumbPath ) ),
- $wgSVGConverters[$wgSVGConverter] );
- $conv = shell_exec( $cmd );
- } else {
- $conv = false;
- }
- } elseif ( $wgUseImageMagick ) {
- # use ImageMagick
- # Specify white background color, will be used for transparent images
- # in Internet Explorer/Windows instead of default black.
- $cmd = $wgImageMagickConvertCommand .
- " -quality 85 -background white -geometry {$width} ".
- escapeshellarg($this->imagePath) . " " .
- escapeshellarg($thumbPath);
- $conv = shell_exec( $cmd );
- } else {
- # Use PHP's builtin GD library functions.
- #
- # First find out what kind of file this is, and select the correct
- # input routine for this.
+ return new ThumbnailImage( $this->getViewURL(), $this->getWidth(), $this->getHeight() );
+ }
+
+ $height = floor( $this->height * ( $width/$this->width ) );
+
+ list( $isScriptUrl, $url ) = $this->thumbUrl( $width );
+ if ( $isScriptUrl && $useScript ) {
+ // Use thumb.php to render the image
+ return new ThumbnailImage( $url, $width, $height );
+ }
- $truecolor = false;
-
- switch( $this->type ) {
- case 1: # GIF
- $src_image = imagecreatefromgif( $this->imagePath );
- break;
- case 2: # JPG
- $src_image = imagecreatefromjpeg( $this->imagePath );
- $truecolor = true;
- break;
- case 3: # PNG
- $src_image = imagecreatefrompng( $this->imagePath );
- $truecolor = ( $this->bits > 8 );
- break;
- case 15: # WBMP for WML
- $src_image = imagecreatefromwbmp( $this->imagePath );
- break;
- case 16: # XBM
- $src_image = imagecreatefromxbm( $this->imagePath );
- break;
- default:
- return 'Image type not supported';
- break;
- }
- $height = floor( $this->height * ( $width/$this->width ) );
- if ( $truecolor ) {
- $dst_image = imagecreatetruecolor( $width, $height );
+ $thumbName = $this->thumbName( $width, $this->fromSharedDirectory );
+ $thumbPath = wfImageThumbDir( $this->name, $this->fromSharedDirectory ).'/'.$thumbName;
+
+ if ( !file_exists( $thumbPath ) ) {
+ $oldThumbPath = wfDeprecatedThumbDir( $thumbName, 'thumb', $this->fromSharedDirectory ).
+ '/'.$thumbName;
+ $done = false;
+ if ( file_exists( $oldThumbPath ) ) {
+ if ( filemtime($oldThumbPath) >= filemtime($this->imagePath) ) {
+ rename( $oldThumbPath, $thumbPath );
+ $done = true;
} else {
- $dst_image = imagecreate( $width, $height );
+ unlink( $oldThumbPath );
}
- imagecopyresampled( $dst_image, $src_image,
- 0,0,0,0,
- $width, $height, $this->width, $this->height );
- switch( $this->type ) {
- case 1: # GIF
- case 3: # PNG
- case 15: # WBMP
- case 16: # XBM
- #$thumbUrl .= ".png";
- #$thumbPath .= ".png";
- imagepng( $dst_image, $thumbPath );
- break;
- case 2: # JPEG
- #$thumbUrl .= ".jpg";
- #$thumbPath .= ".jpg";
- imageinterlace( $dst_image );
- imagejpeg( $dst_image, $thumbPath, 95 );
- break;
- default:
- break;
- }
- imagedestroy( $dst_image );
- imagedestroy( $src_image );
+ }
+ if ( !$done ) {
+ $this->reallyRenderThumb( $thumbPath, $width, $height );
+ # Purge squid
+ # This has to be done after the image is updated and present for all machines on NFS,
+ # or else the old version might be stored into the squid again
+ if ( $wgUseSquid ) {
+ if ( substr( $url, 0, 4 ) == 'http' ) {
+ $urlArr = array( $url );
+ } else {
+ $urlArr = array( $wgInternalServer.$url );
+ }
+ wfPurgeSquidServers($urlArr);
+ }
+ }
+ }
+ return new ThumbnailImage( $url, $width, $height, $thumbPath );
+ } // END OF function renderThumb
+ /**
+ * Really render a thumbnail
+ *
+ * @access private
+ */
+ function /*private*/ reallyRenderThumb( $thumbPath, $width, $height ) {
+ global $wgSVGConverters, $wgSVGConverter,
+ $wgUseImageMagick, $wgImageMagickConvertCommand;
+
+ $this->load();
+
+ if( $this->extension == 'svg' ) {
+ global $wgSVGConverters, $wgSVGConverter;
+ if( isset( $wgSVGConverters[$wgSVGConverter] ) ) {
+ global $wgSVGConverterPath;
+ $cmd = str_replace(
+ array( '$path/', '$width', '$input', '$output' ),
+ array( $wgSVGConverterPath,
+ $width,
+ escapeshellarg( $this->imagePath ),
+ escapeshellarg( $thumbPath ) ),
+ $wgSVGConverters[$wgSVGConverter] );
+ $conv = shell_exec( $cmd );
+ } else {
+ $conv = false;
}
+ } elseif ( $wgUseImageMagick ) {
+ # use ImageMagick
+ # Specify white background color, will be used for transparent images
+ # in Internet Explorer/Windows instead of default black.
+ $cmd = $wgImageMagickConvertCommand .
+ " -quality 85 -background white -geometry {$width} ".
+ escapeshellarg($this->imagePath) . " " .
+ escapeshellarg($thumbPath);
+ $conv = shell_exec( $cmd );
+ } else {
+ # Use PHP's builtin GD library functions.
#
- # Check for zero-sized thumbnails. Those can be generated when
- # no disk space is available or some other error occurs
- #
+ # First find out what kind of file this is, and select the correct
+ # input routine for this.
+
+ $truecolor = false;
+
+ switch( $this->type ) {
+ case 1: # GIF
+ $src_image = imagecreatefromgif( $this->imagePath );
+ break;
+ case 2: # JPG
+ $src_image = imagecreatefromjpeg( $this->imagePath );
+ $truecolor = true;
+ break;
+ case 3: # PNG
+ $src_image = imagecreatefrompng( $this->imagePath );
+ $truecolor = ( $this->bits > 8 );
+ break;
+ case 15: # WBMP for WML
+ $src_image = imagecreatefromwbmp( $this->imagePath );
+ break;
+ case 16: # XBM
+ $src_image = imagecreatefromxbm( $this->imagePath );
+ break;
+ default:
+ return 'Image type not supported';
+ break;
+ }
+ if ( $truecolor ) {
+ $dst_image = imagecreatetruecolor( $width, $height );
+ } else {
+ $dst_image = imagecreate( $width, $height );
+ }
+ imagecopyresampled( $dst_image, $src_image,
+ 0,0,0,0,
+ $width, $height, $this->width, $this->height );
+ switch( $this->type ) {
+ case 1: # GIF
+ case 3: # PNG
+ case 15: # WBMP
+ case 16: # XBM
+ imagepng( $dst_image, $thumbPath );
+ break;
+ case 2: # JPEG
+ imageinterlace( $dst_image );
+ imagejpeg( $dst_image, $thumbPath, 95 );
+ break;
+ default:
+ break;
+ }
+ 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
+ #
+ if( file_exists( $thumbPath ) ) {
$thumbstat = stat( $thumbPath );
- if( $thumbstat['size'] == 0 )
- {
+ if( $thumbstat['size'] == 0 ) {
unlink( $thumbPath );
}
+ }
+ }
+
+ /**
+ * Get all thumbnail names previously generated for this image
+ */
+ function getThumbnails( $shared = false ) {
+ if ( Image::isHashed( $shared ) ) {
+ $this->load();
+ $files = array();
+ $dir = wfImageThumbDir( $this->name, $shared );
- # Purge squid
- # This has to be done after the image is updated and present for all machines on NFS,
- # or else the old version might be stored into the squid again
- if ( $wgUseSquid ) {
- $urlArr = Array(
- $wgInternalServer.$thumbUrl
- );
- wfPurgeSquidServers($urlArr);
+ // This generates an error on failure, hence the @
+ $handle = @opendir( $dir );
+
+ if ( $handle ) {
+ while ( false !== ( $file = readdir($handle) ) ) {
+ if ( $file{0} != '.' ) {
+ $files[] = $file;
+ }
+ }
+ closedir( $handle );
}
+ } else {
+ $files = array();
}
- return $thumbUrl;
- } // END OF function createThumb
+
+ return $files;
+ }
+
+ /**
+ * Delete all previously generated thumbnails, refresh metadata in memcached and purge the squid
+ */
+ function purgeCache( $archiveFiles = array(), $shared = false ) {
+ global $wgInternalServer, $wgUseSquid;
+
+ // Refresh metadata cache
+ clearstatcache();
+ $this->loadFromFile();
+ $this->saveToCache();
+
+ // Delete thumbnails
+ $files = $this->getThumbnails( $shared );
+ $dir = wfImageThumbDir( $this->name, $shared );
+ $urls = array();
+ foreach ( $files as $file ) {
+ if ( preg_match( '/^(\d+)px/', $file, $m ) ) {
+ $urls[] = $wgInternalServer . $this->thumbUrl( $m[1], $this->fromSharedDirectory );
+ @unlink( "$dir/$file" );
+ }
+ }
+
+ // Purge the squid
+ if ( $wgUseSquid ) {
+ $urls[] = $wgInternalServer . $this->getViewURL();
+ foreach ( $archiveFiles as $file ) {
+ $urls[] = $wgInternalServer . wfImageArchiveUrl( $file );
+ }
+ wfPurgeSquidServers( $urls );
+ }
+ }
/**
* Return the image history of this image, line by line.
@@ -524,8 +876,7 @@ class Image
*
* @access public
*/
- function nextHistoryLine()
- {
+ function nextHistoryLine() {
$fname = 'Image::nextHistoryLine()';
$dbr =& wfGetDB( DB_SLAVE );
if ( $this->historyLine == 0 ) {// called for the first time, return line from cur
@@ -553,8 +904,7 @@ class Image
* Reset the history pointer to the first element of the history
* @access public
*/
- function resetHistory()
- {
+ function resetHistory() {
$this->historyLine = 0;
}
@@ -564,9 +914,386 @@ class Image
* @return bool
*/
function mustRender() {
+ $this->load();
return ( $this->extension == 'svg' );
}
+ /**
+ * Return the full filesystem path to the file. Note that this does
+ * not mean that a file actually exists under that location.
+ *
+ * This path depends on whether directory hashing is active or not,
+ * i.e. whether the images are all found in the same directory,
+ * or in hashed paths like /images/3/3c.
+ *
+ * @access public
+ * @param boolean $fromSharedDirectory Return the path to the file
+ * in a shared repository (see $wgUseSharedRepository and related
+ * options in DefaultSettings.php) instead of a local one.
+ *
+ */
+ function getFullPath( $fromSharedRepository = false ) {
+ global $wgUploadDirectory, $wgSharedUploadDirectory;
+ global $wgHashedUploadDirectory, $wgHashedSharedUploadDirectory;
+
+ $dir = $fromSharedRepository ? $wgSharedUploadDirectory :
+ $wgUploadDirectory;
+
+ // $wgSharedUploadDirectory may be false, if thumb.php is used
+ if ( $dir ) {
+ $fullpath = $dir . wfGetHashPath($this->name, $fromSharedRepository) . $this->name;
+ } else {
+ $fullpath = false;
+ }
+
+ return $fullpath;
+ }
+
+ /**
+ * @return bool
+ * @static
+ */
+ function isHashed( $shared ) {
+ global $wgHashedUploadDirectory, $wgHashedSharedUploadDirectory;
+ 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;
+ 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' );
+ }
+
+ // Delete thumbnails and refresh the metadata cache
+ $this->purgeCache();
+
+ // Fail now if the image isn't there
+ if ( !$this->fileExists || $this->fromSharedDirectory ) {
+ return false;
+ }
+
+ if ( $wgUseCopyrightUpload ) {
+ $textdesc = '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $desc . "\n" .
+ '== ' . wfMsg ( 'filestatus' ) . " ==\n" . $copyStatus . "\n" .
+ '== ' . wfMsg ( 'filesource' ) . " ==\n" . $source ;
+ } else {
+ $textdesc = $desc;
+ }
+
+ $now = $dbw->timestamp();
+
+ # 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.
+ $dbw->insert( 'image',
+ array(
+ 'img_name' => $this->name,
+ 'img_size'=> $this->size,
+ 'img_width' => $this->width,
+ 'img_height' => $this->height,
+ 'img_bits' => $this->bits,
+ 'img_type' => $this->type,
+ 'img_timestamp' => $now,
+ 'img_description' => $desc,
+ 'img_user' => $wgUser->getID(),
+ 'img_user_text' => $wgUser->getName(),
+ 'img_exif' => $this->exif,
+ ), $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 {
+ # Collision, this is an update of an image
+ # Insert previous contents into oldimage
+ $dbw->insertSelect( 'oldimage', 'image',
+ array(
+ 'oi_name' => 'img_name',
+ 'oi_archive_name' => $dbw->addQuotes( $oldver ),
+ 'oi_size' => 'img_size',
+ '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_bits' => $this->bits,
+ 'img_type' => $this->type,
+ 'img_timestamp' => $now,
+ 'img_user' => $wgUser->getID(),
+ 'img_user_text' => $wgUser->getName(),
+ 'img_description' => $desc,
+ 'img_exif' => $this->exif,
+ ), array( /* WHERE */
+ 'img_name' => $this->name
+ ), $fname
+ );
+
+ # Invalidate the cache for the description page
+ $descTitle->invalidateCache();
+ $purgeURLs[] = $descTitle->getInternalURL();
+ }
+
+ # Invalidate cache for all pages using this image
+ $linksTo = $this->getLinksTo();
+
+ if ( $wgUseSquid ) {
+ $u = SquidUpdate::newFromTitles( $linksTo, $purgeURLs );
+ array_push( $wgPostCommitUpdateList, $u );
+ }
+ Title::touchArray( $linksTo );
+
+ $log = new LogPage( 'upload' );
+ $log->addEntry( 'upload', $descTitle, $desc );
+
+ return true;
+ }
+
+ /**
+ * Get an array of Title objects which are articles which use this image
+ * Also adds their IDs to the link cache
+ *
+ * This is mostly copied from Title::getLinksTo()
+ */
+ function getLinksTo( $options = '' ) {
+ global $wgLinkCache;
+ $fname = 'Image::getLinksTo';
+ wfProfileIn( $fname );
+
+ if ( $options ) {
+ $db =& wfGetDB( DB_MASTER );
+ } else {
+ $db =& wfGetDB( DB_SLAVE );
+ }
+
+ extract( $db->tableNames( 'page', 'imagelinks' ) );
+ $encName = $db->addQuotes( $this->name );
+ $sql = "SELECT page_namespace,page_title,page_id FROM $page,$imagelinks WHERE page_id=il_from AND il_to=$encName $options";
+ $res = $db->query( $sql, $fname );
+
+ $retVal = array();
+ if ( $db->numRows( $res ) ) {
+ while ( $row = $db->fetchObject( $res ) ) {
+ if ( $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title ) ) {
+ $wgLinkCache->addGoodLink( $row->page_id, $titleObj->getPrefixedDBkey() );
+ $retVal[] = $titleObj;
+ }
+ }
+ }
+ $db->freeResult( $res );
+ return $retVal;
+ }
+
+ function retrieveExifData () {
+ global $wgShowEXIF ;
+ if ( ! $wgShowEXIF ) return array ();
+ if ( $this->type !== '2' ) return array ();
+
+ $exif = exif_read_data( $this->imagePath );
+ $exif = $this->stripExifData( $exif );
+ return $exif ;
+ }
+
+ function getExifData () {
+ global $wgRequest, $wgShowEXIF;
+
+ if ( ! $wgShowEXIF ) return array ();
+
+ $action = $wgRequest->getVal( 'action' ); # Allow forced updates
+
+ $ret = unserialize ( $this->exif );
+
+ if ( count( $ret) == 0 || $action == 'purge' ) { # No EXIF data was stored for this image
+ $this->updateExifData() ;
+ $ret = unserialize ( $this->exif ) ;
+ }
+
+ return $ret ;
+ }
+
+ function updateExifData () {
+ global $wgShowEXIF ;
+ if ( ! $wgShowEXIF ) return ;
+ if ( false === $this->getImagePath() ) return ; # Not a local image
+
+ $fname = "Image:updateExifData" ;
+
+ # Get EXIF data from image
+ $exif = $this->retrieveExifData () ;
+ $this->exif = serialize ( $exif ) ;
+
+ # Update EXIF data in database
+ $dbw =& wfGetDB( DB_MASTER );
+ $dbw->update( '`image`',
+ array( 'img_exif' => $this->exif ),
+ 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
+ * @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
@@ -574,12 +1301,13 @@ class Image
* Returns the image directory of an image
* If the directory does not exist, it is created.
* The result is an absolute path.
+ *
+ * This function is called from thumb.php before Setup.php is included
*
* @param string $fname file name of the image file
* @access public
*/
-function wfImageDir( $fname )
-{
+function wfImageDir( $fname ) {
global $wgUploadDirectory, $wgHashedUploadDirectory;
if (!$wgHashedUploadDirectory) { return $wgUploadDirectory; }
@@ -599,29 +1327,57 @@ function wfImageDir( $fname )
* Returns the image directory of an image's thubnail
* If the directory does not exist, it is created.
* The result is an absolute path.
+ *
+ * This function is called from thumb.php before Setup.php is included
*
- * @param string $fname file name of the thumbnail file, including file size prefix
+ * @param string $fname file name of the original image file
* @param string $subdir (optional) subdirectory of the image upload directory that should be used for storing the thumbnail. Default is 'thumb'
* @param boolean $shared (optional) use the shared upload directory
* @access public
*/
-function wfImageThumbDir( $fname , $subdir='thumb', $shared=false)
-{
- return wfImageArchiveDir( $fname, $subdir, $shared );
+function wfImageThumbDir( $fname, $shared = false ) {
+ $base = wfImageArchiveDir( $fname, 'thumb', $shared );
+ if ( Image::isHashed( $shared ) ) {
+ $dir = "$base/$fname";
+
+ if ( !is_dir( $base ) ) {
+ $oldumask = umask(0);
+ @mkdir( $base, 0777 );
+ umask( $oldumask );
+ }
+
+ if ( ! is_dir( $dir ) ) {
+ $oldumask = umask(0);
+ @mkdir( $dir, 0777 );
+ umask( $oldumask );
+ }
+ } else {
+ $dir = $base;
+ }
+
+ return $dir;
+}
+
+/**
+ * Old thumbnail directory, kept for conversion
+ */
+function wfDeprecatedThumbDir( $thumbName , $subdir='thumb', $shared=false) {
+ return wfImageArchiveDir( $thumbName, $subdir, $shared );
}
/**
* Returns the image directory of an image's old version
* If the directory does not exist, it is created.
* The result is an absolute path.
+ *
+ * This function is called from thumb.php before Setup.php is included
*
* @param string $fname file name of the thumbnail file, including file size prefix
* @param string $subdir (optional) subdirectory of the image upload directory that should be used for storing the old version. Default is 'archive'
* @param boolean $shared (optional) use the shared upload directory (only relevant for other functions which call this one)
* @access public
*/
-function wfImageArchiveDir( $fname , $subdir='archive', $shared=false )
-{
+function wfImageArchiveDir( $fname , $subdir='archive', $shared=false ) {
global $wgUploadDirectory, $wgHashedUploadDirectory,
$wgSharedUploadDirectory, $wgHashedSharedUploadDirectory;
$dir = $shared ? $wgSharedUploadDirectory : $wgUploadDirectory;
@@ -629,132 +1385,42 @@ function wfImageArchiveDir( $fname , $subdir='archive', $shared=false )
if (!$hashdir) { return $dir.'/'.$subdir; }
$hash = md5( $fname );
$oldumask = umask(0);
+
# Suppress warning messages here; if the file itself can't
# be written we'll worry about it then.
+ wfSuppressWarnings();
+
$archive = $dir.'/'.$subdir;
- if ( ! is_dir( $archive ) ) { @mkdir( $archive, 0777 ); }
+ if ( ! is_dir( $archive ) ) { mkdir( $archive, 0777 ); }
$archive .= '/' . $hash{0};
- if ( ! is_dir( $archive ) ) { @mkdir( $archive, 0777 ); }
+ if ( ! is_dir( $archive ) ) { mkdir( $archive, 0777 ); }
$archive .= '/' . substr( $hash, 0, 2 );
- if ( ! is_dir( $archive ) ) { @mkdir( $archive, 0777 ); }
+ if ( ! is_dir( $archive ) ) { mkdir( $archive, 0777 ); }
+ wfRestoreWarnings();
umask( $oldumask );
return $archive;
}
-/**
- * Record an image upload in the upload log.
- */
-function wfRecordUpload( $name, $oldver, $size, $desc, $copyStatus = "", $source = "" )
-{
- global $wgUser, $wgLang, $wgTitle, $wgOut, $wgDeferredUpdateList;
- global $wgUseCopyrightUpload;
-
- $fname = 'wfRecordUpload';
- $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' );
- }
-
-
- $now = wfTimestampNow();
- $won = wfInvertTimestamp( $now );
- $size = IntVal( $size );
-
- if ( $wgUseCopyrightUpload )
- {
- $textdesc = '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $desc . "\n" .
- '== ' . wfMsg ( 'filestatus' ) . " ==\n" . $copyStatus . "\n" .
- '== ' . wfMsg ( 'filesource' ) . " ==\n" . $source ;
- }
- else $textdesc = $desc ;
-
- $now = wfTimestampNow();
- $won = wfInvertTimestamp( $now );
-
- # 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.
- $dbw->insert( 'image',
- array(
- 'img_name' => $name,
- 'img_size'=> $size,
- 'img_timestamp' => $dbw->timestamp($now),
- 'img_description' => $desc,
- 'img_user' => $wgUser->getID(),
- 'img_user_text' => $wgUser->getName(),
- ), $fname, 'IGNORE'
- );
- $descTitle = Title::makeTitleSafe( NS_IMAGE, $name );
-
- if ( $dbw->affectedRows() ) {
- # Successfully inserted, this is a new image
- $id = $descTitle->getArticleID();
-
- if ( $id == 0 ) {
- $seqVal = $dbw->nextSequenceValue( 'cur_cur_id_seq' );
- $dbw->insert( 'cur',
- array(
- 'cur_id' => $seqVal,
- 'cur_namespace' => NS_IMAGE,
- 'cur_title' => $name,
- 'cur_comment' => $desc,
- 'cur_user' => $wgUser->getID(),
- 'cur_user_text' => $wgUser->getName(),
- 'cur_timestamp' => $dbw->timestamp($now),
- 'cur_is_new' => 1,
- 'cur_text' => $textdesc,
- 'inverse_timestamp' => $won,
- 'cur_touched' => $dbw->timestamp($now)
- ), $fname
- );
- $id = $dbw->insertId() or 0; # We should throw an error instead
- RecentChange::notifyNew( $now, $descTitle, 0, $wgUser, $desc );
-
- $u = new SearchUpdate( $id, $name, $desc );
- $u->doUpdate();
- }
+/*
+ * Return the hash path component of an image path (URL or filesystem),
+ * e.g. "/3/3c/", or just "/" if hashing is not used.
+ *
+ * @param $dbkey The filesystem / database name of the file
+ * @param $fromSharedDirectory Use the shared file repository? It may
+ * use different hash settings from the local one.
+ */
+function wfGetHashPath ( $dbkey, $fromSharedDirectory = false ) {
+ global $wgHashedSharedUploadDirectory, $wgSharedUploadDirectory;
+ global $wgHashedUploadDirectory;
+
+ if( Image::isHashed( $fromSharedDirectory ) ) {
+ $hash = md5($dbkey);
+ return '/' . $hash{0} . '/' . substr( $hash, 0, 2 ) . '/';
} else {
- # Collision, this is an update of an image
- # Get current image row for update
- $s = $dbw->selectRow( 'image', array( 'img_name','img_size','img_timestamp','img_description',
- 'img_user','img_user_text' ), array( 'img_name' => $name ), $fname, 'FOR UPDATE' );
-
- # Insert it into oldimage
- $dbw->insert( 'oldimage',
- array(
- 'oi_name' => $s->img_name,
- 'oi_archive_name' => $oldver,
- 'oi_size' => $s->img_size,
- 'oi_timestamp' => $dbw->timestamp($s->img_timestamp),
- 'oi_description' => $s->img_description,
- 'oi_user' => $s->img_user,
- 'oi_user_text' => $s->img_user_text
- ), $fname
- );
-
- # Update the current image row
- $dbw->update( 'image',
- array( /* SET */
- 'img_size' => $size,
- 'img_timestamp' => $dbw->timestamp(),
- 'img_user' => $wgUser->getID(),
- 'img_user_text' => $wgUser->getName(),
- 'img_description' => $desc,
- ), array( /* WHERE */
- 'img_name' => $name
- ), $fname
- );
-
- # Invalidate the cache for the description page
- $descTitle->invalidateCache();
+ return '/';
}
-
- $log = new LogPage( 'upload' );
- $log->addEntry( 'upload', $descTitle, $desc );
}
/**
@@ -764,8 +1430,7 @@ function wfRecordUpload( $name, $oldver, $size, $desc, $copyStatus = "", $source
* @param string $subdir (optional) subdirectory of the image upload directory that is used by the old version. Default is 'archive'
* @access public
*/
-function wfImageArchiveUrl( $name, $subdir='archive' )
-{
+function wfImageArchiveUrl( $name, $subdir='archive' ) {
global $wgUploadPath, $wgHashedUploadDirectory;
if ($wgHashedUploadDirectory) {
@@ -785,7 +1450,7 @@ function wfImageArchiveUrl( $name, $subdir='archive' )
* @param string $length
* @return int Length in pixels
*/
-function scaleSVGUnit( $length ) {
+function wfScaleSVGUnit( $length ) {
static $unitLength = array(
'px' => 1.0,
'pt' => 1.25,
@@ -815,7 +1480,7 @@ function scaleSVGUnit( $length ) {
* @param string $filename
* @return array
*/
-function getSVGsize( $filename ) {
+function wfGetSVGsize( $filename ) {
$width = 256;
$height = 256;
@@ -831,14 +1496,85 @@ function getSVGsize( $filename ) {
}
$tag = $matches[1];
if( preg_match( '/\bwidth\s*=\s*("[^"]+"|\'[^\']+\')/s', $tag, $matches ) ) {
- $width = scaleSVGUnit( trim( substr( $matches[1], 1, -1 ) ) );
+ $width = wfScaleSVGUnit( trim( substr( $matches[1], 1, -1 ) ) );
}
if( preg_match( '/\bheight\s*=\s*("[^"]+"|\'[^\']+\')/s', $tag, $matches ) ) {
- $height = scaleSVGUnit( trim( substr( $matches[1], 1, -1 ) ) );
+ $height = wfScaleSVGUnit( trim( substr( $matches[1], 1, -1 ) ) );
}
return array( $width, $height, 'SVG',
"width=\"$width\" height=\"$height\"" );
}
+/**
+ * Is an image on the bad image list?
+ */
+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;
+ }
+ }
+ }
+ return false;
+}
+
+
+
+/**
+ * Wrapper class for thumbnail images
+ * @package MediaWiki
+ */
+class ThumbnailImage {
+ /**
+ * @param string $path Filesystem path to the thumb
+ * @param string $url URL path to the thumb
+ * @access private
+ */
+ function ThumbnailImage( $url, $width, $height, $path = false ) {
+ $this->url = $url;
+ $this->width = $width;
+ $this->height = $height;
+ $this->path = $path;
+ }
+
+ /**
+ * @return string The thumbnail URL
+ */
+ function getUrl() {
+ return $this->url;
+ }
+
+ /**
+ * Return HTML ![]()
tag for the thumbnail, will include
+ * width and height attributes and a blank alt text (as required).
+ *
+ * You can set or override additional attributes by passing an
+ * associative array of name => data pairs. The data will be escaped
+ * for HTML output, so should be in plaintext.
+ *
+ * @param array $attribs
+ * @return string
+ * @access public
+ */
+ function toHtml( $attribs = array() ) {
+ $attribs['src'] = $this->url;
+ $attribs['width'] = $this->width;
+ $attribs['height'] = $this->height;
+ if( !isset( $attribs['alt'] ) ) $attribs['alt'] = '';
+
+ $html = '![]()
$data ) {
+ $html .= $name . '="' . htmlspecialchars( $data ) . '" ';
+ }
+ $html .= '/>';
+ return $html;
+ }
+
+}
?>