Changeset 1283

Timestamp:

08/06/09 10:54:35 (15 years ago)

Author:

amuller

Message:

Ticket #485 - Correção das pastas nas preferencias

File:

• trunk/expressoMail1_2/inc/hook_settings.inc.php (modified) (2 diffs)

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -93 +93 @@
 
 //Use user folders from email
-require_once('class.imap_functions.inc.php');
-$boemailadmin = CreateObject('emailadmin.bo');
-$emailadmin_profile = $boemailadmin->getProfileList();
-$_SESSION['phpgw_info']['expressomail']['email_server'] = $boemailadmin->getProfile($emailadmin_profile[0]['profileID']);
-$_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user'];
-$e_server = $_SESSION['phpgw_info']['expressomail']['email_server'];
-$imap = CreateObject('expressoMail1_2.imap_functions');
-$save_in_folder_selected = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'];
-
-// Load Special Folders (Sent, Trash, Draft, Spam) from EmailAdmin (if exists, else get_lang)
-$specialFolders = array ("Trash" => lang("Trash"), "Drafts" => lang("Drafts"), "Spam" => lang("Spam"), "Sent" => lang("Sent")); 
-foreach ($specialFolders as $key => $value){
-        if($e_server['imapDefault'.$key.'Folder'])
-                $specialFolders[$key] = $e_server['imapDefault'.$key.'Folder'];
-}
-unset($default);
-foreach($imap -> get_folders_list() as $id => $folder){
-        if (!(is_numeric($id) || strstr($folder['folder_id'],"user".$e_server['imapDelimiter'])))
-                continue;
-        else{
-                // Translate INBOX (root folder)
-                if (strtolower($folder['folder_name']) == "inbox")
-                        $folder['folder_name'] = lang("Inbox");
-                // Translate Special Folders
-                elseif (($keyFolder = array_search($folder['folder_name'], $specialFolders)) !== false)
-                        $folder['folder_name'] = lang($keyFolder);
+if ($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'];
+        $default = Array(
+                'INBOX' =>      lang('INBOX'), 
+                'INBOX/'.$trash => $trash,  
+                'INBOX/'.$drafts => $drafts,
+                'INBOX/'.$spam => $spam,
+                'INBOX/'.$sent => $sent
+        );
+}
+else{
+        require_once('class.imap_functions.inc.php');
+        $boemailadmin = CreateObject('emailadmin.bo');
+        $emailadmin_profile = $boemailadmin->getProfileList();
+        $_SESSION['phpgw_info']['expressomail']['email_server'] = $boemailadmin->getProfile($emailadmin_profile[0]['profileID']);
+        $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user'];
+        $e_server = $_SESSION['phpgw_info']['expressomail']['email_server'];
+        $imap = CreateObject('expressoMail1_2.imap_functions');
+        $save_in_folder_selected = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'];
+
+        // Load Special Folders (Sent, Trash, Draft, Spam) from EmailAdmin (if exists, else get_lang)
+        $specialFolders = array ("Trash" => lang("Trash"), "Drafts" => lang("Drafts"), "Spam" => lang("Spam"), "Sent" => lang("Sent")); 
+        foreach ($specialFolders as $key => $value){
+                if($e_server['imapDefault'.$key.'Folder'])
+                        $specialFolders[$key] = $e_server['imapDefault'.$key.'Folder'];
+        }
+        unset($default);
+        foreach($imap -> get_folders_list() as $id => $folder){
+                if (!(is_numeric($id) || strstr($folder['folder_id'],"user".$e_server['imapDelimiter'])))
+                        continue;
+                else{
+                        // Translate INBOX (root folder)
+                        if (strtolower($folder['folder_name']) == "inbox")
+                                $folder['folder_name'] = lang("Inbox");
+                        // Translate Special Folders
+                        elseif (($keyFolder = array_search($folder['folder_name'], $specialFolders)) !== false)
+                                $folder['folder_name'] = lang($keyFolder);
 /*      // Identation for subfolders
         $folder_id = explode($e_server['imapDelimiter'],$folder['folder_id']);       
@@ -126 +140 @@
                 $ident .= ' - ';
 $o_folders.= "<option value='".$folder['folder_id']."' ".($save_in_folder_selected == $folder['folder_id'] ? 'selected' : '' ).">".$ident.$folder['folder_name']."</option>";           */
-                $default[$folder['folder_id']] = $folder['folder_name'];
+                        $default[$folder['folder_id']] = $folder['folder_name'];
+                }
         }
 }