Fixed Telize driver, as well as driver backups not using inputted IP address. Updated config layout

Author: stevebauman

src/Stevebauman/Location/Drivers/Telize.php

@@ -12,7 +12,6 @@ public function __construct($config)
         $this->config = $config;
 
         $this->url = $this->config->get('location::drivers.Telize.url');
-
     }
 
     public function get($ip)
@@ -21,29 +20,49 @@ public function get($ip)
 
         try {
             $contents = json_decode(file_get_contents($this->url.$ip));
-
+            
             $location->ip = $ip;
 
-            $location->countryName = $contents->country;
+            if(property_exists($contents, 'country')) {
+                $location->countryName = $contents->country; 
+            }
 
-            $location->countryCode = $contents->country_code;
+            if(property_exists($contents, 'country_code')) {
+                $location->countryCode = $contents->country_code;  
+            }
 
-            $location->regionName = $contents->region;
+            if(property_exists($contents, 'region')) {
+                $location->regionName = $contents->region;
+            }
 
-            $location->regionCode = $contents->region_code;
+            if(property_exists($contents, 'region_code')) {
+                $location->regionCode = $contents->region_code;
+            }
 
-            $location->cityName = $contents->city;
+            if(property_exists($contents, 'city')) {
+                $location->cityName = $contents->city;
+            }
 
-            $location->postalCode = $contents->postal_code;
+            if(property_exists($contents, 'postal_code')) {
+                $location->postalCode = $contents->postal_code;
+            }
 
-            $location->longitude = $contents->longitude;
+            if(property_exists($contents, 'longitude')) {
+                $location->longitude = $contents->longitude;
+            }
 
-            $location->latitude = $contents->latitude;
+            if(property_exists($contents, 'latitude')) {
+                $location->latitude = $contents->latitude;
+            }
+            
+            if(property_exists($contents, 'isp')) {
+                $location->isp = $contents->isp;
+            }
 
             $location->driver = get_class($this);
 
         } catch (\Exception $e) {
-            
+
             $location->error = true;
 
         }

src/Stevebauman/Location/Location.php

@@ -28,6 +28,11 @@ class Location {
      */
     private $location;
 
+    /*
+     * Holds the current IP of the user
+     */
+    private $ip;
+    
     public function __construct(Config $config, Session $session)
     {
         $this->config = $config;
@@ -109,7 +114,7 @@ public function lists($value = '', $name = '')
      * 
      * @param string $value
      * @param string $name
-     * @return type
+     * @return array
      */
     public function dropdown($value = '', $name = '')
     {
@@ -169,7 +174,7 @@ private function setLocation($ip = NULL)
         if($this->config->get('location::localhost_forget_location')) {
             $this->session->forget('location');
         }
-        
+
         /*
          * Check if the location has already been set in the current session
          */
@@ -183,14 +188,14 @@ private function setLocation($ip = NULL)
         } else {
 
             /*
-             * If an IP address is supplied, we'll send it right to the driver,
-             * if not, we'll get it from the client automatically
+             * Set the IP
              */
-            if($ip) {
-                $this->location = $this->driver->get($this->validateIp($ip));
-            } else {
-                $this->location = $this->driver->get($this->getClientIP()); 
-            }
+            $this->setIp($ip);
+            
+            /*
+             * Set the location
+             */
+            $this->location = $this->driver->get($this->ip);
 
             /*
              * The locations object property 'error' will be true if an exception has
@@ -207,6 +212,25 @@ private function setLocation($ip = NULL)
         }
     }
 
+    /**
+     * Sets the current IP property. If an IP address is supplied, it is validated
+     * before it's set, otherwise it is grabbed automatically from the client
+     * 
+     * @param string $ip
+     */
+    private function setIp($ip)
+    {
+        /*
+         * If an IP address is supplied, we'll validate it and set it,
+         * otherwise we'll grab it automatically from the client
+         */
+        if($ip) {
+            $this->ip = $this->validateIp($ip);
+        } else {
+            $this->ip = $this->getClientIP();
+        }
+    }
+    
     /**
      * Returns the IP address if it is valid, throws an exception if it's not
      * 
@@ -242,8 +266,8 @@ private function getLocationFromFallback()
         foreach($fallbacks as $fallbackDriver) {
 
             $driver = $this->getDriver($fallbackDriver);
-            
-            $location = $driver->get($this->getClientIP());
+
+            $location = $driver->get($this->ip);
 
             /*
              * If no error has occured, return the new location

src/Stevebauman/Location/Objects/Location.php

@@ -28,6 +28,8 @@ class Location {
 
     public $areaCode = '';
 
+    public $isp = '';
+    
     /*
      * Holds the IP address that was used to retrieve location information
      */