tbrehm
2012-04-10 94bddda25cf9d5971c9ea4e4ffc77a5890c55c49
install/update.php
@@ -96,8 +96,8 @@
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
$conf['language'] = $conf_old['language'];
if($conf['language'] == '{language}') $conf['language'] = 'en';
$conf['timezone'] = $conf_old['timezone'];
if($conf['timezone'] == '{timezone}') $conf['timezone'] = 'UTC';
$conf['timezone'] = (isset($conf_old['timezone']))?$conf_old['timezone']:'UTC';
if($conf['timezone'] == '{timezone}' or trim($conf['timezone']) == '') $conf['timezone'] = 'UTC';
if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
@@ -362,7 +362,7 @@
swriteln('Updating ISPConfig');
if ($conf['services']['web'] && $inst->ispconfig_interface_installed) {
if ($conf['services']['web'] && $inst->install_ispconfig_interface) {
   //** Customise the port ISPConfig runs on
   $ispconfig_port_number = get_ispconfig_port_number();
   if($conf['webserver']['server_type'] == 'nginx'){