Changeset 5844
- Timestamp:
- 03/28/12 17:28:16 (12 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r5816 r5844 2389 2389 function get_folders_list($params = null) 2390 2390 { 2391 2391 2392 ///Define Variaveis 2392 2393 $prefixShared = 'user'; //Prefixo das pastas compartilhadas … … 2773 2774 //build shared folder path 2774 2775 $newfolder = "user" . $this->imap_delimiter . $fromaddress[3] . $this->imap_delimiter . $this->imap_sentfolder; 2775 if ($this->folder_exists($newfolder)) 2776 2777 if ($this->folder_exists($newfolder)){ 2778 $has_new_folder = false; 2776 2779 $folder = $newfolder; 2777 else 2778 $folder = $params['folder']; 2780 } 2781 else{ 2782 $name_folder = $this->imap_sentfolder; 2783 $base_path = "user" . $this->imap_delimiter . $fromaddress[3]; 2784 $arr_new_folder['newp'] = $name_folder; 2785 $arr_new_folder['base_path'] = $base_path; 2786 2787 $this->create_mailbox($arr_new_folder); 2788 $has_new_folder = true; 2789 $folder = $newfolder; 2790 } 2779 2791 } else { 2792 $has_new_folder = false; 2780 2793 $folder = $params['folder']; 2781 2794 } … … 3088 3101 3089 3102 3090 return array("success" => true); 3103 //return array("success" => true, "folder" => $folder_list); 3104 return array("success" => true, "load" => $has_new_folder); 3091 3105 3092 3106 } -
trunk/expressoMail1_2/js/main.js
r5835 r5844 672 672 } 673 673 674 function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive){ 675 674 function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive){ 676 675 if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){ 677 676 alert( "Impossivel deletar mensagens que estão ainda estão sendo arquivadas." ); … … 686 685 if(folder.substr(0,4) == 'user') 687 686 { 688 var arrayFolder = folder.split(cyrus_delimiter); 689 userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash']; 687 var arrayFolder = folder.split(cyrus_delimiter); 688 userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash']; 689 /** TODO Mudar quando melhorias forem implementadas na API de atualização do cache */ 690 DataLayer.remove('folder', false); 691 DataLayer.get('folder'); 692 693 var has_folder = DataLayer.get('folder', userTrashFolder); 694 if(!has_folder){ 695 create_new_folder(special_folders['Trash'], 'user'+cyrus_delimiter+arrayFolder[1]); 696 } 697 690 698 } 691 699 else userTrashFolder = mount_url_folder(["INBOX",special_folders["Trash"]]); … … 2001 2009 2002 2010 function send_message_return(data, ID){ 2011 2012 if (typeof(data) == 'object' && data.load){ 2013 cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu); 2014 } 2003 2015 watch_changes_in_msg(ID); 2004 2016 … … 3547 3559 } 3548 3560 3561 function create_new_folder(name_folder, base_path){ 3562 $.ajax({ 3563 url : "controller.php?action=$this.imap_functions.create_mailbox", 3564 type : "POST", 3565 async : false, 3566 data : "newp="+name_folder+"&base_path="+base_path, 3567 success : function(data){ 3568 data = connector.unserialize(data); 3569 if(data == "Mailbox already exists"){ 3570 write_msg(get_lang("Mailbox already exists")); 3571 } 3572 cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu); 3573 } 3574 }); 3575 } 3576 3549 3577 function searchEmail(emailString){ 3550 3578 var arrayInvalidEmails = new Array(); … … 3599 3627 var prefix = 'INBOX'; 3600 3628 }else{ 3601 var prefix = 'user/'+user_selected_name; 3602 } 3629 var prefix = 'user' + cyrus_delimiter+user_selected_name; 3630 3631 /** TODO Mudar quando melhorias forem implementadas na API de atualização do cache */ 3632 DataLayer.remove('folder', false); 3633 DataLayer.get('folder'); 3634 3635 var has_folder = DataLayer.get('folder', prefix + cyrus_delimiter + draftsfolder); 3636 if(!has_folder){ 3637 create_new_folder(draftsfolder, prefix); 3638 } 3639 } 3640 3603 3641 var folder_id = (openTab.imapBox[border_id] && openTab.type[border_id] < 6) ? openTab.imapBox[border_id]: prefix + cyrus_delimiter + draftsfolder; 3604 3642 form.folder = folder_id; -
trunk/prototype/modules/mail/js/foldertree.js
r5813 r5844 11 11 element.children = new Array(); 12 12 root[i].children.push(element); 13 /* root[i]['children_unseen'] = (root[i]['children_unseen']? root[i]['children_unseen'] : 0)+ parseInt(element.messageCount.unseen);14 console.log("=== INI ===");15 console.log(root[i].id);16 console.log(root[i].children.length);17 console.log("=== END ===");18 for(var k=0; k<root[i].children.length; k++){19 root[i]['children_unseen'] += (root[i].children[k]['children_unseen'] ? root[i].children[k]['children_unseen'] : 0);20 } */21 13 return true; 22 14 } else if (ok = unorphanize(root[i].children, element)) { … … 419 411 } 420 412 $(".new_folder").parent().addClass("folders-loading"); 421 $.ajax({ 422 url : "controller.php?action=$this.imap_functions.create_mailbox", 423 type : "POST", 424 data : "newp="+($(this).val() != "" ? $(this).val() : get_lang("New Folder"))+"&base_path="+(selected_li.attr('id')? selected_li.attr('id') : "INBOX"), 425 success : function(data){ 426 data = connector.unserialize(data); 427 if(data == "Mailbox already exists"){ 428 write_msg(get_lang("Mailbox already exists")); 429 } 430 cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu); 431 } 432 }); 413 create_new_folder(($(this).val() != "" ? $(this).val() : get_lang("New Folder")), (selected_li.attr('id')? selected_li.attr('id') : "INBOX")); 433 414 }else if( event.keyCode == 27){ 434 415 draw_new_tree_folder();
Note: See TracChangeset
for help on using the changeset viewer.