c2a2a5c22d76e7747019823efa632eb53f872ef3 max Tue Mar 24 02:34:21 2015 -0700 changing hgLogin to add special message on mirrors, refs #14718 diff --git src/hg/hgLogin/hgLogin.c src/hg/hgLogin/hgLogin.c index b2c7fd1..8dd8e28 100644 --- src/hg/hgLogin/hgLogin.c +++ src/hg/hgLogin/hgLogin.c @@ -420,33 +420,43 @@ "<p><a href=\"hgLogin?hgLogin.do.displayLoginPage=1\">Return to Login</a></p>"); cartRemove(cart, "hgLogin_helpWith"); cartRemove(cart, "hgLogin_email"); cartRemove(cart, "hgLogin_userName"); cartRemove(cart, "hgLogin_sendMailTo"); cartRemove(cart, "hgLogin_sendMailContain"); } void displayMailSuccessPwd() /* display mail success confirmation box */ { char *username = cgiUsualString("user",""); hPrintf( "<div id=\"confirmationBoxPwd\" class=\"centeredContainer formBox\">" "<h2>%s</h2>", brwName); +char *contactAddr = returnAddr; +if (sameString(returnAddr, "NOEMAIL")) + contactAddr = "the administrator of this Genome Browser Mirror"; + hPrintf( "<p id=\"confirmationMsgPwd\" class=\"confirmationTxt\">An email containing password reset information has been sent to the registered email address of <B>%s</B>.<BR><BR>" - " If you do not receive an email, please contact genome-www@soe.ucsc.edu for help.</p>", username); + " If you do not receive an email, please contact %s for help.</p>", username, contactAddr); + +if (sameString(returnAddr, "NOEMAIL")) + hPrintf("<p>If you still have questions, you can contact the Genome Browser team at " + "genome-www@soe.ucsc.edu. As this is a mirror website not managed by UCSC, please " + "specify the address of the mirror in your email.</p>"); + hPrintf( "<p><a href=\"hgLogin?hgLogin.do.displayLoginPage=1\">Return to Login</a></p>"); cartRemove(cart, "hgLogin_helpWith"); cartRemove(cart, "hgLogin_email"); cartRemove(cart, "hgLogin_userName"); cartRemove(cart, "hgLogin_sendMailTo"); cartRemove(cart, "hgLogin_sendMailContain"); } void sendMailOut(char *email, char *subject, char *msg) /* send mail to email address */ { char *hgLoginHost = wikiLinkHost(); char *obj = cartUsualString(cart, "hgLogin_helpWith", ""); int result;