5faaad7e4a0cde71c69f9c73db7fe94cf5db8bdc
angie
  Thu Jun 9 11:42:40 2016 -0700
Revert "Added checking of wiki.loggedInCookie (numeric user ID) using random numbers as suggested by Max"

This reverts commit a240964d6dfdd6f8661487b64538d33518d88501.

Conflicts:
src/hg/hgSession/hgSession.c
-- doSessionDetail was moved up by Jonathan's changes, so it needed to be changed to get userName the old way.

diff --git src/hg/hgLogin/hgLogin.c src/hg/hgLogin/hgLogin.c
index ab7cf57..95c3630 100644
--- src/hg/hgLogin/hgLogin.c
+++ src/hg/hgLogin/hgLogin.c
@@ -1279,34 +1279,35 @@
     return;
     }
 struct gbMembers *m = gbMembersLoad(row);
 sqlFreeResult(&sr);
 
 /* Check user name exist and account activated */
 if (!sameString(m->accountActivated,"Y"))
     {              
     freez(&errMsg);
     errMsg = cloneString("Account is not activated.");
     displayLoginPage(conn);
     return;
     }
 if (checkPwd(password,m->password))
     {
-    hPrintf("<h2>Login successful for user %s.\n</h2>\n", userName);
+    unsigned int userID=m->idx;  
+    hPrintf("<h2>Login successful for user %s with id %d.\n</h2>\n"
+        ,userName,userID);
     clearNewPasswordFields(conn, userName);
-    uint authToken = loginSystemLoginUser(userName);
-    displayLoginSuccess(userName, authToken);
+    displayLoginSuccess(userName,userID);
     return;
     } 
 else if (usingNewPassword(conn, userName, password))
     {
     cartSetString(cart, "hgLogin_changeRequired", "YES");
     changePasswordPage(conn);
     } 
 else
     {
     errMsg = cloneString(incorrectUsernameOrPassword);
     displayLoginPage(conn);
     return;
     }
 gbMembersFree(&m);
 }