* Fixed unclosed <p> tag

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

diff --git a/includes/SpecialEmailuser.php b/includes/SpecialEmailuser.php
index 577a8e9..2e667d5 100644 (file)
--- a/includes/SpecialEmailuser.php
+++ b/includes/SpecialEmailuser.php
@@ -18,43 +18,35 @@ function wfSpecialEmailuser( $par ) {
                return;
        }
        
-       if ( $wgUser->isAnon() ||
-               ( !$wgUser->isValidEmailAddr( $wgUser->getEmail() ) ) ) {
+       if( !$wgUser->canSendEmail() ) {
+               wfDebug( "User can't send.\n" );
                $wgOut->errorpage( "mailnologin", "mailnologintext" );
                return;
        }
        
        $action = $wgRequest->getVal( 'action' );
-       if( empty( $par ) ) {
-               $target = $wgRequest->getVal( 'target' );
-       } else {
-               $target = $par;
-       }
+       $target = isset($par) ? $par : $wgRequest->getVal( 'target' );
        if ( "" == $target ) {
+               wfDebug( "Target is empty.\n" );
                $wgOut->errorpage( "notargettitle", "notargettext" );
                return;
        }
+       
        $nt = Title::newFromURL( $target );
        if ( is_null( $nt ) ) {
+               wfDebug( "Target is invalid title.\n" );
                $wgOut->errorpage( "notargettitle", "notargettext" );
                return;
        }
+       
        $nu = User::newFromName( $nt->getText() );
-
-       if ( 0 == $nu->getID() ) {
+       if( is_null( $nu ) || !$nu->canReceiveEmail() ) {
+               wfDebug( "Target is invalid user or can't receive.\n" );
                $wgOut->errorpage( "noemailtitle", "noemailtext" );
                return;
        }
 
        $address = $nu->getEmail();
-
-       if ( ( !$nu->isValidEmailAddr( $address ) ) ||
-            ( 1 == $nu->getOption( "disablemail" ) ) ||
-            ( 0 == $nu->getEmailauthenticationtimestamp() ) ) {
-               $wgOut->errorpage( "noemailtitle", "noemailtext" );
-               return;
-       }
-
        $f = new EmailUserForm( $nu->getName() . " <{$address}>", $target );
 
        if ( "success" == $action ) {
@@ -147,13 +139,13 @@ class EmailUserForm {
                        
                        $mailResult = userMailer( $this->mAddress, $from, $subject, $this->text );
                        
-                       if (!$mailResult) {
+                       if( WikiError::isError( $mailResult ) ) {
+                               $wgOut->addHTML( wfMsg( "usermailererror" ) . $mailResult);
+                       } else {
                                $titleObj = Title::makeTitle( NS_SPECIAL, "Emailuser" );
                                $encTarget = wfUrlencode( $this->target );
                                $wgOut->redirect( $titleObj->getFullURL( "target={$encTarget}&action=success" ) );
                                wfRunHooks('EmailUserComplete', array($this->mAddress, $from, $subject, $this->text));
-                       } else {
-                         $wgOut->addHTML( wfMsg( "usermailererror" ) . $mailResult);
                        }
                }
        }