Fixing #11

ThaDafinser · Jul 13, 2015 · d7c174f · d7c174f
1 parent aa59dba
commit d7c174f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 data.php
 .project
 .buildpath
-.settings/org.eclipse.php.core.prefs
+.settings
diff --git a/IntranetGeoIP.php b/IntranetGeoIP.php
@@ -8,6 +8,8 @@
 use Piwik\Network;
 use Piwik\Log;
 use Piwik\Notification;
+use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
+use Piwik\Tracker\Request as TrackerRequest;
 
 class IntranetGeoIP extends Plugin
 {
@@ -89,7 +91,7 @@ public function uninstall()
      *
      * @see getListHooksRegistered()
      */
-    public function logIntranetSubNetworkInfo(&$visitorInfo)
+    public function logIntranetSubNetworkInfo(&$visitorInfo, TrackerRequest $request)
     {
         if (! file_exists($this->getDataFilePath())) {
             Log::error('Plugin IntranetGeoIP does not work. File is missing: ' . $this->getDataFilePath());
@@ -104,7 +106,14 @@ public function logIntranetSubNetworkInfo(&$visitorInfo)
             return;
         }
 
-        $ip = Network\IP::fromBinaryIP($visitorInfo['location_ip']);
+        $privacyConfig = new PrivacyManagerConfig();
+
+        $ipBinary = $request->getIp();
+        if ($privacyConfig->useAnonymizedIpForVisitEnrichment === true) {
+            $ipBinary = $visitorInfo['location_ip'];
+        }
+
+        $ip = Network\IP::fromBinaryIP($ipBinary);
 
         foreach ($data as $value) {
             if (isset($value['networks']) && $ip->isInRanges($value['networks']) === true) {