X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FImagePage.php;h=612d2a691921ce1fe301dd3890ee733cce7185dd;hb=45758df495630ea288f83d16d74bb97aa9bcdf17;hp=901a54b87a565babdf6406453348c27d619a0321;hpb=3c8690d8c478b4324ba4e0ecf26fb2fcd4de7237;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/ImagePage.php b/includes/ImagePage.php index 901a54b87a..612d2a6919 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -22,22 +22,28 @@ class ImagePage extends Article { $this->dupes = null; $this->repo = null; } + + public function setFile( $file ) { + $this->displayImg = $file; + $this->img = $file; + $this->fileLoaded = true; + } protected function loadFile() { - if ( $this->fileLoaded ) { + if( $this->fileLoaded ) { return true; } $this->fileLoaded = true; $this->displayImg = $this->img = false; wfRunHooks( 'ImagePageFindFile', array( $this, &$this->img, &$this->displayImg ) ); - if ( !$this->img ) { + if( !$this->img ) { $this->img = wfFindFile( $this->mTitle ); - if ( !$this->img ) { + if( !$this->img ) { $this->img = wfLocalFile( $this->mTitle ); } } - if ( !$this->displayImg ) { + if( !$this->displayImg ) { $this->displayImg = $this->img; } $this->repo = $this->img->getRepo(); @@ -47,18 +53,18 @@ class ImagePage extends Article { * Handler for action=render * Include body text only; none of the image extras */ - function render() { + public function render() { global $wgOut; $wgOut->setArticleBodyOnly( true ); parent::view(); } - function view() { + public 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() ) { + 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(); @@ -66,8 +72,8 @@ class ImagePage extends Article { // 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_FILE, $this->img->getName() ), + /* $appendSubtitle */ true, /* $forceKnown */ true ) ); $this->viewUpdates(); return; } @@ -76,10 +82,10 @@ class ImagePage extends Article { $diff = $wgRequest->getVal( 'diff' ); $diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) ); - if ( $this->mTitle->getNamespace() != NS_IMAGE || ( isset( $diff ) && $diffOnly ) ) + if( $this->mTitle->getNamespace() != NS_FILE || ( isset( $diff ) && $diffOnly ) ) return Article::view(); - if ( $wgShowEXIF && $this->displayImg->exists() ) { + if( $wgShowEXIF && $this->displayImg->exists() ) { // FIXME: bad interface, see note on MediaHandler::formatMetadata(). $formattedMetadata = $this->displayImg->formatMetadata(); $showmeta = $formattedMetadata !== false; @@ -87,53 +93,49 @@ class ImagePage extends Article { $showmeta = false; } - if ( $this->displayImg->exists() ) + if( !$diff && $this->displayImg->exists() ) $wgOut->addHTML( $this->showTOC($showmeta) ); - $this->openShowImage(); + if( !$diff ) + $this->openShowImage(); # No need to display noarticletext, we use our own message, output in openShowImage() - if ( $this->getID() ) { + if( $this->getID() ) { Article::view(); } else { # Just need to set the right headers $wgOut->setArticleFlag( true ); - $wgOut->setRobotpolicy( 'noindex,nofollow' ); $wgOut->setPageTitle( $this->mTitle->getPrefixedText() ); $this->viewUpdates(); } # Show shared description, if needed - if ( $this->mExtraDescription ) { + if( $this->mExtraDescription ) { $fol = wfMsgNoTrans( 'shareddescriptionfollows' ); if( $fol != '-' && !wfEmptyMsg( 'shareddescriptionfollows', $fol ) ) { $wgOut->addWikiText( $fol ); } - $wgOut->addHTML( '
' ); - } else { - $this->checkSharedConflict(); + $wgOut->addHTML( ' \n" ); } $this->closeShowImage(); $this->imageHistory(); // TODO: Cleanup the following - $wgOut->addHTML( Xml::element( 'h2', - array( 'id' => 'filelinks' ), + $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(); - } + # 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(); - if ( $showmeta ) { + if( $showmeta ) { global $wgStylePath, $wgStyleVersion; - $expand = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-expand' ) ) ); - $collapse = htmlspecialchars( wfEscapeJsString( wfMsg( 'metadata-collapse' ) ) ); - $wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ). "\n" ); + $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( @@ -143,32 +145,32 @@ class ImagePage extends Article { public function getRedirectTarget() { $this->loadFile(); - if ( $this->img->isLocal() ) { + if( $this->img->isLocal() ) { return parent::getRedirectTarget(); } // Foreign image page $from = $this->img->getRedirected(); $to = $this->img->getName(); - if ( $from == $to ) { + if( $from == $to ) { return null; } - return $this->mRedirectTarget = Title::makeTitle( NS_IMAGE, $to ); + return $this->mRedirectTarget = Title::makeTitle( NS_FILE, $to ); } public function followRedirect() { $this->loadFile(); - if ( $this->img->isLocal() ) { + if( $this->img->isLocal() ) { return parent::followRedirect(); } $from = $this->img->getRedirected(); $to = $this->img->getName(); - if ( $from == $to ) { + if( $from == $to ) { return false; } - return Title::makeTitle( NS_IMAGE, $to ); + return Title::makeTitle( NS_FILE, $to ); } public function isRedirect( $text = false ) { $this->loadFile(); - if ( $this->img->isLocal() ) + if( $this->img->isLocal() ) return parent::isRedirect( $text ); return (bool)$this->img->getRedirected(); @@ -191,10 +193,10 @@ class ImagePage extends Article { public function getDuplicates() { $this->loadFile(); - if ( !is_null($this->dupes) ) { + if( !is_null($this->dupes) ) { return $this->dupes; } - if ( !( $hash = $this->img->getSha1() ) ) { + if( !( $hash = $this->img->getSha1() ) ) { return $this->dupes = array(); } $dupes = RepoGroup::singleton()->findBySha1( $hash ); @@ -203,9 +205,9 @@ class ImagePage extends Article { $size = $this->img->getSize(); foreach ( $dupes as $index => $file ) { $key = $file->getRepoName().':'.$file->getName(); - if ( $key == $self ) + if( $key == $self ) unset( $dupes[$index] ); - if ( $file->getSize() != $size ) + if( $file->getSize() != $size ) unset( $dupes[$index] ); } return $this->dupes = $dupes; @@ -216,19 +218,17 @@ class ImagePage extends Article { /** * Create the TOC * - * @access private - * * @param bool $metadata Whether or not to show the metadata link * @return string */ - function showTOC( $metadata ) { + protected function showTOC( $metadata ) { global $wgLang; $r = '' );
}
- if ( $thumbnail ) {
+ if( $thumbnail ) {
$options = array(
'alt' => $this->displayImg->getTitle()->getPrefixedText(),
'file-link' => true,
);
$wgOut->addHTML( ' ' .
$thumbnail->toHtml( $options ) .
- $anchorclose . ' ' );
+ $anchorclose . "\n" );
}
- if ( $this->displayImg->isMultipage() ) {
+ if( $this->displayImg->isMultipage() ) {
$count = $this->displayImg->pageCount();
- if ( $page > 1 ) {
+ if( $page > 1 ) {
$label = $wgOut->parse( wfMsg( 'imgmultipageprev' ), false );
$link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page-1) );
$thumb1 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none',
@@ -385,7 +387,7 @@ class ImagePage extends Article {
$thumb1 = '';
}
- if ( $page < $count ) {
+ if( $page < $count ) {
$label = wfMsg( 'imgmultipagenext' );
$link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page+1) );
$thumb2 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none',
@@ -422,36 +424,39 @@ class ImagePage extends Article {
}
} else {
#if direct link is allowed but it's not a renderable image, show an icon.
- if ( $this->displayImg->isSafeFile() ) {
+ if( $this->displayImg->isSafeFile() ) {
$icon= $this->displayImg->iconThumb();
$wgOut->addHTML( '' .
$icon->toHtml( array( 'desc-link' => true ) ) .
- ' ' );
+ "\n" );
}
$showLink = true;
}
- if ($showLink) {
+ if($showLink) {
$filename = wfEscapeWikiText( $this->displayImg->getName() );
+ $medialink = $this->displayImg->isMissing() ?
+ "'''$filename'''" :
+ "[[Media:$filename|$filename]]";
- if ( !$this->displayImg->isSafeFile() ) {
+ if( !$this->displayImg->isSafeFile() ) {
$warning = wfMsgNoTrans( 'mediawarning' );
$wgOut->addWikiText( <<$warning
EOT
);
} else {
$wgOut->addWikiText( <<\n$1\n \n";
+ $repo = $this->img->getRepo()->getDisplayName();
- $sk = $wgUser->getSkin();
- $descUrl = $dupfile->getDescriptionUrl();
- if( $same ) {
- $link = $sk->makeExternalLink( $descUrl, wfMsg( 'shareduploadduplicate-linktext' ) );
- $wgOut->addHTML( ' ' );
+ $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 {
- $link = $sk->makeExternalLink( $descUrl, wfMsg( 'shareduploadconflict-linktext' ) );
- $wgOut->addHTML( ' ' );
+ $wgOut->wrapWikiMsg( $wrap, array( 'sharedupload', $repo ), ''/*BACKCOMPAT*/ );
}
- }
- function checkSharedConflictCallback( $repo ) {
- $this->loadFile();
- $dupfile = $repo->newFile( $this->img->getTitle() );
- if( $dupfile && $dupfile->exists() ) {
- $this->dupFile = $dupfile;
- return $dupfile->exists();
+ if( $descText ) {
+ $this->mExtraDescription = $descText;
}
- return false;
}
- function getUploadUrl() {
+ public function getUploadUrl() {
$this->loadFile();
$uploadTitle = SpecialPage::getTitleFor( 'Upload' );
- return $uploadTitle->getFullUrl( 'wpDestFile=' . urlencode( $this->img->getName() ) );
+ return $uploadTitle->getFullUrl( 'wpDestFile=' . urlencode( $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.
*/
- function uploadLinksBox() {
+ protected function uploadLinksBox() {
global $wgUser, $wgOut;
$this->loadFile();
@@ -567,69 +524,45 @@ EOT
$sk = $wgUser->getSkin();
- $wgOut->addHtml( '
\n" );
$wgOut->addWikiMsg( 'nolinkstoimage' );
$wgOut->addHTML( " \n" );
return;
}
+
$wgOut->addHTML( "\n" );
- $wgOut->addWikiText( wfMsgExt( 'linkstoimage', array( 'parsemag' ), $count ) );
- $wgOut->addHTML( " \n" );
+ $wgOut->addHTML( "\n" );
$res->free();
// Add a links to [[Special:Whatlinkshere]]
- if ( $count > $limit )
+ if( $count > $limit )
$wgOut->addWikiMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() );
+ $wgOut->addHTML( "\n" );
}
- function imageRedirects()
- {
- global $wgUser, $wgOut;
+ protected function imageRedirects() {
+ global $wgUser, $wgOut, $wgLang;
- $redirects = $this->getTitle()->getRedirectsHere( NS_IMAGE );
- if ( count( $redirects ) == 0 ) return;
+ $redirects = $this->getTitle()->getRedirectsHere( NS_FILE );
+ if( count( $redirects ) == 0 ) return;
$wgOut->addHTML( "
\n" );
- $wgOut->addWikiText( wfMsgExt( 'redirectstofile', array( 'parsemag' ), count( $redirects ) ) );
+ $wgOut->addWikiMsg( 'redirectstofile',
+ $wgLang->formatNum( count( $redirects ) )
+ );
$wgOut->addHTML( " \n" );
}
- function imageDupes() {
- global $wgOut, $wgUser;
+ protected function imageDupes() {
+ global $wgOut, $wgUser, $wgLang;
$this->loadFile();
$dupes = $this->getDuplicates();
- if ( count( $dupes ) == 0 ) return;
+ if( count( $dupes ) == 0 ) return;
$wgOut->addHTML( "
\n" );
- $wgOut->addWikiText( wfMsgExt( 'duplicatesoffile', array( 'parsemag' ), count( $dupes ) ) );
+ $wgOut->addWikiMsg( 'duplicatesoffile',
+ $wgLang->formatNum( count( $dupes ) ), $this->mTitle->getDBkey()
+ );
$wgOut->addHTML( " \n" );
}
@@ -742,7 +691,7 @@ EOT
/**
* Override handling of action=purge
*/
- function doPurge() {
+ public function doPurge() {
$this->loadFile();
if( $this->img->exists() ) {
wfDebug( "ImagePage::doPurge purging " . $this->img->getName() . "\n" );
@@ -751,7 +700,10 @@ EOT
$this->img->upgradeRow();
$this->img->purgeCache();
} else {
- wfDebug( "ImagePage::doPurge no image\n" );
+ 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();
}
@@ -762,7 +714,7 @@ EOT
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 );
@@ -788,34 +740,37 @@ class ImageHistoryList {
$this->imagePage = $imagePage;
}
- function getImagePage() {
+ public function getImagePage() {
return $this->imagePage;
}
- function getSkin() {
+ public function getSkin() {
return $this->skin;
}
- function getFile() {
+ public function getFile() {
return $this->img;
}
- public function beginImageHistoryList() {
+ public function beginImageHistoryList( $navLinks = '' ) {
global $wgOut, $wgUser;
- return Xml::element( 'h2', array( 'id' => 'filehistory' ), wfMsg( 'filehist' ) )
+ return Xml::element( 'h2', array( 'id' => 'filehistory' ), wfMsg( 'filehist' ) ) . "\n"
+ . "
\n"
. $wgOut->parse( wfMsgNoTrans( 'filehist-help' ) )
+ . $navLinks . "\n"
. Xml::openElement( 'table', array( 'class' => 'filehistory' ) ) . "\n"
. ' '
. ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ? ' | ' : '' )
. ' | ' . wfMsgHtml( 'filehist-datetime' ) . ' | '
+ . '' . wfMsgHtml( 'filehist-thumb' ) . ' | '
. '' . wfMsgHtml( 'filehist-dimensions' ) . ' | '
- . '' . wfMsgHtml( 'filehist-user' ) . ' | '
- . '' . wfMsgHtml( 'filehist-comment' ) . ' | '
+ . '' . wfMsgHtml( 'filehist-user' ) . ' | '
+ . '' . wfMsgHtml( 'filehist-comment' ) . ' | '
. " |