Changeset 4726

Timestamp:

07/14/11 11:40:46 (13 years ago)

Author:

airton

Message:

Ticket #2118 - Opcao de troca do delimitador-separador das pastas do IMAP nao funciona a contento

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• inc/hook_settings.inc.php (modified) (1 diff)
• js/draw_api.js (modified) (4 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1900 +1900 @@
                 $mbox_stream = $this->open_mbox();
                 if($params && $params['onload'] && $_SESSION['phpgw_info']['expressomail']['server']['certificado']){
-                        $this->delete_mailbox(array("del_past" => "INBOX/decifradas"));
+                        $this->delete_mailbox(array("del_past" => "INBOX".$this->imap_delimiter."decifradas"));
                 }
 

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -130 +130 @@
 if ($type != "" && $type != "user"){
         
-        $trash = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
-        $drafts = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'];
-        $spam = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'];
-        $sent = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'];
+        $trash     = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'];
+        $drafts    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'];
+        $spam      = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'];
+        $sent      = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'];
+        $delimiter = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter'];
         $default = Array(
                 'INBOX' =>      lang('INBOX'), 

trunk/expressoMail1_2/js/draw_api.js

@@ -258 +258 @@
                 }
 
-                var trash_span=document.getElementById('lINBOX/'+trashfolder+'tree_folders');
-                var draft_span=document.getElementById('lINBOX/'+draftsfolder+'tree_folders');
-                var sent_span=document.getElementById('l'+this.preferences.save_in_folder+'tree_folders');
-                var sent_span_default=document.getElementById('lINBOX/'+sentfolder+'tree_folders');
-                var spam_span=document.getElementById('lINBOX/'+spamfolder+'tree_folders');
+                var trash_span = document.getElementById('lINBOX'+cyrus_delimiter+trashfolder  + 'tree_folders'); 
+            var draft_span = document.getElementById('lINBOX'+cyrus_delimiter+draftsfolder + 'tree_folders'); 
+            var sent_span  = document.getElementById('lINBOX'+cyrus_delimiter+sentfolder   + 'tree_folders'); 
+            var spam_span  = document.getElementById('lINBOX'+cyrus_delimiter+spamfolder   + 'tree_folders');
                 //local folders
-                var sent_local_conf = this.preferences.save_in_folder.replace("INBOX/","local_");
+                var sent_local_conf = this.preferences.save_in_folder.replace("INBOX"+cyrus_delimiter,"local_");
                 var sent_local_conf_span=document.getElementById('l'+sent_local_conf+'tree_folders');
                 var trash_local_span=document.getElementById('llocal_'+trashfolder+'tree_folders');
@@ -1628 +1627 @@
                 img_next_msg.src = "./templates/"+template+"/images/down.gray.button.png";
                 img_next_msg.style.cursor = 'default';
-                if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX/decifradas")) // testa se a mensagem e local
+                // testa se a mensagem e local 
+            if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX" + cyrus_delimiter + "decifradas")) // testa se a mensagem e local
                 {
                         img_next_msg.onclick = function()
@@ -1653 +1653 @@
                         var previousMsgBox = folder.previousSibling.name?folder.previousSibling.name:info_msg.msg_folder;
 
-                        if (previousMsgBox == "INBOX/decifradas") // teste para ver se a mensagem vem da pasta oculta decifradas
+                        if (previousMsgBox == "INBOX" + cyrus_delimiter + "decifradas") // teste para ver se a mensagem vem da pasta oculta decifradas
                                         previousMsgBox = get_current_folder();
 
@@ -1673 +1673 @@
                 img_previous_msg.src = "./templates/"+template+"/images/up.gray.button.png";
                 img_previous_msg.style.cursor = 'default';
-                if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX/decifradas")) // testa se a mensagem e local
+                // testa se a mensagem e local 
+            if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX" + cyrus_delimiter + "decifradas")) // testa se a mensagem e local
                 {
                         img_previous_msg.onclick = function()