From 2bdcab1ef303bc737ca514dc79cc07c85d7f80ef Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Fri, 16 Nov 2018 16:11:50 +0100
Subject: [PATCH] - raised version to 3.2.0dev - fixes in addon installer

---
 install/sql/ispconfig3.sql                 | 2 +-
 install/tpl/config.inc.php.master          | 2 +-
 interface/lib/config.inc.php               | 2 +-
 server/addons.php                          | 2 +-
 server/lib/classes/addon_installer.inc.php | 4 ++++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 7462bbb74e..1b168b44bf 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -2270,7 +2270,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.1dev');
+INSERT INTO sys_config VALUES ('db','db_version','3.2.0dev');
 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 02a7b2f65c..c3ed1c06b9 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.1dev');
+define('ISPC_APP_VERSION', '3.2.0dev');
 define('DEVSYSTEM', 0);
 
 
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 3c534f3f21..e5789ace37 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -45,7 +45,7 @@ $revision = str_replace(array('Revision:', '$', ' '), '', $svn_revision);
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.1dev');
+define('ISPC_APP_VERSION', '3.2.0dev');
 define('DEVSYSTEM', 0);
 
 
diff --git a/server/addons.php b/server/addons.php
index f914e496e6..84d0b78978 100755
--- a/server/addons.php
+++ b/server/addons.php
@@ -46,7 +46,7 @@ $action = '';
 $package = '';
 
 $argv = $_SERVER['argv'];
-for($a = 0; $a < count($argv); $a++) {
+for($a = 1; $a < count($argv); $a++) {
 	if($argv[$a] === '--install' || $argv[$a] === 'install'
 			|| $argv[$a] === '--update' || $argv[$a] === 'update') {
 		$action = 'install';
diff --git a/server/lib/classes/addon_installer.inc.php b/server/lib/classes/addon_installer.inc.php
index e7061f7836..82df5008d7 100644
--- a/server/lib/classes/addon_installer.inc.php
+++ b/server/lib/classes/addon_installer.inc.php
@@ -121,6 +121,10 @@ class addon_installer {
 	 * @throws AddonInstallerValidationException
 	 */
 	public function installAddon($package_file, $force = false) {
+		global $app;
+		
+		$app->load('ispconfig_addon_installer_base');
+		
 		if(!is_file($package_file)) {
 			throw new AddonInstallerException('Package file not found.');
 		} elseif(substr($package_file, -4) !== '.pkg') {
-- 
GitLab