function getArticle() {
return $this->mArticle;
}
-
+
function getTitle() {
return $this->mTitle;
}
* @returns nothing
*/
function history() {
- global $wgOut, $wgRequest, $wgTitle;
+ global $wgOut, $wgRequest, $wgTitle, $wgScript;
/*
* Allow client caching.
*/
-
if( $wgOut->checkLastModified( $this->mArticle->getTouched() ) )
- /* Client cache fresh and headers sent, nothing more to do. */
- return;
+ /* Client cache fresh and headers sent, nothing more to do. */
+ return;
wfProfileIn( __METHOD__ );
$wgOut->setPageTitleActionText( wfMsg( 'history_short' ) );
$wgOut->setArticleFlag( false );
$wgOut->setArticleRelated( true );
- $wgOut->setRobotpolicy( 'noindex,nofollow' );
+ $wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->setSyndicated( true );
$wgOut->setFeedAppendQuery( 'action=history' );
$wgOut->addScriptFile( 'history.js' );
return;
}
- wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) );
-
/**
- * Do the list
+ * Add date selector to quickly get to a certain time
*/
- $pager = new PageHistoryPager( $this );
- $this->linesonpage = $pager->getNumRows();
+ $year = $wgRequest->getInt( 'year' );
+ $month = $wgRequest->getInt( 'month' );
+
+ $action = htmlspecialchars( $wgScript );
$wgOut->addHTML(
+ Xml::fieldset( wfMsg( 'history-search' ), false, array( 'id' => 'mw-history-search' ) ) .
+ "<form action=\"$action\" method=\"get\">" .
+ Xml::hidden( 'title', $this->mTitle->getPrefixedDBKey() ) . "\n" .
+ Xml::hidden( 'action', 'history' ) . "\n" .
+ $this->getDateMenu( $year, $month ) . ' ' .
+ Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "\n" .
+ '</form></fieldset>'
+ );
+
+ wfRunHooks( 'PageHistoryBeforeList', array( &$this->mArticle ) );
+
+ /**
+ * 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__ );
+ }
+
+ /**
+ * @return string Formatted HTML
+ * @param int $year
+ * @param int $month
+ */
+ private function getDateMenu( $year, $month ) {
+ # Offset overrides year/month selection
+ if( $month && $month !== -1 ) {
+ $encMonth = intval( $month );
+ } else {
+ $encMonth = '';
+ }
+ if ( $year ) {
+ $encYear = intval( $year );
+ } else if( $encMonth ) {
+ $thisMonth = intval( gmdate( 'n' ) );
+ $thisYear = intval( gmdate( 'Y' ) );
+ if( intval($encMonth) > $thisMonth ) {
+ $thisYear--;
+ }
+ $encYear = $thisYear;
+ } else {
+ $encYear = '';
+ }
+ return Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
+ Xml::input( 'year', 4, $encYear, array('id' => 'year', 'maxlength' => 4) ) .
+ ' '.
+ Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
+ Xml::monthSelector( $encMonth, -1 );
}
/**
* @return string HTML output
*/
function beginHistoryList() {
- global $wgTitle, $wgScript;
+ global $wgTitle, $wgScript, $wgEnableHtmlDiff;
$this->lastdate = '';
$s = wfMsgExt( 'histlegend', array( 'parse') );
$s .= Xml::openElement( 'form', array( 'action' => $wgScript ) );
$s .= Xml::hidden( 'title', $wgTitle->getPrefixedDbKey() );
- $s .= $this->submitButton();
+ 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;
}
* @return string HTML output
*/
function endHistoryList() {
+ global $wgEnableHtmlDiff;
$s = '</ul>';
- $s .= $this->submitButton( array( 'id' => 'historysubmit' ) );
+ 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 $bits optional CSS ID
+ * @param array $attributes attributes
* @return string HTML output for the submit button
*/
- function submitButton( $bits = array() ) {
+ function submitButton($message, $attributes = array() ) {
# Disable submit button if history has 1 revision only
if ( $this->linesonpage > 1 ) {
- return Xml::submitButton( wfMsg( 'compareselectedversions' ),
- $bits + array(
- 'class' => 'historysubmit',
- 'accesskey' => wfMsg( 'accesskey-compareselectedversions' ),
- 'title' => wfMsg( 'tooltip-compareselectedversions' ),
- )
- );
+ return Xml::submitButton( $message , $attributes );
} else {
return '';
}
if( $wgUser->isAllowed( 'deleterevision' ) ) {
$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
if( $firstInList ) {
- // We don't currently handle well changing the top revision's settings
+ // We don't currently handle well changing the top revision's settings
$del = $this->message['rev-delundel'];
} else if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
- // If revision was hidden from sysops
+ // If revision was hidden from sysops
$del = $this->message['rev-delundel'];
} else {
$del = $this->mSkin->makeKnownLinkObj( $revdel,
- $this->message['rev-delundel'],
+ $this->message['rev-delundel'],
'target=' . urlencode( $this->mTitle->getPrefixedDbkey() ) .
'&oldid=' . urlencode( $rev->getId() ) );
// Bolden oversighted content
if( $rev->isDeleted( Revision::DELETED_RESTRICTED ) )
- $del = "<strong>$del</strong>";
+ $del = "<strong>$del</strong>";
}
$s .= " <tt>(<small>$del</small>)</tt> ";
}
}
if ( !is_null( $size = $rev->getSize() ) && $rev->userCan( Revision::DELETED_TEXT ) ) {
- if ( $size == 0 ) {
- $stxt = wfMsg( 'historyempty' );
- } else {
- $stxt = wfMsg( 'nbytes', $wgLang->formatNum( $size ) );
- $stxt = "($stxt)";
- }
- $stxt = htmlspecialchars( $stxt );
- $s .= " <span class=\"history-size\">$stxt</span>";
+ $s .= ' ' . $this->mSkin->formatRevisionSize( $size );
}
$s .= $this->mSkin->revComment( $rev, false, true );
&& !$this->mTitle->getUserPermissionsErrors( 'edit', $wgUser )
&& $latest ) {
$tools[] = '<span class="mw-rollback-link">'
- . $this->mSkin->buildRollbackLink( $rev )
- . '</span>';
+ . $this->mSkin->buildRollbackLink( $rev )
+ . '</span>';
}
if( $this->mTitle->quickUserCan( 'edit' ) &&
- !$rev->isDeleted( Revision::DELETED_TEXT ) &&
- !$next->rev_deleted & Revision::DELETED_TEXT ) {
- $undolink = $this->mSkin->makeKnownLinkObj(
+ !$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' ),
- 'action=edit&undoafter=' . $next->rev_id . '&undo=' . $rev->getId()
+ $undoTooltip,
+ array( 'action' => 'edit', 'undoafter' => $next->rev_id, 'undo' => $rev->getId() ),
+ array( 'known', 'noclasses' )
);
$tools[] = "<span class=\"mw-history-undo\">{$undolink}</span>";
}
}
/**
- * Create a link to view this revision of the page
- * @param Revision $rev
- * @returns string
- */
+ * 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 );
if( $rev->userCan( Revision::DELETED_TEXT ) ) {
$link = $this->mSkin->makeKnownLinkObj(
- $this->mTitle, $date, "oldid=" . $rev->getId() );
+ $this->mTitle, $date, "oldid=" . $rev->getId() );
} else {
$link = $date;
}
}
/**
- * 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
- */
+ * 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->makeKnownLinkObj(
- $this->mTitle, $cur,
+ $this->mTitle, $cur,
'diff=' . $this->getLatestID() .
"&oldid=" . $rev->getId() );
}
}
/**
- * 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
- */
+ * 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"
} elseif( $next === 'unknown' ) {
# Next row probably exists but is unknown, use an oldid=prev link
return $this->mSkin->makeKnownLinkObj(
- $this->mTitle,
- $last,
+ $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,
+ $this->mTitle,
+ $last,
"diff=" . $prevRev->getId() . "&oldid={$next->rev_id}"
- /*,
+ /*,
'',
'',
"tabindex={$counter}"*/ );
/** @todo: move title texts to javascript */
if ( $firstInList ) {
$first = Xml::element( 'input', array_merge(
- $radio,
- array(
+ $radio,
+ array(
'style' => 'visibility:hidden',
'name' => 'oldid' ) ) );
$checkmark = array( 'checked' => 'checked' );
$checkmark = array();
}
$first = Xml::element( 'input', array_merge(
- $radio,
- $checkmark,
- array( 'name' => 'oldid' ) ) );
+ $radio,
+ $checkmark,
+ array( 'name' => 'oldid' ) ) );
$checkmark = array();
}
$second = Xml::element( 'input', array_merge(
- $radio,
- $checkmark,
- array( 'name' => 'diff' ) ) );
+ $radio,
+ $checkmark,
+ array( 'name' => 'diff' ) ) );
return $first . $second;
} else {
return '';
$db = wfGetDB( DB_SLAVE );
$this->mLatestId = $db->selectField( 'page',
"page_latest",
- array( 'page_id' => $id ),
- __METHOD__ );
+ array( 'page_id' => $id ),
+ __METHOD__ );
}
return $this->mLatestId;
}
$dbr = wfGetDB( DB_SLAVE );
if ($direction == PageHistory::DIR_PREV)
- list($dirs, $oper) = array("ASC", ">=");
+ list($dirs, $oper) = array("ASC", ">=");
else /* $direction == PageHistory::DIR_NEXT */
- list($dirs, $oper) = array("DESC", "<=");
+ list($dirs, $oper) = array("DESC", "<=");
if ($offset)
- $offsets = array("rev_timestamp $oper '$offset'");
+ $offsets = array("rev_timestamp $oper '$offset'");
else
- $offsets = array();
+ $offsets = array();
$page_id = $this->mTitle->getArticleID();
- $res = $dbr->select(
+ return $dbr->select(
'revision',
- Revision::selectFields(),
- array_merge(array("rev_page=$page_id"), $offsets),
- __METHOD__,
- array('ORDER BY' => "rev_timestamp $dirs",
+ Revision::selectFields(),
+ array_merge(array("rev_page=$page_id"), $offsets),
+ __METHOD__,
+ array('ORDER BY' => "rev_timestamp $dirs",
'USE INDEX' => 'page_timestamp', 'LIMIT' => $limit)
- );
-
- $result = array();
- while (($obj = $dbr->fetchObject($res)) != NULL)
- $result[] = $obj;
-
- return $result;
+ );
}
/** @todo document */
global $wgUser, $wgShowUpdatedMarker;
if ($this->mNotificationTimestamp !== NULL)
- return $this->mNotificationTimestamp;
+ return $this->mNotificationTimestamp;
if ($wgUser->isAnon() || !$wgShowUpdatedMarker)
- return $this->mNotificationTimestamp = false;
+ return $this->mNotificationTimestamp = false;
$dbr = wfGetDB(DB_SLAVE);
$this->mNotificationTimestamp = $dbr->selectField(
'watchlist',
'wl_notificationtimestamp',
- array( 'wl_namespace' => $this->mTitle->getNamespace(),
+ array( 'wl_namespace' => $this->mTitle->getNamespace(),
'wl_title' => $this->mTitle->getDBkey(),
'wl_user' => $wgUser->getId()
- ),
- __METHOD__ );
+ ),
+ __METHOD__ );
// Don't use the special value reserved for telling whether the field is filled
if ( is_null( $this->mNotificationTimestamp ) ) {
* @param string $type
*/
function feed( $type ) {
- global $wgFeedClasses;
+ 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( 'action=history' ) );
+ $this->mTitle->getPrefixedText() . ' - ' .
+ wfMsgForContent( 'history-feed-title' ),
+ wfMsgForContent( 'history-feed-description' ),
+ $this->mTitle->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, PageHistory::DIR_NEXT);
- $items = $this->fetchRevisions(10, 0, PageHistory::DIR_NEXT);
$feed->outHeader();
if( $items ) {
foreach( $items as $row ) {
function feedEmpty() {
global $wgOut;
return new FeedItem(
- wfMsgForContent( 'nohistory' ),
- $wgOut->parse( wfMsgForContent( 'history-feed-empty' ) ),
- $this->mTitle->getFullUrl(),
- wfTimestamp( TS_MW ),
+ wfMsgForContent( 'nohistory' ),
+ $wgOut->parse( wfMsgForContent( 'history-feed-empty' ) ),
+ $this->mTitle->getFullUrl(),
+ wfTimestamp( TS_MW ),
'',
- $this->mTitle->getTalkPage()->getFullUrl() );
+ $this->mTitle->getTalkPage()->getFullUrl() );
}
/**
$rev = new Revision( $row );
$rev->setTitle( $this->mTitle );
$text = FeedUtils::formatDiffRow( $this->mTitle,
- $this->mTitle->getPreviousRevisionID( $rev->getId() ),
- $rev->getId(),
- $rev->getTimestamp(),
- $rev->getComment() );
+ $this->mTitle->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() ) );
+ $rev->getUserText(),
+ $wgContLang->timeanddate( $rev->getTimestamp() ) );
} else {
$title = $rev->getUserText() . ": " . $this->stripComment( $rev->getComment() );
}
return new FeedItem(
- $title,
- $text,
- $this->mTitle->getFullUrl( 'diff=' . $rev->getId() . '&oldid=prev' ),
- $rev->getTimestamp(),
- $rev->getUserText(),
- $this->mTitle->getTalkPage()->getFullUrl() );
+ $title,
+ $text,
+ $this->mTitle->getFullUrl( 'diff=' . $rev->getId() . '&oldid=prev' ),
+ $rev->getTimestamp(),
+ $rev->getUserText(),
+ $this->mTitle->getTalkPage()->getFullUrl() );
}
/**
class PageHistoryPager extends ReverseChronologicalPager {
public $mLastRow = false, $mPageHistory;
- function __construct( $pageHistory ) {
+ function __construct( $pageHistory, $year='', $month='' ) {
parent::__construct();
$this->mPageHistory = $pageHistory;
+ $this->getDateCond( $year, $month );
}
function getQueryInfo() {
$queryInfo = array(
- 'tables' => array('revision'),
- 'fields' => Revision::selectFields(),
- 'conds' => array('rev_page' => $this->mPageHistory->mTitle->getArticleID() ),
- 'options' => array( 'USE INDEX' => array('revision','page_timestamp') )
+ 'tables' => array('revision'),
+ 'fields' => Revision::selectFields(),
+ 'conds' => array('rev_page' => $this->mPageHistory->mTitle->getArticleID() ),
+ 'options' => array( 'USE INDEX' => array('revision' => 'page_timestamp') )
);
wfRunHooks( 'PageHistoryPager::getQueryInfo', array( &$this, &$queryInfo ) );
return $queryInfo;
$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->mPageHistory->getNotificationTimestamp(), $latest, $firstInList );
} else {
$s = '';
}
$next = $this->mPastTheEndRow;
}
$s = $this->mPageHistory->historyLine( $this->mLastRow, $next, $this->mCounter++,
- $this->mPageHistory->getNotificationTimestamp(), $latest, $firstInList );
+ $this->mPageHistory->getNotificationTimestamp(), $latest, $firstInList );
} else {
$s = '';
}
dépôts / lhc / web / wiklou.git / blobdiff