use CURL for ip geolocation, closes #4

ibericode · Jan 21, 2017 · bc676f5 · bc676f5
1 parent 16e1174
commit bc676f5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/Countries.php b/src/Countries.php
@@ -349,10 +349,17 @@ public function inEurope($code) {
      * @return string
      */
     public function ip($ip) {
-        $response = file_get_contents('http://ip2c.org/' . $ip);
+        $url = 'http://ip2c.org/' . $ip;
 
-        if(!empty($response)) {
-            $parts = explode( ';', $response );
+        $curl_handle = curl_init();
+        curl_setopt($curl_handle, CURLOPT_URL, $url);
+        curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT, 10);
+        curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
+        $response_body = curl_exec($curl_handle);
+        curl_close($curl_handle);
+
+        if(!empty($response_body)) {
+            $parts = explode( ';', $response_body );
             return $parts[1] === 'ZZ' ? '' : $parts[1];
         }
 

diff --git a/src/Rates/Clients/JsonVat.php b/src/Rates/Clients/JsonVat.php
@@ -22,7 +22,7 @@ public function fetch() {
 
         $curl_handle = curl_init();
         curl_setopt($curl_handle, CURLOPT_URL, $url);
-        curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT, 0);
+        curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT, 10);
         curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, true);
         $response_body = curl_exec($curl_handle);
         curl_close($curl_handle);

diff --git a/tests/CountriesTest.php b/tests/CountriesTest.php
@@ -33,4 +33,5 @@ public function test_inEurope() {
             self::assertTrue( $countries->inEurope( $country ) );
         }
     }
+
 }