<?php
-/**
- */
-/**
- *
- */
if( !defined( 'MEDIAWIKI' ) )
die( 1 );
/**
* Special handling for image description pages
*
- * @addtogroup Media
+ * @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 __construct( $title, $time = false ) {
+ function __construct( $title ) {
parent::__construct( $title );
- $this->img = wfFindFile( $this->mTitle, $time );
+ $this->dupes = null;
+ $this->repo = null;
+ }
+
+ 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 = wfLocalFile( $this->mTitle );
- $this->current = $this->img;
- } else {
- $this->current = $time ? wfLocalFile( $this->mTitle ) : $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->repo;
+ $this->repo = $this->img->getRepo();
}
/**
function view() {
global $wgOut, $wgShowEXIF, $wgRequest, $wgUser;
+ $this->loadFile();
if ( $this->mTitle->getNamespace() == NS_IMAGE && $this->img->getRedirected() ) {
if ( $this->mTitle->getDBkey() == $this->img->getName() ) {
// 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() );
- $this->viewRedirect( Title::makeTitle( NS_IMAGE, $this->img->getName() ),
- /* $overwriteSubtitle */ true, /* $forceKnown */ true );
+ $wgOut->addHTML( $this->viewRedirect( Title::makeTitle( NS_IMAGE, $this->img->getName() ),
+ /* $appendSubtitle */ true, /* $forceKnown */ true ) );
$this->viewUpdates();
return;
}
if ( $this->mTitle->getNamespace() != NS_IMAGE || ( isset( $diff ) && $diffOnly ) )
return Article::view();
- if ($wgShowEXIF && $this->img->exists()) {
+ if ( $wgShowEXIF && $this->displayImg->exists() ) {
// FIXME: bad interface, see note on MediaHandler::formatMetadata().
- $formattedMetadata = $this->img->formatMetadata();
+ $formattedMetadata = $this->displayImg->formatMetadata();
$showmeta = $formattedMetadata !== false;
} else {
$showmeta = false;
}
- if ($this->img->exists())
- $wgOut->addHTML($this->showTOC($showmeta));
+ if ( $this->displayImg->exists() )
+ $wgOut->addHTML( $this->showTOC($showmeta) );
$this->openShowImage();
} else {
# Just need to set the right headers
$wgOut->setArticleFlag( true );
- $wgOut->setRobotpolicy( 'noindex,nofollow' );
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
$this->viewUpdates();
}
$this->closeShowImage();
$this->imageHistory();
// TODO: Cleanup the following
- $this->imageLinks();
+
+ $wgOut->addHTML( Xml::element( 'h2',
+ array( 'id' => 'filelinks' ),
+ wfMsg( 'imagelinks' ) ) . "\n" );
$this->imageDupes();
// TODO: We may want to find local images redirecting to a foreign
// file: "The following local files redirect to this file"
- if ( $this->img->isLocal() ) $this->imageRedirects();
+ if ( $this->img->isLocal() ) {
+ $this->imageRedirects();
+ }
+ $this->imageLinks();
if ( $showmeta ) {
global $wgStylePath, $wgStyleVersion;
}
public function getRedirectTarget() {
- if ( $this->img->isLocal() )
+ $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;
+ if ( $from == $to ) {
+ return null;
+ }
return $this->mRedirectTarget = Title::makeTitle( NS_IMAGE, $to );
}
public function followRedirect() {
- if ( $this->img->isLocal() )
+ $this->loadFile();
+ if ( $this->img->isLocal() ) {
return parent::followRedirect();
-
+ }
$from = $this->img->getRedirected();
$to = $this->img->getName();
- if ($from == $to) return false;
+ if ( $from == $to ) {
+ return false;
+ }
return Title::makeTitle( NS_IMAGE, $to );
}
public function isRedirect( $text = false ) {
+ $this->loadFile();
if ( $this->img->isLocal() )
return parent::isRedirect( $text );
}
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
* shared upload server if possible.
*/
function getContent() {
+ $this->loadFile();
if( $this->img && !$this->img->isLocal() && 0 == $this->getID() ) {
return '';
}
function openShowImage() {
global $wgOut, $wgUser, $wgImageLimits, $wgRequest, $wgLang, $wgContLang;
- $full_url = $this->img->getURL();
+ $this->loadFile();
+
+ $full_url = $this->displayImg->getURL();
$linkAttribs = false;
$sizeSel = intval( $wgUser->getOption( 'imagesize') );
if( !isset( $wgImageLimits[$sizeSel] ) ) {
$sk = $wgUser->getSkin();
$dirmark = $wgContLang->getDirMark();
- if ( $this->img->exists() ) {
+ if ( $this->displayImg->exists() ) {
# image
$page = $wgRequest->getIntOrNull( 'page' );
if ( is_null( $page ) ) {
} else {
$params = array( 'page' => $page );
}
- $width_orig = $this->img->getWidth();
+ $width_orig = $this->displayImg->getWidth();
$width = $width_orig;
- $height_orig = $this->img->getHeight();
+ $height_orig = $this->displayImg->getHeight();
$height = $height_orig;
- $mime = $this->img->getMimeType();
+ $mime = $this->displayImg->getMimeType();
$showLink = false;
$linkAttribs = array( 'href' => $full_url );
- $longDesc = $this->img->getLongDesc();
+ $longDesc = $this->displayImg->getLongDesc();
wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this , &$wgOut ) ) ;
- if ( $this->img->allowInlineDisplay() ) {
+ if ( $this->displayImg->allowInlineDisplay() ) {
# image
# "Download high res version" link below the image
- #$msgsize = wfMsgHtml('file-info-size', $width_orig, $height_orig, $sk->formatSize( $this->img->getSize() ), $mime );
+ #$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.
# because of rounding.
}
$msgbig = wfMsgHtml( 'show-big-image' );
- $msgsmall = wfMsgExt( 'show-big-image-thumb',
- array( 'parseinline' ), $wgLang->formatNum( $width ), $wgLang->formatNum( $height ) );
+ $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->img->getName() );
+ $msgbig = htmlspecialchars( $this->displayImg->getName() );
$msgsmall = wfMsgExt( 'file-nohires', array( 'parseinline' ) );
}
$params['width'] = $width;
- $thumbnail = $this->img->transform( $params );
+ $thumbnail = $this->displayImg->transform( $params );
$anchorclose = "<br />";
- if( $this->img->mustRender() ) {
+ if( $this->displayImg->mustRender() ) {
$showLink = true;
} else {
$anchorclose .=
'<br />' . Xml::tags( 'a', $linkAttribs, $msgbig ) . "$dirmark " . $longDesc;
}
- if ( $this->img->isMultipage() ) {
+ if ( $this->displayImg->isMultipage() ) {
$wgOut->addHTML( '<table class="multipageimage"><tr><td>' );
}
if ( $thumbnail ) {
$options = array(
- 'alt' => $this->img->getTitle()->getPrefixedText(),
+ 'alt' => $this->displayImg->getTitle()->getPrefixedText(),
'file-link' => true,
);
$wgOut->addHTML( '<div class="fullImageLink" id="file">' .
$anchorclose . '</div>' );
}
- if ( $this->img->isMultipage() ) {
- $count = $this->img->pageCount();
+ if ( $this->displayImg->isMultipage() ) {
+ $count = $this->displayImg->pageCount();
if ( $page > 1 ) {
$label = $wgOut->parse( wfMsg( 'imgmultipageprev' ), false );
$link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page-1) );
- $thumb1 = $sk->makeThumbLinkObj( $this->mTitle, $this->img, $link, $label, 'none',
+ $thumb1 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none',
array( 'page' => $page - 1 ) );
} else {
$thumb1 = '';
if ( $page < $count ) {
$label = wfMsg( 'imgmultipagenext' );
$link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page+1) );
- $thumb2 = $sk->makeThumbLinkObj( $this->mTitle, $this->img, $link, $label, 'none',
+ $thumb2 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none',
array( 'page' => $page + 1 ) );
} else {
$thumb2 = '';
}
} 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">' .
$icon->toHtml( array( 'desc-link' => true ) ) .
if ($showLink) {
- $filename = wfEscapeWikiText( $this->img->getName() );
+ $filename = wfEscapeWikiText( $this->displayImg->getName() );
- if (!$this->img->isSafeFile()) {
+ if ( !$this->displayImg->isSafeFile() ) {
$warning = wfMsgNoTrans( 'mediawarning' );
$wgOut->addWikiText( <<<EOT
<div class="fullMedia">
}
}
- if(!$this->img->isLocal()) {
+ if( !$this->displayImg->isLocal() ) {
$this->printSharedImageText();
}
} else {
$title = SpecialPage::getTitleFor( 'Upload' );
$link = $sk->makeKnownLinkObj($title, wfMsgHtml('noimage-linktext'),
- 'wpDestFile=' . urlencode( $this->img->getName() ) );
+ 'wpDestFile=' . urlencode( $this->displayImg->getName() ) );
$wgOut->addHTML( wfMsgWikiHtml( 'noimage', $link ) );
}
}
function printSharedImageText() {
global $wgOut, $wgUser;
+ $this->loadFile();
+
$descUrl = $this->img->getDescriptionUrl();
$descText = $this->img->getDescriptionText();
$s = "<div class='sharedUploadNotice'>" . wfMsgWikiHtml( 'sharedupload' );
}
}
+ /*
+ * Check for files with the same name on the foreign repos.
+ */
function checkSharedConflict() {
global $wgOut, $wgUser;
+
$repoGroup = RepoGroup::singleton();
if( !$repoGroup->hasForeignRepos() ) {
return;
}
+
+ $this->loadFile();
if( !$this->img->isLocal() ) {
return;
}
}
function checkSharedConflictCallback( $repo ) {
+ $this->loadFile();
$dupfile = $repo->newFile( $this->img->getTitle() );
- if( $dupfile->exists() )
+ if( $dupfile && $dupfile->exists() ) {
$this->dupFile = $dupfile;
- return $dupfile->exists();
+ return $dupfile->exists();
+ }
+ return false;
}
function getUploadUrl() {
+ $this->loadFile();
$uploadTitle = SpecialPage::getTitleFor( 'Upload' );
return $uploadTitle->getFullUrl( 'wpDestFile=' . urlencode( $this->img->getName() ) );
}
function uploadLinksBox() {
global $wgUser, $wgOut;
+ $this->loadFile();
if( !$this->img->isLocal() )
return;
* 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();
+ function imageHistory() {
+ global $wgOut, $wgUseExternalEditor;
+ $this->loadFile();
if ( $this->img->exists() ) {
- $list = new ImageHistoryList( $sk, $this->current );
- $file = $this->current;
- $dims = $file->getDimensionsString();
- $s = $list->beginImageHistoryList() .
- $list->imageHistoryLine( true, $file );
+ $list = new ImageHistoryList( $this );
+ $file = $this->img;
+ $s = $list->beginImageHistoryList();
+ $s .= $list->imageHistoryLine( true, $file );
// old image versions
$hist = $this->img->getHistory();
foreach( $hist as $file ) {
- $dims = $file->getDimensionsString();
$s .= $list->imageHistoryLine( false, $file );
}
$s .= $list->endImageHistoryList();
} else { $s=''; }
$wgOut->addHTML( $s );
- $this->img->resetHistory(); // free db resources
+ $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
}
- function imageLinks()
- {
- global $wgUser, $wgOut;
-
- $limit = 100;
+ function imageLinks() {
+ global $wgUser, $wgOut, $wgLang;
- $wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'filelinks' ), wfMsg( 'imagelinks' ) ) . "\n" );
+ $limit = 100;
$dbr = wfGetDB( DB_SLAVE );
__METHOD__,
array( 'LIMIT' => $limit + 1)
);
-
- if ( 0 == $dbr->numRows( $res ) ) {
+ $count = $dbr->numRows( $res );
+ if ( $count == 0 ) {
+ $wgOut->addHTML( "<div id='mw-imagepage-nolinkstoimage'>\n" );
$wgOut->addWikiMsg( 'nolinkstoimage' );
+ $wgOut->addHTML( "</div>\n" );
return;
}
- $wgOut->addWikiMsg( 'linkstoimage' );
- $wgOut->addHTML( "<ul class='mw-imagepage-linktoimage'>\n" );
+
+ $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();
$count = 0;
while ( $s = $res->fetchObject() ) {
$wgOut->addHTML( "<li>{$link}</li>\n" );
}
}
- $wgOut->addHTML( "</ul>\n" );
+ $wgOut->addHTML( "</ul></div>\n" );
$res->free();
-
+
// Add a links to [[Special:Whatlinkshere]]
if ( $count > $limit )
$wgOut->addWikiMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() );
}
- function imageRedirects()
- {
- global $wgUser, $wgOut;
-
- $dbr = wfGetDB( DB_SLAVE );
- $res = $dbr->select(
- array( 'redirect', 'page' ),
- array( 'page_title' ),
- array(
- 'rd_namespace' => NS_IMAGE,
- 'rd_title' => $this->mTitle->getDBkey(),
- 'page_namespace' => NS_IMAGE,
- 'rd_from = page_id'
- ),
- __METHOD__
- );
-
+ function imageRedirects() {
+ global $wgUser, $wgOut, $wgLang;
- if ( 0 == $dbr->numRows( $res ) )
- return;
+ $redirects = $this->getTitle()->getRedirectsHere( NS_IMAGE );
+ if ( count( $redirects ) == 0 ) return;
- $wgOut->addWikiMsg( 'redirectstofile' );
+ $wgOut->addHTML( "<div id='mw-imagepage-section-redirectstofile'>\n" );
+ $wgOut->addWikiMsg( 'redirectstofile',
+ $wgLang->formatNum( count( $redirects ) )
+ );
$wgOut->addHTML( "<ul class='mw-imagepage-redirectstofile'>\n" );
$sk = $wgUser->getSkin();
- while ( $row = $dbr->fetchObject( $res ) ) {
- $name = Title::makeTitle( NS_IMAGE, $row->page_title );
- $link = $sk->makeKnownLinkObj( $name, "" );
- wfDebug("Image redirect: {$row->page_title}\n");
+ foreach ( $redirects as $title ) {
+ $link = $sk->makeKnownLinkObj( $title, "", "redirect=no" );
$wgOut->addHTML( "<li>{$link}</li>\n" );
}
- $wgOut->addHTML( "</ul>\n" );
-
- $res->free();
+ $wgOut->addHTML( "</ul></div>\n" );
+
}
-
+
function imageDupes() {
- global $wgOut, $wgUser;
-
- if ( !( $hash = $this->img->getSha1() ) ) return;
- // Probably deprecates checkSharedConflict?
- $dupes = RepoGroup::singleton()->findBySha1( $hash );
- //$dupes = RepoGroup::singleton()->getLocalRepo()->findBySha1( $hash );
-
- // Don't dupe with self
- $self = $this->img->getRepoName().':'.$this->img->getName();
- foreach ( $dupes as $index => $file ) {
- $key = $file->getRepoName().':'.$file->getName();
- if ( $key == $self )
- unset( $dupes[$index] );
- }
+ global $wgOut, $wgUser, $wgLang;
+
+ $this->loadFile();
+
+ $dupes = $this->getDuplicates();
if ( count( $dupes ) == 0 ) return;
- $wgOut->addWikiMsg( 'duplicatesoffile' );
+ $wgOut->addHTML( "<div id='mw-imagepage-section-duplicates'>\n" );
+ $wgOut->addWikiMsg( 'duplicatesoffile',
+ $wgLang->formatNum( count( $dupes ) )
+ );
$wgOut->addHTML( "<ul class='mw-imagepage-duplicates'>\n" );
$sk = $wgUser->getSkin();
foreach ( $dupes as $file ) {
if ( $file->isLocal() )
$link = $sk->makeKnownLinkObj( $file->getTitle(), "" );
- else
- $link = $sk->makeExternalLink( $file->getDescriptionUrl(),
+ else {
+ $link = $sk->makeExternalLink( $file->getDescriptionUrl(),
$file->getTitle()->getPrefixedText() );
+ }
$wgOut->addHTML( "<li>{$link}</li>\n" );
}
- $wgOut->addHTML( "</ul>\n" );
+ $wgOut->addHTML( "</ul></div>\n" );
}
/**
* Delete the file, or an earlier version of it
*/
public function delete() {
- if( !$this->img->exists() || !$this->img->isLocal() ) {
+ $this->loadFile();
+ if( !$this->img->exists() || !$this->img->isLocal() || $this->img->getRedirected() ) {
// Standard article deletion
Article::delete();
return;
* Revert the file to an earlier version
*/
public function revert() {
+ $this->loadFile();
$reverter = new FileRevertForm( $this->img );
$reverter->execute();
}
* Override handling of action=purge
*/
function doPurge() {
+ $this->loadFile();
if( $this->img->exists() ) {
wfDebug( "ImagePage::doPurge purging " . $this->img->getName() . "\n" );
$update = new HTMLCacheUpdate( $this->mTitle, 'imagelinks' );
function showError( $description ) {
global $wgOut;
$wgOut->setPageTitle( wfMsg( "internalerror" ) );
- $wgOut->setRobotpolicy( "noindex,nofollow" );
+ $wgOut->setRobotPolicy( "noindex,nofollow" );
$wgOut->setArticleRelated( false );
$wgOut->enableClientCache( false );
$wgOut->addWikiText( $description );
/**
* Builds the image revision log shown on image pages
*
- * @addtogroup Media
+ * @ingroup Media
*/
class ImageHistoryList {
- protected $img, $skin, $title, $repo;
+ protected $imagePage, $img, $skin, $title, $repo;
+
+ public function __construct( $imagePage ) {
+ global $wgUser;
+ $this->skin = $wgUser->getSkin();
+ $this->current = $imagePage->getFile();
+ $this->img = $imagePage->getDisplayedFile();
+ $this->title = $imagePage->getTitle();
+ $this->imagePage = $imagePage;
+ }
+
+ function getImagePage() {
+ return $this->imagePage;
+ }
+
+ function getSkin() {
+ return $this->skin;
+ }
- public function __construct( $skin, $img ) {
- $this->skin = $skin;
- $this->img = $img;
- $this->title = $img->getTitle();
+ function getFile() {
+ return $this->img;
}
public function beginImageHistoryList() {
global $wgOut, $wgUser;
- $deleteColumn = $wgUser->isAllowed( 'delete' ) || $wgUser->isAllowed( 'deleterevision' );
return Xml::element( 'h2', array( 'id' => 'filehistory' ), wfMsg( 'filehist' ) )
. $wgOut->parse( wfMsgNoTrans( 'filehist-help' ) )
. Xml::openElement( 'table', array( 'class' => 'filehistory' ) ) . "\n"
. '<tr><td></td>'
- . ( $this->img->isLocal() && $deleteColumn ? '<td></td>' : '' )
+ . ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ? '<td></td>' : '' )
. '<th>' . wfMsgHtml( 'filehist-datetime' ) . '</th>'
- . '<th>' . wfMsgHtml( 'filehist-user' ) . '</th>'
+ . '<th>' . wfMsgHtml( 'filehist-thumb' ) . '</th>'
. '<th>' . wfMsgHtml( 'filehist-dimensions' ) . '</th>'
- . '<th class="mw-imagepage-filesize">' . wfMsgHtml( 'filehist-filesize' ) . '</th>'
+ . '<th>' . wfMsgHtml( 'filehist-user' ) . '</th>'
. '<th>' . wfMsgHtml( 'filehist-comment' ) . '</th>'
. "</tr>\n";
}
$dims = $file->getDimensionsString();
$sha1 = $file->getSha1();
- $local = $this->img->isLocal();
- $row = '';
+ $local = $this->current->isLocal();
+ $row = $css = $selected = '';
// Deletion link
if( $local && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ) {
wfMsgHtml( $iscur ? 'filehist-deleteall' : 'filehist-deleteone' ),
implode( '&', $q )
);
- $row .= '<br/>';
}
# Link to hide content
if( $wgUser->isAllowed( 'deleterevision' ) ) {
+ if( $wgUser->isAllowed('delete') ) {
+ $row .= '<br/>';
+ }
$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
// If file is top revision or locked from this user, don't link
if( $iscur || !$file->userCan(File::DELETED_RESTRICTED) ) {
if( $file->isDeleted(File::DELETED_RESTRICTED) )
$del = "<strong>$del</strong>";
}
- $row .= "<tt><small>$del</small></tt>";
+ $row .= "<tt style='white-space: nowrap;'><small>$del</small></tt>";
}
$row .= '</td>';
}
$row .= '</td>';
// Date/time and image link
- $row .= '<td>';
+ if( $file->getTimestamp() === $this->img->getTimestamp() ) {
+ $selected = "class='filehistory-selected'";
+ }
+ $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>';
$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
# Make a link to review the image
$url = $this->skin->makeKnownLinkObj( $revdel, $wgLang->timeAndDate( $timestamp, true ),
- "target=".$wgTitle->getPrefixedText()."&file=$sha1.".$this->img->getExtension() );
+ "target=".$wgTitle->getPrefixedText()."&file=$sha1.".$this->current->getExtension() );
$row .= '<span class="history-deleted">'.$url.'</span>';
} else {
- $url = $iscur ? $this->img->getUrl() : $this->img->getArchiveUrl( $img );
- $row .= Xml::element( 'a',
- array( 'href' => $url ),
- $wgLang->timeAndDate( $timestamp, true ) );
+ $url = $iscur ? $this->current->getUrl() : $this->current->getArchiveUrl( $img );
+ $row .= Xml::element( 'a', array( 'href' => $url ), $wgLang->timeAndDate( $timestamp, true ) );
}
- $row .= '</td>';
+ // Thumbnail
+ if( $file->allowInlineDisplay() && $file->userCan( File::DELETED_FILE ) && !$file->isDeleted( File::DELETED_FILE ) ) {
+ $params = array(
+ 'width' => '120',
+ 'height' => '120',
+ );
+ $thumbnail = $file->transform( $params );
+ $options = array(
+ 'alt' => wfMsg( 'filehist-thumbtext', $wgLang->timeAndDate( $timestamp, true ) ),
+ 'file-link' => true,
+ );
+ $row .= '</td><td>' . $thumbnail->toHtml( $options );
+ } else {
+ $row .= '</td><td>' . wfMsgHtml( 'filehist-nothumb' );
+ }
+ $row .= "</td><td>";
+
+ // Image dimensions
+ $row .= htmlspecialchars( $dims );
+
+ // File size
+ $row .= " <span style='white-space: nowrap;'>(" . $this->skin->formatSize( $size ) . ')</span>';
// Uploading user
- $row .= '<td>';
+ $row .= '</td><td>';
if( $local ) {
// Hide deleted usernames
- if( $file->isDeleted(File::DELETED_USER) )
+ if( $file->isDeleted(File::DELETED_USER) ) {
$row .= '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
- else
- $row .= $this->skin->userLink( $user, $usertext ) .
- $this->skin->userToolLinks( $user, $usertext );
+ } else {
+ $row .= $this->skin->userLink( $user, $usertext ) . " <span style='white-space: nowrap;'>" .
+ $this->skin->userToolLinks( $user, $usertext ) . "</span>";
+ }
} else {
$row .= htmlspecialchars( $usertext );
}
- $row .= '</td>';
-
- // Image dimensions
- $row .= '<td>' . htmlspecialchars( $dims ) . '</td>';
-
- // File size
- $row .= '<td class="mw-imagepage-filesize">' . $this->skin->formatSize( $size ) . '</td>';
+ $row .= '</td><td>';
// Don't show deleted descriptions
- if ( $file->isDeleted(File::DELETED_COMMENT) )
- $row .= '<td><span class="history-deleted">' . wfMsgHtml('rev-deleted-comment') . '</span></td>';
- else
- $row .= '<td>' . $this->skin->commentBlock( $description, $this->title ) . '</td>';
+ 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>';
+
+ wfRunHooks( 'ImagePageFileHistoryLine', array( $this, $file, &$row, &$rowClass ) );
+ $classAttr = $rowClass ? " class='$rowClass'" : "";
- return "<tr>{$row}</tr>\n";
+ return "<tr{$classAttr}>{$row}</tr>\n";
}
}
dépôts / lhc / web / wiklou.git / blobdiff