Fixed: FS#2378 - $conf['theme'] value in interface/lib/config.inc.php is overwritten (reset to 'default') on update

Author: tbrehm

install/dist/lib/fedora.lib.php

@@ -742,6 +742,7 @@ public function install_ispconfig()
 		$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
 		$content = str_replace('{language}', $conf['language'], $content);
 		$content = str_replace('{timezone}', $conf['timezone'], $content);
+		$content = str_replace('{theme}', $conf['theme'], $content)
 
 		wf("$install_dir/interface/lib/$configfile", $content);
 
@@ -765,6 +766,7 @@ public function install_ispconfig()
 		$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
 		$content = str_replace('{language}', $conf['language'], $content);
 		$content = str_replace('{timezone}', $conf['timezone'], $content);
+		$content = str_replace('{theme}', $conf['theme'], $content)
 
 		wf("$install_dir/server/lib/$configfile", $content);
 

install/dist/lib/gentoo.lib.php

@@ -740,6 +740,7 @@ public function install_ispconfig()
 		$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
 		$content = str_replace('{language}', $conf['language'], $content);
 		$content = str_replace('{timezone}', $conf['timezone'], $content);
+		$content = str_replace('{theme}', $conf['theme'], $content)
 
 		$this->write_config_file("$install_dir/interface/lib/$configfile", $content);
 

install/dist/lib/opensuse.lib.php

@@ -782,6 +782,7 @@ public function install_ispconfig()
 		$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
 		$content = str_replace('{language}', $conf['language'], $content);
 		$content = str_replace('{timezone}', $conf['timezone'], $content);
+		$content = str_replace('{theme}', $conf['theme'], $content)
 
 		wf("$install_dir/interface/lib/$configfile", $content);
 
@@ -805,6 +806,7 @@ public function install_ispconfig()
 		$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
 		$content = str_replace('{language}', $conf['language'], $content);
 		$content = str_replace('{timezone}', $conf['timezone'], $content);
+		$content = str_replace('{theme}', $conf['theme'], $content)
 
 		wf("$install_dir/server/lib/$configfile", $content);
 

install/install.php

@@ -109,6 +109,9 @@
 $conf['timezone'] = $tmp_out[0];
 unset($tmp_out);
 
+//* Set defaukt theme
+$conf['theme'] = 'default';
+
 //** Select installation mode
 $install_mode = $inst->simple_query('Installation mode', array('standard','expert'), 'standard');
 

install/lib/installer_base.lib.php

@@ -1650,6 +1650,7 @@ public function install_ispconfig() {
 		$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
 		$content = str_replace('{language}', $conf['language'], $content);
 		$content = str_replace('{timezone}', $conf['timezone'], $content);
+		$content = str_replace('{theme}', $conf['theme'], $content);
 
 		wf($install_dir.'/interface/lib/'.$configfile, $content);
 
@@ -1673,6 +1674,7 @@ public function install_ispconfig() {
 		$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
 		$content = str_replace('{language}', $conf['language'], $content);
 		$content = str_replace('{timezone}', $conf['timezone'], $content);
+		$content = str_replace('{theme}', $conf['theme'], $content);
 
 		wf($install_dir.'/server/lib/'.$configfile, $content);
 

install/tpl/config.inc.php.master

@@ -144,7 +144,7 @@ $conf['software_updates_enabled'] = false;
 
 
 //** Themes
-$conf['theme'] = 'default';
+$conf['theme'] = '{theme}';
 $conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
 $conf['logo'] = 'themes/default/images/header_logo.png';