class ImagePage extends Article {
/* private */ var $img; // Image object this page is shown for
-
+ var $mExtraDescription = false;
+
+ function render() {
+ global $wgOut;
+ $wgOut->setArticleBodyOnly(true);
+ $wgOut->addWikitext($this->getContent(true));
+ }
+
function view() {
- global $wgUseExternalEditor, $wgOut ;
+ global $wgUseExternalEditor, $wgOut, $wgShowEXIF;
- $this->img = new Image( $this->mTitle );
+ $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;
+ }
+
+ if ($this->img->exists())
+ $wgOut->addHTML($this->showTOC($showmeta));
+
$this->openShowImage();
- if ( $this->img->exists() ) $this->showEXIFdata();
-
+ if ($exif)
+ $wgOut->addWikiText($this->makeMetadataTable($exif));
+
# 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->addMetaTags();
$this->viewUpdates();
}
-
- if ( $this->img->exists() ) {
- $this->uploadNewVersionLink();
- if ( $wgUseExternalEditor && $this->img->exists() ) {
- $this->externalEditorLink();
- }
+
+ if ($this->mExtraDescription) {
+ $fol = wfMsg('shareddescriptionfollows');
+ if ($fol != '-')
+ $wgOut->addWikiText(wfMsg('shareddescriptionfollows'));
+ $wgOut->addHTML($this->mExtraDescription);
}
+
$this->closeShowImage();
$this->imageHistory();
$this->imageLinks();
Article::view();
}
}
-
- function showEXIFdata()
- {
- global $wgOut , $wgShowEXIF ;
- if ( ! $wgShowEXIF ) return ;
-
- # Get the EXIF data
- $exif = $this->img->getExifData () ;
- if ( count ( $exif ) == 0 ) return ; # No EXIF data available
- if ( count ( $exif ) == 1 && isset ( $exif["EXIF"] ) && $exif["EXIF"] == "NO" ) return ; # This image does not have EXIF data
-
- # Create the table
- $r = "<table border='1' cellspacing='0' cellpadding='0' align='right'>" ;
- $r .= "<caption>EXIF data</caption>" ;
- foreach ( $exif AS $k => $v ) {
- $r .= "<tr>" ;
- $v = str_replace ( "\0" , "" , $v ) ;
- $r .= "<th><small>" . htmlspecialchars ( $k ) . "</small></th>" ;
- $r .= "<td><small>" . htmlspecialchars ( $v ) . "</small></td>" ;
- $r .= "</tr>" ;
- }
- $r .= "</table>" ;
- $wgOut->addHTML ( $r ) ;
+
+ /**
+ * 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">' . wfMsgHtml( 'metadata' ) . '</a></li>' : '') . '
+ <li><a href="#filehistory">' . wfMsgHtml( 'imghistory' ) . '</a></li>
+ <li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . '</a></li>
+ </ul>';
+ return $r;
+ }
+
+ /**
+ * Make a table with metadata to be shown in the output page.
+ *
+ * @access private
+ *
+ * @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 | '. wfMsg( 'metadata' ) . "\n";
+ foreach( $exif as $k => $v ) {
+ $tag = strtolower( $k );
+ $msg = wfMsg( "exif-$tag" );
+
+ $r .= "! class=$tag | $msg\n";
+ $r .= "| class=$tag | $v\n";
+ $r .= "|-\n";
}
+ return substr($r, 0, -3) . '|}';
+ }
+
+ /**
+ * Overloading Article's getContent method.
+ * Omit noarticletext if sharedupload
+ *
+ * @param $noredir If true, do not follow redirects
+ */
+ function getContent( $noredir )
+ {
+ if ( $this->img && $this->img->fromSharedDirectory && 0 == $this->getID() ) {
+ return '';
+ }
+ return Article::getContent( $noredir );
+ }
function openShowImage()
{
- global $wgOut, $wgUser, $wgImageLimits, $wgRequest,
- $wgUseImageResize, $wgRepositoryBaseUrl,
- $wgUseExternalEditor, $wgServer;
- $full_url = $this->img->getViewURL();
+ global $wgOut, $wgUser, $wgImageLimits, $wgRequest,
+ $wgUseImageResize, $wgRepositoryBaseUrl,
+ $wgUseExternalEditor, $wgServer, $wgFetchCommonsDescriptions;
+ $full_url = $this->img->getURL();
$anchoropen = '';
$anchorclose = '';
if( $wgUser->getOption( 'imagesize' ) == '' ) {
$sizeSel = User::getDefaultOption( 'imagesize' );
} else {
- $sizeSel = IntVal( $wgUser->getOption( 'imagesize' ) );
+ $sizeSel = intval( $wgUser->getOption( 'imagesize' ) );
}
if( !isset( $wgImageLimits[$sizeSel] ) ) {
$sizeSel = User::getDefaultOption( 'imagesize' );
$sk = $wgUser->getSkin();
if ( $this->img->exists() ) {
- if ( $this->img->getType() != '' ) {
+ # image
+ $width = $this->img->getWidth();
+ $height = $this->img->getHeight();
+ $showLink = false;
+
+ if ( $this->img->allowInlineDisplay() and $width and $height) {
# image
- $width = $this->img->getWidth();
- $height = $this->img->getHeight();
- $msg = wfMsg('showbigimage', $width, $height, intval( $this->img->getSize()/1024 ) );
+
+ # "Download high res version" link below the image
+ $msg = wfMsgHtml('showbigimage', $width, $height, intval( $this->img->getSize()/1024 ) );
if ( $width > $maxWidth ) {
$height = floor( $height * $maxWidth / $width );
$width = $maxWidth;
- }
+ }
if ( $height > $maxHeight ) {
$width = floor( $width * $maxHeight / $height );
$height = $maxHeight;
if ( $width != $this->img->getWidth() || $height != $this->img->getHeight() ) {
if( $wgUseImageResize ) {
$thumbnail = $this->img->getThumbnail( $width );
- $url = $thumbnail->getUrl();
+ if ( $thumbnail == null ) {
+ $url = $this->img->getViewURL();
+ } else {
+ $url = $thumbnail->getURL();
+ }
} else {
# No resize ability? Show the full image, but scale
# it down in the browser so it fits on the page.
- $url = $full_url;
+ $url = $this->img->getViewURL();
}
$anchoropen = "<a href=\"{$full_url}\">";
- $anchorclose = "</a><br />\n$anchoropen{$msg}</a>";
+ $anchorclose = "</a><br />";
+ if( $this->img->mustRender() ) {
+ $showLink = true;
+ } else {
+ $anchorclose .= "\n$anchoropen{$msg}</a>";
+ }
} else {
- $url = $full_url;
+ $url = $this->img->getViewURL();
+ $showLink = true;
}
- $s = '<div class="fullImageLink">' . $anchoropen .
+ $wgOut->addHTML( '<div class="fullImageLink" id="file">' . $anchoropen .
"<img border=\"0\" src=\"{$url}\" width=\"{$width}\" height=\"{$height}\" alt=\"" .
- htmlspecialchars( $wgRequest->getVal( 'image' ) ).'" />' . $anchorclose . '</div>';
+ htmlspecialchars( $wgRequest->getVal( 'image' ) ).'" />' . $anchorclose . '</div>' );
} else {
- $s = "<div class=\"fullMedia\">" . $sk->makeMediaLink( $this->img->getName(),'' ) . '</div>';
+ #if direct link is allowed but it's not a renderable image, show an icon.
+ if ($this->img->isSafeFile()) {
+ $icon= $this->img->iconThumb();
+
+ $wgOut->addHTML( '<div class="fullImageLink" id="file"><a href="' . $full_url . '">' .
+ $icon->toHtml() .
+ '</a></div>' );
+ }
+
+ $showLink = true;
}
- $wgOut->addHTML( $s );
- if($this->img->fromSharedDirectory) {
- $sharedtext="<div class=\"sharedUploadNotice\">" . wfMsg("sharedupload");
- if($wgRepositoryBaseUrl) {
- $sharedtext .= " ". wfMsg("shareduploadwiki",$wgRepositoryBaseUrl . urlencode($this->mTitle->getDBkey()));
+
+
+ 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
+<div class="fullMedia">
+<span class="dangerousLink">[[Media:$filename|$filename]]</span>
+<span class="fileInfo"> ($info)</span>
+</div>
+
+<div class="mediaWarning">$warning</div>
+END
+ );
+ } else {
+ $wgOut->addWikiText( <<<END
+<div class="fullMedia">
+[[Media:$filename|$filename]] <span class="fileInfo"> ($info)</span>
+</div>
+END
+ );
}
- $sharedtext.="</div>";
- $wgOut->addWikiText($sharedtext);
}
-
+
+ if($this->img->fromSharedDirectory) {
+ $this->printSharedImageText();
+ }
} else {
# Image does not exist
- $wgOut->addWikiText( wfMsg( 'noimage', $this->getUploadUrl() ) );
+
+ $title = Title::makeTitle( NS_SPECIAL, 'Upload' );
+ $link = $sk->makeKnownLinkObj($title, wfMsgHtml('noimage-linktext'),
+ 'wpDestFile=' . urlencode( $this->img->getName() ) );
+ $wgOut->addHTML( wfMsgWikiHtml( 'noimage', $link ) );
}
}
-
+
+ function printSharedImageText() {
+ global $wgRepositoryBaseUrl, $wgFetchCommonsDescriptions, $wgOut, $wgUser;
+
+ $url = $wgRepositoryBaseUrl . urlencode($this->mTitle->getDBkey());
+ $sharedtext = "<div class='sharedUploadNotice'>" . wfMsgWikiHtml("sharedupload");
+ if ($wgRepositoryBaseUrl && !$wgFetchCommonsDescriptions) {
+
+ $sk = $wgUser->getSkin();
+ $title = Title::makeTitle( NS_SPECIAL, 'Upload' );
+ $link = $sk->makeKnownLinkObj($title, wfMsgHtml('shareduploadwiki-linktext'),
+ array( 'wpDestFile' => urlencode( $this->img->getName() )));
+ $sharedtext .= " " . wfMsgWikiHtml('shareduploadwiki', $link);
+ }
+ $sharedtext .= "</div>";
+ $wgOut->addHTML($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;
+ }
+ }
+
function getUploadUrl() {
global $wgServer;
$uploadTitle = Title::makeTitle( NS_SPECIAL, 'Upload' );
}
- function uploadNewVersionLink() {
- global $wgOut;
- $wgOut->addWikiText( wfMsg( 'uploadnewversion', $this->getUploadUrl() ) );
- }
-
- function externalEditorLink()
+ function uploadLinksBox()
{
- global $wgUser,$wgOut;
+ global $wgUser, $wgOut;
+
+ if ($this->img->fromSharedDirectory)
+ return;
+
$sk = $wgUser->getSkin();
- $wgOut->addHTML( '<div class="editExternally">' );
+ $wgOut->addHTML( '<br /><ul>' );
+ if( $wgUser->isAllowed( 'reupload' ) ) {
+ $wgOut->addWikiText( "<li>\n<div>". wfMsg( 'uploadnewversion', $this->getUploadUrl() ) ."</div>\n</li>\n" );
+ }
+ $wgOut->addHTML( '<li>' );
$wgOut->addHTML( $sk->makeKnownLinkObj( $this->mTitle,
- wfMsg( 'edit-externally' ),
- "action=edit&externaledit=true&mode=file" ) );
- $wgOut->addWikiText( '<div class="editExternallyHelp">' .
- wfMsg('edit-externally-help') . '</div>' );
- $wgOut->addHTML( '</div><br clear="both" />' );
+ 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
-
+
}
/**
*/
function imageHistory()
{
- global $wgUser, $wgOut;
+ global $wgUser, $wgOut, $wgUseExternalEditor;
$sk = $wgUser->getSkin();
if ( $line ) {
$list =& new ImageHistoryList( $sk );
$s = $list->beginImageHistoryList() .
- $list->imageHistoryLine( true, $line->img_timestamp,
+ $list->imageHistoryLine( true, wfTimestamp(TS_MW, $line->img_timestamp),
$this->mTitle->getDBkey(), $line->img_user,
- $line->img_user_text, $line->img_size, $line->img_description );
+ $line->img_user_text, $line->img_size, $line->img_description,
+ $line->img_width, $line->img_height
+ );
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 );
+ $line->oi_archive_name, $line->img_user,
+ $line->img_user_text, $line->img_size, $line->img_description,
+ $line->img_width, $line->img_height
+ );
}
$s .= $list->endImageHistoryList();
} else { $s=''; }
$wgOut->addHTML( $s );
+
+ # 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() ) {
+ $this->uploadLinksBox();
+ }
+
}
function imageLinks()
{
global $wgUser, $wgOut;
- $wgOut->addHTML( '<h2>' . wfMsg( 'imagelinks' ) . "</h2>\n" );
+ $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
+ $dbr->addQuotes( $this->mTitle->getDBkey() ) . " AND il_from=page_id";
+ $sql = $dbr->limitResult($sql, 500, 0);
$res = $dbr->query( $sql, "ImagePage::imageLinks" );
if ( 0 == $dbr->numRows( $res ) ) {
$confirm = $wgRequest->getBool( 'wpConfirmB' );
$image = $wgRequest->getVal( 'image' );
$oldimage = $wgRequest->getVal( 'oldimage' );
-
- # Only sysops can delete images. Previously ordinary users could delete
+
+ # 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;
$wgOut->fatalError( wfMsg( 'cannotdelete' ) );
return;
}
-
+
$this->img = new Image( $this->mTitle );
-
+
# Deleting old images doesn't require confirmation
if ( !is_null( $oldimage ) || $confirm ) {
if( $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ), $oldimage ) ) {
}
return;
}
-
+
if ( !is_null( $image ) ) {
$q = '&image=' . urlencode( $image );
} else if ( !is_null( $oldimage ) ) {
$reason = $wgRequest->getVal( 'wpReason' );
$oldimage = $wgRequest->getVal( 'oldimage' );
-
+
$dbw =& wfGetDB( DB_MASTER );
if ( !is_null( $oldimage ) ) {
$wgOut->unexpectedValueError( 'oldimage', htmlspecialchars($oldimage) );
return;
}
-
+
# Invalidate description page cache
$this->mTitle->invalidateCache();
$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}";
return;
}
$dbw->delete( 'image', array( 'img_name' => $image ) );
- $res = $dbw->select( 'oldimage', array( 'oi_archive_name' ), array( 'oi_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 );
- }
+ }
# And also the HTML of all pages using this image
$linksTo = $this->img->getLinksTo();
$u = SquidUpdate::newFromTitles( $linksTo, $urlArr );
array_push( $wgPostCommitUpdateList, $u );
}
-
+
$dbw->delete( 'oldimage', array( 'oi_name' => $image ) );
# Image itself is now gone, and database is cleaned.
$wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
$wgOut->setRobotpolicy( 'noindex,nofollow' );
- $sk = $wgUser->getSkin();
- $loglink = $sk->makeKnownLinkObj(
- Title::makeTitle( NS_SPECIAL, 'Log/delete' ),
- wfMsg( 'deletionlog' ) );
-
+ $loglink = '[[Special:Log/delete|' . wfMsg( 'deletionlog' ) . ']]';
$text = wfMsg( 'deletedtext', $deleted, $loglink );
- $wgOut->addHTML( '<p>' . $text . "</p>\n" );
+ $wgOut->addWikiText( $text );
+
$wgOut->returnToMain( false, $this->mTitle->getPrefixedText() );
}
$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.
$wgOut->sysopRequired();
return;
}
+ if ( $wgUser->isBlocked() ) {
+ return $this->blockedIPpage();
+ }
if( !$wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ), $oldimage ) ) {
$wgOut->errorpage( 'internalerror', 'sessionfailure' );
return;
- }
+ }
$name = substr( $oldimage, 15 );
$dest = wfImageDir( $name );
return;
}
$oldver = wfTimestampNow() . "!{$name}";
-
+
$dbr =& wfGetDB( DB_SLAVE );
$size = $dbr->selectField( 'oldimage', 'oi_size', array( 'oi_archive_name' => $oldimage ) );
$descTitle = $img->getTitle();
$wgOut->returnToMain( false, $descTitle->getPrefixedText() );
}
+
+ function blockedIPpage() {
+ require_once( 'EditPage.php' );
+ $edit = new EditPage( $this );
+ return $edit->blockedIPpage();
+ }
+
}
/**
function ImageHistoryList( &$skin ) {
$this->skin =& $skin;
}
-
+
function beginImageHistoryList() {
- $s = "\n<h2>" . wfMsg( 'imghistory' ) . "</h2>\n" .
+ $s = "\n<h2 id=\"filehistory\">" . wfMsg( 'imghistory' ) . "</h2>\n" .
"<p>" . wfMsg( 'imghistlegend' ) . "</p>\n".'<ul class="special">';
return $s;
}
return $s;
}
- function imageHistoryLine( $iscur, $timestamp, $img, $user, $usertext, $size, $description ) {
+ function imageHistoryLine( $iscur, $timestamp, $img, $user, $usertext, $size, $description, $width, $height ) {
global $wgUser, $wgLang, $wgContLang, $wgTitle;
$datetime = $wgLang->timeanddate( $timestamp, true );
$usertext );
}
$nbytes = wfMsg( 'nbytes', $size );
+ $widthheight = wfMsg( 'widthheight', $width, $height );
$style = $this->skin->getInternalLinkAttributes( $url, $datetime );
- $s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a>"
- . " . . {$userlink} ({$nbytes})";
+ $s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a> . . {$userlink} . . {$widthheight} ({$nbytes})";
$s .= $this->skin->commentBlock( $description, $wgTitle );
$s .= "</li>\n";
dépôts / lhc / web / wiklou.git / blobdiff