Changeset 1550 in ExiteCMS for trunk/includes/geoip_include.php

Timestamp:

07/27/08 14:26:17 (4 years ago)

Author:

root

Message:

Fixed country code and flag caching issue due to an array index overflow. Fixed incorrect wikilink parsing (missing some works, parsing URL's in [img] tags). Fixed isURL() not accepting a % sign in the path of an URL

File:

• trunk/includes/geoip_include.php (modified) (4 diffs)

trunk/includes/geoip_include.php

@@ -29 +29 @@
     global $db_prefix, $_GeoIP_result;
 
-    // convert the IP address to a number
-    $ipnum = GeoIP_IP2Num($ip_addr);
-    if (!$ipnum) return false;
-    
     // not cached?
-    if (!isset($_GeoIP_result[$ipnum])) {
+    if (!isset($_GeoIP_result[$ip_addr])) {
 
         // check if there is an exception defined
@@ -40 +36 @@
         if ($data = dbarray($result)) {
             // add it to the cache
-            $_GeoIP_result[$ipnum] = $data['ip_code'];
+            $_GeoIP_result[$ip_addr] = $data['ip_code'];
         } else {
+            // convert the IP address to a number
+            $ipnum = GeoIP_IP2Num($ip_addr);
+            if (!$ipnum) return false;          
             // look this IP address up
             $result = dbquery("SELECT * FROM ".$db_prefix."GeoIP WHERE '".sprintf("%u", $ipnum)."' BETWEEN ip_start_num AND ip_end_num LIMIT 1");
             if ($data = dbarray($result)) {
                 // add it to the cache
-                $_GeoIP_result[$ipnum] = $data['ip_code'];
+                $_GeoIP_result[$ip_addr] = $data['ip_code'];
             } else {
-                $_GeoIP_result[$ipnum] = false;
+                $_GeoIP_result[$ip_addr] = false;
             }
         }
@@ -54 +53 @@
     }
 
-    return $_GeoIP_result[$ipnum];
+    return $_GeoIP_result[$ip_addr];
 }
 
@@ -71 +70 @@
     global $db_prefix, $settings;
 
-    $result = dbquery("SELECT locales_value FROM ".$db_prefix."locales WHERE locales_code = '".$settings['locale_code']."' AND locales_name = 'countrycode' AND locales_key = '".$ip_code."' LIMIT 1");
-    if (!dbrows($result)) {
-        // no translated country names found, load the english set instead
-        $result = dbquery("SELECT locales_value FROM ".$db_prefix."locales WHERE locales_code = 'en' AND locales_name = 'countrycode' AND locales_key = '".$ip_code."' LIMIT 1");
+    // not cached?
+    if (!isset($_GeoIP_result[$ip_code])) {
+
+        $result = dbquery("SELECT locales_value FROM ".$db_prefix."locales WHERE locales_code = '".$settings['locale_code']."' AND locales_name = 'countrycode' AND locales_key = '".$ip_code."' LIMIT 1");
+        if (!dbrows($result)) {
+            // no translated country names found, load the english set instead
+            $result = dbquery("SELECT locales_value FROM ".$db_prefix."locales WHERE locales_code = 'en' AND locales_name = 'countrycode' AND locales_key = '".$ip_code."' LIMIT 1");
+        }
+        if (dbrows($result) == 0) {
+            $_GeoIP_result[$ip_code] = "";
+        } else {
+            $data = dbarray($result);
+            $_GeoIP_result[$ip_code] = $data['locales_value'];
+        }
     }
-    if (dbrows($result) == 0) {
-        return "";
-    }
-    $data = dbarray($result);
-    return $data['locales_value'];
+
+    return $_GeoIP_result[$ip_code];
 }