Changeset 3798

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.

Location:

branches/2.2/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (5 diffs)
• js/draw_api.js (modified) (3 diffs)
• js/main.js (modified) (1 diff)

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); 

branches/2.2/expressoMail1_2/js/draw_api.js

@@ -1333 +1333 @@
                         td.innerHTML += "&nbsp;<img style='cursor:pointer' onclick='alert(\""+get_lang("This message is signed, but it is invalid. You should not trust on it.")+"\");' title='"+get_lang("Voided message")+"' src='templates/"+template+"/images/invalid.gif'>";
         }
-
+        
         if (info_msg.DispositionNotificationTo)
         {
-                td.innerHTML += '&nbsp;<img style="cursor:pointer" alt="'+ get_lang('Message with read notification') + '" title="'+ get_lang('Message with read notification') + '" src="templates/'+template+'/images/notification.gif">';
+                td.innerHTML += '&nbsp;<img id="disposition_notification_'+ID+'" style="cursor:pointer" alt="'+ get_lang('Message with read notification') + '" title="'+ get_lang('Message with read notification') + '" src="templates/'+template+'/images/notification.gif">';
         }
 
@@ -1626 +1626 @@
                 tr0.appendChild(td0);
                 tbody_message.appendChild(tr0);
+                
+                var important_message = document.createElement("INPUT");
+                important_message.id = "is_important_"+ID;
+                important_message.name = "is_important";
+                important_message.type = "HIDDEN";
+                important_message.value = (info_msg.Importance == "" || info_msg.Importance == "Normal") ? "0": "1";
+                
+                options.appendChild(important_message);
         }
         //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1688 +1696 @@
         tr1.appendChild(from_values);
         tr1.appendChild(local_message);
-
-
 
         if (info_msg.reply_to){

branches/2.2/expressoMail1_2/js/main.js

@@ -1316 +1316 @@
                         }
                         Element("subject_" + new_border_ID).value = data.subject;
+                        
+                        if( Element("disposition_notification_" + border_ID) )
+                                Element("return_receipt_" + new_border_ID).checked = true;
+
+                        var element_important_message = Element("important_message_" + new_border_ID);
+                        if(element_important_message) {
+                                if(Element("is_important_" + border_ID).value == "1") element_important_message.checked = true;
+                        }
 
                         var divFiles = Element("divFiles_"+new_border_ID);