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

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

diff --git a/app/assets/javascripts/matomo.js b/app/assets/javascripts/matomo.js
index 34af54ce776278617bed471c776ee89b966805b8..7d147a55cfb3b36dc21ccd8929526d8ff5d2967e 100644 (file)
--- a/app/assets/javascripts/matomo.js
+++ b/app/assets/javascripts/matomo.js
@@ -10,10 +10,23 @@ if (OSM.MATOMO) {
       success: function () {
         matomoTracker = Matomo.getTracker(base + "matomo.php", OSM.MATOMO.site);
 
       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();