diff options
| author | czaks <marcin@6irc.net> | 2014-02-19 00:01:40 +0100 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-02-19 00:01:40 +0100 |
| commit | bcb47a1d331253d8fba47db5468ba004d2584d6b (patch) | |
| tree | fb3b661578581daa74e1e8848bfdc235cc9e9979 /post.php | |
| parent | 9dad842c2471602dbcfad0de0291bfd54d39f852 (diff) | |
geoip: compatibility fix; this allows to have both versions of geoip loaded
Diffstat (limited to 'post.php')
| -rw-r--r-- | post.php | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -448,7 +448,7 @@ if (isset($_POST['delete'])) { if ($config['country_flags']) { require 'inc/lib/geoip/geoip.inc'; - $gi=geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD); + $gi=geoip\geoip_open('inc/lib/geoip/GeoIPv6.dat', GEOIP_STANDARD); function ipv4to6($ip) { if (strpos($ip, ':') !== false) { @@ -462,10 +462,10 @@ if (isset($_POST['delete'])) { return '::ffff:'.$part7.':'.$part8; } - if ($country_code = geoip_country_code_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))) { + if ($country_code = geoip\geoip_country_code_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))) { if (!in_array(strtolower($country_code), array('eu', 'ap', 'o1', 'a1', 'a2'))) $post['body'] .= "\n<tinyboard flag>".strtolower($country_code)."</tinyboard>". - "\n<tinyboard flag alt>".geoip_country_name_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))."</tinyboard>"; + "\n<tinyboard flag alt>".geoip\geoip_country_name_by_addr_v6($gi, ipv4to6($_SERVER['REMOTE_ADDR']))."</tinyboard>"; } } |
