Updated version number to 3.0.4.6

tbrehm

2012-06-11 897af06af9522ded99b1e0f46730299e89856ffe

 install/autoupdate.php

@@ -31,6 +31,8 @@
   ISPConfig 3 updater.
*/

die("Autoupdate has been removed.\nPlease start the update on the shell with the command ispconfig_update.sh as root user.\n");

error_reporting(E_ALL|E_STRICT);

/*
@@ -144,6 +146,16 @@
   die("internal error - MYSQL-Root passord not known");
}

//** Test mysql root connection
if(!@mysql_connect($conf["mysql"]["host"],$conf["mysql"]["admin_user"],$conf["mysql"]["admin_password"])) {
   die("internal error - MYSQL-Root passord wrong");
}

/*
 *  Check all tables
*/
checkDbHealth();

/*
 *  Prepare the dump of the database 
*/
@@ -244,15 +256,21 @@
   }
}

if($conf['services']['web'] == true) {
   //** Configure Apache
   swriteln('Configuring Apache');
   $inst->configure_apache();

   //** Configure vlogger
   swriteln('Configuring vlogger');
   $inst->configure_vlogger();

if($conf['services']['web']) {
   if($conf['webserver']['server_type'] == 'apache'){
      //** Configure Apache
      swriteln('Configuring Apache');
      $inst->configure_apache();
       
      //** Configure vlogger
      swriteln('Configuring vlogger');
      $inst->configure_vlogger();
   } else {
      //** Configure nginx
      swriteln('Configuring nginx');
      $inst->configure_nginx();
   }
	
   //** Configure apps vhost
   swriteln('Configuring Apps vhost');
   $inst->configure_apps_vhost();
@@ -300,7 +318,9 @@
   if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script']))       system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
}
if($conf['services']['web']) {
   if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script']))             system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   if($conf['webserver']['server_type'] == 'apache' && $conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script']))             system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   //* Reload is enough for nginx
   if($conf['webserver']['server_type'] == 'nginx' && $conf['nginx']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['nginx']['init_script']))             system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' reload');
   if($conf['pureftpd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['pureftpd']['init_script']))            system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
}
if($conf['services']['dns']) {