Changeset 4726


Ignore:
Timestamp:
07/14/11 11:40:46 (8 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/inc/class.imap_functions.inc.php

    r4560 r4726  
    19001900                $mbox_stream = $this->open_mbox(); 
    19011901                if($params && $params['onload'] && $_SESSION['phpgw_info']['expressomail']['server']['certificado']){ 
    1902                         $this->delete_mailbox(array("del_past" => "INBOX/decifradas")); 
     1902                        $this->delete_mailbox(array("del_past" => "INBOX".$this->imap_delimiter."decifradas")); 
    19031903                } 
    19041904 
  • trunk/expressoMail1_2/inc/hook_settings.inc.php

    r4465 r4726  
    130130if ($type != "" && $type != "user"){ 
    131131         
    132         $trash = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']; 
    133         $drafts = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']; 
    134         $spam = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']; 
    135         $sent = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']; 
     132        $trash     = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']; 
     133        $drafts    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']; 
     134        $spam      = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']; 
     135        $sent      = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']; 
     136        $delimiter = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDelimiter']; 
    136137        $default = Array( 
    137138                'INBOX' =>      lang('INBOX'),  
  • trunk/expressoMail1_2/js/draw_api.js

    r4719 r4726  
    258258                } 
    259259 
    260                 var trash_span=document.getElementById('lINBOX/'+trashfolder+'tree_folders'); 
    261                 var draft_span=document.getElementById('lINBOX/'+draftsfolder+'tree_folders'); 
    262                 var sent_span=document.getElementById('l'+this.preferences.save_in_folder+'tree_folders'); 
    263                 var sent_span_default=document.getElementById('lINBOX/'+sentfolder+'tree_folders'); 
    264                 var spam_span=document.getElementById('lINBOX/'+spamfolder+'tree_folders'); 
     260                var trash_span = document.getElementById('lINBOX'+cyrus_delimiter+trashfolder  + 'tree_folders');  
     261            var draft_span = document.getElementById('lINBOX'+cyrus_delimiter+draftsfolder + 'tree_folders');  
     262            var sent_span  = document.getElementById('lINBOX'+cyrus_delimiter+sentfolder   + 'tree_folders');  
     263            var spam_span  = document.getElementById('lINBOX'+cyrus_delimiter+spamfolder   + 'tree_folders'); 
    265264                //local folders 
    266                 var sent_local_conf = this.preferences.save_in_folder.replace("INBOX/","local_"); 
     265                var sent_local_conf = this.preferences.save_in_folder.replace("INBOX"+cyrus_delimiter,"local_"); 
    267266                var sent_local_conf_span=document.getElementById('l'+sent_local_conf+'tree_folders'); 
    268267                var trash_local_span=document.getElementById('llocal_'+trashfolder+'tree_folders'); 
     
    16281627                img_next_msg.src = "./templates/"+template+"/images/down.gray.button.png"; 
    16291628                img_next_msg.style.cursor = 'default'; 
    1630                 if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX/decifradas")) // testa se a mensagem e local 
     1629                // testa se a mensagem e local  
     1630            if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX" + cyrus_delimiter + "decifradas")) // testa se a mensagem e local 
    16311631                { 
    16321632                        img_next_msg.onclick = function() 
     
    16531653                        var previousMsgBox = folder.previousSibling.name?folder.previousSibling.name:info_msg.msg_folder; 
    16541654 
    1655                         if (previousMsgBox == "INBOX/decifradas") // teste para ver se a mensagem vem da pasta oculta decifradas 
     1655                        if (previousMsgBox == "INBOX" + cyrus_delimiter + "decifradas") // teste para ver se a mensagem vem da pasta oculta decifradas 
    16561656                                        previousMsgBox = get_current_folder(); 
    16571657 
     
    16731673                img_previous_msg.src = "./templates/"+template+"/images/up.gray.button.png"; 
    16741674                img_previous_msg.style.cursor = 'default'; 
    1675                 if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX/decifradas")) // testa se a mensagem e local 
     1675                // testa se a mensagem e local  
     1676            if (!proxy_mensagens.is_local_folder(get_current_folder()) && !(info_msg.msg_folder == "INBOX" + cyrus_delimiter + "decifradas")) // testa se a mensagem e local 
    16761677                { 
    16771678                        img_previous_msg.onclick = function() 
Note: See TracChangeset for help on using the changeset viewer.