From 0ebea0e2d4928e1440b34a5da1ce1c61be9c8e43 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 8 Nov 2008 19:41:38 +0000 Subject: [PATCH] * getNotificationTimestamp() moved to Title.php * remove deprecated UI nav method * Various code cleanup and style tweaks --- includes/PageHistory.php | 244 ++++++++++++++------------------------- 1 file changed, 85 insertions(+), 159 deletions(-) diff --git a/includes/PageHistory.php b/includes/PageHistory.php index c637e46023..c84cecdf1b 100644 --- a/includes/PageHistory.php +++ b/includes/PageHistory.php @@ -22,7 +22,6 @@ class PageHistory { var $mArticle, $mTitle, $mSkin; var $lastdate; var $linesonpage; - var $mNotificationTimestamp; var $mLatestId = null; /** @@ -31,12 +30,10 @@ class PageHistory { * @param Article $article * @returns nothing */ - function __construct($article) { + function __construct( $article ) { global $wgUser; - $this->mArticle =& $article; $this->mTitle =& $article->mTitle; - $this->mNotificationTimestamp = NULL; $this->mSkin = $wgUser->getSkin(); $this->preCacheMessages(); } @@ -74,8 +71,7 @@ class PageHistory { * Allow client caching. */ if( $wgOut->checkLastModified( $this->mArticle->getTouched() ) ) - /* Client cache fresh and headers sent, nothing more to do. */ - return; + return; // Client cache fresh and headers sent, nothing more to do. wfProfileIn( __METHOD__ ); @@ -92,7 +88,8 @@ class PageHistory { $wgOut->addScriptFile( 'history.js' ); $logPage = SpecialPage::getTitleFor( 'Log' ); - $logLink = $this->mSkin->makeKnownLinkObj( $logPage, wfMsgHtml( 'viewpagelogs' ), 'page=' . $this->mTitle->getPrefixedUrl() ); + $logLink = $this->mSkin->makeKnownLinkObj( $logPage, wfMsgHtml( 'viewpagelogs' ), + 'page=' . $this->mTitle->getPrefixedUrl() ); $wgOut->setSubtitle( $logLink ); $feedType = $wgRequest->getVal( 'feed' ); @@ -110,20 +107,6 @@ class PageHistory { return; } - /* - * "go=first" means to jump to the last (earliest) history page. - * This is deprecated, it no longer appears in the user interface - */ - if ( $wgRequest->getText("go") == 'first' ) { - $limit = $wgRequest->getInt( 'limit', 50 ); - global $wgFeedLimit; - if( $limit > $wgFeedLimit ) { - $limit = $wgFeedLimit; - } - $wgOut->redirect( $wgTitle->getLocalURL( "action=history&limit={$limit}&dir=prev" ) ); - return; - } - /** * Add date selector to quickly get to a certain time */ @@ -132,30 +115,31 @@ class PageHistory { $action = htmlspecialchars( $wgScript ); $wgOut->addHTML( - Xml::fieldset( wfMsg( 'history-fieldset-title' ), false, array( 'id' => 'mw-history-search' ) ) . "
" . - Xml::hidden( 'title', $this->mTitle->getPrefixedDBKey() ) . "\n" . - Xml::hidden( 'action', 'history' ) . "\n" . - $this->getDateMenu( $year, $month ) . ' ' . - Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" . - '
' - ); + Xml::fieldset( wfMsg( 'history-fieldset-title' ), false, array( 'id' => 'mw-history-search' ) ) . + Xml::hidden( 'title', $this->mTitle->getPrefixedDBKey() ) . "\n" . + Xml::hidden( 'action', 'history' ) . "\n" . + $this->getDateMenu( $year, $month ) . ' ' . + Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" . + '' + ); - wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) ); + wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) ); - /** - * Do the list - */ - $pager = new PageHistoryPager( $this, $year, $month ); - $this->linesonpage = $pager->getNumRows(); - $wgOut->addHTML( + /** + * Do the list + */ + $pager = new PageHistoryPager( $this, $year, $month ); + $this->linesonpage = $pager->getNumRows(); + $wgOut->addHTML( $pager->getNavigationBar() . $this->beginHistoryList() . $pager->getBody() . $this->endHistoryList() . $pager->getNavigationBar() - ); - wfProfileOut( __METHOD__ ); + ); + + wfProfileOut( __METHOD__ ); } /** @@ -170,7 +154,7 @@ class PageHistory { } else { $encMonth = ''; } - if ( $year ) { + if( $year ) { $encYear = intval( $year ); } else if( $encMonth ) { $thisMonth = intval( gmdate( 'n' ) ); @@ -200,29 +184,29 @@ class PageHistory { $s = wfMsgExt( 'histlegend', array( 'parse') ); $s .= Xml::openElement( 'form', array( 'action' => $wgScript, 'id' => 'mw-history-compare' ) ); $s .= Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() ); - if($wgEnableHtmlDiff){ + if( $wgEnableHtmlDiff ) { $s .= $this->submitButton( wfMsg( 'visualcomparison'), - array( - 'name' => 'htmldiff', - 'class' => 'historysubmit', - 'accesskey' => wfMsg( 'accesskey-visualcomparison' ), - 'title' => wfMsg( 'tooltip-compareselectedversions' ), - ) + array( + 'name' => 'htmldiff', + 'class' => 'historysubmit', + 'accesskey' => wfMsg( 'accesskey-visualcomparison' ), + 'title' => wfMsg( 'tooltip-compareselectedversions' ), + ) ); $s .= $this->submitButton( wfMsg( 'wikicodecomparison'), - array( - 'class' => 'historysubmit', - 'accesskey' => wfMsg( 'accesskey-compareselectedversions' ), - 'title' => wfMsg( 'tooltip-compareselectedversions' ), - ) + array( + 'class' => 'historysubmit', + 'accesskey' => wfMsg( 'accesskey-compareselectedversions' ), + 'title' => wfMsg( 'tooltip-compareselectedversions' ), + ) ); - }else{ + } else { $s .= $this->submitButton( wfMsg( 'compareselectedversions'), - array( - 'class' => 'historysubmit', - 'accesskey' => wfMsg( 'accesskey-compareselectedversions' ), - 'title' => wfMsg( 'tooltip-compareselectedversions' ), - ) + array( + 'class' => 'historysubmit', + 'accesskey' => wfMsg( 'accesskey-compareselectedversions' ), + 'title' => wfMsg( 'tooltip-compareselectedversions' ), + ) ); } $s .= ''; - if($wgEnableHtmlDiff){ + if( $wgEnableHtmlDiff ) { $s .= $this->submitButton( wfMsg( 'visualcomparison'), - array( - 'name' => 'htmldiff', - 'class' => 'historysubmit', - 'accesskey' => wfMsg( 'accesskey-visualcomparison' ), - 'title' => wfMsg( 'tooltip-compareselectedversions' ), - ) + array( + 'name' => 'htmldiff', + 'class' => 'historysubmit', + 'accesskey' => wfMsg( 'accesskey-visualcomparison' ), + 'title' => wfMsg( 'tooltip-compareselectedversions' ), + ) ); $s .= $this->submitButton( wfMsg( 'wikicodecomparison'), - array( - 'class' => 'historysubmit', - 'accesskey' => wfMsg( 'accesskey-compareselectedversions' ), - 'title' => wfMsg( 'tooltip-compareselectedversions' ), - ) + array( + 'class' => 'historysubmit', + 'accesskey' => wfMsg( 'accesskey-compareselectedversions' ), + 'title' => wfMsg( 'tooltip-compareselectedversions' ), + ) ); - }else{ + } else { $s .= $this->submitButton( wfMsg( 'compareselectedversions'), - array( - 'class' => 'historysubmit', - 'accesskey' => wfMsg( 'accesskey-compareselectedversions' ), - 'title' => wfMsg( 'tooltip-compareselectedversions' ), - ) + array( + 'class' => 'historysubmit', + 'accesskey' => wfMsg( 'accesskey-compareselectedversions' ), + 'title' => wfMsg( 'tooltip-compareselectedversions' ), + ) ); } $s .= ''; @@ -274,7 +258,7 @@ class PageHistory { */ function submitButton($message, $attributes = array() ) { # Disable submit button if history has 1 revision only - if ( $this->linesonpage > 1 ) { + if( $this->linesonpage > 1 ) { return Xml::submitButton( $message , $attributes ); } else { return ''; @@ -299,13 +283,12 @@ class PageHistory { $rev = new Revision( $row ); $rev->setTitle( $this->mTitle ); - $s = ''; $curlink = $this->curLink( $rev, $latest ); $lastlink = $this->lastLink( $rev, $next, $counter ); $arbitrary = $this->diffButtons( $rev, $firstInList, $counter ); $link = $this->revLink( $rev ); - $s .= "($curlink) ($lastlink) $arbitrary"; + $s = "($curlink) ($lastlink) $arbitrary"; if( $wgUser->isAllowed( 'deleterevision' ) ) { $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); @@ -334,35 +317,29 @@ class PageHistory { $s .= ' ' . Xml::element( 'span', array( 'class' => 'minor' ), wfMsg( 'minoreditletter') ); } - if ( !is_null( $size = $rev->getSize() ) && $rev->userCan( Revision::DELETED_TEXT ) ) { + if( !is_null( $size = $rev->getSize() ) && $rev->userCan( Revision::DELETED_TEXT ) ) { $s .= ' ' . $this->mSkin->formatRevisionSize( $size ); } $s .= $this->mSkin->revComment( $rev, false, true ); - if ($notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp)) { + if( $notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp) ) { $s .= ' ' . wfMsgHtml( 'updatedmarker' ) . ''; } - #add blurb about text having been deleted if( $rev->isDeleted( Revision::DELETED_TEXT ) ) { $s .= ' ' . wfMsgHtml( 'deletedrev' ) . ''; } $tools = array(); - if ( !is_null( $next ) && is_object( $next ) ) { - if( !$this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser ) - && !$this->mTitle->getUserPermissionsErrors( 'edit', $wgUser ) - && $latest ) { - $tools[] = '' - . $this->mSkin->buildRollbackLink( $rev ) - . ''; + if( !is_null( $next ) && is_object( $next ) ) { + if( $latest && $this->mTitle->userCan( 'rollback' ) && $this->mTitle->userCan( 'edit' ) ) { + $tools[] = ''.$this->mSkin->buildRollbackLink( $rev ).''; } - if( $this->mTitle->quickUserCan( 'edit' ) && - !$rev->isDeleted( Revision::DELETED_TEXT ) && - !$next->rev_deleted & Revision::DELETED_TEXT ) { - + if( $this->mTitle->quickUserCan( 'edit' ) && !$rev->isDeleted( Revision::DELETED_TEXT ) && + !$next->rev_deleted & Revision::DELETED_TEXT ) + { # Create undo tooltip for the first (=latest) line only $undoTooltip = $latest ? array( 'title' => wfMsg( 'tooltip-undo' ) ) @@ -418,10 +395,8 @@ class PageHistory { if( $latest || !$rev->userCan( Revision::DELETED_TEXT ) ) { return $cur; } else { - return $this->mSkin->makeKnownLinkObj( - $this->mTitle, $cur, - 'diff=' . $this->getLatestID() . - "&oldid=" . $rev->getId() ); + return $this->mSkin->makeKnownLinkObj( $this->mTitle, $cur, + 'diff=' . $this->mTitle->getLatestRevID() . "&oldid=" . $rev->getId() ); } } @@ -441,21 +416,13 @@ class PageHistory { return $last; } elseif( $next === 'unknown' ) { # Next row probably exists but is unknown, use an oldid=prev link - return $this->mSkin->makeKnownLinkObj( - $this->mTitle, - $last, + return $this->mSkin->makeKnownLinkObj( $this->mTitle, $last, "diff=" . $prevRev->getId() . "&oldid=prev" ); } elseif( !$prevRev->userCan(Revision::DELETED_TEXT) || !$nextRev->userCan(Revision::DELETED_TEXT) ) { return $last; } else { - return $this->mSkin->makeKnownLinkObj( - $this->mTitle, - $last, - "diff=" . $prevRev->getId() . "&oldid={$next->rev_id}" - /*, - '', - '', - "tabindex={$counter}"*/ ); + return $this->mSkin->makeKnownLinkObj( $this->mTitle, $last, + "diff=" . $prevRev->getId() . "&oldid={$next->rev_id}" ); } } @@ -479,7 +446,7 @@ class PageHistory { } /** @todo: move title texts to javascript */ - if ( $firstInList ) { + if( $firstInList ) { $first = Xml::element( 'input', array_merge( $radio, array( @@ -508,19 +475,6 @@ class PageHistory { } } - /** @todo document */ - function getLatestId() { - if( is_null( $this->mLatestId ) ) { - $id = $this->mTitle->getArticleID(); - $db = wfGetDB( DB_SLAVE ); - $this->mLatestId = $db->selectField( 'page', - "page_latest", - array( 'page_id' => $id ), - __METHOD__ ); - } - return $this->mLatestId; - } - /** * Fetch an array of revisions, specified by a given limit, offset and * direction. This is now only used by the feeds. It was previously @@ -529,12 +483,12 @@ class PageHistory { function fetchRevisions($limit, $offset, $direction) { $dbr = wfGetDB( DB_SLAVE ); - if ($direction == PageHistory::DIR_PREV) + if( $direction == PageHistory::DIR_PREV ) list($dirs, $oper) = array("ASC", ">="); else /* $direction == PageHistory::DIR_NEXT */ list($dirs, $oper) = array("DESC", "<="); - if ($offset) + if( $offset ) $offsets = array("rev_timestamp $oper '$offset'"); else $offsets = array(); @@ -550,42 +504,13 @@ class PageHistory { ); } - /** @todo document */ - function getNotificationTimestamp() { - global $wgUser, $wgShowUpdatedMarker; - - if ($this->mNotificationTimestamp !== NULL) - return $this->mNotificationTimestamp; - - if ($wgUser->isAnon() || !$wgShowUpdatedMarker) - return $this->mNotificationTimestamp = false; - - $dbr = wfGetDB(DB_SLAVE); - - $this->mNotificationTimestamp = $dbr->selectField( - 'watchlist', - 'wl_notificationtimestamp', - array( 'wl_namespace' => $this->mTitle->getNamespace(), - 'wl_title' => $this->mTitle->getDBkey(), - 'wl_user' => $wgUser->getId() - ), - __METHOD__ ); - - // Don't use the special value reserved for telling whether the field is filled - if ( is_null( $this->mNotificationTimestamp ) ) { - $this->mNotificationTimestamp = false; - } - - return $this->mNotificationTimestamp; - } - /** * Output a subscription feed listing recent edits to this page. * @param string $type */ function feed( $type ) { global $wgFeedClasses, $wgRequest, $wgFeedLimit; - if ( !FeedUtils::checkFeedOutput($type) ) { + if( !FeedUtils::checkFeedOutput($type) ) { return; } @@ -673,11 +598,12 @@ class PageHistory { * @ingroup Pager */ class PageHistoryPager extends ReverseChronologicalPager { - public $mLastRow = false, $mPageHistory; + public $mLastRow = false, $mPageHistory, $mTitle; function __construct( $pageHistory, $year='', $month='' ) { parent::__construct(); $this->mPageHistory = $pageHistory; + $this->mTitle =& $this->mPageHistory->mTitle; $this->getDateCond( $year, $month ); } @@ -697,11 +623,11 @@ class PageHistoryPager extends ReverseChronologicalPager { } function formatRow( $row ) { - if ( $this->mLastRow ) { + if( $this->mLastRow ) { $latest = $this->mCounter == 1 && $this->mIsFirst; $firstInList = $this->mCounter == 1; $s = $this->mPageHistory->historyLine( $this->mLastRow, $row, $this->mCounter++, - $this->mPageHistory->getNotificationTimestamp(), $latest, $firstInList ); + $this->mTitle->getNotificationTimestamp(), $latest, $firstInList ); } else { $s = ''; } @@ -716,12 +642,12 @@ class PageHistoryPager extends ReverseChronologicalPager { } function getEndBody() { - if ( $this->mLastRow ) { + if( $this->mLastRow ) { $latest = $this->mCounter == 1 && $this->mIsFirst; $firstInList = $this->mCounter == 1; - if ( $this->mIsBackwards ) { + if( $this->mIsBackwards ) { # Next row is unknown, but for UI reasons, probably exists if an offset has been specified - if ( $this->mOffset == '' ) { + if( $this->mOffset == '' ) { $next = null; } else { $next = 'unknown'; @@ -731,7 +657,7 @@ class PageHistoryPager extends ReverseChronologicalPager { $next = $this->mPastTheEndRow; } $s = $this->mPageHistory->historyLine( $this->mLastRow, $next, $this->mCounter++, - $this->mPageHistory->getNotificationTimestamp(), $latest, $firstInList ); + $this->mTitle->getNotificationTimestamp(), $latest, $firstInList ); } else { $s = ''; } -- 2.20.1