Rename 'SpecialContribSubEnd' hook to more appropriate 'ContributionsToolLinks',...
[lhc/web/wiklou.git] / includes / SpecialContributions.php
index 0a1ef6e..d245144 100644 (file)
 <?php
 /**
- * @package MediaWiki
- * @subpackage SpecialPage
+ * Special:Contributions, show user contributions in a paged list
+ * @addtogroup SpecialPage
  */
 
-/** @package MediaWiki */
-class ContribsFinder {
-       var $username, $offset, $limit, $namespace;
-       var $dbr;
+class ContribsPager extends IndexPager {
+       public $mDefaultDirection = true;
+       var $messages, $target;
+       var $namespace = '', $mDb;
 
-       /**
-        * Constructor
-        * @param $username Username as a string
-       */
-       function ContribsFinder( $username ) {
-               $this->username = $username;
-               $this->namespace = false;
-               $this->dbr =& wfGetDB( DB_SLAVE );
-       }
+       function __construct( $target, $namespace = false, $year = false, $month = false ) {
+               parent::__construct();
+               foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist 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;
+               return $query;
+       }
+
+       function getQueryInfo() {
+               list( $index, $userCond ) = $this->getUserCond();
+               $conds = array_merge( array('page_id=rev_page'), $userCond, $this->getNamespaceCond() );
 
-       function setNamespace( $ns ) {
-               $this->namespace = $ns;
+               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'
+                       ),
+                       'conds' => $conds,
+                       'options' => array( 'FORCE INDEX' => $index )
+               );
        }
 
-       function setLimit( $limit ) {
-               $this->limit = $limit;
-       }
+       function getUserCond() {
+               $condition = array();
 
-       function setOffset( $offset ) {
-               $this->offset = $offset;
+               if ( $this->target == 'newbies' ) {
+                       $max = $this->mDb->selectField( 'user', 'max(user_id)', false, __METHOD__ );
+                       $condition[] = 'rev_user >' . (int)($max - $max / 100);
+                       $index = 'user_timestamp';
+               } else {
+                       $condition['rev_user_text'] = $this->target;
+                       $index = 'usertext_timestamp';
+               }
+               return array( $index, $condition );
        }
 
-       /**
-        * Get timestamp of either first or last contribution made by the user.
-        * @todo Maybe it should be private ?
-        * @param $dir string 'ASC' or 'DESC'.
-        * @return Revision timestamp (rev_timestamp).
-       */
-       function getEditLimit( $dir ) {
-               list( $index, $usercond ) = $this->getUserCond();
-               $nscond = $this->getNamespaceCond();
-               $use_index = $this->dbr->useIndexClause( $index );
-               list( $revision, $page) = $this->dbr->tableNamesN( '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;
+       function getNamespaceCond() {
+               if ( $this->namespace !== '' ) {
+                       return array( 'page_namespace' => (int)$this->namespace );
                } else {
-                       return false;
+                       return array();
+               }
+       }
+       
+       function getDateCond() {
+               if ( $this->year || $this->month ) {
+                       // Assume this year if only a month is given
+                       if ( $this->year ) {
+                               $year_start = $this->year;
+                       } else {
+                               $year_start = substr( wfTimestampNow(), 0, 4 );
+                               $thisMonth = gmdate( 'n' );
+                               if( $this->month > $thisMonth ) {
+                                       // Future contributions aren't supposed to happen. :)
+                                       $year_start--;
+                               }
+                       }
+                       
+                       if ( $this->month ) {
+                               $month_end = str_pad($this->month + 1, 2, '0', STR_PAD_LEFT);
+                               $year_end = $year_start;
+                       } else {
+                               $month_end = 0;
+                               $year_end = $year_start + 1;
+                       }
+                       $ts_end = str_pad($year_end . $month_end, 14, '0' );
+
+                       $this->mOffset = $ts_end;
                }
        }
 
-       /**
-        * Get timestamps of first and last contributions made by the user.
-        * @return Array containing first rev_timestamp and last rev_timestamp.
-       */
-       function getEditLimits() {
-               return array(
-                       $this->getEditLimit( "ASC" ),
-                       $this->getEditLimit( "DESC" )
-               );
+       function getIndexField() {
+               return 'rev_timestamp';
        }
 
-       function getUserCond() {
-               $condition = '';
+       function getStartBody() {
+               return "<ul>\n";
+       }
 
-               if ( $this->username == 'newbies' ) {
-                       $max = $this->dbr->selectField( 'user', 'max(user_id)', false, 'make_sql' );
-                       $condition = '>' . (int)($max - $max / 100);
-               }
+       function getEndBody() {
+               return "</ul>\n";
+       }
 
-               if ( $condition == '' ) {
-                       $condition = ' rev_user_text=' . $this->dbr->addQuotes( $this->username );
-                       $index = 'usertext_timestamp';
-               } else {
-                       $condition = ' rev_user '.$condition ;
-                       $index = 'user_timestamp';
+       function getNavigationBar() {
+               if ( isset( $this->mNavigationBar ) ) {
+                       return $this->mNavigationBar;
                }
-               return array( $index, $condition );
-       }
+               $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' )
+               );
 
-       function getNamespaceCond() {
-               if ( $this->namespace !== false )
-                       return ' AND page_namespace = ' . (int)$this->namespace;
-               return '';
+               $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;
        }
 
        /**
-        * @return Timestamp of first entry in previous page.
-       */
-       function getPreviousOffsetForPaging() {
-               list( $index, $usercond ) = $this->getUserCond();
-               $nscond = $this->getNamespaceCond();
-
-               $use_index = $this->dbr->useIndexClause( $index );
-               list( $page, $revision ) = $this->dbr->tableNamesN( 'page', 'revision' );
-
-               $sql =  "SELECT rev_timestamp FROM $page, $revision $use_index " .
-                       "WHERE page_id = rev_page AND rev_timestamp > '" . $this->offset . "' AND " .
-                       $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;
+        * 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( $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>' . $this->messages['uctop'] . '</strong>';
+                       if( !$row->page_is_new ) {
+                               $difftext .= '(' . $sk->makeKnownLinkObj( $page, $this->messages['diff'], 'diff=0' ) . ')';
+                       } else {
+                               $difftext .= $this->messages['newarticle'];
+                       }
+
+                       if( $wgUser->isAllowed( 'rollback' ) ) {
+                               $topmarktext .= ' '.$sk->generateRollback( $rev );
+                       }
+
+               }
+               if( $rev->userCan( Revision::DELETED_TEXT ) ) {
+                       $difftext = '(' . $sk->makeKnownLinkObj( $page, $this->messages['diff'], 'diff=prev&oldid='.$row->rev_id ) . ')';
                } else {
-                       $offset = false;
+                       $difftext = '(' . $this->messages['diff'] . ')';
                }
-               $this->dbr->freeResult( $res );
-               return $offset;
-       }
-
-       /**
-        * @return Timestamp of first entry in next page.
-       */
-       function getFirstOffsetForPaging() {
-               list( $index, $usercond ) = $this->getUserCond();
-               $use_index = $this->dbr->useIndexClause( $index );
-               list( $page, $revision ) = $this->dbr->tableNamesN( 'page', 'revision' );
-               $nscond = $this->getNamespaceCond();
-               $sql =  "SELECT rev_timestamp FROM $page, $revision $use_index " .
-                       "WHERE page_id = rev_page AND " .
-                       $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;
+               $histlink='('.$sk->makeKnownLinkObj( $page, $this->messages['hist'], 'action=history' ) . ')';
+
+               $comment = $sk->revComment( $rev );
+               $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 ) . ') ';
                } else {
-                       $offset = false;
+                       $userlink = '';
                }
-               $this->dbr->freeResult( $res );
-               return $offset;
-       }
 
-       /* private */ function makeSql() {
-               $offsetQuery = '';
-
-               list( $page, $revision ) = $this->dbr->tableNamesN( 'page', 'revision' );
-               list( $index, $userCond ) = $this->getUserCond();
+               if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                       $d = '<span class="history-deleted">' . $d . '</span>';
+               }
 
-               if ( $this->offset )
-                       $offsetQuery = "AND rev_timestamp < '{$this->offset}'";
+               if( $row->rev_minor_edit ) {
+                       $mflag = '<span class="minor">' . $this->messages['minoreditletter'] . '</span> ';
+               } else {
+                       $mflag = '';
+               }
 
-               $nscond = $this->getNamespaceCond();
-               $use_index = $this->dbr->useIndexClause( $index );
-               $sql = "SELECT
-                       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
-                       FROM $page,$revision $use_index
-                       WHERE page_id=rev_page AND $userCond $nscond $offsetQuery
-                       ORDER BY rev_timestamp DESC";
-               $sql = $this->dbr->limitResult( $sql, $this->limit, 0 );
-               return $sql;
+               $ret = "{$d} {$histlink} {$difftext} {$mflag} {$link}{$userlink}{$comment} {$topmarktext}";
+               if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                       $ret .= ' ' . wfMsgHtml( 'deletedrev' );
+               }
+               $ret = "<li>$ret</li>\n";
+               wfProfileOut( __METHOD__ );
+               return $ret;
        }
-
+       
        /**
-        * This do the search for the user given when creating the object.
-        * It should probably be the only public function in this class.
-        * @return Array of contributions.
-       */
-       function find() {
-               $contribs = array();
-               $res = $this->dbr->query( $this->makeSql(), __METHOD__ );
-               while ( $c = $this->dbr->fetchObject( $res ) )
-                       $contribs[] = $c;
-               $this->dbr->freeResult( $res );
-               return $contribs;
-       }
-};
+        * Get the Database object in use
+        *
+        * @return Database
+        */
+       public function getDatabase() {
+               return $this->mDb;
+       }
+       
+}
 
 /**
  * Special page "user contributions".
@@ -194,154 +221,137 @@ class ContribsFinder {
 function wfSpecialContributions( $par = null ) {
        global $wgUser, $wgOut, $wgLang, $wgRequest;
 
-       $target = isset( $par ) ? $par : $wgRequest->getVal( 'target' );
-       if ( !strlen( $target ) ) {
-               $wgOut->showErrorPage( 'notargettitle', 'notargettext' );
-               return;
+       $options = array();
+       
+       if ( isset( $par ) && $par == 'newbies' ) {
+               $target = 'newbies';
+               $options['contribs'] = 'newbie';
+       } elseif ( isset( $par ) ) {
+               $target = $par;
+       } else {
+               $target = $wgRequest->getVal( 'target' );
        }
 
-       $nt = Title::newFromURL( $target );
-       if ( !$nt ) {
-               $wgOut->showErrorPage( 'notargettitle', 'notargettext' );
-               return;
+       // check for radiobox
+       if ( $wgRequest->getVal( 'contribs' ) == 'newbie' ) {
+               $target = 'newbies';
+               $options['contribs'] = 'newbie';
        }
 
-       $options = array();
-
-       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'] = '';
+       if ( !strlen( $target ) ) {
+               $wgOut->addHTML( contributionsForm( '' ) );
+               return;
+       }
 
-       $title = SpecialPage::getTitleFor( 'Contributions' );
+       $options['limit'] = $wgRequest->getInt( 'limit', 50 );
        $options['target'] = $target;
 
-       $nt =& Title::makeTitle( NS_USER, $nt->getDBkey() );
-       $finder = new ContribsFinder( ( $target == 'newbies' ) ? 'newbies' : $nt->getText() );
-       $finder->setLimit( $options['limit'] );
-       $finder->setOffset( $options['offset'] );
+       $nt = Title::makeTitleSafe( NS_USER, $target );
+       if ( !$nt ) {
+               $wgOut->addHTML( contributionsForm( '' ) );
+               return;
+       }
+       $id = User::idFromName( $nt->getText() );
 
+       if ( $target != 'newbies' ) {
+               $target = $nt->getText();
+               $wgOut->setSubtitle( contributionsSub( $nt, $id ) );
+       } else {
+               $wgOut->setSubtitle( wfMsgHtml( 'sp-contributions-newbies-sub') );
+       }
+       
        if ( ( $ns = $wgRequest->getVal( 'namespace', null ) ) !== null && $ns !== '' ) {
                $options['namespace'] = intval( $ns );
-               $finder->setNamespace( $options['namespace'] );
        } else {
                $options['namespace'] = '';
        }
-
        if ( $wgUser->isAllowed( 'rollback' ) && $wgRequest->getBool( 'bot' ) ) {
                $options['bot'] = '1';
        }
-
-       if ( $wgRequest->getText( 'go' ) == 'prev' ) {
-               $offset = $finder->getPreviousOffsetForPaging();
-               if ( $offset !== false ) {
-                       $options['offset'] = $offset;
-                       $prevurl = $title->getLocalURL( wfArrayToCGI( $options ) );
-                       $wgOut->redirect( $prevurl );
-                       return;
-               }
-       }
-
-       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;
+       
+       $skip = $wgRequest->getText( 'offset' ) || $wgRequest->getText( 'dir' ) == 'prev';
+       # Offset overrides year/month selection
+       if ( ( $month = $wgRequest->getIntOrNull( 'month' ) ) !== null && $month !== -1 ) {
+               $options['month'] = intval( $month );
+       } else {
+               $options['month'] = '';
+       }
+       if ( ( $year = $wgRequest->getIntOrNull( 'year' ) ) !== null ) {
+               $options['year'] = intval( $year );
+       } else if( $options['month'] ) {
+               $thisMonth = intval( gmdate( 'n' ) );
+               $thisYear = intval( gmdate( 'Y' ) );
+               if( intval( $options['month'] ) > $thisMonth ) {
+                       $thisYear--;
                }
-       }
-
-       if ( $target == 'newbies' ) {
-               $wgOut->setSubtitle( wfMsgHtml( 'sp-contributions-newbies-sub') );
+               $options['year'] = $thisYear;
        } else {
-               $wgOut->setSubtitle( wfMsgHtml( 'contribsub', contributionsSub( $nt ) ) );
+               $options['year'] = '';
        }
 
-       $id = User::idFromName( $nt->getText() );
        wfRunHooks( 'SpecialContributionsBeforeMainOutput', $id );
 
-       $wgOut->addHTML( contributionsForm( $options) );
-
-       $contribs = $finder->find();
+       $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'] = '';
+       }
 
-       if ( count( $contribs ) == 0) {
+       $pager = new ContribsPager( $target, $options['namespace'], $options['year'], $options['month'] );
+       if ( !$pager->getNumRows() ) {
                $wgOut->addWikiText( wfMsg( 'nocontribs' ) );
                return;
        }
 
-       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>";
-       }
-
-       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>";
-       }
-
-       if ( $target == 'newbies' ) {
-               $firstlast ="($newestlink)";
-       } else {
-               $firstlast = "($newestlink | $oldestlink)";
-       }
-
-       $urls = array();
-       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>";
+       # 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 = wfMsg( $message, $target );
+               if( !wfEmptyMsg( $message, $text ) && $text != '-' ) {
+                       $wgOut->addHtml( '<div class="mw-contributions-footer">' );
+                       $wgOut->addWikiText( $text );
+                       $wgOut->addHtml( '</div>' );
+               }
        }
-       $bits = implode( $urls, ' | ' );
-
-       $prevnextbits = $firstlast .' '. wfMsgHtml( 'viewprevnext', $newerlink, $olderlink, $bits );
-
-       $wgOut->addHTML( "<p>{$prevnextbits}</p>\n" );
-
-       $wgOut->addHTML( "<ul>\n" );
-
-       $sk = $wgUser->getSkin();
-       foreach ( $contribs as $contrib )
-               $wgOut->addHTML( ucListEdit( $sk, $contrib ) );
-
-       $wgOut->addHTML( "</ul>\n" );
-       $wgOut->addHTML( "<p>{$prevnextbits}</p>\n" );
 }
 
 /**
  * Generates the subheading with links
- * @param $nt @see Title object for the target
+ * @param Title $nt Title object for the target
+ * @param integer $id User ID for the target
+ * @return String: appropriately-escaped HTML to be output literally
  */
-function contributionsSub( $nt ) {
+function contributionsSub( $nt, $id ) {
        global $wgSysopUserBans, $wgLang, $wgUser;
 
        $sk = $wgUser->getSkin();
-       $id = User::idFromName( $nt->getText() );
 
        if ( 0 == $id ) {
-               $ul = $nt->getText();
+               $user = $nt->getText();
        } else {
-               $ul = $sk->makeLinkObj( $nt, htmlspecialchars( $nt->getText() ) );
+               $user = $sk->makeLinkObj( $nt, htmlspecialchars( $nt->getText() ) );
        }
        $talk = $nt->getTalkPage();
        if( $talk ) {
                # Talk page link
-               $tools[] = $sk->makeLinkObj( $talk, $wgLang->getNsText( NS_TALK ) );
+               $tools[] = $sk->makeLinkObj( $talk, wfMsgHtml( 'talkpagelinktext' ) );
                if( ( $id != 0 && $wgSysopUserBans ) || ( $id == 0 && User::isIP( $nt->getText() ) ) ) {
                        # Block link
                        if( $wgUser->isAllowed( 'block' ) )
@@ -351,9 +361,21 @@ function contributionsSub( $nt ) {
                }
                # Other logs link
                $tools[] = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'Log' ), wfMsgHtml( 'log' ), 'user=' . $nt->getPartialUrl() );
-               $ul .= ' (' . implode( ' | ', $tools ) . ')';
+
+               wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) );
+
+               $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)" );
        }
-       return $ul;
 }
 
 /**
@@ -361,97 +383,64 @@ function contributionsSub( $nt ) {
  * @param $options Array: the options to be included.
  */
 function contributionsForm( $options ) {
-       global $wgScript, $wgTitle;
+       global $wgScript, $wgTitle, $wgRequest;
 
        $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";
+       if ( !isset( $options['target'] ) ) {
+               $options['target'] = '';
+       } else {
+               $options['target'] = str_replace( '_' , ' ' , $options['target'] );
        }
 
-       $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.
- *
- * 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 ucListEdit( $sk, $row ) {
-       $fname = 'ucListEdit';
-       wfProfileIn( $fname );
-
-       global $wgLang, $wgUser, $wgRequest;
-       static $messages;
-       if( !isset( $messages ) ) {
-               foreach( explode( ' ', 'uctop diff newarticle rollbacklink diff hist minoreditletter' ) as $msg ) {
-                       $messages[$msg] = wfMsgExt( $msg, array( 'escape') );
-               }
+       if ( !isset( $options['namespace'] ) ) {
+               $options['namespace'] = '';
        }
 
-       $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' ) . ')';
-               } else {
-                       $difftext .= $messages['newarticle'];
-               }
-
-               if( $wgUser->isAllowed( 'rollback' ) ) {
-                       $topmarktext .= ' '.$sk->generateRollback( $rev );
-               }
-
+       if ( !isset( $options['contribs'] ) ) {
+               $options['contribs'] = 'user';
        }
-       if( $rev->userCan( Revision::DELETED_TEXT ) ) {
-               $difftext = '(' . $sk->makeKnownLinkObj( $page, $messages['diff'], 'diff=prev&oldid='.$row->rev_id ) . ')';
-       } else {
-               $difftext = '(' . $messages['diff'] . ')';
+       
+       if ( !isset( $options['year'] ) ) {
+               $options['year'] = '';
        }
-       $histlink='('.$sk->makeKnownLinkObj( $page, $messages['hist'], 'action=history' ) . ')';
 
-       $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 ( !isset( $options['month'] ) ) {
+               $options['month'] = '';
        }
 
-       if( $row->rev_minor_edit ) {
-               $mflag = '<span class="minor">' . $messages['minoreditletter'] . '</span> ';
-       } else {
-               $mflag = '';
+       if ( $options['contribs'] == 'newbie' ) {
+               $options['target'] = '';
        }
 
-       $ret = "{$d} {$histlink} {$difftext} {$mflag} {$link} {$comment} {$topmarktext}";
-       if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
-               $ret .= ' ' . wfMsgHtml( 'deletedrev' );
-       }
-       $ret = "<li>$ret</li>\n";
-       wfProfileOut( $fname );
-       return $ret;
-}
+       $f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
 
-?>
+       foreach ( $options as $name => $value ) {
+               if ( in_array( $name, array( 'namespace', 'target', 'contribs', 'year', 'month' ) ) ) {
+                       continue;
+               }
+               $f .= "\t" . Xml::hidden( $name, $value ) . "\n";
+       }
+
+       $f .= '<fieldset>' .
+               Xml::element( 'legend', array(), wfMsg( 'sp-contributions-search' ) ) .
+               Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parseinline' ) ), 'contribs' , 'newbie' , 'newbie', $options['contribs'] == 'newbie' ? true : false ) . '<br />' .
+               Xml::radioLabel( wfMsgExt( 'sp-contributions-username', array( 'parseinline' ) ), 'contribs' , 'user', 'user', $options['contribs'] == 'user' ? true : false ) . ' ' .
+               Xml::input( 'target', 20, $options['target']) . ' '.
+               Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
+               Xml::namespaceSelector( $options['namespace'], '' ) .
+               Xml::openElement( 'p' ) .
+               Xml::label( wfMsg( 'year' ), 'year' ) . ' '.
+               Xml::input( 'year', 4, $options['year'], array('id' => 'year', 'maxlength' => 4) ) . ' '.
+               Xml::label( wfMsg( 'month' ), 'month' ) . ' '.
+               Xml::monthSelector( $options['month'], -1 ) . ' '.
+               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;
+}