Changeset 3777

Timestamp:

02/17/11 15:21:40 (12 years ago)

Author:

diegomoreno

Message:

Ticket #1528 - expressoMail1_2 - Ajuste exibindo corretamente o 'from' quando envio com copia.

File:

• branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (2 diffs)

branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -240 +240 @@
                 if(!$head_array['to']['name'])
                         $head_array['to']['name'] = $head_array['to']['email'];
+                $cc = $header->cc;
+                if ( ($cc) && (!$head_array['to']['name']) ){
+                        $head_array['to']['name'] = ( isset( $cc[0]->personal ) ) ? $this->decode_string($cc[0]->personal) : NULL;
+                        $head_array['to']['email'] = $this->decode_string($cc[0]->mailbox) . "@" . $cc[0]->host;
+                        if(!$head_array['to']['name'])
+                                $head_array['to']['name'] = $head_array['from']['email'];
+                }
                 $head_array['subject'] = ( isset( $header->fetchsubject ) ) ? $this->decode_string($header->fetchsubject) : '';
 
@@ -1634 +1641 @@
                         $return[$i]['to']['email'] = $to[0]->mailbox . "@" . $to[0]->host;
                         $return[$i]['to']['full'] ='"' . $return[$i]['to']['name'] . '" ' . '<' . $return[$i]['to']['email'] . '>';
-
+                        $cc = $header->cc;
+                        if ( ($cc) && (!$return[$i]['to']['name']) ){
+                                $return[$i]['to']['name'] =  $cc[0]->personal;
+                                $return[$i]['to']['email'] = $cc[0]->mailbox . "@" . $cc[0]->host;
+                        }
                         $return[$i]['subject'] = $this->decode_string($header->fetchsubject);