index b777ebc886bfb8a301dffe10f6eee61623107674..2ea2668a21bc692425edd6036d589a10c389d8e0 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
}
$config= session::global_get('config');
$config->check_and_reload();
}
$config= session::global_get('config');
$config->check_and_reload();
+$config->configRegistry->reload();
/* Enable compressed output */
/* Enable compressed output */
-if ($config->get_cfg_value("sendCompressedOutput") == "true"){
+if ($config->get_cfg_value("core","sendCompressedOutput") == "true"){
ob_start("ob_gzhandler");
}
ob_start("ob_gzhandler");
}
}else{
/* check GOsa.conf for defined session lifetime */
}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'));
/* get time difference between last page reload */
$request_time = (time()- session::global_get('_LAST_PAGE_REQUEST'));
@DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
/* Set template compile directory */
@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 */
$smarty->error_unassigned= true;
/* Set default */
require_once("$BASE_DIR/$path");
} else {
msg_dialog::display(_("Fatal error"),
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", "<b>update-gosa</b>"), 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;
}
}
exit;
}
}
$plist= session::global_get('plist');
/* Check for register globals */
$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"),
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.") ;
FATAL_ERROR_DIALOG);
new log("security","login","",array(),"Register globals is on. For security reasons, this should be turned off.") ;
}
/* show web frontend */
}
/* show web frontend */
+$smarty->assign ("title","GOsa");
$smarty->assign ("logo", image(get_template_path("images/logo.png")));
$smarty->assign ("logoutimage", get_template_path("images/btn-logout.png"));
$smarty->assign ("date", date("l, dS F Y H:i:s O"));
$smarty->assign ("logo", image(get_template_path("images/logo.png")));
$smarty->assign ("logoutimage", get_template_path("images/btn-logout.png"));
$smarty->assign ("date", date("l, dS F Y H:i:s O"));
$smarty->assign ("menu", $plist->gen_menu());
$smarty->assign ("plug", "$plug");
$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"){
/* React on clicks */
if ($_SERVER["REQUEST_METHOD"] == "POST"){
}
/* check if we are using account expiration */
}
/* 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){
$expired= ldap_expired_account($config, $ui->dn, $ui->username);
if ($expired == 2){
} else {
msg_dialog::display(
_("Plugin"),
} else {
msg_dialog::display(
_("Plugin"),
- sprintf(_("FATAL: Cannot find any plugin definitions for plugin '%s'!"), $plug),
+ sprintf(_("FATAL: Cannot find any plugin definitions for plugin %s!"), bold($plug)),
FATAL_ERROR_DIALOG);
exit();
}
FATAL_ERROR_DIALOG);
exit();
}
}
/* Save filters? */
}
/* 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)){
$cookie_vars = array("MultiDialogFilters","CurrentMainBase");
foreach($cookie_vars as $var){
if(session::global_is_set($var)){