Changeset 3831

Timestamp:

02/28/11 16:33:32 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1565 - Resolvendo problema quando não há nada no campo to.

Location:

branches/2.2/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/draw_api.js (modified) (1 diff)

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

@@ -235 +235 @@
                 $to = $header->to;
                 $head_array['to'] = array();
-                $tmp = ( isset( $to[0]->personal ) ) ? imap_mime_header_decode($to[0]->personal) : NULL;
-                $head_array['to']['name'] = ( isset( $tmp[0]->text ) ) ? $this->decode_string($this->decode_string($tmp[0]->text)) : NULL;
-                $head_array['to']['email'] = ( isset( $to[0]->mailbox ) ) ? ( $this->decode_string($to[0]->mailbox) . "@" . ( ( isset( $to[0]->host ) ) ? $to[0]->host : '' ) ) : NULL;
-                if(!$head_array['to']['name'])
-                        $head_array['to']['name'] = $head_array['to']['email'];
+                if($to[1] && $to[1]->host == ".SYNTAX-ERROR.") { //E-mails que não possuem o campo "para", vêm com o recipiente preenchido, porém com um recipiente a mais alegando erro de sintaxe.
+                        $head_array['to']['name'] = $head_array['to']['email'] = NULL;
+                }
+                else {
+                        $tmp = ( isset( $to[0]->personal ) ) ? imap_mime_header_decode($to[0]->personal) : NULL;
+                        $head_array['to']['name'] = ( isset( $tmp[0]->text ) ) ? $this->decode_string($this->decode_string($tmp[0]->text)) : NULL;
+                        $head_array['to']['email'] = ( isset( $to[0]->mailbox ) ) ? ( $this->decode_string($to[0]->mailbox) . "@" . ( ( isset( $to[0]->host ) ) ? $to[0]->host : '' ) ) : NULL;
+                        if(!$head_array['to']['name'])
+                                $head_array['to']['name'] = $head_array['to']['email'];
+                }
                 $cc = $header->cc;
+                $cco = $header->bcc;
                 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'];
+                }
+                else if ( ($cco) && (!$head_array['to']['name']) ){
+                        $head_array['to']['name'] = ( isset( $cco[0]->personal ) ) ? $this->decode_string($cco[0]->personal) : NULL;
+                        $head_array['to']['email'] = $this->decode_string($cco[0]->mailbox) . "@" . $cco[0]->host;
                         if(!$head_array['to']['name'])
                                 $head_array['to']['name'] = $head_array['from']['email'];

branches/2.2/expressoMail1_2/js/draw_api.js

@@ -1002 +1002 @@
                                 if(headers_msgs.to.email != null && headers_msgs.to.email.toLowerCase() != Element("user_email").value)
                                         td_element24.innerHTML = "<img valign='center' src ='templates/"+template+"/images/sent.gif' title='"+get_lang('Sent')+"'>";
-
-                                if ((headers_msgs.to)&&(headers_msgs.to.name != null))
-                                        td_element3.innerHTML += headers_msgs.to.name;
-                                else if (headers_msgs.to){
-                                        td_element3.innerHTML += headers_msgs.to.email;
+                                
+                                if (headers_msgs.to) {
+                                        if (headers_msgs.to.name != null)
+                                                td_element3.innerHTML += headers_msgs.to.name;
+                                        else if(headers_msgs.to.email != null) {
+                                                td_element3.innerHTML += headers_msgs.to.email;
+                                        }
+                                        else {
+                                                td_element3.innerHTML += get_lang("without destination");
+                                        }
                                 }
                         }