' );
}
- if( $thumbnail ) {
+ if ( $thumbnail ) {
$options = array(
'alt' => $this->displayImg->getTitle()->getPrefixedText(),
'file-link' => true,
@@ -376,10 +388,10 @@ class ImagePage extends Article {
$anchorclose . "\n" );
}
- if( $this->displayImg->isMultipage() ) {
+ if ( $isMulti ) {
$count = $this->displayImg->pageCount();
- if( $page > 1 ) {
+ if ( $page > 1 ) {
$label = $wgOut->parse( wfMsg( 'imgmultipageprev' ), false );
$link = $sk->link(
$this->mTitle,
@@ -394,7 +406,7 @@ class ImagePage extends Article {
$thumb1 = '';
}
- if( $page < $count ) {
+ if ( $page < $count ) {
$label = wfMsg( 'imgmultipagenext' );
$link = $sk->link(
$this->mTitle,
@@ -417,9 +429,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' ),
@@ -428,7 +439,7 @@ class ImagePage extends Article {
$wgOut->addHTML(
' | ' .
Xml::openElement( 'form', $formParams ) .
- Xml::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) .
+ Html::hidden( 'title', $this->getTitle()->getPrefixedDbKey() ) .
wfMsgExt( 'imgmultigoto', array( 'parseinline', 'replaceafter' ), $select ) .
Xml::submitButton( wfMsg( 'imgmultigo' ) ) .
Xml::closeElement( 'form' ) .
@@ -436,12 +447,12 @@ class ImagePage extends Article {
);
}
} else {
- #if direct link is allowed but it's not a renderable image, show an icon.
- if( $this->displayImg->isSafeFile() ) {
- $icon= $this->displayImg->iconThumb();
+ # if direct link is allowed but it's not a renderable image, show an icon.
+ if ( $this->displayImg->isSafeFile() ) {
+ $icon = $this->displayImg->iconThumb();
$wgOut->addHTML( ' ' .
- $icon->toHtml( array( 'desc-link' => true ) ) .
+ $icon->toHtml( array( 'file-link' => true ) ) .
" \n" );
}
@@ -449,32 +460,31 @@ class ImagePage extends Article {
}
- if($showLink) {
+ if ( $showLink ) {
$filename = wfEscapeWikiText( $this->displayImg->getName() );
- $medialink = "[[Media:$filename|$filename]]";
+ $linktext = $filename;
+ if ( isset( $msgbig ) ) {
+ $linktext = wfEscapeWikiText( $msgbig );
+ }
+ $medialink = "[[Media:$filename|$linktext]]";
- if( !$this->displayImg->isSafeFile() ) {
+ if ( !$this->displayImg->isSafeFile() ) {
$warning = wfMsgNoTrans( 'mediawarning' );
$wgOut->addWikiText( <<
-{$medialink}$dirmark
-$longDesc
-
+{$medialink}$dirmark $longDesc
$warning
EOT
);
} else {
$wgOut->addWikiText( <<
-{$medialink}{$dirmark}
-$longDesc
+{$medialink}{$dirmark} $longDesc
EOT
);
}
}
- if( !$this->displayImg->isLocal() ) {
+ if ( !$this->displayImg->isLocal() ) {
$this->printSharedImageText();
}
} else {
@@ -507,11 +517,15 @@ EOT
$descUrl = $this->img->getDescriptionUrl();
$descText = $this->img->getDescriptionText();
+ /* Add canonical to head if there is no local page for this shared file */
+ if( $descUrl && $this->getID() == 0 ) {
+ $wgOut->addLink( array( 'rel' => 'canonical', 'href' => $descUrl ) );
+ }
+
$wrap = "\n$1\n \n";
$repo = $this->img->getRepo()->getDisplayName();
- $msg = '';
- if( $descUrl && $descText && wfMsgNoTrans( 'sharedupload-desc-here' ) !== '-' ) {
+ 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 ) );
@@ -519,7 +533,7 @@ EOT
$wgOut->wrapWikiMsg( $wrap, array( 'sharedupload', $repo ), ''/*BACKCOMPAT*/ );
}
- if( $descText ) {
+ if ( $descText ) {
$this->mExtraDescription = $descText;
}
}
@@ -538,12 +552,12 @@ EOT
* external editing (and instructions link) etc.
*/
protected function uploadLinksBox() {
- global $wgUser, $wgOut, $wgEnableUploads;
+ global $wgUser, $wgOut, $wgEnableUploads, $wgUseExternalEditor;
- if( !$wgEnableUploads ) { return; }
+ if ( !$wgEnableUploads ) { return; }
$this->loadFile();
- if( !$this->img->isLocal() )
+ if ( !$this->img->isLocal() )
return;
$sk = $wgUser->getSkin();
@@ -551,36 +565,38 @@ EOT
$wgOut->addHTML( "
\n" );
# "Upload a new version of this file" link
- if( UploadBase::userCanReUpload($wgUser,$this->img->name) ) {
+ if ( UploadBase::userCanReUpload( $wgUser, $this->img->name ) ) {
$ulink = $sk->makeExternalLink( $this->getUploadUrl(), wfMsg( 'uploadnewversion-linktext' ) );
$wgOut->addHTML( "{$ulink} \n" );
}
# External editing link
- $elink = $sk->link(
- $this->mTitle,
- wfMsgHtml( 'edit-externally' ),
- array(),
- array(
- 'action' => 'edit',
- 'externaledit' => 'true',
- 'mode' => 'file'
- ),
- array( 'known', 'noclasses' )
- );
- $wgOut->addHTML( '- ' . $elink . ' ' . wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) . "
\n" );
+ if ( $wgUseExternalEditor ) {
+ $elink = $sk->link(
+ $this->mTitle,
+ wfMsgHtml( 'edit-externally' ),
+ array(),
+ array(
+ 'action' => 'edit',
+ 'externaledit' => 'true',
+ 'mode' => 'file'
+ ),
+ array( 'known', 'noclasses' )
+ );
+ $wgOut->addHTML( '- ' . $elink . ' ' . wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) . "
\n" );
+ }
$wgOut->addHTML( " \n" );
}
- protected function closeShowImage() {} # For overloading
+ protected 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.
*/
protected function imageHistory() {
- global $wgOut, $wgUseExternalEditor;
+ global $wgOut;
$this->loadFile();
$pager = new ImageHistoryPseudoPager( $this );
@@ -590,7 +606,7 @@ EOT
# 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() ) {
+ if ( $this->img->exists() ) {
$this->uploadLinksBox();
}
}
@@ -607,18 +623,16 @@ EOT
array( 'page_namespace', 'page_title' ),
array( 'il_to' => $this->mTitle->getDBkey(), 'il_from = page_id' ),
__METHOD__,
- array( 'LIMIT' => $limit + 1)
+ array( 'LIMIT' => $limit + 1 )
);
$count = $dbr->numRows( $res );
- if( $count == 0 ) {
- $wgOut->addHTML( "\n" );
- $wgOut->addWikiMsg( 'nolinkstoimage' );
- $wgOut->addHTML( " \n" );
+ if ( $count == 0 ) {
+ $wgOut->wrapWikiMsg( Html::rawElement( 'div', array ( 'id' => 'mw-imagepage-nolinkstoimage' ), "\n$1\n" ), 'nolinkstoimage' );
return;
}
$wgOut->addHTML( "\n" );
- if( $count <= $limit - 1 ) {
+ if ( $count <= $limit - 1 ) {
$wgOut->addWikiMsg( 'linkstoimage', $count );
} else {
// More links than the limit. Add a link to [[Special:Whatlinkshere]]
@@ -628,37 +642,47 @@ EOT
);
}
- $wgOut->addHTML( " \n" );
+ $wgOut->addHTML( Html::openElement( 'ul', array( 'class' => 'mw-imagepage-linkstoimage' ) ) . "\n" );
$sk = $wgUser->getSkin();
$count = 0;
- while ( $s = $res->fetchObject() ) {
+ $elements = array();
+ foreach ( $res as $s ) {
$count++;
- if( $count <= $limit ) {
+ if ( $count <= $limit ) {
// We have not yet reached the extra one that tells us there is more to fetch
- $link = $sk->link(
- Title::makeTitle( $s->page_namespace, $s->page_title ),
- null,
- array(),
- array(),
- array( 'known', 'noclasses' )
- );
- $wgOut->addHTML( "- {$link}
\n" );
+ $elements[] = $s;
}
}
- $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( " \n" );
+ }
+ $wgOut->addHTML( Html::closeElement( 'div' ) . "\n" );
}
protected function imageRedirects() {
global $wgUser, $wgOut, $wgLang;
$redirects = $this->getTitle()->getRedirectsHere( NS_FILE );
- if( count( $redirects ) == 0 ) return;
+ if ( count( $redirects ) == 0 ) return;
$wgOut->addHTML( "\n" );
$wgOut->addWikiMsg( 'redirectstofile',
@@ -687,7 +711,7 @@ EOT
$this->loadFile();
$dupes = $this->getDuplicates();
- if( count( $dupes ) == 0 ) return;
+ if ( count( $dupes ) == 0 ) return;
$wgOut->addHTML( " \n" );
$wgOut->addWikiMsg( 'duplicatesoffile',
@@ -698,7 +722,7 @@ EOT
$sk = $wgUser->getSkin();
foreach ( $dupes as $file ) {
$fromSrc = '';
- if( $file->isLocal() ) {
+ if ( $file->isLocal() ) {
$link = $sk->link(
$file->getTitle(),
null,
@@ -721,16 +745,16 @@ EOT
*/
public function delete() {
global $wgUploadMaintenance;
- if( $wgUploadMaintenance && $this->mTitle && $this->mTitle->getNamespace() == NS_FILE ) {
+ if ( $wgUploadMaintenance && $this->mTitle && $this->mTitle->getNamespace() == NS_FILE ) {
global $wgOut;
- $wgOut->addWikiText('Deletion and restoration of images temporarily disabled during maintenance.' );
+ $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 );
@@ -751,7 +775,7 @@ EOT
*/
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();
@@ -778,6 +802,22 @@ EOT
$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;
+ }
+ }
}
/**
@@ -796,7 +836,7 @@ class ImageHistoryList {
$this->img = $imagePage->getDisplayedFile();
$this->title = $imagePage->getTitle();
$this->imagePage = $imagePage;
- $this->showThumb = $wgShowArchiveThumbnails;
+ $this->showThumb = $wgShowArchiveThumbnails && $this->img->canRender();
}
public function getImagePage() {
@@ -819,7 +859,7 @@ class ImageHistoryList {
. $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' ) . ' | '
@@ -833,24 +873,24 @@ class ImageHistoryList {
}
public function imageHistoryLine( $iscur, $file ) {
- global $wgUser, $wgLang, $wgContLang, $wgTitle;
+ global $wgUser, $wgLang;
- $timestamp = wfTimestamp(TS_MW, $file->getTimestamp());
+ $timestamp = wfTimestamp( TS_MW, $file->getTimestamp() );
$img = $iscur ? $file->getName() : $file->getArchiveName();
- $user = $file->getUser('id');
- $usertext = $file->getUser('text');
+ $user = $file->getUser( 'id' );
+ $usertext = $file->getUser( 'text' );
$description = $file->getDescription();
$local = $this->current->isLocal();
- $row = $css = $selected = '';
+ $row = $selected = '';
// Deletion link
- if( $local && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ) {
+ if ( $local && ( $wgUser->isAllowed( 'delete' ) || $wgUser->isAllowed( 'deletedhistory' ) ) ) {
$row .= '';
# Link to remove from history
- if( $wgUser->isAllowed( 'delete' ) ) {
+ if ( $wgUser->isAllowed( 'delete' ) ) {
$q = array( 'action' => 'delete' );
- if( !$iscur )
+ if ( !$iscur )
$q['oldimage'] = $img;
$row .= $this->skin->link(
$this->title,
@@ -858,42 +898,37 @@ class ImageHistoryList {
array(), $q, array( 'known' )
);
}
- # Link to hide content
- if( $wgUser->isAllowed( 'deleterevision' ) ) {
- if( $wgUser->isAllowed('delete') ) {
- $row .= ' ';
+ # Link to hide content. Don't show useless link to people who cannot hide revisions.
+ $canHide = $wgUser->isAllowed( 'deleterevision' );
+ if ( $canHide || ( $wgUser->isAllowed( 'deletedhistory' ) && $file->getVisibility() ) ) {
+ if ( $wgUser->isAllowed( 'delete' ) ) {
+ $row .= ' ';
}
- $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' );
+ if ( $iscur || !$file->userCan( File::DELETED_RESTRICTED ) ) {
+ $del = $this->skin->revDeleteLinkDisabled( $canHide );
} else {
list( $ts, $name ) = explode( '!', $img, 2 );
- $del = $this->skin->link( $revdel, wfMsgHtml( 'rev-delundel' ),
- array(),
- array(
- 'type' => 'oldimage',
- 'target' => $wgTitle->getPrefixedText(),
- 'ids' => $ts,
- ),
- array( 'known' )
+ $query = array(
+ 'type' => 'oldimage',
+ 'target' => $this->title->getPrefixedText(),
+ 'ids' => $ts,
);
- // Bolden oversighted content
- if( $file->isDeleted(File::DELETED_RESTRICTED) )
- $del = "$del";
+ $del = $this->skin->revDeleteLink( $query,
+ $file->isDeleted( File::DELETED_RESTRICTED ), $canHide );
}
- $row .= "$del";
+ $row .= $del;
}
$row .= ' | ';
}
// Reversion link/current indicator
$row .= '';
- if( $iscur ) {
+ if ( $iscur ) {
$row .= wfMsgHtml( 'filehist-current' );
- } elseif( $local && $wgUser->isLoggedIn() && $this->title->userCan( 'edit' ) ) {
- if( $file->isDeleted(File::DELETED_FILE) ) {
- $row .= wfMsgHtml('filehist-revert');
+ } elseif ( $local && $wgUser->isLoggedIn() && $this->title->userCan( 'edit' ) ) {
+ if ( $file->isDeleted( File::DELETED_FILE ) ) {
+ $row .= wfMsgHtml( 'filehist-revert' );
} else {
$row .= $this->skin->link(
$this->title,
@@ -911,14 +946,14 @@ class ImageHistoryList {
$row .= ' | ';
// Date/time and image link
- if( $file->getTimestamp() === $this->img->getTimestamp() ) {
+ if ( $file->getTimestamp() === $this->img->getTimestamp() ) {
$selected = "class='filehistory-selected'";
}
$row .= "";
- if( !$file->userCan(File::DELETED_FILE) ) {
+ if ( !$file->userCan( File::DELETED_FILE ) ) {
# Don't link to unviewable files
$row .= '' . $wgLang->timeAndDate( $timestamp, true ) . '';
- } elseif( $file->isDeleted(File::DELETED_FILE) ) {
+ } elseif ( $file->isDeleted( File::DELETED_FILE ) ) {
$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
# Make a link to review the image
$url = $this->skin->link(
@@ -926,13 +961,13 @@ class ImageHistoryList {
$wgLang->timeAndDate( $timestamp, true ),
array(),
array(
- 'target' => $wgTitle->getPrefixedText(),
+ 'target' => $this->title->getPrefixedText(),
'file' => $img,
'token' => $wgUser->editToken( $img )
),
array( 'known', 'noclasses' )
);
- $row .= ''.$url.'';
+ $row .= '' . $url . '';
} else {
$url = $iscur ? $this->current->getUrl() : $this->current->getArchiveUrl( $img );
$row .= Xml::element( 'a', array( 'href' => $url ), $wgLang->timeAndDate( $timestamp, true ) );
@@ -952,12 +987,12 @@ class ImageHistoryList {
// Uploading user
$row .= ' | ';
- if( $local ) {
+ if ( $local ) {
// Hide deleted usernames
- if( $file->isDeleted(File::DELETED_USER) ) {
+ if ( $file->isDeleted( File::DELETED_USER ) ) {
$row .= '' . wfMsgHtml( 'rev-deleted-user' ) . '';
} else {
- $row .= $this->skin->userLink( $user, $usertext ) . " " .
+ $row .= $this->skin->userLink( $user, $usertext ) . " " .
$this->skin->userToolLinks( $user, $usertext ) . "";
}
} else {
@@ -966,13 +1001,14 @@ class ImageHistoryList {
$row .= ' | ';
// Don't show deleted descriptions
- if( $file->isDeleted(File::DELETED_COMMENT) ) {
- $row .= '' . wfMsgHtml('rev-deleted-comment') . '';
+ if ( $file->isDeleted( File::DELETED_COMMENT ) ) {
+ $row .= '' . wfMsgHtml( 'rev-deleted-comment' ) . '';
} else {
$row .= $this->skin->commentBlock( $description, $this->title );
}
$row .= ' | ';
+ $rowClass = null;
wfRunHooks( 'ImagePageFileHistoryLine', array( $this, $file, &$row, &$rowClass ) );
$classAttr = $rowClass ? " class='$rowClass'" : "";
@@ -982,12 +1018,12 @@ class ImageHistoryList {
protected function getThumbForLine( $file ) {
global $wgLang;
- if( $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',
);
- $timestamp = wfTimestamp(TS_MW, $file->getTimestamp());
+ $timestamp = wfTimestamp( TS_MW, $file->getTimestamp() );
$thumbnail = $file->transform( $params );
$options = array(
@@ -1011,9 +1047,9 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager {
function __construct( $imagePage ) {
parent::__construct();
$this->mImagePage = $imagePage;
- $this->mTitle = clone( $imagePage->getTitle() );
+ $this->mTitle = clone ( $imagePage->getTitle() );
$this->mTitle->setFragment( '#filehistory' );
- $this->mImg = NULL;
+ $this->mImg = null;
$this->mHist = array();
$this->mRange = array( 0, 0 ); // display range
}
@@ -1037,68 +1073,68 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager {
function getBody() {
$s = '';
$this->doQuery();
- if( count($this->mHist) ) {
+ if ( count( $this->mHist ) ) {
$list = new ImageHistoryList( $this->mImagePage );
# Generate prev/next links
$navLink = $this->getNavigationBar();
- $s = $list->beginImageHistoryList($navLink);
+ $s = $list->beginImageHistoryList( $navLink );
// Skip rows there just for paging links
- for( $i = $this->mRange[0]; $i <= $this->mRange[1]; $i++ ) {
+ for ( $i = $this->mRange[0]; $i <= $this->mRange[1]; $i++ ) {
$file = $this->mHist[$i];
$s .= $list->imageHistoryLine( !$file->isOld(), $file );
}
- $s .= $list->endImageHistoryList($navLink);
+ $s .= $list->endImageHistoryList( $navLink );
}
return $s;
}
function doQuery() {
- if( $this->mQueryDone ) return;
+ if ( $this->mQueryDone ) return;
$this->mImg = $this->mImagePage->getFile(); // ensure loading
- if( !$this->mImg->exists() ) {
+ if ( !$this->mImg->exists() ) {
return;
}
$queryLimit = $this->mLimit + 1; // limit plus extra row
- if( $this->mIsBackwards ) {
+ if ( $this->mIsBackwards ) {
// Fetch the file history
- $this->mHist = $this->mImg->getHistory($queryLimit,null,$this->mOffset,false);
+ $this->mHist = $this->mImg->getHistory( $queryLimit, null, $this->mOffset, false );
// The current rev may not meet the offset/limit
- $numRows = count($this->mHist);
- if( $numRows <= $this->mLimit && $this->mImg->getTimestamp() > $this->mOffset ) {
- $this->mHist = array_merge( array($this->mImg), $this->mHist );
+ $numRows = count( $this->mHist );
+ if ( $numRows <= $this->mLimit && $this->mImg->getTimestamp() > $this->mOffset ) {
+ $this->mHist = array_merge( array( $this->mImg ), $this->mHist );
}
} else {
// The current rev may not meet the offset
- if( !$this->mOffset || $this->mImg->getTimestamp() < $this->mOffset ) {
+ if ( !$this->mOffset || $this->mImg->getTimestamp() < $this->mOffset ) {
$this->mHist[] = $this->mImg;
}
// Old image versions (fetch extra row for nav links)
- $oiLimit = count($this->mHist) ? $this->mLimit : $this->mLimit+1;
+ $oiLimit = count( $this->mHist ) ? $this->mLimit : $this->mLimit + 1;
// Fetch the file history
$this->mHist = array_merge( $this->mHist,
- $this->mImg->getHistory($oiLimit,$this->mOffset,null,false) );
+ $this->mImg->getHistory( $oiLimit, $this->mOffset, null, false ) );
}
- $numRows = count($this->mHist); // Total number of query results
- if( $numRows ) {
+ $numRows = count( $this->mHist ); // Total number of query results
+ if ( $numRows ) {
# Index value of top item in the list
$firstIndex = $this->mIsBackwards ?
- $this->mHist[$numRows-1]->getTimestamp() : $this->mHist[0]->getTimestamp();
+ $this->mHist[$numRows - 1]->getTimestamp() : $this->mHist[0]->getTimestamp();
# Discard the extra result row if there is one
- if( $numRows > $this->mLimit && $numRows > 1 ) {
- if( $this->mIsBackwards ) {
+ if ( $numRows > $this->mLimit && $numRows > 1 ) {
+ if ( $this->mIsBackwards ) {
# Index value of item past the index
$this->mPastTheEndIndex = $this->mHist[0]->getTimestamp();
# Index value of bottom item in the list
$lastIndex = $this->mHist[1]->getTimestamp();
# Display range
- $this->mRange = array( 1, $numRows-1 );
+ $this->mRange = array( 1, $numRows - 1 );
} else {
# Index value of item past the index
- $this->mPastTheEndIndex = $this->mHist[$numRows-1]->getTimestamp();
+ $this->mPastTheEndIndex = $this->mHist[$numRows - 1]->getTimestamp();
# Index value of bottom item in the list
- $lastIndex = $this->mHist[$numRows-2]->getTimestamp();
+ $lastIndex = $this->mHist[$numRows - 2]->getTimestamp();
# Display range
- $this->mRange = array( 0, $numRows-2 );
+ $this->mRange = array( 0, $numRows - 2 );
}
} else {
# Setting indexes to an empty string means that they will be
@@ -1108,16 +1144,16 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager {
$this->mPastTheEndIndex = '';
# Index value of bottom item in the list
$lastIndex = $this->mIsBackwards ?
- $this->mHist[0]->getTimestamp() : $this->mHist[$numRows-1]->getTimestamp();
+ $this->mHist[0]->getTimestamp() : $this->mHist[$numRows - 1]->getTimestamp();
# Display range
- $this->mRange = array( 0, $numRows-1 );
+ $this->mRange = array( 0, $numRows - 1 );
}
} else {
$firstIndex = '';
$lastIndex = '';
$this->mPastTheEndIndex = '';
}
- if( $this->mIsBackwards ) {
+ if ( $this->mIsBackwards ) {
$this->mIsFirst = ( $numRows < $queryLimit );
$this->mIsLast = ( $this->mOffset == '' );
$this->mLastShown = $firstIndex;
---|
|