Changeset 6860 for trunk/expressoMail1_2/js/main.js

Timestamp:

07/24/12 10:27:50 (12 years ago)

Author:

marcosw

Message:

Ticket #2947 - Merge do branch das novas funcionalidades para o trunk

File:

• trunk/expressoMail1_2/js/main.js (modified) (5 diffs)

trunk/expressoMail1_2/js/main.js

@@ -534 +534 @@
                                         var confNotification = confirm(get_lang("The sender:\n%1\nwaits your notification of reading. Do you want to confirm this?",Base64.decode(msg_info.DispositionNotificationTo)), "");
 
-                        if (confNotification)
-                                cExecute ("$this.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&date="+msg_info.udate+"&subject="+url_encode(msg_info.subject), handler_sendNotification);
+                        if (confNotification) {
+                        /* Adequação a nova funcionalidade. Agora, a confirmação de leitura é uma preferência do usuário. */
+                                if(preferences.confirm_read_message) {
+                                        $.Zebra_Dialog(get_lang("Would you like to send the read receipt?"), {
+                                                'type':     'question',
+                                                'title':    get_lang('Read receipt'),
+                                                'buttons':  [get_lang("Yes"), get_lang("No")],
+                                                'overlay_opacity' : 0.5,
+                                                'onClose':  function(caption) {
+                                                        if(caption == get_lang("Yes"))
+                                                                cExecute ("$this.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&date="+msg_info.udate+"&subject="+url_encode(msg_info.subject), handler_sendNotification);                                                              
+                                                        else 
+                                                                write_msg(get_lang("Confirmation message is not sent"));
+                                                }
+                                        });
+                                }
+                                else
+                                        cExecute ("$this.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&date="+msg_info.udate+"&subject="+url_encode(msg_info.subject), handler_sendNotification);                                                              
+                        }
+                                
                 }
                 //Change msg class to read.
@@ -2689 +2707 @@
         }
         //stringEmail = content.find('[name="input_to"]').val();
+
         var stringEmail = "";
         var stringToEmail = "";
@@ -3491 +3510 @@
                 else{
                         var filename = 'mensagens.zip'; 
-                        if (data.match(/\.eml$/gi)) { 
-                                filename = 'fonte_da_mensagem.eml'; 
+                        if (data[0].match(/\.eml$/gi)) { 
+                filename = data[1]+'.eml'; 
                         } 
                         download_attachments(null, null, data, null,null,filename);
@@ -3869 +3888 @@
                 wfolders.makeWindow('null','import');
 }
-function import_calendar(data){
-    var import_url = '$this.db_functions.import_vcard&msg_folder='+data;
-    var logUser;
-    var up;
-    var owner;
-    
-    //Verifica o contexto de importação
-    var decodeOwner = function(){
-        
+
+function decodeOwner(){
         owner = User.me.id;
         var imapBox = openTab.imapBox[currentTab].split(cyrus_delimiter);
@@ -3883 +3895 @@
             var user = DataLayer.get('user', {filter: ['=','uid',imapBox[1]]});             
             owner = $.isArray(user) ? user[0].id : user.id;
-        }
-        
+        }       
         return owner;
-    }
-    
+}
+function import_calendar(data){
+    var import_url = '$this.db_functions.import_vcard&msg_folder='+data;
+    var logUser;
+    var up;
+    var owner;   
     function handler_import_calendar(data){
             if(data === true){