From 6e8002182a6bbfa2316898120b7075a4beb047ff Mon Sep 17 00:00:00 2001
From: Greg Roach <greg@subaqua.co.uk>
Date: Tue, 7 Nov 2023 18:36:18 +0000
Subject: [PATCH] Fix: #4842 - update the JS snippet for matomo analytics

---
 app/Module/MatomoAnalyticsModule.php          |  1 -
 .../modules/matomo-analytics/snippet.phtml    | 25 ++++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/Module/MatomoAnalyticsModule.php b/app/Module/MatomoAnalyticsModule.php
index 0e0b304767e..d9f05e35269 100644
--- a/app/Module/MatomoAnalyticsModule.php
+++ b/app/Module/MatomoAnalyticsModule.php
@@ -84,7 +84,6 @@ public function analyticsParameters(): array
         $matomo_site_id = $this->getPreference('MATOMO_SITE_ID');
         $matomo_url     = $this->getPreference('MATOMO_URL');
 
-        // Reports on the webtrees forum say that a trailing slash is required.
         if (!str_ends_with($matomo_url, '/')) {
             $matomo_url .= '/';
         }
diff --git a/resources/views/modules/matomo-analytics/snippet.phtml b/resources/views/modules/matomo-analytics/snippet.phtml
index e6e3488e5d1..d59c360226b 100644
--- a/resources/views/modules/matomo-analytics/snippet.phtml
+++ b/resources/views/modules/matomo-analytics/snippet.phtml
@@ -5,20 +5,21 @@ declare(strict_types=1);
 use Fisharebest\Webtrees\Contracts\UserInterface;
 
 /**
+ * @var string        $MATOMO_SITE_ID
+ * @var string        $MATOMO_URL
  * @var UserInterface $user
  */
 
 ?>
-<script type="text/javascript">
-    var _paq = window._paq || [];
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function() {
-        var u=<?= json_encode($MATOMO_URL ?? '', JSON_THROW_ON_ERROR) ?>;
-        _paq.push(['setTrackerUrl', u+'piwik.php']);
-        _paq.push(['setSiteId', <?= json_encode($MATOMO_SITE_ID ?? '', JSON_THROW_ON_ERROR) ?>]);
-        _paq.push(['setUserId', <?= json_encode($user->userName(), JSON_THROW_ON_ERROR) ?>]);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-    })();
+<script>
+  var _paq = window._paq = window._paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u=<?= json_encode($MATOMO_URL, JSON_THROW_ON_ERROR) ?>;
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', <?= (int) $MATOMO_SITE_ID ?>]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>