* Rollback should not work if the wiki is read-only

[lhc/web/wiklou.git] / includes / ImageGallery.php

diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index 8d7c36d..46ecd16 100644 (file)
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -20,9 +20,14 @@ class ImageGallery
        var $mRevisionId = 0;
 
        /**
-        * Is the gallery on a wiki page (i.e. not a special page)
+        * Hide blacklisted images?
         */
-       var $mParsing;
+       var $mHideBadImages;
+
+       /**
+        * Registered parser object for output callbacks
+        */
+       var $mParser;
 
        /**
         * Contextual title, used when images are being screened
@@ -42,14 +47,22 @@ class ImageGallery
                $this->mImages = array();
                $this->mShowBytes = true;
                $this->mShowFilename = true;
-               $this->mParsing = false;
+               $this->mParser = false;
+               $this->mHideBadImages = false;
        }
 
        /**
-        * Set the "parse" bit so we know to hide "bad" images
+        * Register a parser object
         */
-       function setParsing( $val = true ) {
-               $this->mParsing = $val;
+       function setParser( $parser ) {
+               $this->mParser = $parser;
+       }
+
+       /**
+        * Set bad image flag
+        */
+       function setHideBadImages( $flag = true ) {
+               $this->mHideBadImages = $flag;
        }
 
        /**
@@ -238,7 +251,7 @@ class ImageGallery
                                # We're dealing with a non-image, spit out the name and be done with it.
                                $thumbhtml = "\n\t\t\t".'<div style="height: '.($this->mHeights*1.25+2).'px;">'
                                        . htmlspecialchars( $nt->getText() ) . '</div>';
-                       } elseif( $this->mParsing && wfIsBadImage( $nt->getDBkey(), $this->getContextTitle() ) ) {
+                       } elseif( $this->mHideBadImages && wfIsBadImage( $nt->getDBkey(), $this->getContextTitle() ) ) {
                                # The image is blacklisted, just show it as a text link.
                                $thumbhtml = "\n\t\t\t".'<div style="height: '.($this->mHeights*1.25+2).'px;">'
                                        . $sk->makeKnownLinkObj( $nt, htmlspecialchars( $nt->getText() ) ) . '</div>';
@@ -248,8 +261,19 @@ class ImageGallery
                                        . htmlspecialchars( $img->getLastError() ) . '</div>';
                        } else {
                                $vpad = floor( ( 1.25*$this->mHeights - $thumb->height ) /2 ) - 2;
-                               $thumbhtml = "\n\t\t\t".'<div class="thumb" style="padding: ' . $vpad . 'px 0; width: '.($this->mWidths+30).'px;">'
-                                       . $sk->makeKnownLinkObj( $nt, $thumb->toHtml() ) . '</div>';
+                                       
+                               $thumbhtml = "\n\t\t\t".
+                                       '<div class="thumb" style="padding: ' . $vpad . 'px 0; width: ' .($this->mWidths+30).'px;">'
+                                       # Auto-margin centering for block-level elements. Needed now that we have video
+                                       # handlers since they may emit block-level elements as opposed to simple <img> tags.
+                                       # ref http://css-discuss.incutio.com/?page=CenteringBlockElement
+                                       . '<div style="margin-left: auto; margin-right: auto; width: ' .$this->mWidths.'px;">'
+                                       . $thumb->toHtml( array( 'desc-link' => true ) ) . '</div></div>';
+
+                               // Call parser transform hook
+                               if ( $this->mParser && $img->getHandler() ) {
+                                       $img->getHandler()->parserTransformHook( $this->mParser, $img );
+                               }
                        }
 
                        //TODO
@@ -279,7 +303,7 @@ class ImageGallery
                                $s .= "\n\t<tr>";
                        }
                        $s .=
-                               "\n\t\t" . '<td><div class="gallerybox" style="width: '.($this->mWidths*1.25).'px;">'
+                               "\n\t\t" . '<td><div class="gallerybox" style="width: '.($this->mWidths+35).'px;">'
                                        . $thumbhtml
                                        . "\n\t\t\t" . '<div class="gallerytext">' . "\n"
                                                . $textlink . $text . $nb
@@ -327,3 +351,4 @@ class ImageGallery
 
 } //class
 
+