w/s diff. mostly eol w/s and using only tabs of width 4 to indent.
[lhc/web/wiklou.git] / includes / specials / SpecialContributions.php
index 8885909..4823af6 100644 (file)
@@ -1,5 +1,6 @@
 <?php
 /**
+ * Implements Special:Contributions
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
  */
 
 /**
  * Special:Contributions, show user contributions in a paged list
- * @file
+ *
  * @ingroup SpecialPage
  */
 
 class SpecialContributions extends SpecialPage {
 
+       protected $opts;
+
        public function __construct() {
                parent::__construct( 'Contributions' );
        }
@@ -34,6 +40,7 @@ class SpecialContributions extends SpecialPage {
 
                $this->setHeaders();
                $this->outputHeader();
+               $wgOut->addModuleStyles( 'mediawiki.special' );
 
                $this->opts = array();
 
@@ -52,7 +59,7 @@ class SpecialContributions extends SpecialPage {
                        $this->opts['contribs'] = 'newbie';
                }
 
-               $this->opts['deletedOnly'] = $wgRequest->getCheck( 'deletedOnly' );
+               $this->opts['deletedOnly'] = $wgRequest->getBool( 'deletedOnly' );
 
                if( !strlen( $target ) ) {
                        $wgOut->addHTML( $this->getForm() );
@@ -61,7 +68,7 @@ class SpecialContributions extends SpecialPage {
 
                $this->opts['limit'] = $wgRequest->getInt( 'limit', $wgUser->getOption('rclimit') );
                $this->opts['target'] = $target;
-               $this->opts['topOnly'] = $wgRequest->getCheck( 'topOnly' );
+               $this->opts['topOnly'] = $wgRequest->getBool( 'topOnly' );
 
                $nt = Title::makeTitleSafe( NS_USER, $target );
                if( !$nt ) {
@@ -74,6 +81,10 @@ class SpecialContributions extends SpecialPage {
                        $target = $nt->getText();
                        $wgOut->setSubtitle( $this->contributionsSub( $nt, $id ) );
                        $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsgExt( 'contributions-title', array( 'parsemag' ),$target ) ) );
+                       $user = User::newFromName( $target, false );
+                       if ( is_object($user) ) {
+                               $wgUser->getSkin()->setRelevantUser( $user );
+                       }
                } else {
                        $wgOut->setSubtitle( wfMsgHtml( 'sp-contributions-newbies-sub') );
                        $wgOut->setHTMLTitle( wfMsg( 'pagetitle', wfMsg( 'sp-contributions-newbies-title' ) ) );
@@ -135,6 +146,7 @@ class SpecialContributions extends SpecialPage {
                                        '<p>' . $pager->getNavigationBar() . '</p>'
                                );
                        }
+                       $wgOut->preventClickjacking( $pager->getPreventClickjacking() );
 
 
                        # Show the appropriate "footer" message - WHOIS tools, etc.
@@ -150,8 +162,7 @@ class SpecialContributions extends SpecialPage {
                                        }
                                }
 
-                               $text = wfMsgNoTrans( $message, $target );
-                               if( !wfEmptyMsg( $message, $text ) && $text != '-' ) {
+                               if( !wfMessage( $message, $target )->isDisabled() ) {
                                        $wgOut->wrapWikiMsg(
                                                "<div class='mw-contributions-footer'>\n$1\n</div>",
                                                array( $message, $target ) );
@@ -174,7 +185,7 @@ class SpecialContributions extends SpecialPage {
         * @todo Fixme: almost the same as getSubTitle in SpecialDeletedContributions.php. Could be combined.
         */
        protected function contributionsSub( $nt, $id ) {
-               global $wgSysopUserBans, $wgLang, $wgUser, $wgOut;
+               global $wgLang, $wgUser, $wgOut;
 
                $sk = $wgUser->getSkin();
 
@@ -186,70 +197,7 @@ class SpecialContributions extends SpecialPage {
                $userObj = User::newFromName( $nt->getText(), /* check for username validity not needed */ false );
                $talk = $nt->getTalkPage();
                if( $talk ) {
-                       # Talk page link
-                       $tools[] = $sk->link( $talk, wfMsgHtml( 'sp-contributions-talk' ) );
-                       if( ( $id !== null && $wgSysopUserBans ) || ( $id === null && IP::isIPAddress( $nt->getText() ) ) ) {
-                               if( $wgUser->isAllowed( 'block' ) ) { # Block / Change block / Unblock links
-                                       if ( $userObj->isBlocked() ) {
-                                               $tools[] = $sk->linkKnown( # Change block link
-                                                       SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ),
-                                                       wfMsgHtml( 'change-blocklink' )
-                                               );
-                                               $tools[] = $sk->linkKnown( # Unblock link
-                                                       SpecialPage::getTitleFor( 'Ipblocklist' ),
-                                                       wfMsgHtml( 'unblocklink' ),
-                                                       array(),
-                                                       array(
-                                                               'action' => 'unblock',
-                                                               'ip' => $nt->getDBkey()
-                                                       )
-                                               );
-                                       }
-                                       else { # User is not blocked
-                                               $tools[] = $sk->linkKnown( # Block link
-                                                       SpecialPage::getTitleFor( 'Blockip', $nt->getDBkey() ),
-                                                       wfMsgHtml( 'blocklink' )
-                                               );
-                                       }
-                               }
-                               # Block log link
-                               $tools[] = $sk->linkKnown(
-                                       SpecialPage::getTitleFor( 'Log' ),
-                                       wfMsgHtml( 'sp-contributions-blocklog' ),
-                                       array(),
-                                       array(
-                                               'type' => 'block',
-                                               'page' => $nt->getPrefixedText()
-                                       )
-                               );
-                       }
-                       # Other logs link
-                       $tools[] = $sk->linkKnown(
-                               SpecialPage::getTitleFor( 'Log' ),
-                               wfMsgHtml( 'sp-contributions-logs' ),
-                               array(),
-                               array( 'user' => $nt->getText() )
-                       );
-
-                       # Add link to deleted user contributions for priviledged users
-                       if( $wgUser->isAllowed( 'deletedhistory' ) ) {
-                               $tools[] = $sk->linkKnown(
-                                       SpecialPage::getTitleFor( 'DeletedContributions', $nt->getDBkey() ),
-                                       wfMsgHtml( 'sp-contributions-deleted' )
-                               );
-                       }
-
-                       # Add a link to change user rights for privileged users
-                       $userrightsPage = new UserrightsPage();
-                       if( $id !== null && $userrightsPage->userCanChangeRights( User::newFromId( $id ) ) ) {
-                               $tools[] = $sk->linkKnown(
-                                       SpecialPage::getTitleFor( 'Userrights', $nt->getDBkey() ),
-                                       wfMsgHtml( 'sp-contributions-userrights' )
-                               );
-                       }
-
-                       wfRunHooks( 'ContributionsToolLinks', array( $id, $nt, &$tools ) );
-
+                       $tools = self::getUserLinks( $nt, $talk, $userObj, $wgUser );
                        $links = $wgLang->pipeList( $tools );
 
                        // Show a note if the user is blocked and display the last block log entry.
@@ -278,13 +226,94 @@ class SpecialContributions extends SpecialPage {
                // 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' ) ) ) {
+               if( wfEmptyMsg( 'contribsub' ) ) {
                        return wfMsgHtml( 'contribsub2', $user, $links );
                } else {
                        return wfMsgHtml( 'contribsub', "$user ($links)" );
                }
        }
 
+       /**
+        * Links to different places.
+        * @param $userpage Title: Target user page
+        * @param $talkpage Title: Talk page
+        * @param $target User: Target user object
+        * @param $subject User: The viewing user ($wgUser is still checked in some cases, like userrights page!!)
+        */
+       public static function getUserLinks( Title $userpage, Title $talkpage, User $target, User $subject ) {
+
+               $sk = $subject->getSkin();
+               $id = $target->getId();
+               $username = $target->getName();
+
+               $tools[] = $sk->link( $talkpage, wfMsgHtml( 'sp-contributions-talk' ) );
+
+               if( ( $id !== null ) || ( $id === null && IP::isIPAddress( $username ) ) ) {
+                       if( $subject->isAllowed( 'block' ) ) { # Block / Change block / Unblock links
+                               if ( $target->isBlocked() ) {
+                                       $tools[] = $sk->linkKnown( # Change block link
+                                               SpecialPage::getTitleFor( 'Block', $username ),
+                                               wfMsgHtml( 'change-blocklink' )
+                                       );
+                                       $tools[] = $sk->linkKnown( # Unblock link
+                                               SpecialPage::getTitleFor( 'Unblock', $username ),
+                                               wfMsgHtml( 'unblocklink' )
+                                       );
+                               } else { # User is not blocked
+                                       $tools[] = $sk->linkKnown( # Block link
+                                               SpecialPage::getTitleFor( 'Block', $username ),
+                                               wfMsgHtml( 'blocklink' )
+                                       );
+                               }
+                       }
+                       # Block log link
+                       $tools[] = $sk->linkKnown(
+                               SpecialPage::getTitleFor( 'Log' ),
+                               wfMsgHtml( 'sp-contributions-blocklog' ),
+                               array(),
+                               array(
+                                       'type' => 'block',
+                                       'page' => $userpage->getPrefixedText()
+                               )
+                       );
+               }
+               # Uploads
+               $tools[] = $sk->linkKnown(
+                       SpecialPage::getTitleFor( 'Listfiles' ),
+                       wfMsgHtml( 'sp-contributions-uploads' ),
+                       array(),
+                       array( 'user' => $username )
+               );
+
+               # Other logs link
+               $tools[] = $sk->linkKnown(
+                       SpecialPage::getTitleFor( 'Log' ),
+                       wfMsgHtml( 'sp-contributions-logs' ),
+                       array(),
+                       array( 'user' => $username )
+               );
+
+               # Add link to deleted user contributions for priviledged users
+               if( $subject->isAllowed( 'deletedhistory' ) ) {
+                       $tools[] = $sk->linkKnown(
+                               SpecialPage::getTitleFor( 'DeletedContributions', $username ),
+                               wfMsgHtml( 'sp-contributions-deleted' )
+                       );
+               }
+
+               # Add a link to change user rights for privileged users
+               $userrightsPage = new UserrightsPage();
+               if( $id !== null && $userrightsPage->userCanChangeRights( $target ) ) {
+                       $tools[] = $sk->linkKnown(
+                               SpecialPage::getTitleFor( 'Userrights', $username ),
+                               wfMsgHtml( 'sp-contributions-userrights' )
+                       );
+               }
+
+               wfRunHooks( 'ContributionsToolLinks', array( $id, $userpage, &$tools ) );
+               return $tools;
+       }
+
        /**
         * Generates the namespace selector form with hidden attributes.
         * @return String: HTML fragment
@@ -327,7 +356,7 @@ class SpecialContributions extends SpecialPage {
                        $this->opts['topOnly'] = false;
                }
 
-               $f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) );
+               $f = Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'class' => 'mw-contributions-form' ) );
 
                # Add hidden params for tracking except for parameters in $skipParameters
                $skipParameters = array( 'namespace', 'deletedOnly', 'target', 'contribs', 'year', 'month', 'topOnly' );
@@ -335,42 +364,38 @@ class SpecialContributions extends SpecialPage {
                        if( in_array( $name, $skipParameters ) ) {
                                continue;
                        }
-                       $f .= "\t" . Xml::hidden( $name, $value ) . "\n";
+                       $f .= "\t" . Html::hidden( $name, $value ) . "\n";
                }
 
                $tagFilter = ChangeTags::buildTagFilterSelector( $this->opts['tagFilter'] );
 
-               $f .= '<fieldset>' .
-                       Xml::element( 'legend', array(), wfMsg( 'sp-contributions-search' ) ) .
+               $f .=   Xml::fieldset( wfMsg( 'sp-contributions-search' ) ) .
                        Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parsemag' ) ),
-                               'contribs', 'newbie' , 'newbie', $this->opts['contribs'] == 'newbie' ? true : false ) . '<br />' .
+                               'contribs', 'newbie' , 'newbie', $this->opts['contribs'] == 'newbie' ) . '<br />' .
                        Xml::radioLabel( wfMsgExt( 'sp-contributions-username', array( 'parsemag' ) ),
-                               'contribs' , 'user', 'user', $this->opts['contribs'] == 'user' ? true : false ) . ' ' .
+                               'contribs' , 'user', 'user', $this->opts['contribs'] == 'user' ) . ' ' .
                        Html::input( 'target', $this->opts['target'], 'text', array(
                                'size' => '20',
                                'required' => ''
                        ) + ( $this->opts['target'] ? array() : array( 'autofocus' ) ) ) . ' '.
-                       '<span style="white-space: nowrap">' .
-                       Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' .
-                       Xml::namespaceSelector( $this->opts['namespace'], '' ) .
-                       '</span>' .
+                       Html::rawElement( 'span', array( 'style' => 'white-space: nowrap' ),
+                               Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' .
+                               Xml::namespaceSelector( $this->opts['namespace'], '' )
+                       ) .
                        Xml::checkLabel( wfMsg( 'history-show-deleted' ),
                                'deletedOnly', 'mw-show-deleted-only', $this->opts['deletedOnly'] ) . '<br />' .
                        Xml::tags( 'p', null, Xml::checkLabel( wfMsg( 'sp-contributions-toponly' ),
                                'topOnly', 'mw-show-top-only', $this->opts['topOnly'] ) ) .
                        ( $tagFilter ? Xml::tags( 'p', null, implode( '&#160;', $tagFilter ) ) : '' ) .
-                       Xml::openElement( 'p' ) .
-                       '<span style="white-space: nowrap">' .
-                       Xml::dateMenu( $this->opts['year'], $this->opts['month'] ) .
-                       '</span>' . ' ' .
-                       Xml::submitButton( wfMsg( 'sp-contributions-submit' ) ) .
-                       Xml::closeElement( 'p' );
-
+                       Html::rawElement( 'p', array( 'style' => 'white-space: nowrap' ),
+                               Xml::dateMenu( $this->opts['year'], $this->opts['month'] ) . ' ' .
+                               Xml::submitButton( wfMsg( 'sp-contributions-submit' ) )
+                       ) . ' ';
                $explain = wfMsgExt( 'sp-contributions-explain', 'parseinline' );
-               if( !wfEmptyMsg( 'sp-contributions-explain', $explain ) )
+               if( !wfEmptyMsg( 'sp-contributions-explain' ) ) {
                        $f .= "<p id='mw-sp-contributions-explain'>{$explain}</p>";
-
-               $f .= '</fieldset>' .
+               }
+               $f .= Xml::closeElement('fieldset' ) .
                        Xml::closeElement( 'form' );
                return $f;
        }
@@ -416,7 +441,7 @@ class SpecialContributions extends SpecialPage {
 
                $feed->outHeader();
                if( $pager->getNumRows() > 0 ) {
-                       while( $row = $pager->mResult->fetchObject() ) {
+                       foreach ( $pager->mResult as $row ) {
                                $feed->outItem( $this->feedItem( $row ) );
                        }
                }
@@ -424,10 +449,10 @@ class SpecialContributions extends SpecialPage {
        }
 
        protected function feedTitle() {
-               global $wgContLanguageCode, $wgSitename;
+               global $wgLanguageCode, $wgSitename;
                $page = SpecialPage::getPage( 'Contributions' );
                $desc = $page->getDescription();
-               return "$wgSitename - $desc [$wgContLanguageCode]";
+               return "$wgSitename - $desc [$wgLanguageCode]";
        }
 
        protected function feedItem( $row ) {
@@ -450,10 +475,18 @@ class SpecialContributions extends SpecialPage {
                }
        }
 
+       /**
+        * @param $revision Revision
+        * @return string
+        */
        protected function feedItemAuthor( $revision ) {
                return $revision->getUserText();
        }
 
+       /**
+        * @param $revision Revision
+        * @return string
+        */
        protected function feedItemDesc( $revision ) {
                if( $revision ) {
                        return '<p>' . htmlspecialchars( $revision->getUserText() ) . wfMsgForContent( 'colon-separator' ) .
@@ -473,6 +506,7 @@ class ContribsPager extends ReverseChronologicalPager {
        public $mDefaultDirection = true;
        var $messages, $target;
        var $namespace = '', $mDb;
+       var $preventClickjacking = false;
 
        function __construct( $options ) {
                parent::__construct();
@@ -606,7 +640,6 @@ class ContribsPager extends ReverseChronologicalPager {
                $classes = array();
 
                $page = Title::newFromRow( $row );
-               $page->resetArticleId( $row->rev_page ); // use process cache
                $link = $sk->link(
                        $page,
                        htmlspecialchars( $page->getPrefixedText() ),
@@ -614,13 +647,14 @@ class ContribsPager extends ReverseChronologicalPager {
                        $page->isRedirect() ? array( 'redirect' => 'no' ) : array()
                );
                # Mark current revisions
-               $difftext = $topmarktext = '';
+               $topmarktext = '';
                if( $row->rev_id == $row->page_latest ) {
                        $topmarktext .= '<span class="mw-uctop">' . $this->messages['uctop'] . '</span>';
                        # Add rollback link
                        if( !$row->page_is_new && $page->quickUserCan( 'rollback' )
                                && $page->quickUserCan( 'edit' ) )
                        {
+                               $this->preventClickjacking();
                                $topmarktext .= ' '.$sk->generateRollback( $rev );
                        }
                }
@@ -655,7 +689,7 @@ class ContribsPager extends ReverseChronologicalPager {
                                array( 'oldid' => intval( $row->rev_id ) )
                        );
                } else {
-                       $d = $date;
+                       $d = htmlspecialchars( $date );
                }
                if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
                        $d = '<span class="history-deleted">' . $d . '</span>';
@@ -741,4 +775,11 @@ class ContribsPager extends ReverseChronologicalPager {
                }
        }
 
+       protected function preventClickjacking() {
+               $this->preventClickjacking = true;
+       }
+
+       public function getPreventClickjacking() {
+               return $this->preventClickjacking;
+       }
 }