X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FImagePage.php;h=91fd25db1368c36044487f59d26931d829a44bf2;hb=42b5c265c0b9c8323f659f3082152c28ed1ad2e6;hp=55e63baffe8912536f4e7e8bd98d48c1b8a94b41;hpb=61fe8acfc56b7110e002c9d4f5456fffc29d5241;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/ImagePage.php b/includes/ImagePage.php index 55e63baffe..91fd25db13 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -1,6 +1,6 @@ dupes = null; $this->repo = null; } + + public function setFile( $file ) { + $this->displayImg = $file; + $this->img = $file; + $this->fileLoaded = true; + } protected function loadFile() { if ( $this->fileLoaded ) { @@ -47,37 +53,42 @@ 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; + + $diff = $wgRequest->getVal( 'diff' ); + $diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) ); + + if ( $this->mTitle->getNamespace() != NS_FILE || ( isset( $diff ) && $diffOnly ) ) { + return parent::view(); + } + $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() || isset( $diff ) ) { // mTitle is the same as the redirect target so ask Article // to perform the redirect for us. - return Article::view(); + $wgRequest->setVal( 'diffonly', 'true' ); + return parent::view(); } else { // 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; } } - $diff = $wgRequest->getVal( 'diff' ); - $diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) ); - - if ( $this->mTitle->getNamespace() != NS_IMAGE || ( isset( $diff ) && $diffOnly ) ) - return Article::view(); + $this->showRedirectedFromHeader(); if ( $wgShowEXIF && $this->displayImg->exists() ) { // FIXME: bad interface, see note on MediaHandler::formatMetadata(). @@ -87,18 +98,18 @@ class ImagePage extends Article { $showmeta = false; } - if ( $this->displayImg->exists() ) - $wgOut->addHTML( $this->showTOC($showmeta) ); + 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() ) { - Article::view(); + parent::view(); } else { # Just need to set the right headers $wgOut->setArticleFlag( true ); - $wgOut->setRobotpolicy( 'noindex,nofollow' ); $wgOut->setPageTitle( $this->mTitle->getPrefixedText() ); $this->viewUpdates(); } @@ -106,39 +117,45 @@ class ImagePage extends Article { # Show shared description, if needed if ( $this->mExtraDescription ) { $fol = wfMsgNoTrans( 'shareddescriptionfollows' ); - if( $fol != '-' && !wfEmptyMsg( 'shareddescriptionfollows', $fol ) ) { + 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(); + + # 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( 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->addModules( array( 'mediawiki.legacy.metadata' ) ); $wgOut->addHTML( "\n" ); } + + $css = $this->repo->getDescriptionStylesheetUrl(); + if ( $css ) { + $wgOut->addStyle( $css ); + } } public function getRedirectTarget() { @@ -150,9 +167,9 @@ class ImagePage extends Article { $from = $this->img->getRedirected(); $to = $this->img->getName(); if ( $from == $to ) { - return null; + return null; } - return $this->mRedirectTarget = Title::makeTitle( NS_IMAGE, $to ); + return $this->mRedirectTarget = Title::makeTitle( NS_FILE, $to ); } public function followRedirect() { $this->loadFile(); @@ -162,9 +179,9 @@ class ImagePage extends Article { $from = $this->img->getRedirected(); $to = $this->img->getName(); if ( $from == $to ) { - return false; + return false; } - return Title::makeTitle( NS_IMAGE, $to ); + return Title::makeTitle( NS_FILE, $to ); } public function isRedirect( $text = false ) { $this->loadFile(); @@ -191,7 +208,7 @@ 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() ) ) { @@ -199,10 +216,10 @@ class ImagePage extends Article { } $dupes = RepoGroup::singleton()->findBySha1( $hash ); // Remove duplicates with self and non matching file sizes - $self = $this->img->getRepoName().':'.$this->img->getName(); + $self = $this->img->getRepoName() . ':' . $this->img->getName(); $size = $this->img->getSize(); foreach ( $dupes as $index => $file ) { - $key = $file->getRepoName().':'.$file->getName(); + $key = $file->getRepoName() . ':' . $file->getName(); if ( $key == $self ) unset( $dupes[$index] ); if ( $file->getSize() != $size ) @@ -216,20 +233,22 @@ class ImagePage extends Article { /** * Create the TOC * - * @access private - * - * @param bool $metadata Whether or not to show the metadata link - * @return string + * @param $metadata Boolean: whether or not to show the metadata link + * @return String */ - function showTOC( $metadata ) { - global $wgLang; - $r = '' );
}
@@ -370,15 +393,21 @@ class ImagePage extends Article {
);
$wgOut->addHTML( ' ' .
$thumbnail->toHtml( $options ) .
- $anchorclose . ' ' );
+ $anchorclose . "\n" );
}
- if ( $this->displayImg->isMultipage() ) {
+ if ( $isMulti ) {
$count = $this->displayImg->pageCount();
if ( $page > 1 ) {
$label = $wgOut->parse( wfMsg( 'imgmultipageprev' ), false );
- $link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page-1) );
+ $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 {
@@ -387,7 +416,13 @@ class ImagePage extends Article {
if ( $page < $count ) {
$label = wfMsg( 'imgmultipagenext' );
- $link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page+1) );
+ $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 {
@@ -402,9 +437,8 @@ class ImagePage extends Article {
'onchange' => 'document.pageselector.submit();',
);
- $option = array();
- for ( $i=1; $i <= $count; $i++ ) {
- $options[] = Xml::option( $wgLang->formatNum($i), $i, $i == $page );
+ for ( $i = 1; $i <= $count; $i++ ) {
+ $options[] = Xml::option( $wgLang->formatNum( $i ), $i, $i == $page );
}
$select = Xml::tags( 'select',
array( 'id' => 'pageselector', 'name' => 'page' ),
@@ -421,216 +455,169 @@ class ImagePage extends Article {
);
}
} else {
- #if direct link is allowed but it's not a renderable image, show an icon.
+ # if direct link is allowed but it's not a renderable image, show an icon.
if ( $this->displayImg->isSafeFile() ) {
- $icon= $this->displayImg->iconThumb();
+ $icon = $this->displayImg->iconThumb();
$wgOut->addHTML( '' .
- $icon->toHtml( array( 'desc-link' => true ) ) .
- ' ' );
+ $icon->toHtml( array( 'file-link' => true ) ) .
+ "\n" );
}
$showLink = true;
}
- if ($showLink) {
+ if ( $showLink ) {
$filename = wfEscapeWikiText( $this->displayImg->getName() );
+ $medialink = "[[Media:$filename|$filename]]";
if ( !$this->displayImg->isSafeFile() ) {
$warning = wfMsgNoTrans( 'mediawarning' );
$wgOut->addWikiText( <<$warning
EOT
);
} else {
$wgOut->addWikiText( <<\n$1\n ", $nofile );
}
}
/**
* Show a notice that the file is from a shared repository
*/
- function printSharedImageText() {
- global $wgOut, $wgUser;
+ protected function printSharedImageText() {
+ global $wgOut;
$this->loadFile();
$descUrl = $this->img->getDescriptionUrl();
$descText = $this->img->getDescriptionText();
- $s = " ";
- $wgOut->addHTML( $s );
-
- if ( $descText ) {
- $this->mExtraDescription = $descText;
- }
- }
-
- /*
- * 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;
- }
- $this->dupFile = null;
- $repoGroup->forEachForeignRepo( array( $this, 'checkSharedConflictCallback' ) );
-
- if( !$this->dupFile )
- return;
- $dupfile = $this->dupFile;
- $same = (
- ($this->img->getSha1() == $dupfile->getSha1()) &&
- ($this->img->getSize() == $dupfile->getSize())
- );
+ $wrap = "\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( ' ' );
+ 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( 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.
*/
- function uploadLinksBox() {
- global $wgUser, $wgOut;
+ protected function uploadLinksBox() {
+ global $wgUser, $wgOut, $wgEnableUploads, $wgUseExternalEditor;
+
+ if ( !$wgEnableUploads ) { return; }
$this->loadFile();
- if( !$this->img->isLocal() )
+ if ( !$this->img->isLocal() )
return;
$sk = $wgUser->getSkin();
- $wgOut->addHtml( '
\n" );
- $wgOut->addWikiMsg( 'nolinkstoimage' );
- $wgOut->addHTML( " \n" );
+ $count = $dbr->numRows( $res );
+ if ( $count == 0 ) {
+ $wgOut->wrapWikiMsg( Html::rawElement( 'div', array ( 'id' => 'mw-imagepage-nolinkstoimage' ), "\n$1\n" ), 'nolinkstoimage' );
return;
}
+
$wgOut->addHTML( "\n" );
- $wgOut->addWikiMsg( 'linkstoimage' );
- $wgOut->addHTML( " \n" );
+
+ // Sort the list by namespace:title
+ usort ( $elements, array( $this, 'compare' ) );
+
+ // Create links for every element
+ foreach( $elements as $element ) {
+ $link = $sk->linkKnown( Title::makeTitle( $element->page_namespace, $element->page_title ) );
+ $wgOut->addHTML( Html::rawElement(
+ 'li',
+ array( 'id' => 'mw-imagepage-linkstoimage-ns' . $element->page_namespace ),
+ $link
+ ) . "\n"
+ );
+
+ };
+ $wgOut->addHTML( Html::closeElement( 'ul' ) . "\n" );
$res->free();
-
+
// Add a links to [[Special:Whatlinkshere]]
- if ( $count > $limit )
+ if ( $count > $limit ) {
$wgOut->addWikiMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() );
+ }
+ $wgOut->addHTML( Html::closeElement( 'div' ) . "\n" );
}
- function imageRedirects()
- {
- global $wgUser, $wgOut;
-
- $redirects = $this->getTitle()->getRedirectsHere( NS_IMAGE );
+ protected function imageRedirects() {
+ global $wgUser, $wgOut, $wgLang;
+
+ $redirects = $this->getTitle()->getRedirectsHere( NS_FILE );
if ( count( $redirects ) == 0 ) return;
$wgOut->addHTML( "
\n" );
- $wgOut->addWikiMsg( 'redirectstofile' );
+ $wgOut->addWikiMsg( 'redirectstofile',
+ $wgLang->formatNum( count( $redirects ) )
+ );
$wgOut->addHTML( " \n" );
}
-
- function imageDupes() {
- global $wgOut, $wgUser;
+
+ protected function imageDupes() {
+ global $wgOut, $wgUser, $wgLang;
$this->loadFile();
@@ -701,17 +718,28 @@ EOT
if ( count( $dupes ) == 0 ) return;
$wgOut->addHTML( "
\n" );
- $wgOut->addWikiMsg( 'duplicatesoffile' );
+ $wgOut->addWikiMsg( 'duplicatesoffile',
+ $wgLang->formatNum( count( $dupes ) ), $this->mTitle->getDBkey()
+ );
$wgOut->addHTML( " \n" );
}
@@ -720,10 +748,17 @@ EOT
* 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( "
\n$1\n \n", array( 'filedelete-maintenance' ) );
+ return;
+ }
+
$this->loadFile();
- if( !$this->img->exists() || !$this->img->isLocal() || $this->img->getRedirected() ) {
+ if ( !$this->img->exists() || !$this->img->isLocal() || $this->img->getRedirected() ) {
// Standard article deletion
- Article::delete();
+ parent::delete();
return;
}
$deleter = new FileDeleteForm( $this->img );
@@ -742,16 +777,19 @@ EOT
/**
* Override handling of action=purge
*/
- function doPurge() {
+ public function doPurge() {
$this->loadFile();
- if( $this->img->exists() ) {
+ 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\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,12 +800,28 @@ 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 );
}
+
+ /**
+ * Callback for usort() to do link sorts by (namespace, title)
+ * Function copied from Title::compare()
+ *
+ * @param $a object page to compare with
+ * @param $b object page to compare with
+ * @return Integer: result of string comparison, or namespace comparison
+ */
+ protected function compare( $a, $b ) {
+ if ( $a->page_namespace == $b->page_namespace ) {
+ return strcmp( $a->page_title, $b->page_title );
+ } else {
+ return $a->page_namespace - $b->page_namespace;
+ }
+ }
}
/**
@@ -777,155 +831,172 @@ EOT
*/
class ImageHistoryList {
- protected $imagePage, $img, $skin, $title, $repo;
+ protected $imagePage, $img, $skin, $title, $repo, $showThumb;
public function __construct( $imagePage ) {
- global $wgUser;
+ 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();
}
- 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' ) )
- . Xml::openElement( 'table', array( 'class' => 'filehistory' ) ) . "\n"
+ . $navLinks . "\n"
+ . Xml::openElement( 'table', array( 'class' => 'wikitable filehistory' ) ) . "\n"
. ' '
- . ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ? ' | ' : '' )
+ . ( $this->current->isLocal() && ( $wgUser->isAllowed( 'delete' ) || $wgUser->isAllowed( 'deletedhistory' ) ) ? ' | ' : '' )
. ' | ' . wfMsgHtml( 'filehist-datetime' ) . ' | '
+ . ( $this->showThumb ? '' . wfMsgHtml( 'filehist-thumb' ) . ' | ' : '' )
. '' . wfMsgHtml( 'filehist-dimensions' ) . ' | '
- . '' . wfMsgHtml( 'filehist-user' ) . ' | '
- . '' . wfMsgHtml( 'filehist-comment' ) . ' | '
+ . '' . wfMsgHtml( 'filehist-user' ) . ' | '
+ . '' . wfMsgHtml( 'filehist-comment' ) . ' | '
. " |