7a5f46a7edd5d3a05debae097811b274f2c442c8
chinhli
  Wed May 30 15:35:39 2012 -0700
create getReturnToURL() function for used by returnToURL.
diff --git src/hg/hgLogin/hgLogin.c src/hg/hgLogin/hgLogin.c
index 2f14f8c..4ad70fc 100644
--- src/hg/hgLogin/hgLogin.c
+++ src/hg/hgLogin/hgLogin.c
@@ -230,90 +230,72 @@
 int delay=nSec*1000;
 hPrintf("<script  language=\"JavaScript\">\n"
     "<!-- \n"
     "window.setTimeout(afterDelay, %d);\n"
     "function afterDelay() {\n"
     "window.location =\"http://%s/cgi-bin/hgLogin?hgLogin.do.displayLoginPage=1\";\n}"
     "//-->\n</script>", delay, hgLoginHost);
 }
 
 boolean tokenExpired(char *dateTime)
 /* Is token expired? */
 {
 return FALSE;
 }
 
-void getReturnToURL(char *returnTo)
+char *getReturnToURL()
 /* get URL passed in with returnto URL */
 {
 char *returnURL = cartUsualString(cart, "returnto", "");
 char *hgLoginHost = wikiLinkHost();
-
+char returnTo[512];
 if (!returnURL || sameString(returnURL,""))
    safef(returnTo, sizeof(returnTo),
         "http://%s/cgi-bin/hgSession?hgS_doMainPage=1", hgLoginHost);
 else
    safecpy(returnTo, sizeof(returnTo), returnURL);
+return cloneString(returnTo);
 }
 
 void returnToURL(int nSec)
 /* delay for N/10  micro seconds then return to the "returnto" URL */
 {
-char *returnURL = cartUsualString(cart, "returnto", "");
-char *hgLoginHost = wikiLinkHost();
-char returnTo[512];
-
-if (!returnURL || sameString(returnURL,""))
-   safef(returnTo, sizeof(returnTo),
-        "http://%s/cgi-bin/hgSession?hgS_doMainPage=1", hgLoginHost);
-else
-   safecpy(returnTo, sizeof(returnTo), returnURL);
+char *returnURL = getReturnToURL();
 int delay=nSec*100;
 hPrintf(
     "<script  language=\"JavaScript\">\n"
     "<!-- "
     "\n"
     "window.setTimeout(afterDelay, %d);\n"
     "function afterDelay() {\n"
     "window.location =\"%s\";\n}"
     "\n//-->\n"
     "</script>", delay, returnURL);
 }
 
-
 void  displayActMailSuccess()
 /* display Activate mail success box */
 {
-char *returnURL = cartUsualString(cart, "returnto", "");
-char *hgLoginHost = wikiLinkHost();
-char returnTo[512];
-
-if (!returnURL || sameString(returnURL,""))
-   safef(returnTo, sizeof(returnTo),
-        "http://%s/cgi-bin/hgSession?hgS_doMainPage=1", hgLoginHost);
-else
-   safecpy(returnTo, sizeof(returnTo), returnURL);
-
+char *returnURL = getReturnToURL(); 
 hPrintf(
     "<div id=\"confirmationBox\" class=\"centeredContainer formBox\">"
     "\n"
     "<h2>UCSC Genome Browser</h2>"
     "<p id=\"confirmationMsg\" class=\"confirmationTxt\">An account activation email has been sent to you. \n"
    "Please activate your account within 7 days.</p>"
     "\n"
     "<p><a href=\"%s\">Return</a></p>", returnURL);
-cartRemove(cart, "hgLogin_helpWith");
 cartRemove(cart, "hgLogin_email");
 cartRemove(cart, "hgLogin_userName");
 }
 
 
 void sendActMailOut(char *email, char *subject, char *msg)
 /* send mail to email address */
 {
 char *hgLoginHost = wikiLinkHost();
 char cmd[4096];
 safef(cmd,sizeof(cmd),
     "echo '%s' | mail -s \"%s\" %s" , msg, subject, email);
 int result = system(cmd);
 if (result == -1)
     {