From 9ab5689634c673f70a91f4397b64320f0c3328e8 Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Fri, 16 Nov 2018 16:17:41 +0100 Subject: [PATCH] - addon installer fixes --- server/lib/classes/addon_installer.inc.php | 2 ++ server/lib/classes/ispconfig_addon_installer_base.inc.php | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/lib/classes/addon_installer.inc.php b/server/lib/classes/addon_installer.inc.php index 82df5008d7..0b76ebf9ff 100644 --- a/server/lib/classes/addon_installer.inc.php +++ b/server/lib/classes/addon_installer.inc.php @@ -176,6 +176,8 @@ class addon_installer { $inst->onAfterInstall(); } + exec('rm -rf ' . escapeshellarg($tmp_dir)); + return true; } diff --git a/server/lib/classes/ispconfig_addon_installer_base.inc.php b/server/lib/classes/ispconfig_addon_installer_base.inc.php index e02ac00360..1e3cf2ec97 100644 --- a/server/lib/classes/ispconfig_addon_installer_base.inc.php +++ b/server/lib/classes/ispconfig_addon_installer_base.inc.php @@ -85,10 +85,10 @@ class ispconfig_addon_installer_base { if(is_dir($this->temp_dir . '/install')) { $ret = null; $retval = 0; - $command = 'cp -rf ' . escapeshellarg($this->temp_dir . '/addon.ini') . ' ' . escapeshellarg($this->temp_dir . '/' . $this->addon_ident . 'addon.php') . ' ' . escapeshellarg($this->temp_dir . '/install'). ' ' . escapeshellarg($install_dir . '/'); + $command = 'cp -rf ' . escapeshellarg($this->temp_dir . '/addon.ini') . ' ' . escapeshellarg($this->temp_dir . '/' . $this->addon_ident . '.addon.php') . ' ' . escapeshellarg($this->temp_dir . '/install'). ' ' . escapeshellarg($install_dir . '/'); exec($command, $ret, $retval); if($retval != 0) { - throw new AddonInstallerException('Command ' . $command . ' failed with code ' . $retval); + /* TODO: logging */ } return true; @@ -174,7 +174,7 @@ class ispconfig_addon_installer_base { - public function onRaisedInstallerEvent($event_name) { + public function onRaisedInstallerEvent($event_name, $data) { } } -- GitLab