if( $this->mTitle->getNamespace() != NS_FILE || ( isset( $diff ) && $diffOnly ) )
return Article::view();
+
+ $this->showRedirectedFromHeader();
if( $wgShowEXIF && $this->displayImg->exists() ) {
// FIXME: bad interface, see note on MediaHandler::formatMetadata().
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 {
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 {
$icon= $this->displayImg->iconThumb();
$wgOut->addHTML( '<div class="fullImageLink" id="file">' .
- $icon->toHtml( array( 'desc-link' => true ) ) .
+ $icon->toHtml( array( 'file-link' => true ) ) .
"</div>\n" );
}
if($showLink) {
$filename = wfEscapeWikiText( $this->displayImg->getName() );
- $medialink = $this->displayImg->isMissing() ?
- "'''$filename'''" :
- "[[Media:$filename|$filename]]";
+ $medialink = "[[Media:$filename|$filename]]";
if( !$this->displayImg->isSafeFile() ) {
$warning = wfMsgNoTrans( 'mediawarning' );
if ( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
// Only show an upload link if the user can upload
$uploadTitle = SpecialPage::getTitleFor( 'Upload' );
- $nofile = wfMsgHtml(
+ $nofile = array(
'filepage-nofile-link',
$uploadTitle->getFullUrl( array( 'wpDestFile' => $this->img->getName() ) )
);
}
else
{
- $nofile = wfMsgHtml( 'filepage-nofile' );
+ $nofile = 'filepage-nofile';
}
$wgOut->setRobotPolicy( 'noindex,nofollow' );
- $wgOut->addHTML( '<div id="mw-imagepage-nofile" class="plainlinks">' . $nofile . '</div>' );
+ $wgOut->wrapWikiMsg( "<div id='mw-imagepage-nofile' class='plainlinks'>\n$1\n</div>", $nofile );
}
}
$wgOut->addHTML( "<br /><ul>\n" );
# "Upload a new version of this file" link
- if( UploadForm::userCanReUpload($wgUser,$this->img->name) ) {
+ 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
- $elink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'edit-externally' ), 'action=edit&externaledit=true&mode=file' );
+ $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" );
$count++;
if( $count <= $limit ) {
// We have not yet reached the extra one that tells us there is more to fetch
- $name = Title::makeTitle( $s->page_namespace, $s->page_title );
- $link = $sk->makeKnownLinkObj( $name, "" );
+ $link = $sk->link(
+ Title::makeTitle( $s->page_namespace, $s->page_title ),
+ null,
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ );
$wgOut->addHTML( "<li>{$link}</li>\n" );
}
}
$sk = $wgUser->getSkin();
foreach ( $redirects as $title ) {
- $link = $sk->makeKnownLinkObj( $title, "", "redirect=no" );
+ $link = $sk->link(
+ $title,
+ null,
+ array(),
+ array( 'redirect' => 'no' ),
+ array( 'known', 'noclasses' )
+ );
$wgOut->addHTML( "<li>{$link}</li>\n" );
}
$wgOut->addHTML( "</ul></div>\n" );
$sk = $wgUser->getSkin();
foreach ( $dupes as $file ) {
$fromSrc = '';
- if( $file->isLocal() )
- $link = $sk->makeKnownLinkObj( $file->getTitle(), "" );
- else {
+ if( $file->isLocal() ) {
+ $link = $sk->link(
+ $file->getTitle(),
+ null,
+ array(),
+ array(),
+ array( 'known', 'noclasses' )
+ );
+ } else {
$link = $sk->makeExternalLink( $file->getDescriptionUrl(),
$file->getTitle()->getPrefixedText() );
$fromSrc = wfMsg( 'shared-repo-from', $file->getRepo()->getDisplayName() );
* 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;
+ }
+
$this->loadFile();
if( !$this->img->exists() || !$this->img->isLocal() || $this->img->getRedirected() ) {
// Standard article deletion
*/
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();
}
public function getImagePage() {
. "<div id=\"mw-imagepage-section-filehistory\">\n"
. $wgOut->parse( wfMsgNoTrans( 'filehist-help' ) )
. $navLinks . "\n"
- . Xml::openElement( 'table', array( 'class' => 'filehistory' ) ) . "\n"
+ . Xml::openElement( 'table', array( 'class' => 'wikitable filehistory' ) ) . "\n"
. '<tr><td></td>'
- . ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ? '<td></td>' : '' )
+ . ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedhistory') ) ? '<td></td>' : '' )
. '<th>' . wfMsgHtml( 'filehist-datetime' ) . '</th>'
- . '<th>' . wfMsgHtml( 'filehist-thumb' ) . '</th>'
+ . ( $this->showThumb ? '<th>' . wfMsgHtml( 'filehist-thumb' ) . '</th>' : '' )
. '<th>' . wfMsgHtml( 'filehist-dimensions' ) . '</th>'
. '<th>' . wfMsgHtml( 'filehist-user' ) . '</th>'
. '<th>' . wfMsgHtml( 'filehist-comment' ) . '</th>'
$user = $file->getUser('id');
$usertext = $file->getUser('text');
$description = $file->getDescription();
- $sha1 = $file->getSha1();
$local = $this->current->isLocal();
$row = $css = $selected = '';
// Deletion link
- if( $local && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ) {
+ if( $local && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedhistory') ) ) {
$row .= '<td>';
# Link to remove from history
if( $wgUser->isAllowed( 'delete' ) ) {
array(), $q, array( 'known' )
);
}
- # Link to hide content
- if( $wgUser->isAllowed( 'deleterevision' ) ) {
+ # Link to hide content. Don't show useless link to people who cannot hide revisions.
+ if( $wgUser->isAllowed('deleterevision') || ($wgUser->isAllowed('deletedhistory') && $file->getVisibility()) ) {
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) ) {
$del = wfMsgHtml( 'rev-delundel' );
} else {
- // If the file was hidden, link to sha-1
list( $ts, $name ) = explode( '!', $img, 2 );
- $del = $this->skin->link( $revdel, wfMsgHtml( 'rev-delundel' ),
+ $del = $this->skin->link(
+ SpecialPage::getTitleFor( 'Revisiondelete' ),
+ wfMsgHtml( 'rev-delundel' ),
array(),
- array( 'target' => $wgTitle->getPrefixedText(), 'oldimage' => $ts ),
+ array(
+ 'type' => 'oldimage',
+ 'target' => $wgTitle->getPrefixedText(),
+ 'ids' => $ts,
+ ),
array( 'known' )
);
// Bolden oversighted content
if( $file->isDeleted(File::DELETED_RESTRICTED) )
$del = "<strong>$del</strong>";
}
- $row .= "<tt style='white-space: nowrap;'><small>$del</small></tt>";
+ $row .= "<span class='mw-revdelundel-link'>$del</span>";
}
$row .= '</td>';
}
if( $file->isDeleted(File::DELETED_FILE) ) {
$row .= wfMsgHtml('filehist-revert');
} else {
- $q = array();
- $q[] = 'action=revert';
- $q[] = 'oldimage=' . urlencode( $img );
- $q[] = 'wpEditToken=' . urlencode( $wgUser->editToken( $img ) );
- $row .= $this->skin->makeKnownLinkObj( $this->title,
+ $row .= $this->skin->link(
+ $this->title,
wfMsgHtml( 'filehist-revert' ),
- implode( '&', $q ) );
+ array(),
+ array(
+ 'action' => 'revert',
+ 'oldimage' => $img,
+ 'wpEditToken' => $wgUser->editToken( $img )
+ ),
+ array( 'known', 'noclasses' )
+ );
}
}
$row .= '</td>';
} elseif( $file->isDeleted(File::DELETED_FILE) ) {
$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->current->getExtension() );
+ $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>';
- } elseif( $file->isMissing() ) {
- # Don't link to missing files
- $row .= $wgLang->timeAndDate( $timestamp, true );
} else {
$url = $iscur ? $this->current->getUrl() : $this->current->getArchiveUrl( $img );
$row .= Xml::element( 'a', array( 'href' => $url ), $wgLang->timeAndDate( $timestamp, true ) );
$row .= "</td>";
// Thumbnail
- $row .= '<td>' . $this->getThumbForLine( $file ) . '</td>';
+ if ( $this->showThumb ) {
+ $row .= '<td>' . $this->getThumbForLine( $file ) . '</td>';
+ }
// Image dimensions + size
$row .= '<td>';
protected function getThumbForLine( $file ) {
global $wgLang;
- if( $file->isMissing() ) {
- return '<strong class="error">' . wfMsgHtml( 'filehist-missing' ) . '</strong>';
- } elseif( $file->allowInlineDisplay() && $file->userCan( File::DELETED_FILE ) && !$file->isDeleted( File::DELETED_FILE ) ) {
+ 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 ) ),
+ 'alt' => wfMsg( 'filehist-thumbtext',
+ $wgLang->timeAndDate( $timestamp, true ),
+ $wgLang->date( $timestamp, true ),
+ $wgLang->time( $timestamp, true ) ),
'file-link' => true,
);
dépôts / lhc / web / wiklou.git / blobdiff