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).
---
server/scripts/ispconfig_update.php | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php
index d2f10d8..58d8ef5 100644
--- a/server/scripts/ispconfig_update.php
+++ b/server/scripts/ispconfig_update.php
@@ -51,7 +51,7 @@
//* Stop the installation
if($input == 'quit') {
- swriteln($this->lng("Installation terminated by user.\n"));
+ swriteln("Installation terminated by user.\n");
die();
}
@@ -86,20 +86,22 @@
|___/ ";
echo "\n".str_repeat('-',80)."\n";
echo "\n\n>> Update \n\n";
-echo "Please choose the update method. For production systems select 'stable'. \nThe update from svn is only for development systems and may break your current setup.\n\n";
+echo "Please choose the update method. For production systems select 'stable'. \nThe update from svn is only for development systems and may break your current setup.\nNote: Update all slave server, before you update master server.\n\n";
$method = simple_query('Select update method', array('stable','svn'), 'stable');
if($method == 'stable') {
- $new_version = file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt') or die('Unable to retrieve version file.');
+ $new_version = @file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt') or die('Unable to retrieve version file.');
$new_version = trim($new_version);
if($new_version != ISPC_APP_VERSION) {
- exec('/usr/local/ispconfig/server/scripts/update_from_tgz.sh');
+ passthru('/usr/local/ispconfig/server/scripts/update_from_tgz.sh');
+ exit;
} else {
- echo "There are no updates available.\n";
+ echo "There are no updates available for ISPConfig ".ISPC_APP_VERSION."\n";
}
} else {
- exec('/usr/local/ispconfig/server/scripts/update_from_svn.sh');
+ passthru('/usr/local/ispconfig/server/scripts/update_from_svn.sh');
+ exit;
}
--
Gitblit v1.9.1