X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FImageGallery.php;h=46ecd16959cf37c3c0ac35bf48237db2ed3dd21d;hb=2cdff4cf67b77a3a7bb54c656a05bfe8a529ae3d;hp=44177d62a8f0f80736c103f261d001469dc468e5;hpb=e6bb9de12b4ca0ee0d2d33cebf610fb2a274b484;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php index 44177d62a8..46ecd16959 100644 --- a/includes/ImageGallery.php +++ b/includes/ImageGallery.php @@ -1,46 +1,177 @@ mImages = array(); $this->mShowBytes = true; $this->mShowFilename = true; + $this->mParser = false; + $this->mHideBadImages = false; + } + + /** + * Register a parser object + */ + function setParser( $parser ) { + $this->mParser = $parser; + } + + /** + * Set bad image flag + */ + function setHideBadImages( $flag = true ) { + $this->mHideBadImages = $flag; + } + + /** + * 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" ); } /** - * isEmpty() returns false iff the gallery doesn't contain any images + * Add an image at the beginning of the gallery. + * + * @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( $title, $html='' ) { + if ( $title instanceof File ) { + // Old calling convention + $title = $title->getTitle(); + } + array_unshift( $this->mImages, array( &$title, $html ) ); + } + + + /** + * isEmpty() returns true if the gallery contains no images */ function isEmpty() { return empty( $this->mImages ); @@ -49,8 +180,8 @@ 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); @@ -59,16 +190,29 @@ 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); } + + /** + * Set arbitrary attributes to go on the HTML gallery output element. + * Should be suitable for a <table> element. + * + * Note -- if taking from user input, you should probably run through + * Sanitizer::validateAttributes() first. + * + * @param array of HTML attribute pairs + */ + function setAttributes( $attribs ) { + $this->mAttribs = $attribs; + } /** * Return a HTML representation of the image gallery - * + * * For each image in the gallery, display * - a thumbnail * - the image name @@ -77,70 +221,134 @@ class ImageGallery * */ function toHTML() { - global $wgLang, $wgContLang, $wgUser; + global $wgLang; + + $sk = $this->getSkin(); - $sk = $wgUser->getSkin(); + $attribs = Sanitizer::mergeAttributes( + array( + 'class' => 'gallery', + 'cellspacing' => '0', + 'cellpadding' => '0' ), + $this->mAttribs ); + $s = Xml::openElement( 'table', $attribs ); + if( $this->mCaption ) + $s .= "\n\t
' . - htmlspecialchars( $nt->getText() ) . ' | ' . (($i%4==3) ? "\n" : ''); - $i++; + 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".'|
' .
- '
| \n" . (($i%4==3) ? "|
'
+ . $thumbhtml
+ . "\n\t\t\t" . ' ' . "\n"
+ . $textlink . $text . $nb
+ . "\n\t\t\t "
+ . "\n\t\t | ";
+ if ( $i % $this->mPerRow == $this->mPerRow - 1 ) {
+ $s .= "\n\t