- addon installer fixes

Author: Marius Burkard

server/lib/classes/addon_installer.inc.php

@@ -176,6 +176,8 @@ public function installAddon($package_file, $force = false) {
 			$inst->onAfterInstall();
 		}
 
+		exec('rm -rf ' . escapeshellarg($tmp_dir));
+		
 		return true;
 	}
 

server/lib/classes/ispconfig_addon_installer_base.inc.php

@@ -85,10 +85,10 @@ protected function copyAddonFiles() {
 		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 @@ public function onAfterUpdate() { }
 
 
 
-	public function onRaisedInstallerEvent($event_name) {
+	public function onRaisedInstallerEvent($event_name, $data) {
 
 	}
 }