From f598b0538af4f60282766de07b7b642cf2339c6d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 17 Aug 2012 03:22:19 -0400
Subject: [PATCH] Fixed: FS#2378 - $conf['theme'] value in interface/lib/config.inc.php is overwritten (reset to 'default') on update

---
 install/tpl/config.inc.php.master  |    2 +-
 install/install.php                |    3 +++
 install/lib/installer_base.lib.php |    2 ++
 install/dist/lib/fedora.lib.php    |    2 ++
 install/dist/lib/gentoo.lib.php    |    1 +
 install/dist/lib/opensuse.lib.php  |    2 ++
 6 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index bd38b20..7ee22dc 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -742,6 +742,7 @@
 		$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 @@
 		$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);
 		
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index e9f4838..dab2c5f 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -740,6 +740,7 @@
 		$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);
 		
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 7370984..d117b25 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -782,6 +782,7 @@
 		$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 @@
 		$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);
 		
diff --git a/install/install.php b/install/install.php
index c9f3794..d2a4416 100644
--- a/install/install.php
+++ b/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');
 
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index b887a94..dd55a54 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1650,6 +1650,7 @@
 		$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 @@
 		$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);
 
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index cc6933f..ff6e6a4 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -144,7 +144,7 @@
 
 
 //** 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';
 

--
Gitblit v1.9.1