diff options
| author | joostdekeijzer <joost@dekeijzer.org> | 2014-11-17 20:18:29 +0300 |
|---|---|---|
| committer | joostdekeijzer <joost@dekeijzer.org> | 2014-11-23 15:29:05 +0300 |
| commit | 2878dcc5f5a24b72b7d396f009086a81223efafa (patch) | |
| tree | 3248cf036aa6cd06cc28e992dcbbed2b76a6c7ea /libs | |
| parent | 49fa74824cbdc350d008fe2c5a7950e09638d297 (diff) | |
added possible future _v6 functions in GeoIP PECL
Diffstat (limited to 'libs')
| -rwxr-xr-x | libs/MaxMindGeoIP/geoip.inc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/libs/MaxMindGeoIP/geoip.inc b/libs/MaxMindGeoIP/geoip.inc index a0d74edd1f..739a4ef987 100755 --- a/libs/MaxMindGeoIP/geoip.inc +++ b/libs/MaxMindGeoIP/geoip.inc @@ -98,13 +98,19 @@ if (!defined('GEOIP_DOMAIN_EDITION')) { // GeoIP PECL installed? define("GEOIP_DOMAIN_EDITION", 11); } -define("GEOIP_COUNTRY_EDITION_V6", 12); +//if (!defined('GEOIP_COUNTRY_EDITION_V6')) { + // GeoIP PECL installed? + define("GEOIP_COUNTRY_EDITION_V6", 12); +//} define("GEOIP_LOCATIONA_EDITION", 13); define("GEOIP_ACCURACYRADIUS_EDITION", 14); define("GEOIP_CITYCOMBINED_EDITION", 15); define("GEOIP_CITY_EDITION_REV1_V6", 30); define("GEOIP_CITY_EDITION_REV0_V6", 31); -define("GEOIP_NETSPEED_EDITION_REV1", 32); +if (!defined('GEOIP_NETSPEED_EDITION_REV1')) { + // GeoIP PECL installed? + define("GEOIP_NETSPEED_EDITION_REV1", 32); +} define("GEOIP_NETSPEED_EDITION_REV1_V6", 33); define("GEOIP_USERTYPE_EDITION", 28); define("GEOIP_USERTYPE_EDITION_V6", 29); @@ -1619,6 +1625,8 @@ function geoip_country_id_by_name($gi, $name) return geoip_country_id_by_addr($gi, $addr); } +if (!function_exists('geoip_country_code_by_name_v6')) { +// GeoIP PECL installed? function geoip_country_code_by_name_v6($gi, $name) { $country_id = geoip_country_id_by_name_v6($gi, $name); @@ -1627,7 +1635,7 @@ function geoip_country_code_by_name_v6($gi, $name) } return false; } - +} if (!function_exists('geoip_country_code_by_name')) { // GeoIP PECL installed? function geoip_country_code_by_name($gi, $name) @@ -1640,6 +1648,8 @@ function geoip_country_code_by_name($gi, $name) } } +if (!function_exists('geoip_country_name_by_name_v6')) { +// GeoIP PECL installed? function geoip_country_name_by_name_v6($gi, $name) { $country_id = geoip_country_id_by_name_v6($gi, $name); @@ -1648,7 +1658,7 @@ function geoip_country_name_by_name_v6($gi, $name) } return false; } - +} if (!function_exists('geoip_country_name_by_name')) { // GeoIP PECL installed? function geoip_country_name_by_name($gi, $name) |