USE INDEX -> DB::useIndexClause()

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

diff --git a/includes/SpecialEmailuser.php b/includes/SpecialEmailuser.php
index 2d9645d..860d25b 100644 (file)
--- a/includes/SpecialEmailuser.php
+++ b/includes/SpecialEmailuser.php
@@ -1,35 +1,56 @@
 <?php
-
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ *
+ */
 require_once('UserMailer.php');
 
-function wfSpecialEmailuser()
-{
-       global $wgUser, $wgOut, $wgRequest;
+function wfSpecialEmailuser( $par ) {
+       global $wgUser, $wgOut, $wgRequest, $wgEnableEmail, $wgEnableUserEmail;
 
+       if( !( $wgEnableEmail && $wgEnableUserEmail ) ) {
+               $wgOut->errorpage( "nosuchspecialpage", "nospecialpagetext" );
+               return;
+       }
+       
        if ( 0 == $wgUser->getID() ||
-               ( false === strpos( $wgUser->getEmail(), "@" ) ) ) {
+               ( !$wgUser->isValidEmailAddr( $wgUser->getEmail() ) ) ) {
                $wgOut->errorpage( "mailnologin", "mailnologintext" );
                return;
        }
+       
        $action = $wgRequest->getVal( 'action' );
-       $target = $wgRequest->getVal( 'target' );
+       if( empty( $par ) ) {
+               $target = $wgRequest->getVal( 'target' );
+       } else {
+               $target = $par;
+       }
        if ( "" == $target ) {
                $wgOut->errorpage( "notargettitle", "notargettext" );
                return;
        }
        $nt = Title::newFromURL( $target );
+       if ( is_null( $nt ) ) {
+               $wgOut->errorpage( "notargettitle", "notargettext" );
+               return;
+       }
        $nu = User::newFromName( $nt->getText() );
-       $id = $nu->idForName();
 
-       if ( 0 == $id ) {
+       if ( 0 == $nu->getID() ) {
                $wgOut->errorpage( "noemailtitle", "noemailtext" );
                return;
        }
-       $nu->setID( $id );
+
        $address = $nu->getEmail();
 
-       if ( ( false === strpos( $address, "@" ) ) ||
-         ( 1 == $nu->getOption( "disablemail" ) ) ) {
+       if ( ( !$nu->isValidEmailAddr( $address ) ) ||
+            ( 1 == $nu->getOption( "disablemail" ) ) ||
+            ( 0 == $nu->getEmailauthenticationtimestamp() ) ) {
                $wgOut->errorpage( "noemailtitle", "noemailtext" );
                return;
        }
@@ -41,14 +62,18 @@ function wfSpecialEmailuser()
        else { $f->showForm( "" ); }
 }
 
+/**
+ * @todo document
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
 class EmailUserForm {
 
        var $mAddress;
        var $target;
        var $text, $subject;
 
-       function EmailUserForm( $addr, $target )
-       {
+       function EmailUserForm( $addr, $target ) {
                global $wgRequest;
                $this->mAddress = $addr;
                $this->target = $target;
@@ -56,8 +81,7 @@ class EmailUserForm {
                $this->subject = $wgRequest->getText( 'wpSubject' );
        }
 
-       function showForm( $err )
-       {
+       function showForm( $err ) {
                global $wgOut, $wgUser, $wgLang;
 
                $wgOut->setPagetitle( wfMsg( "emailpage" ) );
@@ -81,55 +105,56 @@ class EmailUserForm {
 
                if ( "" != $err ) {
                        $wgOut->setSubtitle( wfMsg( "formerror" ) );
-                       $wgOut->addHTML( "<p><font color='red' size='+1'>{$err}</font>\n" );
+                       $wgOut->addHTML( "<p><font color='red' size='+1'>{$err}</font></p>\n" );
                }
-               $wgOut->addHTML( "<p>
+               $wgOut->addHTML( "
 <form id=\"emailuser\" method=\"post\" action=\"{$action}\">
-<table border=0><tr>
-<td align=right>{$emf}:</td>
-<td align=left><strong>{$sender}</strong></td>
+<table border='0'><tr>
+<td align='right'>{$emf}:</td>
+<td align='left'><strong>{$sender}</strong></td>
 </tr><tr>
-<td align=right>{$emt}:</td>
-<td align=left><strong>{$rcpt}</strong></td>
+<td align='right'>{$emt}:</td>
+<td align='left'><strong>{$rcpt}</strong></td>
 </tr><tr>
-<td align=right>{$emr}:</td>
-<td align=left>
-<input type=text name=\"wpSubject\" value=\"{$encSubject}\">
+<td align='right'>{$emr}:</td>
+<td align='left'>
+<input type='text' name=\"wpSubject\" value=\"{$encSubject}\" />
 </td>
 </tr><tr>
-<td align=right>{$emm}:</td>
-<td align=left>
-<textarea name=\"wpText\" rows=10 cols=60 wrap=virtual>
-{$this->text}
-</textarea>
+<td align='right'>{$emm}:</td>
+<td align='left'>
+<textarea name=\"wpText\" rows='10' cols='60' wrap='virtual'>" . htmlspecialchars( $this->text ) .
+"</textarea>
 </td></tr><tr>
-<td>&nbsp;</td><td align=left>
-<input type=submit name=\"wpSend\" value=\"{$ems}\">
+<td>&nbsp;</td><td align='left'>
+<input type='submit' name=\"wpSend\" value=\"{$ems}\" />
 </td></tr></table>
 </form>\n" );
 
        }
 
-       function doSubmit()
-       {
+       function doSubmit() {
                global $wgOut, $wgUser, $wgLang, $wgOutputEncoding;
            
                $from = wfQuotedPrintable( $wgUser->getName() ) . " <" . $wgUser->getEmail() . ">";
+               $subject = wfQuotedPrintable( $this->subject );
                
-               $mailResult = userMailer( $this->mAddress, $from, wfQuotedPrintable( $this->subject ), $this->text );
-
-               if (! $mailResult)
-               {
-                       $titleObj = Title::makeTitle( NS_SPECIAL, "Emailuser" );
-                       $encTarget = wfUrlencode( $this->target );
-                       $wgOut->redirect( $titleObj->getFullURL( "target={$encTarget}&action=success" ) );
+               if (wfRunHooks('EmailUser', $this->mAddress, $from, $subject, $this->text)) {
+                       
+                       $mailResult = userMailer( $this->mAddress, $from, $subject, $this->text );
+                       
+                       if (!$mailResult) {
+                               $titleObj = Title::makeTitle( NS_SPECIAL, "Emailuser" );
+                               $encTarget = wfUrlencode( $this->target );
+                               $wgOut->redirect( $titleObj->getFullURL( "target={$encTarget}&action=success" ) );
+                               wfRunHooks('EmailUserComplete', $this->mAddress, $from, $subject, $this->text);
+                       } else {
+                         $wgOut->addHTML( wfMsg( "usermailererror" ) . $mailResult);
+                       }
                }
-               else
-                       $wgOut->addHTML( wfMsg( "usermailererror" ) . $mailResult);
        }
 
-       function showSuccess()
-       {
+       function showSuccess() {
                global $wgOut, $wgUser;
 
                $wgOut->setPagetitle( wfMsg( "emailsent" ) );