Changeset 5805

Timestamp:

03/23/12 17:15:38 (12 years ago)

Author:

eduardow

Message:

Ticket #1948 - implementação de validação de caracteres de e-mail

File:

• trunk/expressoMail1_2/inc/class.db_functions.inc.php (modified) (3 diffs)

trunk/expressoMail1_2/inc/class.db_functions.inc.php

@@ -188 +188 @@
 
                         if(preg_replace('/\s+/', '', $array_addrs[$i]) != ""){
+
                                 if(strchr($array_addrs[$i],'@') == "") {                
                                         if(strpos($array_addrs[$i],'<') && strpos($array_addrs[$i],'>')){
                                                 $alias = substr($array_addrs[$i], strpos($array_addrs[$i],'<'), strpos($array_addrs[$i],'>'));
                                                 $alias = str_replace('<','', str_replace('>','',$alias));
+
                                         }
                                         else{
@@ -197 +199 @@
                                                 $alias = preg_replace('/\s/', '', $alias);
                                         }       
+
                                         $arrayContacts = $this -> getContactsByGroupAlias($alias);
+
 
                                         if($arrayContacts) {
@@ -213 +217 @@
                                         }
                                 }
+//-- validação email --
                                 else{
-                                        $array_addrs_final[$j] = $array_addrs[$i]; 
+                                        preg_match('/<([^>]+)>/', $array_addrs[$i], $match);
+                                        if(count($match) == 2){
+                                        $ex_arr = explode('@', $match[1]);
+                                        }else{
+                                         $ex_arr = explode('@', $array_addrs[$i]);
+                                         }
+                                        if(count($ex_arr) == 2){
+                                                if($ex_arr[0] !== '' && $ex_arr[1] !== ''){
+                                                        if(preg_match("/[^0-9a-zA-Z._-]+/", $ex_arr[0]) == 0 && preg_match("/[^0-9a-zA-Z._-]+/", $ex_arr[1]) == 0){
+                                                                $array_addrs_final[$j] = $array_addrs[$i];
+                                                        }else{
+                                                                return array("False" => "$alias");
+                                                         }
+                                                }else{
+                                                        return array("False" => "$alias");
+                                                 }
+                                        }else{
+                                                return array("False" => "$alias");
+                                         }
                                 }
+//-- fim --
                         }else{
                                 $array_addrs_final[$j] = $array_addrs[$i];