Changeset 5014 for branches/2.3/expressoMail1_2/js/main.js

Timestamp:

08/31/11 16:43:08 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #2154 - Não importa mensagens quando selecionada pasta do arquivamento local

File:

• branches/2.3/expressoMail1_2/js/main.js (modified) (1 diff)

branches/2.3/expressoMail1_2/js/main.js

@@ -2736 +2736 @@
                 if(data == 'Post-Content-Length')
                         write_msg(get_lang('The size of this message has exceeded  the limit (%1B).', preferences.max_attachment_size ? preferences.max_attachment_size : Element('upload_max_filesize').value));
-                else {  /*
-                        * @author Rommel Cysne (rommel.cysne@serpro.gov.br)
-                        * @date 2009/05/15
-                        * Foi colocado um teste para verificar se a pasta selecionada, passada como parametro,
-                        * eh uma pasta local (qualquer uma)
-                        */
-                        var er = /^local_/;
-                        if ( er.test(wfolders_tree._selected.id) )
-                        {
-                                archive_msgs('INBOX/Lixeira/tmpMoveToLocal',wfolders_tree._selected.id,data);
-                                cExecute('$this.imap_functions.delete_mailbox',function(){},'del_past=INBOX/Lixeira/tmpMoveToLocal');
-                        }
-                                                 else{
-                                write_msg(get_lang(data));
-                                arrayJSWin["import_window"].close();
-                                if(openTab.imapBox[0] == wfolders_tree._selected.id)
-                                {
-                                        openTab.imapBox[0] = '';
-                                        change_folder(wfolders_tree._selected.id, wfolders_tree._selected.caption);
-                                } else{
-                                        refresh();
-                                }
-                        }
-        }
+                else
+                {
+                    write_msg(get_lang('The import was executed successfully.'));
+                    /*
+                    * @author Rommel Cysne (rommel.cysne@serpro.gov.br)
+                    * @date 2009/05/15
+                    * Foi colocado um teste para verificar se a pasta selecionada, passada como parametro,
+                    * eh uma pasta local (qualquer uma)
+                    */
+                    var er = /^local_/;
+                    if ( er.test(wfolders_tree._selected.id) )
+                    {
+                        var tempTrashFolder = 'INBOX' + cyrus_delimiter + trashfolder + '/tmpMoveToLocal';
+                        archive_msgs(tempTrashFolder ,wfolders_tree._selected.id, data);
+                        cExecute('$this.imap_functions.delete_mailbox',function(){},'del_past=' + tempTrashFolder);
+                    }
+                    else{
+                        arrayJSWin["import_window"].close();
+                        if(openTab.imapBox[0] == wfolders_tree._selected.id)
+                        {
+                                openTab.imapBox[0] = '';
+                                change_folder(wfolders_tree._selected.id, wfolders_tree._selected.caption);
+                        } else{
+                                refresh();
+                        }
+                    }
+                }
         }