Index: trunk/phase3/maintenance/language/messages.inc
===================================================================
--- trunk/phase3/maintenance/language/messages.inc (revision 41177)
+++ trunk/phase3/maintenance/language/messages.inc (revision 41178)
@@ -1379,6 +1379,9 @@
'special-categories-sort-count',
'special-categories-sort-abc',
),
+ 'deletedcontribs' => array(
+ 'deletedcontributions',
+ ),
'linksearch' => array(
'linksearch',
'linksearch-pat',
@@ -2824,6 +2827,7 @@
'logpages' => 'Special:Log',
'allpages' => 'Special:AllPages',
'categories' => 'Special:Categories',
+ 'deletedcontribs' => 'Special:DeletedContributions',
'linksearch' => 'Special:LinkSearch',
'listusers' => 'Special:ListUsers',
'newuserlog' => 'Special:Log/newusers',
Index: trunk/phase3/includes/AutoLoader.php
===================================================================
--- trunk/phase3/includes/AutoLoader.php (revision 41177)
+++ trunk/phase3/includes/AutoLoader.php (revision 41178)
@@ -431,6 +431,8 @@
'DBLockForm' => 'includes/specials/SpecialLockdb.php',
'DBUnlockForm' => 'includes/specials/SpecialUnlockdb.php',
'DeadendPagesPage' => 'includes/specials/SpecialDeadendpages.php',
+ 'DeletedContributionsPage' => 'includes/specials/SpecialDeletedContributions.php',
+ 'DeletedContribsPager' => 'includes/specials/SpecialDeletedContributions.php',
'DisambiguationsPage' => 'includes/specials/SpecialDisambiguations.php',
'DoubleRedirectsPage' => 'includes/specials/SpecialDoubleRedirects.php',
'EmailConfirmation' => 'includes/specials/SpecialConfirmemail.php',
Index: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php (revision 41177)
+++ trunk/phase3/includes/DefaultSettings.php (revision 41178)
@@ -2812,6 +2812,7 @@
'Blockip' => 'users',
'Preferences' => 'users',
'Resetpass' => 'users',
+ 'DeletedContributions' => 'users',
'Mostlinked' => 'highuse',
'Mostlinkedcategories' => 'highuse',
Index: trunk/phase3/includes/specials/SpecialContributions.php
===================================================================
--- trunk/phase3/includes/specials/SpecialContributions.php (revision 41177)
+++ trunk/phase3/includes/specials/SpecialContributions.php (revision 41178)
@@ -335,8 +335,13 @@
wfMsgHtml( 'sp-contributions-blocklog' ), 'type=block&page=' . $nt->getPrefixedUrl() );
}
# Other logs link
- $tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ), wfMsgHtml( 'log' ), 'user=' . $nt->getPartialUrl() );
+ $tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ), wfMsgHtml( 'log' ), 'user=' . $nt->getPartialUrl() );
+ # Add link to deleted user contributions for priviledged users
+ if( $wgUser->isAllowed( 'deletedhistory' ) ) {
+ $tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'DeletedContributions' ), wfMsgHtml( 'deletedcontributions' ) );
+ }
+
wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) );
$links = implode( ' | ', $tools );
Index: trunk/phase3/includes/specials/SpecialDeletedContributions.php
===================================================================
--- trunk/phase3/includes/specials/SpecialDeletedContributions.php (revision 0)
+++ trunk/phase3/includes/specials/SpecialDeletedContributions.php (revision 41178)
@@ -0,0 +1,367 @@
+<?php
+/**
+ * Implements Special:DeletedContributions to display archived revisions
+ * @ingroup SpecialPage
+ */
+
+class DeletedContribsPager extends IndexPager {
+ public $mDefaultDirection = true;
+ var $messages, $target;
+ var $namespace = '', $mDb;
+
+ function __construct( $target, $namespace = false ) {
+ parent::__construct();
+ foreach( explode( ' ', 'deletionlog undeletebtn minoreditletter diff' ) as $msg ) {
+ $this->messages[$msg] = wfMsgExt( $msg, array( 'escape') );
+ }
+ $this->target = $target;
+ $this->namespace = $namespace;
+ $this->mDb = wfGetDB( DB_SLAVE, 'contributions' );
+ }
+
+ function getDefaultQuery() {
+ $query = parent::getDefaultQuery();
+ $query['target'] = $this->target;
+ return $query;
+ }
+
+ function getQueryInfo() {
+ list( $index, $userCond ) = $this->getUserCond();
+ $conds = array_merge( $userCond, $this->getNamespaceCond() );
+
+ return array(
+ 'tables' => array( 'archive' ),
+ 'fields' => array(
+ 'ar_rev_id', 'ar_namespace', 'ar_title', 'ar_timestamp', 'ar_comment', 'ar_minor_edit',
+ 'ar_user', 'ar_user_text', 'ar_deleted'
+ ),
+ 'conds' => $conds,
+ 'options' => array( 'FORCE INDEX' => $index )
+ );
+ }
+
+ function getUserCond() {
+ $condition = array();
+
+ $condition['ar_user_text'] = $this->target;
+ $index = 'usertext_timestamp';
+
+ return array( $index, $condition );
+ }
+
+ function getIndexField() {
+ return 'ar_timestamp';
+ }
+
+ function getStartBody() {
+ return "<ul>\n";
+ }
+
+ function getEndBody() {
+ return "</ul>\n";
+ }
+
+ function getNavigationBar() {
+ if ( isset( $this->mNavigationBar ) ) {
+ return $this->mNavigationBar;
+ }
+ $linkTexts = array(
+ 'prev' => wfMsgHtml( 'pager-newer-n', $this->mLimit ),
+ 'next' => wfMsgHtml( 'pager-older-n', $this->mLimit ),
+ 'first' => wfMsgHtml( 'page_first' ),
+ 'last' => wfMsgHtml( 'page_last' )
+ );
+
+ $pagingLinks = $this->getPagingLinks( $linkTexts );
+ $limitLinks = $this->getLimitLinks();
+ $limits = implode( ' | ', $limitLinks );
+
+ $this->mNavigationBar = "({$pagingLinks['first']} | {$pagingLinks['last']}) " .
+ wfMsgExt( 'viewprevnext', array( 'parsemag' ), $pagingLinks['prev'], $pagingLinks['next'], $limits );
+ return $this->mNavigationBar;
+ }
+
+ function getNamespaceCond() {
+ if ( $this->namespace !== '' ) {
+ return array( 'ar_namespace' => (int)$this->namespace );
+ } else {
+ return array();
+ }
+ }
+
+ /**
+ * 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.
+ *
+ * @todo This would probably look a lot nicer in a table.
+ */
+ function formatRow( $row ) {
+ wfProfileIn( __METHOD__ );
+
+ global $wgLang, $wgUser;
+
+ $sk = $this->getSkin();
+
+ $rev = new Revision( array(
+ 'id' => $row->ar_rev_id,
+ 'comment' => $row->ar_comment,
+ 'user' => $row->ar_user,
+ 'user_text' => $row->ar_user_text,
+ 'timestamp' => $row->ar_timestamp,
+ 'minor_edit' => $row->ar_minor_edit,
+ 'rev_deleted' => $row->ar_deleted,
+ ) );
+
+ $page = Title::makeTitle( $row->ar_namespace, $row->ar_title );
+
+ $undelete = SpecialPage::getTitleFor( 'Undelete' );
+
+ $logs = SpecialPage::getTitleFor( 'Log' );
+ $dellog = $sk->makeKnownLinkObj( $logs,
+ $this->messages['deletionlog'],
+ 'type=delete&page=' . $page->getPrefixedUrl() );
+
+ $reviewlink = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Undelete', $page->getPrefixedDBkey() ),
+ $this->messages['undeletebtn'] );
+
+ $link = $sk->makeKnownLinkObj( $undelete,
+ htmlspecialchars( $page->getPrefixedText() ),
+ 'target=' . $page->getPrefixedUrl() .
+ '×tamp=' . $rev->getTimestamp() );
+
+ $last = $sk->makeKnownLinkObj( $undelete,
+ $this->messages['diff'],
+ "target=" . $page->getPrefixedUrl() .
+ "×tamp=" . $rev->getTimestamp() .
+ "&diff=prev" );
+
+ $comment = $sk->revComment( $rev );
+ $d = $wgLang->timeanddate( $rev->getTimestamp(), true );
+
+ if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ $d = '<span class="history-deleted">' . $d . '</span>';
+ } else {
+ $link = $sk->makeKnownLinkObj( $undelete, $d,
+ 'target=' . $page->getPrefixedUrl() .
+ '×tamp=' . $rev->getTimestamp() );
+ }
+
+ $pagelink = $sk->makeLinkObj( $page );
+
+ if( $rev->isMinor() ) {
+ $mflag = '<span class="minor">' . $this->messages['minoreditletter'] . '</span> ';
+ } else {
+ $mflag = '';
+ }
+
+
+ $ret = "{$link} ($last) ({$dellog}) ({$reviewlink}) . . {$mflag} {$pagelink} {$comment}";
+ if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+ $ret .= ' ' . wfMsgHtml( 'deletedrev' );
+ }
+
+ $ret = "<li>$ret</li>\n";
+
+ wfProfileOut( __METHOD__ );
+ return $ret;
+ }
+
+ /**
+ * Get the Database object in use
+ *
+ * @return Database
+ */
+ public function getDatabase() {
+ return $this->mDb;
+ }
+}
+
+class DeletedContributionsPage extends SpecialPage {
+ function __construct() {
+ parent::__construct( 'DeletedContributions', 'deletedhistory',
+ /*listed*/ true, /*function*/ false, /*file*/ false );
+ }
+
+ /**
+ * Special page "deleted user contributions".
+ * Shows a list of the deleted contributions of a user.
+ *
+ * @return none
+ * @param $par String: (optional) user name of the user for which to show the contributions
+ */
+ function execute( $par ) {
+ global $wgUser;
+ $this->setHeaders();
+
+ if ( !$this->userCanExecute( $wgUser ) ) {
+ $this->displayRestrictionError();
+ return;
+ }
+
+ global $wgUser, $wgOut, $wgLang, $wgRequest;
+
+ $options = array();
+
+ if ( isset( $par ) ) {
+ $target = $par;
+ } else {
+ $target = $wgRequest->getVal( 'target' );
+ }
+
+ if ( !strlen( $target ) ) {
+ $wgOut->addHTML( $this->getForm( '' ) );
+ return;
+ }
+
+ $options['limit'] = $wgRequest->getInt( 'limit', 50 );
+ $options['target'] = $target;
+
+ $nt = Title::makeTitleSafe( NS_USER, $target );
+ if ( !$nt ) {
+ $wgOut->addHTML( $this->getForm( '' ) );
+ return;
+ }
+ $id = User::idFromName( $nt->getText() );
+
+ $target = $nt->getText();
+ $wgOut->setSubtitle( $this->getSubTitle( $nt, $id ) );
+
+ if ( ( $ns = $wgRequest->getVal( 'namespace', null ) ) !== null && $ns !== '' ) {
+ $options['namespace'] = intval( $ns );
+ } else {
+ $options['namespace'] = '';
+ }
+
+ $wgOut->addHTML( $this->getForm( $options ) );
+
+ $pager = new DeletedContribsPager( $target, $options['namespace'] );
+ if ( !$pager->getNumRows() ) {
+ $wgOut->addWikiText( wfMsg( 'nocontribs' ) );
+ return;
+ }
+
+ # Show a message about slave lag, if applicable
+ if( ( $lag = $pager->getDatabase()->getLag() ) > 0 )
+ $wgOut->showLagWarning( $lag );
+
+ $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 )
+ ? 'sp-contributions-footer-anon'
+ : 'sp-contributions-footer';
+
+
+ $text = wfMsgNoTrans( $message, $target );
+ if( !wfEmptyMsg( $message, $text ) && $text != '-' ) {
+ $wgOut->addHtml( '<div class="mw-contributions-footer">' );
+ $wgOut->addWikiText( $text );
+ $wgOut->addHtml( '</div>' );
+ }
+ }
+ }
+
+ /**
+ * Generates the subheading with links
+ * @param $nt @see Title object for the target
+ */
+ function getSubTitle( $nt, $id ) {
+ global $wgSysopUserBans, $wgLang, $wgUser;
+
+ $sk = $wgUser->getSkin();
+
+ if ( 0 == $id ) {
+ $user = $nt->getText();
+ } else {
+ $user = $sk->makeLinkObj( $nt, htmlspecialchars( $nt->getText() ) );
+ }
+ $talk = $nt->getTalkPage();
+ if( $talk ) {
+ # Talk page link
+ $tools[] = $sk->makeLinkObj( $talk, wfMsgHtml( 'talkpagelinktext' ) );
+ if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && User::isIP( $nt->getText() ) ) ) {
+ # Block link
+ if( $wgUser->isAllowed( 'block' ) )
+ $tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ),
+ wfMsgHtml( 'blocklink' ) );
+ # Block log link
+ $tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ),
+ wfMsgHtml( 'sp-contributions-blocklog' ), 'type=block&page=' . $nt->getPrefixedUrl() );
+ }
+ # Other logs link
+ $tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ),
+ wfMsgHtml( 'log' ), 'user=' . $nt->getPartialUrl() );
+ # Link to undeleted contributions
+ $tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Contributions', $nt->getDBkey() ),
+ wfMsgHtml( 'contributions' ) );
+
+ $links = implode( ' | ', $tools );
+ }
+
+ // Old message 'contribsub' had one parameter, but that doesn't work for
+ // languages that want to put the "for" bit right after $user but before
+ // $links. If 'contribsub' is around, use it for reverse compatibility,
+ // otherwise use 'contribsub2'.
+ if( wfEmptyMsg( 'contribsub', wfMsg( 'contribsub' ) ) ) {
+ return wfMsgHtml( 'contribsub2', $user, $links );
+ } else {
+ return wfMsgHtml( 'contribsub', "$user ($links)" );
+ }
+ }
+
+ /**
+ * Generates the namespace selector form with hidden attributes.
+ * @param $options Array: the options to be included.
+ */
+ function getForm( $options ) {
+ global $wgScript, $wgTitle, $wgRequest;
+
+ $options['title'] = $wgTitle->getPrefixedText();
+ if ( !isset( $options['target'] ) ) {
+ $options['target'] = '';
+ } else {
+ $options['target'] = str_replace( '_' , ' ' , $options['target'] );
+ }
+
+ if ( !isset( $options['namespace'] ) ) {
+ $options['namespace'] = '';
+ }
+
+ if ( !isset( $options['contribs'] ) ) {
+ $options['contribs'] = 'user';
+ }
+
+ if ( $options['contribs'] == 'newbie' ) {
+ $options['target'] = '';
+ }
+
+ $f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
+
+ foreach ( $options as $name => $value ) {
+ if ( in_array( $name, array( 'namespace', 'target', 'contribs' ) ) ) {
+ continue;
+ }
+ $f .= "\t" . Xml::hidden( $name, $value ) . "\n";
+ }
+
+ $f .= Xml::openElement( 'fieldset' ) .
+ Xml::element( 'legend', array(), wfMsg( 'sp-contributions-search' ) ) .
+ Xml::tags( 'label', array( 'for' => 'target' ), wfMsgExt( 'sp-contributions-username', 'parseinline' ) ) . ' ' .
+ Xml::input( 'target', 20, $options['target']) . ' '.
+ Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' .
+ Xml::namespaceSelector( $options['namespace'], '' ) . ' ' .
+ Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
+ Xml::closeElement( 'fieldset' ) .
+ Xml::closeElement( 'form' );
+ return $f;
+ }
+}
Property changes on: trunk/phase3/includes/specials/SpecialDeletedContributions.php
___________________________________________________________________
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Index: trunk/phase3/includes/SpecialPage.php
===================================================================
--- trunk/phase3/includes/SpecialPage.php (revision 41177)
+++ trunk/phase3/includes/SpecialPage.php (revision 41178)
@@ -96,6 +96,7 @@
'Newimages' => array( 'IncludableSpecialPage', 'Newimages' ),
'Listusers' => array( 'SpecialPage', 'Listusers' ),
'Listgrouprights' => 'SpecialListGroupRights',
+ 'Deletedcontributions' => 'DeletedContributionsPage',
'Statistics' => array( 'SpecialPage', 'Statistics' ),
'Randompage' => 'Randompage',
'Lonelypages' => array( 'SpecialPage', 'Lonelypages' ),
Index: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php (revision 41177)
+++ trunk/phase3/languages/messages/MessagesEn.php (revision 41178)
@@ -438,6 +438,7 @@
'Invalidateemail' => array( 'InvalidateEmail' ),
'Blankpage' => array( 'BlankPage' ),
'LinkSearch' => array( 'LinkSearch' ),
+ 'DeletedContributions' => array( 'DeletedContributions' ),
);
/**
@@ -2107,6 +2108,9 @@
'special-categories-sort-count' => 'sort by count',
'special-categories-sort-abc' => 'sort alphabetically',
+# Special:DeletedContributions
+'deletedcontributions' => 'Deleted user contributions',
+
# Special:LinkSearch
'linksearch' => 'Search web links',
'linksearch-pat' => 'Search pattern:',
