MDL-23720 importing latest PEAR GeoIP module

hyokwang-ahn · Aug 9, 2010 · bbb13f0 · bbb13f0
1 parent 4806e6d
commit bbb13f0
Show file tree

Hide file tree

Showing 11 changed files with 1,426 additions and 5,379 deletions.
diff --git a/iplookup/index.php b/iplookup/index.php
@@ -26,7 +26,7 @@
 
 require('../config.php');
 require_once($CFG->libdir.'/filelib.php');
-require_once($CFG->libdir.'/geoip/geoipcity.inc');
+require_once('Net/GeoIP.php');
 
 require_login();
 
@@ -64,9 +64,9 @@
 }
 
 if (!empty($CFG->geoipfile) and file_exists($CFG->geoipfile)) {
-    $gi = geoip_open($CFG->geoipfile, GEOIP_STANDARD);
-    $location = geoip_record_by_addr($gi, $ip);
-    geoip_close($gi);
+    $geoip = Net_GeoIP::getInstance($CFG->geoipfile, Net_GeoIP::STANDARD);
+    $location = $geoip->lookupLocation($ip);
+    $geoip->close();
 
     if (empty($location)) {
         print_error('iplookupfailed', 'error', '', $ip);

diff --git a/lib/geoip/ChangeLog.htm b/lib/geoip/ChangeLog.htm
diff --git a/lib/geoip/README.htm b/lib/geoip/README.htm