X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FImageGallery.php;h=86bf786d33a1cba20cbca97bd0378ac27b04bf46;hb=3de6fd8c819d21bb3814a6f97d429c1912f5c048;hp=b652e491315ea237eed1f960e4669259d50ee0df;hpb=e34d357e9da096a9a98ee5988cf49e3af2b35aa5;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php index b652e49131..86bf786d33 100644 --- a/includes/ImageGallery.php +++ b/includes/ImageGallery.php @@ -1,47 +1,152 @@ - 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 $text Additional 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, $text='' ) { - $this->mImages[] = array( &$image, $text ); + function add( $image, $html='' ) { + $this->mImages[] = array( &$image, $html ); + wfDebug( "ImageGallery::add " . $image->getName() . "\n" ); } /** - * isEmpty() returns false iff the gallery doesn't contain any images + * Add an image at the beginning of the gallery. + * + * @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 ) ); + } + + + /** + * isEmpty() returns true if the gallery contains no images */ function isEmpty() { return empty( $this->mImages ); @@ -50,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); @@ -60,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); @@ -69,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 @@ -78,80 +183,111 @@ class ImageGallery * */ function toHTML() { - global $wgLang, $wgContLang, $wgUser; + global $wgLang, $wgGenerateThumbnailOnParse; + + $sk = $this->getSkin(); - $sk = $wgUser->getSkin(); + $s = ''; + if( $this->mCaption ) + $s .= "\n\t"; - $s = '
{$this->mCaption}
'; $i = 0; foreach ( $this->mImages as $pair ) { $img =& $pair[0]; $text = $pair[1]; - $name = $img->getName(); $nt = $img->getTitle(); + 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 //$ul = $sk->makeLink( $wgContLang->getNsText( Namespace::getUser() ) . ":{$ut}", $ut ); - $nb = $this->mShowBytes ? - wfMsg( "nbytes", $wgLang->formatNum( $img->getSize() ) ) . '
' : - '' ; + if( $this->mShowBytes ) { + if( $img->exists() ) { + $nb = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'), + $wgLang->formatNum( $img->getSize() ) ); + } else { + $nb = wfMsgHtml( 'filemissing' ); + } + $nb = "$nb
\n"; + } else { + $nb = ''; + } + $textlink = $this->mShowFilename ? - $sk->makeKnownLinkObj( $nt, Language::truncate( $nt->getText(), 20, '...' ) ) . '
' : + $sk->makeKnownLinkObj( $nt, htmlspecialchars( $wgLang->truncate( $nt->getText(), 20, '...' ) ) ) . "
\n" : '' ; - $s .= ($i%4==0) ? '' : ''; - $s .= '' . (($i%4==3) ? '' : ''); + # 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 - $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 % $this->mPerRow != 0 ) { + $s .= "\n\t"; } - $s .= '
' . - ''. - '
' . - $sk->makeKnownLinkObj( $nt, '' ) . '
' . - $textlink . $text . $nb; - - $s .= '
' + . $thumbhtml + . "\n\t\t\t" . '
' . "\n" + . $textlink . $text . $nb + . "\n\t\t\t
" + . "\n\t\t
'; + $s .= "\n"; return $s; } /** - * Transparently generates an image gallery from a text with one line per image. - * text labels may be given by using |-style alternative text. E.g. - * Image:one.jpg|The number "1" - * Image:tree.jpg|A tree - * given as text will return a gallery with two images, labeled 'The number "1"' and - * 'A tree'. - */ - function newFromTextList( $text ) { - $ig = new ImageGallery(); - $ig->setShowBytes( false ); - $ig->setShowFilename( false ); - $lines = explode( "\n", $text ); - foreach ( $lines as $line ) { - preg_match( "/^([^|]+)(\\|(.*))?$/", $line, $matches ); - # Skip empty lines - if ( count( $matches ) == 0 ) { - continue; - } - $nt = Title::newFromURL( $matches[1] ); - if ( isset( $matches[3] ) ) { - $label = $matches[3]; - } else { - $label = ''; - } - $ig->add( Image::newFromTitle( $nt ), $label ); - } - return $ig; + * @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 - - - - -} // defined( 'MEDIAWIKI' ) ?>