Changeset 4644 for sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/draw_api.js

Timestamp:

06/30/11 19:00:36 (13 years ago)

Author:

fernando-alberto

Message:

Ticket #1269 - Mergiando revisoes do brach22 de rev4447 ate rev4643

Location:

sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js

Files:

• . (modified) (1 prop)
• draw_api.js (modified) (4 diffs)

sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/draw_api.js

@@ -343 +343 @@
                 var nm1 = "";
                 if(tree_folders._folderPr.length > 0){
-                        var nm_folder = "";
-                        for(var i=0; i < tree_folders._folderPr.length; i++){
-                                nm_folder = tree_folders._folderPr[i].split(cyrus_delimiter);
-                                if(nm_folder[0] == "INBOX"){
-                                        if(nm1 == ""){
-                                                nm1 = nm_folder[1];
-                                                folder_create = "INBOX" + cyrus_delimiter + nm_folder[1] + ";";
-                                        }else{
-                                                if( nm1 != nm_folder[1]){
-                                                        folder_create += "INBOX" + cyrus_delimiter + nm_folder[1] + ";";
-                                                        nm1 = nm_folder[1];
-                                                }
+                        folder_create = tree_folders._folderPr.join(';');
+                }
+                if(folder_create != ""){
+                        if(confirm(get_lang("There are folders with invalid format. If you want to fix now, click on button OK."))){
+                                var handler_correct_folders = function(data){
+                                        //Timeout to release HTTPRequest , loadScript and update tree folders.
+                                        if(data){
+                                                write_msg(get_lang('The folders were fixed with success.'));
+                                                setTimeout("connector.loadScript('TreeShow');ttreeBox.update_folder();",500);
                                         }
                                 }
-                        }
-                }
-                if(folder_create != ""){
-                        if(confirm(get_lang("There are folders with invalid format. Do you want to fix them?"))){
-                                var handler_correct_folders = function(data){
-                                        //Timeout to release HTTPRequest , loadScript and update tree folders.
-                                        if(data)
-                                                setTimeout("connector.loadScript('TreeShow');ttreeBox.update_folder();",500);
-                                }
                                 cExecute("$this.imap_functions.create_extra_mailbox",handler_correct_folders,"nw_folders="+folder_create);
+                        }
+                        else{
+                                write_msg(get_lang('Warning: The folders with invalid format will be unavailable.'));
                         }
                 }
@@ -633 +624 @@
          * folder before finishing the Ajax request
          */
-        if (msg_folder != headers_msgs['folder']) {     
+        if (msg_folder != headers_msgs['folder']) { 
                 
                 if (headers_msgs['folder']) {
@@ -1375 +1366 @@
         }
 
+        //Verifica se a mensagem local foi encaminhada.
+        if (info_msg.Draft == 'X' && info_msg.Answered == 'A')
+                info_msg.Forwarded = 'F';
         // NORMAL MSG
-        if(info_msg.Draft != 'X')
+        if(info_msg.Draft != 'X' || info_msg.Forwarded == 'F')
         {
         var options = document.createElement("TD");
@@ -3071 +3065 @@
         else
                 td221.className = 'dsused';
+                
+        td221.setAttribute("style","width: 100%");
 
         tr221.appendChild(td221);