added auto-revision from svn to version

redray

2008-12-01 6eaaa70ea8ee9cd1044dbd101d6573d2e134d0f2

 install/update.php

@@ -28,8 +28,12 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

/*
   ISPConfig 3 updater.
*/

//** ISPConfig 3 installer.
error_reporting(E_ALL|E_STRICT);

//** The banner on the command line
echo "\n\n".str_repeat('-',80)."\n";
echo " _____ ___________   _____              __ _       
@@ -43,14 +47,13 @@
echo "\n".str_repeat('-',80)."\n";
echo "\n\n>> Update  \n\n";


//** Include the library with the basic installer functions
require_once('lib/install.lib.php');

//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');

//** Installer/updater logfile
//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../'));

@@ -82,6 +85,7 @@
//** Set the mysql login information
$conf["mysql"]["host"] = $conf_old["db_host"];
$conf["mysql"]["database"] = $conf_old["db_database"];
$conf['mysql']['charset'] = 'utf8';
$conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];

@@ -138,10 +142,10 @@
//** load old data back into database
if( !empty($conf["mysql"]["admin_password"]) ) {

   system("mysql -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." -p".$conf['mysql']['admin_password']." ".$conf['mysql']['database']." < existing_db.sql");
   system("mysql --default-character-set=".$conf['mysql']['charset']." -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." -p".$conf['mysql']['admin_password']." ".$conf['mysql']['database']." < existing_db.sql");
} else {

   system("mysql -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." ".$conf['mysql']['database']." < existing_db.sql");
   system("mysql --default-character-set=".$conf['mysql']['charset']." -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." ".$conf['mysql']['database']." < existing_db.sql");
}

// create a backup copy of the ispconfig database in the root folder
@@ -250,19 +254,19 @@
//** Restart services:
if($reconfigure_services_answer == 'yes') {
   swriteln('Restarting services ...');
   system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
   system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
   if($conf['mysql']['init_script'] != '')            system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
   if($conf['postfix']['init_script'] != '')         system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
   if($conf['saslauthd']['init_script'] != '')         system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
   if($conf['amavis']['init_script'] != '')         system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
   if($conf['clamav']['init_script'] != '')         system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
   if($conf['courier']['courier-authdaemon'] != '')    system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
   if($conf['courier']['courier-imap'] != '')          system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
   if($conf['courier']['courier-imap-ssl'] != '')       system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
   if($conf['courier']['courier-pop'] != '')          system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
   if($conf['courier']['courier-pop-ssl'] != '')       system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
   if($conf['apache']['init_script'] != '')          system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   if($conf['pureftpd']['init_script'] != '')         system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
   if($conf['mydns']['init_script'] != '')            system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
}

echo "Update finished.\n";