From 15c14048aeb0406e3d7f29ca4420f6860420eabd Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Fri, 16 Nov 2018 16:44:18 +0100 Subject: [PATCH] - fixed missing globals --- server/lib/classes/addon_installer.inc.php | 2 ++ server/lib/classes/ispconfig_addon_installer_base.inc.php | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/lib/classes/addon_installer.inc.php b/server/lib/classes/addon_installer.inc.php index 07301f34f7..3a108e8bbb 100644 --- a/server/lib/classes/addon_installer.inc.php +++ b/server/lib/classes/addon_installer.inc.php @@ -54,6 +54,8 @@ class addon_installer { * @throws AddonInstallerValidationException */ private function validatePackage($path) { + global $app; + $app->log('Validating extracted addon at ' . $path, 0, false); if(!is_dir($path)) { diff --git a/server/lib/classes/ispconfig_addon_installer_base.inc.php b/server/lib/classes/ispconfig_addon_installer_base.inc.php index 2aa2d184ab..5767864c25 100644 --- a/server/lib/classes/ispconfig_addon_installer_base.inc.php +++ b/server/lib/classes/ispconfig_addon_installer_base.inc.php @@ -34,7 +34,7 @@ class ispconfig_addon_installer_base { } protected function copyInterfaceFiles() { - global $conf; + global $app, $conf; $app->log('Copying interface files.', 0, false); $install_dir = realpath($conf['rootpath'] . '/..'); @@ -56,7 +56,7 @@ class ispconfig_addon_installer_base { } protected function copyServerFiles() { - global $conf; + global $app, $conf; $app->log('Copying server files.', 0, false); @@ -169,6 +169,8 @@ class ispconfig_addon_installer_base { public function onBeforeInstall() { } public function onInstall() { + global $app; + $app->log('Running onInstall()', 0, false); $this->copyAddonFiles(); $this->copyInterfaceFiles(); @@ -182,6 +184,8 @@ class ispconfig_addon_installer_base { public function onBeforeUpdate() { } public function onUpdate() { + global $app; + $app->log('Running onUpdate()', 0, false); $this->copyAddonFiles(); $this->copyInterfaceFiles(); -- GitLab