]> scripts.mit.edu Git - autoinstallsdev/mediawiki.git/blobdiff - includes/ImagePage.php
MediaWiki 1.16.0
[autoinstallsdev/mediawiki.git] / includes / ImagePage.php
index b6524e191107b951b70c260e8b99881c39a53145..dd2c2ab1fcb530967a8431a76a6653adffed9921 100644 (file)
 <?php
-/**
- * @package MediaWiki
- */
 
-/**
- *
- */
 if( !defined( 'MEDIAWIKI' ) )
-       die();
-
-require_once( 'Image.php' );
+       die( 1 );
 
 /**
  * Special handling for image description pages
- * @package MediaWiki
+ *
+ * @ingroup Media
  */
 class ImagePage extends Article {
 
-       /* private */ var $img;  // Image object this page is shown for
+       /* private */ var $img;  // Image object
+       /* private */ var $displayImg;
+       /* private */ var $repo;
+       /* private */ var $fileLoaded;
        var $mExtraDescription = false;
+       var $dupes;
 
-       function render() {
-               global $wgOut;
-               $wgOut->setArticleBodyOnly(true);
-               $wgOut->addWikitext($this->getContent(true));
+       function __construct( $title ) {
+               parent::__construct( $title );
+               $this->dupes = null;
+               $this->repo = null;
+       }
+       
+       public function setFile( $file ) {
+               $this->displayImg = $file;
+               $this->img = $file;
+               $this->fileLoaded = true;
        }
 
-       function view() {
-               global $wgUseExternalEditor, $wgOut, $wgShowEXIF;
-
-               $this->img = new Image( $this->mTitle );
-
-               if( $this->mTitle->getNamespace() == NS_IMAGE  ) {
-                       if ($wgShowEXIF && $this->img->exists()) {
-                               $exif = $this->img->getExifData();
-                               $showmeta = count($exif) ? true : false;
-                       } else {
-                               $exif = false;
-                               $showmeta = false;
+       protected function loadFile() {
+               if( $this->fileLoaded ) {
+                       return true;
+               }
+               $this->fileLoaded = true;
+
+               $this->displayImg = $this->img = false;
+               wfRunHooks( 'ImagePageFindFile', array( $this, &$this->img, &$this->displayImg ) );
+               if( !$this->img ) {
+                       $this->img = wfFindFile( $this->mTitle );
+                       if( !$this->img ) {
+                               $this->img = wfLocalFile( $this->mTitle );
                        }
+               }
+               if( !$this->displayImg ) {
+                       $this->displayImg = $this->img;
+               }
+               $this->repo = $this->img->getRepo();
+       }
 
-                       if ($this->img->exists())
-                               $wgOut->addHTML($this->showTOC($showmeta));
+       /**
+        * Handler for action=render
+        * Include body text only; none of the image extras
+        */
+       public function render() {
+               global $wgOut;
+               $wgOut->setArticleBodyOnly( true );
+               parent::view();
+       }
 
-                       $this->openShowImage();
-                       if ($exif)
-                               $wgOut->addWikiText($this->makeMetadataTable($exif));
+       public function view() {
+               global $wgOut, $wgShowEXIF, $wgRequest, $wgUser;
+               $this->loadFile();
 
-                       # No need to display noarticletext, we use our own message, output in openShowImage()
-                       if( $this->getID() ) {
-                               Article::view();
+               if( $this->mTitle->getNamespace() == NS_FILE && $this->img->getRedirected() ) {
+                       if( $this->mTitle->getDBkey() == $this->img->getName() ) {
+                               // mTitle is the same as the redirect target so ask Article
+                               // to perform the redirect for us.
+                               return Article::view();
                        } else {
-                               # Just need to set the right headers
-                               $wgOut->setArticleFlag( true );
-                               $wgOut->setRobotpolicy( 'index,follow' );
+                               // mTitle is not the same as the redirect target so it is 
+                               // probably the redirect page itself. Fake the redirect symbol
                                $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-                               $wgOut->addMetaTags();
+                               $wgOut->addHTML( $this->viewRedirect( Title::makeTitle( NS_FILE, $this->img->getName() ),
+                                       /* $appendSubtitle */ true, /* $forceKnown */ true ) );
                                $this->viewUpdates();
+                               return;
                        }
+               }
 
-                       if ($this->mExtraDescription) {
-                               $fol = wfMsg('shareddescriptionfollows');
-                               if ($fol != '-')
-                                       $wgOut->addWikiText(wfMsg('shareddescriptionfollows'));
-                               $wgOut->addHTML($this->mExtraDescription);
-                       }
+               $diff = $wgRequest->getVal( 'diff' );
+               $diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
+
+               if( $this->mTitle->getNamespace() != NS_FILE || ( isset( $diff ) && $diffOnly ) )
+                       return Article::view();
+                       
+               $this->showRedirectedFromHeader();
 
-                       $this->closeShowImage();
-                       $this->imageHistory();
-                       $this->imageLinks();
+               if( $wgShowEXIF && $this->displayImg->exists() ) {
+                       // FIXME: bad interface, see note on MediaHandler::formatMetadata().
+                       $formattedMetadata = $this->displayImg->formatMetadata();
+                       $showmeta = $formattedMetadata !== false;
                } else {
+                       $showmeta = false;
+               }
+
+               if( !$diff && $this->displayImg->exists() )
+                       $wgOut->addHTML( $this->showTOC($showmeta) );
+
+               if( !$diff )
+                       $this->openShowImage();
+
+               # No need to display noarticletext, we use our own message, output in openShowImage()
+               if( $this->getID() ) {
                        Article::view();
+               } else {
+                       # Just need to set the right headers
+                       $wgOut->setArticleFlag( true );
+                       $wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
+                       $this->viewUpdates();
                }
+
+               # Show shared description, if needed
+               if( $this->mExtraDescription ) {
+                       $fol = wfMsgNoTrans( 'shareddescriptionfollows' );
+                       if( $fol != '-' && !wfEmptyMsg( 'shareddescriptionfollows', $fol ) ) {
+                               $wgOut->addWikiText( $fol );
+                       }
+                       $wgOut->addHTML( '<div id="shared-image-desc">' . $this->mExtraDescription . "</div>\n" );
+               }
+
+               $this->closeShowImage();
+               $this->imageHistory();
+               // TODO: Cleanup the following
+               
+               $wgOut->addHTML( Xml::element( 'h2',
+                       array( 'id' => 'filelinks' ),
+                       wfMsg( 'imagelinks' ) ) . "\n" );
+               $this->imageDupes();
+               # TODO! FIXME! For some freaky reason, we can't redirect to foreign images.
+               # Yet we return metadata about the target. Definitely an issue in the FileRepo
+               $this->imageRedirects();
+               $this->imageLinks();
+               
+               # Allow extensions to add something after the image links
+               $html = '';
+               wfRunHooks( 'ImagePageAfterImageLinks', array( $this, &$html ) );
+               if ( $html)
+                       $wgOut->addHTML( $html );
+
+               if( $showmeta ) {
+                       global $wgStylePath, $wgStyleVersion;
+                       $expand = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-expand' ) ) );
+                       $collapse = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-collapse' ) ) );
+                       $wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ) . "\n" );
+                       $wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) );
+                       $wgOut->addScriptFile( 'metadata.js' );
+                       $wgOut->addHTML(
+                               "<script type=\"text/javascript\">attachMetadataToggle('mw_metadata', '$expand', '$collapse');</script>\n" );
+               }
+       }
+       
+       public function getRedirectTarget() {
+               $this->loadFile();
+               if( $this->img->isLocal() ) {
+                       return parent::getRedirectTarget();
+               }
+               // Foreign image page
+               $from = $this->img->getRedirected();
+               $to = $this->img->getName();
+               if( $from == $to ) {
+                       return null; 
+               }
+               return $this->mRedirectTarget = Title::makeTitle( NS_FILE, $to );
+       }
+       public function followRedirect() {
+               $this->loadFile();
+               if( $this->img->isLocal() ) {
+                       return parent::followRedirect();
+               }
+               $from = $this->img->getRedirected();
+               $to = $this->img->getName();
+               if( $from == $to ) {
+                       return false; 
+               }
+               return Title::makeTitle( NS_FILE, $to );        
+       }
+       public function isRedirect( $text = false ) {
+               $this->loadFile();
+               if( $this->img->isLocal() )
+                       return parent::isRedirect( $text );
+                       
+               return (bool)$this->img->getRedirected();
+       }
+       
+       public function isLocal() {
+               $this->loadFile();
+               return $this->img->isLocal();
+       }
+       
+       public function getFile() {
+               $this->loadFile();
+               return $this->img;
+       }
+       
+       public function getDisplayedFile() {
+               $this->loadFile();
+               return $this->displayImg;
        }
+       
+       public function getDuplicates() {
+               $this->loadFile();
+               if( !is_null($this->dupes) ) {
+                       return $this->dupes;
+               }
+               if( !( $hash = $this->img->getSha1() ) ) {
+                       return $this->dupes = array();
+               }
+               $dupes = RepoGroup::singleton()->findBySha1( $hash );
+               // Remove duplicates with self and non matching file sizes
+               $self = $this->img->getRepoName().':'.$this->img->getName();
+               $size = $this->img->getSize();
+               foreach ( $dupes as $index => $file ) {
+                       $key = $file->getRepoName().':'.$file->getName();
+                       if( $key == $self )
+                               unset( $dupes[$index] );
+                       if( $file->getSize() != $size )
+                               unset( $dupes[$index] );
+               }
+               return $this->dupes = $dupes;
+               
+       }
+       
 
        /**
         * Create the TOC
         *
-        * @access private
-        *
         * @param bool $metadata Whether or not to show the metadata link
         * @return string
         */
-       function showTOC( $metadata ) {
-               global $wgLang;
-               $r = '<ul id="filetoc">
-                       <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>
-               </ul>';
-               return $r;
+       protected function showTOC( $metadata ) {
+               $r = array(
+                               '<li><a href="#file">' . wfMsgHtml( 'file-anchor-link' ) . '</a></li>',
+                               '<li><a href="#filehistory">' . wfMsgHtml( 'filehist' ) . '</a></li>',
+                               '<li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . '</a></li>', 
+               );
+               if ( $metadata ) {
+                       $r[] = '<li><a href="#metadata">' . wfMsgHtml( 'metadata' ) . '</a></li>';
+               }
+       
+               wfRunHooks( 'ImagePageShowTOC', array( $this, &$r ) );
+               
+               return '<ul id="filetoc">' . implode( "\n", $r ) . '</ul>';
        }
 
        /**
         * Make a table with metadata to be shown in the output page.
         *
-        * @access private
+        * FIXME: bad interface, see note on MediaHandler::formatMetadata().
         *
         * @param array $exif The array containing the EXIF data
         * @return string
         */
-       function makeMetadataTable( $exif ) {
-               $r = "{| class=metadata align=right width=250px\n";
-               $r .= '|+ id=metadata | '. htmlspecialchars( wfMsg( 'metadata' ) ) . "\n";
-               foreach( $exif as $k => $v ) {
-                       $tag = strtolower( $k );
-                       $r .= "! class=$tag |" . wfMsg( "exif-$tag" ) . "\n";
-                       $r .= "| class=$tag |" . htmlspecialchars( $v ) . "\n";
-                       $r .= "|-\n";
+       protected function makeMetadataTable( $metadata ) {
+               $r = "<div class=\"mw-imagepage-section-metadata\">";
+               $r .= wfMsgNoTrans( 'metadata-help' );
+               $r .= "<table id=\"mw_metadata\" class=\"mw_metadata\">\n";
+               foreach ( $metadata as $type => $stuff ) {
+                       foreach ( $stuff as $v ) {
+                               # FIXME, why is this using escapeId for a class?!
+                               $class = Sanitizer::escapeId( $v['id'] );
+                               if( $type == 'collapsed' ) {
+                                       $class .= ' collapsable';
+                               }
+                               $r .= "<tr class=\"$class\">\n";
+                               $r .= "<th>{$v['name']}</th>\n";
+                               $r .= "<td>{$v['value']}</td>\n</tr>";
+                       }
                }
-               return substr($r, 0, -3) . '|}';
+               $r .= "</table>\n</div>\n";
+               return $r;
        }
 
        /**
         * Overloading Article's getContent method.
-        * Omit noarticletext if sharedupload
         *
-        * @param $noredir If true, do not follow redirects
+        * Omit noarticletext if sharedupload; text will be fetched from the
+        * shared upload server if possible.
         */
-       function getContent( $noredir )
-       {
-               if ( $this->img && $this->img->fromSharedDirectory && 0 == $this->getID() ) {
+       public function getContent() {
+               $this->loadFile();
+               if( $this->img && !$this->img->isLocal() && 0 == $this->getID() ) {
                        return '';
                }
-               return Article::getContent( $noredir );
+               return Article::getContent();
        }
 
-       function openShowImage()
-       {
+       protected function openShowImage() {
                global $wgOut, $wgUser, $wgImageLimits, $wgRequest,
-                      $wgUseImageResize, $wgRepositoryBaseUrl,
-                      $wgUseExternalEditor, $wgServer, $wgFetchCommonsDescriptions;
-               $full_url  = $this->img->getURL();
-               $anchoropen = '';
-               $anchorclose = '';
+                       $wgLang, $wgContLang, $wgEnableUploads;
 
-               if( $wgUser->getOption( 'imagesize' ) == '' ) {
-                       $sizeSel = User::getDefaultOption( 'imagesize' );
-               } else {
-                       $sizeSel = IntVal( $wgUser->getOption( 'imagesize' ) );
-               }
+               $this->loadFile();
+
+               $full_url  = $this->displayImg->getURL();
+               $linkAttribs = false;
+               $sizeSel = intval( $wgUser->getOption( 'imagesize') );
                if( !isset( $wgImageLimits[$sizeSel] ) ) {
                        $sizeSel = User::getDefaultOption( 'imagesize' );
+
+                       // The user offset might still be incorrect, specially if
+                       // $wgImageLimits got changed (see bug #8858).
+                       if( !isset( $wgImageLimits[$sizeSel] ) ) {
+                               // Default to the first offset in $wgImageLimits
+                               $sizeSel = 0;
+                       }
                }
                $max = $wgImageLimits[$sizeSel];
                $maxWidth = $max[0];
                $maxHeight = $max[1];
                $sk = $wgUser->getSkin();
+               $dirmark = $wgContLang->getDirMark();
 
-               if ( $this->img->exists() ) {
+               if( $this->displayImg->exists() ) {
                        # image
-                       $width = $this->img->getWidth();
-                       $height = $this->img->getHeight();
+                       $page = $wgRequest->getIntOrNull( 'page' );
+                       if( is_null( $page ) ) {
+                               $params = array();
+                               $page = 1;
+                       } else {
+                               $params = array( 'page' => $page );
+                       }
+                       $width_orig = $this->displayImg->getWidth();
+                       $width = $width_orig;
+                       $height_orig = $this->displayImg->getHeight();
+                       $height = $height_orig;
+                       $mime = $this->displayImg->getMimeType();
                        $showLink = false;
+                       $linkAttribs = array( 'href' => $full_url );
+                       $longDesc = $this->displayImg->getLongDesc();
+
+                       wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this, &$wgOut ) );
 
-                       if ( $this->img->allowInlineDisplay() and $width and $height) {
+                       if( $this->displayImg->allowInlineDisplay() ) {
                                # image
 
                                # "Download high res version" link below the image
-                               $msg = wfMsg('showbigimage', $width, $height, intval( $this->img->getSize()/1024 ) );
-                               if ( $width > $maxWidth ) {
-                                       $height = floor( $height * $maxWidth / $width );
-                                       $width  = $maxWidth;
+                               #$msgsize = wfMsgHtml('file-info-size', $width_orig, $height_orig, $sk->formatSize( $this->displayImg->getSize() ), $mime );
+                               # We'll show a thumbnail of this image
+                               if( $width > $maxWidth || $height > $maxHeight ) {
+                                       # Calculate the thumbnail size.
+                                       # First case, the limiting factor is the width, not the height.
+                                       if( $width / $height >= $maxWidth / $maxHeight ) {
+                                               $height = round( $height * $maxWidth / $width);
+                                               $width = $maxWidth;
+                                               # Note that $height <= $maxHeight now.
+                                       } else {
+                                               $newwidth = floor( $width * $maxHeight / $height);
+                                               $height = round( $height * $newwidth / $width );
+                                               $width = $newwidth;
+                                               # Note that $height <= $maxHeight now, but might not be identical
+                                               # because of rounding.
+                                       }
+                                       $msgbig  = wfMsgHtml( 'show-big-image' );
+                                       $msgsmall = wfMsgExt( 'show-big-image-thumb', 'parseinline',
+                                               $wgLang->formatNum( $width ),
+                                               $wgLang->formatNum( $height )
+                                       );
+                               } else {
+                                       # Image is small enough to show full size on image page
+                                       $msgbig = htmlspecialchars( $this->displayImg->getName() );
+                                       $msgsmall = wfMsgExt( 'file-nohires', array( 'parseinline' ) );
+                               }
+
+                               $params['width'] = $width;
+                               $thumbnail = $this->displayImg->transform( $params );
+
+                               $anchorclose = "<br />";
+                               if( $this->displayImg->mustRender() ) {
+                                       $showLink = true;
+                               } else {
+                                       $anchorclose .=
+                                               $msgsmall .
+                                               '<br />' . Xml::tags( 'a', $linkAttribs,  $msgbig ) . "$dirmark " . $longDesc;
+                               }
+
+                               $isMulti = $this->displayImg->isMultipage() && $this->displayImg->pageCount() > 1;
+                               if( $isMulti ) {
+                                       $wgOut->addHTML( '<table class="multipageimage"><tr><td>' );
                                }
-                               if ( $height > $maxHeight ) {
-                                       $width = floor( $width * $maxHeight / $height );
-                                       $height = $maxHeight;
+
+                               if( $thumbnail ) {
+                                       $options = array(
+                                               'alt' => $this->displayImg->getTitle()->getPrefixedText(),
+                                               'file-link' => true,
+                                       );
+                                       $wgOut->addHTML( '<div class="fullImageLink" id="file">' .
+                                               $thumbnail->toHtml( $options ) .
+                                               $anchorclose . "</div>\n" );
                                }
-                               if ( $width != $this->img->getWidth() || $height != $this->img->getHeight() ) {
-                                       if( $wgUseImageResize ) {
-                                               $thumbnail = $this->img->getThumbnail( $width );
-                                               if ( $thumbnail == null ) {
-                                                       $url = $this->img->getViewURL();
-                                               } else {
-                                                       $url = $thumbnail->getURL();
-                                               }
+
+                               if( $isMulti ) {
+                                       $count = $this->displayImg->pageCount();
+
+                                       if( $page > 1 ) {
+                                               $label = $wgOut->parse( wfMsg( 'imgmultipageprev' ), false );
+                                               $link = $sk->link(
+                                                       $this->mTitle,
+                                                       $label,
+                                                       array(),
+                                                       array( 'page' => $page - 1 ),
+                                                       array( 'known', 'noclasses' )
+                                               );
+                                               $thumb1 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none',
+                                                       array( 'page' => $page - 1 ) );
                                        } else {
-                                               # No resize ability? Show the full image, but scale
-                                               # it down in the browser so it fits on the page.
-                                               $url = $this->img->getViewURL();
+                                               $thumb1 = '';
                                        }
-                                       $anchoropen  = "<a href=\"{$full_url}\">";
-                                       $anchorclose = "</a><br />";
-                                       if( $this->img->mustRender() ) {
-                                               $showLink = true;
+
+                                       if( $page < $count ) {
+                                               $label = wfMsg( 'imgmultipagenext' );
+                                               $link = $sk->link(
+                                                       $this->mTitle,
+                                                       $label,
+                                                       array(),
+                                                       array( 'page' => $page + 1 ),
+                                                       array( 'known', 'noclasses' )
+                                               );
+                                               $thumb2 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none',
+                                                       array( 'page' => $page + 1 ) );
                                        } else {
-                                               $anchorclose .= "\n$anchoropen{$msg}</a>";
+                                               $thumb2 = '';
                                        }
-                               } else {
-                                       $url = $this->img->getViewURL();
-                                       $showLink = true;
+
+                                       global $wgScript;
+
+                                       $formParams = array(
+                                               'name' => 'pageselector',
+                                               'action' => $wgScript,
+                                               'onchange' => 'document.pageselector.submit();',
+                                       );
+
+                                       $option = array();
+                                       for ( $i=1; $i <= $count; $i++ ) {
+                                               $options[] = Xml::option( $wgLang->formatNum($i), $i, $i == $page );
+                                       }
+                                       $select = Xml::tags( 'select',
+                                               array( 'id' => 'pageselector', 'name' => 'page' ),
+                                               implode( "\n", $options ) );
+
+                                       $wgOut->addHTML(
+                                               '</td><td><div class="multipageimagenavbox">' .
+                                               Xml::openElement( 'form', $formParams ) .
+                                               Xml::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) .
+                                               wfMsgExt( 'imgmultigoto', array( 'parseinline', 'replaceafter' ), $select ) .
+                                               Xml::submitButton( wfMsg( 'imgmultigo' ) ) .
+                                               Xml::closeElement( 'form' ) .
+                                               "<hr />$thumb1\n$thumb2<br clear=\"all\" /></div></td></tr></table>"
+                                       );
                                }
-                               $wgOut->addHTML( '<div class="fullImageLink" id="file">' . $anchoropen .
-                                    "<img border=\"0\" src=\"{$url}\" width=\"{$width}\" height=\"{$height}\" alt=\"" .
-                                    htmlspecialchars( $wgRequest->getVal( 'image' ) ).'" />' . $anchorclose . '</div>' );
                        } else {
                                #if direct link is allowed but it's not a renderable image, show an icon.
-                               if ($this->img->isSafeFile()) {
-                                       $icon= $this->img->iconThumb();
+                               if( $this->displayImg->isSafeFile() ) {
+                                       $icon= $this->displayImg->iconThumb();
 
-                                       $wgOut->addHTML( '<div class="fullImageLink" id="file"><a href="' . $full_url . '">' .
-                                       $icon->toHtml() .
-                                       '</a></div>' );
+                                       $wgOut->addHTML( '<div class="fullImageLink" id="file">' .
+                                       $icon->toHtml( array( 'file-link' => true ) ) .
+                                       "</div>\n" );
                                }
-                               
+
                                $showLink = true;
                        }
 
 
-                       if ($showLink) {
-                               $filename = wfEscapeWikiText( $this->img->getName() );
-                               $info = wfMsg( 'fileinfo',
-                                       ceil($this->img->getSize()/1024.0),
-                                       $this->img->getMimeType() );
-       
-                               if (!$this->img->isSafeFile()) {
-                                       $warning = wfMsg( 'mediawarning' );
-                                       $wgOut->addWikiText( <<<END
+                       if($showLink) {
+                               $filename = wfEscapeWikiText( $this->displayImg->getName() );
+                               $medialink = "[[Media:$filename|$filename]]";
+
+                               if( !$this->displayImg->isSafeFile() ) {
+                                       $warning = wfMsgNoTrans( 'mediawarning' );
+                                       $wgOut->addWikiText( <<<EOT
 <div class="fullMedia">
-<span class="dangerousLink">[[Media:$filename|$filename]]</span>
-<span class="fileInfo"> ($info)</span>
+<span class="dangerousLink">{$medialink}</span>$dirmark
+<span class="fileInfo">$longDesc</span>
 </div>
-
 <div class="mediaWarning">$warning</div>
-END
+EOT
                                                );
                                } else {
-                                       $wgOut->addWikiText( <<<END
+                                       $wgOut->addWikiText( <<<EOT
 <div class="fullMedia">
-[[Media:$filename|$filename]] <span class="fileInfo"> ($info)</span>
+{$medialink}{$dirmark}
+<span class="fileInfo">$longDesc</span>
 </div>
-END
-                                               );
+EOT
+                                       );
                                }
                        }
 
-                       if($this->img->fromSharedDirectory) {
+                       if( !$this->displayImg->isLocal() ) {
                                $this->printSharedImageText();
                        }
                } else {
                        # Image does not exist
-                       $wgOut->addWikiText( wfMsg( 'noimage', $this->getUploadUrl() ) );
+                       if ( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
+                               // Only show an upload link if the user can upload
+                               $uploadTitle = SpecialPage::getTitleFor( 'Upload' );
+                               $nofile = array(
+                                       'filepage-nofile-link',
+                                       $uploadTitle->getFullUrl( array( 'wpDestFile' => $this->img->getName() ) )
+                               );
+                       }
+                       else
+                       {
+                               $nofile = 'filepage-nofile';
+                       }
+                       $wgOut->setRobotPolicy( 'noindex,nofollow' );
+                       $wgOut->wrapWikiMsg( "<div id='mw-imagepage-nofile' class='plainlinks'>\n$1\n</div>", $nofile );
                }
        }
 
-       function printSharedImageText() {
-               global $wgRepositoryBaseUrl, $wgFetchCommonsDescriptions, $wgOut;
+       /**
+        * Show a notice that the file is from a shared repository
+        */
+       protected function printSharedImageText() {
+               global $wgOut;
 
-               $url = $wgRepositoryBaseUrl . urlencode($this->mTitle->getDBkey());
-               $sharedtext = "<div class='sharedUploadNotice'>" . wfMsg("sharedupload");
-               if ($wgRepositoryBaseUrl && !$wgFetchCommonsDescriptions) {
-                       $sharedtext .= " " . wfMsg("shareduploadwiki", $url);
+               $this->loadFile();
+
+               $descUrl = $this->img->getDescriptionUrl();
+               $descText = $this->img->getDescriptionText();
+
+               $wrap = "<div class=\"sharedUploadNotice\">\n$1\n</div>\n";
+               $repo = $this->img->getRepo()->getDisplayName();
+
+               $msg = '';
+               if( $descUrl && $descText && wfMsgNoTrans( 'sharedupload-desc-here' ) !== '-'  ) {
+                       $wgOut->wrapWikiMsg( $wrap, array( 'sharedupload-desc-here', $repo, $descUrl ) );
+               } elseif ( $descUrl && wfMsgNoTrans( 'sharedupload-desc-there' ) !== '-' ) {
+                       $wgOut->wrapWikiMsg( $wrap, array( 'sharedupload-desc-there', $repo, $descUrl ) );
+               } else {
+                       $wgOut->wrapWikiMsg( $wrap, array( 'sharedupload', $repo ), ''/*BACKCOMPAT*/ );
                }
-               $sharedtext .= "</div>";
-               $wgOut->addWikiText($sharedtext);
 
-               if ($wgRepositoryBaseUrl && $wgFetchCommonsDescriptions) {
-                       require_once("HttpFunctions.php");
-                       $ur = ini_set('allow_url_fopen', true);
-                       $text = wfGetHTTP($url . '?action=render');
-                       ini_set('allow_url_fopen', $ur);
-                       if ($text)
-                               $this->mExtraDescription = $text;
+               if( $descText ) {
+                       $this->mExtraDescription = $descText;
                }
        }
 
-       function getUploadUrl() {
-               global $wgServer;
-               $uploadTitle = Title::makeTitle( NS_SPECIAL, 'Upload' );
-               return $wgServer . $uploadTitle->getLocalUrl( 'wpDestFile=' . urlencode( $this->img->getName() ) );
+       public function getUploadUrl() {
+               $this->loadFile();
+               $uploadTitle = SpecialPage::getTitleFor( 'Upload' );
+               return $uploadTitle->getFullUrl( array(
+                       'wpDestFile' => $this->img->getName(),
+                       'wpForReUpload' => 1
+                ) );
        }
 
+       /**
+        * Print out the various links at the bottom of the image page, e.g. reupload,
+        * external editing (and instructions link) etc.
+        */
+       protected function uploadLinksBox() {
+               global $wgUser, $wgOut, $wgEnableUploads, $wgUseExternalEditor;
 
-       function uploadLinksBox()
-       {
-               global $wgUser, $wgOut;
+               if( !$wgEnableUploads ) { return; }
 
-               if ($this->img->fromSharedDirectory)
+               $this->loadFile();
+               if( !$this->img->isLocal() )
                        return;
 
                $sk = $wgUser->getSkin();
-               $wgOut->addHTML( '<br /><ul><li>' );
-               $wgOut->addWikiText( '<div>'. wfMsg( 'uploadnewversion', $this->getUploadUrl() ) .'</div>' );
-               $wgOut->addHTML( '</li><li>' );
-               $wgOut->addHTML( $sk->makeKnownLinkObj( $this->mTitle,
-                       wfMsg( 'edit-externally' ), "action=edit&externaledit=true&mode=file" ) );
-               $wgOut->addWikiText( '<div>' .  wfMsg('edit-externally-help') . '</div>' );
-               $wgOut->addHTML( '</li></ul>' );
-       }
 
-       function closeShowImage()
-       {
-               # For overloading
+               $wgOut->addHTML( "<br /><ul>\n" );
+
+               # "Upload a new version of this file" link
+               if( UploadBase::userCanReUpload($wgUser,$this->img->name) ) {
+                       $ulink = $sk->makeExternalLink( $this->getUploadUrl(), wfMsg( 'uploadnewversion-linktext' ) );
+                       $wgOut->addHTML( "<li id=\"mw-imagepage-reupload-link\"><div class=\"plainlinks\">{$ulink}</div></li>\n" );
+               }
+
+               # External editing link
+               if ( $wgUseExternalEditor ) {
+                       $elink = $sk->link(
+                               $this->mTitle,
+                               wfMsgHtml( 'edit-externally' ),
+                               array(),
+                               array(
+                                       'action' => 'edit',
+                                       'externaledit' => 'true',
+                                       'mode' => 'file'
+                               ),
+                               array( 'known', 'noclasses' )
+                       );
+                       $wgOut->addHTML( '<li id="mw-imagepage-edit-external">' . $elink . ' <small>' . wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) . "</small></li>\n" );
+               }
 
+               $wgOut->addHTML( "</ul>\n" );
        }
 
+       protected function closeShowImage() {} # For overloading
+
        /**
         * If the page we've just displayed is in the "Image" namespace,
         * we follow it with an upload history of the image and its usage.
         */
-       function imageHistory()
-       {
-               global $wgUser, $wgOut, $wgUseExternalEditor;
-
-               $sk = $wgUser->getSkin();
-
-               $line = $this->img->nextHistoryLine();
+       protected function imageHistory() {
+               global $wgOut;
 
-               if ( $line ) {
-                       $list =& new ImageHistoryList( $sk );
-                       $s = $list->beginImageHistoryList() .
-                               $list->imageHistoryLine( true, $line->img_timestamp,
-                                       $this->mTitle->getDBkey(),  $line->img_user,
-                                       $line->img_user_text, $line->img_size, $line->img_description );
+               $this->loadFile();
+               $pager = new ImageHistoryPseudoPager( $this );
+               $wgOut->addHTML( $pager->getBody() );
 
-                       while ( $line = $this->img->nextHistoryLine() ) {
-                               $s .= $list->imageHistoryLine( false, $line->img_timestamp,
-                               $line->oi_archive_name, $line->img_user,
-                               $line->img_user_text, $line->img_size, $line->img_description );
-                       }
-                       $s .= $list->endImageHistoryList();
-               } else { $s=''; }
-               $wgOut->addHTML( $s );
+               $this->img->resetHistory(); // free db resources
 
                # Exist check because we don't want to show this on pages where an image
                # doesn't exist along with the noimage message, that would suck. -ævar
-               if( $wgUseExternalEditor && $this->img->exists() ) {
+               if( $this->img->exists() ) {
                        $this->uploadLinksBox();
                }
-
        }
 
-       function imageLinks()
-       {
-               global $wgUser, $wgOut;
-
-               $wgOut->addHTML( '<h2 id="filelinks">' . wfMsg( 'imagelinks' ) . "</h2>\n" );
-
-               $dbr =& wfGetDB( DB_SLAVE );
-               $page = $dbr->tableName( 'page' );
-               $imagelinks = $dbr->tableName( 'imagelinks' );
-
-               $sql = "SELECT page_namespace,page_title FROM $imagelinks,$page WHERE il_to=" .
-                 $dbr->addQuotes( $this->mTitle->getDBkey() ) . " AND il_from=page_id"
-                 . " LIMIT 500"; # quickie emergency brake
-               $res = $dbr->query( $sql, "ImagePage::imageLinks" );
-
-               if ( 0 == $dbr->numRows( $res ) ) {
-                       $wgOut->addHtml( '<p>' . wfMsg( "nolinkstoimage" ) . "</p>\n" );
+       protected function imageLinks() {
+               global $wgUser, $wgOut, $wgLang;
+
+               $limit = 100;
+
+               $dbr = wfGetDB( DB_SLAVE );
+
+               $res = $dbr->select(
+                       array( 'imagelinks', 'page' ),
+                       array( 'page_namespace', 'page_title' ),
+                       array( 'il_to' => $this->mTitle->getDBkey(), 'il_from = page_id' ),
+                       __METHOD__,
+                       array( 'LIMIT' => $limit + 1)   
+               );
+               $count = $dbr->numRows( $res );
+               if( $count == 0 ) {
+                       $wgOut->addHTML( "<div id='mw-imagepage-nolinkstoimage'>\n" );
+                       $wgOut->addWikiMsg( 'nolinkstoimage' );
+                       $wgOut->addHTML( "</div>\n" );
                        return;
                }
-               $wgOut->addHTML( '<p>' . wfMsg( 'linkstoimage' ) .  "</p>\n<ul>" );
+               
+               $wgOut->addHTML( "<div id='mw-imagepage-section-linkstoimage'>\n" );
+               if( $count <= $limit - 1 ) {
+                       $wgOut->addWikiMsg( 'linkstoimage', $count );
+               } else {
+                       // More links than the limit. Add a link to [[Special:Whatlinkshere]]
+                       $wgOut->addWikiMsg( 'linkstoimage-more',
+                               $wgLang->formatNum( $limit ),
+                               $this->mTitle->getPrefixedDBkey()
+                       );
+               }
 
+               $wgOut->addHTML( "<ul class='mw-imagepage-linkstoimage'>\n" );
                $sk = $wgUser->getSkin();
-               while ( $s = $dbr->fetchObject( $res ) ) {
-                       $name = Title::MakeTitle( $s->page_namespace, $s->page_title );
-                       $link = $sk->makeKnownLinkObj( $name, "" );
-                       $wgOut->addHTML( "<li>{$link}</li>\n" );
+               $count = 0;
+               while ( $s = $res->fetchObject() ) {
+                       $count++;
+                       if( $count <= $limit ) {
+                               // We have not yet reached the extra one that tells us there is more to fetch
+                               $link = $sk->link(
+                                       Title::makeTitle( $s->page_namespace, $s->page_title ),
+                                       null,
+                                       array(),
+                                       array(),
+                                       array( 'known', 'noclasses' )
+                               );
+                               $wgOut->addHTML( "<li>{$link}</li>\n" );
+                       }
                }
                $wgOut->addHTML( "</ul>\n" );
-       }
-
-       function delete()
-       {
-               global $wgUser, $wgOut, $wgRequest;
-
-               $confirm = $wgRequest->wasPosted();
-               $image = $wgRequest->getVal( 'image' );
-               $oldimage = $wgRequest->getVal( 'oldimage' );
+               $res->free();
 
-               # Only sysops can delete images. Previously ordinary users could delete
-               # old revisions, but this is no longer the case.
-               if ( !$wgUser->isAllowed('delete') ) {
-                       $wgOut->sysopRequired();
-                       return;
-               }
-               if ( $wgUser->isBlocked() ) {
-                       return $this->blockedIPpage();
-               }
-               if ( wfReadOnly() ) {
-                       $wgOut->readOnlyPage();
-                       return;
-               }
+               // Add a links to [[Special:Whatlinkshere]]
+               if( $count > $limit )
+                       $wgOut->addWikiMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() );
+               $wgOut->addHTML( "</div>\n" );
+       }
+       
+       protected function imageRedirects() {
+               global $wgUser, $wgOut, $wgLang;
 
-               # Better double-check that it hasn't been deleted yet!
-               $wgOut->setPagetitle( wfMsg( 'confirmdelete' ) );
-               if ( ( !is_null( $image ) )
-                 && ( '' == trim( $image ) ) ) {
-                       $wgOut->fatalError( wfMsg( 'cannotdelete' ) );
-                       return;
-               }
+               $redirects = $this->getTitle()->getRedirectsHere( NS_FILE );
+               if( count( $redirects ) == 0 ) return;
 
-               $this->img  = new Image( $this->mTitle );
+               $wgOut->addHTML( "<div id='mw-imagepage-section-redirectstofile'>\n" );
+               $wgOut->addWikiMsg( 'redirectstofile',
+                       $wgLang->formatNum( count( $redirects ) )
+               );
+               $wgOut->addHTML( "<ul class='mw-imagepage-redirectstofile'>\n" );
 
-               # Deleting old images doesn't require confirmation
-               if ( !is_null( $oldimage ) || $confirm ) {
-                       if( $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ), $oldimage ) ) {
-                               $this->doDelete();
-                       } else {
-                               $wgOut->fatalError( wfMsg( 'sessionfailure' ) );
-                       }
-                       return;
+               $sk = $wgUser->getSkin();
+               foreach ( $redirects as $title ) {
+                       $link = $sk->link(
+                               $title,
+                               null,
+                               array(),
+                               array( 'redirect' => 'no' ),
+                               array( 'known', 'noclasses' )
+                       );
+                       $wgOut->addHTML( "<li>{$link}</li>\n" );
                }
+               $wgOut->addHTML( "</ul></div>\n" );
 
-               if ( !is_null( $image ) ) {
-                       $q = '&image=' . urlencode( $image );
-               } else if ( !is_null( $oldimage ) ) {
-                       $q = '&oldimage=' . urlencode( $oldimage );
-               } else {
-                       $q = '';
-               }
-               return $this->confirmDelete( $q, $wgRequest->getText( 'wpReason' ) );
        }
 
-       function doDelete()
-       {
-               global $wgOut, $wgUser, $wgContLang, $wgRequest;
-               global $wgUseSquid, $wgInternalServer, $wgPostCommitUpdateList;
-               $fname = 'ImagePage::doDelete';
+       protected function imageDupes() {
+               global $wgOut, $wgUser, $wgLang;
 
-               $reason = $wgRequest->getVal( 'wpReason' );
-               $oldimage = $wgRequest->getVal( 'oldimage' );
+               $this->loadFile();
 
-               $dbw =& wfGetDB( DB_MASTER );
+               $dupes = $this->getDuplicates();
+               if( count( $dupes ) == 0 ) return;
 
-               if ( !is_null( $oldimage ) ) {
-                       if ( strlen( $oldimage ) < 16 ) {
-                               $wgOut->unexpectedValueError( 'oldimage', htmlspecialchars($oldimage) );
-                               return;
-                       }
-                       if ( strstr( $oldimage, "/" ) || strstr( $oldimage, "\\" ) ) {
-                               $wgOut->unexpectedValueError( 'oldimage', htmlspecialchars($oldimage) );
-                               return;
-                       }
-
-                       # Invalidate description page cache
-                       $this->mTitle->invalidateCache();
+               $wgOut->addHTML( "<div id='mw-imagepage-section-duplicates'>\n" );
+               $wgOut->addWikiMsg( 'duplicatesoffile',
+                       $wgLang->formatNum( count( $dupes ) ), $this->mTitle->getDBkey()
+               );
+               $wgOut->addHTML( "<ul class='mw-imagepage-duplicates'>\n" );
 
-                       # Squid purging
-                       if ( $wgUseSquid ) {
-                               $urlArr = Array(
-                                       $wgInternalServer.wfImageArchiveUrl( $oldimage ),
-                                       $wgInternalServer.$this->mTitle->getFullURL()
+               $sk = $wgUser->getSkin();
+               foreach ( $dupes as $file ) {
+                       $fromSrc = '';
+                       if( $file->isLocal() ) {
+                               $link = $sk->link(
+                                       $file->getTitle(),
+                                       null,
+                                       array(),
+                                       array(),
+                                       array( 'known', 'noclasses' )
                                );
-                               wfPurgeSquidServers($urlArr);
-                       }
-                       $this->doDeleteOldImage( $oldimage );
-                       $dbw->delete( 'oldimage', array( 'oi_archive_name' => $oldimage ) );
-                       $deleted = $oldimage;
-               } else {
-                       $image = $this->mTitle->getDBkey();
-                       $dest = wfImageDir( $image );
-                       $archive = wfImageDir( $image );
-
-                       # Delete the image file if it exists; due to sync problems
-                       # or manual trimming sometimes the file will be missing.
-                       $targetFile = "{$dest}/{$image}";
-                       if( file_exists( $targetFile ) && ! @unlink( $targetFile ) ) {
-                               # If the deletion operation actually failed, bug out:
-                               $wgOut->fileDeleteError( $targetFile );
-                               return;
-                       }
-                       $dbw->delete( 'image', array( 'img_name' => $image ) );
-                       $res = $dbw->select( 'oldimage', array( 'oi_archive_name' ), array( 'oi_name' => $image ) );
-
-                       # Purge archive URLs from the squid
-                       $urlArr = Array();
-                       while ( $s = $dbw->fetchObject( $res ) ) {
-                               $this->doDeleteOldImage( $s->oi_archive_name );
-                               $urlArr[] = $wgInternalServer.wfImageArchiveUrl( $s->oi_archive_name );
+                       } else {
+                               $link = $sk->makeExternalLink( $file->getDescriptionUrl(),
+                                       $file->getTitle()->getPrefixedText() );
+                               $fromSrc = wfMsg( 'shared-repo-from', $file->getRepo()->getDisplayName() );
                        }
+                       $wgOut->addHTML( "<li>{$link} {$fromSrc}</li>\n" );
+               }
+               $wgOut->addHTML( "</ul></div>\n" );
+       }
 
-                       # And also the HTML of all pages using this image
-                       $linksTo = $this->img->getLinksTo();
-                       if ( $wgUseSquid ) {
-                               $u = SquidUpdate::newFromTitles( $linksTo, $urlArr );
-                               array_push( $wgPostCommitUpdateList, $u );
-                       }
+       /**
+        * Delete the file, or an earlier version of it
+        */
+       public function delete() {
+               global $wgUploadMaintenance;
+               if( $wgUploadMaintenance && $this->mTitle && $this->mTitle->getNamespace() == NS_FILE ) {
+                       global $wgOut;
+                       $wgOut->wrapWikiMsg( "<div class='error'>\n$1</div>\n", array( 'filedelete-maintenance' ) );
+                       return;
+               }
 
-                       $dbw->delete( 'oldimage', array( 'oi_name' => $image ) );
+               $this->loadFile();
+               if( !$this->img->exists() || !$this->img->isLocal() || $this->img->getRedirected() ) {
+                       // Standard article deletion
+                       Article::delete();
+                       return;
+               }
+               $deleter = new FileDeleteForm( $this->img );
+               $deleter->execute();
+       }
 
-                       # Image itself is now gone, and database is cleaned.
-                       # Now we remove the image description page.
+       /**
+        * Revert the file to an earlier version
+        */
+       public function revert() {
+               $this->loadFile();
+               $reverter = new FileRevertForm( $this->img );
+               $reverter->execute();
+       }
 
-                       $article = new Article( $this->mTitle );
-                       $article->doDeleteArticle( $reason ); # ignore errors
+       /**
+        * Override handling of action=purge
+        */
+       public function doPurge() {
+               $this->loadFile();
+               if( $this->img->exists() ) {
+                       wfDebug( "ImagePage::doPurge purging " . $this->img->getName() . "\n" );
+                       $update = new HTMLCacheUpdate( $this->mTitle, 'imagelinks' );
+                       $update->doUpdate();
+                       $this->img->upgradeRow();
+                       $this->img->purgeCache();
+               } else {
+                       wfDebug( "ImagePage::doPurge no image for " . $this->img->getName() . "; limiting purge to cache only\n" );
+                       // even if the file supposedly doesn't exist, force any cached information
+                       // to be updated (in case the cached information is wrong)
+                       $this->img->purgeCache();
+               }
+               parent::doPurge();
+       }
 
-                       # Invalidate parser cache and client cache for pages using this image
-                       # This is left until relatively late to reduce lock time
-                       Title::touchArray( $linksTo );
+       /**
+        * Display an error with a wikitext description
+        */
+       function showError( $description ) {
+               global $wgOut;
+               $wgOut->setPageTitle( wfMsg( "internalerror" ) );
+               $wgOut->setRobotPolicy( "noindex,nofollow" );
+               $wgOut->setArticleRelated( false );
+               $wgOut->enableClientCache( false );
+               $wgOut->addWikiText( $description );
+       }
 
-                       /* Delete thumbnails and refresh image metadata cache */
-                       $this->img->purgeCache();
+}
 
+/**
+ * Builds the image revision log shown on image pages
+ *
+ * @ingroup Media
+ */
+class ImageHistoryList {
 
-                       $deleted = $image;
-               }
+       protected $imagePage, $img, $skin, $title, $repo, $showThumb;
 
-               $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
-               $wgOut->setRobotpolicy( 'noindex,nofollow' );
+       public function __construct( $imagePage ) {
+               global $wgUser, $wgShowArchiveThumbnails;
+               $this->skin = $wgUser->getSkin();
+               $this->current = $imagePage->getFile();
+               $this->img = $imagePage->getDisplayedFile();
+               $this->title = $imagePage->getTitle();
+               $this->imagePage = $imagePage;
+               $this->showThumb = $wgShowArchiveThumbnails && $this->img->canRender();
+       }
 
-               $loglink = '[[Special:Log/delete|' . wfMsg( 'deletionlog' ) . ']]';
-               $text = wfMsg( 'deletedtext', $deleted, $loglink );
+       public function getImagePage() {
+               return $this->imagePage;
+       }
 
-               $wgOut->addWikiText( $text );
+       public function getSkin() {
+               return $this->skin;
+       }
 
-               $wgOut->returnToMain( false, $this->mTitle->getPrefixedText() );
+       public function getFile() {
+               return $this->img;
        }
 
-       function doDeleteOldImage( $oldimage )
-       {
-               global $wgOut;
+       public function beginImageHistoryList( $navLinks = '' ) {
+               global $wgOut, $wgUser;
+               return Xml::element( 'h2', array( 'id' => 'filehistory' ), wfMsg( 'filehist' ) ) . "\n"
+                       . "<div id=\"mw-imagepage-section-filehistory\">\n"
+                       . $wgOut->parse( wfMsgNoTrans( 'filehist-help' ) )
+                       . $navLinks . "\n"
+                       . Xml::openElement( 'table', array( 'class' => 'wikitable filehistory' ) ) . "\n"
+                       . '<tr><td></td>'
+                       . ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedhistory') ) ? '<td></td>' : '' )
+                       . '<th>' . wfMsgHtml( 'filehist-datetime' ) . '</th>'
+                       . ( $this->showThumb ? '<th>' . wfMsgHtml( 'filehist-thumb' ) . '</th>' : '' )
+                       . '<th>' . wfMsgHtml( 'filehist-dimensions' ) . '</th>'
+                       . '<th>' . wfMsgHtml( 'filehist-user' ) . '</th>'
+                       . '<th>' . wfMsgHtml( 'filehist-comment' ) . '</th>'
+                       . "</tr>\n";
+       }
 
-               $name = substr( $oldimage, 15 );
-               $archive = wfImageArchiveDir( $name );
-
-               # Delete the image if it exists. Sometimes the file will be missing
-               # due to manual intervention or weird sync problems; treat that
-               # condition gracefully and continue to delete the database entry.
-               # Also some records may end up with an empty oi_archive_name field
-               # if the original file was missing when a new upload was made;
-               # don't try to delete the directory then!
-               #
-               $targetFile = "{$archive}/{$oldimage}";
-               if( $oldimage != '' && file_exists( $targetFile ) && !@unlink( $targetFile ) ) {
-                       # If we actually have a file and can't delete it, throw an error.
-                       $wgOut->fileDeleteError( "{$archive}/{$oldimage}" );
-               } else {
-                       # Log the deletion
-                       $log = new LogPage( 'delete' );
-                       $log->addEntry( 'delete', $this->mTitle, wfMsg('deletedrevision',$oldimage) );
-               }
+       public function endImageHistoryList( $navLinks = '' ) {
+               return "</table>\n$navLinks\n</div>\n";
        }
 
-       function revert()
-       {
-               global $wgOut, $wgRequest, $wgUser;
-               global $wgUseSquid, $wgInternalServer, $wgDeferredUpdateList;
+       public function imageHistoryLine( $iscur, $file ) {
+               global $wgUser, $wgLang, $wgContLang, $wgTitle;
 
-               $oldimage = $wgRequest->getText( 'oldimage' );
-               if ( strlen( $oldimage ) < 16 ) {
-                       $wgOut->unexpectedValueError( 'oldimage', htmlspecialchars($oldimage) );
-                       return;
-               }
-               if ( strstr( $oldimage, "/" ) || strstr( $oldimage, "\\" ) ) {
-                       $wgOut->unexpectedValueError( 'oldimage', htmlspecialchars($oldimage) );
-                       return;
+               $timestamp = wfTimestamp(TS_MW, $file->getTimestamp());
+               $img = $iscur ? $file->getName() : $file->getArchiveName();
+               $user = $file->getUser('id');
+               $usertext = $file->getUser('text');
+               $description = $file->getDescription();
+
+               $local = $this->current->isLocal();
+               $row = $css = $selected = '';
+
+               // Deletion link
+               if( $local && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedhistory') ) ) {
+                       $row .= '<td>';
+                       # Link to remove from history
+                       if( $wgUser->isAllowed( 'delete' ) ) {
+                               $q = array( 'action' => 'delete' );
+                               if( !$iscur )
+                                       $q['oldimage'] = $img;
+                               $row .= $this->skin->link(
+                                       $this->title,
+                                       wfMsgHtml( $iscur ? 'filehist-deleteall' : 'filehist-deleteone' ),
+                                       array(), $q, array( 'known' )
+                               );
+                       }
+                       # Link to hide content. Don't show useless link to people who cannot hide revisions.
+                       $canHide = $wgUser->isAllowed( 'deleterevision' );
+                       if( $canHide || ($wgUser->isAllowed('deletedhistory') && $file->getVisibility()) ) {
+                               if( $wgUser->isAllowed('delete') ) {
+                                       $row .= '<br />';
+                               }
+                               // If file is top revision or locked from this user, don't link
+                               if( $iscur || !$file->userCan(File::DELETED_RESTRICTED) ) {
+                                       $del = $this->skin->revDeleteLinkDisabled( $canHide );
+                               } else {
+                                       list( $ts, $name ) = explode( '!', $img, 2 );
+                                       $query = array(
+                                               'type'   => 'oldimage',
+                                               'target' => $wgTitle->getPrefixedText(), 
+                                               'ids'    => $ts,
+                                       );
+                                       $del = $this->skin->revDeleteLink( $query,
+                                               $file->isDeleted(File::DELETED_RESTRICTED), $canHide );
+                               }
+                               $row .= $del;
+                       }
+                       $row .= '</td>';
                }
 
-               if ( wfReadOnly() ) {
-                       $wgOut->readOnlyPage();
-                       return;
-               }
-               if( $wgUser->isAnon() ) {
-                       $wgOut->errorpage( 'uploadnologin', 'uploadnologintext' );
-                       return;
-               }
-               if ( ! $this->mTitle->userCanEdit() ) {
-                       $wgOut->sysopRequired();
-                       return;
+               // Reversion link/current indicator
+               $row .= '<td>';
+               if( $iscur ) {
+                       $row .= wfMsgHtml( 'filehist-current' );
+               } elseif( $local && $wgUser->isLoggedIn() && $this->title->userCan( 'edit' ) ) {
+                       if( $file->isDeleted(File::DELETED_FILE) ) {
+                               $row .= wfMsgHtml('filehist-revert');
+                       } else {
+                               $row .= $this->skin->link(
+                                       $this->title,
+                                       wfMsgHtml( 'filehist-revert' ),
+                                       array(),
+                                       array(
+                                               'action' => 'revert',
+                                               'oldimage' => $img,
+                                               'wpEditToken' => $wgUser->editToken( $img )
+                                       ),
+                                       array( 'known', 'noclasses' )
+                               );
+                       }
                }
-               if ( $wgUser->isBlocked() ) {
-                       return $this->blockedIPpage();
+               $row .= '</td>';
+
+               // Date/time and image link
+               if( $file->getTimestamp() === $this->img->getTimestamp() ) {
+                       $selected = "class='filehistory-selected'";
                }
-               if( !$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ), $oldimage ) ) {
-                       $wgOut->errorpage( 'internalerror', 'sessionfailure' );
-                       return;
+               $row .= "<td $selected style='white-space: nowrap;'>";
+               if( !$file->userCan(File::DELETED_FILE) ) {
+                       # Don't link to unviewable files
+                       $row .= '<span class="history-deleted">' . $wgLang->timeAndDate( $timestamp, true ) . '</span>';
+               } elseif( $file->isDeleted(File::DELETED_FILE) ) {
+                       $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+                       # Make a link to review the image
+                       $url = $this->skin->link(
+                               $revdel,
+                               $wgLang->timeAndDate( $timestamp, true ),
+                               array(),
+                               array(
+                                       'target' => $wgTitle->getPrefixedText(),
+                                       'file' => $img,
+                                       'token' => $wgUser->editToken( $img )
+                               ),
+                               array( 'known', 'noclasses' )
+                       );
+                       $row .= '<span class="history-deleted">'.$url.'</span>';
+               } else {
+                       $url = $iscur ? $this->current->getUrl() : $this->current->getArchiveUrl( $img );
+                       $row .= Xml::element( 'a', array( 'href' => $url ), $wgLang->timeAndDate( $timestamp, true ) );
                }
-               $name = substr( $oldimage, 15 );
+               $row .= "</td>";
 
-               $dest = wfImageDir( $name );
-               $archive = wfImageArchiveDir( $name );
-               $curfile = "{$dest}/{$name}";
-
-               if ( ! is_file( $curfile ) ) {
-                       $wgOut->fileNotFoundError( htmlspecialchars( $curfile ) );
-                       return;
+               // Thumbnail
+               if ( $this->showThumb ) {
+                       $row .= '<td>' . $this->getThumbForLine( $file ) . '</td>';
                }
-               $oldver = wfTimestampNow() . "!{$name}";
 
-               $dbr =& wfGetDB( DB_SLAVE );
-               $size = $dbr->selectField( 'oldimage', 'oi_size', array( 'oi_archive_name' => $oldimage )  );
-
-               if ( ! rename( $curfile, "${archive}/{$oldver}" ) ) {
-                       $wgOut->fileRenameError( $curfile, "${archive}/{$oldver}" );
-                       return;
-               }
-               if ( ! copy( "{$archive}/{$oldimage}", $curfile ) ) {
-                       $wgOut->fileCopyError( "${archive}/{$oldimage}", $curfile );
+               // Image dimensions + size
+               $row .= '<td>';
+               $row .= htmlspecialchars( $file->getDimensionsString() );
+               $row .= " <span style='white-space: nowrap;'>(" . $this->skin->formatSize( $file->getSize() ) . ')</span>';
+               $row .= '</td>';
+
+               // Uploading user
+               $row .= '<td>';
+               if( $local ) {
+                       // Hide deleted usernames
+                       if( $file->isDeleted(File::DELETED_USER) ) {
+                               $row .= '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
+                       } else {
+                               $row .= $this->skin->userLink( $user, $usertext ) . " <span style='white-space: nowrap;'>" . 
+                                       $this->skin->userToolLinks( $user, $usertext ) . "</span>";
+                       }
+               } else {
+                       $row .= htmlspecialchars( $usertext );
                }
+               $row .= '</td><td>';
 
-               # Record upload and update metadata cache
-               $img = Image::newFromName( $name );
-               $img->recordUpload( $oldver, wfMsg( "reverted" ) );
+               // Don't show deleted descriptions
+               if( $file->isDeleted(File::DELETED_COMMENT) ) {
+                       $row .= '<span class="history-deleted">' . wfMsgHtml('rev-deleted-comment') . '</span>';
+               } else {
+                       $row .= $this->skin->commentBlock( $description, $this->title );
+               }
+               $row .= '</td>';
 
-               $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
-               $wgOut->setRobotpolicy( 'noindex,nofollow' );
-               $wgOut->addHTML( wfMsg( 'imagereverted' ) );
+               wfRunHooks( 'ImagePageFileHistoryLine', array( $this, $file, &$row, &$rowClass ) );
+               $classAttr = $rowClass ? " class='$rowClass'" : "";
 
-               $descTitle = $img->getTitle();
-               $wgOut->returnToMain( false, $descTitle->getPrefixedText() );
+               return "<tr{$classAttr}>{$row}</tr>\n";
        }
 
-       function blockedIPpage() {
-               require_once( 'EditPage.php' );
-               $edit = new EditPage( $this );
-               return $edit->blockedIPpage();
-       }
+       protected function getThumbForLine( $file ) {
+               global $wgLang;
 
+               if( $file->allowInlineDisplay() && $file->userCan( File::DELETED_FILE ) && !$file->isDeleted( File::DELETED_FILE ) ) {
+                       $params = array(
+                               'width' => '120',
+                               'height' => '120',
+                       );
+                       $timestamp = wfTimestamp(TS_MW, $file->getTimestamp());
+
+                       $thumbnail = $file->transform( $params );
+                       $options = array(
+                               'alt' => wfMsg( 'filehist-thumbtext',
+                                       $wgLang->timeAndDate( $timestamp, true ),
+                                       $wgLang->date( $timestamp, true ),
+                                       $wgLang->time( $timestamp, true ) ),
+                               'file-link' => true,
+                       );
+                       
+                       if ( !$thumbnail ) return wfMsgHtml( 'filehist-nothumb' );
+
+                       return $thumbnail->toHtml( $options );
+               } else {
+                       return wfMsgHtml( 'filehist-nothumb' );
+               }
+       }
 }
 
-/**
- * @todo document
- * @package MediaWiki
- */
-class ImageHistoryList {
-       function ImageHistoryList( &$skin ) {
-               $this->skin =& $skin;
+class ImageHistoryPseudoPager extends ReverseChronologicalPager {
+       function __construct( $imagePage ) {
+               parent::__construct();
+               $this->mImagePage = $imagePage;
+               $this->mTitle = clone( $imagePage->getTitle() );
+               $this->mTitle->setFragment( '#filehistory' );
+               $this->mImg = null;
+               $this->mHist = array();
+               $this->mRange = array( 0, 0 ); // display range
        }
-
-       function beginImageHistoryList() {
-               $s = "\n<h2 id=\"filehistory\">" . wfMsg( 'imghistory' ) . "</h2>\n" .
-                 "<p>" . wfMsg( 'imghistlegend' ) . "</p>\n".'<ul class="special">';
-               return $s;
+       
+       function getTitle() {
+               return $this->mTitle;
        }
 
-       function endImageHistoryList() {
-               $s = "</ul>\n";
-               return $s;
+       function getQueryInfo() {
+               return false;
        }
 
-       function imageHistoryLine( $iscur, $timestamp, $img, $user, $usertext, $size, $description ) {
-               global $wgUser, $wgLang, $wgContLang, $wgTitle;
-
-               $datetime = $wgLang->timeanddate( $timestamp, true );
-               $del = wfMsg( 'deleteimg' );
-               $delall = wfMsg( 'deleteimgcompletely' );
-               $cur = wfMsg( 'cur' );
+       function getIndexField() {
+               return '';
+       }
 
-               if ( $iscur ) {
-                       $url = Image::imageUrl( $img );
-                       $rlink = $cur;
-                       if ( $wgUser->isAllowed('delete') ) {
-                               $link = $wgTitle->escapeLocalURL( 'image=' . $wgTitle->getPartialURL() .
-                                 '&action=delete' );
-                               $style = $this->skin->getInternalLinkAttributes( $link, $delall );
+       function formatRow( $row ) {
+               return '';
+       }
+       
+       function getBody() {
+               $s = '';
+               $this->doQuery();
+               if( count($this->mHist) ) {
+                       $list = new ImageHistoryList( $this->mImagePage );
+                       # Generate prev/next links
+                       $navLink = $this->getNavigationBar();
+                       $s = $list->beginImageHistoryList($navLink);
+                       // Skip rows there just for paging links
+                       for( $i = $this->mRange[0]; $i <= $this->mRange[1]; $i++ ) {
+                               $file = $this->mHist[$i];
+                               $s .= $list->imageHistoryLine( !$file->isOld(), $file );
+                       }
+                       $s .= $list->endImageHistoryList($navLink);
+               }
+               return $s;
+       }
 
-                               $dlink = '<a href="'.$link.'"'.$style.'>'.$delall.'</a>';
-                       } else {
-                               $dlink = $del;
+       function doQuery() {
+               if( $this->mQueryDone ) return;
+               $this->mImg = $this->mImagePage->getFile(); // ensure loading
+               if( !$this->mImg->exists() ) {
+                       return;
+               }
+               $queryLimit = $this->mLimit + 1; // limit plus extra row
+               if( $this->mIsBackwards ) {
+                       // Fetch the file history
+                       $this->mHist = $this->mImg->getHistory($queryLimit,null,$this->mOffset,false);
+                       // The current rev may not meet the offset/limit
+                       $numRows = count($this->mHist);
+                       if( $numRows <= $this->mLimit && $this->mImg->getTimestamp() > $this->mOffset ) {
+                               $this->mHist = array_merge( array($this->mImg), $this->mHist );
                        }
                } else {
-                       $url = htmlspecialchars( wfImageArchiveUrl( $img ) );
-                       if( $wgUser->getID() != 0 && $wgTitle->userCanEdit() ) {
-                               $token = urlencode( $wgUser->editToken( $img ) );
-                               $rlink = $this->skin->makeKnownLinkObj( $wgTitle,
-                                          wfMsg( 'revertimg' ), 'action=revert&oldimage=' .
-                                          urlencode( $img ) . "&wpEditToken=$token" );
-                               $dlink = $this->skin->makeKnownLinkObj( $wgTitle,
-                                          $del, 'action=delete&oldimage=' . urlencode( $img ) .
-                                          "&wpEditToken=$token" );
+                       // The current rev may not meet the offset
+                       if( !$this->mOffset || $this->mImg->getTimestamp() < $this->mOffset ) {
+                               $this->mHist[] = $this->mImg;
+                       }
+                       // Old image versions (fetch extra row for nav links)
+                       $oiLimit = count($this->mHist) ? $this->mLimit : $this->mLimit+1;
+                       // Fetch the file history
+                       $this->mHist = array_merge( $this->mHist,
+                               $this->mImg->getHistory($oiLimit,$this->mOffset,null,false) );
+               }
+               $numRows = count($this->mHist); // Total number of query results
+               if( $numRows ) {
+                       # Index value of top item in the list
+                       $firstIndex = $this->mIsBackwards ?
+                               $this->mHist[$numRows-1]->getTimestamp() : $this->mHist[0]->getTimestamp();
+                       # Discard the extra result row if there is one
+                       if( $numRows > $this->mLimit && $numRows > 1 ) {
+                               if( $this->mIsBackwards ) {
+                                       # Index value of item past the index
+                                       $this->mPastTheEndIndex = $this->mHist[0]->getTimestamp();
+                                       # Index value of bottom item in the list
+                                       $lastIndex = $this->mHist[1]->getTimestamp();
+                                       # Display range
+                                       $this->mRange = array( 1, $numRows-1 );
+                               } else {
+                                       # Index value of item past the index
+                                       $this->mPastTheEndIndex = $this->mHist[$numRows-1]->getTimestamp();
+                                       # Index value of bottom item in the list
+                                       $lastIndex = $this->mHist[$numRows-2]->getTimestamp();
+                                       # Display range
+                                       $this->mRange = array( 0, $numRows-2 );
+                               }
                        } else {
-                               # Having live active links for non-logged in users
-                               # means that bots and spiders crawling our site can
-                               # inadvertently change content. Baaaad idea.
-                               $rlink = wfMsg( 'revertimg' );
-                               $dlink = $del;
+                               # Setting indexes to an empty string means that they will be
+                               # omitted if they would otherwise appear in URLs. It just so
+                               # happens that this  is the right thing to do in the standard
+                               # UI, in all the relevant cases.
+                               $this->mPastTheEndIndex = '';
+                               # Index value of bottom item in the list
+                               $lastIndex = $this->mIsBackwards ?
+                                       $this->mHist[0]->getTimestamp() : $this->mHist[$numRows-1]->getTimestamp();
+                               # Display range
+                               $this->mRange = array( 0, $numRows-1 );
                        }
+               } else {
+                       $firstIndex = '';
+                       $lastIndex = '';
+                       $this->mPastTheEndIndex = '';
                }
-               if ( 0 == $user ) {
-                       $userlink = $usertext;
+               if( $this->mIsBackwards ) {
+                       $this->mIsFirst = ( $numRows < $queryLimit );
+                       $this->mIsLast = ( $this->mOffset == '' );
+                       $this->mLastShown = $firstIndex;
+                       $this->mFirstShown = $lastIndex;
                } else {
-                       $userlink = $this->skin->makeLinkObj(
-                               Title::makeTitle( NS_USER, $usertext ),
-                               $usertext );
+                       $this->mIsFirst = ( $this->mOffset == '' );
+                       $this->mIsLast = ( $numRows < $queryLimit );
+                       $this->mLastShown = $lastIndex;
+                       $this->mFirstShown = $firstIndex;
                }
-               $nbytes = wfMsg( 'nbytes', $size );
-               $style = $this->skin->getInternalLinkAttributes( $url, $datetime );
-
-               $s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a>"
-                 . " . . {$userlink} ({$nbytes})";
-
-               $s .= $this->skin->commentBlock( $description, $wgTitle );
-               $s .= "</li>\n";
-               return $s;
+               $this->mQueryDone = true;
        }
-
 }
-
-
-?>