diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index bd38b203112e6f6b408901bbfcdea68676b828be..7ee22dc99b94d7f4370b00240dd7482fc1d16dd3 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -742,6 +742,7 @@ class installer_dist extends installer_base { $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 @@ class installer_dist extends installer_base { $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 e9f48387f4f52572f9e00a23fc878294b645b5d9..dab2c5fc98c0653f3a8800250f3f3f6deb912c30 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -740,6 +740,7 @@ class installer extends installer_base $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 7370984fc00da81595ee40806f31353088b5e5d6..d117b251af84a935abffa8bb2b7f0c6a0d25c2d2 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -782,6 +782,7 @@ class installer_dist extends installer_base { $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 @@ class installer_dist extends installer_base { $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 c9f37944f67cdb3c8007a6ea10a60686d932e954..d2a4416eda8288bb1fcdea65d1ef575ecacd57b5 100644 --- a/install/install.php +++ b/install/install.php @@ -109,6 +109,9 @@ exec('date +%Z', $tmp_out); $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 b887a94c975811d25e9a45937b9e4ccf986c8347..dd55a5493acecbf42d65f1bbc5ae3704b46c093f 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1650,6 +1650,7 @@ class installer_base { $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 @@ class installer_base { $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 cc6933f7705086915146de0460b46adb91338593..ff6e6a49a566ebd37d40cf0101fe0b64ef46beb9 100644 --- a/install/tpl/config.inc.php.master +++ b/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';