Changeset 109 for trunk/expressoMail1_2/index.php

Timestamp:

11/12/07 16:24:19 (16 years ago)

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/expressoMail1_2/index.php (modified) (1 diff)

trunk/expressoMail1_2/index.php

@@ -84 +84 @@
        // Set Imap Folder names options
 
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_trash_folder'] = $current_config['expressoMail_trash_folder'];
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_drafts_folder'] = $current_config['expressoMail_drafts_folder'];
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_spam_folder'] = $current_config['expressoMail_spam_folder'];
-    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_sent_folder'] = $current_config['expressoMail_sent_folder'];
+    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_trash_folder']      = $current_config['expressoMail_trash_folder']  ? $current_config['expressoMail_trash_folder']  : lang("Trash");
+    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_drafts_folder'] = $current_config['expressoMail_drafts_folder'] ? $current_config['expressoMail_drafts_folder'] : lang("Drafts");
+    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_spam_folder']       = $current_config['expressoMail_spam_folder']   ? $current_config['expressoMail_spam_folder']   : lang("Spam");
+    $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_sent_folder']       = $current_config['expressoMail_sent_folder']   ? $current_config['expressoMail_sent_folder']   : lang("Sent");
 
     echo '<script> var special_folders = new Array(4);
-                      special_folders["'. $current_config['expressoMail_trash_folder'].'"] = \'Trash\';
-                      special_folders["'. $current_config['expressoMail_drafts_folder'].'"] = \'Drafts\';
-                      special_folders["'. $current_config['expressoMail_spam_folder'].'"] = \'Spam\';
-                      special_folders["'. $current_config['expressoMail_sent_folder'].'"] = \'Sent\';
+                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_trash_folder'].'"] = \'Trash\';
+                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_drafts_folder'].'"] = \'Drafts\';
+                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_spam_folder'].'"] = \'Spam\';
+                      special_folders["'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_sent_folder'].'"] = \'Sent\';
 
-       var trashfolder = "' . $current_config['expressoMail_trash_folder'] . '";
+       var trashfolder = "'.$_SESSION['phpgw_info']['server']['expressomail']['expressoMail_trash_folder'].'";