Changes to use new lib/countries.php

diff --git a/login/countries.php b/login/countries.php
deleted file mode 100644 (file)
index 42d86d8..0000000
--- a/login/countries.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?PHP // $Id$
-
-function print_country_menu($selected = "") {
-
-$countries = array (
-"" => "Select...",
-"AF" => "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 Herzegowina",
-"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",
-"CK" => "Cook Islands",
-"CR" => "Costa Rica",
-"CI" => "Cote D'Ivoire",
-"HR" => "Croatia (Hrvatska)",
-"CU" => "Cuba",
-"CY" => "Cyprus",
-"CZ" => "Czech Republic",
-"DK" => "Denmark",
-"DJ" => "Djibouti",
-"DM" => "Dominica",
-"DO" => "Dominican Republic",
-"TP" => "East Timor",
-"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",
-"FX" => "France, Metropolitan",
-"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 and Mc Donald Islands",
-"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" => "Macau",
-"MK" => "Macedonia",
-"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",
-"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",
-"KN" => "Saint Kitts and Nevis",
-"LC" => "Saint Lucia",
-"VC" => "Saint Vincent and the Grenadines",
-"WS" => "Samoa",
-"SM" => "San Marino",
-"ST" => "Sao Tome and Principe",
-"SA" => "Saudi Arabia",
-"SN" => "Senegal",
-"SC" => "Seychelles",
-"SL" => "Sierra Leone",
-"SG" => "Singapore",
-"SK" => "Slovakia (Slovak Republic)",
-"SI" => "Slovenia",
-"SB" => "Solomon Islands",
-"SO" => "Somalia",
-"ZA" => "South Africa",
-"ES" => "Spain",
-"LK" => "Sri Lanka",
-"SH" => "St. Helena",
-"PM" => "St. Pierre and Miquelon",
-"SD" => "Sudan",
-"SR" => "Suriname",
-"SJ" => "Svalbard and Jan Mayen Islands",
-"SZ" => "Swaziland",
-"SE" => "Sweden",
-"CH" => "Switzerland",
-"SY" => "Syrian Arab Republic",
-"TW" => "Taiwan",
-"TJ" => "Tajikistan",
-"TZ" => "Tanzania, United Republic of",
-"TH" => "Thailand",
-"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 of America",
-"UY" => "Uruguay",
-"UZ" => "Uzbekistan",
-"VU" => "Vanuatu",
-"VA" => "Vatican City State (Holy See)",
-"VE" => "Venezuela",
-"VN" => "Vietnam",
-"VG" => "Virgin Islands (British)",
-"VI" => "Virgin Islands (U.S.)",
-"WF" => "Wallis And Futuna Islands",
-"EH" => "Western Sahara",
-"YE" => "Yemen",
-"YU" => "Yugoslavia",
-"ZR" => "Zaire",
-"ZM" => "Zambia",
-"ZW" => "Zimbabwe");
-
-echo "<SELECT NAME=country>\n";
-while (list($code, $country) = each ($countries) ) {
-       echo "<OPTION VALUE=\"$code\"";
-       if ($code == $selected) {
-               echo " SELECTED";
-       }
-       echo ">$country\n";
-}
-echo "</SELECT>\n";
-
-
-}

diff --git a/login/signup.php b/login/signup.php
index b4f3dfe1d75da75566a610f290fa0b877048c8ec..28078b03011a2a4a39a6e8b494eed9bfd6d31671 100644 (file)
--- a/login/signup.php
+++ b/login/signup.php
@@ -1,7 +1,7 @@
 <?PHP // $Id$
 
        require("../config.php");
-       require("countries.php");
+       require("../lib/countries.php");
 
        if (match_referer() && isset($HTTP_POST_VARS)) {
                $user = (object) $HTTP_POST_VARS;
@@ -80,9 +80,6 @@ function validate_form($user, &$err) {
                $err->email = "Email address already registered. <A HREF=forgot_password.php>New password?</A>";
 
 
-       if (empty($user->phone)) 
-               $err->phone = "Missing phone number";
-
        if (empty($user->city)) 
                $err->city = "Missing city";
 

diff --git a/login/signup_form.php b/login/signup_form.php
index a6faeffbd3f02415052a01133034faea7f7a1480..1acfe5d87a95721c6448bbc63a87d4b4eb3c899d 100644 (file)
--- a/login/signup_form.php
+++ b/login/signup_form.php
@@ -47,7 +47,7 @@
 </tr>
 <tr valign=top>
        <td><P>Phone number:</td>
-       <td><input type="text" name="phone" size=25 value="<? pv($user->phone) ?>">
+       <td><input type="text" name="phone" size=25 value="<? pv($user->phone) ?>"> (optional)
        <? formerr($err->phone) ?>
        </td>
 </tr>
@@ -59,7 +59,7 @@
 </tr>
 <tr valign=top>
        <td><P>Country:</td>
-       <td><? print_country_menu($user->country) ?>
+       <td><? choose_from_menu ($COUNTRIES, "country", $user->country, "Select a country...", "", "") ?>
        <? formerr($err->country) ?>
        </td>
 </tr>