Changeset 2938 for branches

Timestamp:

06/17/10 09:49:54 (14 years ago)

Author:

amuller

Message:

Ticket #818 - Remove a validação equívocada

File:

• branches/2.0/expressoMail1_2/inc/class.phpmailer.php (modified) (2 diffs)

branches/2.0/expressoMail1_2/inc/class.phpmailer.php

@@ -525 +525 @@
         for($i = 0; $i < count($this->to); $i++)
         {
-            if($this->valEm($this->to[$i][0]))
-            {
-                if(!$this->smtp->Recipient($this->to[$i][0]))  $bad_rcpt[] = $this->to[$i][0];
-            }
-            else
-            {
-                $errorx .= $this->to[$i][0] . ', ';
-            }
+                if(!$this->smtp->Recipient($this->to[$i][0]))
+                        $bad_rcpt[] = $this->to[$i][0];
         }
         for($i = 0; $i < count($this->cc); $i++)
         {
-            if($this->valEm($this->cc[$i][0]))
-            {
-                if(!$this->smtp->Recipient($this->cc[$i][0])) $bad_rcpt[] = $this->cc[$i][0];
-            }
-                        else
-            {
-                $errorx .= $this->cc[$i][0] . ', ';
-            }
+                if(!$this->smtp->Recipient($this->cc[$i][0]))
+                        $bad_rcpt[] = $this->cc[$i][0];
         }
         for($i = 0; $i < count($this->bcc); $i++)
         {
-            if($this->valEm($this->bcc[$i][0]))
-            {
-                if(!$this->smtp->Recipient($this->bcc[$i][0])) $bad_rcpt[] = $this->bcc[$i][0];
-            }
-                        else
-            {
-                $errorx .= $this->bcc[$i][0] . ', ';
-            }
+                if(!$this->smtp->Recipient($this->bcc[$i][0]))
+                        $bad_rcpt[] = $this->bcc[$i][0];      
         }
         if($errorx != '')
@@ -726 +708 @@
         
         return $smtpSent;
-    }
-
-    function valEm($email)
-    {
-        $mail_retorno = FALSE;
-        if ((strlen($email) >= 6) && (substr_count($email,"@") == 1) && (substr($email,0,1) != "@") && (substr($email,strlen($email)-1,1) != "@"))
-        {
-            if ((!strstr($email,"'")) && (!strstr($email,"\"")) && (!strstr($email,"\\")) && (!strstr($email,"\$")) && (!strstr($email," ")))
-            {
-                //testa se tem caracter .
-                if (substr_count($email,".")>= 1)
-                {
-                    //obtem a terminação do dominio
-                    $term_dom = substr(strrchr ($email, '.'),1);
-                    //verifica se terminação do dominio esta correcta
-                    if (strlen($term_dom)>1 && strlen($term_dom)<5 && (!strstr($term_dom,"@")) )
-                    {
-                        $antes_dom = substr($email,0,strlen($email) - strlen($term_dom) - 1);
-                        $caracter_ult = substr($antes_dom,strlen($antes_dom)-1,1);
-                        if ($caracter_ult != "@" && $caracter_ult != ".")
-                        {
-                            $mail_retorno = TRUE;
-                        }
-                    }
-                }
-            }
-        }
-        return $mail_retorno;
     }