X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FImageGallery.php;h=6045ad682a16207d44f3f3955512ecec4d077dca;hb=4331d13d8701cbd0217ecbe593df100b81693ef2;hp=1a3a7867c4c0d9d083407350ce1ec4c6efd7f35c;hpb=266d41f165fe23e85f70f90891f951b0b0bcda7a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index 1a3a7867c4..6045ad682a 100644
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -1,9 +1,8 @@
 <?php
 if ( ! defined( 'MEDIAWIKI' ) )
-	die( -1 );
+	die( 1 );
 
 /**
- * @package MediaWiki
  */
 
 /**
@@ -11,39 +10,144 @@ if ( ! defined( 'MEDIAWIKI' ) )
  *
  * Add images to the gallery using add(), then render that list to HTML using toHTML().
  *
- * @package MediaWiki
+ * @addtogroup Media
  */
 class ImageGallery
 {
 	var $mImages, $mShowBytes, $mShowFilename;
+	var $mCaption = false;
+	var $mSkin = false;
+	var $mRevisionId = 0;
+
+	/**
+	 * Is the gallery on a wiki page (i.e. not a special page)
+	 */
+	var $mParsing;
+
+	/**
+	 * Contextual title, used when images are being screened
+	 * against the bad image list
+	 */
+	private $contextTitle = false;
+
+	private $mPerRow = 4; // How many images wide should the gallery be?
+	private $mWidths = 120, $mHeights = 120; // How wide/tall each thumbnail should be
 
 	/**
 	 * Create a new image gallery object.
 	 */
-	function ImageGallery( ) {
+	function __construct( ) {
 		$this->mImages = array();
 		$this->mShowBytes = true;
 		$this->mShowFilename = true;
+		$this->mParsing = false;
+	}
+
+	/**
+	 * Set the "parse" bit so we know to hide "bad" images
+	 */
+	function setParsing( $val = true ) {
+		$this->mParsing = $val;
+	}
+
+	/**
+	 * Set the caption (as plain text)
+	 *
+	 * @param $caption Caption
+	 */
+	function setCaption( $caption ) {
+		$this->mCaption = htmlspecialchars( $caption );
+	}
+
+	/**
+	 * Set the caption (as HTML)
+	 *
+	 * @param $caption Caption
+	 */
+	public function setCaptionHtml( $caption ) {
+		$this->mCaption = $caption;
+	}
+
+	/**
+	 * Set how many images will be displayed per row.
+	 *
+	 * @param int $num > 0; invalid numbers will be rejected
+	 */
+	public function setPerRow( $num ) {
+		if ($num > 0) {
+			$this->mPerRow = (int)$num;
+		}
+	}
+
+	/**
+	 * Set how wide each image will be, in pixels.
+	 *
+	 * @param int $num > 0; invalid numbers will be ignored
+	 */
+	public function setWidths( $num ) {
+		if ($num > 0) {
+			$this->mWidths = (int)$num;
+		}
+	}
+
+	/**
+	 * Set how high each image will be, in pixels.
+	 *
+	 * @param int $num > 0; invalid numbers will be ignored
+	 */
+	public function setHeights( $num ) {
+		if ($num > 0) {
+			$this->mHeights = (int)$num;
+		}
+	}
+
+	/**
+	 * Instruct the class to use a specific skin for rendering
+	 *
+	 * @param $skin Skin object
+	 */
+	function useSkin( $skin ) {
+		$this->mSkin = $skin;
+	}
+
+	/**
+	 * Return the skin that should be used
+	 *
+	 * @return Skin object
+	 */
+	function getSkin() {
+		if( !$this->mSkin ) {
+			global $wgUser;
+			$skin = $wgUser->getSkin();
+		} else {
+			$skin = $this->mSkin;
+		}
+		return $skin;
 	}
 
 	/**
 	 * Add an image to the gallery.
 	 *
-	 * @param Image  $image  Image object that is added to the gallery
-	 * @param string $html   Additional HTML text to be shown. The name and size of the image are always shown.
+	 * @param $title Title object of the image that is added to the gallery
+	 * @param $html  String: additional HTML text to be shown. The name and size of the image are always shown.
 	 */
-	function add( $image, $html='' ) {
-		$this->mImages[] = array( &$image, $html );
+	function add( $title, $html='' ) {
+		if ( $title instanceof File ) {
+			// Old calling convention
+			$title = $title->getTitle();
+		}
+		$this->mImages[] = array( $title, $html );
+		wfDebug( "ImageGallery::add " . $title->getText() . "\n" );
 	}
 
 	/**
  	* Add an image at the beginning of the gallery.
  	*
- 	* @param Image  $image  Image object that is added to the gallery
- 	* @param string $html   Additional HTML text to be shown. The name and size of the image are always shown.
+ 	* @param $title Title object of the image that is added to the gallery
+ 	* @param $html  String:  Additional HTML text to be shown. The name and size of the image are always shown.
  	*/
-	function insert( $image, $html='' ) {
-		array_unshift( $this->mImages, array( &$image, $html ) );
+	function insert( $title, $html='' ) {
+		array_unshift( $this->mImages, array( &$title, $html ) );
 	}
 
 
@@ -58,7 +162,7 @@ class ImageGallery
 	 * Enable/Disable showing of the file size of an image in the gallery.
 	 * Enabled by default.
 	 *
-	 * @param boolean $f	set to false to disable
+	 * @param $f Boolean: set to false to disable.
 	 */
 	function setShowBytes( $f ) {
 		$this->mShowBytes = ( $f == true);
@@ -68,7 +172,7 @@ class ImageGallery
 	 * Enable/Disable showing of the filename of an image in the gallery.
 	 * Enabled by default.
 	 *
-	 * @param boolean $f	set to false to disable
+	 * @param $f Boolean: set to false to disable.
 	 */
 	function setShowFilename( $f ) {
 		$this->mShowFilename = ( $f == true);
@@ -85,34 +189,51 @@ class ImageGallery
 	 *
 	 */
 	function toHTML() {
-		global $wgLang, $wgUser;
+		global $wgLang;
 
-		$sk = $wgUser->getSkin();
+		$sk = $this->getSkin();
 
 		$s = '<table class="gallery" cellspacing="0" cellpadding="0">';
+		if( $this->mCaption )
+			$s .= "\n\t<caption>{$this->mCaption}</caption>";
+
+		$params = array( 'width' => $this->mWidths, 'height' => $this->mHeights );
 		$i = 0;
 		foreach ( $this->mImages as $pair ) {
-			$img =& $pair[0];
+			$nt = $pair[0];
 			$text = $pair[1];
+			
+			# Give extensions a chance to select the file revision for us
+			$time = false;
+			wfRunHooks( 'BeforeGalleryFindFile', array( &$this, &$nt, &$time ) );
 
-			$name = $img->getName();
-			$nt = $img->getTitle();
-
-			// Not an image. Just print the name and skip.
-			if ( $nt->getNamespace() != NS_IMAGE ) {
-				$s .= '<td><div class="gallerybox" style="height: 152px;">' .
-					htmlspecialchars( $nt->getText() ) . '</div></td>' .  (($i%4==3) ? "</tr>\n" : '');
-				$i++;
+			$img = wfFindFile( $nt, $time );
 
-				continue;
+			if( $nt->getNamespace() != NS_IMAGE || !$img ) {
+				# We're dealing with a non-image, spit out the name and be done with it.
+				$thumbhtml = "\n\t\t\t".'<div style="height: '.($this->mHeights*1.25+2).'px;">'
+					. htmlspecialchars( $nt->getText() ) . '</div>';
+ 			} elseif( $this->mParsing && wfIsBadImage( $nt->getDBkey(), $this->getContextTitle() ) ) {
+				# The image is blacklisted, just show it as a text link.
+				$thumbhtml = "\n\t\t\t".'<div style="height: '.($this->mHeights*1.25+2).'px;">'
+					. $sk->makeKnownLinkObj( $nt, htmlspecialchars( $nt->getText() ) ) . '</div>';
+			} elseif( !( $thumb = $img->transform( $params ) ) ) {
+				# Error generating thumbnail.
+				$thumbhtml = "\n\t\t\t".'<div style="height: '.($this->mHeights*1.25+2).'px;">'
+					. htmlspecialchars( $img->getLastError() ) . '</div>';
+			} else {
+				$vpad = floor( ( 1.25*$this->mHeights - $thumb->height ) /2 ) - 2;
+				$thumbhtml = "\n\t\t\t".'<div class="thumb" style="padding: ' . $vpad . 'px 0; width: '.($this->mWidths+30).'px;">'
+					. $sk->makeKnownLinkObj( $nt, $thumb->toHtml() ) . '</div>';
 			}
 
 			//TODO
 			//$ul = $sk->makeLink( $wgContLang->getNsText( Namespace::getUser() ) . ":{$ut}", $ut );
 
 			if( $this->mShowBytes ) {
-				if( $img->exists() ) {
-					$nb = wfMsgHtml( 'nbytes', $wgLang->formatNum( $img->getSize() ) );
+				if( $img ) {
+					$nb = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'),
+						$wgLang->formatNum( $img->getSize() ) );
 				} else {
 					$nb = wfMsgHtml( 'filemissing' );
 				}
@@ -125,28 +246,59 @@ class ImageGallery
 				$sk->makeKnownLinkObj( $nt, htmlspecialchars( $wgLang->truncate( $nt->getText(), 20, '...' ) ) ) . "<br />\n" :
 				'' ;
 
-			$s .= ($i%4==0) ? '<tr>' : '';
-			$thumb = $img->getThumbnail( 120, 120 );
-			$vpad = floor( ( 150 - $thumb->height ) /2 ) - 2;
-			$s .= '<td><div class="gallerybox">' . '<div class="thumb" style="padding: ' . $vpad . 'px 0;">';
-
 			# ATTENTION: The newline after <div class="gallerytext"> is needed to accommodate htmltidy which
 			# in version 4.8.6 generated crackpot html in its absence, see:
 			# http://bugzilla.wikimedia.org/show_bug.cgi?id=1765 -Ævar
-			$s .= $sk->makeKnownLinkObj( $nt, $thumb->toHtml() ) . '</div><div class="gallerytext">' . "\n" .
-				$textlink . $text . $nb .
-				'</div>';
-			$s .= "</div></td>\n";
-			$s .= ($i%4==3) ? '</tr>' : '';
-			$i++;
+
+			if ( $i % $this->mPerRow == 0 ) {
+				$s .= "\n\t<tr>";
+			}
+			$s .=
+				"\n\t\t" . '<td><div class="gallerybox" style="width: '.($this->mWidths*1.25).'px;">'
+					. $thumbhtml
+					. "\n\t\t\t" . '<div class="gallerytext">' . "\n"
+						. $textlink . $text . $nb
+					. "\n\t\t\t</div>"
+				. "\n\t\t</div></td>";
+			if ( $i % $this->mPerRow == $this->mPerRow - 1 ) {
+				$s .= "\n\t</tr>";
+			}
+			++$i;
 		}
-		if( $i %4 != 0 ) {
-			$s .= "</tr>\n";
+		if( $i % $this->mPerRow != 0 ) {
+			$s .= "\n\t</tr>";
 		}
-		$s .= '</table>';
+		$s .= "\n</table>";
 
 		return $s;
 	}
 
+	/**
+	 * @return int Number of images in the gallery
+	 */
+	public function count() {
+		return count( $this->mImages );
+	}
+	
+	/**
+	 * Set the contextual title
+	 *
+	 * @param Title $title Contextual title
+	 */
+	public function setContextTitle( $title ) {
+		$this->contextTitle = $title;
+	}
+	
+	/**
+	 * Get the contextual title, if applicable
+	 *
+	 * @return mixed Title or false
+	 */
+	public function getContextTitle() {
+		return is_object( $this->contextTitle ) && $this->contextTitle instanceof Title
+				? $this->contextTitle
+				: false;
+	}
+
 } //class
 ?>