Index: /trunk/expressoMail1_2/inc/load_lang.php
===================================================================
--- /trunk/expressoMail1_2/inc/load_lang.php (revision 566)
+++ /trunk/expressoMail1_2/inc/load_lang.php (revision 604)
@@ -4,5 +4,5 @@
{
$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,7 +14,7 @@
}
}
- $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 "";
?>
Index: /trunk/expressoMail1_2/index.php
===================================================================
--- /trunk/expressoMail1_2/index.php (revision 569)
+++ /trunk/expressoMail1_2/index.php (revision 604)
@@ -96,9 +96,11 @@
'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,5 +147,5 @@
$_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 '";
+ include("inc/load_lang.php");
// INCLUDE these JS Files:
echo $obj -> getFilesJs("js/abas.js," .