Merge pull request #56 from totten/master-extern-url

OpenTracker - Create URL via CRM_Utils_System::externUrl()
civicrm · May 28, 2020 · 7a69cc2 · 7a69cc2
2 parents 1c85909 + c4f95e1
commit 7a69cc2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Listener/OpenTracker.php b/src/Listener/OpenTracker.php
@@ -26,14 +26,19 @@ public function onCompose(ComposeBatchEvent $e) {
 
     $config = \CRM_Core_Config::singleton();
 
+    // TODO: After v5.21 goes EOL, remove the $isLegacy check.
+    $isLegacy = version_compare(\CRM_Utils_System::version(), '5.23.alpha', '<');
+
     foreach ($e->getTasks() as $task) {
       /** @var \Civi\FlexMailer\FlexMailerTask $task */
       $mailParams = $task->getMailParams();
 
       if (!empty($mailParams) && !empty($mailParams['html'])) {
-        $mailParams['html'] .= "\n" . '<img src="' .
-          $config->userFrameworkResourceURL . "extern/open.php?q=" . $task->getEventQueueId() .
-          "\" width='1' height='1' alt='' border='0'>";
+        $openUrl = $isLegacy
+          ? $config->userFrameworkResourceURL . "extern/open.php?q=" . $task->getEventQueueId()
+          : \CRM_Utils_System::externUrl('extern/open', "q=" . $task->getEventQueueId());
+
+        $mailParams['html'] .= "\n" . '<img src="' . htmlentities($openUrl) . "\" width='1' height='1' alt='' border='0'>";
 
         $task->setMailParams($mailParams);
       }