Changeset 7286 for trunk

Timestamp:

09/24/12 14:55:43 (12 years ago)

Author:

douglasz

Message:

Ticket #3127 - Mensagens criadas pelo Expresso com inconsistência no Outlook.

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (3 diffs)
• js/main.js (modified) (2 diffs)

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

@@ -2658 +2658 @@
             $fromaddress = $params['input_from'] ? explode(';', $params['input_from']) : "";
             $message_attachments_contents = (isset($params['message_attachments_content'])) ? $params['message_attachments_content'] : false;
-
+                        
             ##
             # @AUTHOR Rodrigo Souza dos Santos
@@ -2673 +2673 @@
                     return "The server denied your request to send a mail, you cannot use this mail address.";
             }
-
 
             if (substr($params['input_to'], -1) == ',')
@@ -2887 +2886 @@
             }
 
-
-            if ($fromaddress)
-                $mailService->setFrom('"' . $fromaddress[0] . '" <' . $fromaddress[1] . '>');
-            else
-                $mailService->setFrom('"' . $_SESSION['phpgw_info']['expressomail']['user']['firstname'] . ' ' . $_SESSION['phpgw_info']['expressomail']['user']['lastname'] . '" <' . $_SESSION['phpgw_info']['expressomail']['user']['email'] . '>');
-            
-            $mailService->addHeaderField('Reply-To', $replytoaddress);
+                        $from = $fromaddress ?  ('"' . $fromaddress[0] . '" <' . $fromaddress[1] . '>') : ('"' . $_SESSION['phpgw_info']['expressomail']['user']['firstname'] . ' ' . $_SESSION['phpgw_info']['expressomail']['user']['lastname'] . '" <' . $_SESSION['phpgw_info']['expressomail']['user']['email'] . '>');
+                        $mailService->setFrom($from);                           
+        
+                        $mailService->addHeaderField('Reply-To', !!$replytoaddress ? $replytoaddress : $from);
 
             $bol = $this->add_recipients('to', $toaddress, $mailService);

trunk/expressoMail1_2/js/main.js

@@ -2878 +2878 @@
     $.each(array, function(index, value){
         stringReply += $(value).find("input").val() + ",";
-    });
+    }); 
     var stringToEmail = "";
     draw_email_box(content.find(".to-tr").find("textarea:first").val() || content.find(".to-tr").find("input:visible").val(), content.find(".to-tr").find("textarea:first"));
@@ -2934 +2934 @@
     mailData.msg_forward_from = $(content).find('[name="msg_forward_from"]').val();
     mailData.msg_reply_from = $(content).find('[name="msg_reply_from"]').val();
+        
+        if ($(content).find('select[name="input_from"]').val())
+                mailData.input_from = $(content).find('select[name="input_from"]').val();