* @addtogroup SpecialPage
*/
-class ContribsPager extends IndexPager {
+class ContribsPager extends ReverseChronologicalPager {
public $mDefaultDirection = true;
var $messages, $target;
- var $namespace = '', $mDb;
+ var $namespace = '', $year = '', $month = '', $mDb;
function __construct( $target, $namespace = false, $year = false, $month = false ) {
parent::__construct();
- foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist minoreditletter' ) as $msg ) {
+ foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist newpageletter minoreditletter' ) as $msg ) {
$this->messages[$msg] = wfMsgExt( $msg, array( 'escape') );
}
$this->target = $target;
$this->namespace = $namespace;
-
+
$year = intval($year);
$month = intval($month);
-
+
$this->year = ($year > 0 && $year < 10000) ? $year : false;
$this->month = ($month > 0 && $month < 13) ? $month : false;
$this->getDateCond();
-
+
$this->mDb = wfGetDB( DB_SLAVE, 'contributions' );
}
function getDefaultQuery() {
$query = parent::getDefaultQuery();
$query['target'] = $this->target;
+ $query['month'] = $this->month;
+ $query['year'] = $this->year;
return $query;
}
return array(
'tables' => array( 'page', 'revision' ),
- 'fields' => array(
- 'page_namespace', 'page_title', 'page_is_new', 'page_latest', 'rev_id', 'rev_page',
- 'rev_text_id', 'rev_timestamp', 'rev_comment', 'rev_minor_edit', 'rev_user',
- 'rev_user_text', 'rev_deleted'
+ 'fields' => array(
+ 'page_namespace', 'page_title', 'page_is_new', 'page_latest', 'rev_id', 'rev_page',
+ 'rev_text_id', 'rev_timestamp', 'rev_comment', 'rev_minor_edit', 'rev_user',
+ 'rev_user_text', 'rev_parent_id', 'rev_deleted'
),
'conds' => $conds,
'options' => array( 'USE INDEX' => $index )
return array();
}
}
-
+
function getDateCond() {
if ( $this->year || $this->month ) {
// Assume this year if only a month is given
$year_start--;
}
}
-
+
if ( $this->month ) {
$month_end = str_pad($this->month + 1, 2, '0', STR_PAD_LEFT);
$year_end = $year_start;
return "</ul>\n";
}
- function getNavigationBar() {
- if ( isset( $this->mNavigationBar ) ) {
- return $this->mNavigationBar;
- }
- $linkTexts = array(
- 'prev' => wfMsgHtml( "sp-contributions-newer", $this->mLimit ),
- 'next' => wfMsgHtml( 'sp-contributions-older', $this->mLimit ),
- 'first' => wfMsgHtml('sp-contributions-newest'),
- 'last' => wfMsgHtml( 'sp-contributions-oldest' )
- );
-
- $pagingLinks = $this->getPagingLinks( $linkTexts );
- $limitLinks = $this->getLimitLinks();
- $limits = implode( ' | ', $limitLinks );
-
- $this->mNavigationBar = "({$pagingLinks['first']} | {$pagingLinks['last']}) " .
- wfMsgHtml("viewprevnext", $pagingLinks['prev'], $pagingLinks['next'], $limits);
- return $this->mNavigationBar;
- }
-
/**
* Generates each row in the contributions list.
*
* Contributions which are marked "top" are currently on top of the history.
- * For these contributions, a [rollback] link is shown for users with sysop
- * privileges. The rollback link restores the most recent version that was not
- * written by the target user.
+ * For these contributions, a [rollback] link is shown for users with roll-
+ * back privileges. The rollback link restores the most recent version that
+ * was not written by the target user.
*
* @todo This would probably look a lot nicer in a table.
*/
$difftext .= $this->messages['newarticle'];
}
- if( $wgUser->isAllowed( 'rollback' ) ) {
+ if( !$page->getUserPermissionsErrors( 'rollback', $wgUser )
+ && !$page->getUserPermissionsErrors( 'edit', $wgUser ) ) {
$topmarktext .= ' '.$sk->generateRollback( $rev );
}
}
- if( $rev->userCan( Revision::DELETED_TEXT ) ) {
+ # Is there a visable previous revision?
+ if( $rev->userCan(Revision::DELETED_TEXT) ) {
$difftext = '(' . $sk->makeKnownLinkObj( $page, $this->messages['diff'], 'diff=prev&oldid='.$row->rev_id ) . ')';
} else {
$difftext = '(' . $this->messages['diff'] . ')';
}
$histlink='('.$sk->makeKnownLinkObj( $page, $this->messages['hist'], 'action=history' ) . ')';
- $comment = $wgContLang->getDirMark() . $sk->revComment( $rev );
+ $comment = $wgContLang->getDirMark() . $sk->revComment( $rev, false, true );
$d = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->rev_timestamp ), true );
-
+
if( $this->target == 'newbies' ) {
$userlink = ' . . ' . $sk->userLink( $row->rev_user, $row->rev_user_text );
$userlink .= ' (' . $sk->userTalkLink( $row->rev_user, $row->rev_user_text ) . ') ';
$d = '<span class="history-deleted">' . $d . '</span>';
}
+ if( $rev->getParentId() === 0 ) {
+ $nflag = '<span class="newpage">' . $this->messages['newpageletter'] . '</span>';
+ } else {
+ $nflag = '';
+ }
+
if( $row->rev_minor_edit ) {
$mflag = '<span class="minor">' . $this->messages['minoreditletter'] . '</span> ';
} else {
$mflag = '';
}
- $ret = "{$d} {$histlink} {$difftext} {$mflag} {$link}{$userlink}{$comment} {$topmarktext}";
+ $ret = "{$d} {$histlink} {$difftext} {$nflag}{$mflag} {$link}{$userlink}{$comment} {$topmarktext}";
if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
$ret .= ' ' . wfMsgHtml( 'deletedrev' );
}
wfProfileOut( __METHOD__ );
return $ret;
}
-
+
/**
* Get the Database object in use
*
public function getDatabase() {
return $this->mDb;
}
-
+
}
/**
global $wgUser, $wgOut, $wgLang, $wgRequest;
$options = array();
-
+
if ( isset( $par ) && $par == 'newbies' ) {
$target = 'newbies';
$options['contribs'] = 'newbie';
} else {
$wgOut->setSubtitle( wfMsgHtml( 'sp-contributions-newbies-sub') );
}
-
+
if ( ( $ns = $wgRequest->getVal( 'namespace', null ) ) !== null && $ns !== '' ) {
$options['namespace'] = intval( $ns );
} else {
if ( $wgUser->isAllowed( 'markbotedit' ) && $wgRequest->getBool( 'bot' ) ) {
$options['bot'] = '1';
}
-
+
$skip = $wgRequest->getText( 'offset' ) || $wgRequest->getText( 'dir' ) == 'prev';
# Offset overrides year/month selection
if ( ( $month = $wgRequest->getIntOrNull( 'month' ) ) !== null && $month !== -1 ) {
wfRunHooks( 'SpecialContributionsBeforeMainOutput', $id );
- $wgOut->addHTML( contributionsForm( $options ) );
- # Show original selected options, don't apply them so as to allow paging
- $_GET['year'] = ''; // hack for Pager
- $_GET['month'] = ''; // hack for Pager
if( $skip ) {
$options['year'] = '';
$options['month'] = '';
}
+ $wgOut->addHTML( contributionsForm( $options ) );
+
$pager = new ContribsPager( $target, $options['namespace'], $options['year'], $options['month'] );
if ( !$pager->getNumRows() ) {
- $wgOut->addWikiText( wfMsg( 'nocontribs' ) );
+ $wgOut->addWikiMsg( 'nocontribs' );
return;
}
if( ( $lag = $pager->getDatabase()->getLag() ) > 0 )
$wgOut->showLagWarning( $lag );
- $wgOut->addHTML(
+ $wgOut->addHTML(
'<p>' . $pager->getNavigationBar() . '</p>' .
$pager->getBody() .
'<p>' . $pager->getNavigationBar() . '</p>' );
-
+
# If there were contributions, and it was a valid user or IP, show
# the appropriate "footer" message - WHOIS tools, etc.
if( $target != 'newbies' ) {
- $message = IP::isIPAddress( $target )
+ $message = IP::isIPAddress( $target )
? 'sp-contributions-footer-anon'
: 'sp-contributions-footer';
- $text = wfMsg( $message, $target );
+ $text = wfMsgNoTrans( $message, $target );
if( !wfEmptyMsg( $message, $text ) && $text != '-' ) {
$wgOut->addHtml( '<div class="mw-contributions-footer">' );
$wgOut->addWikiText( $text );
if ( !isset( $options['contribs'] ) ) {
$options['contribs'] = 'user';
}
-
+
if ( !isset( $options['year'] ) ) {
$options['year'] = '';
}
'</span>' .
Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
Xml::closeElement( 'p' );
-
+
$explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' );
if( !wfEmptyMsg( 'sp-contributions-explain', $explain ) )
$f .= "<p>{$explain}</p>";
-
+
$f .= '</fieldset>' .
Xml::closeElement( 'form' );
return $f;
dépôts / lhc / web / wiklou.git / blobdiff