X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fmain.php;h=2ea2668a21bc692425edd6036d589a10c389d8e0;hb=5c2d01aab3c13cca9f03b4983a3a00b4ea47ae51;hp=f9e19fa341a9299e1d01dd558d2d8b7b107829e3;hpb=e6549ef71b8ea8dce60446b4b004874787aca759;p=gosa.git diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php index f9e19fa34..2ea2668a2 100644 --- a/gosa-core/html/main.php +++ b/gosa-core/html/main.php @@ -41,6 +41,8 @@ session::set('errorsAlreadyPosted',array()); session::global_set('runtime_cache',array()); session::set('limit_exceeded',FALSE); +pathNavigator::clear(); + if ($_SERVER["REQUEST_METHOD"] == "POST"){ @DEBUG (DEBUG_POST, __LINE__, __FUNCTION__, __FILE__, $_POST, "_POST"); } @@ -62,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"); } @@ -74,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')); @@ -95,7 +98,8 @@ 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 */ $reload_navigation = false; @@ -145,8 +149,8 @@ if (!session::global_is_set('plist')){ require_once("$BASE_DIR/$path"); } else { msg_dialog::display(_("Fatal error"), - sprintf(_("Cannot locate file '%s' - please run '%s' to fix this"), - "$BASE_DIR/$path", "update-gosa"), FATAL_ERROR_DIALOG); + sprintf(_("Cannot locate file %s - please run %s to fix this"), + bold("$BASE_DIR/$path"), bold("update-gosa")), FATAL_ERROR_DIALOG); exit; } } @@ -162,10 +166,10 @@ 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 on. GOsa will refuse to login unless this is fixed by an administrator."), + _("FATAL: Register globals is active. Please fix this in order to continue."), FATAL_ERROR_DIALOG); new log("security","login","",array(),"Register globals is on. For security reasons, this should be turned off.") ; @@ -265,10 +269,12 @@ if (isset($_GET['reset'])){ } /* show web frontend */ -$smarty->assign ("logo", "