diff options
author | Matthieu Aubry <matt@piwik.org> | 2015-10-20 12:16:43 +0300 |
---|---|---|
committer | Matthieu Aubry <matt@piwik.org> | 2015-10-20 12:16:43 +0300 |
commit | f7e22679ad208fb54becffcb424d881dd5b3a912 (patch) | |
tree | fdf2eb1c2adab75098bff9801c45edd0fadfc3b9 | |
parent | fe518c0af443707fb6bbc982f403f6e81720f821 (diff) | |
parent | 3eb0ce78699b49106fb414fe78e7a427de957be4 (diff) |
Merge pull request #9064 from piwik/7778_fix
Tracker configId should be based on original IP, not on anonymised IP?
-rw-r--r-- | plugins/CoreHome/Tracker/VisitRequestProcessor.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/plugins/CoreHome/Tracker/VisitRequestProcessor.php b/plugins/CoreHome/Tracker/VisitRequestProcessor.php index 7fee641de0..e4e5a2ddf8 100644 --- a/plugins/CoreHome/Tracker/VisitRequestProcessor.php +++ b/plugins/CoreHome/Tracker/VisitRequestProcessor.php @@ -19,6 +19,7 @@ use Piwik\Tracker\Settings; use Piwik\Tracker\Visit\VisitProperties; use Piwik\Tracker\VisitExcluded; use Piwik\Tracker\VisitorRecognizer; +use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig; /** * Encapsulates core tracking logic related to visits. @@ -91,8 +92,15 @@ class VisitRequestProcessor extends RequestProcessor return true; } + $privacyConfig = new PrivacyManagerConfig(); + + $ip = $request->getIpString(); + if ($privacyConfig->useAnonymizedIpForVisitEnrichment) { + $ip = $visitProperties->getProperty('location_ip'); + } + // visitor recognition - $visitorId = $this->userSettings->getConfigId($request, $visitProperties->getProperty('location_ip')); + $visitorId = $this->userSettings->getConfigId($request, $ip); $request->setMetadata('CoreHome', 'visitorId', $visitorId); $isKnown = $this->visitorRecognizer->findKnownVisitor($visitorId, $visitProperties, $request); |