From 0e22f4df58d7eb587617b2c43176b032244f67a2 Mon Sep 17 00:00:00 2001 From: "Nicholas K. Dionysopoulos" Date: Fri, 12 Jul 2019 09:48:08 +0300 Subject: [PATCH] Allow CLI scripts to run from a symlinked site --- component/cli/datacompliance_account_delete.php | 8 +++++--- component/cli/datacompliance_account_lifecycle.php | 4 +++- component/cli/datacompliance_lifecycle_notify.php | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/component/cli/datacompliance_account_delete.php b/component/cli/datacompliance_account_delete.php index cd37488..734d5e6 100644 --- a/component/cli/datacompliance_account_delete.php +++ b/component/cli/datacompliance_account_delete.php @@ -11,7 +11,9 @@ define('_JEXEC', 1); -$path = __DIR__ . '/../administrator/components/com_datacompliance/assets/cli/base.php'; +// Setup and import the base CLI script +$curdir = __DIR__; +$path = __DIR__ . '/../administrator/components/com_datacompliance/assets/cli/base.php'; if (file_exists($path)) { @@ -41,7 +43,7 @@ public function execute() // Logger format. "echo" passes the log message verbatim. 'logger' => 'callback', 'callback' => function (LogEntry $entry) { - $priorities = array( + $priorities = [ Log::EMERGENCY => 'EMERGENCY', Log::ALERT => 'ALERT', Log::CRITICAL => 'CRITICAL', @@ -50,7 +52,7 @@ public function execute() Log::NOTICE => 'NOTICE', Log::INFO => 'INFO', Log::DEBUG => 'DEBUG', - ); + ]; $priority = $priorities[$entry->priority]; $date = $entry->date->format(JText::_('DATE_FORMAT_FILTER_DATETIME')); diff --git a/component/cli/datacompliance_account_lifecycle.php b/component/cli/datacompliance_account_lifecycle.php index 5c81767..3a0db71 100644 --- a/component/cli/datacompliance_account_lifecycle.php +++ b/component/cli/datacompliance_account_lifecycle.php @@ -10,7 +10,9 @@ define('_JEXEC', 1); -$path = __DIR__ . '/../administrator/components/com_datacompliance/assets/cli/base.php'; +// Setup and import the base CLI script +$curdir = __DIR__; +$path = __DIR__ . '/../administrator/components/com_datacompliance/assets/cli/base.php'; if (file_exists($path)) { diff --git a/component/cli/datacompliance_lifecycle_notify.php b/component/cli/datacompliance_lifecycle_notify.php index 6f90c13..20357c5 100644 --- a/component/cli/datacompliance_lifecycle_notify.php +++ b/component/cli/datacompliance_lifecycle_notify.php @@ -13,7 +13,9 @@ define('_JEXEC', 1); -$path = __DIR__ . '/../administrator/components/com_datacompliance/assets/cli/base.php'; +// Setup and import the base CLI script +$curdir = __DIR__; +$path = __DIR__ . '/../administrator/components/com_datacompliance/assets/cli/base.php'; if (file_exists($path)) {