Changeset 604

Timestamp:

01/14/09 15:25:35 (15 years ago)

Author:

niltonneto

Message:

Resolve #397

Location:

trunk/expressoMail1_2

Files:

• inc/load_lang.php (modified) (2 diffs)
• index.php (modified) (3 diffs)

trunk/expressoMail1_2/inc/load_lang.php

@@ -4 +4 @@
         {
                 $array_keys = array();
-                $fn = '../setup/phpgw_'.$_SESSION['phpgw_info']['expressomail']['user']['preferences']['common']['lang'].'.lang';                       
+                $fn = 'setup/phpgw_'.$_SESSION['phpgw_info']['expressomail']['user']['preferences']['common']['lang'].'.lang';                  
                 if (file_exists($fn)){
                         $fp = fopen($fn,'r');
@@ -14 +14 @@
                 }
         }
-        $script  = "array_lang = new Array();";
+        
         foreach($_SESSION['phpgw_info']['expressomail']['lang'] as $key => $value)
                 $script .= "array_lang['".str_replace("'","\'",strtolower($key))."'] = '".str_replace("'","\'",$value)."';\n";
-        echo $script;
+        echo "<script type='text/javascript'>$script</script>";
 ?>

trunk/expressoMail1_2/index.php

@@ -96 +96 @@
                         'use_dynamic_contacts'                          => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_dynamic_contacts'] : "0",
                         'number_of_contacts'                            => $current_config['expressoMail_Number_of_dynamic_contacts'] ? $current_config['expressoMail_Number_of_dynamic_contacts'] : "0",
-                'use_cache'                                             => $current_config['expressoMail_enable_cache']
+                        'use_cache'                                             => $current_config['expressoMail_enable_cache'],
+                        'notification_domains'                  => $current_config['expressoMail_notification_domains']
 
 
                 
         );
+
 
         $template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
@@ -145 +147 @@
     $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder']              : lang("Spam");
     $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']    = $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']      ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder']              : lang("Sent");
-
+    
     echo '<script> var special_folders = new Array(4);
         special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"] = \'Trash\';
@@ -160 +162 @@
 
         $obj = createobject("expressoMail1_2.functions");
-        echo "<script src='inc/load_lang.php?".$update_version."' type='text/javascript'></script>";    
+        include("inc/load_lang.php");           
         // INCLUDE these JS Files: 
         echo $obj -> getFilesJs("js/abas.js," .