Changeset 1413 in ExiteCMS

Timestamp:

05/18/08 01:04:57 (4 years ago)

Author:

hverton

Message:

Fixed check for a valid email address by defining a CheckRecipient() function, which checks not only the SMTP return code, but also the message returned (to capture p.e. greylisting).

Location:

trunk

Files:

• edit_profile.php (modified) (1 diff)
• includes/smtp_include.php (modified) (3 diffs)
• register.php (modified) (1 diff)

trunk/edit_profile.php

@@ -96 +96 @@
                                 $error .= sprintf($locale['489'], $email_domain)."<br><br>\n";
                             } else {
-                                if (!$mail->Recipient($email)) {
+                                if (!$mail->CheckRecipient($email)) {
                                     // mail server doesn't respond to RCPT TO message
                                     $error .= sprintf($locale['490'], $email, $mailhost)."<br><br>\n";

trunk/includes/smtp_include.php

@@ -714 +714 @@
      * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
      *
-     * SMTP CODE SUCCESS: 250,251,450("greylisted")
+     * SMTP CODE SUCCESS: 250,251
      * SMTP CODE FAILURE: 550,551,552,553,450,451,452
      * SMTP CODE ERROR  : 500,501,503,421
@@ -738 +738 @@
         }
 
-        if($code != 250 && $code != 251 && ($code == 450 && strpos(strtolower($reply), "greylist")===false)) {
+        if($code != 250 && $code != 251) {
             $this->error =
                 array("error" => "RCPT not accepted from server",
@@ -750 +750 @@
         }
         return true;
+    }
+
+    /**
+     * Sends the command RCPT to the SMTP server with the TO: argument of $to.
+     * Returns true if the recipient was accepted false if it was rejected.
+     *
+     * Implements some extra SUCCESS codes, based on the reply text
+     *
+     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
+     *
+     * SMTP CODE SUCCESS: 250,251
+     * SMTP CODE SUCCESS: 450 ("%greylist%")
+     * SMTP CODE FAILURE: 550,551,552,553,450,451,452
+     * SMTP CODE ERROR  : 500,501,503,421
+     * @access public
+     * @return bool
+     */
+    function CheckRecipient($to) {
+        $this->error = null; # so no confusion is caused
+
+        if(!$this->connected()) {
+            $this->error = array(
+                    "error" => "Called Recipient() without being connected");
+            return false;
+        }
+
+        fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
+
+        $rply = $this->get_lines();
+        $code = substr($rply,0,3);
+
+        if($this->do_debug >= 2) {
+            echo "SMTP -> FROM SERVER:" . $this->CRLF . $rply;
+        }
+
+        // standard success codes
+        if($code == 250 || $code == 251) {
+            return true;
+        }
+
+        // ESMTP Postfix greylist filter
+        if($code == 450 && strpos(strtolower($reply), "greylisted")===false) {
+            return true;
+        }
+
+        $this->error =
+            array("error" => "RCPT not accepted from server",
+                  "smtp_code" => $code,
+                  "smtp_msg" => substr($rply,4));
+        if($this->do_debug >= 1) {
+            echo "SMTP -> ERROR: " . $this->error["error"] .
+                     ": " . $rply . $this->CRLF;
+        }
+        return false;
     }
 

trunk/register.php

@@ -99 +99 @@
                         $error .= sprintf($locale['413'], $email_domain)."<br /><br />\n";
                     } else {
-                        if (!$mail->Recipient($email)) {
+                        if (!$mail->CheckRecipient($email)) {
                             // mail server doesn't respond to RCPT TO message
                             $error .= sprintf($locale['414'], $email, $mailhost)."<br /><br />\n";