Changeset 5306


Ignore:
Timestamp:
01/04/12 14:55:54 (12 years ago)
Author:
thiago
Message:

Ticket #2350 - Deixar dinamico o nome das pastas no codigo

Location:
trunk/expressoMail1_2
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r5302 r5306  
    4848                 
    4949                //armazena os caminhos das pastas ( sent, spam, drafts, trash ) 
    50                 //$this->folders['sent']    = $this->imap_delimiter . $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']; //Variavel folders armazena o caminho /sent 
    51                 $this->folders['sent']    =  $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']; //Variavel folders armazena o caminho /sent 
    52                 $this->folders['spam']    =  $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']; 
    53                 $this->folders['drafts']  =  $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']; 
    54                 $this->folders['trash']   =  $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']; 
    55                  
    56                 if( empty ( $this->folders['sent'] ) ){ 
    57                   //$this->folders['sent'] = $this->imap_delimiter . 'Sent';     
    58                   $this->folders['sent'] = 'Sent'; 
    59                 } 
    60                 if( empty ( $this->folders['spam'] ) ){ 
    61                   $this->folders['spam'] = 'Spam';       
    62                 } 
    63                 if( empty ( $this->folders['drafts'] ) ){ 
    64                   $this->folders['drafts'] = 'Drafts';   
    65                 } 
    66                 if( empty ( $this->folders['trash'] ) ){ 
    67                   $this->folders['trash'] = 'Trash';     
    68                 } 
    69                  
     50                $this->folders['sent']    =  empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']) ? 'Sent' : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']; //Variavel folders armazena o caminho /sent 
     51                $this->folders['spam']    =  empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']) ? 'Spam' : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']; 
     52                $this->folders['drafts']  =  empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']) ? 'Drafts' : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder']; 
     53                $this->folders['trash']   =  empty($_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']) ? 'Trash' : $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder']; 
     54 
    7055                if ($_SESSION['phpgw_info']['expressomail']['email_server']['imapTLSEncryption'] == 'yes') 
    7156                { 
    … …  
    7964         
    8065        function mount_url_folder($folders){ 
    81                  
    82                 if(strlen($folders) == 1){ 
    83                          
    84                         $var = $this->imap_delimiter.$folders[0]; 
    85                         return $var; 
    86                          
    87                 } else { 
    88                  
    89                 $var = ""; 
    90                 for($i = 0; $i<strlen($folders)-1; $i++){ 
    91                         $var += $folders[$i].$this->imap_delimiter; 
    92                 } 
    93                         $var += $folders[strlen($folders) - 1]; 
    94                         return $var; 
    95                 } 
     66                return implode($this->imap_delimiter,$folders); 
    9667        } 
    9768         
    … …  
    24002371                                        break; 
    24012372                                case 1: 
    2402                                         if( ($p = $this->getFolderPos($folders , $user . $this->mount_url_folder(array($this->folders['drafts'])) )) || $p === 0 ) 
     2373                                        if( ($p = $this->getFolderPos($folders , $this->mount_url_folder(array($user , $this->folders['drafts'])) )) || $p === 0 ) 
    24032374                                                $principals[] = $folders[$p]; 
    24042375                                        break; 
    24052376                                case 2: 
    2406                                         if( ($p = $this->getFolderPos($folders , $user . $this->mount_url_folder(array($this->folders['sent'])) )) || $p === 0 ) 
     2377                                        if( ($p = $this->getFolderPos($folders , $this->mount_url_folder(array($user , $this->folders['sent'])) )) || $p === 0 ) 
    24072378                                                $principals[] = $folders[$p]; 
    24082379                                        break; 
    24092380                                case 3: 
    2410                                         if( ($p = $this->getFolderPos($folders , $user . $this->mount_url_folder(array($this->folders['spam'])) )) || $p === 0 ) 
     2381                                        if( ($p = $this->getFolderPos($folders , $this->mount_url_folder(array($user , $this->folders['spam'])) )) || $p === 0 ) 
    24112382                                                $principals[] = $folders[$p]; 
    24122383                                        break; 
    24132384                                case 4: 
    2414                                         if( ($p = $this->getFolderPos($folders , $user . $this->mount_url_folder(array($this->folders['trash'])) )) || $p === 0  ) 
     2385                                        if( ($p = $this->getFolderPos($folders , $this->mount_url_folder(array($user , $this->folders['trash'])) )) || $p === 0  ) 
    24152386                                                $principals[] = $folders[$p];                                            
    24162387                                        break; 

  • trunk/expressoMail1_2/js/draw_api.js

    r5302 r5306  
    211211                } 
    212212 
    213                 var trash_span = document.getElementById(mount_url_folder(["lINBOX","Trash"])  + 'tree_folders');  
    214                 var draft_span = document.getElementById(mount_url_folder(["lINBOX","Drafts"]) + 'tree_folders');  
    215                 var sent_span  = document.getElementById(mount_url_folder(["lINBOX","Sent"]) + 'tree_folders');  
    216                 var spam_span  = document.getElementById(mount_url_folder(["lINBOX","Spam"]) + 'tree_folders'); 
     213                var trash_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Trash"]])  + 'tree_folders');  
     214                var draft_span = document.getElementById(mount_url_folder(["lINBOX",special_folders["Drafts"]]) + 'tree_folders');  
     215                var sent_span  = document.getElementById(mount_url_folder(["lINBOX",special_folders["Sent"]]) + 'tree_folders');  
     216                var spam_span  = document.getElementById(mount_url_folder(["lINBOX",special_folders["Spam"]]) + 'tree_folders'); 
    217217                //local folders 
    218                 var sent_local_conf = this.preferences.save_in_folder.replace("INBOX"+cyrus_delimiter,"local_"); 
     218                var sent_local_conf = this.preferences.save_in_folder.replace(mount_url_folder(["INBOX",""]),"local_"); 
    219219                var sent_local_conf_span=document.getElementById('l'+sent_local_conf+'tree_folders'); 
    220220                var trash_local_span=document.getElementById('llocal_'+special_folders['Trash']+'tree_folders'); 
    … …  
    249249 
    250250                draw_paging(Element('tot_m').innerHTML); 
    251                 if(document.getElementById(mount_url_folder(["nINBOX","Trash"])+"tree_folders")) 
     251                if(document.getElementById(mount_url_folder(["nINBOX",special_folders["Trash"]])+"tree_folders")) 
    252252                { 
    253253                        var trash = document.createElement("SPAN"); 
    … …  
    260260                        trash.onmouseover = function() {trash.style.color="red";}; 
    261261                        trash.onmouseout= function() {trash.style.color="#666666";}; 
    262                         document.getElementById(mount_url_folder(["nINBOX","Trash"])+"tree_folders").appendChild(trash); 
    263                 } 
    264                 if(document.getElementById(mount_url_folder(["nINBOX","Spam"])+"tree_folders")) 
     262                        document.getElementById(mount_url_folder(["nINBOX",special_folders["Trash"]])+"tree_folders").appendChild(trash); 
     263                } 
     264                if(document.getElementById(mount_url_folder(["nINBOX",special_folders["Spam"]])+"tree_folders")) 
    265265                { 
    266266                                                var spam = document.createElement("SPAN"); 
    … …  
    274274                                                spam.onmouseover = function() {spam.style.color="red";}; 
    275275                                                spam.onmouseout= function() {spam.style.color="#666666";}; 
    276                                                 document.getElementById(mount_url_folder(["nINBOX","Spam"])+"tree_folders").appendChild(spam); 
     276                                                document.getElementById(mount_url_folder(["nINBOX",special_folders["Spam"]])+"tree_folders").appendChild(spam); 
    277277                           } 
    278278 

  • trunk/expressoMail1_2/js/main.js

    r5302 r5306  
    99         
    1010function mount_url_folder(folders){ 
    11          
    12         if(folders.length == 1){ 
    13                  
    14                 var url = cyrus_delimiter+folders[0]; 
    15                 return url; 
    16                  
    17         } else { 
    18          
    19         var url = ""; 
    20         for(var i = 0; i < (folders.length -1); i++){ 
    21                 url += folders[i]+cyrus_delimiter; 
    22         } 
    23         url += folders[folders.length - 1]; 
    24         return url; 
    25         } 
     11        return folders.join(cyrus_delimiter); 
    2612} 
    2713function init(){ 
    … …  
    547533 
    548534function delete_msgs(folder, msgs_number, border_ID, show_success_msg,archive){ 
    549                          
     535                                                 
    550536                        if( preferences.use_local_messages == 1 && expresso_local_messages.isArchiving( msgs_number, folder ) ){ 
    551537                          alert( "Impossivel deletar mensagens que estão ainda estão sendo arquivadas." ); 
    … …  
    563549                          userTrashFolder = 'user'+cyrus_delimiter+arrayFolder[1]+cyrus_delimiter+special_folders['Trash'];   
    564550                        }  
    565                                 else userTrashFolder = mount_url_folder(["INBOX","Trash"]);  
     551                                else userTrashFolder = mount_url_folder(["INBOX",special_folders["Trash"]]);  
    566552          
    567553                        if(openTab.type[currentTab] == 1)  
    … …  
    632618                write_msg(get_lang('No selected message.')); 
    633619} 
    634  
    635620 
    636621   
    … …  
    728713 
    729714        if (selected_messages){ 
     715                 
    730716                var selected_param = ""; 
    731717                if (selected_messages.indexOf(',') != -1) 
    … …  
    736722                                if(tr.getAttribute('name') == current_folder) 
    737723                                        remove_currente_folder += tr.id.replace(/_[a-zA-Z0-9]+/,"")+','; 
    738                                 if ((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX","Trash"])) || !(parseInt(preferences.save_deleted_msg))) 
     724                                 
     725                                if ((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX",special_folders["Trash"]])) || !(parseInt(preferences.save_deleted_msg))) 
    739726                                { 
    740727                                        msg_to_delete +=   ','+special_folders['Trash']+';'+tr.id.replace(/_[a-zA-Z0-9]+/,""); 
    … …  
    755742                        if(tr.getAttribute('name') == current_folder) 
    756743                                        remove_currente_folder += tr.id.replace(/_[a-zA-Z0-9]+/,"")+','; 
    757                         if((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX","Trash"])) || !(parseInt(preferences.save_deleted_msg))){ 
     744                        if((action == 'delete' && tr.getAttribute('name') == mount_url_folder(["INBOX",special_folders["Trash"]])) || !(parseInt(preferences.save_deleted_msg))){ 
    758745                                msg_to_delete = special_folders['Trash']+';'+tr.id.replace(/_[a-zA-Z0-9]+/,""); 
    759746                        }else if (!(tr.getAttribute('name') == new_folder && action != 'delete')){ 
    … …  
    771758                        params += "&new_folder_name_move="+url_encode(new_folder_name); 
    772759                 
    773                         new_folder = mount_url_folder(["INBOX","Trash"]); 
     760                        new_folder = mount_url_folder(["INBOX",special_folders["Trash"]]); 
    774761                        new_folder_name = special_folders['Trash']; 
    775762                        params += "&selected_messages_delete="+url_encode(msg_to_delete); 
    … …  
    777764                        cExecute ("$this.imap_functions.move_delete_search_messages", handler_move_search_msgs, params); 
    778765                }else if(msg_to_delete != ""){ 
    779                         new_folder = mount_url_folder(["INBOX","Trash"]); 
     766                        new_folder = mount_url_folder(["INBOX",special_folders["Trash"]]); 
    780767                        new_folder_name = special_folders['Trash']; 
    781768                        params += "&delete=true"; 
    … …  
    11041091{ 
    11051092    var msgs_to_remove = {}; 
    1106     var target = mount_url_folder(["INBOX","Trash"]) + cyrus_delimiter + 'tmpMoveToLocal'; 
     1093    var target = mount_url_folder(["INBOX",special_folders["Trash"],'tmpMoveToLocal']); 
    11071094     
    11081095    success = expresso_local_messages.select_mail( [ 'original_id', 'original_folder' ], success ); 
    … …  
    29782965                if(!verify_session(data)) 
    29792966                        return; 
    2980                 tree_folders.getNodeById(mount_url_folder(["INBOX","Trash"])).alter({caption: get_lang("Trash")}); 
    2981                 tree_folders.getNodeById(mount_url_folder(["INBOX","Trash"]))._refresh(); 
     2967                tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Trash"]])).alter({caption: get_lang("Trash")}); 
     2968                tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Trash"]]))._refresh(); 
    29822969                update_quota(get_current_folder()); 
    29832970                if (data){ 
    29842971                        write_msg(get_lang('Your Trash folder was empty.')); 
    2985                         if (get_current_folder() == mount_url_folder(["INBOX","Trash"])){ 
     2972                        if (get_current_folder() == mount_url_folder(["INBOX",special_folders["Trash"]])){ 
    29862973                                draw_paging(0); 
    29872974                                remove_rows(document.getElementById("table_box"));                               
    … …  
    30032990                if(!verify_session(data)) 
    30042991                        return; 
    3005                 if (get_current_folder() == mount_url_folder(["INBOX","Spam"])){ 
     2992                if (get_current_folder() == mount_url_folder(["INBOX",special_folders["Spam"]])){ 
    30062993                        draw_paging(0); 
    30072994                        remove_rows(document.getElementById("table_box")); 
    30082995                } 
    3009                 tree_folders.getNodeById(mount_url_folder(["INBOX","Spam"])).alter({caption: get_lang("Spam")}); 
    3010                 tree_folders.getNodeById(mount_url_folder(["INBOX","Spam"]))._refresh(); 
     2996                tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Spam"]])).alter({caption: get_lang("Spam")}); 
     2997                tree_folders.getNodeById(mount_url_folder(["INBOX",special_folders["Spam"]]))._refresh(); 
    30112998                update_quota(get_current_folder()); 
    30122999                if (data) 
    … …  
    31713158        else 
    31723159        { 
    3173                 new_folder = mount_url_folder(["INBOX","Spam"]); 
     3160                new_folder = mount_url_folder(["INBOX",special_folders["Spam"]]); 
    31743161        } 
    31753162        var new_folder_name = 'Spam'; 
    … …  
    31863173                msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r")); 
    31873174        else if(currentTab != 0 && currentTab.indexOf("search_")  >= 0){ 
    3188                 var content_search = document.getElementById('content_id_'+currentTab);'INBOX/Trash', 'Trash', 
    3189                 move_search_msgs('content_id_'+currentTab,  mount_url_folder(["INBOX","Spam"]), special_folders['Spam']); 
     3175                var content_search = document.getElementById('content_id_'+currentTab);mount_url_folder(["INBOX",special_folders['Trash']]), 'Trash', 
     3176                move_search_msgs('content_id_'+currentTab,  mount_url_folder(["INBOX",special_folders["Spam"]]), special_folders['Spam']); 
    31903177                refresh(); 
    31913178                return; 
Note: See TracChangeset for help on using the changeset viewer.