Fix various problems related to GDPR tools (#22975)

matomo-org · Jan 24, 2025 · 13b46eb · 13b46eb
1 parent b512927
commit 13b46eb
Show file tree

Hide file tree

Showing 11 changed files with 166 additions and 58 deletions.
diff --git a/plugins/API/API.php b/plugins/API/API.php
@@ -569,7 +569,11 @@ public function getSuggestedValuesForSegment($segmentName, $idSite)
         $suggestedValuesCallbackRequiresTable = false;
 
         if (!empty($segment['suggestedValuesApi']) && is_string($segment['suggestedValuesApi']) && !Rules::isBrowserTriggerEnabled()) {
-            $now = Date::now()->setTimezone(Site::getTimezoneFor($idSite));
+            if ($idSite === 'all') {
+                $now = Date::now()->setTimezone(\Piwik\Plugins\SitesManager\API::getInstance()->getDefaultTimezone());
+            } else {
+                $now = Date::now()->setTimezone(Site::getTimezoneFor($idSite));
+            }
             if (self::$_autoSuggestLookBack != 60) {
                 // in Auto suggest tests we need to assume now is in 2018...
                 // we do - 20 to make sure the year is still correct otherwise could end up being 2017-12-31 and the recorded visits are over several days in the tests we make sure to select the last day a visit was recorded

diff --git a/plugins/CoreHome/Columns/UserId.php b/plugins/CoreHome/Columns/UserId.php
@@ -52,7 +52,7 @@ public function __construct()
     public function configureSegments(SegmentsList $segmentsList, DimensionSegmentFactory $dimensionSegmentFactory)
     {
         // Configure userId segment only if visitor profile is available
-        if (Live::isVisitorProfileEnabled() || \Piwik\API\Request::getRootApiRequestMethod() === 'API.getSegmentsMetadata') {
+        if (Live::isVisitorProfileEnabled()) {
             parent::configureSegments($segmentsList, $dimensionSegmentFactory);
         }
     }

diff --git a/plugins/Live/API.php b/plugins/Live/API.php
@@ -250,6 +250,18 @@ public function getVisitorProfile($idSite, $visitorId = false, $segment = false,
         return $result;
     }
 
+    /**
+     * Returns if the visitor profile is enabled for the given site(s))
+     *
+     * @param string|int|array $idSite
+     * @return bool
+     * @internal
+     */
+    public function isVisitorProfileEnabled($idSite): bool
+    {
+        return Live::isVisitorProfileEnabled($idSite);
+    }
+
     /**
      * Returns the visitor ID of the most recent visit.
      *

diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php
@@ -13,6 +13,7 @@
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Container\StaticContainer;
+use Piwik\Site;
 
 /**
  *
@@ -68,11 +69,11 @@ public static function checkIsVisitorLogEnabled($idSite = null): void
         }
 
         if (empty($idSite)) {
-            $idSite = Common::getRequestVar('idSite', 0, 'int');
+            $idSite = Common::getRequestVar('idSite', '', 'string');
         }
 
         if (!empty($idSite)) {
-            $idSites = is_array($idSite) ? $idSite : [$idSite];
+            $idSites = Site::getIdSitesFromIdSitesString($idSite);
 
             foreach ($idSites as $idSite) {
                 $settings = new MeasurableSettings($idSite);
@@ -117,11 +118,11 @@ public static function checkIsVisitorProfileEnabled($idSite = null): void
         }
 
         if (empty($idSite)) {
-            $idSite = Common::getRequestVar('idSite', 0, 'int');
+            $idSite = Common::getRequestVar('idSite', '', 'string');
         }
 
         if (!empty($idSite)) {
-            $idSites = is_array($idSite) ? $idSite : [$idSite];
+            $idSites = Site::getIdSitesFromIdSitesString($idSite);
 
             foreach ($idSites as $idSite) {
                 $settings = new MeasurableSettings($idSite);

diff --git a/plugins/Live/javascripts/visitorProfile.js b/plugins/Live/javascripts/visitorProfile.js
@@ -44,27 +44,46 @@
      * @param {String} idSite The ID of the site.
      */
     VisitorProfileControl.showPopover = function (visitorId, idSite) {
-
-        if (!piwik.visitorProfileEnabled) {
+        var showProfile = function(visitorId, idSite, visitorProfileEnabled) {
+          if (!piwik.visitorProfileEnabled && (!idSite || piwik.idSite == idSite)) {
             console.error('Visitor Profile was disabled in website settings');
             return;
-        }
+          }
 
-        var url = 'module=Live&action=getVisitorProfilePopup&visitorId=' + encodeURIComponent(visitorId);
-        if (idSite) {
+          var url = 'module=Live&action=getVisitorProfilePopup&visitorId=' + encodeURIComponent(visitorId);
+          if (idSite) {
             url += '&idSite=' + idSite;
-        }
+          }
 
-        // if there is already a map shown on the screen, do not show the map in the popup. kartograph seems
-        // to only support showing one map at a time.
-        if ($('.RealTimeMap').length > 0) {
+          // if there is already a map shown on the screen, do not show the map in the popup. kartograph seems
+          // to only support showing one map at a time.
+          if ($('.RealTimeMap').length > 0) {
             url += '&showMap=0';
+          }
+
+          var ajaxRequest = new ajaxHelper();
+          ajaxRequest.removeDefaultParameter('segment');
+
+          Piwik_Popover.createPopupAndLoadUrl(url, _pk_translate('Live_VisitorProfile'), 'visitor-profile-popup', ajaxRequest);
+        }
+
+        if (idSite && idSite != piwik.idSite) {
+          var ajax = new ajaxHelper();
+          ajax.addParams({
+            module: 'API',
+            method: 'Live.isVisitorProfileEnabled',
+            format: 'json',
+            idSite: idSite
+          }, 'GET');
+          ajax.setCallback(function (response) {
+            showProfile(visitorId, idSite, response && response.value);
+          });
+          ajax.send();
+        } else {
+          showProfile(visitorId, idSite, piwik.visitorProfileEnabled);
         }
 
-        var ajaxRequest = new ajaxHelper();
-        ajaxRequest.removeDefaultParameter('segment');
 
-        Piwik_Popover.createPopupAndLoadUrl(url, _pk_translate('Live_VisitorProfile'), 'visitor-profile-popup', ajaxRequest);
     };
 
     $.extend(VisitorProfileControl.prototype, UIControl.prototype, {