Allow overriding some Tracker config by idSite (#17636)

* Allow tracker config to be customized per site (for some configs)

* Update Response.php

* allow few more settings to be overwritten on a per site basis

* idsite parameter may not be specified during Tracker\Request::__construct() (eg, during bulk tracking)

* Fix another test.

* Just make idsite optional for TrackerConfig::getConfigValue() calls.

* try to fix remaining failure

* forgot to add test file

Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>

2 files changed, 2 insertions, 21 deletions

diff --git a/plugins/Referrers/Columns/Campaign.php b/plugins/Referrers/Columns/Campaign.php
index c34daebf90..c5fd824a33 100644
--- a/plugins/Referrers/Columns/Campaign.php
+++ b/plugins/Referrers/Columns/Campaign.php
@@ -23,14 +23,8 @@ class Campaign extends Base
      *
      * @var bool
      */
-    protected $createNewVisitWhenCampaignChanges;
     protected $nameSingular = 'Referrers_ColumnCampaign';
 
-    public function __construct()
-    {
-        $this->createNewVisitWhenCampaignChanges = TrackerConfig::getConfigValue('create_new_visit_when_campaign_changes') == 1;
-    }
-
     /**
      * If we should create a new visit when the campaign changes, check if the campaign info changed and if so
      * force the tracker to create a new visit.i
@@ -42,7 +36,7 @@ class Campaign extends Base
      */
     public function shouldForceNewVisit(Request $request, Visitor $visitor, Action $action = null)
     {
-        if (!$this->createNewVisitWhenCampaignChanges) {
+        if (TrackerConfig::getConfigValue('create_new_visit_when_campaign_changes', $request->getIdSiteIfExists()) != 1) {
             return false;
         }
 
diff --git a/plugins/Referrers/Columns/Website.php b/plugins/Referrers/Columns/Website.php
index da693f1674..73aa5bcbed 100644
--- a/plugins/Referrers/Columns/Website.php
+++ b/plugins/Referrers/Columns/Website.php
@@ -20,22 +20,9 @@ class Website extends Base
     protected $type = self::TYPE_TEXT;
     protected $nameSingular = 'General_Website';
 
-    /**
-     * Set using the `[Tracker] create_new_visit_when_website_referrer_changes` INI config option.
-     * If true, will force new visits if the referrer website changes.
-     *
-     * @var bool
-     */
-    protected $createNewVisitWhenWebsiteReferrerChanges;
-
-    public function __construct()
-    {
-        $this->createNewVisitWhenWebsiteReferrerChanges = TrackerConfig::getConfigValue('create_new_visit_when_website_referrer_changes') == 1;
-    }
-
     public function shouldForceNewVisit(Request $request, Visitor $visitor, Action $action = null)
     {
-        if (!$this->createNewVisitWhenWebsiteReferrerChanges) {
+        if (TrackerConfig::getConfigValue('create_new_visit_when_website_referrer_changes', $request->getIdSiteIfExists()) != 1) {
             return false;
         }