Commit 2bdcab1e authored by Marius Burkard's avatar Marius Burkard

- raised version to 3.2.0dev

- fixes in addon installer
parent 7dbf4c1e
...@@ -2270,7 +2270,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, ...@@ -2270,7 +2270,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config` -- 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'); INSERT INTO sys_config VALUES ('interface','session_timeout','0');
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;
...@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision); ...@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
//** Application //** Application
define('ISPC_APP_TITLE', 'ISPConfig'); define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.1dev'); define('ISPC_APP_VERSION', '3.2.0dev');
define('DEVSYSTEM', 0); define('DEVSYSTEM', 0);
......
...@@ -45,7 +45,7 @@ $revision = str_replace(array('Revision:', '$', ' '), '', $svn_revision); ...@@ -45,7 +45,7 @@ $revision = str_replace(array('Revision:', '$', ' '), '', $svn_revision);
//** Application //** Application
define('ISPC_APP_TITLE', 'ISPConfig'); define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.1dev'); define('ISPC_APP_VERSION', '3.2.0dev');
define('DEVSYSTEM', 0); define('DEVSYSTEM', 0);
......
...@@ -46,7 +46,7 @@ $action = ''; ...@@ -46,7 +46,7 @@ $action = '';
$package = ''; $package = '';
$argv = $_SERVER['argv']; $argv = $_SERVER['argv'];
for($a = 0; $a < count($argv); $a++) { for($a = 1; $a < count($argv); $a++) {
if($argv[$a] === '--install' || $argv[$a] === 'install' if($argv[$a] === '--install' || $argv[$a] === 'install'
|| $argv[$a] === '--update' || $argv[$a] === 'update') { || $argv[$a] === '--update' || $argv[$a] === 'update') {
$action = 'install'; $action = 'install';
......
...@@ -121,6 +121,10 @@ class addon_installer { ...@@ -121,6 +121,10 @@ class addon_installer {
* @throws AddonInstallerValidationException * @throws AddonInstallerValidationException
*/ */
public function installAddon($package_file, $force = false) { public function installAddon($package_file, $force = false) {
global $app;
$app->load('ispconfig_addon_installer_base');
if(!is_file($package_file)) { if(!is_file($package_file)) {
throw new AddonInstallerException('Package file not found.'); throw new AddonInstallerException('Package file not found.');
} elseif(substr($package_file, -4) !== '.pkg') { } elseif(substr($package_file, -4) !== '.pkg') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment