From 5ec2bd2461c5c51fd9860bec4b3d34adf39bcb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek?= Date: Thu, 7 Sep 2017 12:16:54 +0200 Subject: [PATCH] *moved countries list to a separate file (#304) --- config.countries.php | 249 +++++++++++++++++++++++++++++++++++++++++++ register.php | 35 +++--- settings.php | 39 +++---- 3 files changed, 282 insertions(+), 41 deletions(-) create mode 100644 config.countries.php diff --git a/config.countries.php b/config.countries.php new file mode 100644 index 0000000..6fd0dd4 --- /dev/null +++ b/config.countries.php @@ -0,0 +1,249 @@ + 'Afghanistan', + 'al' => 'Albania', + 'dz' => 'Algeria', + 'as' => 'American Samoa', + 'ad' => 'Andorra', + 'ao' => 'Angola', + 'ai' => 'Anguilla', + 'aq' => 'Antarctica', + 'ag' => 'Antigua and Barbuda', + 'ar' => 'Argentina', + 'am' => 'Armenia', + 'aw' => 'Aruba', + 'au' => 'Australia', + 'at' => 'Austria', + 'az' => 'Azerbaijan', + 'bs' => 'Bahamas', + 'bh' => 'Bahrain', + 'bd' => 'Bangladesh', + 'bb' => 'Barbados', + 'by' => 'Belarus', + 'be' => 'Belgium', + 'bz' => 'Belize', + 'bj' => 'Benin', + 'bm' => 'Bermuda', + 'bt' => 'Bhutan', + 'bo' => 'Bolivia', + 'ba' => 'Bosnia and Herzegovina', + 'bw' => 'Botswana', + 'bv' => 'Bouvet Island', + 'br' => 'Brazil', + 'io' => 'British Indian Ocean Territory', + 'bn' => 'Brunei Darussalam', + 'bg' => 'Bulgaria', + 'bf' => 'Burkina Faso', + 'bi' => 'Burundi', + 'kh' => 'Cambodia', + 'cm' => 'Cameroon', + 'ca' => 'Canada', + 'cv' => 'Cape Verde', + 'ky' => 'Cayman Islands', + 'cf' => 'Central African Republic', + 'td' => 'Chad', + 'cl' => 'Chile', + 'cn' => 'China', + 'cx' => 'Christmas Island', + 'cc' => 'Cocos (Keeling) Islands', + 'co' => 'Colombia', + 'km' => 'Comoros', + 'cg' => 'Congo', + 'cd' => 'Congo, the Democratic Republic of the', + 'ck' => 'Cook Islands', + 'cr' => 'Costa Rica', + 'ci' => 'Cote D\'Ivoire', + 'hr' => 'Croatia', + 'cu' => 'Cuba', + 'cy' => 'Cyprus', + 'cz' => 'Czech Republic', + 'dk' => 'Denmark', + 'dj' => 'Djibouti', + 'dm' => 'Dominica', + 'do' => 'Dominican Republic', + 'ec' => 'Ecuador', + 'eg' => 'Egypt', + 'sv' => 'El Salvador', + 'gq' => 'Equatorial Guinea', + 'er' => 'Eritrea', + 'ee' => 'Estonia', + 'et' => 'Ethiopia', + 'fk' => 'Falkland Islands (Malvinas)', + 'fo' => 'Faroe Islands', + 'fj' => 'Fiji', + 'fi' => 'Finland', + 'fr' => 'France', + 'gf' => 'French Guiana', + 'pf' => 'French Polynesia', + 'tf' => 'French Southern Territories', + 'ga' => 'Gabon', + 'gm' => 'Gambia', + 'ge' => 'Georgia', + 'de' => 'Germany', + 'gh' => 'Ghana', + 'gi' => 'Gibraltar', + 'gr' => 'Greece', + 'gl' => 'Greenland', + 'gd' => 'Grenada', + 'gp' => 'Guadeloupe', + 'gu' => 'Guam', + 'gt' => 'Guatemala', + 'gn' => 'Guinea', + 'gw' => 'Guinea-Bissau', + 'gy' => 'Guyana', + 'ht' => 'Haiti', + 'hm' => 'Heard Island and Mcdonald Islands', + 'va' => 'Holy See (Vatican City State)', + 'hn' => 'Honduras', + 'hk' => 'Hong Kong', + 'hu' => 'Hungary', + 'is' => 'Iceland', + 'in' => 'India', + 'id' => 'Indonesia', + 'ir' => 'Iran, Islamic Republic of', + 'iq' => 'Iraq', + 'ie' => 'Ireland', + 'il' => 'Israel', + 'it' => 'Italy', + 'jm' => 'Jamaica', + 'jp' => 'Japan', + 'jo' => 'Jordan', + 'kz' => 'Kazakhstan', + 'ke' => 'Kenya', + 'ki' => 'Kiribati', + 'kp' => 'Korea, Democratic People\'s Republic of', + 'kr' => 'Korea, Republic of', + 'kw' => 'Kuwait', + 'kg' => 'Kyrgyzstan', + 'la' => 'Lao People\'s Democratic Republic', + 'lv' => 'Latvia', + 'lb' => 'Lebanon', + 'ls' => 'Lesotho', + 'lr' => 'Liberia', + 'ly' => 'Libyan Arab Jamahiriya', + 'li' => 'Liechtenstein', + 'lt' => 'Lithuania', + 'lu' => 'Luxembourg', + 'mo' => 'Macao', + 'mk' => 'Macedonia, the Former Yugoslav Republic of', + 'mg' => 'Madagascar', + 'mw' => 'Malawi', + 'my' => 'Malaysia', + 'mv' => 'Maldives', + 'ml' => 'Mali', + 'mt' => 'Malta', + 'mh' => 'Marshall Islands', + 'mq' => 'Martinique', + 'mr' => 'Mauritania', + 'mu' => 'Mauritius', + 'yt' => 'Mayotte', + 'mx' => 'Mexico', + 'fm' => 'Micronesia, Federated States of', + 'md' => 'Moldova, Republic of', + 'mc' => 'Monaco', + 'mn' => 'Mongolia', + 'ms' => 'Montserrat', + 'ma' => 'Morocco', + 'mz' => 'Mozambique', + 'mm' => 'Myanmar', + 'na' => 'Namibia', + 'nr' => 'Nauru', + 'np' => 'Nepal', + 'nl' => 'Netherlands', + 'an' => 'Netherlands Antilles', + 'nc' => 'New Caledonia', + 'nz' => 'New Zealand', + 'ni' => 'Nicaragua', + 'ne' => 'Niger', + 'ng' => 'Nigeria', + 'nu' => 'Niue', + 'nf' => 'Norfolk Island', + 'mp' => 'Northern Mariana Islands', + 'no' => 'Norway', + 'om' => 'Oman', + 'pk' => 'Pakistan', + 'pw' => 'Palau', + 'ps' => 'Palestinian Territory, Occupied', + 'pa' => 'Panama', + 'pg' => 'Papua New Guinea', + 'py' => 'Paraguay', + 'pe' => 'Peru', + 'ph' => 'Philippines', + 'pn' => 'Pitcairn', + 'pl' => 'Poland', + 'pt' => 'Portugal', + 'pr' => 'Puerto Rico', + 'qa' => 'Qatar', + 're' => 'Reunion', + 'ro' => 'Romania', + 'ru' => 'Russian Federation', + 'rw' => 'Rwanda', + 'sh' => 'Saint Helena', + 'kn' => 'Saint Kitts and Nevis', + 'lc' => 'Saint Lucia', + 'pm' => 'Saint Pierre and Miquelon', + 'vc' => 'Saint Vincent and the Grenadines', + 'ws' => 'Samoa', + 'sm' => 'San Marino', + 'st' => 'Sao Tome and Principe', + 'sa' => 'Saudi Arabia', + 'sn' => 'Senegal', + 'cs' => 'Serbia and Montenegro', + 'sc' => 'Seychelles', + 'sl' => 'Sierra Leone', + 'sg' => 'Singapore', + 'sk' => 'Slovakia', + 'si' => 'Slovenia', + 'sb' => 'Solomon Islands', + 'so' => 'Somalia', + 'za' => 'South Africa', + 'gs' => 'South Georgia and the South Sandwich Islands', + 'es' => 'Spain', + 'lk' => 'Sri Lanka', + 'sd' => 'Sudan', + 'sr' => 'Suriname', + 'sj' => 'Svalbard and Jan Mayen', + 'sz' => 'Swaziland', + 'se' => 'Sweden', + 'ch' => 'Switzerland', + 'sy' => 'Syrian Arab Republic', + 'tw' => 'Taiwan, Province of China', + 'tj' => 'Tajikistan', + 'tz' => 'Tanzania, United Republic of', + 'th' => 'Thailand', + 'tl' => 'Timor-Leste', + 'tg' => 'Togo', + 'tk' => 'Tokelau', + 'to' => 'Tonga', + 'tt' => 'Trinidad and Tobago', + 'tn' => 'Tunisia', + 'tr' => 'Turkey', + 'tm' => 'Turkmenistan', + 'tc' => 'Turks and Caicos Islands', + 'tv' => 'Tuvalu', + 'ug' => 'Uganda', + 'ua' => 'Ukraine', + 'ae' => 'United Arab Emirates', + 'gb' => 'United Kingdom', + 'us' => 'United States', + 'um' => 'United States Minor Outlying Islands', + 'uy' => 'Uruguay', + 'uz' => 'Uzbekistan', + 'vu' => 'Vanuatu', + 've' => 'Venezuela', + 'vn' => 'Viet Nam', + 'vg' => 'Virgin Islands, British', + 'vi' => 'Virgin Islands, U.s.', + 'wf' => 'Wallis and Futuna', + 'eh' => 'Western Sahara', + 'ye' => 'Yemen', + 'zm' => 'Zambia', + 'zw' => 'Zimbabwe' +); +?> diff --git a/register.php b/register.php index ec38648..009e2ff 100644 --- a/register.php +++ b/register.php @@ -2,6 +2,7 @@ require_once 'engine/init.php'; logged_in_redirect(); include 'layout/overall/header.php'; +require_once('config.countries.php'); if (empty($_POST) === false) { // $_POST[''] @@ -12,7 +13,7 @@ if (empty($_POST) === false) { break 1; } } - + // check errors (= user exist, pass long enough if (empty($errors) === true) { /* Token used for cross site scripting security */ @@ -44,11 +45,11 @@ if (empty($_POST) === false) { } } } - + if (user_exist($_POST['username']) === true) { $errors[] = 'Sorry, that username already exist.'; } - + // Don't allow "default admin names in config.php" access to register. $isNoob = in_array(strtolower($_POST['username']), $config['page_admin_access']) ? true : false; if ($isNoob) { @@ -131,7 +132,7 @@ if (isset($_GET['success']) && empty($_GET['success'])) { if ($config['log_ip']) { znote_visitor_insert_detailed_data(1); } - + //Register $register_data = array( 'name' => $_POST['username'], @@ -141,12 +142,12 @@ if (isset($_GET['success']) && empty($_GET['success'])) { 'ip' => getIPLong(), 'flag' => $_POST['flag'] ); - + user_create_account($register_data, $config['mailserver']); if (!$config['mailserver']['debug']) header('Location: register.php?success'); exit(); //End register - + } else if (empty($errors) === false){ echo ''; echo output_errors($errors); @@ -174,17 +175,15 @@ if (isset($_GET['success']) && empty($_GET['success'])) {
  • Country:
    • - diff --git a/settings.php b/settings.php index c131059..15edfb0 100644 --- a/settings.php +++ b/settings.php @@ -2,6 +2,7 @@ require_once 'engine/init.php'; protect_page(); include 'layout/overall/header.php'; +require_once('config.countries.php'); if (empty($_POST) === false) { // $_POST[''] @@ -16,7 +17,7 @@ if (empty($_POST) === false) { break 1; } } - + if (empty($errors) === true) { if (filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL) === false) { $errors[] = 'A valid email address is required.'; @@ -36,21 +37,21 @@ if (isset($_GET['success']) === true && empty($_GET['success']) === true) { $update_data = array( 'email' => $_POST['new_email'], ); - + $update_znote_data = array( 'flag' => getValue($_POST['new_flag']), ); - + user_update_account($update_data); user_update_znote_account($update_znote_data); header('Location: settings.php?success'); exit(); - + } else if (empty($errors) === false) { echo output_errors($errors); } ?> - +
    • @@ -60,17 +61,15 @@ if (isset($_GET['success']) === true && empty($_GET['success']) === true) {
    • Country:
    - \ No newline at end of file +?>