http://www.mediawiki.org/wiki/Special:Code/MediaWiki/55168

Revision: 55168
Author:   tstarling
Date:     2009-08-17 05:09:36 +0000 (Mon, 17 Aug 2009)

Log Message:
-----------
* Renamed PageHistory to HistoryPage. Brion gave me permission to do this a 
couple of years ago, I thought it was about time. Provides naming consistency 
with ImagePage, RawPage, etc. 
* Moved historyLine(), beginHistoryList(), endHistoryList() and related helper 
functions to the pager class.
* Renamed HistoryPage member variables, removed "m" prefix.
* Added declaration for IndexPager::$mIsFirst

Modified Paths:
--------------
    trunk/phase3/includes/AutoLoader.php
    trunk/phase3/includes/Pager.php
    trunk/phase3/includes/Wiki.php

Added Paths:
-----------
    trunk/phase3/includes/HistoryPage.php

Removed Paths:
-------------
    trunk/phase3/includes/PageHistory.php

Modified: trunk/phase3/includes/AutoLoader.php
===================================================================
--- trunk/phase3/includes/AutoLoader.php        2009-08-17 03:39:20 UTC (rev 
55167)
+++ trunk/phase3/includes/AutoLoader.php        2009-08-17 05:09:36 UTC (rev 
55168)
@@ -95,6 +95,8 @@
        'HistoryBlobCurStub' => 'includes/HistoryBlob.php',
        'HistoryBlob' => 'includes/HistoryBlob.php',
        'HistoryBlobStub' => 'includes/HistoryBlob.php',
+       'HistoryPage' => 'includes/HistoryPage.php',
+       'HistoryPager' => 'includes/HistoryPage.php',
        'Html' => 'includes/Html.php',
        'HTMLCacheUpdate' => 'includes/HTMLCacheUpdate.php',
        'HTMLCacheUpdateJob' => 'includes/HTMLCacheUpdate.php',
@@ -157,9 +159,9 @@
        'Namespace' => 'includes/NamespaceCompat.php', // Compat
        'OldChangesList' => 'includes/ChangesList.php',
        'OutputPage' => 'includes/OutputPage.php',
-       'PageHistory' => 'includes/PageHistory.php',
-       'PageHistoryPager' => 'includes/PageHistory.php',
        'PageQueryPage' => 'includes/PageQueryPage.php',
+       'PageHistory' => 'includes/HistoryPage.php',
+       'PageHistoryPager' => 'includes/HistoryPage.php',
        'Pager' => 'includes/Pager.php',
        'PasswordError' => 'includes/User.php',
        'PatrolLog' => 'includes/PatrolLog.php',

Copied: trunk/phase3/includes/HistoryPage.php (from rev 55141, 
trunk/phase3/includes/PageHistory.php)
===================================================================
--- trunk/phase3/includes/HistoryPage.php                               (rev 0)
+++ trunk/phase3/includes/HistoryPage.php       2009-08-17 05:09:36 UTC (rev 
55168)
@@ -0,0 +1,699 @@
+<?php
+/**
+ * Page history
+ *
+ * Split off from Article.php and Skin.php, 2003-12-22
+ * @file
+ */
+
+/**
+ * This class handles printing the history page for an article.  In order to
+ * be efficient, it uses timestamps rather than offsets for paging, to avoid
+ * costly LIMIT,offset queries.
+ *
+ * Construct it by passing in an Article, and call $h->history() to print the
+ * history.
+ *
+ */
+class HistoryPage {
+       const DIR_PREV = 0;
+       const DIR_NEXT = 1;
+
+       var $article, $title, $skin;
+
+       /**
+        * Construct a new HistoryPage.
+        *
+        * @param Article $article
+        * @returns nothing
+        */
+       function __construct( $article ) {
+               global $wgUser;
+               $this->article =& $article;
+               $this->title =& $article->getTitle();
+               $this->skin = $wgUser->getSkin();
+               $this->preCacheMessages();
+       }
+
+       function getArticle() {
+               return $this->article;
+       }
+
+       function getTitle() {
+               return $this->title;
+       }
+
+       /**
+        * As we use the same small set of messages in various methods and that
+        * they are called often, we call them once and save them in 
$this->message
+        */
+       function preCacheMessages() {
+               // Precache various messages
+               if( !isset( $this->message ) ) {
+                       foreach( explode(' ', 'cur last rev-delundel' ) as $msg 
) {
+                               $this->message[$msg] = wfMsgExt( $msg, array( 
'escape') );
+                       }
+               }
+       }
+
+       /**
+        * Print the history page for an article.
+        *
+        * @returns nothing
+        */
+       function history() {
+               global $wgOut, $wgRequest, $wgScript;
+
+               /*
+                * Allow client caching.
+                */
+               if( $wgOut->checkLastModified( $this->article->getTouched() ) )
+                       return; // Client cache fresh and headers sent, nothing 
more to do.
+
+               wfProfileIn( __METHOD__ );
+
+               /*
+                * Setup page variables.
+                */
+               $wgOut->setPageTitle( wfMsg( 'history-title', 
$this->title->getPrefixedText() ) );
+               $wgOut->setPageTitleActionText( wfMsg( 'history_short' ) );
+               $wgOut->setArticleFlag( false );
+               $wgOut->setArticleRelated( true );
+               $wgOut->setRobotPolicy( 'noindex,nofollow' );
+               $wgOut->setSyndicated( true );
+               $wgOut->setFeedAppendQuery( 'action=history' );
+               $wgOut->addScriptFile( 'history.js' );
+
+               $logPage = SpecialPage::getTitleFor( 'Log' );
+               $logLink = $this->skin->link(
+                       $logPage,
+                       wfMsgHtml( 'viewpagelogs' ),
+                       array(),
+                       array( 'page' => $this->title->getPrefixedText() ),
+                       array( 'known', 'noclasses' )
+               );
+               $wgOut->setSubtitle( $logLink );
+
+               $feedType = $wgRequest->getVal( 'feed' );
+               if( $feedType ) {
+                       wfProfileOut( __METHOD__ );
+                       return $this->feed( $feedType );
+               }
+
+               /*
+                * Fail if article doesn't exist.
+                */
+               if( !$this->title->exists() ) {
+                       $wgOut->addWikiMsg( 'nohistory' );
+                       wfProfileOut( __METHOD__ );
+                       return;
+               }
+
+               /**
+                * Add date selector to quickly get to a certain time
+                */
+               $year = $wgRequest->getInt( 'year' );
+               $month = $wgRequest->getInt( 'month' );
+               $tagFilter = $wgRequest->getVal( 'tagfilter' );
+               $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter );
+
+               $action = htmlspecialchars( $wgScript );
+               $wgOut->addHTML(
+                       "<form action=\"$action\" method=\"get\" 
id=\"mw-history-searchform\">" .
+                       Xml::fieldset( wfMsg( 'history-fieldset-title' ), 
false, array( 'id' => 'mw-history-search' ) ) .
+                       Xml::hidden( 'title', $this->title->getPrefixedDBKey() 
) . "\n" .
+                       Xml::hidden( 'action', 'history' ) . "\n" .
+                       xml::dateMenu( $year, $month ) . '&nbsp;' .
+                       ( $tagSelector ? ( implode( '&nbsp;', $tagSelector ) . 
'&nbsp;' ) : '' ) .
+                       Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
+                       '</fieldset></form>'
+               );
+
+               wfRunHooks( 'PageHistoryBeforeList', array( &$this->article ) );
+
+               /**
+                * Do the list
+                */
+               $pager = new HistoryPager( $this, $year, $month, $tagFilter );
+               $wgOut->addHTML(
+                       $pager->getNavigationBar() .
+                       $pager->getBody() .
+                       $pager->getNavigationBar()
+               );
+
+               wfProfileOut( __METHOD__ );
+       }
+
+       /**
+        * Fetch an array of revisions, specified by a given limit, offset and
+        * direction. This is now only used by the feeds. It was previously
+        * used by the main UI but that's now handled by the pager.
+        */
+       function fetchRevisions($limit, $offset, $direction) {
+               $dbr = wfGetDB( DB_SLAVE );
+
+               if( $direction == HistoryPage::DIR_PREV )
+                       list($dirs, $oper) = array("ASC", ">=");
+               else /* $direction == HistoryPage::DIR_NEXT */
+                       list($dirs, $oper) = array("DESC", "<=");
+
+               if( $offset )
+                       $offsets = array("rev_timestamp $oper '$offset'");
+               else
+                       $offsets = array();
+
+               $page_id = $this->title->getArticleID();
+
+               return $dbr->select( 'revision',
+                       Revision::selectFields(),
+                       array_merge(array("rev_page=$page_id"), $offsets),
+                       __METHOD__,
+                       array( 'ORDER BY' => "rev_timestamp $dirs", 
+                               'USE INDEX' => 'page_timestamp', 'LIMIT' => 
$limit)
+               );
+       }
+
+       /**
+        * Output a subscription feed listing recent edits to this page.
+        * @param string $type
+        */
+       function feed( $type ) {
+               global $wgFeedClasses, $wgRequest, $wgFeedLimit;
+               if( !FeedUtils::checkFeedOutput($type) ) {
+                       return;
+               }
+
+               $feed = new $wgFeedClasses[$type](
+               $this->title->getPrefixedText() . ' - ' .
+               wfMsgForContent( 'history-feed-title' ),
+               wfMsgForContent( 'history-feed-description' ),
+               $this->title->getFullUrl( 'action=history' ) );
+
+               // Get a limit on number of feed entries. Provide a sane default
+               // of 10 if none is defined (but limit to $wgFeedLimit max)
+               $limit = $wgRequest->getInt( 'limit', 10 );
+               if( $limit > $wgFeedLimit || $limit < 1 ) {
+                       $limit = 10;
+               }
+               $items = $this->fetchRevisions($limit, 0, 
HistoryPage::DIR_NEXT);
+
+               $feed->outHeader();
+               if( $items ) {
+                       foreach( $items as $row ) {
+                               $feed->outItem( $this->feedItem( $row ) );
+                       }
+               } else {
+                       $feed->outItem( $this->feedEmpty() );
+               }
+               $feed->outFooter();
+       }
+
+       function feedEmpty() {
+               global $wgOut;
+               return new FeedItem(
+                       wfMsgForContent( 'nohistory' ),
+                       $wgOut->parse( wfMsgForContent( 'history-feed-empty' ) 
),
+                       $this->title->getFullUrl(),
+                       wfTimestamp( TS_MW ),
+                               '',
+                       $this->title->getTalkPage()->getFullUrl() );
+       }
+
+       /**
+        * Generate a FeedItem object from a given revision table row
+        * Borrows Recent Changes' feed generation functions for formatting;
+        * includes a diff to the previous revision (if any).
+        *
+        * @param $row
+        * @return FeedItem
+        */
+       function feedItem( $row ) {
+               $rev = new Revision( $row );
+               $rev->setTitle( $this->title );
+               $text = FeedUtils::formatDiffRow( $this->title,
+               $this->title->getPreviousRevisionID( $rev->getId() ),
+               $rev->getId(),
+               $rev->getTimestamp(),
+               $rev->getComment() );
+
+               if( $rev->getComment() == '' ) {
+                       global $wgContLang;
+                       $title = wfMsgForContent( 'history-feed-item-nocomment',
+                       $rev->getUserText(),
+                       $wgContLang->timeanddate( $rev->getTimestamp() ) );
+               } else {
+                       $title = $rev->getUserText() . wfMsgForContent( 
'colon-separator' ) . FeedItem::stripComment( $rev->getComment() );
+               }
+
+               return new FeedItem(
+                       $title,
+                       $text,
+                       $this->title->getFullUrl( 'diff=' . $rev->getId() . 
'&oldid=prev' ),
+                       $rev->getTimestamp(),
+                       $rev->getUserText(),
+                       $this->title->getTalkPage()->getFullUrl() );
+       }
+}
+
+
+/**
+ * @ingroup Pager
+ */
+class HistoryPager extends ReverseChronologicalPager {
+       public $lastRow = false, $counter, $historyPage, $title;
+       protected $oldIdChecked;
+
+       function __construct( $historyPage, $year='', $month='', $tagFilter = 
'' ) {
+               parent::__construct();
+               $this->historyPage = $historyPage;
+               $this->title = $this->historyPage->title;
+               $this->tagFilter = $tagFilter;
+               $this->getDateCond( $year, $month );
+       }
+
+       function getQueryInfo() {
+               $queryInfo = array(
+                       'tables'  => array('revision'),
+                       'fields'  => array_merge( Revision::selectFields(), 
array('ts_tags') ),
+                       'conds'   => array('rev_page' => 
$this->historyPage->title->getArticleID() ),
+                       'options' => array( 'USE INDEX' => array('revision' => 
'page_timestamp') ),
+                       'join_conds' => array( 'tag_summary' => array( 'LEFT 
JOIN', 'ts_rev_id=rev_id' ) ),
+               );
+               ChangeTags::modifyDisplayQuery( $queryInfo['tables'],
+                                                                               
$queryInfo['fields'],
+                                                                               
$queryInfo['conds'],
+                                                                               
$queryInfo['join_conds'],
+                                                                               
$queryInfo['options'],
+                                                                               
$this->tagFilter );
+               wfRunHooks( 'PageHistoryPager::getQueryInfo', array( &$this, 
&$queryInfo ) );
+               return $queryInfo;
+       }
+
+       function getIndexField() {
+               return 'rev_timestamp';
+       }
+
+       function formatRow( $row ) {
+               if( $this->lastRow ) {
+                       $latest = $this->counter == 1 && $this->mIsFirst;
+                       $firstInList = $this->counter == 1;
+                       $s = $this->historyLine( $this->lastRow, $row, 
$this->counter++,
+                               $this->title->getNotificationTimestamp(), 
$latest, $firstInList );
+               } else {
+                       $s = '';
+               }
+               $this->lastRow = $row;
+               return $s;
+       }
+
+       /**
+        * Creates begin of history list with a submit button
+        *
+        * @return string HTML output
+        */
+       function getStartBody() {
+               global $wgScript, $wgEnableHtmlDiff, $wgUser;
+               $this->lastRow = false;
+               $this->counter = 1;
+               $this->oldIdChecked = 0;
+
+               $s = wfMsgExt( 'histlegend', array( 'parse') );
+               if( $this->getNumRows() > 1 && 
$wgUser->isAllowed('deleterevision') ) {
+                       $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
+                       $s .= Xml::openElement( 'form',
+                               array(
+                                       'action' => $revdel->getLocalURL( 
array( 
+                                               'type' => 'revision',
+                                               'target' => 
$this->title->getPrefixedDbKey()
+                                       ) ),
+                                       'method' => 'post', 
+                                       'id' => 'mw-history-revdeleteform',
+                                       'style'  => 
'visibility:hidden;float:right;'
+                               )
+                       );
+                       $s .= Xml::hidden( 'ids', '', 
array('id'=>'revdel-oldid') );
+                       $s .= Xml::submitButton( wfMsg( 
'showhideselectedversions' ) );
+                       $s .= Xml::closeElement( 'form' );
+               }
+               $s .= Xml::openElement( 'form', array( 'action' => $wgScript,
+                       'id' => 'mw-history-compare' ) );
+               $s .= Xml::hidden( 'title', $this->title->getPrefixedDbKey() );
+               if( $wgEnableHtmlDiff ) {
+                       $s .= $this->submitButton( wfMsg( 'visualcomparison'),
+                               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' ),
+                               )
+                       );
+               } else {
+                       $s .= $this->submitButton( wfMsg( 
'compareselectedversions'),
+                               array(
+                                       'class'     => 'historysubmit',
+                                       'accesskey' => wfMsg( 
'accesskey-compareselectedversions' ),
+                                       'title'     => wfMsg( 
'tooltip-compareselectedversions' ),
+                               )
+                       );
+               }
+               $s .= '<ul id="pagehistory">' . "\n";
+               return $s;
+       }
+
+       function getEndBody() {
+
+               if( $this->lastRow ) {
+                       $latest = $this->counter == 1 && $this->mIsFirst;
+                       $firstInList = $this->counter == 1;
+                       if( $this->mIsBackwards ) {
+                               # Next row is unknown, but for UI reasons, 
probably exists if an offset has been specified
+                               if( $this->mOffset == '' ) {
+                                       $next = null;
+                               } else {
+                                       $next = 'unknown';
+                               }
+                       } else {
+                               # The next row is the past-the-end row
+                               $next = $this->mPastTheEndRow;
+                       }
+                       $s = $this->historyLine( $this->lastRow, $next, 
$this->counter++,
+                               $this->title->getNotificationTimestamp(), 
$latest, $firstInList );
+               } else {
+                       $s = '';
+               }
+
+               global $wgEnableHtmlDiff;
+               $s .= '</ul>';
+               if( $wgEnableHtmlDiff ) {
+                       $s .= $this->submitButton( wfMsg( 'visualcomparison'),
+                               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' ),
+                               )
+                       );
+               } else {
+                       $s .= $this->submitButton( wfMsg( 
'compareselectedversions'),
+                               array(
+                                       'class'     => 'historysubmit',
+                                       'accesskey' => wfMsg( 
'accesskey-compareselectedversions' ),
+                                       'title'     => wfMsg( 
'tooltip-compareselectedversions' ),
+                               )
+                       );
+               }
+               $s .= '</form>';
+               return $s;
+       }
+
+       /**
+        * Creates a submit button
+        *
+        * @param array $attributes attributes
+        * @return string HTML output for the submit button
+        */
+       function submitButton($message, $attributes = array() ) {
+               # Disable submit button if history has 1 revision only
+               if( $this->getNumRows() > 1 ) {
+                       return Xml::submitButton( $message , $attributes );
+               } else {
+                       return '';
+               }
+       }
+
+       /**
+        * Returns a row from the history printout.
+        *
+        * @todo document some more, and maybe clean up the code (some params 
redundant?)
+        *
+        * @param Row $row The database row corresponding to the previous line.
+        * @param mixed $next The database row corresponding to the next line.
+        * @param int $counter Apparently a counter of what row number we're 
at, counted from the top row = 1.
+        * @param $notificationtimestamp
+        * @param bool $latest Whether this row corresponds to the page's 
latest revision.
+        * @param bool $firstInList Whether this row corresponds to the first 
displayed on this history page.
+        * @return string HTML output for the row
+        */
+       function historyLine( $row, $next, $counter = '', 
$notificationtimestamp = false,
+               $latest = false, $firstInList = false )
+       {
+               global $wgUser, $wgLang;
+               $rev = new Revision( $row );
+               $rev->setTitle( $this->title );
+
+               $curlink = $this->curLink( $rev, $latest );
+               $lastlink = $this->lastLink( $rev, $next, $counter );
+               $diffButtons = $this->diffButtons( $rev, $firstInList, $counter 
);
+               $link = $this->revLink( $rev );
+               $classes = array();
+
+               $s = "($curlink) ($lastlink) $diffButtons";
+
+               if( $wgUser->isAllowed( 'deleterevision' ) ) {
+                       // Hide JS by default for non-JS browsing
+                       $hidden = array( 'style' => 'display:none' );
+                       // If revision was hidden from sysops
+                       if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
+                               $del = Xml::check( 'deleterevisions', false,
+                                       $hidden + array('disabled' => 
'disabled') );
+                               $del .= Xml::tags( 'span', array( 
'class'=>'mw-revdelundel-link' ),
+                                       '(' . 
$this->historyPage->message['rev-delundel'] . ')' );
+                       // Otherwise, show the link...
+                       } else {
+                               $id = $rev->getId();
+                               $jsCall = 
"updateShowHideForm($id,this.checked)";
+                               $del = Xml::check( 'showhiderevisions', false,
+                                       $hidden + array(
+                                               'onchange' => $jsCall,
+                                               'id' => "mw-revdel-$id" ) );
+                               $query = array(
+                                       'type' => 'revision',
+                                       'target' => 
$this->title->getPrefixedDbkey(),
+                                       'ids' => $rev->getId() );
+                               $del .= $this->getSkin()->revDeleteLink( $query,
+                                       $rev->isDeleted( 
Revision::DELETED_RESTRICTED ) );
+                       }
+                       $s .= " $del ";
+               }
+
+               $s .= " $link";
+               $s .= " <span class='history-user'>" . 
$this->getSkin()->revUserTools( $rev, true ) . "</span>";
+
+               if( $rev->isMinor() ) {
+                       $s .= ' ' . ChangesList::flag( 'minor' );
+               }
+
+               if( !is_null( $size = $rev->getSize() ) && !$rev->isDeleted( 
Revision::DELETED_TEXT ) ) {
+                       $s .= ' ' . $this->getSkin()->formatRevisionSize( $size 
);
+               }
+
+               $s .= $this->getSkin()->revComment( $rev, false, true );
+
+               if( $notificationtimestamp && ($row->rev_timestamp >= 
$notificationtimestamp) ) {
+                       $s .= ' <span class="updatedmarker">' .  wfMsgHtml( 
'updatedmarker' ) . '</span>';
+               }
+
+               $tools = array();
+
+               if( !is_null( $next ) && is_object( $next ) ) {
+                       if( $latest && $this->title->userCan( 'rollback' ) && 
$this->title->userCan( 'edit' ) ) {
+                               $tools[] = '<span class="mw-rollback-link">'.
+                                       $this->getSkin()->buildRollbackLink( 
$rev ).'</span>';
+                       }
+
+                       if( $this->title->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' ) )
+                                       : array();
+                               $undolink = $this->getSkin()->link(
+                                       $this->title,
+                                       wfMsgHtml( 'editundo' ),
+                                       $undoTooltip,
+                                       array( 'action' => 'edit', 'undoafter' 
=> $next->rev_id, 'undo' => $rev->getId() ),
+                                       array( 'known', 'noclasses' )
+                               );
+                               $tools[] = "<span 
class=\"mw-history-undo\">{$undolink}</span>";
+                       }
+               }
+
+               if( $tools ) {
+                       $s .= ' (' . $wgLang->pipeList( $tools ) . ')';
+               }
+
+               # Tags
+               list($tagSummary, $newClasses) = ChangeTags::formatSummaryRow( 
$row->ts_tags, 'history' );
+               $classes = array_merge( $classes, $newClasses );
+               $s .= " $tagSummary";
+
+               wfRunHooks( 'PageHistoryLineEnding', array( $this, &$row , &$s 
) );
+
+               $attribs = array();
+               if ( $classes ) {
+                       $attribs['class'] = implode( ' ', $classes );
+               }
+
+               return Xml::tags( 'li', $attribs, $s ) . "\n";
+       }
+
+       /**
+        * Create a link to view this revision of the page
+        * @param Revision $rev
+        * @returns string
+        */
+       function revLink( $rev ) {
+               global $wgLang;
+               $date = $wgLang->timeanddate( wfTimestamp(TS_MW, 
$rev->getTimestamp()), true );
+               $date = htmlspecialchars( $date );
+               if( !$rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                       $link = $this->getSkin()->link(
+                               $this->title,
+                               $date,
+                               array(),
+                               array( 'oldid' => $rev->getId() ),
+                               array( 'known', 'noclasses' )
+                       );
+               } else {
+                       $link = "<span class=\"history-deleted\">$date</span>";
+               }
+               return $link;
+       }
+
+       /**
+        * Create a diff-to-current link for this revision for this page
+        * @param Revision $rev
+        * @param Bool $latest, this is the latest revision of the page?
+        * @returns string
+        */
+       function curLink( $rev, $latest ) {
+               $cur = $this->historyPage->message['cur'];
+               if( $latest || !$rev->userCan( Revision::DELETED_TEXT ) ) {
+                       return $cur;
+               } else {
+                       return $this->getSkin()->link(
+                               $this->title,
+                               $cur,
+                               array(),
+                               array(
+                                       'diff' => 
$this->title->getLatestRevID(),
+                                       'oldid' => $rev->getId()
+                               ),
+                               array( 'known', 'noclasses' )
+                       );
+               }
+       }
+
+       /**
+        * Create a diff-to-previous link for this revision for this page.
+        * @param Revision $prevRev, the previous revision
+        * @param mixed $next, the newer revision
+        * @param int $counter, what row on the history list this is
+        * @returns string
+        */
+       function lastLink( $prevRev, $next, $counter ) {
+               $last = $this->historyPage->message['last'];
+               # $next may either be a Row, null, or "unkown"
+               $nextRev = is_object($next) ? new Revision( $next ) : $next;
+               if( is_null($next) ) {
+                       # Probably no next row
+                       return $last;
+               } elseif( $next === 'unknown' ) {
+                       # Next row probably exists but is unknown, use an 
oldid=prev link
+                       return $this->getSkin()->link(
+                               $this->title,
+                               $last,
+                               array(),
+                               array(
+                                       'diff' => $prevRev->getId(),
+                                       'oldid' => 'prev'
+                               ),
+                               array( 'known', 'noclasses' )
+                       );
+               } elseif( !$prevRev->userCan(Revision::DELETED_TEXT) || 
!$nextRev->userCan(Revision::DELETED_TEXT) ) {
+                       return $last;
+               } else {
+                       return $this->getSkin()->link(
+                               $this->title,
+                               $last,
+                               array(),
+                               array(
+                                       'diff' => $prevRev->getId(),
+                                       'oldid' => $next->rev_id
+                               ),
+                               array( 'known', 'noclasses' )
+                       );
+               }
+       }
+
+       /**
+        * Create radio buttons for page history
+        *
+        * @param object $rev Revision
+        * @param bool $firstInList Is this version the first one?
+        * @param int $counter A counter of what row number we're at, counted 
from the top row = 1.
+        * @return string HTML output for the radio buttons
+        */
+       function diffButtons( $rev, $firstInList, $counter ) {
+               if( $this->getNumRows() > 1 ) {
+                       $id = $rev->getId();
+                       $radio = array( 'type'  => 'radio', 'value' => $id );
+                       /** @todo: move title texts to javascript */
+                       if( $firstInList ) {
+                               $first = Xml::element( 'input', 
+                                       array_merge( $radio, array(
+                                               'style' => 'visibility:hidden',
+                                               'name'  => 'oldid',
+                                               'id' => 'mw-oldid-null' ) )
+                               );
+                               $checkmark = array( 'checked' => 'checked' );
+                       } else {
+                               # Check visibility of old revisions
+                               if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
+                                       $radio['disabled'] = 'disabled';
+                                       $checkmark = array(); // We will check 
the next possible one
+                               } else if( $counter == 2 || 
!$this->oldIdChecked ) {
+                                       $checkmark = array( 'checked' => 
'checked' );
+                                       $this->oldIdChecked = $id;
+                               } else {
+                                       $checkmark = array();
+                               }
+                               $first = Xml::element( 'input',
+                                       array_merge( $radio, $checkmark, array(
+                                               'name'  => 'oldid',
+                                               'id' => "mw-oldid-$id" ) ) );
+                               $checkmark = array();
+                       }
+                       $second = Xml::element( 'input',
+                               array_merge( $radio, $checkmark, array(
+                                       'name'  => 'diff',
+                                       'id' => "mw-diff-$id" ) ) );
+                       return $first . $second;
+               } else {
+                       return '';
+               }
+       }
+}
+
+/**
+ * Backwards-compatibility aliases
+ */
+class PageHistory extends HistoryPage {}
+class PageHistoryPager extends HistoryPager {}
+


Property changes on: trunk/phase3/includes/HistoryPage.php
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision
Added: svn:mergeinfo
   + /branches/REL1_15/phase3/includes/PageHistory.php:51646
Added: svn:eol-style
   + native

Deleted: trunk/phase3/includes/PageHistory.php
===================================================================
--- trunk/phase3/includes/PageHistory.php       2009-08-17 03:39:20 UTC (rev 
55167)
+++ trunk/phase3/includes/PageHistory.php       2009-08-17 05:09:36 UTC (rev 
55168)
@@ -1,715 +0,0 @@
-<?php
-/**
- * Page history
- *
- * Split off from Article.php and Skin.php, 2003-12-22
- * @file
- */
-
-/**
- * This class handles printing the history page for an article.  In order to
- * be efficient, it uses timestamps rather than offsets for paging, to avoid
- * costly LIMIT,offset queries.
- *
- * Construct it by passing in an Article, and call $h->history() to print the
- * history.
- *
- */
-class PageHistory {
-       const DIR_PREV = 0;
-       const DIR_NEXT = 1;
-
-       var $mArticle, $mTitle, $mSkin;
-       var $lastdate;
-       var $linesonpage;
-       var $mLatestId = null;
-       
-       private $mOldIdChecked = 0;
-
-       /**
-        * Construct a new PageHistory.
-        *
-        * @param Article $article
-        * @returns nothing
-        */
-       function __construct( $article ) {
-               global $wgUser;
-               $this->mArticle =& $article;
-               $this->mTitle =& $article->mTitle;
-               $this->mSkin = $wgUser->getSkin();
-               $this->preCacheMessages();
-       }
-
-       function getArticle() {
-               return $this->mArticle;
-       }
-
-       function getTitle() {
-               return $this->mTitle;
-       }
-
-       /**
-        * As we use the same small set of messages in various methods and that
-        * they are called often, we call them once and save them in 
$this->message
-        */
-       function preCacheMessages() {
-               // Precache various messages
-               if( !isset( $this->message ) ) {
-                       foreach( explode(' ', 'cur last rev-delundel' ) as $msg 
) {
-                               $this->message[$msg] = wfMsgExt( $msg, array( 
'escape') );
-                       }
-               }
-       }
-
-       /**
-        * Print the history page for an article.
-        *
-        * @returns nothing
-        */
-       function history() {
-               global $wgOut, $wgRequest, $wgScript;
-
-               /*
-                * Allow client caching.
-                */
-               if( $wgOut->checkLastModified( $this->mArticle->getTouched() ) )
-                       return; // Client cache fresh and headers sent, nothing 
more to do.
-
-               wfProfileIn( __METHOD__ );
-
-               /*
-                * Setup page variables.
-                */
-               $wgOut->setPageTitle( wfMsg( 'history-title', 
$this->mTitle->getPrefixedText() ) );
-               $wgOut->setPageTitleActionText( wfMsg( 'history_short' ) );
-               $wgOut->setArticleFlag( false );
-               $wgOut->setArticleRelated( true );
-               $wgOut->setRobotPolicy( 'noindex,nofollow' );
-               $wgOut->setSyndicated( true );
-               $wgOut->setFeedAppendQuery( 'action=history' );
-               $wgOut->addScriptFile( 'history.js' );
-
-               $logPage = SpecialPage::getTitleFor( 'Log' );
-               $logLink = $this->mSkin->link(
-                       $logPage,
-                       wfMsgHtml( 'viewpagelogs' ),
-                       array(),
-                       array( 'page' => $this->mTitle->getPrefixedText() ),
-                       array( 'known', 'noclasses' )
-               );
-               $wgOut->setSubtitle( $logLink );
-
-               $feedType = $wgRequest->getVal( 'feed' );
-               if( $feedType ) {
-                       wfProfileOut( __METHOD__ );
-                       return $this->feed( $feedType );
-               }
-
-               /*
-                * Fail if article doesn't exist.
-                */
-               if( !$this->mTitle->exists() ) {
-                       $wgOut->addWikiMsg( 'nohistory' );
-                       wfProfileOut( __METHOD__ );
-                       return;
-               }
-
-               /**
-                * Add date selector to quickly get to a certain time
-                */
-               $year = $wgRequest->getInt( 'year' );
-               $month = $wgRequest->getInt( 'month' );
-               $tagFilter = $wgRequest->getVal( 'tagfilter' );
-               $tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter );
-
-               $action = htmlspecialchars( $wgScript );
-               $wgOut->addHTML(
-                       "<form action=\"$action\" method=\"get\" 
id=\"mw-history-searchform\">" .
-                       Xml::fieldset( wfMsg( 'history-fieldset-title' ), 
false, array( 'id' => 'mw-history-search' ) ) .
-                       Xml::hidden( 'title', $this->mTitle->getPrefixedDBKey() 
) . "\n" .
-                       Xml::hidden( 'action', 'history' ) . "\n" .
-                       xml::dateMenu( $year, $month ) . '&nbsp;' .
-                       ( $tagSelector ? ( implode( '&nbsp;', $tagSelector ) . 
'&nbsp;' ) : '' ) .
-                       Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
-                       '</fieldset></form>'
-               );
-
-               wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) 
);
-
-               /**
-                * Do the list
-                */
-               $pager = new PageHistoryPager( $this, $year, $month, $tagFilter 
);
-               $this->linesonpage = $pager->getNumRows();
-               $wgOut->addHTML(
-                       $pager->getNavigationBar() .
-                       $this->beginHistoryList() .
-                       $pager->getBody() .
-                       $this->endHistoryList() .
-                       $pager->getNavigationBar()
-               );
-
-               wfProfileOut( __METHOD__ );
-       }
-
-       /**
-        * Creates begin of history list with a submit button
-        *
-        * @return string HTML output
-        */
-       function beginHistoryList() {
-               global $wgUser, $wgScript, $wgEnableHtmlDiff;
-               $this->lastdate = '';
-               $s = wfMsgExt( 'histlegend', array( 'parse') );
-               if( $this->linesonpage > 1 && 
$wgUser->isAllowed('deleterevision') ) {
-                       $revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
-                       $s .= Xml::openElement( 'form',
-                               array(
-                                       'action' => $revdel->getLocalURL( 
array( 
-                                               'type' => 'revision',
-                                               'target' => 
$this->mTitle->getPrefixedDbKey()
-                                       ) ),
-                                       'method' => 'post', 
-                                       'id' => 'mw-history-revdeleteform',
-                                       'style'  => 
'visibility:hidden;float:right;'
-                               )
-                       );
-                       $s .= Xml::hidden( 'ids', '', 
array('id'=>'revdel-oldid') );
-                       $s .= Xml::submitButton( wfMsg( 
'showhideselectedversions' ) );
-                       $s .= Xml::closeElement( 'form' );
-               }
-               $s .= Xml::openElement( 'form', array( 'action' => $wgScript,
-                       'id' => 'mw-history-compare' ) );
-               $s .= Xml::hidden( 'title', $this->mTitle->getPrefixedDbKey() );
-               if( $wgEnableHtmlDiff ) {
-                       $s .= $this->submitButton( wfMsg( 'visualcomparison'),
-                               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' ),
-                               )
-                       );
-               } else {
-                       $s .= $this->submitButton( wfMsg( 
'compareselectedversions'),
-                               array(
-                                       'class'     => 'historysubmit',
-                                       'accesskey' => wfMsg( 
'accesskey-compareselectedversions' ),
-                                       'title'     => wfMsg( 
'tooltip-compareselectedversions' ),
-                               )
-                       );
-               }
-               $s .= '<ul id="pagehistory">' . "\n";
-               return $s;
-       }
-
-       /**
-        * Creates end of history list with a submit button
-        *
-        * @return string HTML output
-        */
-       function endHistoryList() {
-               global $wgEnableHtmlDiff;
-               $s = '</ul>';
-               if( $wgEnableHtmlDiff ) {
-                       $s .= $this->submitButton( wfMsg( 'visualcomparison'),
-                               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' ),
-                               )
-                       );
-               } else {
-                       $s .= $this->submitButton( wfMsg( 
'compareselectedversions'),
-                               array(
-                                       'class'     => 'historysubmit',
-                                       'accesskey' => wfMsg( 
'accesskey-compareselectedversions' ),
-                                       'title'     => wfMsg( 
'tooltip-compareselectedversions' ),
-                               )
-                       );
-               }
-               $s .= '</form>';
-               return $s;
-       }
-
-       /**
-        * Creates a submit button
-        *
-        * @param array $attributes attributes
-        * @return string HTML output for the submit button
-        */
-       function submitButton($message, $attributes = array() ) {
-               # Disable submit button if history has 1 revision only
-               if( $this->linesonpage > 1 ) {
-                       return Xml::submitButton( $message , $attributes );
-               } else {
-                       return '';
-               }
-       }
-
-       /**
-        * Returns a row from the history printout.
-        *
-        * @todo document some more, and maybe clean up the code (some params 
redundant?)
-        *
-        * @param Row $row The database row corresponding to the previous line.
-        * @param mixed $next The database row corresponding to the next line.
-        * @param int $counter Apparently a counter of what row number we're 
at, counted from the top row = 1.
-        * @param $notificationtimestamp
-        * @param bool $latest Whether this row corresponds to the page's 
latest revision.
-        * @param bool $firstInList Whether this row corresponds to the first 
displayed on this history page.
-        * @return string HTML output for the row
-        */
-       function historyLine( $row, $next, $counter = '', 
$notificationtimestamp = false,
-               $latest = false, $firstInList = false )
-       {
-               global $wgUser, $wgLang;
-               $rev = new Revision( $row );
-               $rev->setTitle( $this->mTitle );
-
-               $curlink = $this->curLink( $rev, $latest );
-               $lastlink = $this->lastLink( $rev, $next, $counter );
-               $arbitrary = $this->diffButtons( $rev, $firstInList, $counter );
-               $link = $this->revLink( $rev );
-               $classes = array();
-
-               $s = "($curlink) ($lastlink) $arbitrary";
-
-               if( $wgUser->isAllowed( 'deleterevision' ) ) {
-                       // Hide JS by default for non-JS browsing
-                       $hidden = array( 'style' => 'display:none' );
-                       // If revision was hidden from sysops
-                       if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
-                               $del = Xml::check( 'deleterevisions', false,
-                                       $hidden + array('disabled' => 
'disabled') );
-                               $del .= Xml::tags( 'span', array( 
'class'=>'mw-revdelundel-link' ),
-                                       '(' . $this->message['rev-delundel'] . 
')' );
-                       // Otherwise, show the link...
-                       } else {
-                               $id = $rev->getId();
-                               $jsCall = 
"updateShowHideForm($id,this.checked)";
-                               $del = Xml::check( 'showhiderevisions', false,
-                                       $hidden + array(
-                                               'onchange' => $jsCall,
-                                               'id' => "mw-revdel-$id" ) );
-                               $query = array(
-                                       'type' => 'revision',
-                                       'target' => 
$this->mTitle->getPrefixedDbkey(),
-                                       'ids' => $rev->getId() );
-                               $del .= $this->mSkin->revDeleteLink( $query,
-                                       $rev->isDeleted( 
Revision::DELETED_RESTRICTED ) );
-                       }
-                       $s .= " $del ";
-               }
-
-               $s .= " $link";
-               $s .= " <span class='history-user'>" . 
$this->mSkin->revUserTools( $rev, true ) . "</span>";
-
-               if( $rev->isMinor() ) {
-                       $s .= ' ' . ChangesList::flag( 'minor' );
-               }
-
-               if( !is_null( $size = $rev->getSize() ) && !$rev->isDeleted( 
Revision::DELETED_TEXT ) ) {
-                       $s .= ' ' . $this->mSkin->formatRevisionSize( $size );
-               }
-
-               $s .= $this->mSkin->revComment( $rev, false, true );
-
-               if( $notificationtimestamp && ($row->rev_timestamp >= 
$notificationtimestamp) ) {
-                       $s .= ' <span class="updatedmarker">' .  wfMsgHtml( 
'updatedmarker' ) . '</span>';
-               }
-
-               $tools = array();
-
-               if( !is_null( $next ) && is_object( $next ) ) {
-                       if( $latest && $this->mTitle->userCan( 'rollback' ) && 
$this->mTitle->userCan( 'edit' ) ) {
-                               $tools[] = '<span class="mw-rollback-link">'.
-                                       $this->mSkin->buildRollbackLink( $rev 
).'</span>';
-                       }
-
-                       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' ) )
-                                       : array();
-                               $undolink = $this->mSkin->link(
-                                       $this->mTitle,
-                                       wfMsgHtml( 'editundo' ),
-                                       $undoTooltip,
-                                       array( 'action' => 'edit', 'undoafter' 
=> $next->rev_id, 'undo' => $rev->getId() ),
-                                       array( 'known', 'noclasses' )
-                               );
-                               $tools[] = "<span 
class=\"mw-history-undo\">{$undolink}</span>";
-                       }
-               }
-
-               if( $tools ) {
-                       $s .= ' (' . $wgLang->pipeList( $tools ) . ')';
-               }
-
-               # Tags
-               list($tagSummary, $newClasses) = ChangeTags::formatSummaryRow( 
$row->ts_tags, 'history' );
-               $classes = array_merge( $classes, $newClasses );
-               $s .= " $tagSummary";
-
-               wfRunHooks( 'PageHistoryLineEnding', array( $this, &$row , &$s 
) );
-
-               $classes = implode( ' ', $classes );
-
-               return "<li class=\"$classes\">$s</li>\n";
-       }
-
-       /**
-        * Create a link to view this revision of the page
-        * @param Revision $rev
-        * @returns string
-        */
-       function revLink( $rev ) {
-               global $wgLang;
-               $date = $wgLang->timeanddate( wfTimestamp(TS_MW, 
$rev->getTimestamp()), true );
-               $date = htmlspecialchars( $date );
-               if( !$rev->isDeleted( Revision::DELETED_TEXT ) ) {
-                       $link = $this->mSkin->link(
-                               $this->mTitle,
-                               $date,
-                               array(),
-                               array( 'oldid' => $rev->getId() ),
-                               array( 'known', 'noclasses' )
-                       );
-               } else {
-                       $link = "<span class=\"history-deleted\">$date</span>";
-               }
-               return $link;
-       }
-
-       /**
-        * Create a diff-to-current link for this revision for this page
-        * @param Revision $rev
-        * @param Bool $latest, this is the latest revision of the page?
-        * @returns string
-        */
-       function curLink( $rev, $latest ) {
-               $cur = $this->message['cur'];
-               if( $latest || !$rev->userCan( Revision::DELETED_TEXT ) ) {
-                       return $cur;
-               } else {
-                       return $this->mSkin->link(
-                               $this->mTitle,
-                               $cur,
-                               array(),
-                               array(
-                                       'diff' => 
$this->mTitle->getLatestRevID(),
-                                       'oldid' => $rev->getId()
-                               ),
-                               array( 'known', 'noclasses' )
-                       );
-               }
-       }
-
-       /**
-        * Create a diff-to-previous link for this revision for this page.
-        * @param Revision $prevRev, the previous revision
-        * @param mixed $next, the newer revision
-        * @param int $counter, what row on the history list this is
-        * @returns string
-        */
-       function lastLink( $prevRev, $next, $counter ) {
-               $last = $this->message['last'];
-               # $next may either be a Row, null, or "unkown"
-               $nextRev = is_object($next) ? new Revision( $next ) : $next;
-               if( is_null($next) ) {
-                       # Probably no next row
-                       return $last;
-               } elseif( $next === 'unknown' ) {
-                       # Next row probably exists but is unknown, use an 
oldid=prev link
-                       return $this->mSkin->link(
-                               $this->mTitle,
-                               $last,
-                               array(),
-                               array(
-                                       'diff' => $prevRev->getId(),
-                                       'oldid' => 'prev'
-                               ),
-                               array( 'known', 'noclasses' )
-                       );
-               } elseif( !$prevRev->userCan(Revision::DELETED_TEXT) || 
!$nextRev->userCan(Revision::DELETED_TEXT) ) {
-                       return $last;
-               } else {
-                       return $this->mSkin->link(
-                               $this->mTitle,
-                               $last,
-                               array(),
-                               array(
-                                       'diff' => $prevRev->getId(),
-                                       'oldid' => $next->rev_id
-                               ),
-                               array( 'known', 'noclasses' )
-                       );
-               }
-       }
-
-       /**
-        * Create radio buttons for page history
-        *
-        * @param object $rev Revision
-        * @param bool $firstInList Is this version the first one?
-        * @param int $counter A counter of what row number we're at, counted 
from the top row = 1.
-        * @return string HTML output for the radio buttons
-        */
-       function diffButtons( $rev, $firstInList, $counter ) {
-               if( $this->linesonpage > 1 ) {
-                       $id = $rev->getId();
-                       $radio = array( 'type'  => 'radio', 'value' => $id );
-                       /** @todo: move title texts to javascript */
-                       if( $firstInList ) {
-                               $first = Xml::element( 'input', 
-                                       array_merge( $radio, array(
-                                               'style' => 'visibility:hidden',
-                                               'name'  => 'oldid',
-                                               'id' => 'mw-oldid-null' ) )
-                               );
-                               $checkmark = array( 'checked' => 'checked' );
-                       } else {
-                               # Check visibility of old revisions
-                               if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
-                                       $radio['disabled'] = 'disabled';
-                                       $checkmark = array(); // We will check 
the next possible one
-                               } else if( $counter == 2 || 
!$this->mOldIdChecked ) {
-                                       $checkmark = array( 'checked' => 
'checked' );
-                                       $this->mOldIdChecked = $id;
-                               } else {
-                                       $checkmark = array();
-                               }
-                               $first = Xml::element( 'input',
-                                       array_merge( $radio, $checkmark, array(
-                                               'name'  => 'oldid',
-                                               'id' => "mw-oldid-$id" ) ) );
-                               $checkmark = array();
-                       }
-                       $second = Xml::element( 'input',
-                               array_merge( $radio, $checkmark, array(
-                                       'name'  => 'diff',
-                                       'id' => "mw-diff-$id" ) ) );
-                       return $first . $second;
-               } else {
-                       return '';
-               }
-       }
-
-       /**
-        * Fetch an array of revisions, specified by a given limit, offset and
-        * direction. This is now only used by the feeds. It was previously
-        * used by the main UI but that's now handled by the pager.
-        */
-       function fetchRevisions($limit, $offset, $direction) {
-               $dbr = wfGetDB( DB_SLAVE );
-
-               if( $direction == PageHistory::DIR_PREV )
-                       list($dirs, $oper) = array("ASC", ">=");
-               else /* $direction == PageHistory::DIR_NEXT */
-                       list($dirs, $oper) = array("DESC", "<=");
-
-               if( $offset )
-                       $offsets = array("rev_timestamp $oper '$offset'");
-               else
-                       $offsets = array();
-
-               $page_id = $this->mTitle->getArticleID();
-
-               return $dbr->select( 'revision',
-                       Revision::selectFields(),
-                       array_merge(array("rev_page=$page_id"), $offsets),
-                       __METHOD__,
-                       array( 'ORDER BY' => "rev_timestamp $dirs", 
-                               'USE INDEX' => 'page_timestamp', 'LIMIT' => 
$limit)
-               );
-       }
-
-       /**
-        * Output a subscription feed listing recent edits to this page.
-        * @param string $type
-        */
-       function feed( $type ) {
-               global $wgFeedClasses, $wgRequest, $wgFeedLimit;
-               if( !FeedUtils::checkFeedOutput($type) ) {
-                       return;
-               }
-
-               $feed = new $wgFeedClasses[$type](
-                       $this->mTitle->getPrefixedText() . ' - ' .
-                               wfMsgForContent( 'history-feed-title' ),
-                       wfMsgForContent( 'history-feed-description' ),
-                       $this->mTitle->getFullUrl( array( 'action' => 'history' 
) )
-               );
-
-               // Get a limit on number of feed entries. Provide a sane default
-               // of 10 if none is defined (but limit to $wgFeedLimit max)
-               $limit = $wgRequest->getInt( 'limit', 10 );
-               if( $limit > $wgFeedLimit || $limit < 1 ) {
-                       $limit = 10;
-               }
-               $items = $this->fetchRevisions($limit, 0, 
PageHistory::DIR_NEXT);
-
-               $feed->outHeader();
-               if( $items ) {
-                       foreach( $items as $row ) {
-                               $feed->outItem( $this->feedItem( $row ) );
-                       }
-               } else {
-                       $feed->outItem( $this->feedEmpty() );
-               }
-               $feed->outFooter();
-       }
-
-       function feedEmpty() {
-               global $wgOut;
-               return new FeedItem(
-                       wfMsgForContent( 'nohistory' ),
-                       $wgOut->parse( wfMsgForContent( 'history-feed-empty' ) 
),
-                       $this->mTitle->getFullUrl(),
-                       wfTimestamp( TS_MW ),
-                               '',
-                       $this->mTitle->getTalkPage()->getFullUrl()
-               );
-       }
-
-       /**
-        * Generate a FeedItem object from a given revision table row
-        * Borrows Recent Changes' feed generation functions for formatting;
-        * includes a diff to the previous revision (if any).
-        *
-        * @param $row
-        * @return FeedItem
-        */
-       function feedItem( $row ) {
-               $rev = new Revision( $row );
-               $rev->setTitle( $this->mTitle );
-               $text = FeedUtils::formatDiffRow(
-                       $this->mTitle,
-                       $this->mTitle->getPreviousRevisionID( $rev->getId() ),
-                       $rev->getId(),
-                       $rev->getTimestamp(),
-                       $rev->getComment()
-               );
-               if( $rev->getComment() == '' ) {
-                       global $wgContLang;
-                       $ts = $rev->getTimestamp();
-                       $title = wfMsgForContent( 'history-feed-item-nocomment',
-                               $rev->getUserText(),
-                               $wgContLang->timeanddate( $ts ),
-                               $wgContLang->date( $ts ),
-                               $wgContLang->time( $ts ) );
-               } else {
-                       $title = $rev->getUserText() . wfMsgForContent( 
'colon-separator' ) .
-                               FeedItem::stripComment( $rev->getComment() );
-               }
-               return new FeedItem(
-                       $title,
-                       $text,
-                       $this->mTitle->getFullUrl( array(
-                               'diff' => $rev->getId(),
-                               'oldid' => 'prev'
-                       ) ),
-                       $rev->getTimestamp(),
-                       $rev->getUserText(),
-                       $this->mTitle->getTalkPage()->getFullUrl()
-               );
-       }
-}
-
-/**
- * @ingroup Pager
- */
-class PageHistoryPager extends ReverseChronologicalPager {
-       public $mLastRow = false, $mPageHistory, $mTitle;
-
-       function __construct( $pageHistory, $year='', $month='', $tagFilter = 
'' ) {
-               parent::__construct();
-               $this->mPageHistory = $pageHistory;
-               $this->mTitle =& $this->mPageHistory->mTitle;
-               $this->tagFilter = $tagFilter;
-               $this->getDateCond( $year, $month );
-       }
-
-       function getQueryInfo() {
-               $queryInfo = array(
-                       'tables'  => array('revision'),
-                       'fields'  => array_merge( Revision::selectFields(), 
array('ts_tags') ),
-                       'conds'   => array('rev_page' => 
$this->mPageHistory->mTitle->getArticleID() ),
-                       'options' => array( 'USE INDEX' => array('revision' => 
'page_timestamp') ),
-                       'join_conds' => array( 'tag_summary' => array( 'LEFT 
JOIN', 'ts_rev_id=rev_id' ) ),
-               );
-               ChangeTags::modifyDisplayQuery( $queryInfo['tables'],
-                                                                               
$queryInfo['fields'],
-                                                                               
$queryInfo['conds'],
-                                                                               
$queryInfo['join_conds'],
-                                                                               
$queryInfo['options'],
-                                                                               
$this->tagFilter );
-               wfRunHooks( 'PageHistoryPager::getQueryInfo', array( &$this, 
&$queryInfo ) );
-               return $queryInfo;
-       }
-
-       function getIndexField() {
-               return 'rev_timestamp';
-       }
-
-       function formatRow( $row ) {
-               if( $this->mLastRow ) {
-                       $latest = $this->mCounter == 1 && $this->mIsFirst;
-                       $firstInList = $this->mCounter == 1;
-                       $s = $this->mPageHistory->historyLine( $this->mLastRow, 
$row, $this->mCounter++,
-                               $this->mTitle->getNotificationTimestamp(), 
$latest, $firstInList );
-               } else {
-                       $s = '';
-               }
-               $this->mLastRow = $row;
-               return $s;
-       }
-
-       function getStartBody() {
-               $this->mLastRow = false;
-               $this->mCounter = 1;
-               return '';
-       }
-
-       function getEndBody() {
-               if( $this->mLastRow ) {
-                       $latest = $this->mCounter == 1 && $this->mIsFirst;
-                       $firstInList = $this->mCounter == 1;
-                       if( $this->mIsBackwards ) {
-                               # Next row is unknown, but for UI reasons, 
probably exists if an offset has been specified
-                               if( $this->mOffset == '' ) {
-                                       $next = null;
-                               } else {
-                                       $next = 'unknown';
-                               }
-                       } else {
-                               # The next row is the past-the-end row
-                               $next = $this->mPastTheEndRow;
-                       }
-                       $s = $this->mPageHistory->historyLine( $this->mLastRow, 
$next, $this->mCounter++,
-                               $this->mTitle->getNotificationTimestamp(), 
$latest, $firstInList );
-               } else {
-                       $s = '';
-               }
-               return $s;
-       }
-}

Modified: trunk/phase3/includes/Pager.php
===================================================================
--- trunk/phase3/includes/Pager.php     2009-08-17 03:39:20 UTC (rev 55167)
+++ trunk/phase3/includes/Pager.php     2009-08-17 05:09:36 UTC (rev 55168)
@@ -50,7 +50,7 @@
  *      last page depending on the dir parameter.
  *
  *  Subclassing the pager to implement concrete functionality should be fairly
- *  simple, please see the examples in PageHistory.php and
+ *  simple, please see the examples in HistoryPage.php and
  *  SpecialIpblocklist.php. You just need to override formatRow(),
  *  getQueryInfo() and getIndexField(). Don't forget to call the parent
  *  constructor if you override it.
@@ -87,6 +87,9 @@
        public $mDefaultDirection;
        public $mIsBackwards;
 
+       /** True if the current result set is the first one */
+       public $mIsFirst;
+
        /**
         * Result object for the query. Warning: seek before use.
         */

Modified: trunk/phase3/includes/Wiki.php
===================================================================
--- trunk/phase3/includes/Wiki.php      2009-08-17 03:39:20 UTC (rev 55167)
+++ trunk/phase3/includes/Wiki.php      2009-08-17 05:09:36 UTC (rev 55168)
@@ -532,7 +532,7 @@
                                if( $request->getFullRequestURL() == 
$title->getInternalURL( 'action=history' ) ) {
                                        $output->setSquidMaxage( $this->getVal( 
'SquidMaxage' ) );
                                }
-                               $history = new PageHistory( $article );
+                               $history = new HistoryPage( $article );
                                $history->history();
                                break;
                        default:



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to