const DIR_PREV = 0;
const DIR_NEXT = 1;
- var $article, $title, $skin;
+ /** Contains the Article object. Passed on construction. */
+ private $article;
+ /** The $article title object. Found on construction. */
+ private $title;
/**
* Construct a new HistoryPage.
* @param $article Article
*/
function __construct( $article ) {
- global $wgUser;
$this->article = $article;
$this->title = $article->getTitle();
- $this->skin = $wgUser->getSkin();
$this->preCacheMessages();
}
- function getArticle() {
+ /** Get the Article object we are working on. */
+ public function getArticle() {
return $this->article;
}
- function getTitle() {
+ /** Get the Title object. */
+ public 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() {
+ private function preCacheMessages() {
// Precache various messages
- if( !isset( $this->message ) ) {
+ if ( !isset( $this->message ) ) {
$msgs = array( 'cur', 'last', 'pipe-separator' );
- foreach( $msgs as $msg ) {
- $this->message[$msg] = wfMsgExt( $msg, array( 'escapenoentities') );
+ foreach ( $msgs as $msg ) {
+ $this->message[$msg] = wfMsgExt( $msg, array( 'escapenoentities' ) );
}
}
}
function history() {
global $wgOut, $wgRequest, $wgScript;
- /*
+ /**
* Allow client caching.
*/
- if( $wgOut->checkLastModified( $this->article->getTouched() ) )
+ if ( $wgOut->checkLastModified( $this->article->getTouched() ) )
return; // Client cache fresh and headers sent, nothing more to do.
wfProfileIn( __METHOD__ );
- /*
- * Setup page variables.
- */
+ // Setup page variables.
$wgOut->setPageTitle( wfMsg( 'history-title', $this->title->getPrefixedText() ) );
$wgOut->setPageTitleActionText( wfMsg( 'history_short' ) );
$wgOut->setArticleFlag( false );
$wgOut->setRobotPolicy( 'noindex,nofollow' );
$wgOut->setSyndicated( true );
$wgOut->setFeedAppendQuery( 'action=history' );
- $wgOut->addModules( array( 'mediawiki.legacy.history', 'mediawiki.views.history' ) );
+ $wgOut->addModules( array( 'mediawiki.legacy.history', 'mediawiki.action.history' ) );
+ // Creation of a subtitle link pointing to [[Special:Log]]
$logPage = SpecialPage::getTitleFor( 'Log' );
- $logLink = $this->skin->link(
+ $logLink = Linker::linkKnown(
$logPage,
wfMsgHtml( 'viewpagelogs' ),
array(),
- array( 'page' => $this->title->getPrefixedText() ),
- array( 'known', 'noclasses' )
+ array( 'page' => $this->title->getPrefixedText() )
);
$wgOut->setSubtitle( $logLink );
+ // Handle atom/RSS feeds.
$feedType = $wgRequest->getVal( 'feed' );
- if( $feedType ) {
+ if ( $feedType ) {
wfProfileOut( __METHOD__ );
return $this->feed( $feedType );
}
- /*
- * Fail if article doesn't exist.
- */
- if( !$this->title->exists() ) {
+ // Fail nicely if article doesn't exist.
+ if ( !$this->title->exists() ) {
$wgOut->addWikiMsg( 'nohistory' );
# show deletion/move log if there is an entry
LogEventsList::showLogExtract(
/**
* Add date selector to quickly get to a certain time
*/
- $year = $wgRequest->getInt( 'year' );
- $month = $wgRequest->getInt( 'month' );
- $tagFilter = $wgRequest->getVal( 'tagfilter' );
+ $year = $wgRequest->getInt( 'year' );
+ $month = $wgRequest->getInt( 'month' );
+ $tagFilter = $wgRequest->getVal( 'tagfilter' );
$tagSelector = ChangeTags::buildTagFilterSelector( $tagFilter );
+
/**
* Option to show only revisions that have been (partially) hidden via RevisionDelete
*/
if ( $wgRequest->getBool( 'deleted' ) ) {
- $conds = array("rev_deleted != '0'");
+ $conds = array( "rev_deleted != '0'" );
} else {
$conds = array();
}
$checkDeleted = Xml::checkLabel( wfMsg( 'history-show-deleted' ),
'deleted', 'mw-show-deleted-only', $wgRequest->getBool( 'deleted' ) ) . "\n";
+ // Add the general form
$action = htmlspecialchars( $wgScript );
$wgOut->addHTML(
"<form action=\"$action\" method=\"get\" id=\"mw-history-searchform\">" .
wfRunHooks( 'PageHistoryBeforeList', array( &$this->article ) );
- /**
- * Do the list
- */
+ // Create and output the list.
$pager = new HistoryPager( $this, $year, $month, $tagFilter, $conds );
$wgOut->addHTML(
$pager->getNavigationBar() .
$pager->getBody() .
$pager->getNavigationBar()
);
+ $wgOut->preventClickjacking( $pager->getPreventClickjacking() );
wfProfileOut( __METHOD__ );
}
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 ( $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
+ 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),
+ array_merge( array( "rev_page=$page_id" ), $offsets ),
__METHOD__,
array( 'ORDER BY' => "rev_timestamp $dirs",
- 'USE INDEX' => 'page_timestamp', 'LIMIT' => $limit)
+ 'USE INDEX' => 'page_timestamp', 'LIMIT' => $limit )
);
}
*/
function feed( $type ) {
global $wgFeedClasses, $wgRequest, $wgFeedLimit;
- if( !FeedUtils::checkFeedOutput($type) ) {
+ if ( !FeedUtils::checkFeedOutput( $type ) ) {
return;
}
// 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 ) {
+ if ( $limit > $wgFeedLimit || $limit < 1 ) {
$limit = 10;
}
- $items = $this->fetchRevisions($limit, 0, HistoryPage::DIR_NEXT);
+ $items = $this->fetchRevisions( $limit, 0, HistoryPage::DIR_NEXT );
+ // Generate feed elements enclosed between header and footer.
$feed->outHeader();
- if( $items ) {
- foreach( $items as $row ) {
+ if ( $items ) {
+ foreach ( $items as $row ) {
$feed->outItem( $this->feedItem( $row ) );
}
} else {
$rev->getTimestamp(),
$rev->getComment()
);
- if( $rev->getComment() == '' ) {
+ if ( $rev->getComment() == '' ) {
global $wgContLang;
$title = wfMsgForContent( 'history-feed-item-nocomment',
$rev->getUserText(),
class HistoryPager extends ReverseChronologicalPager {
public $lastRow = false, $counter, $historyPage, $title, $buttons, $conds;
protected $oldIdChecked;
+ protected $preventClickjacking = false;
- function __construct( $historyPage, $year='', $month='', $tagFilter = '', $conds = array() ) {
+ function __construct( $historyPage, $year = '', $month = '', $tagFilter = '', $conds = array() ) {
parent::__construct();
$this->historyPage = $historyPage;
- $this->title = $this->historyPage->title;
+ $this->title = $this->historyPage->getTitle();
$this->tagFilter = $tagFilter;
$this->getDateCond( $year, $month );
$this->conds = $conds;
return $this->historyPage->getArticle();
}
+ function getTitle() {
+ return $this->title;
+ }
+
function getSqlComment() {
if ( $this->conds ) {
return 'history page filtered'; // potentially slow, see CR r58153
function getQueryInfo() {
$queryInfo = array(
- 'tables' => array('revision'),
+ 'tables' => array( 'revision' ),
'fields' => Revision::selectFields(),
'conds' => array_merge(
- array( 'rev_page' => $this->historyPage->title->getArticleID() ),
+ array( 'rev_page' => $this->title->getArticleID() ),
$this->conds ),
- 'options' => array( 'USE INDEX' => array('revision' => 'page_timestamp') ),
+ 'options' => array( 'USE INDEX' => array( 'revision' => 'page_timestamp' ) ),
'join_conds' => array( 'tag_summary' => array( 'LEFT JOIN', 'ts_rev_id=rev_id' ) ),
);
ChangeTags::modifyDisplayQuery(
}
function formatRow( $row ) {
- if( $this->lastRow ) {
- $latest = ($this->counter == 1 && $this->mIsFirst);
+ if ( $this->lastRow ) {
+ $latest = ( $this->counter == 1 && $this->mIsFirst );
$firstInList = $this->counter == 1;
$this->counter++;
$s = $this->historyLine( $this->lastRow, $row,
* @return string HTML output
*/
function getStartBody() {
- global $wgScript, $wgUser, $wgOut, $wgContLang;
+ global $wgScript, $wgUser, $wgOut;
$this->lastRow = false;
$this->counter = 1;
$this->oldIdChecked = 0;
$s .= Html::hidden( 'title', $this->title->getPrefixedDbKey() ) . "\n";
$s .= Html::hidden( 'action', 'historysubmit' ) . "\n";
- $s .= '<div>' . $this->submitButton( wfMsg( 'compareselectedversions'),
+ $s .= '<div>' . $this->submitButton( wfMsg( 'compareselectedversions' ),
array( 'class' => 'historysubmit' ) ) . "\n";
-
+
$this->buttons = '<div>';
- $this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions'),
+ $this->buttons .= $this->submitButton( wfMsg( 'compareselectedversions' ),
array( 'class' => 'historysubmit' )
- + $wgUser->getSkin()->tooltipAndAccessKeyAttribs( 'compareselectedversions' )
+ + Linker::tooltipAndAccesskeyAttribs( 'compareselectedversions' )
) . "\n";
-
- if( $wgUser->isAllowed('deleterevision') ) {
- $float = $wgContLang->alignEnd();
- # Note bug #20966, <button> is non-standard in IE<8
- $element = Html::element( 'button',
- array(
- 'type' => 'submit',
- 'name' => 'revisiondelete',
- 'value' => '1',
- 'style' => "float: $float;",
- 'class' => 'mw-history-revisiondelete-button',
- ),
- wfMsg( 'showhideselectedversions' )
- ) . "\n";
- $s .= $element;
- $this->buttons .= $element;
- }
- if( $wgUser->isAllowed( 'revisionmove' ) ) {
- $float = $wgContLang->alignEnd();
- # Note bug #20966, <button> is non-standard in IE<8
- $element = Html::element( 'button',
- array(
- 'type' => 'submit',
- 'name' => 'revisionmove',
- 'value' => '1',
- 'style' => "float: $float;",
- 'class' => 'mw-history-revisionmove-button',
- ),
- wfMsg( 'revisionmoveselectedversions' )
- ) . "\n";
- $s .= $element;
- $this->buttons .= $element;
+
+ if ( $wgUser->isAllowed( 'deleterevision' ) ) {
+ $s .= $this->getRevisionButton( 'revisiondelete', 'showhideselectedversions' );
}
$this->buttons .= '</div>';
$s .= '</div><ul id="pagehistory">' . "\n";
return $s;
}
+ private function getRevisionButton( $name, $msg ) {
+ $this->preventClickjacking();
+ # Note bug #20966, <button> is non-standard in IE<8
+ $element = Html::element( 'button',
+ array(
+ 'type' => 'submit',
+ 'name' => $name,
+ 'value' => '1',
+ 'class' => "mw-history-$name-button",
+ ),
+ wfMsg( $msg )
+ ) . "\n";
+ $this->buttons .= $element;
+ return $element;
+ }
+
function getEndBody() {
- if( $this->lastRow ) {
+ if ( $this->lastRow ) {
$latest = $this->counter == 1 && $this->mIsFirst;
$firstInList = $this->counter == 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';
}
$s .= "</ul>\n";
# Add second buttons only if there is more than one rev
- if( $this->getNumRows() > 2 ) {
+ if ( $this->getNumRows() > 2 ) {
$s .= $this->buttons;
}
$s .= '</form>';
*/
function submitButton( $message, $attributes = array() ) {
# Disable submit button if history has 1 revision only
- if( $this->getNumRows() > 1 ) {
+ if ( $this->getNumRows() > 1 ) {
return Xml::submitButton( $message , $attributes );
} else {
return '';
$del = '';
// Show checkboxes for each revision
- if( $wgUser->isAllowed( 'deleterevision' ) || $wgUser->isAllowed( 'revisionmove' ) ) {
+ if ( $wgUser->isAllowed( 'deleterevision' ) ) {
+ $this->preventClickjacking();
// If revision was hidden from sysops, disable the checkbox
- // However, if the user has revisionmove rights, we cannot disable the checkbox
- if( !$rev->userCan( Revision::DELETED_RESTRICTED ) && !$wgUser->isAllowed( 'revisionmove' ) ) {
+ if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
$del = Xml::check( 'deleterevisions', false, array( 'disabled' => 'disabled' ) );
// Otherwise, enable the checkbox...
} else {
$del = Xml::check( 'showhiderevisions', false,
- array( 'name' => 'ids['.$rev->getId().']' ) );
+ array( 'name' => 'ids[' . $rev->getId() . ']' ) );
}
// User can only view deleted revisions...
- } else if( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) {
+ } elseif ( $rev->getVisibility() && $wgUser->isAllowed( 'deletedhistory' ) ) {
// If revision was hidden from sysops, disable the link
- if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
- $cdel = $this->getSkin()->revDeleteLinkDisabled( false );
+ if ( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) {
+ $cdel = Linker::revDeleteLinkDisabled( false );
// Otherwise, show the link...
} else {
$query = array( 'type' => 'revision',
- 'target' => $this->title->getPrefixedDbkey(), 'ids' => $rev->getId() );
- $del .= $this->getSkin()->revDeleteLink( $query,
+ 'target' => $this->title->getPrefixedDbkey(), 'ids' => $rev->getId() );
+ $del .= Linker::revDeleteLink( $query,
$rev->isDeleted( Revision::DELETED_RESTRICTED ), false );
}
}
- if( $del ) {
+ if ( $del ) {
$s .= " $del ";
}
+ $dirmark = $wgLang->getDirMark();
+
$s .= " $link";
+ $s .= $dirmark;
$s .= " <span class='history-user'>" .
- $this->getSkin()->revUserTools( $rev, true ) . "</span>";
+ Linker::revUserTools( $rev, true ) . "</span>";
+ $s .= $dirmark;
- if( $rev->isMinor() ) {
+ if ( $rev->isMinor() ) {
$s .= ' ' . ChangesList::flag( 'minor' );
}
- if( !is_null( $size = $rev->getSize() ) && !$rev->isDeleted( Revision::DELETED_TEXT ) ) {
- $s .= ' ' . $this->getSkin()->formatRevisionSize( $size );
+ if ( !is_null( $size = $rev->getSize() ) && !$rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ $s .= ' ' . Linker::formatRevisionSize( $size );
}
- $s .= $this->getSkin()->revComment( $rev, false, true );
+ $s .= Linker::revComment( $rev, false, true );
- if( $notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp) ) {
+ if ( $notificationtimestamp && ( $row->rev_timestamp >= $notificationtimestamp ) ) {
$s .= ' <span class="updatedmarker">' . wfMsgHtml( 'updatedmarker' ) . '</span>';
}
$tools = array();
# Rollback and undo links
- 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 ( !is_null( $next ) && is_object( $next ) ) {
+ if ( $latest && $this->title->userCan( 'rollback' ) && $this->title->userCan( 'edit' ) ) {
+ $this->preventClickjacking();
+ $tools[] = '<span class="mw-rollback-link">' .
+ Linker::buildRollbackLink( $rev ) . '</span>';
}
- if( $this->title->quickUserCan( 'edit' )
+ if ( $this->title->quickUserCan( 'edit' )
&& !$rev->isDeleted( Revision::DELETED_TEXT )
&& !$next->rev_deleted & Revision::DELETED_TEXT )
{
$undoTooltip = $latest
? array( 'title' => wfMsg( 'tooltip-undo' ) )
: array();
- $undolink = $this->getSkin()->link(
+ $undolink = Linker::linkKnown(
$this->title,
wfMsgHtml( 'editundo' ),
$undoTooltip,
'action' => 'edit',
'undoafter' => $next->rev_id,
'undo' => $rev->getId()
- ),
- array( 'known', 'noclasses' )
+ )
);
$tools[] = "<span class=\"mw-history-undo\">{$undolink}</span>";
}
}
- if( $tools ) {
+ if ( $tools ) {
$s .= ' (' . $wgLang->pipeList( $tools ) . ')';
}
# Tags
- list($tagSummary, $newClasses) = ChangeTags::formatSummaryRow( $row->ts_tags, 'history' );
+ list( $tagSummary, $newClasses ) = ChangeTags::formatSummaryRow( $row->ts_tags, 'history' );
$classes = array_merge( $classes, $newClasses );
$s .= " $tagSummary";
*/
function revLink( $rev ) {
global $wgLang;
- $date = $wgLang->timeanddate( wfTimestamp(TS_MW, $rev->getTimestamp()), true );
+ $date = $wgLang->timeanddate( wfTimestamp( TS_MW, $rev->getTimestamp() ), true );
$date = htmlspecialchars( $date );
if ( $rev->userCan( Revision::DELETED_TEXT ) ) {
- $link = $this->getSkin()->link(
+ $link = Linker::linkKnown(
$this->title,
$date,
array(),
- array( 'oldid' => $rev->getId() ),
- array( 'known', 'noclasses' )
+ array( 'oldid' => $rev->getId() )
);
} else {
$link = $date;
*/
function curLink( $rev, $latest ) {
$cur = $this->historyPage->message['cur'];
- if( $latest || !$rev->userCan( Revision::DELETED_TEXT ) ) {
+ if ( $latest || !$rev->userCan( Revision::DELETED_TEXT ) ) {
return $cur;
} else {
- return $this->getSkin()->link(
+ return Linker::linkKnown(
$this->title,
$cur,
array(),
array(
'diff' => $this->title->getLatestRevID(),
'oldid' => $rev->getId()
- ),
- array( 'known', 'noclasses' )
+ )
);
}
}
function lastLink( $prevRev, $next ) {
$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) ) {
+ $nextRev = is_object( $next ) ? new Revision( $next ) : $next;
+ if ( is_null( $next ) ) {
# Probably no next row
return $last;
- } elseif( $next === 'unknown' ) {
+ } elseif ( $next === 'unknown' ) {
# Next row probably exists but is unknown, use an oldid=prev link
- return $this->getSkin()->link(
+ return Linker::linkKnown(
$this->title,
$last,
array(),
array(
'diff' => $prevRev->getId(),
'oldid' => 'prev'
- ),
- array( 'known', 'noclasses' )
+ )
);
- } elseif( !$prevRev->userCan(Revision::DELETED_TEXT)
- || !$nextRev->userCan(Revision::DELETED_TEXT) )
+ } elseif ( !$prevRev->userCan( Revision::DELETED_TEXT )
+ || !$nextRev->userCan( Revision::DELETED_TEXT ) )
{
return $last;
} else {
- return $this->getSkin()->link(
+ return Linker::linkKnown(
$this->title,
$last,
array(),
array(
'diff' => $prevRev->getId(),
'oldid' => $next->rev_id
- ),
- array( 'known', 'noclasses' )
+ )
);
}
}
* @return String: HTML output for the radio buttons
*/
function diffButtons( $rev, $firstInList ) {
- if( $this->getNumRows() > 1 ) {
+ if ( $this->getNumRows() > 1 ) {
$id = $rev->getId();
$radio = array( 'type' => 'radio', 'value' => $id );
/** @todo: move title texts to javascript */
- if( $firstInList ) {
+ if ( $firstInList ) {
$first = Xml::element( 'input',
array_merge( $radio, array(
'style' => 'visibility:hidden',
$checkmark = array( 'checked' => 'checked' );
} else {
# Check visibility of old revisions
- if( !$rev->userCan( Revision::DELETED_TEXT ) ) {
+ if ( !$rev->userCan( Revision::DELETED_TEXT ) ) {
$radio['disabled'] = 'disabled';
$checkmark = array(); // We will check the next possible one
- } else if( !$this->oldIdChecked ) {
+ } elseif ( !$this->oldIdChecked ) {
$checkmark = array( 'checked' => 'checked' );
$this->oldIdChecked = $id;
} else {
return '';
}
}
+
+ /**
+ * This is called if a write operation is possible from the generated HTML
+ */
+ function preventClickjacking( $enable = true ) {
+ $this->preventClickjacking = $enable;
+ }
+
+ /**
+ * Get the "prevent clickjacking" flag
+ */
+ function getPreventClickjacking() {
+ return $this->preventClickjacking;
+ }
}
/**
dépôts / lhc / web / wiklou.git / blobdiff