Changeset 1066221

Timestamp:

01/12/2015 05:32:56 PM (11 years ago)

Author:

jonscaife

Message:

Fix for servers supporting ipv4 & ipv6

Location:

worldcurrency/trunk

Files:

• readme.txt (modified) (2 diffs)
• worldcurrency.php (modified) (2 diffs)

worldcurrency/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 2.8.0
 Tested up to: 4.1
-Stable tag: 1.19
+Stable tag: 1.20
 
 Recognises users by IP address and shows them converted values in their local currency, you can write post/pages in multiple currencies.
@@ -98 +98 @@
 == Changelog ==
 
+= 1.20 (12 January 2015) =
+* Fix: Fix for servers which are ipv6 and ipv4, converts all visitor addresses to pure ipv4 format.  Plugin has no support for native ipv6 at this time (the ip2c database is ipv4 only)
+
 = 1.19 (12 January 2015) =
 * Fix: Corrected error in readme

worldcurrency/trunk/worldcurrency.php

@@ -4 +4 @@
 Plugin URI: http://www.cometicucinoilweb.it/blog/en/worldcurrency-plugin-for-wordpress/
 Description: Recognises users by IP address and shows them converted values in their local currency, you can write post/pages in multiple currencies.
-Version: 1.19
-Date: 12 Jamuary 2015
+Version: 1.20
+Date: 12 January 2015
 Author: Daniele Tieghi
 Author URI: www.cometicucinoilweb.it/blog/en/who-we-are/daniele-tieghi/
@@ -224 +224 @@
             require_once dirname(__FILE__).'/ip2c/ip2c.php';
 
+            // Known prefix
+            $v4mapped_prefix_hex = '00000000000000000000ffff';
+            $v4mapped_prefix_bin = pack("H*", $v4mapped_prefix_hex);
+
+            // Or more readable when using PHP >= 5.4
+            # $v4mapped_prefix_bin = hex2bin($v4mapped_prefix_hex);
+
+            // Parse
+            $addr = $_SERVER['REMOTE_ADDR'];
+            $addr_bin = inet_pton($addr);
+            if( $addr_bin === FALSE ) {
+              // Unparsable? How did they connect?!?
+              die('Invalid IP address');
+            }
+
+            // Check prefix
+            if( substr($addr_bin, 0, strlen($v4mapped_prefix_bin)) == $v4mapped_prefix_bin) {
+              // Strip prefix
+              $addr_bin = substr($addr_bin, strlen($v4mapped_prefix_bin));
+            }
+
+            // Convert back to printable address in canonical form
+            $addr = inet_ntop($addr_bin);
+
             $ip2c = new ip2country();
-            $res = $ip2c->get_country($_SERVER['REMOTE_ADDR']);
+            $res = $ip2c->get_country($addr);
 
             if ($res == false) {