Changeset 3798 for branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php

Timestamp:

02/22/11 11:25:46 (13 years ago)

Author:

thiagoaos

Message:

Ticket #1567 - Corrigido edição do rascunho mantendo as opções dos checkbox.

File:

• branches/2.2/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (5 diffs)

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

@@ -582 +582 @@
             $return['signature']        = $return_get_body['signature'];
                 }
+                
+                $flag = preg_match('/importance *: *(.*)\r/i', $header_, $importance);
+                $return['Importance'] = ($flag == 0) ? "Normal" : $importance[1];
 
                 $pattern = '/^[ \t]*Disposition-Notification-To:[ ]*<?[[:alnum:]\._-]+@[[:alnum:]_-]+[\.[:alnum:]]+>?/sm';
@@ -608 +611 @@
                 $return['msg_folder'] = $msg_folder;
 
-                $offset = $this->functions->CalculateDateOffset();
-                $msgTimestamp = $header->udate + $offset;
+                $offset = $this->functions->CalculateDateOffset();
+                $msgTimestamp = $header->udate + $offset;
 
                 $date_msg = gmdate("d/m/Y",$msgTimestamp);
@@ -2678 +2681 @@
                 $toaddress = $params['input_to'];
                 $ccaddress = $params['input_cc'];
-                $ccoaddress = $params['input_cco'];
-                $replytoaddress = $params['input_replyto'];
+                $ccoaddress = $params['input_cco'];
+                $return_receipt = $params['input_return_receipt'];
+                $is_important = $params['input_important_message'];
                 $subject = $params['input_subject'];
                 $msg_uid = $params['msg_id'];
@@ -2697 +2701 @@
                 $folder = @eregi_replace("INBOX.", "INBOX".$this->imap_delimiter, $folder);
                 // End Fix.
-                if(strtoupper($folder) == 'INBOX/DRAFTS')
-                    {
-                        $mail->SaveMessageAsDraft = $folder;
-                    }
+                if(strtoupper($folder) == 'INBOX/DRAFTS') $mail->SaveMessageAsDraft = $folder;
+
                 $mail->SaveMessageInFolder = $folder;
                 $mail->SMTPDebug = false;
@@ -2717 +2719 @@
                 $this->add_recipients("to", $toaddress, &$mail);
                 $this->add_recipients("cc", $ccaddress, &$mail);
-                $this->add_recipients("cco", $ccoaddress, &$mail);
+    $this->add_recipients("cco", $ccoaddress, &$mail);
                 $mail->AddReplyTo($replytoaddress);
                 $mail->Subject = $subject;
                 $mail->IsHTML(true);
                 $mail->Body = $body;
+                
+                // Important message
+                if($is_important)
+                        $mail->isImportant();
+
+                // Disposition-Notification-To
+                if ($return_receipt)
+                        $mail->ConfirmReadingTo = $_SESSION['phpgw_info']['expressomail']['user']['email'];
 
                 $return_forward = $this->buildEmbeddedImages($mail,$msg_uid,$forwarding_attachments);