249f4a8dc0c2d606a69d86693178cecb65197067
chinhli
  Wed Apr 25 12:28:26 2012 -0700
Finished Greg's Login UI.
diff --git src/hg/hgLogin/gbMembers.c src/hg/hgLogin/gbMembers.c
index a958418..5aca320 100644
--- src/hg/hgLogin/gbMembers.c
+++ src/hg/hgLogin/gbMembers.c
@@ -7,38 +7,33 @@
 #include "dystring.h"
 #include "jksql.h"
 #include "gbMembers.h"
 
 
 void gbMembersStaticLoad(char **row, struct gbMembers *ret)
 /* Load a row from gbMembers table into ret.  The contents of ret will
  * be replaced at the next call to this function. */
 {
 
 ret->idx = sqlUnsigned(row[0]);
 ret->userName = row[1];
 ret->realName = row[2];
 ret->password = row[3];
 ret->email = row[4];
-ret->lastTouched = row[5];
-ret->newPassword = row[6];
-ret->newPassTime = row[7];
-ret->emailAuthenticated = row[8];
-ret->emailToken = row[9];
-ret->emailTokenExpires = row[10];
-safecpy(ret->passwordChangeRequired, sizeof(ret->passwordChangeRequired), row[11]);
-safecpy(ret->accountAactivated, sizeof(ret->accountAactivated), row[12]);
+ret->lastUse = row[5];
+safecpy(ret->activated, sizeof(ret->activated), row[6]);
+ret->dateAuthenticated = row[7];
 }
 
 struct gbMembers *gbMembersLoadByQuery(struct sqlConnection *conn, char *query)
 /* Load all gbMembers from table that satisfy the query given.  
  * Where query is of the form 'select * from example where something=something'
  * or 'select example.* from example, anotherTable where example.something = 
  * anotherTable.something'.
  * Dispose of this with gbMembersFreeList(). */
 {
 struct gbMembers *list = NULL, *el;
 struct sqlResult *sr;
 char **row;
 
 sr = sqlGetResult(conn, query);
 while ((row = sqlNextRow(sr)) != NULL)
@@ -49,180 +44,156 @@
 slReverse(&list);
 sqlFreeResult(&sr);
 return list;
 }
 
 void gbMembersSaveToDb(struct sqlConnection *conn, struct gbMembers *el, char *tableName, int updateSize)
 /* Save gbMembers as a row to the table specified by tableName. 
  * As blob fields may be arbitrary size updateSize specifies the approx size
  * of a string that would contain the entire query. Arrays of native types are
  * converted to comma separated strings and loaded as such, User defined types are
  * inserted as NULL. Note that strings must be escaped to allow insertion into the database.
  * For example "autosql's features include" --> "autosql\'s features include" 
  * If worried about this use gbMembersSaveToDbEscaped() */
 {
 struct dyString *update = newDyString(updateSize);
-dyStringPrintf(update, "insert into %s values ( %u,'%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')", 
-	tableName,  el->idx,  el->userName,  el->realName,  el->password,  el->email,  el->lastTouched,  el->newPassword,  el->newPassTime,  el->emailAuthenticated,  el->emailToken,  el->emailTokenExpires,  el->passwordChangeRequired,  el->accountAactivated);
+dyStringPrintf(update, "insert into %s values ( %u,'%s','%s','%s','%s','%s','%s','%s')", 
+	tableName,  el->idx,  el->userName,  el->realName,  el->password,  el->email,  el->lastUse,  el->activated,  el->dateAuthenticated);
 sqlUpdate(conn, update->string);
 freeDyString(&update);
 }
 
 void gbMembersSaveToDbEscaped(struct sqlConnection *conn, struct gbMembers *el, char *tableName, int updateSize)
 /* Save gbMembers as a row to the table specified by tableName. 
  * As blob fields may be arbitrary size updateSize specifies the approx size.
  * of a string that would contain the entire query. Automatically 
  * escapes all simple strings (not arrays of string) but may be slower than gbMembersSaveToDb().
  * For example automatically copies and converts: 
  * "autosql's features include" --> "autosql\'s features include" 
  * before inserting into database. */ 
 {
 struct dyString *update = newDyString(updateSize);
-char  *userName, *realName, *password, *email, *lastTouched, *newPassword, *newPassTime, *emailAuthenticated, *emailToken, *emailTokenExpires, *passwordChangeRequired, *accountAactivated;
+char  *userName, *realName, *password, *email, *lastUse, *activated, *dateAuthenticated;
 userName = sqlEscapeString(el->userName);
 realName = sqlEscapeString(el->realName);
 password = sqlEscapeString(el->password);
 email = sqlEscapeString(el->email);
-lastTouched = sqlEscapeString(el->lastTouched);
-newPassword = sqlEscapeString(el->newPassword);
-newPassTime = sqlEscapeString(el->newPassTime);
-emailAuthenticated = sqlEscapeString(el->emailAuthenticated);
-emailToken = sqlEscapeString(el->emailToken);
-emailTokenExpires = sqlEscapeString(el->emailTokenExpires);
-passwordChangeRequired = sqlEscapeString(el->passwordChangeRequired);
-accountAactivated = sqlEscapeString(el->accountAactivated);
+lastUse = sqlEscapeString(el->lastUse);
+activated = sqlEscapeString(el->activated);
+dateAuthenticated = sqlEscapeString(el->dateAuthenticated);
 
-dyStringPrintf(update, "insert into %s values ( %u,'%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')", 
-	tableName,  el->idx,  userName,  realName,  password,  email,  lastTouched,  newPassword,  newPassTime,  emailAuthenticated,  emailToken,  emailTokenExpires,  passwordChangeRequired,  accountAactivated);
+dyStringPrintf(update, "insert into %s values ( %u,'%s','%s','%s','%s','%s','%s','%s')", 
+	tableName,  el->idx,  userName,  realName,  password,  email,  lastUse,  activated,  dateAuthenticated);
 sqlUpdate(conn, update->string);
 freeDyString(&update);
 freez(&userName);
 freez(&realName);
 freez(&password);
 freez(&email);
-freez(&lastTouched);
-freez(&newPassword);
-freez(&newPassTime);
-freez(&emailAuthenticated);
-freez(&emailToken);
-freez(&emailTokenExpires);
-freez(&passwordChangeRequired);
-freez(&accountAactivated);
+freez(&lastUse);
+freez(&activated);
+freez(&dateAuthenticated);
 }
 
 struct gbMembers *gbMembersLoad(char **row)
 /* Load a gbMembers from row fetched with select * from gbMembers
  * from database.  Dispose of this with gbMembersFree(). */
 {
 struct gbMembers *ret;
 
 AllocVar(ret);
 ret->idx = sqlUnsigned(row[0]);
 ret->userName = cloneString(row[1]);
 ret->realName = cloneString(row[2]);
 ret->password = cloneString(row[3]);
 ret->email = cloneString(row[4]);
-ret->lastTouched = cloneString(row[5]);
-ret->newPassword = cloneString(row[6]);
-ret->newPassTime = cloneString(row[7]);
-ret->emailAuthenticated = cloneString(row[8]);
-ret->emailToken = cloneString(row[9]);
-ret->emailTokenExpires = cloneString(row[10]);
-safecpy(ret->passwordChangeRequired, sizeof(ret->passwordChangeRequired), row[11]);
-safecpy(ret->accountAactivated, sizeof(ret->accountAactivated), row[12]);
+ret->lastUse = cloneString(row[5]);
+safecpy(ret->activated, sizeof(ret->activated), row[6]);
+ret->dateAuthenticated = cloneString(row[7]);
 return ret;
 }
 
 struct gbMembers *gbMembersLoadAll(char *fileName) 
 /* Load all gbMembers from a whitespace-separated file.
  * Dispose of this with gbMembersFreeList(). */
 {
 struct gbMembers *list = NULL, *el;
 struct lineFile *lf = lineFileOpen(fileName, TRUE);
-char *row[13];
+char *row[8];
 
 while (lineFileRow(lf, row))
     {
     el = gbMembersLoad(row);
     slAddHead(&list, el);
     }
 lineFileClose(&lf);
 slReverse(&list);
 return list;
 }
 
 struct gbMembers *gbMembersLoadAllByChar(char *fileName, char chopper) 
 /* Load all gbMembers from a chopper separated file.
  * Dispose of this with gbMembersFreeList(). */
 {
 struct gbMembers *list = NULL, *el;
 struct lineFile *lf = lineFileOpen(fileName, TRUE);
-char *row[13];
+char *row[8];
 
 while (lineFileNextCharRow(lf, chopper, row, ArraySize(row)))
     {
     el = gbMembersLoad(row);
     slAddHead(&list, el);
     }
 lineFileClose(&lf);
 slReverse(&list);
 return list;
 }
 
 struct gbMembers *gbMembersCommaIn(char **pS, struct gbMembers *ret)
 /* Create a gbMembers out of a comma separated string. 
  * This will fill in ret if non-null, otherwise will
  * return a new gbMembers */
 {
 char *s = *pS;
 
 if (ret == NULL)
     AllocVar(ret);
 ret->idx = sqlUnsignedComma(&s);
 ret->userName = sqlStringComma(&s);
 ret->realName = sqlStringComma(&s);
 ret->password = sqlStringComma(&s);
 ret->email = sqlStringComma(&s);
-ret->lastTouched = sqlStringComma(&s);
-ret->newPassword = sqlStringComma(&s);
-ret->newPassTime = sqlStringComma(&s);
-ret->emailAuthenticated = sqlStringComma(&s);
-ret->emailToken = sqlStringComma(&s);
-ret->emailTokenExpires = sqlStringComma(&s);
-sqlFixedStringComma(&s, ret->passwordChangeRequired, sizeof(ret->passwordChangeRequired));
-sqlFixedStringComma(&s, ret->accountAactivated, sizeof(ret->accountAactivated));
+ret->lastUse = sqlStringComma(&s);
+sqlFixedStringComma(&s, ret->activated, sizeof(ret->activated));
+ret->dateAuthenticated = sqlStringComma(&s);
 *pS = s;
 return ret;
 }
 
 void gbMembersFree(struct gbMembers **pEl)
 /* Free a single dynamically allocated gbMembers such as created
  * with gbMembersLoad(). */
 {
 struct gbMembers *el;
 
 if ((el = *pEl) == NULL) return;
 freeMem(el->userName);
 freeMem(el->realName);
 freeMem(el->password);
 freeMem(el->email);
-freeMem(el->lastTouched);
-freeMem(el->newPassword);
-freeMem(el->newPassTime);
-freeMem(el->emailAuthenticated);
-freeMem(el->emailToken);
-freeMem(el->emailTokenExpires);
+freeMem(el->lastUse);
+freeMem(el->dateAuthenticated);
 freez(pEl);
 }
 
 void gbMembersFreeList(struct gbMembers **pList)
 /* Free a list of dynamically allocated gbMembers's */
 {
 struct gbMembers *el, *next;
 
 for (el = *pList; el != NULL; el = next)
     {
     next = el->next;
     gbMembersFree(&el);
     }
 *pList = NULL;
 }
@@ -237,50 +208,30 @@
 if (sep == ',') fputc('"',f);
 fputc(sep,f);
 if (sep == ',') fputc('"',f);
 fprintf(f, "%s", el->realName);
 if (sep == ',') fputc('"',f);
 fputc(sep,f);
 if (sep == ',') fputc('"',f);
 fprintf(f, "%s", el->password);
 if (sep == ',') fputc('"',f);
 fputc(sep,f);
 if (sep == ',') fputc('"',f);
 fprintf(f, "%s", el->email);
 if (sep == ',') fputc('"',f);
 fputc(sep,f);
 if (sep == ',') fputc('"',f);
-fprintf(f, "%s", el->lastTouched);
+fprintf(f, "%s", el->lastUse);
 if (sep == ',') fputc('"',f);
 fputc(sep,f);
 if (sep == ',') fputc('"',f);
-fprintf(f, "%s", el->newPassword);
+fprintf(f, "%s", el->activated);
 if (sep == ',') fputc('"',f);
 fputc(sep,f);
 if (sep == ',') fputc('"',f);
-fprintf(f, "%s", el->newPassTime);
-if (sep == ',') fputc('"',f);
-fputc(sep,f);
-if (sep == ',') fputc('"',f);
-fprintf(f, "%s", el->emailAuthenticated);
-if (sep == ',') fputc('"',f);
-fputc(sep,f);
-if (sep == ',') fputc('"',f);
-fprintf(f, "%s", el->emailToken);
-if (sep == ',') fputc('"',f);
-fputc(sep,f);
-if (sep == ',') fputc('"',f);
-fprintf(f, "%s", el->emailTokenExpires);
-if (sep == ',') fputc('"',f);
-fputc(sep,f);
-if (sep == ',') fputc('"',f);
-fprintf(f, "%s", el->passwordChangeRequired);
-if (sep == ',') fputc('"',f);
-fputc(sep,f);
-if (sep == ',') fputc('"',f);
-fprintf(f, "%s", el->accountAactivated);
+fprintf(f, "%s", el->dateAuthenticated);
 if (sep == ',') fputc('"',f);
 fputc(lastSep,f);
 }
 
 /* -------------------------------- End autoSql Generated Code -------------------------------- */