aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain d'Alverny <rda@mageia.org>2012-02-25 15:17:53 +0000
committerRomain d'Alverny <rda@mageia.org>2012-02-25 15:17:53 +0000
commit2d86f730d7ce455bd70dc76dfc5b3d3f4eb01877 (patch)
tree6cb29dc6086916d34a41daebf96dcc67e1d0a712
parentef1f4f0c4ea92c65dfa7c03ac324fdd0a89f6ff1 (diff)
downloadwww-2d86f730d7ce455bd70dc76dfc5b3d3f4eb01877.tar
www-2d86f730d7ce455bd70dc76dfc5b3d3f4eb01877.tar.gz
www-2d86f730d7ce455bd70dc76dfc5b3d3f4eb01877.tar.bz2
www-2d86f730d7ce455bd70dc76dfc5b3d3f4eb01877.tar.xz
www-2d86f730d7ce455bd70dc76dfc5b3d3f4eb01877.zip
wrap mga_geoip code
-rw-r--r--lib/Downloads.php4
-rw-r--r--lib/mga_geoip.php233
2 files changed, 120 insertions, 117 deletions
diff --git a/lib/Downloads.php b/lib/Downloads.php
index b96111dbd..1a31c8082 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -242,8 +242,8 @@ class Downloads
if (is_null($country))
{
require_once realpath(__DIR__ . '/mga_geoip.php');
- $country = mga_geoip_country_by_ip($ip, false);
- $continent = mga_geoip_continent_by_country($country);
+ $country = MGA_Geoip::mga_geoip_country_by_ip($ip, false);
+ $continent = MGA_Geoip::mga_geoip_continent_by_country($country);
$fuzzy_mirror = true;
$_SESSION['country'] = $country;
$_SESSION['continent'] = $continent;
diff --git a/lib/mga_geoip.php b/lib/mga_geoip.php
index f4864622e..79c679ab5 100644
--- a/lib/mga_geoip.php
+++ b/lib/mga_geoip.php
@@ -22,150 +22,153 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-// "iso 3166 country","continent code"
-// taken from http://www.maxmind.com/app/country_continent
-$MGA_GEOIP_COUNTRY_TO_CONTINENT = array(
- 'A1' => '--', 'A2' => '--', 'AD' => 'EU', 'AE' => 'AS', 'AF' => 'AS',
- 'AG' => 'NA', 'AI' => 'NA', 'AL' => 'EU', 'AM' => 'AS', 'AN' => 'NA',
- 'AO' => 'AF', 'AP' => 'AS', 'AQ' => 'AN', 'AR' => 'SA', 'AS' => 'OC',
- 'AT' => 'EU', 'AU' => 'OC', 'AW' => 'NA', 'AX' => 'EU', 'AZ' => 'AS',
- 'BA' => 'EU', 'BB' => 'NA', 'BD' => 'AS', 'BE' => 'EU', 'BF' => 'AF',
- 'BG' => 'EU', 'BH' => 'AS', 'BI' => 'AF', 'BJ' => 'AF', 'BL' => 'NA',
- 'BM' => 'NA', 'BN' => 'AS', 'BO' => 'SA', 'BR' => 'SA', 'BS' => 'NA',
- 'BT' => 'AS', 'BV' => 'AN', 'BW' => 'AF', 'BY' => 'EU', 'BZ' => 'NA',
+class MGA_Geoip {
- 'CA' => 'NA', 'CC' => 'AS', 'CD' => 'AF', 'CF' => 'AF', 'CG' => 'AF',
- 'CH' => 'EU', 'CI' => 'AF', 'CK' => 'OC', 'CL' => 'SA', 'CM' => 'AF',
- 'CN' => 'AS', 'CO' => 'SA', 'CR' => 'NA', 'CU' => 'NA', 'CV' => 'AF',
- 'CX' => 'AS', 'CY' => 'AS', 'CZ' => 'EU',
+ // "iso 3166 country","continent code"
+ // taken from http://www.maxmind.com/app/country_continent
+ public static $MGA_GEOIP_COUNTRY_TO_CONTINENT = array(
+ 'A1' => '--', 'A2' => '--', 'AD' => 'EU', 'AE' => 'AS', 'AF' => 'AS',
+ 'AG' => 'NA', 'AI' => 'NA', 'AL' => 'EU', 'AM' => 'AS', 'AN' => 'NA',
+ 'AO' => 'AF', 'AP' => 'AS', 'AQ' => 'AN', 'AR' => 'SA', 'AS' => 'OC',
+ 'AT' => 'EU', 'AU' => 'OC', 'AW' => 'NA', 'AX' => 'EU', 'AZ' => 'AS',
- 'DE' => 'EU', 'DJ' => 'AF', 'DK' => 'EU', 'DM' => 'NA', 'DO' => 'NA',
- 'DZ' => 'AF',
+ 'BA' => 'EU', 'BB' => 'NA', 'BD' => 'AS', 'BE' => 'EU', 'BF' => 'AF',
+ 'BG' => 'EU', 'BH' => 'AS', 'BI' => 'AF', 'BJ' => 'AF', 'BL' => 'NA',
+ 'BM' => 'NA', 'BN' => 'AS', 'BO' => 'SA', 'BR' => 'SA', 'BS' => 'NA',
+ 'BT' => 'AS', 'BV' => 'AN', 'BW' => 'AF', 'BY' => 'EU', 'BZ' => 'NA',
- 'EC' => 'SA', 'EE' => 'EU', 'EG' => 'AF', 'EH' => 'AF', 'ER' => 'AF',
- 'ES' => 'EU', 'ET' => 'AF', 'EU' => 'EU',
+ 'CA' => 'NA', 'CC' => 'AS', 'CD' => 'AF', 'CF' => 'AF', 'CG' => 'AF',
+ 'CH' => 'EU', 'CI' => 'AF', 'CK' => 'OC', 'CL' => 'SA', 'CM' => 'AF',
+ 'CN' => 'AS', 'CO' => 'SA', 'CR' => 'NA', 'CU' => 'NA', 'CV' => 'AF',
+ 'CX' => 'AS', 'CY' => 'AS', 'CZ' => 'EU',
- 'FI' => 'EU', 'FJ' => 'OC', 'FK' => 'SA', 'FM' => 'OC', 'FO' => 'EU',
- 'FR' => 'EU', 'FX' => 'EU',
+ 'DE' => 'EU', 'DJ' => 'AF', 'DK' => 'EU', 'DM' => 'NA', 'DO' => 'NA',
+ 'DZ' => 'AF',
- 'GA' => 'AF', 'GB' => 'EU', 'GD' => 'NA', 'GE' => 'AS', 'GF' => 'SA',
- 'GG' => 'EU', 'GH' => 'AF', 'GI' => 'EU', 'GL' => 'NA', 'GM' => 'AF',
- 'GN' => 'AF', 'GP' => 'NA', 'GQ' => 'AF', 'GR' => 'EU', 'GS' => 'AN',
- 'GT' => 'NA', 'GU' => 'OC', 'GW' => 'AF', 'GY' => 'SA',
+ 'EC' => 'SA', 'EE' => 'EU', 'EG' => 'AF', 'EH' => 'AF', 'ER' => 'AF',
+ 'ES' => 'EU', 'ET' => 'AF', 'EU' => 'EU',
- 'HK' => 'AS', 'HM' => 'AN', 'HN' => 'NA', 'HR' => 'EU', 'HT' => 'NA',
- 'HU' => 'EU',
+ 'FI' => 'EU', 'FJ' => 'OC', 'FK' => 'SA', 'FM' => 'OC', 'FO' => 'EU',
+ 'FR' => 'EU', 'FX' => 'EU',
- 'ID' => 'AS', 'IE' => 'EU', 'IL' => 'AS', 'IM' => 'EU', 'IN' => 'AS',
- 'IO' => 'AS', 'IQ' => 'AS', 'IR' => 'AS', 'IS' => 'EU', 'IT' => 'EU',
+ 'GA' => 'AF', 'GB' => 'EU', 'GD' => 'NA', 'GE' => 'AS', 'GF' => 'SA',
+ 'GG' => 'EU', 'GH' => 'AF', 'GI' => 'EU', 'GL' => 'NA', 'GM' => 'AF',
+ 'GN' => 'AF', 'GP' => 'NA', 'GQ' => 'AF', 'GR' => 'EU', 'GS' => 'AN',
+ 'GT' => 'NA', 'GU' => 'OC', 'GW' => 'AF', 'GY' => 'SA',
- 'JE' => 'EU', 'JM' => 'NA', 'JO' => 'AS', 'JP' => 'AS',
+ 'HK' => 'AS', 'HM' => 'AN', 'HN' => 'NA', 'HR' => 'EU', 'HT' => 'NA',
+ 'HU' => 'EU',
- 'KE' => 'AF', 'KG' => 'AS', 'KH' => 'AS', 'KI' => 'OC', 'KM' => 'AF',
- 'KN' => 'NA', 'KP' => 'AS', 'KR' => 'AS', 'KW' => 'AS', 'KY' => 'NA',
- 'KZ' => 'AS',
+ 'ID' => 'AS', 'IE' => 'EU', 'IL' => 'AS', 'IM' => 'EU', 'IN' => 'AS',
+ 'IO' => 'AS', 'IQ' => 'AS', 'IR' => 'AS', 'IS' => 'EU', 'IT' => 'EU',
- 'LA' => 'AS', 'LB' => 'AS', 'LC' => 'NA', 'LI' => 'EU', 'LK' => 'AS',
- 'LR' => 'AF', 'LS' => 'AF', 'LT' => 'EU', 'LU' => 'EU', 'LV' => 'EU',
- 'LY' => 'AF',
+ 'JE' => 'EU', 'JM' => 'NA', 'JO' => 'AS', 'JP' => 'AS',
- 'MA' => 'AF', 'MC' => 'EU', 'MD' => 'EU', 'ME' => 'EU', 'MF' => 'NA',
- 'MG' => 'AF', 'MH' => 'OC', 'MK' => 'EU', 'ML' => 'AF', 'MM' => 'AS',
- 'MN' => 'AS', 'MO' => 'AS', 'MP' => 'OC', 'MQ' => 'NA', 'MR' => 'AF',
- 'MS' => 'NA', 'MT' => 'EU', 'MU' => 'AF', 'MV' => 'AS', 'MW' => 'AF',
- 'MX' => 'NA', 'MY' => 'AS', 'MZ' => 'AF',
+ 'KE' => 'AF', 'KG' => 'AS', 'KH' => 'AS', 'KI' => 'OC', 'KM' => 'AF',
+ 'KN' => 'NA', 'KP' => 'AS', 'KR' => 'AS', 'KW' => 'AS', 'KY' => 'NA',
+ 'KZ' => 'AS',
- 'NA' => 'AF', 'NC' => 'OC', 'NE' => 'AF', 'NF' => 'OC', 'NG' => 'AF',
- 'NI' => 'NA', 'NL' => 'EU', 'NO' => 'EU', 'NP' => 'AS', 'NR' => 'OC',
- 'NU' => 'OC', 'NZ' => 'OC',
+ 'LA' => 'AS', 'LB' => 'AS', 'LC' => 'NA', 'LI' => 'EU', 'LK' => 'AS',
+ 'LR' => 'AF', 'LS' => 'AF', 'LT' => 'EU', 'LU' => 'EU', 'LV' => 'EU',
+ 'LY' => 'AF',
- 'O1' => '--', 'OM' => 'AS',
+ 'MA' => 'AF', 'MC' => 'EU', 'MD' => 'EU', 'ME' => 'EU', 'MF' => 'NA',
+ 'MG' => 'AF', 'MH' => 'OC', 'MK' => 'EU', 'ML' => 'AF', 'MM' => 'AS',
+ 'MN' => 'AS', 'MO' => 'AS', 'MP' => 'OC', 'MQ' => 'NA', 'MR' => 'AF',
+ 'MS' => 'NA', 'MT' => 'EU', 'MU' => 'AF', 'MV' => 'AS', 'MW' => 'AF',
+ 'MX' => 'NA', 'MY' => 'AS', 'MZ' => 'AF',
- 'PA' => 'NA', 'PE' => 'SA', 'PF' => 'OC', 'PG' => 'OC', 'PH' => 'AS',
- 'PK' => 'AS', 'PL' => 'EU', 'PM' => 'NA', 'PN' => 'OC', 'PR' => 'NA',
- 'PS' => 'AS', 'PT' => 'EU', 'PW' => 'OC', 'PY' => 'SA',
+ 'NA' => 'AF', 'NC' => 'OC', 'NE' => 'AF', 'NF' => 'OC', 'NG' => 'AF',
+ 'NI' => 'NA', 'NL' => 'EU', 'NO' => 'EU', 'NP' => 'AS', 'NR' => 'OC',
+ 'NU' => 'OC', 'NZ' => 'OC',
- 'QA' => 'AS',
+ 'O1' => '--', 'OM' => 'AS',
- 'RE' => 'AF', 'RO' => 'EU', 'RS' => 'EU', 'RU' => 'EU', 'RW' => 'AF',
+ 'PA' => 'NA', 'PE' => 'SA', 'PF' => 'OC', 'PG' => 'OC', 'PH' => 'AS',
+ 'PK' => 'AS', 'PL' => 'EU', 'PM' => 'NA', 'PN' => 'OC', 'PR' => 'NA',
+ 'PS' => 'AS', 'PT' => 'EU', 'PW' => 'OC', 'PY' => 'SA',
- 'SA' => 'AS', 'SB' => 'OC', 'SC' => 'AF', 'SD' => 'AF', 'SE' => 'EU',
- 'SG' => 'AS', 'SH' => 'AF', 'SI' => 'EU', 'SJ' => 'EU', 'SK' => 'EU',
- 'SL' => 'AF', 'SM' => 'EU', 'SN' => 'AF', 'SO' => 'AF', 'SR' => 'SA',
- 'ST' => 'AF', 'SV' => 'NA', 'SY' => 'AS', 'SZ' => 'AF',
+ 'QA' => 'AS',
- 'TC' => 'NA', 'TD' => 'AF', 'TF' => 'AN', 'TG' => 'AF', 'TH' => 'AS',
- 'TJ' => 'AS', 'TK' => 'OC', 'TL' => 'AS', 'TM' => 'AS', 'TN' => 'AF',
- 'TO' => 'OC', 'TR' => 'EU', 'TT' => 'NA', 'TV' => 'OC', 'TW' => 'AS',
- 'TZ' => 'AF',
+ 'RE' => 'AF', 'RO' => 'EU', 'RS' => 'EU', 'RU' => 'EU', 'RW' => 'AF',
- 'UA' => 'EU', 'UG' => 'AF', 'UM' => 'OC', 'US' => 'NA', 'UY' => 'SA',
- 'UZ' => 'AS',
+ 'SA' => 'AS', 'SB' => 'OC', 'SC' => 'AF', 'SD' => 'AF', 'SE' => 'EU',
+ 'SG' => 'AS', 'SH' => 'AF', 'SI' => 'EU', 'SJ' => 'EU', 'SK' => 'EU',
+ 'SL' => 'AF', 'SM' => 'EU', 'SN' => 'AF', 'SO' => 'AF', 'SR' => 'SA',
+ 'ST' => 'AF', 'SV' => 'NA', 'SY' => 'AS', 'SZ' => 'AF',
- 'VA' => 'EU', 'VC' => 'NA', 'VE' => 'SA', 'VG' => 'NA', 'VI' => 'NA',
- 'VN' => 'AS', 'VU' => 'OC',
+ 'TC' => 'NA', 'TD' => 'AF', 'TF' => 'AN', 'TG' => 'AF', 'TH' => 'AS',
+ 'TJ' => 'AS', 'TK' => 'OC', 'TL' => 'AS', 'TM' => 'AS', 'TN' => 'AF',
+ 'TO' => 'OC', 'TR' => 'EU', 'TT' => 'NA', 'TV' => 'OC', 'TW' => 'AS',
+ 'TZ' => 'AF',
- 'WF' => 'OC', 'WS' => 'OC',
+ 'UA' => 'EU', 'UG' => 'AF', 'UM' => 'OC', 'US' => 'NA', 'UY' => 'SA',
+ 'UZ' => 'AS',
- 'YE' => 'AS', 'YT' => 'AF',
+ 'VA' => 'EU', 'VC' => 'NA', 'VE' => 'SA', 'VG' => 'NA', 'VI' => 'NA',
+ 'VN' => 'AS', 'VU' => 'OC',
- 'ZA' => 'AF', 'ZM' => 'AF', 'ZW' => 'AF'
-);
+ 'WF' => 'OC', 'WS' => 'OC',
-/**
- * Wrapper to PHP module function or available MaxMind API library.
- * Works with IPv4 and IPv6 addresses.
- *
- * @param string $ip
- * @param boolean $try_php_module
- *
- * @return string
- *
- * If fail, use $country as a fallback to return.
- * @see http://www.maxmind.com/app/php & http://www.maxmind.com/app/geoip_country
- * It has limitations too & needs to be updated from time to time.
-*/
-function mga_geoip_country_by_ip($ip, $try_php_module = true)
-{
- if ($ip == '127.0.0.1' || $ip == '::1')
- return null;
-
- if ($try_php_module && function_exists('geoip_country_code_by_name'))
- {
- // may shout a "Host {IP} not found"
- $loc = @geoip_country_code_by_name($ip);
- }
- else
- {
- require_once realpath(__DIR__ . '/maxmind/geoip/geoipv6.inc.php');
- $gi = _lib_geoip_open(realpath(__DIR__ . '/maxmind/geoip/GeoIPv6.dat'), GEOIP_STANDARD);
+ 'YE' => 'AS', 'YT' => 'AF',
- // naive rewrite of IPv4 into IPv6
- if (strpos($ip, ':') === false)
- $ip = '::' . $ip;
+ 'ZA' => 'AF', 'ZM' => 'AF', 'ZW' => 'AF'
+ );
- $loc = _lib_geoip_country_code_by_addr_v6($gi, $ip);
- _lib_geoip_close($gi);
+ /**
+ * Wrapper to PHP module function or available MaxMind API library.
+ * Works with IPv4 and IPv6 addresses.
+ *
+ * @param string $ip
+ * @param boolean $try_php_module
+ *
+ * @return string
+ *
+ * If fail, use $country as a fallback to return.
+ * @see http://www.maxmind.com/app/php & http://www.maxmind.com/app/geoip_country
+ * It has limitations too & needs to be updated from time to time.
+ */
+ public static function mga_geoip_country_by_ip($ip, $try_php_module = true)
+ {
+ if ($ip == '127.0.0.1' || $ip == '::1')
+ return null;
+
+ if ($try_php_module && function_exists('geoip_country_code_by_name'))
+ {
+ // may shout a "Host {IP} not found"
+ $loc = @geoip_country_code_by_name($ip);
+ }
+ else
+ {
+ require_once realpath(__DIR__ . '/maxmind/geoip/geoipv6.inc.php');
+ $gi = _lib_geoip_open(realpath(__DIR__ . '/maxmind/geoip/GeoIPv6.dat'), GEOIP_STANDARD);
+
+ // naive rewrite of IPv4 into IPv6
+ if (strpos($ip, ':') === false)
+ $ip = '::' . $ip;
+
+ $loc = _lib_geoip_country_code_by_addr_v6($gi, $ip);
+ _lib_geoip_close($gi);
+ }
+ if (trim($loc) == '' || is_null($loc))
+ return null;
+
+ return strtoupper($loc);
}
- if (trim($loc) == '' || is_null($loc))
- return null;
- return strtoupper($loc);
-}
+ /**
+ * Get continent after country.
+ *
+ * @param string $country
+ *
+ * @return string
+ */
+ public static function mga_geoip_continent_by_country($country) {
-/**
- * Get continent after country.
- *
- * @param string $country
- *
- * @return string
-*/
-function mga_geoip_continent_by_country($country) {
- global $MGA_GEOIP_COUNTRY_TO_CONTINENT;
+ if (array_key_exists($country, self::$MGA_GEOIP_COUNTRY_TO_CONTINENT))
+ return self::$MGA_GEOIP_COUNTRY_TO_CONTINENT[$country];
- if (array_key_exists($country, $MGA_GEOIP_COUNTRY_TO_CONTINENT))
- return $MGA_GEOIP_COUNTRY_TO_CONTINENT[$country];
-
- return '--';
+ return '--';
+ }
} \ No newline at end of file