From 8e38755040c6c2073f92f0ffb087da530d0e7a0a Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 12 Nov 2012 11:49:26 -0500
Subject: [PATCH] - Changed a German translation. - Extended SEO redirect check for subdomains/alias domains.

---
 server/scripts/ispconfig_update.php |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php
index cd301d4..58d8ef5 100644
--- a/server/scripts/ispconfig_update.php
+++ b/server/scripts/ispconfig_update.php
@@ -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