Changeset 2714 for trunk/expressoMail1_2/js/jscode/main.js

Timestamp:

05/06/10 09:12:42 (14 years ago)

Author:

amuller

Message:

Ticket #1064 - Implementando parcialmente o ticket

File:

• trunk/expressoMail1_2/js/jscode/main.js (modified) (6 diffs)

trunk/expressoMail1_2/js/jscode/main.js

@@ -290 +290 @@
         if (typeof(msg_info) != 'object')
                 alert(get_lang("Error in show_msg param is not object"));
-        
+
         if (msg_info.status_get_msg_info == 'false')
         {
@@ -296 +296 @@
                 return;
         }
-        
         var handler_sendNotification = function(data){
                 if (data)
@@ -303 +302 @@
                         write_msg(get_lang("Error in SMTP sending read confirmation."));
         };
-    
+
         if(msg_info.source)
         {
-        // Abrindo um e-mail criptografado
-        // Verifica se existe o objeto applet
-        if (!Element('cert_applet')){
-            // se não existir, mostra mensagem de erro.
-            write_msg(get_lang('The preference "%1" isn\'t enabled.', get_lang('Enable digitally sign/cipher the message?')));
-        } else {
-            // se existir prepara os dados para serem enviados e chama a
-            // operação na applet
-
-            expresso.connector.showProgressBar();
-
-           // if ((msg_info.DispositionNotificationTo) && ((msg_info.Unseen == 'U') || (msg_info.Recent == 'N'))){
-            /*  var confNotification = confirm(get_lang("The sender waits your notification of reading. Do you want to confirm this?"), "");
-                if (confNotification)*/
-            //        cExecute ("expressoMail1_2.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&subject="+url_encode(msg_info.subject), handler_sendNotification);
-           // }
-
-            Element('cert_applet').doButtonClickAction('decript',
-                                                        msg_info.msg_number,
-                                                        msg_info.source,
-                                                        msg_info.msg_folder); // Passa os dados para a applet
-        }
+                // Abrindo um e-mail criptografado
+                // Verifica se existe o objeto applet
+                if (!Element('cert_applet')){
+                        // se não existir, mostra mensagem de erro.
+                        write_msg(get_lang('The preference "%1" isn\'t enabled.', get_lang('Enable digitally sign/cipher the message?')));
+                } else {
+                        // se existir prepara os dados para serem enviados e chama a
+                        // operação na applet
+
+                        expresso.connector.showProgressBar();
+
+                        // if ((msg_info.DispositionNotificationTo) && ((msg_info.Unseen == 'U') || (msg_info.Recent == 'N'))){
+                        /*      var confNotification = confirm(get_lang("The sender waits your notification of reading. Do you want to confirm this?"), "");
+                                if (confNotification)*/
+                        //        cExecute ("expressoMail1_2.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&subject="+url_encode(msg_info.subject), handler_sendNotification);
+                        // }
+
+                        Element('cert_applet').doButtonClickAction('decript',
+                                        msg_info.msg_number,
+                                        msg_info.source,
+                                        msg_info.msg_folder); // Passa os dados para a applet
+                }
                 return;
 
         }
 
-
-        if (msg_info.status_get_msg_info == 'false')
-        {
-                write_msg(get_lang("Problems reading your message")+ ".");
-                return;
-        }
-
         if (msg_info.status == 'false'){
-                eval(msg_info.command_to_exec);
+                delete_border(msg_info.reuse_border);
         }
         else{
-        var ID = msg_info.original_ID ? msg_info.original_ID : msg_info.msg_number;
-        var id_msg_read = ID+"_r";
+                var ID = msg_info.original_ID ? msg_info.original_ID : msg_info.msg_number;
+                var id_msg_read = ID+"_r";
 
                 if (preferences.use_shortcuts == '1')
@@ -350 +342 @@
                 // Call function to draw message
                 // If needed, delete old border
-                if (openTab.type[currentTab] == 2 || openTab.type[currentTab] == 3)
-                        delete_border(currentTab,'false');
-
-                
-                if(Element("border_id_" + id_msg_read)) 
-                        alternate_border(id_msg_read);          
-                else {
-                        var border_id = create_border(msg_info.subject, id_msg_read);
-                        if(border_id)
+                if(currentTab)
+                {
+                        draw_message(msg_info,currentTab);
+                        var unseen_sort = document.getElementById('span_flag_UNSEEN').getAttribute('onclick');
+                        unseen_sort = unseen_sort.toString();
+                        if ( !(unseen_sort.indexOf("'UNSEEN' == 'UNSEEN'") < 0) )
                         {
-                                openTab.type[border_id] = 2;
-                                draw_message(msg_info,border_id);
-                                var unseen_sort = document.getElementById('span_flag_UNSEEN').getAttribute('onclick');
-                                unseen_sort = unseen_sort.toString();
-                                if ( !(unseen_sort.indexOf("'UNSEEN' == 'UNSEEN'") < 0) )
-                                {
-                                        var sort_type = sort_box_type;
-                                        sort_box_type = null;
-                                        sort_box('UNSEEN', sort_type);
-                                }
-                        }
-                        else
-                                return;
-                }
+                                var sort_type = sort_box_type;
+                                sort_box_type = null;
+                                sort_box('UNSEEN', sort_type);
+                        }
+                }
+                else
+                        return;
 
                 var domains = "";
                 if ((msg_info.DispositionNotificationTo) && (!msg_is_read(ID) || (msg_info.Recent == 'N')))
-                {                       
+                {
                         if (preferences.notification_domains != undefined && preferences.notification_domains != "")
-            {
+                        {
                                 domains = preferences.notification_domains.split(',');
-            }
+                        }
                         else
-                        {                               
+                        {
                                 var confNotification = true;
-                         }
+                        }
                         for (var i = 0; i < domains.length; i++)
                                 if (msg_info.DispositionNotificationTo.match(domains[i]+">"))
@@ -392 +374 @@
                                         break;
                                 }
-                                if (confNotification == undefined)
-                                        var confNotification = confirm(get_lang("The sender:\n%1\nwaits your notification of reading. Do you want to confirm this?",msg_info.DispositionNotificationTo), "");
-
+                        if (confNotification == undefined)
+                                var confNotification = confirm(get_lang("The sender:\n%1\nwaits your notification of reading. Do you want to confirm this?",msg_info.DispositionNotificationTo), "");
                         if (confNotification)
                                 cExecute ("expressoMail1_2.imap_functions.send_notification&notificationto="+msg_info.DispositionNotificationTo+"&subject="+url_encode(msg_info.subject), handler_sendNotification);
@@ -401 +382 @@
                 if (!msg_is_read(ID))
                 {
-            set_msg_as_read(ID, true);
+                        set_msg_as_read(ID, true);
                         if (msg_info.cacheHit || (!proxy_mensagens.is_local_folder(get_current_folder()) && msg_info.original_ID))
-            {
+                        {
                                 set_message_flag(ID, "seen"); // avoid caducous (lazy) data
-            }
-        }
+                        }
+                }
         }
 }