Allow CLI scripts to run from a symlinked site

akeeba · Jul 12, 2019 · 0e22f4d · 0e22f4d
1 parent 6cf6876
commit 0e22f4d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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))
 {