From eb3ab4333d86a7e5724a625bf21a1b30b5ed8df6 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 10 Feb 2014 14:59:55 +0100
Subject: [PATCH] Changed version to 3.0.5.4dev

---
 install/lib/install.lib.php         | 37 -----------------------------
 install/lib/update.lib.php          |  4 ++--
 install/sql/ispconfig3.sql          |  2 +-
 install/tpl/config.inc.php.master   |  2 +-
 interface/lib/config.inc.php        |  2 +-
 server/scripts/ispconfig_update.php |  2 +-
 6 files changed, 6 insertions(+), 43 deletions(-)

diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 501cf3b357..4d5fe875ec 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -692,43 +692,6 @@ function is_installed($appname) {
 	}
 }
 
-/*
- * Compare ISPConfig version number.
- * return values:
- * -1 $current version is newer then $new version (downgrade)
- * 0 $current version = $new version
- * 1 $current version is older then new version (update)
-
-*/
-function compare_ispconfig_version($current, $new) {
-	if( $current == $new) {
-		return 0;
-	}
-
-	$p = explode('.', $current);
-	$tmp = '';
-	$tmp .= str_pad(intval($p[0]), 3, '0', STR_PAD_LEFT);
-	$tmp .= (isset($p[1]))?str_pad(intval($p[1]), 3, '0', STR_PAD_LEFT):'000';
-	$tmp .= (isset($p[2]))?str_pad(intval($p[2]), 3, '0', STR_PAD_LEFT):'000';
-	$tmp .= (isset($p[3]))?str_pad(intval($p[3]), 3, '0', STR_PAD_LEFT):'000';
-	$current = $tmp;
-
-	$p = explode('.', $new);
-	$tmp = '';
-	$tmp .= str_pad(intval($p[0]), 3, '0', STR_PAD_LEFT);
-	$tmp .= (isset($p[1]))?str_pad(intval($p[1]), 3, '0', STR_PAD_LEFT):'000';
-	$tmp .= (isset($p[2]))?str_pad(intval($p[2]), 3, '0', STR_PAD_LEFT):'000';
-	$tmp .= (isset($p[3]))?str_pad(intval($p[3]), 3, '0', STR_PAD_LEFT):'000';
-	$new = $tmp;
-
-	if($new > $current) {
-		return 1;
-	} else {
-		return -1;
-	}
-
-}
-
 /*
 * Get the port number of the ISPConfig controlpanel vhost
 */
diff --git a/install/lib/update.lib.php b/install/lib/update.lib.php
index bc0453f7f6..12231b2300 100644
--- a/install/lib/update.lib.php
+++ b/install/lib/update.lib.php
@@ -153,8 +153,8 @@ function updateDbAndIni() {
 		$conf['nginx']['installed'] = false;
 	}
 
-	//* Do incremental DB updates only on installed ISPConfig versions > 3.0.3
-	if(compare_ispconfig_version('3.0.3', ISPC_APP_VERSION) >= 0) {
+	//* Do incremental DB updates only on installed ISPConfig versions >= 3.0.3
+	if(version_compare('3.0.3', ISPC_APP_VERSION, '<=')) {
 
 		swriteln($inst->lng('Starting incremental database update.'));
 
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 9c8f04e263..2a9d96612e 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -2280,7 +2280,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
 -- Dumping data for table `sys_config`
 --
 
-INSERT INTO sys_config VALUES ('db','db_version','3.0.5.3');
+INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4dev');
 INSERT INTO sys_config VALUES ('interface','session_timeout','0');
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index b217603e69..a1b55d91a3 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.5.3');
+define('ISPC_APP_VERSION', '3.0.5.4dev');
 define('DEVSYSTEM', 0);
 
 
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index a27ee16c5e..12d4b48ba3 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -44,7 +44,7 @@ $revision = str_replace(array('Revision:', '$', ' '), '', $svn_revision);
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.0.5.3');
+define('ISPC_APP_VERSION', '3.0.5.4dev');
 define('DEVSYSTEM', 0);
 
 
diff --git a/server/scripts/ispconfig_update.php b/server/scripts/ispconfig_update.php
index 6843e7bde2..9bdf729e85 100644
--- a/server/scripts/ispconfig_update.php
+++ b/server/scripts/ispconfig_update.php
@@ -93,7 +93,7 @@ $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 = trim($new_version);
-	if($new_version != ISPC_APP_VERSION) {
+	if(version_compare($new_version, ISPC_APP_VERSION, '>') {
 		passthru('/usr/local/ispconfig/server/scripts/update_from_tgz.sh');
 		exit;
 	} else {
-- 
GitLab