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

Timestamp:

06/29/12 11:45:31 (11 years ago)

Author:

eduardow

Message:

Ticket #2917 - Confirmação de leitura não está funcionando no Outlook.

File:

• branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)

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

@@ -1140 +1140 @@
             //$return['signature']      = $return_get_body['signature'];
                 }
-                $pattern = '/^[ \t]*Disposition-Notification-To:[ ]*<?[[:alnum:]\._-]+@[[:alnum:]_-]+[\.[:alnum:]]+>?/sm';
+                
+                $pattern = '/^[ \t]*Disposition-Notification-To:.*/mi';
                 if (preg_match($pattern, $header_, $fields))
-                {
-                        if(preg_match('/[[:alnum:]\._\-]+@[[:alnum:]_\-\.]+/',$fields[0], $matches)){ 
-                                $return['DispositionNotificationTo'] = "<".$matches[0].">"; 
-                        } 
-                }
+                $return['DispositionNotificationTo'] = base64_encode(trim(str_ireplace('Disposition-Notification-To:', '', $fields[0])));
 
                 $return['Recent']       = $header->Recent;
@@ -2814 +2811 @@
             $header = $this->get_header($msg_numb);
             $header_ = imap_fetchheader($this->mbox, $msg_numb, FT_UID);
-            $pattern = '/^[ \t]*Disposition-Notification-To:[ ]*<?[[:alnum:]\._-]+@[[:alnum:]_-]+[\.[:alnum:]]+>?/sm';
-            if (preg_match($pattern, $header_, $fields)) {
-                if (preg_match('/[[:alnum:]\._\-]+@[[:alnum:]_\-\.]+/', $fields[0], $matches)) {
-                    $return['DispositionNotificationTo'] = "<" . $matches[0] . ">";
-                }
-            }
+            $pattern = '/^[ \t]*Disposition-Notification-To:.*/mi'; 
+                        if (preg_match($pattern, $header_, $fields)) 
+                                $return['DispositionNotificationTo'] = base64_encode(trim(str_ireplace('Disposition-Notification-To:', '', $fields[0])));
 
             $message_id = $header->message_id;
@@ -3845 +3839 @@
         }
 
-        function send_notification($params){
-                include("../header.inc.php");
-                require_once("class.phpmailer.php");
-                $mail = new PHPMailer();
-
-                $toaddress = $params['notificationto'];
-
-                $subject = lang("Read receipt: %1",$params['subject']);
+        function send_notification($params) 
+        { 
+                $mailService = ServiceLocator::getService('mail');
                 $body = lang("Your message: %1",$params['subject']) . '<br>';
                 $body .= lang("Received in: %1",date("d/m/Y H:i",$params['date'])) . '<br>';
                 $body .= lang("Has been read by: %1 &lt; %2 &gt; at %3", $_SESSION['phpgw_info']['expressomail']['user']['fullname'], $_SESSION['phpgw_info']['expressomail']['user']['email'], date("d/m/Y H:i"));
-                $mail->SMTPDebug = false;
-                $mail->IsSMTP();
-                $mail->Host = $_SESSION['phpgw_info']['expressomail']['email_server']['smtpServer'];
-                $mail->Port = $_SESSION['phpgw_info']['expressomail']['email_server']['smtpPort'];
-                $mail->From = $_SESSION['phpgw_info']['expressomail']['user']['email'];
-                $mail->FromName = $_SESSION['phpgw_info']['expressomail']['user']['fullname'];
-                $mail->AddAddress($toaddress);
-                $mail->Subject = $this->htmlspecialchars_decode($subject);
-
-                $mail->IsHTML(true);
-                $mail->Body = $body;
-
-                if(!$mail->Send()){
-                        return $mail->ErrorInfo;
-                }
-                else
-                        return true;
+                return $mailService->sendMail(base64_decode($params['notificationto']),  
+                                                           $_SESSION['phpgw_info']['expressomail']['user']['email'],  
+                                                           $this->htmlspecialchars_decode(lang("Read receipt: %1",$params['subject'])),  
+                                                           $body);
+
         }