From ed30c60150ffda0301eb1f8d30c93cac94de41df Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 25 Jul 2011 10:38:22 -0400
Subject: [PATCH] Fixed some warnings in the installer.
---
server/scripts/ispconfig_update.php | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php
index bd9b2aa..f7615e1 100644
--- a/server/scripts/ispconfig_update.php
+++ b/server/scripts/ispconfig_update.php
@@ -28,17 +28,30 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+function sread() {
+ $input = fgets(STDIN);
+ return rtrim($input);
+}
+
+function swrite($text = '') {
+ echo $text;
+}
+
+function swriteln($text = '') {
+ echo $text."\n";
+}
+
function simple_query($query, $answers, $default)
{
$finished = false;
do {
$answers_str = implode(',', $answers);
- swrite($this->lng($query).' ('.$answers_str.') ['.$default.']: ');
+ swrite($query.' ('.$answers_str.') ['.$default.']: ');
$input = sread();
//* Stop the installation
if($input == 'quit') {
- swriteln($this->lng("Installation terminated by user.\n"));
+ swriteln("Installation terminated by user.\n");
die();
}
@@ -75,18 +88,20 @@
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";
-$method = $inst->simple_query('Select update method', array('stable','svn'), 'stable');
+$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