Use Language::truncate()

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

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 286201d..b1a03a7 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -71,11 +71,11 @@ class ImagePage extends Article {
        function showTOC( $metadata ) {
                global $wgLang;
                $r = '<ul id="filetoc">
-                       <li><a href="#file">' . $wgLang->getNsText( NS_IMAGE ) . '</a></li>
+                       <li><a href="#file">' . $wgLang->getNsText( NS_IMAGE ) . '</a></li>' .
+                       ($metadata ? '<li><a href="#metadata">' . wfMsg( 'metadata' ) . '</a></li>' : '') . '
                        <li><a href="#filehistory">' . wfMsg( 'imghistory' ) . '</a></li>
-                       <li><a href="#filelinks">' . wfMsg( 'imagelinks' ) . '</a></li>' .
-                       ($metadata ? '<li><a href="#metadata">' . wfMsg( 'metadata' ) . '</a></li>' : '') .
-               '</ul>';
+                       <li><a href="#filelinks">' . wfMsg( 'imagelinks' ) . '</a></li>
+               </ul>';
                return $r;
        }
 
@@ -91,13 +91,28 @@ class ImagePage extends Article {
                $r = "{| class=metadata align=right width=250px\n";
                $r .= '|+ id=metadata | '. htmlspecialchars( wfMsg( 'metadata' ) ) . "\n";
                foreach( $exif as $k => $v ) {
-                       $r .= '!' . wfMsg( 'exif-' . strtolower( $k ) ) . "\n";
-                       $r .= '|' . htmlspecialchars( $v ) . "\n";
+                       $tag = strtolower( $k );
+                       $r .= "! class=$tag |" . wfMsg( "exif-$tag" ) . "\n";
+                       $r .= "| class=$tag |" . htmlspecialchars( $v ) . "\n";
                        $r .= "|-\n";
                }
                return substr($r, 0, -3) . '|}';
        }
 
+       /**
+        * Overloading Article's getContent method.
+        * Omit noarticletext if sharedupload 
+        *
+        * @param $noredir If true, do not follow redirects
+        */
+       function getContent( $noredir )
+       {
+               if ( $this->img && $this->img->fromSharedDirectory && 0 == $this->getID() ) {
+                       return '';
+               }
+               return Article::getContent( $noredir );
+       }
+
        function openShowImage()
        {
                global $wgOut, $wgUser, $wgImageLimits, $wgRequest, 
@@ -121,10 +136,14 @@ class ImagePage extends Article {
                $sk = $wgUser->getSkin();
 
                if ( $this->img->exists() ) {
-                       if ( $this->img->getType() ) {
+                       # image
+                       $width = $this->img->getWidth();
+                       $height = $this->img->getHeight();
+                       $showLink = false;
+                       
+                       if ( $this->img->allowInlineDisplay() and $width and $height) { 
                                # image
-                               $width = $this->img->getWidth();
-                               $height = $this->img->getHeight();
+                               
                                # "Download high res version" link below the image
                                $msg = wfMsg('showbigimage', $width, $height, intval( $this->img->getSize()/1024 ) );
                                if ( $width > $maxWidth ) {
@@ -135,10 +154,15 @@ class ImagePage extends Article {
                                        $width = floor( $width * $maxHeight / $height );
                                        $height = $maxHeight;
                                }
-                               if ( $width != $this->img->getWidth() || $height != $this->img->getHeight() ) {
+                               if ( !$this->img->mustRender() 
+                                  && ( $width != $this->img->getWidth() || $height != $this->img->getHeight() ) ) {
                                        if( $wgUseImageResize ) {
                                                $thumbnail = $this->img->getThumbnail( $width );
-                                               $url = $thumbnail->getUrl();
+                                               if ( $thumbnail == null ) {
+                                                       $url = $full_url;
+                                               } else {
+                                                       $url = $thumbnail->getUrl();
+                                               }
                                        } else {
                                                # No resize ability? Show the full image, but scale
                                                # it down in the browser so it fits on the page.
@@ -148,14 +172,57 @@ class ImagePage extends Article {
                                        $anchorclose = "</a><br />\n$anchoropen{$msg}</a>";
                                } else {
                                        $url = $full_url;
+                                       $showLink = $this->img->mustRender();
                                }
-                               $s = '<div class="fullImageLink" id="file">' . $anchoropen .
+                               $wgOut->addHTML( '<div class="fullImageLink" id="file">' . $anchoropen .
                                     "<img border=\"0\" src=\"{$url}\" width=\"{$width}\" height=\"{$height}\" alt=\"" .
-                                    htmlspecialchars( $wgRequest->getVal( 'image' ) ).'" />' . $anchorclose . '</div>';
+                                    htmlspecialchars( $wgRequest->getVal( 'image' ) ).'" />' . $anchorclose . '</div>' );
                        } else {
-                               $s = "<div class=\"fullMedia\">" . $sk->makeMediaLink( $this->img->getName(),'' ) . '</div>';
+                               #if direct link is allowed but it's not a renderable image, show an icon.
+                               if ($this->img->isSafeFile()) {
+                                       $icon= $this->img->iconThumb();
+       
+                                       $wgOut->addHTML( '<div class="fullImageLink" id="file"><a href="' . $full_url . '">' .
+                                       $icon->toHtml() .
+                                       '</a></div>' );
+                               }
+                       
+                               $showLink = true;
                        }
-                       $wgOut->addHTML( $s );
+                       
+                       
+                       if ($showLink) {
+                               $s= $sk->makeMediaLink( $this->img->getName(), '', '', true );
+                               $info= wfMsg( 'fileinfo', ceil($this->img->getSize()/1024.0), $this->img->getMimeType() );
+                       
+                               if (!$this->img->isSafeFile()) {
+                                       $wgOut->addHTML("<div class=\"fullMedia\">");
+                                       $wgOut->addHTML("<span class=\"dangerousLink\">");
+                                       $wgOut->addHTML($s);
+                                       $wgOut->addHTML("</span>");
+                                       
+                                       $wgOut->addHTML("<span class=\"fileInfo\"> (");
+                                       $wgOut->addWikiText( $info, false );
+                                       $wgOut->addHTML(")</span>");
+                                       $wgOut->addHTML("</div>");
+                                       
+                                       #this should be formated a little nicer. Is CSS sufficient?
+                                       $wgOut->addHTML("<div class=\"mediaWarning\">");
+                                       $wgOut->addWikiText( wfMsg( 'mediawarning' ) );
+                                       $wgOut->addHTML('</div>');
+                                        
+                               } else {
+                                       $wgOut->addHTML("<div class=\"fullMedia\">");
+                                       $wgOut->addHTML($s);
+                                       
+                                       $wgOut->addHTML("<span class=\"fileInfo\"> (");
+                                       $wgOut->addWikiText( $info, false );
+                                       $wgOut->addHTML(")</span>");
+                                       
+                                       $wgOut->addHTML("</div>");
+                               }
+                       }
+                       
                        if($this->img->fromSharedDirectory) {
                                $sharedtext="<div class=\"sharedUploadNotice\">" . wfMsg("sharedupload");
                                if($wgRepositoryBaseUrl) {