X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FImagePage.php;h=b41e12646f1a09f4acc58c4ee242477909373cda;hb=8441c854aaadca54bc9a5c8d728ff80dcf3745cc;hp=ba544b9f08853a18715c23e37cbdb947ca2d54a7;hpb=289c1d7771858fb98b2c10907a65f4bca4cd03c5;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/ImagePage.php b/includes/ImagePage.php index ba544b9f08..b41e12646f 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -1,7 +1,6 @@ dupes = null; - $this->repo = null; + /** + * @param $title Title + * @return WikiFilePage + */ + protected function newPage( Title $title ) { + // Overload mPage with a file-specific page + return new WikiFilePage( $title ); + } + + /** + * Constructor from a page id + * @param $id Int article ID to load + * @returnImagePage|null + */ + public static function newFromID( $id ) { + $t = Title::newFromID( $id ); + # @todo FIXME: Doesn't inherit right + return $t == null ? null : new self( $t ); + # return $t == null ? null : new static( $t ); // PHP 5.3 } /** - * @param $file File: + * @param $file File: * @return void */ public function setFile( $file ) { + $this->mPage->setFile( $file ); $this->displayImg = $file; - $this->img = $file; $this->fileLoaded = true; } @@ -43,18 +55,19 @@ class ImagePage extends Article { } $this->fileLoaded = true; - $this->displayImg = $this->img = false; - wfRunHooks( 'ImagePageFindFile', array( $this, &$this->img, &$this->displayImg ) ); - if ( !$this->img ) { - $this->img = wfFindFile( $this->mTitle ); - if ( !$this->img ) { - $this->img = wfLocalFile( $this->mTitle ); + $this->displayImg = $img = false; + wfRunHooks( 'ImagePageFindFile', array( $this, &$img, &$this->displayImg ) ); + if ( !$img ) { // not set by hook? + $img = wfFindFile( $this->getTitle() ); + if ( !$img ) { + $img = wfLocalFile( $this->getTitle() ); } } - if ( !$this->displayImg ) { - $this->displayImg = $this->img; + $this->mPage->setFile( $img ); + if ( !$this->displayImg ) { // not set by hook? + $this->displayImg = $img; } - $this->repo = $this->img->getRepo(); + $this->repo = $img->getRepo(); } /** @@ -73,53 +86,60 @@ class ImagePage extends Article { $diff = $wgRequest->getVal( 'diff' ); $diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) ); - if ( $this->mTitle->getNamespace() != NS_FILE || ( isset( $diff ) && $diffOnly ) ) { + if ( $this->getTitle()->getNamespace() != NS_FILE || ( isset( $diff ) && $diffOnly ) ) { return parent::view(); } - + $this->loadFile(); - if ( $this->mTitle->getNamespace() == NS_FILE && $this->img->getRedirected() ) { - if ( $this->mTitle->getDBkey() == $this->img->getName() || isset( $diff ) ) { + if ( $this->getTitle()->getNamespace() == NS_FILE && $this->mPage->getFile()->getRedirected() ) { + if ( $this->getTitle()->getDBkey() == $this->mPage->getFile()->getName() || isset( $diff ) ) { // mTitle is the same as the redirect target so ask Article // to perform the redirect for us. $wgRequest->setVal( 'diffonly', 'true' ); return parent::view(); } else { - // mTitle is not the same as the redirect target so it is + // 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() ); - $wgOut->addHTML( $this->viewRedirect( Title::makeTitle( NS_FILE, $this->img->getName() ), + $wgOut->setPageTitle( $this->getTitle()->getPrefixedText() ); + $wgOut->addHTML( $this->viewRedirect( Title::makeTitle( NS_FILE, $this->mPage->getFile()->getName() ), /* $appendSubtitle */ true, /* $forceKnown */ true ) ); - $this->viewUpdates(); + $this->mPage->doViewUpdates( $this->getContext()->getUser() ); return; } } - $this->showRedirectedFromHeader(); - if ( $wgShowEXIF && $this->displayImg->exists() ) { - // FIXME: bad interface, see note on MediaHandler::formatMetadata(). + // @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata(). $formattedMetadata = $this->displayImg->formatMetadata(); $showmeta = $formattedMetadata !== false; } else { $showmeta = false; } - if ( !$diff && $this->displayImg->exists() ) + if ( !$diff && $this->displayImg->exists() ) { $wgOut->addHTML( $this->showTOC( $showmeta ) ); + } - if ( !$diff ) + if ( !$diff ) { $this->openShowImage(); + } # No need to display noarticletext, we use our own message, output in openShowImage() - if ( $this->getID() ) { + if ( $this->mPage->getID() ) { + # NS_FILE is in the user language, but this section (the actual wikitext) + # should be in page content language + $pageLang = $this->getTitle()->getPageLanguage(); + $wgOut->addHTML( Xml::openElement( 'div', array( 'id' => 'mw-imagepage-content', + 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(), + 'class' => 'mw-content-'.$pageLang->getDir() ) ) ); parent::view(); + $wgOut->addHTML( Xml::closeElement( 'div' ) ); } else { # Just need to set the right headers $wgOut->setArticleFlag( true ); - $wgOut->setPageTitle( $this->mTitle->getPrefixedText() ); - $this->viewUpdates(); + $wgOut->setPageTitle( $this->getTitle()->getPrefixedText() ); + $this->mPage->doViewUpdates( $this->getContext()->getUser() ); } # Show shared description, if needed @@ -139,101 +159,41 @@ class ImagePage extends Article { array( 'id' => 'filelinks' ), wfMsg( 'imagelinks' ) ) . "\n" ); $this->imageDupes(); - # TODO! FIXME! For some freaky reason, we can't redirect to foreign images. + # @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 ) + if ( $html ) { $wgOut->addHTML( $html ); + } if ( $showmeta ) { $wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ) . "\n" ); $wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) ); - $wgOut->addModules( array( 'mediawiki.legacy.metadata' ) ); - } - - $css = $this->repo->getDescriptionStylesheetUrl(); - if ( $css ) { - $wgOut->addStyle( $css ); - } - } - - public function getRedirectTarget() { - $this->loadFile(); - if ( $this->img->isLocal() ) { - return parent::getRedirectTarget(); + $wgOut->addModules( array( 'mediawiki.action.view.metadata' ) ); } - // Foreign image page - $from = $this->img->getRedirected(); - $to = $this->img->getName(); - if ( $from == $to ) { - return null; - } - return $this->mRedirectTarget = Title::makeTitle( NS_FILE, $to ); - } - public function followRedirect() { - $this->loadFile(); - if ( $this->img->isLocal() ) { - return parent::followRedirect(); - } - $from = $this->img->getRedirected(); - $to = $this->img->getName(); - if ( $from == $to ) { - return false; + // Add remote Filepage.css + if( !$this->repo->isLocal() ) { + $css = $this->repo->getDescriptionStylesheetUrl(); + if ( $css ) { + $wgOut->addStyle( $css ); + } } - return Title::makeTitle( NS_FILE, $to ); + // always show the local local Filepage.css, bug 29277 + $wgOut->addModuleStyles( 'filepage' ); } - public function isRedirect( $text = false ) { - $this->loadFile(); - if ( $this->img->isLocal() ) - return parent::isRedirect( $text ); - - return (bool)$this->img->getRedirected(); - } - - public function isLocal() { - $this->loadFile(); - return $this->img->isLocal(); - } - - public function getFile() { - $this->loadFile(); - return $this->img; - } - + /** + * @return File + */ public function getDisplayedFile() { $this->loadFile(); return $this->displayImg; } - - public function getDuplicates() { - $this->loadFile(); - if ( !is_null( $this->dupes ) ) { - return $this->dupes; - } - if ( !( $hash = $this->img->getSha1() ) ) { - return $this->dupes = array(); - } - $dupes = RepoGroup::singleton()->findBySha1( $hash ); - // Remove duplicates with self and non matching file sizes - $self = $this->img->getRepoName() . ':' . $this->img->getName(); - $size = $this->img->getSize(); - foreach ( $dupes as $index => $file ) { - $key = $file->getRepoName() . ':' . $file->getName(); - if ( $key == $self ) - unset( $dupes[$index] ); - if ( $file->getSize() != $size ) - unset( $dupes[$index] ); - } - return $this->dupes = $dupes; - - } /** * Create the TOC @@ -243,26 +203,26 @@ class ImagePage extends Article { */ protected function showTOC( $metadata ) { $r = array( - '
  • ' . wfMsgHtml( 'file-anchor-link' ) . '
    • ', - '
  • ' . wfMsgHtml( 'filehist' ) . '
    • ', - '
  • ' . wfMsgHtml( 'imagelinks' ) . '
    • ', + '
  • ' . wfMsgHtml( 'file-anchor-link' ) . '
    • ', + '
  • ' . wfMsgHtml( 'filehist' ) . '
    • ', + '
  • ' . wfMsgHtml( 'imagelinks' ) . '
    • ', ); if ( $metadata ) { $r[] = '
  • ' . wfMsgHtml( 'metadata' ) . '
    • '; } - + wfRunHooks( 'ImagePageShowTOC', array( $this, &$r ) ); - + return ''; } /** * Make a table with metadata to be shown in the output page. * - * FIXME: bad interface, see note on MediaHandler::formatMetadata(). + * @todo FIXME: Bad interface, see note on MediaHandler::formatMetadata(). * * @param $metadata Array: the array containing the EXIF data - * @return String + * @return String The metadata table. This is treated as Wikitext (!) */ protected function makeMetadataTable( $metadata ) { $r = "
    "; @@ -270,7 +230,7 @@ class ImagePage extends Article { $r .= "\n"; foreach ( $metadata as $type => $stuff ) { foreach ( $stuff as $v ) { - # FIXME, why is this using escapeId for a class?! + # @todo FIXME: Why is this using escapeId for a class?! $class = Sanitizer::escapeId( $v['id'] ); if ( $type == 'collapsed' ) { $class .= ' collapsable'; @@ -289,10 +249,11 @@ class ImagePage extends Article { * * Omit noarticletext if sharedupload; text will be fetched from the * shared upload server if possible. + * @return string */ public function getContent() { $this->loadFile(); - if ( $this->img && !$this->img->isLocal() && 0 == $this->getID() ) { + if ( $this->mPage->getFile() && !$this->mPage->getFile()->isLocal() && 0 == $this->getID() ) { return ''; } return parent::getContent(); @@ -300,7 +261,7 @@ class ImagePage extends Article { protected function openShowImage() { global $wgOut, $wgUser, $wgImageLimits, $wgRequest, - $wgLang, $wgContLang, $wgEnableUploads; + $wgLang, $wgEnableUploads, $wgSend404Code; $this->loadFile(); @@ -318,8 +279,7 @@ class ImagePage extends Article { $max = $wgImageLimits[$sizeSel]; $maxWidth = $max[0]; $maxHeight = $max[1]; - $sk = $wgUser->getSkin(); - $dirmark = $wgContLang->getDirMark(); + $dirmark = $wgLang->getDirMark(); if ( $this->displayImg->exists() ) { # image @@ -343,7 +303,7 @@ class ImagePage extends Article { # image # "Download high res version" link below the image - # $msgsize = wfMsgHtml('file-info-size', $width_orig, $height_orig, $sk->formatSize( $this->displayImg->getSize() ), $mime ); + # $msgsize = wfMsgHtml( 'file-info-size', $width_orig, $height_orig, Linker::formatSize( $this->displayImg->getSize() ), $mime ); # We'll show a thumbnail of this image if ( $width > $maxWidth || $height > $maxHeight ) { # Calculate the thumbnail size. @@ -364,17 +324,26 @@ class ImagePage extends Article { foreach ( $wgImageLimits as $size ) { if ( $size[0] < $width_orig && $size[1] < $height_orig && $size[0] != $width && $size[1] != $height ) { - $otherSizes[] = $this->makeSizeLink( $params, $size[0], $size[1] ); + $otherSizes[] = $this->makeSizeLink( $params, $size[0], $size[1] ); } } $msgsmall = wfMessage( 'show-big-image-preview' )-> rawParams( $this->makeSizeLink( $params, $width, $height ) )-> - parse() . ' ' . - wfMessage( 'show-big-image-other' )-> - rawParams( $wgLang->pipeList( $otherSizes ) )->parse(); + parse(); + if ( count( $otherSizes ) && $this->displayImg->getRepo()->canTransformVia404() ) { + $msgsmall .= ' ' . + Html::rawElement( 'span', array( 'class' => 'mw-filepage-other-resolutions' ), + wfMessage( 'show-big-image-other' )->rawParams( $wgLang->pipeList( $otherSizes ) )-> + params( count( $otherSizes ) )->parse() + ); + } + } elseif ( $width == 0 && $height == 0 ){ + # Some sort of audio file that doesn't have dimensions + # Don't output a no hi res message for such a file + $msgsmall = ''; } else { # Image is small enough to show full size on image page - $msgsmall = wfMsgExt( 'file-nohires', array( 'parseinline' ) ); + $msgsmall = wfMessage( 'file-nohires' )->parse(); } $params['width'] = $width; @@ -382,7 +351,7 @@ class ImagePage extends Article { $thumbnail = $this->displayImg->transform( $params ); $showLink = true; - $anchorclose = "
    " . $msgsmall; + $anchorclose = Html::rawElement( 'div', array( 'class' => 'mw-filepage-resolutioninfo' ), $msgsmall ); $isMulti = $this->displayImg->isMultipage() && $this->displayImg->pageCount() > 1; if ( $isMulti ) { @@ -404,14 +373,14 @@ class ImagePage extends Article { if ( $page > 1 ) { $label = $wgOut->parse( wfMsg( 'imgmultipageprev' ), false ); - $link = $sk->link( - $this->mTitle, + $link = Linker::link( + $this->getTitle(), $label, array(), array( 'page' => $page - 1 ), array( 'known', 'noclasses' ) ); - $thumb1 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none', + $thumb1 = Linker::makeThumbLinkObj( $this->getTitle(), $this->displayImg, $link, $label, 'none', array( 'page' => $page - 1 ) ); } else { $thumb1 = ''; @@ -419,14 +388,14 @@ class ImagePage extends Article { if ( $page < $count ) { $label = wfMsg( 'imgmultipagenext' ); - $link = $sk->link( - $this->mTitle, + $link = Linker::link( + $this->getTitle(), $label, array(), array( 'page' => $page + 1 ), array( 'known', 'noclasses' ) ); - $thumb2 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none', + $thumb2 = Linker::makeThumbLinkObj( $this->getTitle(), $this->displayImg, $link, $label, 'none', array( 'page' => $page + 1 ) ); } else { $thumb2 = ''; @@ -439,7 +408,7 @@ class ImagePage extends Article { 'action' => $wgScript, 'onchange' => 'document.pageselector.submit();', ); - + $options = array(); for ( $i = 1; $i <= $count; $i++ ) { $options[] = Xml::option( $wgLang->formatNum( $i ), $i, $i == $page ); } @@ -450,11 +419,11 @@ class ImagePage extends Article { $wgOut->addHTML( '
    ' . Xml::openElement( 'form', $formParams ) . - Html::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) . + Html::hidden( 'title', $this->getTitle()->getPrefixedDBkey() ) . wfMsgExt( 'imgmultigoto', array( 'parseinline', 'replaceafter' ), $select ) . Xml::submitButton( wfMsg( 'imgmultigo' ) ) . Xml::closeElement( 'form' ) . - "
    $thumb1\n$thumb2
    " + "
    $thumb1\n$thumb2
    " ); } } else { @@ -463,14 +432,13 @@ class ImagePage extends Article { $icon = $this->displayImg->iconThumb(); $wgOut->addHTML( '\n" ); + $icon->toHtml( array( 'file-link' => true ) ) . + "\n" ); } $showLink = true; } - if ( $showLink ) { $filename = wfEscapeWikiText( $this->displayImg->getName() ); $linktext = $filename; @@ -500,16 +468,30 @@ EOT } } else { # Image does not exist + if ( !$this->getID() ) { + # No article exists either + # Show deletion log to be consistent with normal articles + LogEventsList::showLogExtract( + $wgOut, + array( 'delete', 'move' ), + $this->getTitle()->getPrefixedText(), + '', + array( 'lim' => 10, + 'conds' => array( "log_action != 'revision'" ), + 'showIfEmpty' => false, + 'msgKey' => array( 'moveddeleted-notice' ) + ) + ); + } + if ( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) { // Only show an upload link if the user can upload $uploadTitle = SpecialPage::getTitleFor( 'Upload' ); $nofile = array( 'filepage-nofile-link', - $uploadTitle->getFullUrl( array( 'wpDestFile' => $this->img->getName() ) ) + $uploadTitle->getFullURL( array( 'wpDestFile' => $this->mPage->getFile()->getName() ) ) ); - } - else - { + } else { $nofile = 'filepage-nofile'; } // Note, if there is an image description page, but @@ -517,23 +499,23 @@ EOT // by Article::View(). $wgOut->setRobotPolicy( 'noindex,nofollow' ); $wgOut->wrapWikiMsg( "", $nofile ); - if ( !$this->getID() ) { + if ( !$this->getID() && $wgSend404Code ) { // If there is no image, no shared image, and no description page, // output a 404, to be consistent with articles. - $wgRequest->response()->header( "HTTP/1.1 404 Not Found" ); + $wgRequest->response()->header( 'HTTP/1.1 404 Not Found' ); } } + $wgOut->setFileVersion( $this->displayImg ); } - + /** - * Creates an thumbnail of specified size and returns an HTML link to it - * @param array $params Scaler parameters - * @param int $width - * @param int $height + * Creates an thumbnail of specified size and returns an HTML link to it + * @param $params array Scaler parameters + * @param $width int + * @param $height int + * @return string */ private function makeSizeLink( $params, $width, $height ) { - global $wgLang; - $params['width'] = $width; $params['height'] = $height; $thumbnail = $this->displayImg->transform( $params ); @@ -542,7 +524,7 @@ EOT 'href' => $thumbnail->getUrl(), 'class' => 'mw-thumbnail-link' ), wfMessage( 'show-big-image-size' )->numParams( - $thumbnail->getWidth(), $thumbnail->getHeight() + $thumbnail->getWidth(), $thumbnail->getHeight() )->parse() ); } else { return ''; @@ -557,16 +539,16 @@ EOT $this->loadFile(); - $descUrl = $this->img->getDescriptionUrl(); - $descText = $this->img->getDescriptionText(); + $descUrl = $this->mPage->getFile()->getDescriptionUrl(); + $descText = $this->mPage->getFile()->getDescriptionText(); /* Add canonical to head if there is no local page for this shared file */ - if( $descUrl && $this->getID() == 0 ) { + if( $descUrl && $this->mPage->getID() == 0 ) { $wgOut->addLink( array( 'rel' => 'canonical', 'href' => $descUrl ) ); } $wrap = "
    \n$1\n
    \n"; - $repo = $this->img->getRepo()->getDisplayName(); + $repo = $this->mPage->getFile()->getRepo()->getDisplayName(); if ( $descUrl && $descText && wfMsgNoTrans( 'sharedupload-desc-here' ) !== '-' ) { $wgOut->wrapWikiMsg( $wrap, array( 'sharedupload-desc-here', $repo, $descUrl ) ); @@ -584,8 +566,8 @@ EOT public function getUploadUrl() { $this->loadFile(); $uploadTitle = SpecialPage::getTitleFor( 'Upload' ); - return $uploadTitle->getFullUrl( array( - 'wpDestFile' => $this->img->getName(), + return $uploadTitle->getFullURL( array( + 'wpDestFile' => $this->mPage->getFile()->getName(), 'wpForReUpload' => 1 ) ); } @@ -602,23 +584,22 @@ EOT } $this->loadFile(); - if ( !$this->img->isLocal() ) + if ( !$this->mPage->getFile()->isLocal() ) { return; - - $sk = $wgUser->getSkin(); + } $wgOut->addHTML( "
    \n" ); @@ -648,69 +633,123 @@ EOT $wgOut->addHTML( $pager->getBody() ); $wgOut->preventClickjacking( $pager->getPreventClickjacking() ); - $this->img->resetHistory(); // free db resources + $this->mPage->getFile()->resetHistory(); // free db resources # 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 ( $this->img->exists() ) { + if ( $this->mPage->getFile()->exists() ) { $this->uploadLinksBox(); } } - protected function imageLinks() { - global $wgUser, $wgOut, $wgLang; - - $limit = 100; - + /** + * @param $target + * @param $limit + * @return ResultWrapper + */ + protected function queryImageLinks( $target, $limit ) { $dbr = wfGetDB( DB_SLAVE ); - $res = $dbr->select( + return $dbr->select( array( 'imagelinks', 'page' ), - array( 'page_namespace', 'page_title' ), - array( 'il_to' => $this->mTitle->getDBkey(), 'il_from = page_id' ), + array( 'page_namespace', 'page_title', 'page_is_redirect', 'il_to' ), + array( 'il_to' => $target, 'il_from = page_id' ), __METHOD__, - array( 'LIMIT' => $limit + 1 ) + array( 'LIMIT' => $limit + 1, 'ORDER BY' => 'il_from', ) ); - $count = $dbr->numRows( $res ); + } + + protected function imageLinks() { + global $wgOut, $wgLang; + + $limit = 100; + + $res = $this->queryImageLinks( $this->getTitle()->getDbKey(), $limit + 1); + $rows = array(); + $redirects = array(); + foreach ( $res as $row ) { + if ( $row->page_is_redirect ) { + $redirects[$row->page_title] = array(); + } + $rows[] = $row; + } + $count = count( $rows ); + + $hasMore = $count > $limit; + if ( !$hasMore && count( $redirects ) ) { + $res = $this->queryImageLinks( array_keys( $redirects ), + $limit - count( $rows ) + 1 ); + foreach ( $res as $row ) { + $redirects[$row->il_to][] = $row; + $count++; + } + $hasMore = ( $res->numRows() + count( $rows ) ) > $limit; + } + if ( $count == 0 ) { - $wgOut->wrapWikiMsg( Html::rawElement( 'div', array ( 'id' => 'mw-imagepage-nolinkstoimage' ), "\n$1\n" ), 'nolinkstoimage' ); + $wgOut->wrapWikiMsg( + Html::rawElement( 'div', + array( 'id' => 'mw-imagepage-nolinkstoimage' ), "\n$1\n" ), + 'nolinkstoimage' + ); return; } - + $wgOut->addHTML( "
    \n" ); - if ( $count <= $limit - 1 ) { + if ( !$hasMore ) { $wgOut->addWikiMsg( 'linkstoimage', $count ); } else { // More links than the limit. Add a link to [[Special:Whatlinkshere]] $wgOut->addWikiMsg( 'linkstoimage-more', $wgLang->formatNum( $limit ), - $this->mTitle->getPrefixedDBkey() + $this->getTitle()->getPrefixedDBkey() ); } - $wgOut->addHTML( Html::openElement( 'ul', array( 'class' => 'mw-imagepage-linkstoimage' ) ) . "\n" ); - $sk = $wgUser->getSkin(); + $wgOut->addHTML( + Html::openElement( 'ul', + array( 'class' => 'mw-imagepage-linkstoimage' ) ) . "\n" + ); $count = 0; - $elements = array(); - foreach ( $res as $s ) { - $count++; - if ( $count <= $limit ) { - // We have not yet reached the extra one that tells us there is more to fetch - $elements[] = $s; - } - } // Sort the list by namespace:title - usort ( $elements, array( $this, 'compare' ) ); + usort( $rows, 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( + $currentCount = 0; + foreach( $rows as $element ) { + $currentCount++; + if ( $currentCount > $limit ) { + break; + } + + $link = Linker::linkKnown( Title::makeTitle( $element->page_namespace, $element->page_title ) ); + if ( !isset( $redirects[$element->page_title] ) ) { + $liContents = $link; + } else { + $ul = "'; + $liContents = wfMessage( 'linkstoimage-redirect' )->rawParams( + $link, $ul )->parse(); + } + $wgOut->addHTML( Html::rawElement( + 'li', + array( 'id' => 'mw-imagepage-linkstoimage-ns' . $element->page_namespace ), + $liContents + ) . "\n" ); }; @@ -719,59 +758,34 @@ EOT // Add a links to [[Special:Whatlinkshere]] if ( $count > $limit ) { - $wgOut->addWikiMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() ); + $wgOut->addWikiMsg( 'morelinkstoimage', $this->getTitle()->getPrefixedDBkey() ); } $wgOut->addHTML( Html::closeElement( 'div' ) . "\n" ); } - - protected function imageRedirects() { - global $wgUser, $wgOut, $wgLang; - - $redirects = $this->getTitle()->getRedirectsHere( NS_FILE ); - if ( count( $redirects ) == 0 ) return; - - $wgOut->addHTML( "
    \n" ); - $wgOut->addWikiMsg( 'redirectstofile', - $wgLang->formatNum( count( $redirects ) ) - ); - $wgOut->addHTML( "
    \n" ); - - } protected function imageDupes() { - global $wgOut, $wgUser, $wgLang; + global $wgOut, $wgLang; $this->loadFile(); - $dupes = $this->getDuplicates(); + $dupes = $this->mPage->getDuplicates(); if ( count( $dupes ) == 0 ) { return; } $wgOut->addHTML( "
    \n" ); $wgOut->addWikiMsg( 'duplicatesoffile', - $wgLang->formatNum( count( $dupes ) ), $this->mTitle->getDBkey() + $wgLang->formatNum( count( $dupes ) ), $this->getTitle()->getDBkey() ); $wgOut->addHTML( "
    \n"; } /** - * @param $iscur - * @param File $file + * @param $iscur + * @param $file File * @return string */ public function imageHistoryLine( $iscur, $file ) { - global $wgUser, $wgLang; + global $wgUser, $wgLang, $wgContLang; $timestamp = wfTimestamp( TS_MW, $file->getTimestamp() ); $img = $iscur ? $file->getName() : $file->getArchiveName(); @@ -966,9 +956,10 @@ class ImageHistoryList { # Link to remove from history if ( $wgUser->isAllowed( 'delete' ) ) { $q = array( 'action' => 'delete' ); - if ( !$iscur ) + if ( !$iscur ) { $q['oldimage'] = $img; - $row .= $this->skin->link( + } + $row .= Linker::link( $this->title, wfMsgHtml( $iscur ? 'filehist-deleteall' : 'filehist-deleteone' ), array(), $q, array( 'known' ) @@ -982,7 +973,7 @@ class ImageHistoryList { } // If file is top revision or locked from this user, don't link if ( $iscur || !$file->userCan( File::DELETED_RESTRICTED ) ) { - $del = $this->skin->revDeleteLinkDisabled( $canHide ); + $del = Linker::revDeleteLinkDisabled( $canHide ); } else { list( $ts, $name ) = explode( '!', $img, 2 ); $query = array( @@ -990,7 +981,7 @@ class ImageHistoryList { 'target' => $this->title->getPrefixedText(), 'ids' => $ts, ); - $del = $this->skin->revDeleteLink( $query, + $del = Linker::revDeleteLink( $query, $file->isDeleted( File::DELETED_RESTRICTED ), $canHide ); } $row .= $del; @@ -1006,14 +997,14 @@ class ImageHistoryList { if ( $file->isDeleted( File::DELETED_FILE ) ) { $row .= wfMsgHtml( 'filehist-revert' ); } else { - $row .= $this->skin->link( + $row .= Linker::link( $this->title, wfMsgHtml( 'filehist-revert' ), array(), array( 'action' => 'revert', 'oldimage' => $img, - 'wpEditToken' => $wgUser->editToken( $img ) + 'wpEditToken' => $wgUser->getEditToken( $img ) ), array( 'known', 'noclasses' ) ); @@ -1028,26 +1019,30 @@ class ImageHistoryList { $row .= ""; if ( !$file->userCan( File::DELETED_FILE ) ) { # Don't link to unviewable files - $row .= '' . $wgLang->timeAndDate( $timestamp, true ) . ''; + $row .= '' . $wgLang->timeanddate( $timestamp, true ) . ''; } elseif ( $file->isDeleted( File::DELETED_FILE ) ) { - $this->preventClickjacking(); - $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); - # Make a link to review the image - $url = $this->skin->link( - $revdel, - $wgLang->timeAndDate( $timestamp, true ), - array(), - array( - 'target' => $this->title->getPrefixedText(), - 'file' => $img, - 'token' => $wgUser->editToken( $img ) - ), - array( 'known', 'noclasses' ) - ); + if ( $local ) { + $this->preventClickjacking(); + $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); + # Make a link to review the image + $url = Linker::link( + $revdel, + $wgLang->timeanddate( $timestamp, true ), + array(), + array( + 'target' => $this->title->getPrefixedText(), + 'file' => $img, + 'token' => $wgUser->getEditToken( $img ) + ), + array( 'known', 'noclasses' ) + ); + } else { + $url = $wgLang->timeanddate( $timestamp, true ); + } $row .= '' . $url . ''; } else { $url = $iscur ? $this->current->getUrl() : $this->current->getArchiveUrl( $img ); - $row .= Xml::element( 'a', array( 'href' => $url ), $wgLang->timeAndDate( $timestamp, true ) ); + $row .= Xml::element( 'a', array( 'href' => $url ), $wgLang->timeanddate( $timestamp, true ) ); } $row .= ""; @@ -1059,41 +1054,40 @@ class ImageHistoryList { // Image dimensions + size $row .= ''; $row .= htmlspecialchars( $file->getDimensionsString() ); - $row .= " (" . $this->skin->formatSize( $file->getSize() ) . ')'; + $row .= ' (' . Linker::formatSize( $file->getSize() ) . ')'; $row .= ''; // Uploading user $row .= ''; - if ( $local ) { - // Hide deleted usernames - if ( $file->isDeleted( File::DELETED_USER ) ) { - $row .= '' . wfMsgHtml( 'rev-deleted-user' ) . ''; + // Hide deleted usernames + if ( $file->isDeleted( File::DELETED_USER ) ) { + $row .= '' . wfMsgHtml( 'rev-deleted-user' ) . ''; + } else { + if ( $local ) { + $row .= Linker::userLink( $user, $usertext ) . ' ' . + Linker::userToolLinks( $user, $usertext ) . ''; } else { - $row .= $this->skin->userLink( $user, $usertext ) . " " . - $this->skin->userToolLinks( $user, $usertext ) . ""; + $row .= htmlspecialchars( $usertext ); } - } else { - $row .= htmlspecialchars( $usertext ); } - $row .= ''; + $row .= ''; // Don't show deleted descriptions if ( $file->isDeleted( File::DELETED_COMMENT ) ) { - $row .= '' . wfMsgHtml( 'rev-deleted-comment' ) . ''; + $row .= '' . wfMsgHtml( 'rev-deleted-comment' ) . ''; } else { - $row .= $this->skin->commentBlock( $description, $this->title ); + $row .= '' . Linker::formatComment( $description, $this->title ) . ''; } - $row .= ''; $rowClass = null; wfRunHooks( 'ImagePageFileHistoryLine', array( $this, $file, &$row, &$rowClass ) ); - $classAttr = $rowClass ? " class='$rowClass'" : ""; + $classAttr = $rowClass ? " class='$rowClass'" : ''; return "{$row}\n"; } /** - * @param File $file + * @param $file File * @return string */ protected function getThumbForLine( $file ) { @@ -1109,13 +1103,15 @@ class ImageHistoryList { $thumbnail = $file->transform( $params ); $options = array( 'alt' => wfMsg( 'filehist-thumbtext', - $wgLang->timeAndDate( $timestamp, true ), + $wgLang->timeanddate( $timestamp, true ), $wgLang->date( $timestamp, true ), $wgLang->time( $timestamp, true ) ), 'file-link' => true, ); - - if ( !$thumbnail ) return wfMsgHtml( 'filehist-nothumb' ); + + if ( !$thumbnail ) { + return wfMsgHtml( 'filehist-nothumb' ); + } return $thumbnail->toHtml( $options ); } else { @@ -1123,10 +1119,16 @@ class ImageHistoryList { } } + /** + * @param $enable bool + */ protected function preventClickjacking( $enable = true ) { $this->preventClickjacking = $enable; } + /** + * @return bool + */ public function getPreventClickjacking() { return $this->preventClickjacking; } @@ -1157,7 +1159,10 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager { $this->mHist = array(); $this->mRange = array( 0, 0 ); // display range } - + + /** + * @return Title + */ function getTitle() { return $this->mTitle; } @@ -1166,14 +1171,23 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager { return false; } + /** + * @return string + */ function getIndexField() { return ''; } + /** + * @return string + */ function formatRow( $row ) { return ''; } - + + /** + * @return string + */ function getBody() { $s = ''; $this->doQuery(); @@ -1197,7 +1211,9 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager { } function doQuery() { - if ( $this->mQueryDone ) return; + if ( $this->mQueryDone ) { + return; + } $this->mImg = $this->mImagePage->getFile(); // ensure loading if ( !$this->mImg->exists() ) { return; @@ -1274,11 +1290,17 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager { } $this->mQueryDone = true; } - + + /** + * @param $enable bool + */ protected function preventClickjacking( $enable = true ) { $this->preventClickjacking = $enable; } + /** + * @return bool + */ public function getPreventClickjacking() { return $this->preventClickjacking; }