X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FImageGallery.php;h=6045ad682a16207d44f3f3955512ecec4d077dca;hb=4331d13d8701cbd0217ecbe593df100b81693ef2;hp=09cbd079285580a17f3d72dfe67ebcd76909fd18;hpb=f88c771756c580442fe7ca2f84bcbb8067b77f57;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php index 09cbd07928..6045ad682a 100644 --- a/includes/ImageGallery.php +++ b/includes/ImageGallery.php @@ -10,24 +10,29 @@ if ( ! defined( 'MEDIAWIKI' ) ) * * Add images to the gallery using add(), then render that list to HTML using toHTML(). * + * @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. */ @@ -44,7 +49,7 @@ class ImageGallery function setParsing( $val = true ) { $this->mParsing = $val; } - + /** * Set the caption (as plain text) * @@ -53,16 +58,49 @@ class ImageGallery function setCaption( $caption ) { $this->mCaption = htmlspecialchars( $caption ); } - + /** * Set the caption (as HTML) * * @param $caption Caption */ - function setCaptionHtml( $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 * @@ -71,7 +109,7 @@ class ImageGallery function useSkin( $skin ) { $this->mSkin = $skin; } - + /** * Return the skin that should be used * @@ -90,22 +128,26 @@ class ImageGallery /** * Add an image to the gallery. * - * @param $image Image object that is added 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. */ - function add( $image, $html='' ) { - $this->mImages[] = array( &$image, $html ); - wfDebug( "ImageGallery::add " . $image->getName() . "\n" ); + 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 object that is added 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. */ - function insert( $image, $html='' ) { - array_unshift( $this->mImages, array( &$image, $html ) ); + function insert( $title, $html='' ) { + array_unshift( $this->mImages, array( &$title, $html ) ); } @@ -147,35 +189,41 @@ class ImageGallery * */ function toHTML() { - global $wgLang, $wgGenerateThumbnailOnParse; + global $wgLang; $sk = $this->getSkin(); $s = ''; if( $this->mCaption ) - $s .= ''; - + $s .= "\n\t"; + + $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 ) ); - $nt = $img->getTitle(); + $img = wfFindFile( $nt, $time ); - if( $nt->getNamespace() != NS_IMAGE ) { + if( $nt->getNamespace() != NS_IMAGE || !$img ) { # We're dealing with a non-image, spit out the name and be done with it. - $thumbhtml = '
' . htmlspecialchars( $nt->getText() ) . '
'; + $thumbhtml = "\n\t\t\t".'
' + . htmlspecialchars( $nt->getText() ) . '
'; } elseif( $this->mParsing && wfIsBadImage( $nt->getDBkey(), $this->getContextTitle() ) ) { # The image is blacklisted, just show it as a text link. - $thumbhtml = '
' + $thumbhtml = "\n\t\t\t".'
' . $sk->makeKnownLinkObj( $nt, htmlspecialchars( $nt->getText() ) ) . '
'; - } else if( !( $thumb = $img->getThumbnail( 120, 120, $wgGenerateThumbnailOnParse ) ) ) { + } elseif( !( $thumb = $img->transform( $params ) ) ) { # Error generating thumbnail. - $thumbhtml = '
' + $thumbhtml = "\n\t\t\t".'
' . htmlspecialchars( $img->getLastError() ) . '
'; } else { - $vpad = floor( ( 150 - $thumb->height ) /2 ) - 2; - $thumbhtml = '
' + $vpad = floor( ( 1.25*$this->mHeights - $thumb->height ) /2 ) - 2; + $thumbhtml = "\n\t\t\t".'
' . $sk->makeKnownLinkObj( $nt, $thumb->toHtml() ) . '
'; } @@ -183,7 +231,7 @@ class ImageGallery //$ul = $sk->makeLink( $wgContLang->getNsText( Namespace::getUser() ) . ":{$ut}", $ut ); if( $this->mShowBytes ) { - if( $img->exists() ) { + if( $img ) { $nb = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'), $wgLang->formatNum( $img->getSize() ) ); } else { @@ -202,21 +250,29 @@ class ImageGallery # in version 4.8.6 generated crackpot html in its absence, see: # http://bugzilla.wikimedia.org/show_bug.cgi?id=1765 -Ævar - $s .= ($i%4==0) ? '
' : ''; - $s .= '\n"; - $s .= ($i%4==3) ? '' : ''; - $i++; + if ( $i % $this->mPerRow == 0 ) { + $s .= "\n\t"; + } + $s .= + "\n\t\t" . '"; + if ( $i % $this->mPerRow == $this->mPerRow - 1 ) { + $s .= "\n\t"; + } + ++$i; } - if( $i %4 != 0 ) { - $s .= "\n"; + if( $i % $this->mPerRow != 0 ) { + $s .= "\n\t"; } - $s .= '
' . $this->mCaption . '
{$this->mCaption}
' . $thumbhtml - . '
' . "\n" . $textlink . $text . $nb - . "
' + . $thumbhtml + . "\n\t\t\t" . '
' . "\n" + . $textlink . $text . $nb + . "\n\t\t\t
" + . "\n\t\t
'; + $s .= "\n"; return $s; } - + /** * @return int Number of images in the gallery */