Changeset 5134 for trunk/expressoMail1_2/inc/class.dynamic_contacts.inc.php

Timestamp:

11/03/11 13:24:28 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoMail?.

File:

• trunk/expressoMail1_2/inc/class.dynamic_contacts.inc.php (modified) (5 diffs)

trunk/expressoMail1_2/inc/class.dynamic_contacts.inc.php

@@ -79 +79 @@
                         {
                                 foreach($this->contacts as $item => $valor)
-                                        $contact .= ';'.$this->contacts[$item]['email'] . ',';
+                                        $contact .= str_replace("#",";",$this->contacts[$item]['email']) . ',';
                                 //Retira ultima virgula.
                                 $contact = substr($contact,0,(strlen($contact) - 1));
@@ -106 +106 @@
                 {
                         // Trim all whitespaces and duplicated commas from full_email_address
-                        $full_email_address = preg_replace('{(,)\1+}',',',ereg_replace( ' +', '', $full_email_address));
+                        $full_email_address = preg_replace('{(,)\1+}',',',$full_email_address);
                         $parse_address = imap_rfc822_parse_adrlist($full_email_address, "");
                         $new_contacts = array();
@@ -118 +118 @@
                                 if(!$this->contacts) // Used one time to insert the first contact in database
                                 {
-                                        $this->db->insert_contact($val->mailbox."@".$val->host);
+                                        $this->db->insert_contact($val->personal."#".$val->mailbox."@".$val->host);
                                         // Just new contact added.
-                                        $new_contacts[] = $val->mailbox."@".$val->host;
+                                        $new_contacts[] = $val->personal.";".$val->mailbox."@".$val->host; 
                                         $this->contacts = $this->db->get_dynamic_contacts();
                                 }
@@ -129 +129 @@
                                         foreach($this->contacts as $item => $valor)
                                         {
-                                                if($this->contacts[$item]['email'] == $val->mailbox."@".$val->host) // check if email already exists
+                                                if($this->contacts[$item]['email'] == $val->personal."#".$val->mailbox."@".$val->host) // check if email already exists
                                                 {       
                                                         $this->contacts[$item]['timestamp'] = time(); //update timestamp of email
@@ -143 +143 @@
                                         {
                                                 // Just new contact added.
-                                                $new_contacts[] = $val->mailbox."@".$val->host;
+                                                $new_contacts[] = $val->personal.";".$val->mailbox."@".$val->host;
                                                 if($this->number_of_contacts > count($this->contacts))
                                                 {
                                                         $this->contacts[] = array( 'timestamp'  => time(),
-                                                                                                                'email'         => $val->mailbox."@".$val->host);
+                                                                                                                'email'         => $val->personal."#".$val->mailbox."@".$val->host);
                                                 }
                                                 if($this->number_of_contacts <= count($this->contacts))
                                                 {
                                                         $this->contacts[$older_contact] = array( 'timestamp'    => time(),
-                                                                                                                                                'email'         => $val->mailbox."@".$val->host);
+                                                                                                                                                'email'         => $val->personal."#".$val->mailbox."@".$val->host);
                                                 }
                                         }