Commit 3ff20295 authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes #3750 fusiondirectory.conf attribute configVersion is unused and should be removed

Showing with 3 additions and 9 deletions
+3 -9
{literal}<?xml version="1.0"?>{/literal}
<conf configVersion="{$config_checksum}" >
<conf>
<!-- Services **************************************************************
Old services that are not based on simpleService needs to be listed here
......
......@@ -145,7 +145,7 @@ Layout example:
<?xml version=\*(L"1.0\*(R"?>
.PP
.Vb 1
\& <conf configVersion="...." >
\& <conf>
\&
\& <!\-\- Global setup \-\->
\& <main>
......
......@@ -16,7 +16,7 @@ Layout example:
<?xml version="1.0"?>
<conf configVersion="...." >
<conf>
<!-- Global setup -->
<main>
......
......@@ -63,7 +63,6 @@ class config {
'MENU' => array()
);
var $basedir = "";
var $config_version = "NOT SET";
/* Keep a copy of the current department list */
var $departments = array();
......@@ -185,9 +184,6 @@ class config {
/* Trigger on CONF section */
if ($tag == 'CONF') {
$this->config_found = TRUE;
if (isset($attrs['CONFIGVERSION'])) {
$this->config_version = $attrs['CONFIGVERSION'];
}
}
/* Return if we're not in config section */
......
......@@ -305,7 +305,6 @@ class setup
$cv['fdForceSSL'] = TRUE;
$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);
$xml = $smarty->fetch(CONFIG_TEMPLATE_DIR.CONFIG_FILE);
$config->parse_data($xml);
......
......@@ -48,7 +48,6 @@ class Step_Finish extends setupStep
$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);
}
......
  • bmortier @bmortier

    mentioned in issue #1235

    By Côme Chilliet on 2017-09-02T15:18:52 (imported from GitLab)

    ·

    mentioned in issue #1235

    By Côme Chilliet on 2017-09-02T15:18:52 (imported from GitLab)

    Toggle commit list
Supports Markdown
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