From 23e34030540a68ffcd08c3fb00502432ae854974 Mon Sep 17 00:00:00 2001
From: Aaron <admin@datahoarder.dev>
Date: Sat, 3 Oct 2020 22:22:02 +0200
Subject: [PATCH] fix: update Matomo integration client code (#2526)

Signed-off-by: Aaron <admin@datahoarder.dev>
---
 server/modules/analytics/matomo/code.yml       | 4 ++--
 server/modules/analytics/matomo/definition.yml | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/server/modules/analytics/matomo/code.yml b/server/modules/analytics/matomo/code.yml
index 8e6c5ef6..a650e9d6 100644
--- a/server/modules/analytics/matomo/code.yml
+++ b/server/modules/analytics/matomo/code.yml
@@ -1,7 +1,7 @@
 head: |
   <!-- Matomo -->
   <script type="text/javascript">
-    var _paq = window._paq || [];
+    var _paq = window._paq = window._paq || [];
     /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
     _paq.push(['trackPageView']);
     _paq.push(['enableLinkTracking']);
@@ -10,7 +10,7 @@ head: |
       _paq.push(['setTrackerUrl', u+'matomo.php']);
       _paq.push(['setSiteId', '{{siteId}}']);
       var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-      g.type='text/javascript'; g.async=true; g.defer=true; g.src='{{scriptUrl}}'; s.parentNode.insertBefore(g,s);
+      g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
     })();
   </script>
   <noscript><p><img src="{{serverHost}}/matomo.php?idsite={{siteId}}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
diff --git a/server/modules/analytics/matomo/definition.yml b/server/modules/analytics/matomo/definition.yml
index 5d99ace1..cf00da83 100644
--- a/server/modules/analytics/matomo/definition.yml
+++ b/server/modules/analytics/matomo/definition.yml
@@ -18,9 +18,3 @@ props:
     hint: Including https:// and optionally the port. Without trailing slash. (e.g. https://example.matomo.cloud)
     default: https://example.matomo.cloud
     order: 2
-  scriptUrl:
-    type: String
-    title: Tracking Script URL
-    hint: The full URL of the Matomo tracking script.
-    default: //cdn.matomo.cloud/EXAMPLE.matomo.cloud/matomo.js
-    order: 3