Use https for urls in visitor details if host is defined with https i…

…n site
matomo-org · Jan 27, 2021 · 1c44aad · 1c44aad
1 parent c8959ca
commit 1c44aad
Showing 1 changed file with 30 additions and 0 deletions.
diff --git a/plugins/Actions/VisitorDetails.php b/plugins/Actions/VisitorDetails.php
@@ -16,6 +16,7 @@
 use Piwik\Piwik;
 use Piwik\Plugin;
 use Piwik\Plugins\Live\VisitorDetailsAbstract;
+use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Site;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\PageUrl;
@@ -160,6 +161,12 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails)
             unset($action['url_prefix']);
         }
 
+        if (array_key_exists('url', $action) && preg_match('/^http:\/\/([^\/]+)\//i', $action['url'], $host)) {
+            if ($this->shouldUseHttpsHost($visitorDetails['idSite'], $host[1])) {
+                $action['url'] = 'https://' . substr($action['url'], 7);
+            }
+        }
+
         switch ($action['type']) {
             case 'goal':
                 $action['icon'] = 'plugins/Morpheus/images/goal.png';
@@ -252,6 +259,29 @@ public function extendActionDetails(&$action, $nextAction, $visitorDetails)
         unset($action['idlink_va']);
     }
 
+    private function shouldUseHttpsHost($idSite, $host)
+    {
+        static $siteUrlCache = [];
+        static $hostSiteCache = [];
+
+        if (empty($siteUrlCache[$idSite])) {
+            $siteUrlCache[$idSite] = APISitesManager::getInstance()->getSiteUrlsFromId($idSite);
+        }
+
+        if (!isset($hostSiteCache[$idSite][$host])) {
+            $hostSiteCache[$idSite][$host] = false;
+
+            foreach ($siteUrlCache[$idSite] as $siteUrl) {
+                if (strpos(strtolower($siteUrl), strtolower('https://' . $host)) === 0) {
+                    $hostSiteCache[$idSite][$host] = true;
+                    break;
+                }
+            }
+        }
+
+        return $hostSiteCache[$idSite][$host];
+    }
+
     /**
      * @param $idVisit
      * @return array