X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FImageGallery.php;h=d391ead60e3edf115f9bb854765074ebb371b8c4;hb=a86ae844e648c31ad7216738d4914802c0e60c07;hp=64fa9cb269f2ae8f47ef069f88b795e8cd183fca;hpb=260cc188fa13f4ce81f47f585e64121739b2cad3;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php index 64fa9cb269..d391ead60e 100644 --- a/includes/ImageGallery.php +++ b/includes/ImageGallery.php @@ -1,6 +1,24 @@ mImages = array(); - $this->mShowBytes = $wgGalleryShowBytes; + $this->mShowBytes = $wgGalleryOptions['showBytes']; $this->mShowFilename = true; $this->mParser = false; $this->mHideBadImages = false; - $this->mPerRow = $wgGalleryImagesPerRow; - $this->mWidths = $wgGalleryImageWidth; - $this->mHeights = $wgGalleryImageHeight; - $this->mCaptionLength = $wgGalleryCaptionLength; + $this->mPerRow = $wgGalleryOptions['imagesPerRow']; + $this->mWidths = $wgGalleryOptions['imageWidth']; + $this->mHeights = $wgGalleryOptions['imageHeight']; + $this->mCaptionLength = $wgGalleryOptions['captionLength']; } /** * Register a parser object + * + * @param $parser Parser */ function setParser( $parser ) { $this->mParser = $parser; @@ -67,7 +93,7 @@ class ImageGallery /** * Set the caption (as plain text) * - * @param $caption Caption + * @param $caption string Caption */ function setCaption( $caption ) { $this->mCaption = htmlspecialchars( $caption ); @@ -76,7 +102,7 @@ class ImageGallery /** * Set the caption (as HTML) * - * @param $caption Caption + * @param $caption String: Caption */ public function setCaptionHtml( $caption ) { $this->mCaption = $caption; @@ -85,10 +111,11 @@ class ImageGallery /** * Set how many images will be displayed per row. * - * @param $num Integer > 0; invalid numbers will be rejected + * @param $num Integer >= 0; If perrow=0 the gallery layout will adapt to screensize + * invalid numbers will be rejected */ public function setPerRow( $num ) { - if ($num > 0) { + if ( $num >= 0 ) { $this->mPerRow = (int)$num; } } @@ -99,7 +126,7 @@ class ImageGallery * @param $num Integer > 0; invalid numbers will be ignored */ public function setWidths( $num ) { - if ($num > 0) { + if ( $num > 0 ) { $this->mWidths = (int)$num; } } @@ -110,7 +137,7 @@ class ImageGallery * @param $num Integer > 0; invalid numbers will be ignored */ public function setHeights( $num ) { - if ($num > 0) { + if ( $num > 0 ) { $this->mHeights = (int)$num; } } @@ -119,58 +146,48 @@ class ImageGallery * Instruct the class to use a specific skin for rendering * * @param $skin Skin object + * @deprecated since 1.18 Not used anymore */ 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; + wfDeprecated( __METHOD__, '1.18' ); + /* no op */ } /** * Add an image to 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. + * @param $html String: Additional HTML text to be shown. The name and size of the image are always shown. + * @param $alt String: Alt text for the image + * @param $link String: Override image link (optional) */ - function add( $title, $html='' ) { + function add( $title, $html = '', $alt = '', $link = '') { if ( $title instanceof File ) { // Old calling convention $title = $title->getTitle(); } - $this->mImages[] = array( $title, $html ); - wfDebug( "ImageGallery::add " . $title->getText() . "\n" ); + $this->mImages[] = array( $title, $html, $alt, $link ); + wfDebug( 'ImageGallery::add ' . $title->getText() . "\n" ); } /** - * 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='' ) { + * 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. + * @param $alt String: Alt text for the image + */ + function insert( $title, $html = '', $alt = '' ) { if ( $title instanceof File ) { // Old calling convention $title = $title->getTitle(); } - array_unshift( $this->mImages, array( &$title, $html ) ); + array_unshift( $this->mImages, array( &$title, $html, $alt ) ); } - /** * isEmpty() returns true if the gallery contains no images + * @return bool */ function isEmpty() { return empty( $this->mImages ); @@ -183,7 +200,7 @@ class ImageGallery * @param $f Boolean: set to false to disable. */ function setShowBytes( $f ) { - $this->mShowBytes = ( $f == true); + $this->mShowBytes = (bool)$f; } /** @@ -193,12 +210,12 @@ class ImageGallery * @param $f Boolean: set to false to disable. */ function setShowFilename( $f ) { - $this->mShowFilename = ( $f == true); + $this->mShowFilename = (bool)$f; } /** * Set arbitrary attributes to go on the HTML gallery output element. - * Should be suitable for a <table> element. + * Should be suitable for a "; - return $s; + return $output; } /** @@ -367,8 +399,8 @@ class ImageGallery */ public function getContextTitle() { return is_object( $this->contextTitle ) && $this->contextTitle instanceof Title - ? $this->contextTitle - : false; + ? $this->contextTitle + : false; } } //class