From c719dc0b1dd696e0cd6b51f09ee13c8263375f7c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 07 Sep 2011 05:57:38 -0400
Subject: [PATCH] Fixed a warning in maildrop plugin.
---
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 1c7a5c4..f7615e1 100644
--- a/server/scripts/ispconfig_update.php
+++ b/server/scripts/ispconfig_update.php
@@ -46,12 +46,12 @@
$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();
}
@@ -91,15 +91,17 @@
$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