Changeset 426 for trunk/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

09/12/08 17:02:14 (16 years ago)

Author:

niltonneto

Message:

http://www.expressolivre.org/dev/ticket/326

Incluir o campo CCo na cópia da mensagem enviada.

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (4 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -326 +326 @@
                         $return['cc'] = "";
                 }       
-                
+
+                ##
+                # @AUTHOR Rodrigo Souza dos Santos
+                # @DATE 2008/09/12
+                # @BRIEF Adding the BCC field.
+                ##
+                $bcc = $header->bcc;
+                $return['bcc'] = "";
+                if (!empty($bcc))
+                {
+                        foreach ($bcc as $tmp_bcc)
+                        {
+                                if (!empty($tmp_bcc->personal))
+                                {
+                                        $personal_tmp_bcc = imap_mime_header_decode($tmp_bcc->personal);
+                                        $return['bcc'] .= '"' . $personal_tmp_bcc[0]->text . '"';
+                                        $return['bcc'] .= " ";
+                                        $return['bcc'] .= "<";
+                                        $return['bcc'] .= $tmp_bcc->mailbox . "@" . $tmp_bcc->host;
+                                        $return['bcc'] .= ">";
+                                        $return['bcc'] .= ", ";
+                                }
+                                else
+                                {
+                                        $return['bcc'] .= $tmp_bcc->mailbox . "@" . $tmp_bcc->host;
+                                        $return['bcc'] .= ", ";
+                                }
+                        }
+                        $return['bcc'] = $this->del_last_two_caracters($return['bcc']);
+                }
+                else
+                {
+                        $return['bcc'] = "";
+                }       
+
                 $reply_to = $header->reply_to;
                 $return['reply_to'] = "";
@@ -1304 +1338 @@
                 $fileContent = imap_fetchbody($mbox_stream, $msg_number, $msg_part, FT_UID);            
                 if($encoding == 'base64')
-                        $fileContent = imap_base64($fileContent);
+                        # The function imap_base64 adds a new line
+                        # at ASCII text, with CRLF line terminators.
+                        # So is being exchanged for base64_decode.
+                        #
+                        #$fileContent = imap_base64($fileContent);
+                        $fileContent = base64_decode($fileContent);
                 else if($encoding == 'quoted-printable')
                         $fileContent = quoted_printable_decode($fileContent);                           
@@ -1962 +2001 @@
                 $toaddress = $params['notificationto'];
                 
-                $subject = 'Confirmação de leitura: ' . $params['subject'];
+                $subject = 'Confirmaￜￜo de leitura: ' . $params['subject'];
                 $body = 'Sua mensagem: ' . $params['subject'] . '<br>';
                 $body .= 'foi lida por: ' . $_SESSION['phpgw_info']['expressomail']['user']['fullname'] . ' &lt;' . $_SESSION['phpgw_info']['expressomail']['user']['email'] . '&gt; em ' . date("d/m/Y H:i");
@@ -2109 +2148 @@
         function remove_accents($string) {
                 return strtr($string, 
-                "?Ó??ó?Ý?úÁÀÃÂÄÇÉÈÊËÍÌ?ÎÏÑÕÔÓÒÖÚÙ?ÛÜ?áàãâäçéèêëíì?îïñóòõôöúù?ûüýÿ", 
+                "?ￜ??ￜ?ￜ?ￜￜￜￜￜￜￜￜￜￜￜￜￜ?ￜￜￜￜￜￜￜￜￜￜ?ￜￜ?ￜￜￜￜￜￜￜￜￜￜￜￜ?ￜￜￜￜￜￜￜￜￜￜ?ￜￜￜￜ", 
                 "SOZsozYYuAAAAACEEEEIIIIINOOOOOUUUUUsaaaaaceeeeiiiiinooooouuuuuyy");
         }