Changeset 4726 for trunk/expressoMail1_2
- Timestamp:
- 07/14/11 11:40:46 (13 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r4560 r4726 1900 1900 $mbox_stream = $this->open_mbox(); 1901 1901 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")); 1903 1903 } 1904 1904 -
trunk/expressoMail1_2/inc/hook_settings.inc.php
r4465 r4726 130 130 if ($type != "" && $type != "user"){ 131 131 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']; 136 137 $default = Array( 137 138 'INBOX' => lang('INBOX'), -
trunk/expressoMail1_2/js/draw_api.js
r4719 r4726 258 258 } 259 259 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'); 265 264 //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_"); 267 266 var sent_local_conf_span=document.getElementById('l'+sent_local_conf+'tree_folders'); 268 267 var trash_local_span=document.getElementById('llocal_'+trashfolder+'tree_folders'); … … 1628 1627 img_next_msg.src = "./templates/"+template+"/images/down.gray.button.png"; 1629 1628 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 1631 1631 { 1632 1632 img_next_msg.onclick = function() … … 1653 1653 var previousMsgBox = folder.previousSibling.name?folder.previousSibling.name:info_msg.msg_folder; 1654 1654 1655 if (previousMsgBox == "INBOX /decifradas") // teste para ver se a mensagem vem da pasta oculta decifradas1655 if (previousMsgBox == "INBOX" + cyrus_delimiter + "decifradas") // teste para ver se a mensagem vem da pasta oculta decifradas 1656 1656 previousMsgBox = get_current_folder(); 1657 1657 … … 1673 1673 img_previous_msg.src = "./templates/"+template+"/images/up.gray.button.png"; 1674 1674 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 1676 1677 { 1677 1678 img_previous_msg.onclick = function()
Note: See TracChangeset
for help on using the changeset viewer.