From 6c643702c161e91691daf4d493e5b6d54323f090 Mon Sep 17 00:00:00 2001 From: flashwave Date: Sun, 13 Mar 2016 21:53:02 +0100 Subject: [PATCH] and now we have a dependency on the intl lib --- config/config.example.ini | 6 - config/iso3166.json | 252 ---------------------- libraries/Controllers/ForumController.php | 3 +- libraries/Utils.php | 35 ++- 4 files changed, 17 insertions(+), 279 deletions(-) delete mode 100644 config/iso3166.json diff --git a/config/config.example.ini b/config/config.example.ini index 2205c0d..28d9702 100644 --- a/config/config.example.ini +++ b/config/config.example.ini @@ -22,12 +22,6 @@ charset = utf8 collation = utf8_unicode_ci -; Data files relative to the root directory -[data] -; JSON file containing ISO 3166 country codes -iso3166 = config/iso3166.json - - ; Development mode settings [dev] ; Show detailed error logs in browser diff --git a/config/iso3166.json b/config/iso3166.json deleted file mode 100644 index 1ab47a4..0000000 --- a/config/iso3166.json +++ /dev/null @@ -1,252 +0,0 @@ -{ - - "AD": "Andorra", - "AE": "United Arab Emirates", - "AF": "Afghanistan", - "AG": "Antigua and Barbuda", - "AI": "Anguilla", - "AL": "Albania", - "AM": "Armenia", - "AO": "Angola", - "AQ": "Antarctica", - "AR": "Argentina", - "AS": "American Samoa", - "AT": "Austria", - "AU": "Australia", - "AW": "Aruba", - "AX": "Åland Islands", - "AZ": "Azerbaijan", - "BA": "Bosnia and Herzegovina", - "BB": "Barbados", - "BD": "Bangladesh", - "BE": "Belgium", - "BF": "Burkina Faso", - "BG": "Bulgaria", - "BH": "Bahrain", - "BI": "Burundi", - "BJ": "Benin", - "BL": "Saint Barthélemy", - "BM": "Bermuda", - "BN": "Brunei Darussalam", - "BO": "Plurinational State of Bolivia", - "BQ": "Bonaire, Sint Eustatius and Saba", - "BR": "Brazil", - "BS": "Bahamas", - "BT": "Bhutan", - "BV": "Bouvet Island", - "BW": "Botswana", - "BY": "Belarus", - "BZ": "Belize", - "CA": "Canada", - "CC": "Cocos (Keeling) Islands", - "CD": "Congo, the Democratic Republic of the", - "CF": "Central African Republic", - "CG": "Congo", - "CH": "Switzerland", - "CI": "Côte d'Ivoire", - "CK": "Cook Islands", - "CL": "Chile", - "CM": "Cameroon", - "CN": "China", - "CO": "Colombia", - "CR": "Costa Rica", - "CU": "Cuba", - "CV": "Cabo Verde", - "CW": "Curaçao", - "CX": "Christmas Island", - "CY": "Cyprus", - "CZ": "Czech Republic", - "DE": "Germany", - "DJ": "Djibouti", - "DK": "Denmark", - "DM": "Dominica", - "DO": "Dominican Republic", - "DZ": "Algeria", - "EC": "Ecuador", - "EE": "Estonia", - "EG": "Egypt", - "EH": "Western Sahara", - "ER": "Eritrea", - "ES": "Spain", - "ET": "Ethiopia", - "FI": "Finland", - "FJ": "Fiji", - "FK": "Falkland Islands (Malvinas)", - "FM": "Federated States of Micronesia", - "FO": "Faroe Islands", - "FR": "France", - "GA": "Gabon", - "GB": "United Kingdom", - "GD": "Grenada", - "GE": "Georgia", - "GF": "French Guiana", - "GG": "Guernsey", - "GH": "Ghana", - "GI": "Gibraltar", - "GL": "Greenland", - "GM": "Gambia", - "GN": "Guinea", - "GP": "Guadeloupe", - "GQ": "Equatorial Guinea", - "GR": "Greece", - "GS": "South Georgia and the South Sandwich Islands", - "GT": "Guatemala", - "GU": "Guam", - "GW": "Guinea-Bissau", - "GY": "Guyana", - "HK": "Hong Kong", - "HM": "Heard Island and McDonald Islands", - "HN": "Honduras", - "HR": "Croatia", - "HT": "Haiti", - "HU": "Hungary", - "ID": "Indonesia", - "IE": "Ireland", - "IL": "Israel", - "IM": "Isle of Man", - "IN": "India", - "IO": "British Indian Ocean Territory", - "IQ": "Iraq", - "IR": "Islamic Republic of Iran", - "IS": "Iceland", - "IT": "Italy", - "JE": "Jersey", - "JM": "Jamaica", - "JO": "Jordan", - "JP": "Japan", - "KE": "Kenya", - "KG": "Kyrgyzstan", - "KH": "Cambodia", - "KI": "Kiribati", - "KM": "Comoros", - "KN": "Saint Kitts and Nevis", - "KP": "Democratic People's Republic of Korea", - "KR": "Republic of Korea", - "KW": "Kuwait", - "KY": "Cayman Islands", - "KZ": "Kazakhstan", - "LA": "Lao People's Democratic Republic", - "LB": "Lebanon", - "LC": "Saint Lucia", - "LI": "Liechtenstein", - "LK": "Sri Lanka", - "LR": "Liberia", - "LS": "Lesotho", - "LT": "Lithuania", - "LU": "Luxembourg", - "LV": "Latvia", - "LY": "Libya", - "MA": "Morocco", - "MC": "Monaco", - "MD": "Republic of Moldova", - "ME": "Montenegro", - "MF": "Saint Martin", - "MG": "Madagascar", - "MH": "Marshall Islands", - "MK": "The former Yugoslav Republic of Macedonia", - "ML": "Mali", - "MM": "Myanmar", - "MN": "Mongolia", - "MO": "Macao", - "MP": "Northern Mariana Islands", - "MQ": "Martinique", - "MR": "Mauritania", - "MS": "Montserrat", - "MT": "Malta", - "MU": "Mauritius", - "MV": "Maldives", - "MW": "Malawi", - "MX": "Mexico", - "MY": "Malaysia", - "MZ": "Mozambique", - "NA": "Namibia", - "NC": "New Caledonia", - "NE": "Niger", - "NF": "Norfolk Island", - "NG": "Nigeria", - "NI": "Nicaragua", - "NL": "The Netherlands", - "NO": "Norway", - "NP": "Nepal", - "NR": "Nauru", - "NU": "Niue", - "NZ": "New Zealand", - "OM": "Oman", - "PA": "Panama", - "PE": "Peru", - "PF": "French Polynesia", - "PG": "Papua New Guinea", - "PH": "Philippines", - "PK": "Pakistan", - "PL": "Poland", - "PM": "Saint Pierre and Miquelon", - "PN": "Pitcairn", - "PR": "Puerto Rico", - "PS": "State of Palestine", - "PT": "Portugal", - "PW": "Palau", - "PY": "Paraguay", - "QA": "Qatar", - "RE": "Réunion", - "RO": "Romania", - "RS": "Serbia", - "RU": "Russian Federation", - "RW": "Rwanda", - "SA": "Saudi Arabia", - "SB": "Solomon Islands", - "SC": "Seychelles", - "SD": "Sudan", - "SE": "Sweden", - "SG": "Singapore", - "SH": "Ascension and Tristan da Cunha Saint Helena", - "SI": "Slovenia", - "SJ": "Svalbard and Jan Mayen", - "SK": "Slovakia", - "SL": "Sierra Leone", - "SM": "San Marino", - "SN": "Senegal", - "SO": "Somalia", - "SR": "Suriname", - "SS": "South Sudan", - "ST": "Sao Tome and Principe", - "SV": "El Salvador", - "SX": "Sint Maarten", - "SY": "Syrian Arab Republic", - "SZ": "Swaziland", - "TC": "Turks and Caicos Islands", - "TD": "Chad", - "TF": "French Southern Territories", - "TG": "Togo", - "TH": "Thailand", - "TK": "Tokelau", - "TL": "Timor-Leste", - "TM": "Turkmenistan", - "TN": "Tunisia", - "TO": "Tonga", - "TR": "Turkey", - "TT": "Trinidad and Tobago", - "TV": "Tuvalu", - "TW": "Taiwan, Province of China", - "TZ": "United Republic of Tanzania", - "UA": "Ukraine", - "UG": "Uganda", - "UM": "United States Minor Outlying Islands", - "US": "United States", - "UY": "Uruguay", - "UZ": "Uzbekistan", - "VA": "Holy See (Vatican City State)", - "VC": "Saint Vincent and the Grenadines", - "VE": "Bolivarian Republic of Venezuela", - "VG": "Virgin Islands, British", - "VI": "Virgin Islands, U.S.", - "VN": "Viet Nam", - "VU": "Vanuatu", - "WF": "Wallis and Futuna", - "WS": "Samoa", - "YE": "Yemen", - "YT": "Mayotte", - "ZA": "South Africa", - "ZM": "Zambia", - "ZW": "Zimbabwe" - -} diff --git a/libraries/Controllers/ForumController.php b/libraries/Controllers/ForumController.php index 286f100..963a556 100644 --- a/libraries/Controllers/ForumController.php +++ b/libraries/Controllers/ForumController.php @@ -61,8 +61,7 @@ class ForumController extends Controller // Redirect forum id 0 to the main page if ($forum->id === 0) { - header('Location: ' . Router::route('forums.index')); - exit; + return header('Location: ' . Router::route('forums.index')); } // Check if the forum exists diff --git a/libraries/Utils.php b/libraries/Utils.php index e8a74e2..2c0864c 100644 --- a/libraries/Utils.php +++ b/libraries/Utils.php @@ -262,11 +262,14 @@ class Utils { // Attempt to get country code using PHP's built in geo thing if (function_exists("geoip_country_code_by_name")) { - $code = geoip_country_code_by_name(Net::IP()); + try { + $code = geoip_country_code_by_name(Net::IP()); - // Check if $code is anything - if ($code) { - return $code; + // Check if $code is anything + if ($code) { + return $code; + } + } catch (\Exception $e) { } } @@ -304,23 +307,17 @@ class Utils */ public static function getCountryName($code) { - // Parse JSON file - $iso3166 = json_decode( - utf8_encode( - file_get_contents( - ROOT . Config::local('data', 'iso3166') - ) - ), - true - ); - - // Check if key exists - if (array_key_exists($code, $iso3166)) { - return $iso3166[$code]; // If entry found return the full name + // Catch XX + if (strtolower($code) === 'xx') { + return 'Unknown'; } - // Else return unknown - return 'Unknown'; + // Catch proxy + if (strtolower($code) === 'a1') { + return 'Anonymous Proxy'; + } + + return locale_get_display_region("-{$code}", 'en'); } /**