From b5715fb4a82d6494e6fba5ffcc1b0af3c9d2421c Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Sat, 07 Jul 2012 13:12:41 -0400
Subject: [PATCH] removed hardcoded width for list search_limit select-element -> css defined
---
server/scripts/ispconfig_update.php | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php
index 1c7a5c4..58d8ef5 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();
}
@@ -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