diff --git a/contrib/fusiondirectory.conf b/contrib/fusiondirectory.conf index 5cef0d8b7ab313bc2e9470d7e78be1556349f1a7..6ae25eecaacd2d154b56cb1648f2bb8893fd6657 100644 --- a/contrib/fusiondirectory.conf +++ b/contrib/fusiondirectory.conf @@ -1,5 +1,5 @@ {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 diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5 index e662aef7f65a8567cc02b9ad4f43d9084ec0cc49..859ef6cf8d48c5370f4dc659dd6a53dea1c755e6 100644 --- a/contrib/man/fusiondirectory.conf.5 +++ b/contrib/man/fusiondirectory.conf.5 @@ -145,7 +145,7 @@ Layout example: <?xml version=\*(L"1.0\*(R"?> .PP .Vb 1 -\& <conf configVersion="...." > +\& <conf> \& \& <!\-\- Global setup \-\-> \& <main> diff --git a/contrib/man/fusiondirectory.conf.pod b/contrib/man/fusiondirectory.conf.pod index 428192380a54b77fb9be277a86d3679fcc4a2e68..0c80a57bb799a49e175f1dbfedbea1aea302bfd8 100644 --- a/contrib/man/fusiondirectory.conf.pod +++ b/contrib/man/fusiondirectory.conf.pod @@ -16,7 +16,7 @@ Layout example: <?xml version="1.0"?> - <conf configVersion="...." > + <conf> <!-- Global setup --> <main> diff --git a/include/class_config.inc b/include/class_config.inc index 9f6176e86b4dc0369f3ac257cf9b396194e8dbe2..bfca96eb23b3f230c18a5ee9cae37fdaa9a31ea4 100644 --- a/include/class_config.inc +++ b/include/class_config.inc @@ -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 */ diff --git a/setup/class_setup.inc b/setup/class_setup.inc index 5c69b2328cab638285e043bcd5a6e763cc28b646..6a4e00432af5ac90eb8835d466b6cca306250415 100644 --- a/setup/class_setup.inc +++ b/setup/class_setup.inc @@ -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); diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc index 2e0dd94a748b2ffb140706ab5da8c5d00dede941..3c3b0252760bd03d76c8fe5a97a0418b6d5a0a18 100644 --- a/setup/class_setupStep_Finish.inc +++ b/setup/class_setupStep_Finish.inc @@ -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); }