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

Timestamp:

11/08/07 00:06:27 (5 years ago)

Author:

hverton

Message:

added the site location country selection (also the explicit country for user_id 1)
added some missing country codes to rev01079.php
birthday in the profile is displayed using the date format and months names of the locale set
forced maintenance mode if uninstalled updates are detected
updated the dbsetup_include.php file to reflect the latest database changes
removed the country name from the GeoIP table, now uses the country name from the locales table

File:

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

trunk/includes/geoip_include.php

@@ -71 +71 @@
         }
         $_GeoIP_result['ip_addr'] = $ip_addr;
-        return $_GeoIP_result['ip_name'];
+        return GeoIP_Code2Name($_GeoIP_result['ip_code']);
     }
 }
 
 function GeoIP_Code2Name($ip_code) {
-    global $db_prefix;
+    global $db_prefix, $settings;
 
-    $result = dbquery("SELECT * FROM ".$db_prefix."GeoIP WHERE ip_code ='".$ip_code."' LIMIT 1");
+    $result = dbquery("SELECT locales_value FROM ".$db_prefix."locales WHERE locales_locale = '".$settings['locale']."' 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_locale = 'English' AND locales_name = 'countrycode' AND locales_key = '".$ip_code."' LIMIT 1");
+    }
     if (dbrows($result) == 0) {
         return "";
     }
     $data = dbarray($result);
-    return $data['ip_name'];
+    return $data['locales_value'];
 }
 
@@ -113 +117 @@
     $data = dbarray($result);
     $geoip_flag = strtolower($data['ip_code']);
-    $geoip_name = $data['ip_name'];
+    $geoip_name = GeoIP_Code2Name($data['ip_code']);
     if (!is_file(PATH_IMAGES."flags/".$geoip_flag.".gif")) {
         if ($tag) {