b535013b6598af52d63ad9865b8377b83d84fa2d max Mon Jun 19 10:25:52 2017 -0700 fixing a few more things in hgLogin/hgSession: empty returnto url uses the new function, fixing typo in hLoginHostCgiBinUrl removing hgLogin from URL, removing the slash in loginUrl() as hLoginHostCgiBinUrl adds a slash already, refs #19632 diff --git src/hg/hgLogin/hgLogin.c src/hg/hgLogin/hgLogin.c index 508efef..c06a144 100644 --- src/hg/hgLogin/hgLogin.c +++ src/hg/hgLogin/hgLogin.c @@ -290,33 +290,31 @@ { struct dyString *result = dyStringNew(1024); struct slName *newCookies = loginLoginUser(userName, idx), *sl; for (sl = newCookies; sl != NULL; sl = sl->next) dyStringPrintf(result, " document.cookie = '%s';", sl->name); return result; } char *getReturnToURL() /* get URL from cart var returnto; if empty, make URL to hgSession on login host. */ { char *returnURL = cartUsualString(cart, "returnto", ""); char returnTo[2048]; if (!returnURL || sameString(returnURL,"")) - safef(returnTo, sizeof(returnTo), - "%shgSession?hgS_doMainPage=1", - hLoginHostCgiBinUrl()); + safef(returnTo, sizeof(returnTo), "%shgSession?hgS_doMainPage=1", hLoginHostCgiBinUrl()) else safecpy(returnTo, sizeof(returnTo), returnURL); return cloneString(returnTo); } void returnToURL(int delay) /* delay for delay mill-seconds then return to the "returnto" URL */ { char *returnURL = getReturnToURL(); jsInlineF( "setTimeout(function(){location='%s';}, %d);\n" , returnURL, delay); } static void redirectToLoginPage(char *paramStr)