Merge branch '1.0'

Author: pulkit

src/GeoIP.php

@@ -70,7 +70,12 @@ public function getIp()
             if ($this->random) {
                 $this->ip = long2ip(rand(0, '4294967295'));
             } else {
-                $this->ip = array_get($_SERVER, 'HTTP_CLIENT_IP', array_get($_SERVER, 'HTTP_X_FORWARDED_FOR', array_get($_SERVER, 'HTTP_X_FORWARDED', array_get($_SERVER, 'HTTP_FORWARDED_FOR', array_get($_SERVER, 'HTTP_FORWARDED', array_get($_SERVER, 'REMOTE_ADDR', '127.0.0.1'))))));
+                $ip = array_get($_SERVER, 'HTTP_CLIENT_IP', array_get($_SERVER, 'HTTP_X_FORWARDED_FOR', array_get($_SERVER, 'HTTP_X_FORWARDED', array_get($_SERVER, 'HTTP_FORWARDED_FOR', array_get($_SERVER, 'HTTP_FORWARDED', array_get($_SERVER, 'REMOTE_ADDR', '127.0.0.1'))))));
+
+                // sometimes we can get multiple ipaddresses
+                // seperated with a ',', eg: proxy/vpn
+                $ip = explode(',', $ip);
+                $this->ip = trim(head($ip));
             }
         }
 
@@ -105,8 +110,8 @@ public function get($property = '')
      */
     protected function getData()
     {
-        $ip = $this->getIp();
-        $this->setIp($ip);
+        $ips = $this->getIp();
+        $this->setIp($ips);
 
         // check ip in memory
         $data = array_get($this->store, $ip);