* @subpackage SpecialPage
*/
-class contribs_finder {
- var $username, $offset, $limit, $namespace, $invert;
+/** @package MediaWiki */
+class ContribsFinder {
+ var $username, $offset, $limit, $namespace;
var $dbr;
- function contribs_finder($username) {
+ function ContribsFinder( $username ) {
$this->username = $username;
- $this->dbr =& wfGetDB(DB_SLAVE);
+ $this->namespace = false;
+ $this->dbr =& wfGetDB( DB_SLAVE );
}
- function set_limit($limit) {
+ function setNamespace( $ns ) {
+ $this->namespace = $ns;
+ }
+
+ function setLimit( $limit ) {
$this->limit = $limit;
}
- function set_offset($offset) {
+ function setOffset( $offset ) {
$this->offset = $offset;
}
- function set_namespace($namespace, $invert = false) {
- $this->namespace = $namespace;
- $this->invert = $invert;
+ function getEditLimit( $dir ) {
+ list( $index, $usercond ) = $this->getUserCond();
+ $nscond = $this->getNamespaceCond();
+ $use_index = $this->dbr->useIndexClause( $index );
+ extract( $this->dbr->tableNames( 'revision', 'page' ) );
+ $sql = "SELECT rev_timestamp " .
+ " FROM $page,$revision $use_index " .
+ " WHERE rev_page=page_id AND $usercond $nscond" .
+ " ORDER BY rev_timestamp $dir LIMIT 1";
+
+ $res = $this->dbr->query( $sql, __METHOD__ );
+ $row = $this->dbr->fetchObject( $res );
+ if ( $row ) {
+ return $row->rev_timestamp;
+ } else {
+ return false;
+ }
}
- function set_hide_minor($hm) {
- $this->hide_minor = $hm;
+ function getEditLimits() {
+ return array(
+ $this->getEditLimit( "ASC" ),
+ $this->getEditLimit( "DESC" )
+ );
}
- function get_edit_limits() {
- list($index, $usercond) = $this->get_user_cond();
+ function getUserCond() {
+ $condition = '';
- $use_index = $this->dbr->useIndexClause($index);
- extract($this->dbr->tableNames('page', 'revision'));
-
- #$sql = "SELECT MIN(rev_timestamp) as earliest, MAX(rev_timestamp) as latest " .
- # "FROM page, revision $use_index WHERE page_id = rev_page " .
- # "AND ";
-
- #$sql .= $usercond;
- #$sql .= $this->get_namespace_cond();
- #$sql .= $this->get_minor_cond();
- $sql = "SELECT MIN(rev_timestamp) as earliest, MAX(rev_timestamp) as latest " .
- "FROM $revision $use_index WHERE " . $usercond;
-
- $res = $this->dbr->query($sql, "contribs_finder::get_edit_limits");
- $rows = array();
- while ($o = $this->dbr->fetchObject($res))
- $rows[] = $o;
- $row = $rows[count($rows) - 1];
- return array($row->earliest, $row->latest);
- }
-
- function get_user_cond() {
- $condition = "";
-
- if ($this->username == 'newbies') {
- $max = $this->dbr->selectField('user', 'max(user_id)', false, "make_sql");
- $condition = '>' . ($max - $max / 100);
+ if ( $this->username == 'newbies' ) {
+ $max = $this->dbr->selectField( 'user', 'max(user_id)', false, 'make_sql' );
+ $condition = '>' . (int)($max - $max / 100);
}
- if ($condition == "") {
- $condition = " rev_user_text=" . $this->dbr->addQuotes($this->username);
+ if ( $condition == '' ) {
+ $condition = ' rev_user_text=' . $this->dbr->addQuotes( $this->username );
$index = 'usertext_timestamp';
} else {
- $condition = " rev_user {$condition}";
+ $condition = ' rev_user '.$condition ;
$index = 'user_timestamp';
}
-
- return array($index, $condition);
+ return array( $index, $condition );
}
- function get_minor_cond() {
- if ($this->hide_minor)
- return ' AND rev_minor_edit=0';
+ function getNamespaceCond() {
+ if ( $this->namespace !== false )
+ return ' AND page_namespace = ' . (int)$this->namespace;
return '';
}
- function get_namespace_cond() {
- $nsQuery = $nsinvert = "";
-
- if ($this->invert)
- $nsinvert = "!";
-
- if (!is_null($this->namespace))
- $nsQuery .= "AND page_namespace {$nsinvert}= {$this->namespace}";
-
- return $nsQuery;
- }
+ function getPreviousOffsetForPaging() {
+ list( $index, $usercond ) = $this->getUserCond();
+ $nscond = $this->getNamespaceCond();
- function get_previous_offset_for_paging() {
- list($index, $usercond) = $this->get_user_cond();
- $use_index = $this->dbr->useIndexClause($index);
- extract($this->dbr->tableNames('page', 'revision'));
+ $use_index = $this->dbr->useIndexClause( $index );
+ extract( $this->dbr->tableNames( 'page', 'revision' ) );
$sql = "SELECT rev_timestamp FROM $page, $revision $use_index " .
"WHERE page_id = rev_page AND rev_timestamp > '" . $this->offset . "' AND " .
- "rev_user_text = " . $this->dbr->addQuotes($this->username);
- $sql .= $this->get_namespace_cond();
- $sql .= $this->get_minor_cond();
- $sql .= " ORDER BY rev_timestamp ASC LIMIT " . $this->limit;
- $res = $this->dbr->query($sql);
- $rows = array();
- while ($obj = $this->dbr->fetchObject($res))
- $rows[] = $obj;
- $this->dbr->freeResult($res);
- return $rows[count($rows) - 1]->rev_timestamp;
- }
-
- function get_first_offset_for_paging() {
- list($index, $usercond) = $this->get_user_cond();
- $use_index = $this->dbr->useIndexClause($index);
- extract($this->dbr->tableNames('page', 'revision'));
+ $usercond . $nscond;
+ $sql .= " ORDER BY rev_timestamp ASC";
+ $sql = $this->dbr->limitResult( $sql, $this->limit, 0 );
+ $res = $this->dbr->query( $sql );
+
+ $numRows = $this->dbr->numRows( $res );
+ if ( $numRows ) {
+ $this->dbr->dataSeek( $res, $numRows - 1 );
+ $row = $this->dbr->fetchObject( $res );
+ $offset = $row->rev_timestamp;
+ } else {
+ $offset = false;
+ }
+ $this->dbr->freeResult( $res );
+ return $offset;
+ }
+ function getFirstOffsetForPaging() {
+ list( $index, $usercond ) = $this->getUserCond();
+ $use_index = $this->dbr->useIndexClause( $index );
+ extract( $this->dbr->tableNames( 'page', 'revision' ) );
+ $nscond = $this->getNamespaceCond();
$sql = "SELECT rev_timestamp FROM $page, $revision $use_index " .
"WHERE page_id = rev_page AND " .
- "rev_user_text = " . $this->dbr->addQuotes($this->username);
- $sql .= $this->get_namespace_cond();
- $sql .= $this->get_minor_cond();
- $sql .= " ORDER BY rev_timestamp ASC LIMIT " . ($this->limit + 1);
- $res = $this->dbr->query($sql);
- $rows = array();
- while ($obj = $this->dbr->fetchObject($res))
- $rows[] = $obj;
- $this->dbr->freeResult($res);
- return $rows[count($rows) - 1]->rev_timestamp;
+ $usercond . $nscond;
+ $sql .= " ORDER BY rev_timestamp ASC";
+ $sql = $this->dbr->limitResult( $sql, $this->limit, 0 );
+ $res = $this->dbr->query( $sql );
+
+ $numRows = $this->dbr->numRows( $res );
+ if ( $numRows ) {
+ $this->dbr->dataSeek( $res, $numRows - 1 );
+ $row = $this->dbr->fetchObject( $res );
+ $offset = $row->rev_timestamp;
+ } else {
+ $offset = false;
+ }
+ $this->dbr->freeResult( $res );
+ return $offset;
}
- /* private */ function make_sql() {
- $userCond = $condition = $index = $minorQuery = $nsQuery
- = $offsetQuery = $limitQuery = $nsinvert = "";
-
- $minorQuery = $this->get_minor_cond();
- $nsQuery = $this->get_namespace_cond();
+ /* private */ function makeSql() {
+ $userCond = $condition = $index = $offsetQuery = '';
- extract($this->dbr->tableNames('page', 'revision'));
- list($index, $userCond) = $this->get_user_cond();
+ extract( $this->dbr->tableNames( 'page', 'revision' ) );
+ list( $index, $userCond ) = $this->getUserCond();
- $limitQuery = "LIMIT {$this->limit}";
- if ($this->offset)
- $offsetQuery = "AND rev_timestamp < '{$this->offset}'";
+ if ( $this->offset )
+ $offsetQuery = "AND rev_timestamp <= '{$this->offset}'";
- $use_index = $this->dbr->useIndexClause($index);
+ $nscond = $this->getNamespaceCond();
+ $use_index = $this->dbr->useIndexClause( $index );
$sql = "SELECT
page_namespace,page_title,page_is_new,page_latest,
- rev_id,rev_timestamp,rev_comment,rev_minor_edit,rev_user_text,
+ rev_id,rev_page,rev_text_id,rev_timestamp,rev_comment,rev_minor_edit,rev_user,rev_user_text,
rev_deleted
FROM $page,$revision $use_index
- WHERE page_id=rev_page AND $userCond $minorQuery $nsQuery $offsetQuery
- ORDER BY rev_timestamp DESC $limitQuery";
+ WHERE page_id=rev_page AND $userCond $nscond $offsetQuery
+ ORDER BY rev_timestamp DESC";
+ $sql = $this->dbr->limitResult( $sql, $this->limit, 0 );
return $sql;
}
function find() {
$contribs = array();
- $res = $this->dbr->query($this->make_sql(), "contribs_finder::find");
- while ($c = $this->dbr->fetchObject($res))
+ $res = $this->dbr->query( $this->makeSql(), __METHOD__ );
+ while ( $c = $this->dbr->fetchObject( $res ) )
$contribs[] = $c;
- $this->dbr->freeResult($res);
+ $this->dbr->freeResult( $res );
return $contribs;
}
};
* Shows a list of the contributions of a user.
*
* @return none
- * @param string $par (optional) user name of the user for which to show the contributions
+ * @param $par String: (optional) user name of the user for which to show the contributions
*/
function wfSpecialContributions( $par = null ) {
- global $wgUser, $wgOut, $wgLang, $wgContLang, $wgRequest, $wgTitle;
+ global $wgUser, $wgOut, $wgLang, $wgRequest;
$fname = 'wfSpecialContributions';
- $target = isset($par) ? $par : $wgRequest->getVal( 'target' );
- if (!strlen($target)) {
- $wgOut->errorpage('notargettitle', 'notargettext');
+ $target = isset( $par ) ? $par : $wgRequest->getVal( 'target' );
+ if ( !strlen( $target ) ) {
+ $wgOut->showErrorPage( 'notargettitle', 'notargettext' );
return;
}
$nt = Title::newFromURL( $target );
- if (!$nt) {
- $wgOut->errorpage( 'notargettitle', 'notargettext' );
+ if ( !$nt ) {
+ $wgOut->showErrorPage( 'notargettitle', 'notargettext' );
return;
}
- $nt =& Title::makeTitle(NS_USER, $nt->getDBkey());
- $namespace = $wgRequest->getIntOrNull('namespace');
- $invert = $wgRequest->getBool('invert');
- $hideminor = $wgRequest->getBool('hideminor');
- $limit = min($wgRequest->getInt('limit', 50), 500);
- $offset = $wgRequest->getVal('offset');
- /* Offset must be an integral. */
- if (!strlen($offset) || !preg_match("/^[0-9]+$/", $offset))
- $offset = 0;
+ $options = array();
- $title = Title::makeTitle(NS_SPECIAL, "Contributions");
- $urlbits = "hideminor=$hideminor&namespace=$namespace&invert=$invert&target=" . wfUrlEncode($target);
- $myurl = $title->escapeLocalURL($urlbits);
+ list( $options['limit'], $options['offset']) = wfCheckLimits();
+ $options['offset'] = $wgRequest->getVal( 'offset' );
+ /* Offset must be an integral. */
+ if ( !strlen( $options['offset'] ) || !preg_match( '/^[0-9]+$/', $options['offset'] ) )
+ $options['offset'] = '';
- $finder = new contribs_finder($nt->getText());
+ $title = Title::makeTitle( NS_SPECIAL, 'Contributions' );
+ $options['target'] = $target;
- $finder->set_namespace($namespace, $invert);
- $finder->set_hide_minor($hideminor);
- $finder->set_limit($limit);
- $finder->set_offset($offset);
+ $nt =& Title::makeTitle( NS_USER, $nt->getDBkey() );
+ $finder = new ContribsFinder( ( $target == 'newbies' ) ? 'newbies' : $nt->getText() );
+ $finder->setLimit( $options['limit'] );
+ $finder->setOffset( $options['offset'] );
- if ($wgRequest->getText('go') == "prev") {
- $prevts = $finder->get_previous_offset_for_paging();
- $prevurl = $title->getLocalURL($urlbits . "&offset=$prevts&limit=$limit");
- $wgOut->redirect($prevurl);
- return;
+ if ( ( $ns = $wgRequest->getVal( 'namespace', null ) ) !== null && $ns !== '' ) {
+ $options['namespace'] = intval( $ns );
+ $finder->setNamespace( $options['namespace'] );
+ } else {
+ $options['namespace'] = '';
}
- if ($wgRequest->getText('go') == "first") {
- $prevts = $finder->get_first_offset_for_paging();
- $prevurl = $title->getLocalURL($urlbits . "&offset=$prevts&limit=$limit");
- $wgOut->redirect($prevurl);
- return;
+ if ( $wgUser->isAllowed( 'rollback' ) && $wgRequest->getBool( 'bot' ) ) {
+ $options['bot'] = '1';
}
- $sk = $wgUser->getSkin();
-
- $id = User::idFromName($nt->getText());
-
- if ( 0 == $id ) {
- $ul = $nt->getText();
- } else {
- $ul = $sk->makeLinkObj( $nt, htmlspecialchars( $nt->getText() ) );
- $userCond = '=' . $id;
+ if ( $wgRequest->getText( 'go' ) == 'prev' ) {
+ $offset = $finder->getPreviousOffsetForPaging();
+ if ( $offset !== false ) {
+ $options['offset'] = $offset;
+ $prevurl = $title->getLocalURL( wfArrayToCGI( $options ) );
+ $wgOut->redirect( $prevurl );
+ return;
+ }
}
- $talk = $nt->getTalkPage();
- if( $talk ) {
- $ul .= ' (' . $sk->makeLinkObj( $talk, $wgLang->getNsText( NS_TALK ) ) . ')';
+
+ if ( $wgRequest->getText( 'go' ) == 'first' && $target != 'newbies') {
+ $offset = $finder->getFirstOffsetForPaging();
+ if ( $offset !== false ) {
+ $options['offset'] = $offset;
+ $prevurl = $title->getLocalURL( wfArrayToCGI( $options ) );
+ $wgOut->redirect( $prevurl );
+ return;
+ }
}
- if ($target == 'newbies') {
- $ul = wfMsg ('newbies');
+ if ( $target == 'newbies' ) {
+ $wgOut->setSubtitle( wfMsgHtml( 'sp-contributions-newbies-sub') );
+ } else {
+ $wgOut->setSubtitle( wfMsgHtml( 'contribsub', contributionsSub( $nt ) ) );
}
- $wgOut->setSubtitle( wfMsgHtml( 'contribsub', $ul ) );
+ $id = User::idFromName( $nt->getText() );
+ wfRunHooks( 'SpecialContributionsBeforeMainOutput', $id );
- $contribsPage = Title::makeTitle( NS_SPECIAL, 'Contributions' );
- $mlink = $sk->makeKnownLinkObj( $contribsPage,
- $hideminor ? wfMsgHtml( 'show' ) : wfMsgHtml( 'hide' ),
- wfArrayToCGI( array(
- 'target' => $nt->getPrefixedDbKey(),
- 'offset' => $offset,
- 'limit' => $limit,
- 'hideminor' => $hideminor ? 0 : 1,
- 'namespace' => $namespace ) ) );
+ $wgOut->addHTML( contributionsForm( $options) );
$contribs = $finder->find();
- if (count($contribs) == 0) {
- $wgOut->addWikiText( wfMsg( "nocontribs" ) );
+ if ( count( $contribs ) == 0) {
+ $wgOut->addWikiText( wfMsg( 'nocontribs' ) );
return;
}
- list($early, $late) = $finder->get_edit_limits();
- $lastts = count($contribs) ? $contribs[count($contribs) - 1]->rev_timestamp : 0;
- $atstart = (!count($contribs) || $late == $contribs[0]->rev_timestamp);
- $atend = (!count($contribs) || $early == $lastts);
-wfdebug("early=$early late=$late lastts=$lastts\n");
- $wgOut->addHTML(ucNamespaceForm($target, $hideminor, $namespace, $invert));
-
- $lasturl = $wgTitle->escapeLocalURL("action=history&limit={$limit}");
-
- $firsttext = wfMsgHtml("histfirst");
- $lasttext = wfMsgHtml("histlast");
+ list( $early, $late ) = $finder->getEditLimits();
+ $lastts = count( $contribs ) ? $contribs[count( $contribs ) - 1]->rev_timestamp : 0;
+ $atstart = ( !count( $contribs ) || $late == $contribs[0]->rev_timestamp );
+ $atend = ( !count( $contribs ) || $early == $lastts );
+
+ // These four are defaults
+ $newestlink = wfMsgHtml( 'sp-contributions-newest' );
+ $oldestlink = wfMsgHtml( 'sp-contributions-oldest' );
+ $newerlink = wfMsgHtml( 'sp-contributions-newer', $options['limit'] );
+ $olderlink = wfMsgHtml( 'sp-contributions-older', $options['limit'] );
+
+ if ( !$atstart ) {
+ $stuff = $title->escapeLocalURL( wfArrayToCGI( array( 'offset' => '' ), $options ) );
+ $newestlink = "<a href=\"$stuff\">$newestlink</a>";
+ $stuff = $title->escapeLocalURL( wfArrayToCGI( array( 'go' => 'prev' ), $options ) );
+ $newerlink = "<a href=\"$stuff\">$newerlink</a>";
+ }
- $prevtext = wfMsg("prevn", $limit);
- if ($atstart) {
- $lastlink = $lasttext;
- $prevlink = $prevtext;
- } else {
- $lastlink = "<a href=\"$myurl&limit=$limit\">$lasttext</a>";
- $prevlink = "<a href=\"$myurl&offset=$offset&limit=$limit&go=prev\">$prevtext</a>";
+ if ( !$atend ) {
+ $stuff = $title->escapeLocalURL( wfArrayToCGI( array( 'go' => 'first' ), $options ) );
+ $oldestlink = "<a href=\"$stuff\">$oldestlink</a>";
+ $stuff = $title->escapeLocalURL( wfArrayToCGI( array( 'offset' => $lastts ), $options ) );
+ $olderlink = "<a href=\"$stuff\">$olderlink</a>";
}
- $nexttext = wfMsg("nextn", $limit);
- if ($atend) {
- $firstlink = $firsttext;
- $nextlink = $nexttext;
+ if ( $target == 'newbies' ) {
+ $firstlast ="($newestlink)";
} else {
- $firstlink = "<a href=\"$myurl&limit=$limit&go=first\">$firsttext</a>";
- $nextlink = "<a href=\"$myurl&offset=$lastts&limit=$limit\">$nexttext</a>";
+ $firstlast = "($newestlink | $oldestlink)";
}
- $firstlast = "($lastlink | $firstlink)";
$urls = array();
- foreach (array(20, 50, 100, 250, 500) as $num)
- $urls[] = "<a href=\"$myurl&offset=$offset&limit={$num}\">".$wgLang->formatNum($num)."</a>";
- $bits = implode($urls, ' | ');
+ foreach ( array( 20, 50, 100, 250, 500 ) as $num ) {
+ $stuff = $title->escapeLocalURL( wfArrayToCGI( array( 'limit' => $num ), $options ) );
+ $urls[] = "<a href=\"$stuff\">".$wgLang->formatNum( $num )."</a>";
+ }
+ $bits = implode( $urls, ' | ' );
- $prevnextbits = "$firstlast " . wfMsgHtml("viewprevnext", $prevlink, $nextlink, $bits);
+ $prevnextbits = $firstlast .' '. wfMsgHtml( 'viewprevnext', $newerlink, $olderlink, $bits );
- $shm = wfMsgHtml( "contribs-showhideminor", $mlink );
- $wgOut->addHTML( "<br />{$prevnextbits} ($shm)</p>\n");
+ $wgOut->addHTML( "<p>{$prevnextbits}</p>\n" );
$wgOut->addHTML( "<ul>\n" );
- foreach ($contribs as $contrib)
- $wgOut->addHTML(ucListEdit($sk, $contrib));
+ $sk = $wgUser->getSkin();
+ foreach ( $contribs as $contrib )
+ $wgOut->addHTML( ucListEdit( $sk, $contrib ) );
$wgOut->addHTML( "</ul>\n" );
- $wgOut->addHTML( "<br />{$prevnextbits} ($shm)\n");
+ $wgOut->addHTML( "<p>{$prevnextbits}</p>\n" );
+}
+
+/**
+ * Generates the subheading with links
+ * @param $nt @see Title object for the target
+ */
+function contributionsSub( $nt ) {
+ global $wgSysopUserBans, $wgLang, $wgUser;
+
+ $sk = $wgUser->getSkin();
+ $id = User::idFromName( $nt->getText() );
+
+ if ( 0 == $id ) {
+ $ul = $nt->getText();
+ } else {
+ $ul = $sk->makeLinkObj( $nt, htmlspecialchars( $nt->getText() ) );
+ }
+ $talk = $nt->getTalkPage();
+ if( $talk ) {
+ # Talk page link
+ $tools[] = $sk->makeLinkObj( $talk, $wgLang->getNsText( NS_TALK ) );
+ if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && User::isIP( $nt->getText() ) ) ) {
+ # Block link
+ if( $wgUser->isAllowed( 'block' ) )
+ $tools[] = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Blockip/' . $nt->getDBkey() ), wfMsgHtml( 'blocklink' ) );
+ # Block log link
+ $tools[] = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Log' ), htmlspecialchars( LogPage::logName( 'block' ) ), 'type=block&page=' . $nt->getPrefixedUrl() );
+ }
+ # Other logs link
+ $tools[] = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Log' ), wfMsgHtml( 'log' ), 'user=' . $nt->getPartialUrl() );
+ $ul .= ' (' . implode( ' | ', $tools ) . ')';
+ }
+ return $ul;
}
+/**
+ * Generates the namespace selector form with hidden attributes.
+ * @param $options Array: the options to be included.
+ */
+function contributionsForm( $options ) {
+ global $wgScript, $wgTitle;
+
+ $options['title'] = $wgTitle->getPrefixedText();
+
+ $f = "<form method='get' action=\"$wgScript\">\n";
+ foreach ( $options as $name => $value ) {
+ if( $name === 'namespace') continue;
+ $f .= "\t" . wfElement( 'input', array(
+ 'name' => $name,
+ 'type' => 'hidden',
+ 'value' => $value ) ) . "\n";
+ }
+
+ $f .= '<p>' . wfMsgHtml( 'namespace' ) . ' ' .
+ HTMLnamespaceselector( $options['namespace'], '' ) .
+ wfElement( 'input', array(
+ 'type' => 'submit',
+ 'value' => wfMsg( 'allpagessubmit' ) )
+ ) .
+ "</p></form>\n";
+
+ return $f;
+}
/**
* Generates each row in the contributions list.
$fname = 'ucListEdit';
wfProfileIn( $fname );
- global $wgLang, $wgOut, $wgUser, $wgRequest;
+ global $wgLang, $wgUser, $wgRequest;
static $messages;
if( !isset( $messages ) ) {
foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist minoreditletter' ) as $msg ) {
- $messages[$msg] = wfMsg( $msg );
+ $messages[$msg] = wfMsgExt( $msg, array( 'escape') );
}
}
- $page =& Title::makeTitle( $row->page_namespace, $row->page_title );
- $link = $sk->makeKnownLinkObj( $page, '' );
+ $rev = new Revision( $row );
+
+ $page = Title::makeTitle( $row->page_namespace, $row->page_title );
+ $link = $sk->makeKnownLinkObj( $page );
$difftext = $topmarktext = '';
if( $row->rev_id == $row->page_latest ) {
$topmarktext .= '<strong>' . $messages['uctop'] . '</strong>';
if( !$row->page_is_new ) {
- $difftext .= $sk->makeKnownLinkObj( $page, '(' . $messages['diff'] . ')', 'diff=0' );
+ $difftext .= '(' . $sk->makeKnownLinkObj( $page, $messages['diff'], 'diff=0' ) . ')';
} else {
$difftext .= $messages['newarticle'];
}
- if( $wgUser->isAllowed('rollback') ) {
+ if( $wgUser->isAllowed( 'rollback' ) ) {
$extraRollback = $wgRequest->getBool( 'bot' ) ? '&bot=1' : '';
$extraRollback .= '&token=' . urlencode(
$wgUser->editToken( array( $page->getPrefixedText(), $row->rev_user_text ) ) );
}
}
- if( $row->rev_deleted && !$wgUser->isAllowed( 'undelete' ) ) {
- $difftext = '(' . $messages['diff'] . ')';
+ if( $rev->userCan( Revision::DELETED_TEXT ) ) {
+ $difftext = '(' . $sk->makeKnownLinkObj( $page, $messages['diff'], 'diff=prev&oldid='.$row->rev_id ) . ')';
} else {
- $difftext = $sk->makeKnownLinkObj( $page, '(' . $messages['diff'].')', 'diff=prev&oldid='.$row->rev_id );
+ $difftext = '(' . $messages['diff'] . ')';
}
$histlink='('.$sk->makeKnownLinkObj( $page, $messages['hist'], 'action=history' ) . ')';
- $comment = $sk->commentBlock( $row->rev_comment, $page );
- $d = $wgLang->timeanddate( $row->rev_timestamp, true );
+ $comment = $sk->revComment( $rev );
+ $d = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->rev_timestamp ), true );
+
+ if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ $d = '<span class="history-deleted">' . $d . '</span>';
+ }
if( $row->rev_minor_edit ) {
$mflag = '<span class="minor">' . $messages['minoreditletter'] . '</span> ';
}
$ret = "{$d} {$histlink} {$difftext} {$mflag} {$link} {$comment} {$topmarktext}";
- if( $row->rev_deleted ) {
- $ret = '<span class="deleted">' . $ret . '</span> ' . htmlspecialchars( wfMsg( 'deletedrev' ) );
+ if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ $ret .= ' ' . wfMsgHtml( 'deletedrev' );
}
$ret = "<li>$ret</li>\n";
wfProfileOut( $fname );
return $ret;
}
-/**
- * Generates a form used to restrict display of contributions
- * to a specific namespace
- *
- * @return none
- * @param string $target target user to show contributions for
- * @param string $hideminor whether minor contributions are hidden
- * @param string $namespace currently selected namespace, NULL for show all
- * @param bool $invert inverts the namespace selection on true (default null)
- */
-function ucNamespaceForm ( $target, $hideminor, $namespace, $invert ) {
- global $wgContLang, $wgScript;
-
- $namespaceselect = "<select name='namespace' id='nsselectbox'>";
- $namespaceselect .= '<option value="" '.(is_null($namespace) ? ' selected="selected"' : '').'>'.wfMsgHtml( 'contributionsall' ).'</option>';
- $arr = $wgContLang->getFormattedNamespaces();
- foreach( $arr as $ns => $name ) {
- if( $ns < NS_MAIN )
- continue;
- $n = $ns === NS_MAIN ? wfMsgHtml( 'blanknamespace' ) : htmlspecialchars( $name );
- $sel = $namespace == $ns ? ' selected="selected"' : '';
- $namespaceselect .= "<option value='$ns'$sel>$n</option>";
- }
- $namespaceselect .= '</select>';
-
- $action = htmlspecialchars( $wgScript );
- $out = "<div class='namespaceselector'><form method='get' action=\"$action\">";
- $out .= '<input type="hidden" name="title" value="' . htmlspecialchars( $wgContLang->specialpage( 'Contributions' ) ) . '" />';
- $out .= '<input type="hidden" name="target" value="' . htmlspecialchars( $target ) . '" />';
- $out .= '<input type="hidden" name="hideminor" value="' . ( $hideminor ? 1 : 0 ) .'" />';
- $out .= "
-<div id='nsselect' class='contributions'>
- <label for='nsselectbox'>" . wfMsgHtml('namespace') . "</label>
- $namespaceselect
- <input type='submit' value=\"" . wfMsgHtml( 'allpagessubmit' ) . "\" />
- <input type='checkbox' name='invert' value='1' id='nsinvert'" . ( $invert ? ' checked="checked"' : '' ) . " />
- <label for='nsinvert'>" . wfMsgHtml('invert') . "</label>
-</div>";
- $out .= '</form></div>';
- return $out;
-}
?>