From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
install/autoupdate.php | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/install/autoupdate.php b/install/autoupdate.php
index a9863ce..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);
/*
@@ -144,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
*/
@@ -156,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