Commit 5e38412f authored by Leigh Stoller's avatar Leigh Stoller

Add "Address Line 2", City, State, and Zip as independent entities,

finally! These have been in the DB for a long time, but never used.
As Eric pointed out, its easier to get realistic address info from
people if we provide the right forms. The downside is that all current
users will have to adjust their info the next time they edit their
info. Thats okay. I thought about forcing all users to do it the next
time they log in, but I figured people would scream.
parent 6294daba
......@@ -89,3 +89,20 @@ newbold 2003/04/02 15:24:48 MST
obvious. They may also want to customize some of the other vars that are
mentioned in configure.in and www/defs.php3.in .
stoller 2003/04/04 10:20:31 MST
Modified files:
sql database-migrate.txt
www approveproject_list.php3
approveuser_form.php3 joinproject.php3
moduserinfo.php3 newproject.php3
showstuff.php3 verifyusr.php3
widearea_register.php
Log:
Add "Address Line 2", City, State, and Zip as independent entities,
finally! These have been in the DB for a long time, but never used.
As Eric pointed out, its easier to get realistic address info from
people if we provide the right forms. The downside is that all current
users will have to adjust their info the next time they edit their
info. Thats okay. I thought about forcing all users to do it the next
time they log in, but I figured people would scream.
......@@ -130,3 +130,12 @@ last_net_act,last_cpu_act,last_ext_act);
PRIMARY KEY (msgid),
KEY date (date)
) TYPE=MyISAM;
1.122: Convert usr_zip to tinytext from int. In prep for using these
fields.
alter table users change usr_zip usr_zip tinytext;
update users set usr_addr2='',usr_city='',usr_state='',usr_zip='';
These fields had never been used, so the type change and init
are okay.
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -73,11 +73,6 @@ while ($projectrow = mysql_fetch_array($query_result)) {
$email = $row[usr_email];
$title = $row[usr_title];
$affil = $row[usr_affil];
$addr = $row[usr_addr];
$addr2 = $row[usr_addr2];
$city = $row[usr_city];
$state = $row[usr_state];
$zip = $row[usr_zip];
$phone = $row[usr_phone];
echo "<tr>
......
......@@ -146,7 +146,10 @@ echo "<tr>
<th>Phone</th>
</tr>
<tr>
<th colspan=5>Addr</th>
<th colspan=2>Addr</th>
<th>City</th>
<th>State</th>
<th>Zip</th>
</tr>\n";
echo "<form action='approveuser.php3' method='post'>\n";
......@@ -215,7 +218,10 @@ 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;
&nbsp;$city&nbsp;
&nbsp;$state&nbsp;
&nbsp;$zip&nbsp;</td>
</tr>\n";
}
echo "<tr>
......
......@@ -181,12 +181,48 @@ function SPITFORM($formfields, $returning, $errors)
# Postal Address
#
echo "<tr>
<td colspan=2>*Postal Address:</td>
<td colspan=2>*Address Line 1:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr]\"
value=\"" . $formfields[usr_addr] . "\"
size=40>
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";
......@@ -435,7 +471,19 @@ if (! $returning) {
}
if (!isset($formfields[usr_addr]) ||
strcmp($formfields[usr_addr], "") == 0) {
$errors["Postal Address"] = "Missing Field";
$errors["Address 1"] = "Missing Field";
}
if (!isset($formfields[usr_city]) ||
strcmp($formfields[usr_city], "") == 0) {
$errors["City"] = "Missing Field";
}
if (!isset($formfields[usr_state]) ||
strcmp($formfields[usr_state], "") == 0) {
$errors["State"] = "Missing Field";
}
if (!isset($formfields[usr_zip]) ||
strcmp($formfields[usr_zip], "") == 0) {
$errors["Zip Code"] = "Missing Field";
}
if (!isset($formfields[usr_phone]) ||
strcmp($formfields[usr_phone], "") == 0) {
......@@ -483,6 +531,9 @@ if (!$returning) {
$usr_affil = addslashes($formfields[usr_affil]);
$usr_email = $formfields[usr_email];
$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_phone = $formfields[usr_phone];
$password1 = $formfields[password1];
$password2 = $formfields[password2];
......@@ -496,6 +547,13 @@ if (!$returning) {
$usr_URL = $formfields[usr_URL];
}
if (! isset($formfields[usr_addr2])) {
$usr_addr2 = "";
}
else {
$usr_addr2 = addslashes($formfields[usr_addr2]);
}
#
# Pub Key.
#
......@@ -548,6 +606,10 @@ else {
$usr_affil = $row[usr_affil];
$usr_email = $row[usr_email];
$usr_addr = $row[usr_addr];
$usr_addr2 = $row[usr_addr2];
$usr_city = $row[usr_city];
$usr_state = $row[usr_state];
$usr_zip = $row[usr_zip];
$usr_phone = $row[usr_phone];
$usr_URL = $row[usr_URL];
}
......@@ -607,11 +669,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_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_URL', '$usr_phone', '$usr_title', '$usr_affil', ".
"'$usr_addr', '$usr_addr2', '$usr_city', '$usr_state', '$usr_zip', ".
"'$usr_URL', '$usr_phone', '$usr_title', '$usr_affil', ".
"'$encoding', NULL, 'newuser', ".
"date_add(now(), interval 1 year), now())");
......@@ -691,7 +755,11 @@ if ($returning) {
"User URL: $usr_URL\n".
"Title: $usr_title\n".
"Affiliation: $usr_affil\n".
"Address: $usr_addr\n".
"Address 1: $usr_addr\n".
"Address 2: $usr_addr2\n".
"City: $usr_city\n".
"State: $usr_state\n".
"Zip: $usr_zip\n".
"Phone: $usr_phone\n".
"\n".
"Please return to $TBWWW,\n".
......
......@@ -157,7 +157,7 @@ function SPITFORM($formfields, $errors)
# Postal Address
#
echo "<tr>
<td colspan=2>*Postal Address:</td>
<td colspan=2>*Address Line 1:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr]\"
......@@ -166,6 +166,42 @@ function SPITFORM($formfields, $errors)
</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";
#
# Phone
#
......@@ -219,6 +255,9 @@ 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
some early users will be forced to adjust their addresses
before they can proceed. Sorry for the inconvenience.
</ol>
</blockquote></blockquote>
</h4>\n";
......@@ -289,6 +328,10 @@ $defaults[target_uid] = $target_uid;
$defaults[usr_email] = $row[usr_email];
$defaults[usr_URL] = $row[usr_URL];
$defaults[usr_addr] = stripslashes($row[usr_addr]);
$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_name] = stripslashes($row[usr_name]);
$defaults[usr_phone] = $row[usr_phone];
$defaults[usr_title] = stripslashes($row[usr_title]);
......@@ -348,6 +391,18 @@ if (!isset($formfields[usr_addr]) ||
strcmp($formfields[usr_addr], "") == 0) {
$errors["Postal Address"] = "Missing Field";
}
if (!isset($formfields[usr_city]) ||
strcmp($formfields[usr_city], "") == 0) {
$errors["City"] = "Missing Field";
}
if (!isset($formfields[usr_state]) ||
strcmp($formfields[usr_state], "") == 0) {
$errors["State"] = "Missing Field";
}
if (!isset($formfields[usr_zip]) ||
strcmp($formfields[usr_zip], "") == 0) {
$errors["Zip Code"] = "Missing Field";
}
if (!isset($formfields[usr_phone]) ||
strcmp($formfields[usr_phone], "") == 0) {
$errors["Phone #"] = "Missing Field";
......@@ -382,6 +437,9 @@ $usr_name = addslashes($formfields[usr_name]);
$usr_affil = addslashes($formfields[usr_affil]);
$usr_email = $formfields[usr_email];
$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_phone = $formfields[usr_phone];
$password1 = $formfields[password1];
$password2 = $formfields[password2];
......@@ -395,6 +453,13 @@ else {
$usr_URL = $formfields[usr_URL];
}
if (! isset($formfields[usr_addr2])) {
$usr_addr2 = "";
}
else {
$usr_addr2 = addslashes($formfields[usr_addr2]);
}
#
# Check that email address looks reasonable. Only admin types can change
# the email address. If its different, the user circumvented the form,
......@@ -472,6 +537,10 @@ if ((isset($password1) && strcmp($password1, "")) &&
if (strcmp($defaults[usr_name], $formfields[usr_name]) ||
strcmp($defaults[usr_URL], $formfields[usr_URL]) ||
strcmp($defaults[usr_addr], $formfields[usr_addr]) ||
strcmp($defaults[usr_addr2], $formfields[usr_addr2]) ||
strcmp($defaults[usr_city], $formfields[usr_city]) ||
strcmp($defaults[usr_state], $formfields[usr_state]) ||
strcmp($defaults[usr_zip], $formfields[usr_zip]) ||
strcmp($defaults[usr_phone], $formfields[usr_phone]) ||
strcmp($defaults[usr_title], $formfields[usr_title]) ||
strcmp($defaults[usr_affil], $formfields[usr_affil]) ||
......@@ -482,6 +551,10 @@ if (strcmp($defaults[usr_name], $formfields[usr_name]) ||
"usr_name=\"$usr_name\", ".
"usr_URL=\"$usr_URL\", ".
"usr_addr=\"$usr_addr\", ".
"usr_addr2=\"$usr_addr2\", ".
"usr_city=\"$usr_city\", ".
"usr_state=\"$usr_state\", ".
"usr_zip=\"$usr_zip\", ".
"usr_phone=\"$usr_phone\", ".
"usr_title=\"$usr_title\", ".
"usr_affil=\"$usr_affil\", ".
......@@ -503,7 +576,11 @@ if (strcmp($defaults[usr_name], $formfields[usr_name]) ||
"Email: $usr_email\n".
"URL: $usr_URL\n".
"Affiliation: $usr_affil\n".
"Address: $usr_addr\n".
"Address1: $usr_addr\n".
"Address2: $usr_addr2\n".
"City: $usr_city\n".
"State: $usr_state\n".
"Zip: $usr_zip\n".
"Phone: $usr_phone\n".
"Title: $usr_title\n",
"From: $TBMAIL_OPS\n".
......
......@@ -199,7 +199,7 @@ function SPITFORM($formfields, $returning, $errors)
# Postal Address
#
echo "<tr>
<td colspan=2>*Postal Address:</td>
<td colspan=2>*Address Line 1:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr]\"
......@@ -208,6 +208,42 @@ function SPITFORM($formfields, $returning, $errors)
</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";
#
# Phone
#
......@@ -588,6 +624,18 @@ if (! $returning) {
strcmp($formfields[usr_addr], "") == 0) {
$errors["Postal Address"] = "Missing Field";
}
if (!isset($formfields[usr_city]) ||
strcmp($formfields[usr_city], "") == 0) {
$errors["City"] = "Missing Field";
}
if (!isset($formfields[usr_state]) ||
strcmp($formfields[usr_state], "") == 0) {
$errors["State"] = "Missing Field";
}
if (!isset($formfields[usr_zip]) ||
strcmp($formfields[usr_zip], "") == 0) {
$errors["Zip Code"] = "Missing Field";
}
if (!isset($formfields[usr_phone]) ||
strcmp($formfields[usr_phone], "") == 0) {
$errors["Phone #"] = "Missing Field";
......@@ -712,6 +760,9 @@ if (!$returning) {
$usr_affil = addslashes($formfields[usr_affil]);
$usr_email = $formfields[usr_email];
$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_phone = $formfields[usr_phone];
$password1 = $formfields[password1];
$password2 = $formfields[password2];
......@@ -726,6 +777,13 @@ if (!$returning) {
$usr_URL = $formfields[usr_URL];
}
if (! isset($formfields[usr_addr2])) {
$usr_addr2 = "";
}
else {
$usr_addr2 = addslashes($formfields[usr_addr2]);
}
#
# Pub Key.
#
......@@ -791,6 +849,10 @@ else {
$usr_affil = $row[usr_affil];
$usr_email = $row[usr_email];
$usr_addr = $row[usr_addr];
$usr_addr2 = $row[usr_addr2];
$usr_city = $row[usr_city];
$usr_state = $row[usr_state];
$usr_zip = $row[usr_zip];
$usr_phone = $row[usr_phone];
$usr_URL = $row[usr_URL];
$usr_returning = "Yes";
......@@ -853,10 +915,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_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_URL', '$usr_title', '$usr_affil', ".
"'$usr_email', ".
"'$usr_addr', '$usr_addr2', '$usr_city', '$usr_state', '$usr_zip', ".
"'$usr_URL', '$usr_title', '$usr_affil', ".
"'$usr_phone', '$encoding', NULL, 'newuser', ".
"date_add(now(), interval 1 year), now())");
......@@ -933,7 +998,11 @@ TBMAIL($TBMAIL_APPROVAL,
"Funders: $proj_funders\n".
"Title: $usr_title\n".
"Affiliation: $usr_affil\n".
"Address: $usr_addr\n".
"Address 1: $usr_addr\n".
"Address 2: $usr_addr2\n".
"City: $usr_city\n".
"State: $usr_state\n".
"Zip: $usr_zip\n".
"Phone: $usr_phone\n".
"Members: $proj_members\n".
"PCs: $proj_pcs\n".
......
......@@ -360,6 +360,10 @@ function SHOWUSER($uid) {
$usr_email = $row[usr_email];
$usr_URL = $row[usr_URL];
$usr_addr = stripslashes($row[usr_addr]);
$usr_addr2 = stripslashes($row[usr_addr2]);
$usr_city = stripslashes($row[usr_city]);
$usr_state = stripslashes($row[usr_state]);
$usr_zip = stripslashes($row[usr_zip]);
$usr_name = stripslashes($row[usr_name]);
$usr_phone = $row[usr_phone];
$usr_title = stripslashes($row[usr_title]);
......@@ -368,6 +372,15 @@ function SHOWUSER($uid) {
$admin = $row[admin];
$adminoff = $row[adminoff];
if (!strcmp($usr_addr2, ""))
$usr_addr2 = "&nbsp";
if (!strcmp($usr_city, ""))
$usr_city = "&nbsp";
if (!strcmp($usr_state, ""))
$usr_state = "&nbsp";
if (!strcmp($usr_zip, ""))
$usr_zip = "&nbsp";
#
# Last Login info.
#
......@@ -416,10 +429,30 @@ function SHOWUSER($uid) {
</tr>\n";
echo "<tr>
<td>Mailing Address:</td>
<td>Address 1:</td>
<td>$usr_addr</td>
</tr>\n";
echo "<tr>
<td>Address 2:</td>
<td>$usr_addr2</td>
</tr>\n";
echo "<tr>
<td>City:</td>
<td>$usr_city</td>
</tr>\n";
echo "<tr>
<td>State:</td>
<td>$usr_state</td>
</tr>\n";
echo "<tr>
<td>Zip:</td>
<td>$usr_zip</td>
</tr>\n";
echo "<tr>
<td>Phone #:</td>
<td>$usr_phone</td>
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -79,6 +79,10 @@ function INFORMLEADERS($uid) {
$usr_email = $row[usr_email];
$usr_URL = $row[usr_URL];
$usr_addr = $row[usr_addr];
$usr_addr2 = $row[usr_addr2];
$usr_city = $row[usr_city];
$usr_state = $row[usr_state];
$usr_zip = $row[usr_zip];
$usr_name = $row[usr_name];
$usr_phone = $row[usr_phone];
$usr_title = $row[usr_title];
......@@ -110,7 +114,11 @@ function INFORMLEADERS($uid) {
"User URL: $usr_URL\n".
"Title: $usr_title\n".
"Affiliation: $usr_affil\n".
"Address: $usr_addr\n".
"Address 1: $usr_addr\n".
"Address 2: $usr_addr2\n".
"City: $usr_city\n".
"State: $usr_state\n".
"Zip: $usr_zip\n".
"Phone: $usr_phone\n".
"\n".
"Please return to $TBWWW,\n".
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -180,16 +180,53 @@ function SPITFORM($formfields, $returning, $errors)
</td>
</tr>\n";
#
# Postal Address
#
echo "<tr>
<td colspan=2>*Postal Address:</td>
<td colspan=2>*Address Line 1:</td>
<td class=left>
<input type=text
name=\"formfields[usr_addr]\"
value=\"" . $formfields[usr_addr] . "\"
size=40>
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";
......@@ -516,7 +553,19 @@ if (! $returning) {
}
if (!isset($formfields[usr_addr]) ||
strcmp($formfields[usr_addr], "") == 0) {
$errors["Postal Address"] = "Missing Field";
$errors["Address 1"] = "Missing Field";
}
if (!isset($formfields[usr_city]) ||
strcmp($formfields[usr_city], "") == 0) {
$errors["City"] = "Missing Field";
}
if (!isset($formfields[usr_state]) ||
strcmp($formfields[usr_state], "") == 0) {
$errors["State"] = "Missing Field";
}
if (!isset($formfields[usr_zip]) ||
strcmp($formfields[usr_zip], "") == 0) {
$errors["Zip Code"] = "Missing Field";
}
if (!isset($formfields[usr_phone]) ||
strcmp($formfields[usr_phone], "") == 0) {
......@@ -669,6 +718,9 @@ if (!$returning) {
$usr_affil = addslashes($formfields[usr_affil]);
$usr_email = $formfields[usr_email];
$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_phone = $formfields[usr_phone];
$password1 = $formfields[password1];
$password2 = $formfields[password2];
......@@ -683,6 +735,13 @@ if (!$returning) {
$usr_URL = $formfields[usr_URL];
}
if (! isset($formfields[usr_addr2])) {
$usr_addr2 = "";
}
else {
$usr_addr2 = addslashes($formfields[usr_addr2]);
}
#
# Pub Key.
#
......@@ -742,6 +801,10 @@ else {
$usr_affil = $row[usr_affil];
$usr_email = $row[usr_email];
$usr_addr = $row[usr_addr];
$usr_addr2 = $row[usr_addr2];
$usr_city = $row[usr_city];
$usr_state = $row[usr_state];
$usr_zip = $row[usr_zip];
$usr_phone = $row[usr_phone];
$usr_URL = $row[usr_URL];
$usr_returning = "Yes";
......@@ -782,10 +845,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_URL,usr_title,usr_affil,usr_phone,usr_pswd,unix_uid,".
" status,pswd_expires,usr_modified,webonly) ".
"VALUES ('$usr_uid', now(), '$usr_expires', '$usr_name', ".
"'$usr_email', '$usr_addr', '$usr_URL', '$usr_title', '$usr_affil', ".
"'$usr_email', ".
"'$usr_addr', '$usr_addr2', '$usr_city', '$usr_state', '$usr_zip', ".
"'$usr_URL', '$usr_title', '$usr_affil', ".
"'$usr_phone', '$encoding', NULL, 'newuser', ".
"date_add(now(), interval 1 year), now(), 1)");
......@@ -846,7 +912,11 @@ TBMAIL($TBMAIL_APPROVAL,
"User URL: $usr_URL\n".
"Title: $usr_title\n".
"Affiliation: $usr_affil\n".
"Address: $usr_addr\n".
"Address 1: $usr_addr\n".
"Address 2: $usr_addr2\n".
"City: $usr_city\n".
"State: $usr_state\n".
"Zip: $usr_zip\n".
"Phone: $usr_phone\n",
"From: $usr_name '$usr_uid' <$usr_email>\n".
"Reply-To: $TBMAIL_APPROVAL\n".
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment