tbrehm

2012-01-04 0dead8799795e2e64f806dfd28ccae758be11e9a

 install/update.php

@@ -96,6 +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';

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"];
@@ -119,7 +121,28 @@
//** Detect the installed applications
$inst->find_installed_apps();

echo "This application will update ISPConfig 3 on your server.\n";
echo "This application will update ISPConfig 3 on your server.\n\n";

//* Make a backup before we start the update
$do_backup = $inst->simple_query('Shall the script create a ISPConfig backup in /var/backup/ now?', array('yes','no'),'yes');
if($do_backup == 'yes') {
	
   //* Create the backup directory
   $backup_path = '/var/backup/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");
   exec("chown root:root $backup_path/*.tar.gz");
   exec("chmod 700 $backup_path/*.tar.gz");
}


//** Initialize the MySQL server connection
include_once('lib/mysql.lib.php');
@@ -139,11 +162,17 @@
$clientdb_user         = '';
$clientdb_password      = '';

//** Ask user for mysql admin_password if empty
if( empty($conf["mysql"]["admin_password"]) ) {

   $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
}
//** Test mysql root connection
$finished = false;
do {
   if(@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["mysql"]["admin_password"])) {
      $finished = true;
   } else {
      swriteln($inst->lng('Unable to connect to mysql server').' '.mysql_error());
      $conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
   }
} while ($finished == false);
unset($finished);

/*
 *  Prepare the dump of the database