From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6

---
 install/autoupdate.php |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/install/autoupdate.php b/install/autoupdate.php
index e3fa094..e43cd51 100644
--- a/install/autoupdate.php
+++ b/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);
 
 /*
@@ -78,10 +80,6 @@
 unset($conf);
 
 if($dist['id'] == '') die('Linux distribution or version not recognized.');
-
-//** Check version
-// if(compare_ispconfig_version('3.0.3',ISPC_APP_VERSION) < 0) die("This updater is for ISPConfig versions > 3.0.3.0. Please Update to ISPConfig 3.0.3.3 first before you update to the current ISPConfig version.\n");
-
 
 //** Include the distribution-specific installer class library and configuration
 if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
@@ -148,6 +146,11 @@
 	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
 */
@@ -160,7 +163,6 @@
 
 //* initialize the database
 $inst->db = new db();
-// $inst->db->dbName = $conf["mysql"]["database"];
 
 /*
  * The next line is a bit tricky!

--
Gitblit v1.9.1