Merge remote-tracking branch 'upstream/pull/5700'

[rails.git] / app / assets / javascripts / matomo.js

diff --git a/app/assets/javascripts/matomo.js b/app/assets/javascripts/matomo.js
index 34af54ce776278617bed471c776ee89b966805b8..4ed3de941bfc05255f5bc33f228a00fb2c822c76 100644 (file)
--- a/app/assets/javascripts/matomo.js
+++ b/app/assets/javascripts/matomo.js
@@ -1,19 +1,32 @@
 if (OSM.MATOMO) {
   $(document).ready(function () {
 if (OSM.MATOMO) {
   $(document).ready(function () {

-    var base = document.location.protocol + "//" + OSM.MATOMO.location + "/";
-    var matomoTracker;
+    const base = document.location.protocol + "//" + OSM.MATOMO.location + "/";
+    let matomoTracker;

 
 

-    var matomoLoader = $.ajax({
+    const matomoLoader = $.ajax({

       url: base + "matomo.js",
       dataType: "script",
       cache: true,
       success: function () {
         matomoTracker = Matomo.getTracker(base + "matomo.php", OSM.MATOMO.site);
 
       url: base + "matomo.js",
       dataType: "script",
       cache: true,
       success: function () {
         matomoTracker = Matomo.getTracker(base + "matomo.php", OSM.MATOMO.site);
 

-        if (OSM.user) {
+        if (OSM.user && OSM.MATOMO.set_user) {

           matomoTracker.setUserId(OSM.user.toString());
         }
 
           matomoTracker.setUserId(OSM.user.toString());
         }
 

+        if (OSM.MATOMO.visitor_cookie_timeout) {
+          matomoTracker.setVisitorCookieTimeout(OSM.MATOMO.visitor_cookie_timeout);
+        }
+
+        if (OSM.MATOMO.referral_cookie_timeout) {
+          matomoTracker.setReferralCookieTimeout(OSM.MATOMO.referral_cookie_timeout);
+        }
+
+        if (OSM.MATOMO.session_cookie_timeout) {
+          matomoTracker.setSessionCookieTimeout(OSM.MATOMO.session_cookie_timeout);
+        }
+
+        matomoTracker.setSecureCookie(true);

         matomoTracker.trackPageView();
         matomoTracker.enableLinkTracking();
 
         matomoTracker.trackPageView();
         matomoTracker.enableLinkTracking();