Commit 67a08472 authored by Chad Barb's avatar Chad Barb

- Added 'Country' to users table

- Changed "Zip" to "ZIP/Postal Code"
- Reformatted Postal Address Forms
parent 6104a44c
......@@ -1116,6 +1116,7 @@ CREATE TABLE users (
usr_city tinytext,
usr_state tinytext,
usr_zip tinytext,
usr_country tinytext,
usr_phone tinytext,
usr_pswd tinytext NOT NULL,
unix_uid smallint(5) unsigned NOT NULL auto_increment,
......
......@@ -184,3 +184,5 @@ last_net_act,last_cpu_act,last_ext_act);
update reserved set vname=node_id where vname is null;
alter table reserved add unique vname (pid,eid,vname);
1.128: Add usr_country column to users table.
No recommended migration commands.
\ No newline at end of file
......@@ -146,10 +146,7 @@ echo "<tr>
<th>Phone</th>
</tr>
<tr>
<th colspan=2>Addr</th>
<th>City</th>
<th>State</th>
<th>Zip</th>
<th colspan=5>Address</th>
</tr>\n";
echo "<form action='approveuser.php3' method='post'>\n";
......@@ -180,6 +177,7 @@ while ($usersrow = mysql_fetch_array($query_result)) {
$city = $row[usr_city];
$state = $row[usr_state];
$zip = $row[usr_zip];
$country = $row[usr_country];
$phone = $row[usr_phone];
echo "<tr>
......@@ -218,10 +216,14 @@ while ($usersrow = mysql_fetch_array($query_result)) {
<td>&nbsp;$phone&nbsp;</td>
</tr>\n";
echo "<tr>
<td colspan=5>&nbsp;$addr&nbsp;
&nbsp;$city&nbsp;
<td colspan=5>&nbsp;$addr&nbsp;";
if (strcmp($addr2,"")) {
echo "&nbsp;$addr2&nbsp;";
}
echo " &nbsp;$city&nbsp;
&nbsp;$state&nbsp;
&nbsp;$zip&nbsp;</td>
&nbsp;$zip&nbsp;
&nbsp;$country&nbsp;</td>
</tr>\n";
}
echo "<tr>
......
......@@ -103,7 +103,7 @@ echo "<tr>
<th>Phone</th>
</tr>
<tr>
<th colspan=5>Addr</th>
<th colspan=5>Address</th>
</tr>\n";
echo "<form action='approvewauser.php3' method='post'>\n";
......@@ -133,6 +133,7 @@ while ($usersrow = mysql_fetch_array($query_result)) {
$city = $row[usr_city];
$state = $row[usr_state];
$zip = $row[usr_zip];
$country = $row[usr_country];
$phone = $row[usr_phone];
echo "<tr>
......@@ -165,7 +166,14 @@ while ($usersrow = mysql_fetch_array($query_result)) {
<td>&nbsp;$phone&nbsp;</td>
</tr>\n";
echo "<tr>
<td colspan=5>&nbsp;$addr&nbsp;</td>
<td colspan=5>&nbsp;$addr&nbsp;"
if (strcmp($addr2,"")) {
echo "&nbsp;$addr2&nbsp;";
}
echo " &nbsp;$city&nbsp;
&nbsp;$state&nbsp;
&nbsp;$zip&nbsp;
&nbsp;$country&nbsp;</td>
</tr>\n";
}
echo "<tr>
......
......@@ -177,54 +177,39 @@ function SPITFORM($formfields, $returning, $errors)
</td>
</tr>\n";
#
# Postal Address
#
echo "<tr>
<td colspan=2>*Address Line 1:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr]\"
value=\"" . $formfields[usr_addr] . "\"
size=45>
</td>
</tr>\n";
#
# Postal Address
#
echo "<tr>
<td colspan=2> Address Line 2:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr2]\"
value=\"" . $formfields[usr_addr2] . "\"
size=45>
</td>
</tr>\n";
#
# City, State, Zip
#
echo "<tr>
<td colspan=2>*City:</td>
<td class=left>
<input type=text
name=\"formfields[usr_city]\"
value=\"" . $formfields[usr_city] . "\"
size=25>
&nbsp *State:
<input type=text
name=\"formfields[usr_state]\"
value=\"" . $formfields[usr_state] . "\"
size=2>
&nbsp *Zip:
<input type=text
name=\"formfields[usr_zip]\"
value=\"" . $formfields[usr_zip] . "\"
size=5>
</td>
</tr>\n";
echo "<tr><td colspan=3>*Postal Address:<br /><center>
<table>
<tr><td>Line 1</td><td colspan=3>
<input type=text
name=\"formfields[usr_addr]\"
value=\"" . $formfields[usr_addr] . "\"
size=45></td></tr>
<tr><td>Line 2</td><td colspan=3>
<input type=text
name=\"formfields[usr_addr2]\"
value=\"" . $formfields[usr_addr2] . "\"
size=45></td></tr>
<tr><td>City</td><td>
<input type=text
name=\"formfields[usr_city]\"
value=\"" . $formfields[usr_city] . "\"
size=25></td>
<td>State/Province</td><td>
<input type=text
name=\"formfields[usr_state]\"
value=\"" . $formfields[usr_state] . "\"
size=2></td></tr>
<tr><td>ZIP/Postal Code</td><td>
<input type=text
name=\"formfields[usr_zip]\"
value=\"" . $formfields[usr_zip] . "\"
size=10></td>
<td>Country</td><td>
<input type=text
name=\"formfields[usr_country]\"
value=\"" . $formfields[usr_country] . "\"
size=15></td></tr>
</table></center></td></tr>";
#
# Phone
......@@ -389,6 +374,7 @@ if (isset($finished)) {
if (! isset($submit)) {
$defaults = array();
$defaults[usr_URL] = "$HTTPTAG";
$defaults[usr_country] = "USA";
#
# These two allow presetting the pid/gid.
......@@ -483,7 +469,11 @@ if (! $returning) {
}
if (!isset($formfields[usr_zip]) ||
strcmp($formfields[usr_zip], "") == 0) {
$errors["Zip Code"] = "Missing Field";
$errors["ZIP/Postal Code"] = "Missing Field";
}
if (!isset($formfields[usr_country]) ||
strcmp($formfields[usr_country], "") == 0) {
$errors["Country"] = "Missing Field";
}
if (!isset($formfields[usr_phone]) ||
strcmp($formfields[usr_phone], "") == 0) {
......@@ -534,6 +524,7 @@ if (!$returning) {
$usr_city = addslashes($formfields[usr_city]);
$usr_state = addslashes($formfields[usr_state]);
$usr_zip = addslashes($formfields[usr_zip]);
$usr_country = addslashes($formfields[usr_country]);
$usr_phone = $formfields[usr_phone];
$password1 = $formfields[password1];
$password2 = $formfields[password2];
......@@ -610,6 +601,7 @@ else {
$usr_city = $row[usr_city];
$usr_state = $row[usr_state];
$usr_zip = $row[usr_zip];
$usr_country= $row[usr_country];
$usr_phone = $row[usr_phone];
$usr_URL = $row[usr_URL];
}
......@@ -669,12 +661,13 @@ if (! $returning) {
DBQueryFatal("INSERT INTO users ".
"(uid,usr_created,usr_expires,usr_name,usr_email,usr_addr,".
" usr_addr2,usr_city,usr_state,usr_zip, ".
" usr_addr2,usr_city,usr_state,usr_zip,usr_country, ".
" usr_URL,usr_phone,usr_title,usr_affil,usr_pswd,unix_uid,".
" status,pswd_expires,usr_modified) ".
"VALUES ('$joining_uid', now(), '$usr_expires', '$usr_name', ".
"'$usr_email', ".
"'$usr_addr', '$usr_addr2', '$usr_city', '$usr_state', '$usr_zip', ".
"'$usr_country', ".
"'$usr_URL', '$usr_phone', '$usr_title', '$usr_affil', ".
"'$encoding', NULL, 'newuser', ".
"date_add(now(), interval 1 year), now())");
......@@ -759,7 +752,8 @@ if ($returning) {
"Address 2: $usr_addr2\n".
"City: $usr_city\n".
"State: $usr_state\n".
"Zip: $usr_zip\n".
"ZIP/Postal Code: $usr_zip\n".
"Country: $usr_country\n".
"Phone: $usr_phone\n".
"\n".
"Please return to $TBWWW,\n".
......
......@@ -153,54 +153,40 @@ function SPITFORM($formfields, $errors)
echo " </td>
</tr>\n";
#
# Postal Address
#
echo "<tr>
<td colspan=2>*Address Line 1:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr]\"
value=\"" . $formfields[usr_addr] . "\"
size=40>
</td>
</tr>\n";
#
# Postal Address
#
echo "<tr>
<td colspan=2> Address Line 2:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr2]\"
value=\"" . $formfields[usr_addr2] . "\"
size=45>
</td>
</tr>\n";
#
# City, State, Zip
#
echo "<tr>
<td colspan=2>*City[<b>3</b>]:</td>
<td class=left>
<input type=text
name=\"formfields[usr_city]\"
value=\"" . $formfields[usr_city] . "\"
size=25>
&nbsp *State:
<input type=text
name=\"formfields[usr_state]\"
value=\"" . $formfields[usr_state] . "\"
size=2>
&nbsp *Zip:
<input type=text
name=\"formfields[usr_zip]\"
value=\"" . $formfields[usr_zip] . "\"
size=5>
</td>
</tr>\n";
echo "<tr><td colspan=3>*Address:<br /><center>
<table>
<tr><td>Line 1</td><td colspan=3>
<input type=text
name=\"formfields[usr_addr]\"
value=\"" . $formfields[usr_addr] . "\"
size=45></td></tr>
<tr><td>Line 2</td><td colspan=3>
<input type=text
name=\"formfields[usr_addr2]\"
value=\"" . $formfields[usr_addr2] . "\"
size=45></td></tr>
<tr><td>City</td><td>
<input type=text
name=\"formfields[usr_city]\"
value=\"" . $formfields[usr_city] . "\"
size=25></td>
<td>State/Province</td><td>
<input type=text
name=\"formfields[usr_state]\"
value=\"" . $formfields[usr_state] . "\"
size=2></td></tr>
<tr><td>ZIP/Postal Code</td><td>
<input type=text
name=\"formfields[usr_zip]\"
value=\"" . $formfields[usr_zip] . "\"
size=10></td>
<td>Country</td><td>
<input type=text
name=\"formfields[usr_country]\"
value=\"" . $formfields[usr_country] . "\"
size=15></td></tr>
</table></center></td></tr>";
#
# Phone
......@@ -255,7 +241,8 @@ function SPITFORM($formfields, $errors)
edit your ssh public keys</a> and your
<a href='showsfskeys.php3?target_uid=$target_uid'>
sfs public keys</a>.
<li> The City, State, Zip fields were added later, and so
<li> The City, State, ZIP/Postal Code, and Country fields
were added later, so
some early users will be forced to adjust their addresses
before they can proceed. Sorry for the inconvenience.
</ol>
......@@ -332,6 +319,7 @@ $defaults[usr_addr2] = stripslashes($row[usr_addr2]);
$defaults[usr_city] = stripslashes($row[usr_city]);
$defaults[usr_state] = stripslashes($row[usr_state]);
$defaults[usr_zip] = stripslashes($row[usr_zip]);
$defaults[usr_country] = stripslashes($row[usr_country]);
$defaults[usr_name] = stripslashes($row[usr_name]);
$defaults[usr_phone] = $row[usr_phone];
$defaults[usr_title] = stripslashes($row[usr_title]);
......@@ -401,7 +389,11 @@ if (!isset($formfields[usr_state]) ||
}
if (!isset($formfields[usr_zip]) ||
strcmp($formfields[usr_zip], "") == 0) {
$errors["Zip Code"] = "Missing Field";
$errors["ZIP/Postal Code"] = "Missing Field";
}
if (!isset($formfields[usr_country]) ||
strcmp($formfields[usr_country], "") == 0) {
$errors["Country"] = "Missing Field";
}
if (!isset($formfields[usr_phone]) ||
strcmp($formfields[usr_phone], "") == 0) {
......@@ -440,6 +432,7 @@ $usr_addr = addslashes($formfields[usr_addr]);
$usr_city = addslashes($formfields[usr_city]);
$usr_state = addslashes($formfields[usr_state]);
$usr_zip = addslashes($formfields[usr_zip]);
$usr_country = addslashes($formfields[usr_country]);
$usr_phone = $formfields[usr_phone];
$password1 = $formfields[password1];
$password2 = $formfields[password2];
......@@ -541,6 +534,7 @@ if (strcmp($defaults[usr_name], $formfields[usr_name]) ||
strcmp($defaults[usr_city], $formfields[usr_city]) ||
strcmp($defaults[usr_state], $formfields[usr_state]) ||
strcmp($defaults[usr_zip], $formfields[usr_zip]) ||
strcmp($defaults[usr_country], $formfields[usr_country]) ||
strcmp($defaults[usr_phone], $formfields[usr_phone]) ||
strcmp($defaults[usr_title], $formfields[usr_title]) ||
strcmp($defaults[usr_affil], $formfields[usr_affil]) ||
......@@ -555,6 +549,7 @@ if (strcmp($defaults[usr_name], $formfields[usr_name]) ||
"usr_city=\"$usr_city\", ".
"usr_state=\"$usr_state\", ".
"usr_zip=\"$usr_zip\", ".
"usr_country=\"$usr_country\", ".
"usr_phone=\"$usr_phone\", ".
"usr_title=\"$usr_title\", ".
"usr_affil=\"$usr_affil\", ".
......@@ -580,7 +575,8 @@ if (strcmp($defaults[usr_name], $formfields[usr_name]) ||
"Address2: $usr_addr2\n".
"City: $usr_city\n".
"State: $usr_state\n".
"Zip: $usr_zip\n".
"ZIP/Postal Code: $usr_zip\n".
"Country: $usr_country\n".
"Phone: $usr_phone\n".
"Title: $usr_title\n",
"From: $TBMAIL_OPS\n".
......
......@@ -195,54 +195,40 @@ function SPITFORM($formfields, $returning, $errors)
</td>
</tr>\n";
#
# Postal Address
#
echo "<tr>
<td colspan=2>*Address Line 1:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr]\"
value=\"" . $formfields[usr_addr] . "\"
size=40>
</td>
</tr>\n";
#
# Postal Address
#
echo "<tr>
<td colspan=2> Address Line 2:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr2]\"
value=\"" . $formfields[usr_addr2] . "\"
size=45>
</td>
</tr>\n";
#
# City, State, Zip
#
echo "<tr>
<td colspan=2>*City:</td>
<td class=left>
<input type=text
name=\"formfields[usr_city]\"
value=\"" . $formfields[usr_city] . "\"
size=25>
&nbsp *State:
<input type=text
name=\"formfields[usr_state]\"
value=\"" . $formfields[usr_state] . "\"
size=2>
&nbsp *Zip:
<input type=text
name=\"formfields[usr_zip]\"
value=\"" . $formfields[usr_zip] . "\"
size=5>
</td>
</tr>\n";
echo "<tr><td colspan=3>*Postal Address:<br /><center>
<table>
<tr><td>Line 1</td><td colspan=3>
<input type=text
name=\"formfields[usr_addr]\"
value=\"" . $formfields[usr_addr] . "\"
size=45></td></tr>
<tr><td>Line 2</td><td colspan=3>
<input type=text
name=\"formfields[usr_addr2]\"
value=\"" . $formfields[usr_addr2] . "\"
size=45></td></tr>
<tr><td>City</td><td>
<input type=text
name=\"formfields[usr_city]\"
value=\"" . $formfields[usr_city] . "\"
size=25></td>
<td>State/Province</td><td>
<input type=text
name=\"formfields[usr_state]\"
value=\"" . $formfields[usr_state] . "\"
size=2></td></tr>
<tr><td>ZIP/Postal Code</td><td>
<input type=text
name=\"formfields[usr_zip]\"
value=\"" . $formfields[usr_zip] . "\"
size=10></td>
<td>Country</td><td>
<input type=text
name=\"formfields[usr_country]\"
value=\"" . $formfields[usr_country] . "\"
size=15></td></tr>
</table></center></td></tr>";
#
# Phone
......@@ -546,6 +532,7 @@ if (! isset($submit)) {
$defaults = array();
$defaults[proj_URL] = "$HTTPTAG";
$defaults[usr_URL] = "$HTTPTAG";
$defaults[usr_country] = "USA";
$defaults[proj_ronpcs] = "0";
$defaults[proj_plabpcs] = "0";
$defaults[proj_public] = "checked";
......@@ -634,7 +621,11 @@ if (! $returning) {
}
if (!isset($formfields[usr_zip]) ||
strcmp($formfields[usr_zip], "") == 0) {
$errors["Zip Code"] = "Missing Field";
$errors["ZIP/Postal Code"] = "Missing Field";
}
if (!isset($formfields[usr_country]) ||
strcmp($formfields[usr_country], "") == 0) {
$errors["Country"] = "Missing Field";
}
if (!isset($formfields[usr_phone]) ||
strcmp($formfields[usr_phone], "") == 0) {
......@@ -763,6 +754,7 @@ if (!$returning) {
$usr_city = addslashes($formfields[usr_city]);
$usr_state = addslashes($formfields[usr_state]);
$usr_zip = addslashes($formfields[usr_zip]);
$usr_country = addslashes($formfields[usr_country]);
$usr_phone = $formfields[usr_phone];
$password1 = $formfields[password1];
$password2 = $formfields[password2];
......@@ -853,6 +845,7 @@ else {
$usr_city = $row[usr_city];
$usr_state = $row[usr_state];
$usr_zip = $row[usr_zip];
$usr_country = $row[usr_country];
$usr_phone = $row[usr_phone];
$usr_URL = $row[usr_URL];
$usr_returning = "Yes";
......@@ -915,12 +908,13 @@ if (! $returning) {
DBQueryFatal("INSERT INTO users ".
"(uid,usr_created,usr_expires,usr_name,usr_email,usr_addr,".
" usr_addr2,usr_city,usr_state,usr_zip, ".
" usr_addr2,usr_city,usr_state,usr_zip,usr_country, ".
" usr_URL,usr_title,usr_affil,usr_phone,usr_pswd,unix_uid,".
" status,pswd_expires,usr_modified) ".
"VALUES ('$proj_head_uid', now(), '$proj_expires', '$usr_name', ".
"'$usr_email', ".
"'$usr_addr', '$usr_addr2', '$usr_city', '$usr_state', '$usr_zip', ".
"'$usr_country', ".
"'$usr_URL', '$usr_title', '$usr_affil', ".
"'$usr_phone', '$encoding', NULL, 'newuser', ".
"date_add(now(), interval 1 year), now())");
......@@ -1002,7 +996,8 @@ TBMAIL($TBMAIL_APPROVAL,
"Address 2: $usr_addr2\n".
"City: $usr_city\n".
"State: $usr_state\n".
"Zip: $usr_zip\n".
"ZIP/Postal Code: $usr_zip\n".
"Country: $usr_country\n".
"Phone: $usr_phone\n".
"Members: $proj_members\n".
"PCs: $proj_pcs\n".
......
......@@ -364,6 +364,7 @@ function SHOWUSER($uid) {
$usr_city = stripslashes($row[usr_city]);
$usr_state = stripslashes($row[usr_state]);
$usr_zip = stripslashes($row[usr_zip]);
$usr_country = stripslashes($row[usr_country]);
$usr_name = stripslashes($row[usr_name]);
$usr_phone = $row[usr_phone];
$usr_title = stripslashes($row[usr_title]);
......@@ -380,6 +381,8 @@ function SHOWUSER($uid) {
$usr_state = "&nbsp";
if (!strcmp($usr_zip, ""))
$usr_zip = "&nbsp";
if (!strcmp($usr_country, ""))
$usr_country = "&nbsp";
#
# Last Login info.
......@@ -449,9 +452,14 @@ function SHOWUSER($uid) {
</tr>\n";
echo "<tr>
<td>Zip:</td>
<td>ZIP:</td>
<td>$usr_zip</td>
</tr>\n";
echo "<tr>
<td>Country:</td>
<td>$usr_country</td>
</tr>\n";
echo "<tr>
<td>Phone #:</td>
......@@ -1649,8 +1657,8 @@ function SHOWWIDEAREANODE($node_id, $embedded = 0) {
$connect_type = $row[connect_type];
$city = $row[city];
$state = $row[state];
$country = $row[country];
$zip = $row[zip];
$country = $row[country];
if (! $embedded) {
echo "<table border=2 cellpadding=0 cellspacing=2
......@@ -1692,13 +1700,13 @@ function SHOWWIDEAREANODE($node_id, $embedded = 0) {
</tr>\n";
echo "<tr>
<td>Country:</td>
<td class=left>$country</td>
<td>ZIP:</td>
<td class=left>$zip</td>
</tr>\n";
echo "<tr>
<td>Zip:</td>
<td class=left>$zip</td>
<td>Country:</td>
<td class=left>$country</td>
</tr>\n";
if (! $embedded) {
......
......@@ -83,6 +83,7 @@ function INFORMLEADERS($uid) {
$usr_city = $row[usr_city];
$usr_state = $row[usr_state];
$usr_zip = $row[usr_zip];
$usr_country = $row[usr_country];
$usr_name = $row[usr_name];
$usr_phone = $row[usr_phone];
$usr_title = $row[usr_title];
......@@ -118,7 +119,8 @@ function INFORMLEADERS($uid) {
"Address 2: $usr_addr2\n".
"City: $usr_city\n".
"State: $usr_state\n".
"Zip: $usr_zip\n".
"ZIP/Postal Code: $usr_zip\n".
"Country: $usr_country\n".
"Phone: $usr_phone\n".
"\n".
"Please return to $TBWWW,\n".
......
......@@ -192,51 +192,39 @@ function SPITFORM($formfields, $returning, $errors)
#
# Postal Address
#
echo "<tr>
<td colspan=2>*Address Line 1:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr]\"
value=\"" . $formfields[usr_addr] . "\"
size=45>
</td>
</tr>\n";
#
# Postal Address
#
echo "<tr>
<td colspan=2> Address Line 2:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr2]\"
value=\"" . $formfields[usr_addr2] . "\"
size=45>
</td>
</tr>\n";
#
# City, State, Zip
#
echo "<tr>
<td colspan=2>*City:</td>
<td class=left>
<input type=text
name=\"formfields[usr_city]\"
value=\"" . $formfields[usr_city] . "\"
size=25>
&nbsp *State:
<input type=text
name=\"formfields[usr_state]\"
value=\"" . $formfields[usr_state] . "\"
size=2>
&nbsp *Zip:
<input type=text
name=\"formfields[usr_zip]\"
value=\"" . $formfields[usr_zip] . "\"
size=5>
</td>
</tr>\n";
echo "<tr><td colspan=3>*Postal Address:<br /><center>
<table>
<tr><td>Line 1</td><td colspan=3>
<input type=text
name=\"formfields[usr_addr]\"
value=\"" . $formfields[usr_addr] . "\"
size=45></td></tr>
<tr><td>Line 2</td><td colspan=3>
<input type=text
name=\"formfields[usr_addr2]\"
value=\"" . $formfields[usr_addr2] . "\"
size=45></td></tr>
<tr><td>City</td><td>
<input type=text
name=\"formfields[usr_city]\"
value=\"" . $formfields[usr_city] . "\"
size=25></td>
<td>State/Province</td><td>
<input type=text
name=\"formfields[usr_state]\"
value=\"" . $formfields[usr_state] . "\"
size=2></td></tr>
<tr><td>ZIP/Postal Code</td><td>
<input type=text
name=\"formfields[usr_zip]\"
value=\"" . $formfields[usr_zip] . "\"
size=10></td>
<td>Country</td><td>
<input type=text
name=\"formfields[usr_country]\"
value=\"" . $formfields[usr_country] . "\"
size=15></td></tr>
</table></center></td></tr>";
#
# Phone
......@@ -359,26 +347,29 @@ function SPITFORM($formfields, $returning, $errors)
</td>
</tr>\n";
#
# ZIP / Postal Code
#
echo "<tr>
<td colspan=2>*Country:</td>
<td colspan=2>*ZIP/Postal Code:</td>
<td class=left>
<input type=text
name=\"formfields[node_country]\"
value=\"" . $formfields[node_country] . "\"
name=\"formfields[node_zip]\"
value=\"" . $formfields[node_zip] . "\"
size=10>
</td>
</tr>\n";
#
# ZIP
# Country
#
echo "<tr>
<td colspan=2>*Zip Code:</td>
<td colspan=2>*Country:</td>
<td class=left>
<input type=text
name=\"formfields[node_zip]\"
value=\"" . $formfields[node_zip] . "\"
size=10>
name=\"formfields[node_country]\"
value=\"" . $formfields[node_country] . "\"
size=15>
</td>
</tr>\n";
......@@ -491,6 +482,7 @@ if (isset($finished)) {
if (! isset($submit)) {
$defaults = array();
$defaults[usr_URL] = "$HTTPTAG";
$defaults[usr_country] = "USA";
$defaults[node_country] = "USA";
#
......@@ -583,7 +575,11 @@ if (! $returning) {
}
if (!isset($formfields[usr_zip]) ||
strcmp($formfields[usr_zip], "") == 0) {
$errors["Zip Code"] = "Missing Field";
$errors["ZIP/Postal Code"] = "Missing Field";
}
if (!isset($formfields[usr_country])