Remove dismiss from deletion log. This simply doesn't make sense to me, nor does...

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

diff --git a/includes/SpecialConfirmemail.php b/includes/SpecialConfirmemail.php
index d38eefa..8d1c3a7 100644 (file)
--- a/includes/SpecialConfirmemail.php
+++ b/includes/SpecialConfirmemail.php
@@ -4,22 +4,18 @@
  * Special page allows users to request email confirmation message, and handles
  * processing of the confirmation code when the link in the email is followed
  *
- * @package MediaWiki
- * @subpackage Special pages
+ * @addtogroup SpecialPage
+ * @author Brion Vibber
  * @author Rob Church <robchur@gmail.com>
  */
- 
-/**
- * Main execution point
- *
- * @param $par Parameters passed to the page
- */
-function wfSpecialConfirmemail( $par ) {
-       $form = new EmailConfirmation();
-       $form->execute( $par );
-}
-
-class EmailConfirmation extends SpecialPage {
+class EmailConfirmation extends UnlistedSpecialPage {
+       
+       /**
+        * Constructor
+        */
+       public function __construct() {
+               parent::__construct( 'Confirmemail' );
+       }
        
        /**
         * Main execution point
@@ -28,12 +24,17 @@ class EmailConfirmation extends SpecialPage {
         */
        function execute( $code ) {
                global $wgUser, $wgOut;
+               $this->setHeaders();
                if( empty( $code ) ) {
                        if( $wgUser->isLoggedIn() ) {
-                               $this->showRequestForm();
+                               if( User::isValidEmailAddr( $wgUser->getEmail() ) ) {
+                                       $this->showRequestForm();
+                               } else {
+                                       $wgOut->addWikiText( wfMsg( 'confirmemail_noemail' ) );
+                               }
                        } else {
-                               $title = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
-                               $self = Title::makeTitle( NS_SPECIAL, 'Confirmemail' );
+                               $title = SpecialPage::getTitleFor( 'Userlogin' );
+                               $self = SpecialPage::getTitleFor( 'Confirmemail' );
                                $skin = $wgUser->getSkin();
                                $llink = $skin->makeKnownLinkObj( $title, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $self->getPrefixedUrl() );
                                $wgOut->addHtml( wfMsgWikiHtml( 'confirmemail_needlogin', $llink ) );
@@ -49,15 +50,22 @@ class EmailConfirmation extends SpecialPage {
        function showRequestForm() {
                global $wgOut, $wgUser, $wgLang, $wgRequest;
                if( $wgRequest->wasPosted() && $wgUser->matchEditToken( $wgRequest->getText( 'token' ) ) ) {
-                       $message = $wgUser->sendConfirmationMail() ? 'confirmemail_sent' : 'confirmemail_sendfailed';
-                       $wgOut->addWikiText( wfMsg( $message ) );
+                       $ok = $wgUser->sendConfirmationMail();
+                       if ( WikiError::isError( $ok ) ) {
+                               $wgOut->addWikiText( wfMsg( 'confirmemail_sendfailed', $ok->toString() ) );
+                       } else {
+                               $wgOut->addWikiText( wfMsg( 'confirmemail_sent' ) );
+                       }
                } else {
                        if( $wgUser->isEmailConfirmed() ) {
                                $time = $wgLang->timeAndDate( $wgUser->mEmailAuthenticated, true );
                                $wgOut->addWikiText( wfMsg( 'emailauthenticated', $time ) );
                        }
+                       if( $wgUser->isEmailConfirmationPending() ) {
+                               $wgOut->addWikiText( wfMsg( 'confirmemail_pending' ) );
+                       }
                        $wgOut->addWikiText( wfMsg( 'confirmemail_text' ) );
-                       $self = Title::makeTitle( NS_SPECIAL, 'Confirmemail' );         
+                       $self = SpecialPage::getTitleFor( 'Confirmemail' );             
                        $form  = wfOpenElement( 'form', array( 'method' => 'post', 'action' => $self->getLocalUrl() ) );
                        $form .= wfHidden( 'token', $wgUser->editToken() );
                        $form .= wfSubmitButton( wfMsgHtml( 'confirmemail_send' ) );
@@ -80,14 +88,14 @@ class EmailConfirmation extends SpecialPage {
                                $message = $wgUser->isLoggedIn() ? 'confirmemail_loggedin' : 'confirmemail_success';
                                $wgOut->addWikiText( wfMsg( $message ) );
                                if( !$wgUser->isLoggedIn() ) {
-                                       $title = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
+                                       $title = SpecialPage::getTitleFor( 'Userlogin' );
                                        $wgOut->returnToMain( true, $title->getPrefixedText() );
                                }
                        } else {
-                               $wgOut->addWikiText( 'confirmemail_error' );
+                               $wgOut->addWikiText( wfMsg( 'confirmemail_error' ) );
                        }
                } else {
-                       $wgOut->addWikiText( 'confirmemail_invalid' );
+                       $wgOut->addWikiText( wfMsg( 'confirmemail_invalid' ) );
                }
        }