X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fmain.php;h=2ea2668a21bc692425edd6036d589a10c389d8e0;hb=5c2d01aab3c13cca9f03b4983a3a00b4ea47ae51;hp=fc440536a34e4df802e974c6acd109c6a5c9d6ec;hpb=9d89440b5b310d94917778fd4c89bf48860a360f;p=gosa.git

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index fc440536a..2ea2668a2 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -64,9 +64,10 @@ if ($_SERVER['REMOTE_ADDR'] != $ui->ip){
 }
 $config= session::global_get('config');
 $config->check_and_reload();
+$config->configRegistry->reload();
 
 /* Enable compressed output */
-if ($config->get_cfg_value("sendCompressedOutput") == "true"){
+if ($config->get_cfg_value("core","sendCompressedOutput") == "true"){
   ob_start("ob_gzhandler");
 }
 
@@ -76,7 +77,7 @@ if(session::global_get('_LAST_PAGE_REQUEST') == ""){
 }else{
 
   /* check GOsa.conf for defined session lifetime */
-  $max_life= $config->get_cfg_value("sessionLifetime", 60*60*2);
+  $max_life= $config->get_cfg_value("core","sessionLifetime");
 
   /* get time difference between last page reload */
   $request_time = (time()- session::global_get('_LAST_PAGE_REQUEST'));
@@ -97,7 +98,7 @@ if(session::global_get('_LAST_PAGE_REQUEST') == ""){
 @DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
 
 /* Set template compile directory */
-$smarty->compile_dir= $config->get_cfg_value("templateCompileDirectory", '/var/spool/gosa');
+$smarty->compile_dir= $config->get_cfg_value("core","templateCompileDirectory", '/var/spool/gosa');
 $smarty->error_unassigned= true;
 
 /* Set default */
@@ -165,7 +166,7 @@ if (!session::global_is_set('plist')){
 $plist= session::global_get('plist');
 
 /* Check for register globals */
-if (isset($global_check) && $config->get_cfg_value("forceglobals") == "true"){
+if (isset($global_check) && $config->get_cfg_value("core","forceglobals") == "true"){
   msg_dialog::display(
             _("PHP configuration"),
             _("FATAL: Register globals is active. Please fix this in order to continue."),
@@ -308,8 +309,6 @@ if($reload_navigation){
 $smarty->assign ("menu", $plist->gen_menu());
 $smarty->assign ("plug", "$plug");
 
-$smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround","false" ) == "true");
-$smarty->assign("usePrototype", "false");
 
 /* React on clicks */
 if ($_SERVER["REQUEST_METHOD"] == "POST"){
@@ -335,7 +334,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
 }
 
 /* check if we are using account expiration */
-if ($config->get_cfg_value("handleExpiredAccounts") == "true"){
+if ($config->get_cfg_value("core","handleExpiredAccounts") == "true"){
   $expired= ldap_expired_account($config, $ui->dn, $ui->username);
 
   if ($expired == 2){
@@ -428,7 +427,7 @@ if(isset($_COOKIE['GOsa_Filter_Settings'])){
 }
 
 /* Save filters? */
-if($config->get_cfg_value("storeFilterSettings") == "true"){
+if($config->get_cfg_value("core","storeFilterSettings") == "true"){
   $cookie_vars = array("MultiDialogFilters","CurrentMainBase");
   foreach($cookie_vars as $var){
     if(session::global_is_set($var)){