Changeset 7294 for branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

09/25/12 09:30:25 (12 years ago)

Author:

eduardow

Message:

Ticket #3127 - Mensagens criadas pelo Expresso com inconsistencia no Outlook.

File:

• branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)

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

@@ -2895 +2895 @@
             }
 
-
-            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);