src/hg/instinct/webUserAdmin/webUserAdmin.c 1.12
1.12 2010/01/13 01:16:16 sbenz
Added an error msg when the hg.conf variables aren't defined, also removed hard references to fan and instead pull from adminEmail
Index: src/hg/instinct/webUserAdmin/webUserAdmin.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/webUserAdmin/webUserAdmin.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -B -U 4 -r1.11 -r1.12
--- src/hg/instinct/webUserAdmin/webUserAdmin.c 10 Sep 2009 22:16:24 -0000 1.11
+++ src/hg/instinct/webUserAdmin/webUserAdmin.c 13 Jan 2010 01:16:16 -0000 1.12
@@ -840,17 +840,19 @@
"<tr><td>Institution</td><td><input type=text name=webUser_institution value=\"%s\" size=40></td></tr>\n"
"<tr><td> </td><td><input type=submit name=webUserAdmin.do.signup value=submit></td></tr>\n"
"</table>\n"
"<br>\n"
-"Questions or problems? Please email <a href=\"mailto:fanhsu@soe.ucsc.edu\">fanhsu@soe.ucsc.edu</a>.<br>\n"
+"Questions or problems? Please email <a href=\"mailto:%s\">%s</a>.<br>\n"
, cartUsualString(cart, "webUser_email", "")
, cartUsualString(cart, "webUser_password", "")
, cartUsualString(cart, "webUser_password2", "")
, cartUsualString(cart, "webUser_name", "")
, cartUsualString(cart, "webUser_phone", "")
, cartUsualString(cart, "webUser_institution", "")
-, sameString("commercial",cartUsualString(cart, "webUser_type", "")) ? " checked" : ""
-, sameString("academic",cartUsualString(cart, "webUser_type", "")) ? " checked" : ""
+//, sameString("commercial",cartUsualString(cart, "webUser_type", "")) ? " checked" : ""
+//, sameString("academic",cartUsualString(cart, "webUser_type", "")) ? " checked" : ""
+, adminEmail
+, adminEmail
);
cartSaveSession(cart);
@@ -960,9 +962,9 @@
char cmd[256];
safef(cmd,sizeof(cmd),
"echo \"%s just signed up.\nPlease authorize this person as appropriate. \" | mail -s \"Someone just signed up at %s.\" %s"
-, email, myHostName, "fanhsu@soe.ucsc.edu");
+, email, myHostName, adminEmail);
int result = system(cmd);
if (result == -1)
{
hPrintf("<br>Note: sending email notice to the reviwer for %s failed\n", email);
@@ -1115,8 +1117,13 @@
* dispatches to the appropriate page-maker. */
{
struct sqlConnection *conn = hAllocConnProfile("localDb", "membership");
+if(!siteName || !adminEmail)
+ errAbort("Missing required hg.conf variables.\n"
+ "Please set the following:\n"
+ "hostname, siteName, adminEmail");
+
cart = theCart;
if (cartVarExists(cart, "debug"))
debugShowAllMembers(conn);
else if (cartVarExists(cart, "update"))