Ticket #1111: ipv6.patch

plugins/Live/Visitor.php

@@ -91 +91 @@
         }
 
         function getIp()
-        {
-                if(isset($this->details['location_ip']))
-                {
-                        return long2ip($this->details['location_ip']);
-                }
-                return false;
-        }
+        {
+                if(isset($this->details['location_ip']))
+                {
+                        if($this->details['location_ip'] !== '0')
+                        {
+                                return long2ip($this->details['location_ip']);
+                        }
+                }
+                if(isset($this->details['location_ipv6']))
+                {
+                        return $this->details['location_ipv6'];
+                }
+                return false;
+        }
 
         function getIdVisit()
         {

core/Tracker/Visit.php

@@ -57 +57 @@
         // can be overwritten in constructor
         protected $timestamp;
         protected $ipString;
+        protected $ipv6String;
 
-        public function __construct($forcedIpString = null, $forcedDateTime = null)
+        public function __construct($forcedIpString = null, $forcedDateTime = null, $forcedIpv6String = null)
         {
                 $this->timestamp = time();
                 if(!empty($forcedDateTime))
@@ -72 +73 @@
                 }
                 
                 $this->ipString = Piwik_Common::getIp($ipString);
+
+                $ipv6String = $forcedIpv6String;
+                if(empty($ipv6String))
+                {
+                        $ipv6String = Piwik_Common::getIpv6();
+                }
+
+                $this->ipv6String = $ipv6String;
         }
         
         function setRequest($requestArray)
@@ -120 +129 @@
         {
                 // the IP is needed by isExcluded() and GoalManager->recordGoals()
                 $this->visitorInfo['location_ip'] = $this->ipString;
+                $this->visitorInfo['location_ipv6'] = $this->ipv6String;
                 
                 if($this->isExcluded())
                 {
@@ -407 +417 @@
                         'config_silverlight'            => $userInfo['config_silverlight'],
                         'config_cookie'                         => $userInfo['config_cookie'],
                         'location_ip'                           => $this->getVisitorIp(),
+                        'location_ipv6'                         => $this->getVisitorIpv6(),
                         'location_browser_lang'         => $userInfo['location_browser_lang'],
                         'location_country'                      => $country,
                 );
@@ -477 +488 @@
                 return $this->visitorInfo['location_ip']; 
         }
         
+        /**
+         * Returns the visitor's IPv6 address
+         *
+         * @return string
+         */
+        protected function getVisitorIpv6()
+        {
+                return $this->visitorInfo['location_ipv6'];
+        }
 
         /**
          * Returns the visitor's browser (user agent)

core/Db/Schema/Myisam.php

@@ -200 +200 @@
                                                           config_silverlight TINYINT(1) NOT NULL,
                                                           config_cookie TINYINT(1) NOT NULL,
                                                           location_ip INT UNSIGNED NOT NULL,
+                                                          location_ipv6 CHAR(39) NOT NULL,
                                                           location_browser_lang VARCHAR(20) NOT NULL,
                                                           location_country CHAR(3) NOT NULL,
                                                           location_continent CHAR(3) NOT NULL,

core/Common.php

@@ -736 +736 @@
 
                 return sprintf("%u", ip2long($ipStringFrom));
         }
+        
+        /**
+         * Convert dotted IP to a stringified integer representation
+         *
+         * @return string ip
+         */
+        static public function getIpv6($ipv6StringFrom = false)
+        {
+                if($ipv6StringFrom === false)
+                {
+                        $ipv6StringFrom = self::getIpString();
+                }
+                // Is an IPv6 regular string (contains at least one colon char)
+                if(strpos($ipv6StringFrom, ':'))
+                {
+                        return $ipv6StringFrom;
+                }
+                // Is not an IPv6 regular string, generic IPv6 address used
+                else
+                {
+                        return '::';
+                }
+        }
 
         /**
          * Returns the best possible IP of the current user, in the format A.B.C.D