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

Timestamp:

07/26/12 11:49:17 (12 years ago)

Author:

marcosw

Message:

Ticket #2897 - Realizado backport da funcionalidade Responder a

File:

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

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

@@ -1355 +1355 @@
                 $reply_to = $header->reply_to;
                 $return['reply_to'] = "";
+                
                 if (is_object($reply_to[0]))
                 {
                         if ($return['from']['email'] != ($reply_to[0]->mailbox."@".$reply_to[0]->host))
                         {
-                                if (!empty($reply_to[0]->personal))
+                                foreach ($reply_to as $tmp_reply_to)
                                 {
-                                        $personal_reply_to = $this->formatMailObject($tmp_reply_to);
-                                        if(!empty($personal_reply_to[0]->text)) {
-                                                $return['reply_to'] .= '"' . $personal_reply_to['name']. '"';
+                                        if (!empty($tmp_reply_to->personal))
+                                        {
+                                                $personal_tmp_reply_to = $this->formatMailObject($tmp_reply_to);
+                                                $return['reply_to'] .= '"' . $personal_tmp_reply_to['name'] . '"';
                                                 $return['reply_to'] .= " ";
                                                 $return['reply_to'] .= "<";
-                                                $return['reply_to'] .= $personal_reply_to['email'];
+                                                $return['reply_to'] .= $personal_tmp_reply_to['email'];
                                                 $return['reply_to'] .= ">";
+                                                $return['reply_to'] .= ", ";
                                         }
-                                        else {
-                                                $return['reply_to'] .= $reply_to[0]->mailbox . "@" . $reply_to[0]->host;
+                                        else
+                                        {
+                                                if (isset($tmp_reply_to->host) && $tmp_reply_to->host != 'unspecified-domain')
+                                                        $return['reply_to'] .= $tmp_reply_to->mailbox . "@" . $tmp_reply_to->host;
+                                                else
+                                                        $return['reply_to'] .= $tmp_reply_to->mailbox;
+                                                $return['reply_to'] .= ", ";
                                         }
                                 }
-                                else
-                                {
-                                        $return['reply_to'] .= $reply_to[0]->mailbox . "@" . $reply_to[0]->host;
-                                }
-                        }
-                }
-                $return['reply_to'] = $this->decode_string($return['reply_to']);
+                                $return['reply_to'] = $this->del_last_two_caracters($return['reply_to']);
+                        }
+                }
+                else
+                {
+                        $return['reply_to'] = "";
+                }
+
                 $return['subject'] = ( isset($header->subject) && trim($header->subject) !== '' ) ?  self::decodeMimeString($header->subject) : $this->functions->getLang('(no subject)   ');
 
@@ -1398 +1407 @@
                 }  
                 $return['alarm'] = $alarm;
-        
+                
                 return $return;
         }
@@ -2593 +2602 @@
             $ccoaddress = preg_replace('/\s+>/', '>', $ccoaddress);
 
-            $replytoaddress = $params['input_replyto'];
+            $replytoaddress = $params['input_reply_to'];
             $subject = $params['input_subject'];
             $return_receipt = $params['input_return_receipt'];
@@ -2778 +2787 @@
             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);
 
             $bol = $this->add_recipients('to', $toaddress, $mailService);