From 9b943da60a39b6a4cdc6291ed658908f0e144d89 Mon Sep 17 00:00:00 2001 From: czaks Date: Sun, 6 Jul 2014 02:13:08 +0200 Subject: Revert "Rework the GeoIP code, add country-based poster names" This reverts commit db3c7f4ee984002fccb86e0cb3fda45edde74351. --- inc/functions.php | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'inc/functions.php') diff --git a/inc/functions.php b/inc/functions.php index 4313e531..6ce76472 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -21,8 +21,6 @@ require_once 'inc/api.php'; require_once 'inc/bans.php'; require_once 'inc/lib/gettext/gettext.inc'; -use Lifo\IP\IP; - // the user is not currently logged in as a moderator $mod = false; @@ -244,23 +242,6 @@ function loadConfig() { if (is_array($config['anonymous'])) $config['anonymous'] = $config['anonymous'][array_rand($config['anonymous'])]; - - if ($config['country_flags'] || $config['country_anonymous']) { - require_once 'inc/lib/geoip/geoip.inc'; - $gi=geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD); - $ipaddy = $_SERVER['REMOTE_ADDR']; - if (IP::isIPv4($ipaddy)) - $ipaddy = IP::to_ipv6($ipaddy, true); - global $country_code, $country_name; - $country_code = strtolower(geoip_country_code_by_addr_v6($gi, $ipaddy)); - $country_name = geoip_country_name_by_addr_v6($gi, $ipaddy); - if (isset($config['country_anonymous'][$country_code])) { - if (is_array($config['country_anonymous'][$country_code])) - $config['anonymous'] = $config['country_anonymous'][$country_code][array_rand($config['country_anonymous'][$country_code])]; - else - $config['anonymous'] = $config['country_anonymous'][$country_code]; - } - } event('load-config'); -- cgit v1.3