Merge "Make 'subnet' feature of $wgRateLimits work with IPv6"

[lhc/web/wiklou.git] / includes / specials / SpecialConfirmemail.php

diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php
index 078c386..47808d1 100644 (file)
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -30,10 +30,6 @@
  * @author Rob Church <robchur@gmail.com>
  */
 class EmailConfirmation extends UnlistedSpecialPage {
-
-       /**
-        * Constructor
-        */
        public function __construct() {
                parent::__construct( 'Confirmemail' );
        }
@@ -41,16 +37,16 @@ class EmailConfirmation extends UnlistedSpecialPage {
        /**
         * Main execution point
         *
-        * @param $code Confirmation code passed to the page
+        * @param null|string $code Confirmation code passed to the page
         */
        function execute( $code ) {
                $this->setHeaders();
 
                $this->checkReadOnly();
 
-               if( $code === null || $code === '' ) {
-                       if( $this->getUser()->isLoggedIn() ) {
-                               if( Sanitizer::validateEmail( $this->getUser()->getEmail() ) ) {
+               if ( $code === null || $code === '' ) {
+                       if ( $this->getUser()->isLoggedIn() ) {
+                               if ( Sanitizer::validateEmail( $this->getUser()->getEmail() ) ) {
                                        $this->showRequestForm();
                                } else {
                                        $this->getOutput()->addWikiMsg( 'confirmemail_noemail' );
@@ -62,7 +58,9 @@ class EmailConfirmation extends UnlistedSpecialPage {
                                        array(),
                                        array( 'returnto' => $this->getTitle()->getPrefixedText() )
                                );
-                               $this->getOutput()->addHTML( $this->msg( 'confirmemail_needlogin' )->rawParams( $llink )->parse() );
+                               $this->getOutput()->addHTML(
+                                       $this->msg( 'confirmemail_needlogin' )->rawParams( $llink )->parse()
+                               );
                        }
                } else {
                        $this->attemptConfirm( $code );
@@ -75,7 +73,10 @@ class EmailConfirmation extends UnlistedSpecialPage {
        function showRequestForm() {
                $user = $this->getUser();
                $out = $this->getOutput();
-               if( $this->getRequest()->wasPosted() && $user->matchEditToken( $this->getRequest()->getText( 'token' ) ) ) {
+
+               if ( $this->getRequest()->wasPosted() &&
+                       $user->matchEditToken( $this->getRequest()->getText( 'token' ) )
+               ) {
                        $status = $user->sendConfirmationMail();
                        if ( $status->isGood() ) {
                                $out->addWikiMsg( 'confirmemail_sent' );
@@ -83,7 +84,7 @@ class EmailConfirmation extends UnlistedSpecialPage {
                                $out->addWikiText( $status->getWikiText( 'confirmemail_sendfailed' ) );
                        }
                } else {
-                       if( $user->isEmailConfirmed() ) {
+                       if ( $user->isEmailConfirmed() ) {
                                // date and time are separate parameters to facilitate localisation.
                                // $time is kept for backward compat reasons.
                                // 'emailauthenticated' is also used in SpecialPreferences.php
@@ -94,14 +95,22 @@ class EmailConfirmation extends UnlistedSpecialPage {
                                $t = $lang->userTime( $emailAuthenticated, $user );
                                $out->addWikiMsg( 'emailauthenticated', $time, $d, $t );
                        }
-                       if( $user->isEmailConfirmationPending() ) {
-                               $out->wrapWikiMsg( "<div class=\"error mw-confirmemail-pending\">\n$1\n</div>", 'confirmemail_pending' );
+
+                       if ( $user->isEmailConfirmationPending() ) {
+                               $out->wrapWikiMsg(
+                                       "<div class=\"error mw-confirmemail-pending\">\n$1\n</div>",
+                                       'confirmemail_pending'
+                               );
                        }
+
                        $out->addWikiMsg( 'confirmemail_text' );
-                       $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalUrl() ) );
-                       $form .= Html::hidden( 'token', $user->getEditToken() );
-                       $form .= Xml::submitButton( $this->msg( 'confirmemail_send' )->text() );
-                       $form .= Xml::closeElement( 'form' );
+                       $form = Html::openElement(
+                               'form',
+                               array( 'method' => 'post', 'action' => $this->getTitle()->getLocalURL() )
+                       ) . "\n";
+                       $form .= Html::hidden( 'token', $user->getEditToken() ) . "\n";
+                       $form .= Xml::submitButton( $this->msg( 'confirmemail_send' )->text() ) . "\n";
+                       $form .= Html::closeElement( 'form' ) . "\n";
                        $out->addHTML( $form );
                }
        }
@@ -114,20 +123,22 @@ class EmailConfirmation extends UnlistedSpecialPage {
         */
        function attemptConfirm( $code ) {
                $user = User::newFromConfirmationCode( $code );
-               if( is_object( $user ) ) {
-                       $user->confirmEmail();
-                       $user->saveSettings();
-                       $message = $this->getUser()->isLoggedIn() ? 'confirmemail_loggedin' : 'confirmemail_success';
-                       $this->getOutput()->addWikiMsg( $message );
-                       if( !$this->getUser()->isLoggedIn() ) {
-                               $title = SpecialPage::getTitleFor( 'Userlogin' );
-                               $this->getOutput()->returnToMain( true, $title );
-                       }
-               } else {
+               if ( !is_object( $user ) ) {
                        $this->getOutput()->addWikiMsg( 'confirmemail_invalid' );
+
+                       return;
                }
-       }
 
+               $user->confirmEmail();
+               $user->saveSettings();
+               $message = $this->getUser()->isLoggedIn() ? 'confirmemail_loggedin' : 'confirmemail_success';
+               $this->getOutput()->addWikiMsg( $message );
+
+               if ( !$this->getUser()->isLoggedIn() ) {
+                       $title = SpecialPage::getTitleFor( 'Userlogin' );
+                       $this->getOutput()->returnToMain( true, $title );
+               }
+       }
 }
 
 /**
@@ -137,16 +148,13 @@ class EmailConfirmation extends UnlistedSpecialPage {
  * @ingroup SpecialPage
  */
 class EmailInvalidation extends UnlistedSpecialPage {
-
        public function __construct() {
                parent::__construct( 'Invalidateemail' );
        }
 
        function execute( $code ) {
                $this->setHeaders();
-
                $this->checkReadOnly();
-
                $this->attemptInvalidate( $code );
        }
 
@@ -158,15 +166,18 @@ class EmailInvalidation extends UnlistedSpecialPage {
         */
        function attemptInvalidate( $code ) {
                $user = User::newFromConfirmationCode( $code );
-               if( is_object( $user ) ) {
-                       $user->invalidateEmail();
-                       $user->saveSettings();
-                       $this->getOutput()->addWikiMsg( 'confirmemail_invalidated' );
-                       if( !$this->getUser()->isLoggedIn() ) {
-                               $this->getOutput()->returnToMain();
-                       }
-               } else {
+               if ( !is_object( $user ) ) {
                        $this->getOutput()->addWikiMsg( 'confirmemail_invalid' );
+
+                       return;
+               }
+
+               $user->invalidateEmail();
+               $user->saveSettings();
+               $this->getOutput()->addWikiMsg( 'confirmemail_invalidated' );
+
+               if ( !$this->getUser()->isLoggedIn() ) {
+                       $this->getOutput()->returnToMain();
                }
        }
 }