ImagePage.php: Difference between revisions
From Knot Atlas
Jump to navigationJump to search
No edit summary |
m (Reverted edits by PasdoMacel (Talk); changed back to last version by Drorbn) |
||
(6 intermediate revisions by 4 users not shown) | |||
Line 1: | Line 1: | ||
[[User:Scott]] made some modifications to ImagePage.php, so when following redirects from image pages, the image is not displayed. |
|||
This is the original Image.php from mediawiki 1.4.7. |
|||
[[Category:Source Code]] |
|||
<pre> |
<pre> |
||
Line 104: | Line 105: | ||
$url = $full_url; |
$url = $full_url; |
||
} |
} |
||
# Changes by Scott Morrison, Aug 30, 2005. No rights reserved. |
|||
⚫ | |||
# try to determine if the image page we're on contains an image, without messing anything else up! |
|||
# this is a hack, and someone who knows better should fix it! |
|||
# in particular, the literal string "Image:" needs to be fixed. |
|||
$pageTitle = $this->getTitle(); |
|||
$pageTitle = $pageTitle->getText(); |
|||
$article = & new Article( Title::newFromText( "Image:".$pageTitle ) ); |
|||
$content = $article->getContent( true ); |
|||
# now if we've been specifically asked not to redirect, or we're on a normal image page, or , show the image |
|||
# otherwise, we're about to be redirected somewhere else, so don't show the image! |
|||
if($wgRequest->getVal( 'redirect' ) == 'no' || substr($content, 0 , 9) != '#REDIRECT') { |
|||
⚫ | |||
"<img border=\"0\" src=\"{$url}\" width=\"{$width}\" height=\"{$height}\" alt=\"" . |
"<img border=\"0\" src=\"{$url}\" width=\"{$width}\" height=\"{$height}\" alt=\"" . |
||
htmlspecialchars( $wgRequest->getVal( 'image' ) ).'" />' . $anchorclose . '</div>'; |
htmlspecialchars( $wgRequest->getVal( 'image' ) ).'" />' . $anchorclose . '</div>'; |
||
} else { |
|||
$s = ''; |
|||
} |
|||
} else { |
} else { |
||
$s = "<div class=\"fullMedia\">" . $sk->makeMediaLink( $this->img->getName(),'' ) . '</div>'; |
$s = "<div class=\"fullMedia\">" . $sk->makeMediaLink( $this->img->getName(),'' ) . '</div>'; |
Latest revision as of 16:33, 18 December 2008
User:Scott made some modifications to ImagePage.php, so when following redirects from image pages, the image is not displayed.
<?php /** * @package MediaWiki */ /** * */ if( !defined( 'MEDIAWIKI' ) ) die(); require_once( 'Image.php' ); /** * Special handling for image description pages * @package MediaWiki */ class ImagePage extends Article { /* private */ var $img; // Image object this page is shown for. Initilaized in openShowImage, not // available in doDelete etc. function view() { if ( Namespace::getImage() == $this->mTitle->getNamespace() ) { $this->openShowImage(); } Article::view(); # If the article we've just shown is in the "Image" namespace, # follow it with the history list and link list for the image # it describes. if ( Namespace::getImage() == $this->mTitle->getNamespace() ) { $this->closeShowImage(); $this->imageHistory(); $this->imageLinks(); } } function openShowImage() { global $wgOut, $wgUser, $wgImageLimits, $wgRequest, $wgUseImageResize; $this->img = Image::newFromTitle( $this->mTitle ); $full_url = $this->img->getViewURL(); $anchoropen = ''; $anchorclose = ''; if( $wgUser->getOption( 'imagesize' ) == '' ) { $sizeSel = User::getDefaultOption( 'imagesize' ); } else { $sizeSel = IntVal( $wgUser->getOption( 'imagesize' ) ); } if( !isset( $wgImageLimits[$sizeSel] ) ) { $sizeSel = User::getDefaultOption( 'imagesize' ); } $max = $wgImageLimits[$sizeSel]; $maxWidth = $max[0]; $maxHeight = $max[1]; if ( $this->img->exists() ) { $sk = $wgUser->getSkin(); if ( $this->img->getType() != '' ) { # image $width = $this->img->getWidth(); $height = $this->img->getHeight(); $msg = wfMsg('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 ); if ( ( $thumbnail == null ) || ( ( ! $this->img->mustRender() ) && ( $thumbnail->getSize() > $this->img->getSize() ) ) ) { # the thumbnail is bigger thatn the original image. # show the original image instead of the thumb. $url = $full_url; $width = $this->img->getWidth(); $height = $this->img->getHeight(); } 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; } $anchoropen = "<a href=\"{$full_url}\">"; $anchorclose = "</a><br />\n$anchoropen{$msg}</a>"; } else { $url = $full_url; } # Changes by Scott Morrison, Aug 30, 2005. No rights reserved. # try to determine if the image page we're on contains an image, without messing anything else up! # this is a hack, and someone who knows better should fix it! # in particular, the literal string "Image:" needs to be fixed. $pageTitle = $this->getTitle(); $pageTitle = $pageTitle->getText(); $article = & new Article( Title::newFromText( "Image:".$pageTitle ) ); $content = $article->getContent( true ); # now if we've been specifically asked not to redirect, or we're on a normal image page, or , show the image # otherwise, we're about to be redirected somewhere else, so don't show the image! if($wgRequest->getVal( 'redirect' ) == 'no' || substr($content, 0 , 9) != '#REDIRECT') { $s = '<div class="fullImageLink">' . $anchoropen . "<img border=\"0\" src=\"{$url}\" width=\"{$width}\" height=\"{$height}\" alt=\"" . htmlspecialchars( $wgRequest->getVal( 'image' ) ).'" />' . $anchorclose . '</div>'; } else { $s = ''; } } else { $s = "<div class=\"fullMedia\">" . $sk->makeMediaLink( $this->img->getName(),'' ) . '</div>'; } $wgOut->addHTML( $s ); if($this->img->fromSharedDirectory) { $wgOut->addWikiText("<div class=\"sharedUploadNotice\">".wfMsg("sharedupload")."</div>"); } } } function closeShowImage() { # For overloading } /** * 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; $sk = $wgUser->getSkin(); $line = $this->img->nextHistoryLine(); if ( $line ) { $list =& new ImageHistoryList( $sk ); $s = $list->beginImageHistoryList() . $list->imageHistoryLine( true, $line->img_timestamp, $this->mTitle->getDBkey(), $line->img_user, $line->img_user_text, $line->img_size, $line->img_description ); 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 ); } $s .= $list->endImageHistoryList(); } else { $s=''; } $wgOut->addHTML( $s ); } function imageLinks() { global $wgUser, $wgOut; $wgOut->addHTML( '<h2>' . wfMsg( 'imagelinks' ) . "</h2>\n" ); $dbr =& wfGetDB( DB_SLAVE ); $cur = $dbr->tableName( 'cur' ); $imagelinks = $dbr->tableName( 'imagelinks' ); $sql = "SELECT cur_namespace,cur_title FROM $imagelinks,$cur WHERE il_to=" . $dbr->addQuotes( $this->mTitle->getDBkey() ) . " AND il_from=cur_id" . " LIMIT 500"; # quickie emergency brake $res = $dbr->query( $sql, "ImagePage::imageLinks" ); if ( 0 == $dbr->numRows( $res ) ) { $wgOut->addHtml( '<p>' . wfMsg( "nolinkstoimage" ) . "</p>\n" ); return; } $wgOut->addHTML( '<p>' . wfMsg( 'linkstoimage' ) . "</p>\n<ul>" ); $sk = $wgUser->getSkin(); while ( $s = $dbr->fetchObject( $res ) ) { $name = Title::MakeTitle( $s->cur_namespace, $s->cur_title ); $link = $sk->makeKnownLinkObj( $name, "" ); $wgOut->addHTML( "<li>{$link}</li>\n" ); } $wgOut->addHTML( "</ul>\n" ); } function delete() { global $wgUser, $wgOut, $wgRequest; $confirm = $wgRequest->getBool( 'wpConfirm' ); $image = $wgRequest->getVal( 'image' ); $oldimage = $wgRequest->getVal( 'oldimage' ); # 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; } # Better double-check that it hasn't been deleted yet! $wgOut->setPagetitle( wfMsg( 'confirmdelete' ) ); if ( !is_null( $image ) ) { if ( '' == trim( $image ) ) { $wgOut->fatalError( wfMsg( 'cannotdelete' ) ); return; } } # Deleting old images doesn't require confirmation if ( !is_null( $oldimage ) || $confirm ) { if( $wgUser->matchEditToken( $wgRequest->getVal( 'wpEditToken' ), $oldimage ) ) { $this->doDelete(); } else { $wgOut->fatalError( wfMsg( 'sessionfailure' ) ); } return; } if ( !is_null( $image ) ) { $q = '&image=' . urlencode( $image ); } else if ( !is_null( $oldimage ) ) { $q = '&oldimage=' . urlencode( $oldimage ); } else { $q = ''; } return $this->confirmDelete( $q, $wgRequest->getText( 'wpReason' ) ); } function doDelete() { global $wgOut, $wgUser, $wgContLang, $wgRequest; global $wgUseSquid, $wgInternalServer, $wgDeferredUpdateList; $fname = 'ImagePage::doDelete'; $reason = $wgRequest->getVal( 'wpReason' ); $oldimage = $wgRequest->getVal( 'oldimage' ); $dbw =& wfGetDB( DB_MASTER ); if ( !is_null( $oldimage ) ) { if ( strlen( $oldimage ) < 16 ) { $wgOut->unexpectedValueError( 'oldimage', htmlspecialchars($oldimage) ); return; } if ( strstr( $oldimage, "/" ) || strstr( $oldimage, "\\" ) ) { $wgOut->unexpectedValueError( 'oldimage', htmlspecialchars($oldimage) ); return; } # Squid purging if ( $wgUseSquid ) { $archUrl = wfImageArchiveUrl( $oldimage ); # don't prefix with internal server if we share one (-> Commons) $prefix = preg_match("/^http:\/\//",$archUrl) ? '' : $wgInternalServer; $urlArr = Array( $prefix.$archUrl ); wfPurgeSquidServers($urlArr); } $this->doDeleteOldImage( $oldimage ); $dbw->delete( 'oldimage', array( 'oi_archive_name' => $oldimage ) ); $deleted = $oldimage; } else { $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}"; if( file_exists( $targetFile ) && ! @unlink( $targetFile ) ) { # If the deletion operation actually failed, bug out: $wgOut->fileDeleteError( $targetFile ); return; } $dbw->delete( 'image', array( 'img_name' => $image ) ); $res = $dbw->select( 'oldimage', array( 'oi_archive_name' ), array( 'oi_name' => $image ) ); # Squid purging if ( $wgUseSquid ) { $curUrl = Image::wfImageUrl( $image ); # don't prefix with internal server if we share one (-> Commons) $prefix = preg_match("/^http:\/\//",$curUrl) ? '' : $wgInternalServer; $urlArr = Array( $prefix.$curUrl ); wfPurgeSquidServers($urlArr); } $urlArr = Array(); while ( $s = $dbw->fetchObject( $res ) ) { $this->doDeleteOldImage( $s->oi_archive_name ); $urlArr[] = $wgInternalServer.wfImageArchiveUrl( $s->oi_archive_name ); } # Squid purging, part II if ( $wgUseSquid ) { /* this needs to be done after LinksUpdate */ $u = new SquidUpdate( $urlArr ); array_push( $wgDeferredUpdateList, $u ); } $dbw->delete( 'oldimage', array( 'oi_name' => $image ) ); # Image itself is now gone, and database is cleaned. # Now we remove the image description page. $nt = Title::newFromText( $wgContLang->getNsText( Namespace::getImage() ) . ":" . $image ); $article = new Article( $nt ); $article->doDeleteArticle( $reason ); # ignore errors /* refresh image metadata cache */ new Image( $image, true ); $deleted = $image; } $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) ); $wgOut->setRobotpolicy( 'noindex,nofollow' ); $sk = $wgUser->getSkin(); $loglink = $sk->makeKnownLink( $wgContLang->getNsText( NS_SPECIAL ) . ':Log/delete', wfMsg( 'deletionlog' ) ); $text = wfMsg( 'deletedtext', $deleted, $loglink ); $wgOut->addHTML( '<p>' . $text . "</p>\n" ); $wgOut->returnToMain( false ); } function doDeleteOldImage( $oldimage ) { global $wgOut; $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. # Also some records may end up with an empty oi_archive_name field # if the original file was missing when a new upload was made; # don't try to delete the directory then! # $targetFile = "{$archive}/{$oldimage}"; if( $oldimage != '' && file_exists( $targetFile ) && !@unlink( $targetFile ) ) { # If we actually have a file and can't delete it, throw an error. $wgOut->fileDeleteError( "{$archive}/{$oldimage}" ); } else { # Log the deletion $log = new LogPage( 'delete' ); $log->addEntry( 'delete', $this->mTitle, wfMsg('deletedrevision',$oldimage) ); } } function revert() { global $wgOut, $wgRequest, $wgUser; global $wgUseSquid, $wgInternalServer, $wgDeferredUpdateList; $oldimage = $wgRequest->getText( 'oldimage' ); if ( strlen( $oldimage ) < 16 ) { $wgOut->unexpectedValueError( 'oldimage', htmlspecialchars($oldimage) ); return; } if ( strstr( $oldimage, "/" ) || strstr( $oldimage, "\\" ) ) { $wgOut->unexpectedValueError( 'oldimage', htmlspecialchars($oldimage) ); return; } if ( wfReadOnly() ) { $wgOut->readOnlyPage(); return; } if( $wgUser->getId() == 0 ) { $wgOut->errorpage( 'uploadnologin', 'uploadnologintext' ); return; } if ( ! $this->mTitle->userCanEdit() ) { $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 ); $archive = wfImageArchiveDir( $name ); $curfile = "{$dest}/{$name}"; if ( ! is_file( $curfile ) ) { $wgOut->fileNotFoundError( htmlspecialchars( $curfile ) ); return; } $oldver = wfTimestampNow() . "!{$name}"; $dbr =& wfGetDB( DB_SLAVE ); $size = $dbr->selectField( 'oldimage', 'oi_size', 'oi_archive_name=\'' . $dbr->strencode( $oldimage ) . "'" ); if ( ! rename( $curfile, "${archive}/{$oldver}" ) ) { $wgOut->fileRenameError( $curfile, "${archive}/{$oldver}" ); return; } if ( ! copy( "{$archive}/{$oldimage}", $curfile ) ) { $wgOut->fileCopyError( "${archive}/{$oldimage}", $curfile ); } wfRecordUpload( $name, $oldver, $size, wfMsg( "reverted" ) ); /* refresh image metadata cache */ new Image( $name, true ); # Squid purging if ( $wgUseSquid ) { $archUrl = wfImageArchiveUrl( $name ); $curUrl = Image::wfImageUrl( $name ); $prefix = preg_match("/^http:\/\//",$curUrl) ? '' : $wgInternalServer; $urlArr = Array( $prefix.$archUrl, $prefix.$curUrl ); wfPurgeSquidServers($urlArr); } $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) ); $wgOut->setRobotpolicy( 'noindex,nofollow' ); $wgOut->addHTML( wfMsg( 'imagereverted' ) ); $wgOut->returnToMain( false ); } function blockedIPpage() { # yucky hack require_once( 'EditPage.php' ); $edit = new EditPage( $this->mTitle ); $edit->blockedIPpage(); return; } } class ImageHistoryList { function ImageHistoryList( &$skin ) { $this->skin =& $skin; } function beginImageHistoryList() { $s = "\n<h2>" . wfMsg( 'imghistory' ) . "</h2>\n" . "<p>" . wfMsg( 'imghistlegend' ) . "</p>\n".'<ul class="special">'; return $s; } function endImageHistoryList() { $s = "</ul>\n"; return $s; } function imageHistoryLine( $iscur, $timestamp, $img, $user, $usertext, $size, $description ) { global $wgUser, $wgLang, $wgContLang, $wgTitle; $datetime = $wgLang->timeanddate( $timestamp, true ); $del = wfMsg( 'deleteimg' ); $delall = wfMsg( 'deleteimgcompletely' ); $cur = wfMsg( 'cur' ); if ( $iscur ) { $url = Image::wfImageUrl( $img ); $rlink = $cur; if ( $wgUser->isAllowed('delete') ) { $link = $wgTitle->escapeLocalURL( 'image=' . $wgTitle->getPartialURL() . '&action=delete' ); $style = $this->skin->getInternalLinkAttributes( $link, $delall ); $dlink = '<a href="'.$link.'"'.$style.'>'.$delall.'</a>'; } else { $dlink = $del; } } else { $url = htmlspecialchars( wfImageArchiveUrl( $img ) ); if( $wgUser->getID() != 0 && $wgTitle->userCanEdit() ) { $token = urlencode( $wgUser->editToken( $img ) ); $rlink = $this->skin->makeKnownLink( $wgTitle->getPrefixedText(), wfMsg( 'revertimg' ), 'action=revert&oldimage=' . urlencode( $img ) . "&wpEditToken=$token" ); $dlink = $this->skin->makeKnownLink( $wgTitle->getPrefixedText(), $del, 'action=delete&oldimage=' . urlencode( $img ) . "&wpEditToken=$token" ); } else { # Having live active links for non-logged in users # means that bots and spiders crawling our site can # inadvertently change content. Baaaad idea. $rlink = wfMsg( 'revertimg' ); $dlink = $del; } } if ( 0 == $user ) { $userlink = $usertext; } else { $userlink = $this->skin->makeLink( $wgContLang->getNsText( Namespace::getUser() ) . ':'.$usertext, $usertext ); } $nbytes = wfMsg( 'nbytes', $size ); $style = $this->skin->getInternalLinkAttributes( $url, $datetime ); $s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a>" . " . . {$userlink} ({$nbytes})"; if ( '' != $description && '*' != $description ) { $sk=$wgUser->getSkin(); $s .= $wgContLang->emphasize(' (' . $sk->formatComment($description,$wgTitle) . ')'); } $s .= "</li>\n"; return $s; } } ?>