d48e7626ab0b366e8ce43fee17366fe7d6ba6e67
angie
Thu Jun 9 11:36:06 2016 -0700
Revert "Several revisions to login cookie-checking after helpful code review by Max:"
This reverts commit 185dbcc2ba84d6eb1301163b926ebed3177cd379.
diff --git src/hg/hgSession/hgSession.c src/hg/hgSession/hgSession.c
index c39177e..63998ff 100644
--- src/hg/hgSession/hgSession.c
+++ src/hg/hgSession/hgSession.c
@@ -581,31 +581,31 @@
"be bookmarked in your web browser and/or shared with "
"others. If you right-click and copy the Browser link, "
"it will be the same as the Email link. However, if you "
"click the Browser link it will take you to the Genome "
"Browser and become a uniquely identified URL once the "
"session loads, so that resulting link is not advised "
"for sharing.\n"
"
Each previously saved named session also appears with "
"a checkbox to add the session to our "
"Public Sessions "
"listing. Adding a session to this listing allows other "
"browser users to view the description and a thumbnail "
"image of your session, and to load the session if they "
"are interested.\n", cartSidUrlString(cart));
}
-else if (loginSystemEnabled() || wikiLinkEnabled())
+else if (wikiLinkEnabled())
{
printf("If you sign in, you will be able "
" to save named sessions which will be displayed with "
" Browser and Email links.\n",
wikiLinkUserLoginUrl(cartSessionId(cart)));
}
dyStringPrintf(dyUrl, "http%s://%s%s", cgiAppendSForHttps(), cgiServerNamePort(), cgiScriptName());
printf("If you have saved your settings to a local file, you can send "
"email to others with the file as an attachment and direct them to "
"%s .\n",
dyUrl->string, dyUrl->string);
dyStringPrintf(dyUrl, "?hgS_doLoadUrl=submit&hgS_loadUrlName=");
printf("If a saved settings file is available from a web server, "
"you can send email to others with a link such as "
@@ -613,31 +613,31 @@
"settings file, e.g. http://www.mysite.edu/~me/mySession.txt . "
"In this type of link, you can replace "
"\"hgSession\" with \"hgTracks\" in order to proceed directly to "
"the Genome Browser. For an example page using such links "
"please see the Session Gallery.\n",
dyUrl->string);
printf("\n");
dyStringFree(&dyUrl);
}
void doMainPage(char *userName, char *message)
/* Login status/links and session controls. */
{
puts("Content-Type:text/html\n");
-if (loginSystemEnabled() || wikiLinkEnabled())
+if (wikiLinkEnabled())
{
if (userName)
welcomeUser(userName);
else
offerLogin();
if (isNotEmpty(message))
{
if (cartVarExists(cart, hgsDoSessionDetail))
webNewSection("Session Details");
else
webNewSection("Updated Session");
puts(message);
}
showSessionControls(userName, TRUE, TRUE);
showLinkingTemplates(userName);
@@ -1429,31 +1429,31 @@
return dyStringCannibalize(&dyMessage);
}
void hgSession()
/* hgSession - Interface with wiki login and do session saving/loading.
* Here we set up cart and some global variables, dispatch the command,
* and put away the cart when it is done. */
{
struct hash *oldVars = hashNew(10);
/* Sometimes we output HTML and sometimes plain text; let each outputter
* take care of headers instead of using a fixed cart*Shell(). */
cart = cartAndCookieNoContent(hUserCookie(), excludeVars, oldVars);
-char *userName = (loginSystemEnabled() || wikiLinkEnabled()) ? wikiLinkUserName() : NULL;
+char *userName = wikiLinkEnabled() ? wikiLinkUserName() : NULL;
if (cartVarExists(cart, hgsDoMainPage) || cartVarExists(cart, hgsCancel))
doMainPage(userName, NULL);
else if (cartVarExists(cart, hgsDoNewSession))
{
char *message = doNewSession(userName);
doMainPage(userName, message);
}
else if (cartVarExists(cart, hgsDoOtherUser))
{
char *message = doOtherUser(hgsDoOtherUser);
doMainPage(userName, message);
}
else if (cartVarExists(cart, hgsDoSaveLocal))
{