Commit 1b320044 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes #2919 Fixing debug level handling in new setup

parent bcf1c300
......@@ -33,7 +33,7 @@
forceSSL="FALSE"
{/if}
templateCompileDirectory="{$templateCompileDirectory}"
debugLevel="{$cv.fdDebugLevel}"
debugLevel="{$cv.debugLevel}"
>
<!-- Location definition -->
......
......@@ -303,7 +303,7 @@ class setup
$cv['fdLogging'] = FALSE;
$cv['fdDisplayErrors'] = FALSE;
$cv['fdForceSSL'] = TRUE;
$cv['fdDebugLevel'] = 0;
$cv['debugLevel'] = 0;
$smarty->assign("cv", xmlentities($cv));
$smarty->assign("config_checksum", md5(file_get_contents(CONFIG_TEMPLATE_DIR.CONFIG_FILE)));
$smarty->assign("templateCompileDirectory", SPOOL_DIR);
......@@ -314,5 +314,10 @@ class setup
load_plist();
$this->o_steps[$this->i_config] = new Step_Config($this->captured_values);
}
function getDebugLevel ()
{
return $this->o_steps[$this->i_config]->attributesAccess['fdDebugLevel']->computeLdapValue();
}
}
?>
......@@ -44,8 +44,10 @@ class Step_Finish extends setupStep
function get_conf_data()
{
$smarty = get_smarty();
$smarty->assign('cv', xmlentities($this->parent->captured_values));
$smarty = get_smarty();
$cv = $this->parent->captured_values;
$cv['debugLevel'] = $this->parent->getDebugLevel();
$smarty->assign('cv', xmlentities($cv));
$smarty->assign('config_checksum', md5(file_get_contents(CONFIG_TEMPLATE_DIR.CONFIG_FILE)));
$smarty->assign('templateCompileDirectory', SPOOL_DIR);
return $smarty->fetch(CONFIG_TEMPLATE_DIR.CONFIG_FILE);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment