From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 server/scripts/ispconfig_update.php |   91 ++++++++++++++++++++++++---------------------
 1 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php
index 7dd908a..42196cd 100644
--- a/server/scripts/ispconfig_update.php
+++ b/server/scripts/ispconfig_update.php
@@ -29,8 +29,8 @@
 */
 
 function sread() {
-    $input = fgets(STDIN);
-    return rtrim($input);
+	$input = fgets(STDIN);
+	return rtrim($input);
 }
 
 function swrite($text = '') {
@@ -42,66 +42,71 @@
 }
 
 function simple_query($query, $answers, $default)
-{		
-		$finished = false;
-		do {
-			$answers_str = implode(',', $answers);
-			swrite($query.' ('.$answers_str.') ['.$default.']: ');
-			$input = sread();
-			
-			//* Stop the installation
-			if($input == 'quit') {
-				swriteln("Installation terminated by user.\n");
-				die();
-			}
-			
-			//* Select the default
-			if($input == '') {
-				$answer = $default;
-				$finished = true;
-			}
-			
-            //* Set answer id valid
-			if(in_array($input, $answers)) {
-				$answer = $input;
-				$finished = true;
-			}
-			
-		} while ($finished == false);
-		swriteln();
-		return $answer;
+{
+	$finished = false;
+	do {
+		$answers_str = implode(',', $answers);
+		swrite($query.' ('.$answers_str.') ['.$default.']: ');
+		$input = sread();
+
+		//* Stop the installation
+		if($input == 'quit') {
+			swriteln("Installation terminated by user.\n");
+			die();
+		}
+
+		//* Select the default
+		if($input == '') {
+			$answer = $default;
+			$finished = true;
+		}
+
+		//* Set answer id valid
+		if(in_array($input, $answers)) {
+			$answer = $input;
+			$finished = true;
+		}
+
+	} while ($finished == false);
+	swriteln();
+	return $answer;
 }
 
-require_once('/usr/local/ispconfig/server/lib/config.inc.php');
+require_once '/usr/local/ispconfig/server/lib/config.inc.php';
 
 
-echo "\n\n".str_repeat('-',80)."\n";
-echo " _____ ___________   _____              __ _       
-|_   _/  ___| ___ \ /  __ \            / _(_)      
-  | | \ `--.| |_/ / | /  \/ ___  _ __ | |_ _  __ _ 
+echo "\n\n".str_repeat('-', 80)."\n";
+echo " _____ ___________   _____              __ _
+|_   _/  ___| ___ \ /  __ \            / _(_)
+  | | \ `--.| |_/ / | /  \/ ___  _ __ | |_ _  __ _
   | |  `--. \  __/  | |    / _ \| '_ \|  _| |/ _` |
  _| |_/\__/ / |     | \__/\ (_) | | | | | | | (_| |
  \___/\____/\_|      \____/\___/|_| |_|_| |_|\__, |
                                               __/ |
                                              |___/ ";
-echo "\n".str_repeat('-',80)."\n";
+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'. \nWARNING: The update from GIT is only for development systems and may break your current setup. Do not use the GIT version on servers that host any live websites!\nNote: Update all slave server, before you update master server.\n\n";
 
-$method = simple_query('Select update method', array('stable','svn'), 'stable');
+$method = simple_query('Select update method', array('stable', 'git-stable', 'git-master'), '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 = trim($new_version);
-	if($new_version != ISPC_APP_VERSION) {
-		exec('/usr/local/ispconfig/server/scripts/update_from_tgz.sh');
+	if(version_compare($new_version, ISPC_APP_VERSION, '>')) {
+		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";
 	}
+} elseif ($method == 'git-stable') {
+	passthru('/usr/local/ispconfig/server/scripts/update_from_dev_stable.sh');
+	exit;
 } else {
-	exec('/usr/local/ispconfig/server/scripts/update_from_svn.sh');
+	passthru('/usr/local/ispconfig/server/scripts/update_from_dev.sh');
+	exit;
 }
 
 
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1