X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FImageGallery.php;h=86bf786d33a1cba20cbca97bd0378ac27b04bf46;hb=3de6fd8c819d21bb3814a6f97d429c1912f5c048;hp=34529b21761518c69cd2e73ec8c98fe1cdbcad00;hpb=2af231d5dcda65603c1bf2e8c6561440fb99b62e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php index 34529b2176..86bf786d33 100644 --- a/includes/ImageGallery.php +++ b/includes/ImageGallery.php @@ -1,49 +1,144 @@ 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 $image Image object 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" ); } /** * 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 $image Image object 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 ) ); @@ -60,8 +155,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); @@ -70,8 +165,8 @@ 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); @@ -79,7 +174,7 @@ class ImageGallery /** * Return a HTML representation of the image gallery - * + * * For each image in the gallery, display * - a thumbnail * - the image name @@ -88,27 +183,37 @@ class ImageGallery * */ function toHTML() { - global $wgLang, $wgUser; + global $wgLang, $wgGenerateThumbnailOnParse; - $sk = $wgUser->getSkin(); + $sk = $this->getSkin(); $s = ''; + if( $this->mCaption ) + $s .= "\n\t"; + $i = 0; foreach ( $this->mImages as $pair ) { $img =& $pair[0]; $text = $pair[1]; - $name = $img->getName(); $nt = $img->getTitle(); - // Not an image. Just print the name and skip. - if ( $nt->getNamespace() != NS_IMAGE ) { - $s .= '' . (($i%4==3) ? "\n" : ''); - $i++; - var_dump( $nt ); - - continue; + if( $nt->getNamespace() != NS_IMAGE ) { + # We're dealing with a non-image, spit out the name and be done with it. + $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 = "\n\t\t\t".'
' + . $sk->makeKnownLinkObj( $nt, htmlspecialchars( $nt->getText() ) ) . '
'; + } elseif( !( $thumb = $img->getThumbnail( $this->mWidths, $this->mHeights, $wgGenerateThumbnailOnParse ) ) ) { + # Error generating thumbnail. + $thumbhtml = "\n\t\t\t".'
' + . htmlspecialchars( $img->getLastError() ) . '
'; + } else { + $vpad = floor( ( 1.25*$this->mHeights - $thumb->height ) /2 ) - 2; + $thumbhtml = "\n\t\t\t".'
' + . $sk->makeKnownLinkObj( $nt, $thumb->toHtml() ) . '
'; } //TODO @@ -116,7 +221,8 @@ class ImageGallery if( $this->mShowBytes ) { if( $img->exists() ) { - $nb = wfMsgHtml( 'nbytes', $wgLang->formatNum( $img->getSize() ) ); + $nb = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'), + $wgLang->formatNum( $img->getSize() ) ); } else { $nb = wfMsgHtml( 'filemissing' ); } @@ -124,38 +230,64 @@ class ImageGallery } else { $nb = ''; } - + $textlink = $this->mShowFilename ? $sk->makeKnownLinkObj( $nt, htmlspecialchars( $wgLang->truncate( $nt->getText(), 20, '...' ) ) ) . "
\n" : '' ; - $s .= ($i%4==0) ? '' : ''; - $thumb = $img->getThumbnail( 120, 120 ); - $vpad = floor( ( 150 - $thumb->height ) /2 ) - 2; - $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}
' . - htmlspecialchars( $nt->getText() ) . '
' . '
'; - # ATTENTION: The newline after
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() ) . '
' . "\n" . - $textlink . $text . $nb . - '
'; - $s .= "
' + . $thumbhtml + . "\n\t\t\t" . '
' . "\n" + . $textlink . $text . $nb + . "\n\t\t\t
" + . "\n\t\t
'; + $s .= "\n"; return $s; } -} //class - - - + /** + * @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; + } -} // defined( 'MEDIAWIKI' ) +} //class ?>