- Improvded timezone setting.

tbrehm

2012-01-06 2dd6746808c19821f5d16ddc2e214c1701019daa

 install/update.php

@@ -97,7 +97,7 @@
$conf['language'] = $conf_old['language'];
if($conf['language'] == '{language}') $conf['language'] = 'en';
$conf['timezone'] = $conf_old['timezone'];
if($conf['timezone'] == '{timezone}') $conf['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"];
@@ -128,17 +128,21 @@
if($do_backup == 'yes') {
   
   //* Create the backup directory
   $backup_path = '/var/backup/backup/ispconfig_'.date('Y-m-d_H-i');
   $backup_path = '/var/backup/ispconfig_'.date('Y-m-d_H-i');
   $conf['backup_path'] = $backup_path;
   exec("mkdir -p $backup_path");
   exec("chown root:root $backup_path");
   exec("chmod 700 $backup_path");
   
   //* Do the backup
   swriteln('Creating backup of /usr/local/ispconfig directory...');
   exec("tar pcfz $backup_path/ispconfig_software.tar.gz /usr/local/ispconfig");
   swriteln('Creating backup of /etc directory...');
   exec("tar pcfz $backup_path/etc.tar.gz /etc");
   swriteln('Creating backup of "/usr/local/ispconfig" directory...');
   exec("tar pcfz $backup_path/ispconfig_software.tar.gz /usr/local/ispconfig 2> /dev/null",$out,$returnvar);
   if($returnvar != 0) die("Backup failed. We stop here...\n");
	
   swriteln('Creating backup of "/etc" directory...');
   exec("tar pcfz $backup_path/etc.tar.gz /etc 2> /dev/null",$out,$returnvar);
   if($returnvar != 0) die("Backup failed. We stop here...\n");
	
   exec("chown root:root $backup_path/*.tar.gz");
   exec("chmod 700 $backup_path/*.tar.gz");
}