- raised version to 3.2.0dev

- fixes in addon installer

Author: Marius Burkard

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;

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);
 
 

interface/lib/config.inc.php

@@ -45,7 +45,7 @@
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.1dev');
+define('ISPC_APP_VERSION', '3.2.0dev');
 define('DEVSYSTEM', 0);
 
 

server/addons.php

@@ -46,7 +46,7 @@
 $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';

server/lib/classes/addon_installer.inc.php

@@ -121,6 +121,10 @@ private function getInstalledAddonVersion($ident) {
 	 * @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') {