27503f94cdbf0d7d8f6f643e9e2ab6b68e2d7ae3
chinhli
  Wed May 2 13:03:56 2012 -0700
finished gbMembers table expansion to include security tokens.
diff --git src/hg/hgLogin/gbMembers.c src/hg/hgLogin/gbMembers.c
index 5aca320..87d5b6d 100644
--- src/hg/hgLogin/gbMembers.c
+++ src/hg/hgLogin/gbMembers.c
@@ -8,32 +8,37 @@
 #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->lastUse = row[5];
-safecpy(ret->activated, sizeof(ret->activated), row[6]);
-ret->dateAuthenticated = row[7];
+ret->newPassword = row[6];
+ret->newPasswordExpire = row[7];
+ret->dateActivated = row[8];
+ret->emailToken = row[9];
+ret->emailTokenExpires = row[10];
+safecpy(ret->passwordChangeRequired, sizeof(ret->passwordChangeRequired), row[11]);
+safecpy(ret->accountActivated, sizeof(ret->accountActivated), row[12]);
 }
 
 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)
@@ -44,156 +49,180 @@
 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')", 
-	tableName,  el->idx,  el->userName,  el->realName,  el->password,  el->email,  el->lastUse,  el->activated,  el->dateAuthenticated);
+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->lastUse,  el->newPassword,  el->newPasswordExpire,  el->dateActivated,  el->emailToken,  el->emailTokenExpires,  el->passwordChangeRequired,  el->accountActivated);
 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, *lastUse, *activated, *dateAuthenticated;
+char  *userName, *realName, *password, *email, *lastUse, *newPassword, *newPasswordExpire, *dateActivated, *emailToken, *emailTokenExpires, *passwordChangeRequired, *accountActivated;
 userName = sqlEscapeString(el->userName);
 realName = sqlEscapeString(el->realName);
 password = sqlEscapeString(el->password);
 email = sqlEscapeString(el->email);
 lastUse = sqlEscapeString(el->lastUse);
-activated = sqlEscapeString(el->activated);
-dateAuthenticated = sqlEscapeString(el->dateAuthenticated);
+newPassword = sqlEscapeString(el->newPassword);
+newPasswordExpire = sqlEscapeString(el->newPasswordExpire);
+dateActivated = sqlEscapeString(el->dateActivated);
+emailToken = sqlEscapeString(el->emailToken);
+emailTokenExpires = sqlEscapeString(el->emailTokenExpires);
+passwordChangeRequired = sqlEscapeString(el->passwordChangeRequired);
+accountActivated = sqlEscapeString(el->accountActivated);
 
-dyStringPrintf(update, "insert into %s values ( %u,'%s','%s','%s','%s','%s','%s','%s')", 
-	tableName,  el->idx,  userName,  realName,  password,  email,  lastUse,  activated,  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,  lastUse,  newPassword,  newPasswordExpire,  dateActivated,  emailToken,  emailTokenExpires,  passwordChangeRequired,  accountActivated);
 sqlUpdate(conn, update->string);
 freeDyString(&update);
 freez(&userName);
 freez(&realName);
 freez(&password);
 freez(&email);
 freez(&lastUse);
-freez(&activated);
-freez(&dateAuthenticated);
+freez(&newPassword);
+freez(&newPasswordExpire);
+freez(&dateActivated);
+freez(&emailToken);
+freez(&emailTokenExpires);
+freez(&passwordChangeRequired);
+freez(&accountActivated);
 }
 
 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->lastUse = cloneString(row[5]);
-safecpy(ret->activated, sizeof(ret->activated), row[6]);
-ret->dateAuthenticated = cloneString(row[7]);
+ret->newPassword = cloneString(row[6]);
+ret->newPasswordExpire = cloneString(row[7]);
+ret->dateActivated = cloneString(row[8]);
+ret->emailToken = cloneString(row[9]);
+ret->emailTokenExpires = cloneString(row[10]);
+safecpy(ret->passwordChangeRequired, sizeof(ret->passwordChangeRequired), row[11]);
+safecpy(ret->accountActivated, sizeof(ret->accountActivated), row[12]);
 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[8];
+char *row[13];
 
 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[8];
+char *row[13];
 
 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->lastUse = sqlStringComma(&s);
-sqlFixedStringComma(&s, ret->activated, sizeof(ret->activated));
-ret->dateAuthenticated = sqlStringComma(&s);
+ret->newPassword = sqlStringComma(&s);
+ret->newPasswordExpire = sqlStringComma(&s);
+ret->dateActivated = sqlStringComma(&s);
+ret->emailToken = sqlStringComma(&s);
+ret->emailTokenExpires = sqlStringComma(&s);
+sqlFixedStringComma(&s, ret->passwordChangeRequired, sizeof(ret->passwordChangeRequired));
+sqlFixedStringComma(&s, ret->accountActivated, sizeof(ret->accountActivated));
 *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->lastUse);
-freeMem(el->dateAuthenticated);
+freeMem(el->newPassword);
+freeMem(el->newPasswordExpire);
+freeMem(el->dateActivated);
+freeMem(el->emailToken);
+freeMem(el->emailTokenExpires);
 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;
 }
@@ -212,26 +241,46 @@
 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->lastUse);
 if (sep == ',') fputc('"',f);
 fputc(sep,f);
 if (sep == ',') fputc('"',f);
-fprintf(f, "%s", el->activated);
+fprintf(f, "%s", el->newPassword);
 if (sep == ',') fputc('"',f);
 fputc(sep,f);
 if (sep == ',') fputc('"',f);
-fprintf(f, "%s", el->dateAuthenticated);
+fprintf(f, "%s", el->newPasswordExpire);
+if (sep == ',') fputc('"',f);
+fputc(sep,f);
+if (sep == ',') fputc('"',f);
+fprintf(f, "%s", el->dateActivated);
+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->accountActivated);
 if (sep == ',') fputc('"',f);
 fputc(lastSep,f);
 }
 
 /* -------------------------------- End autoSql Generated Code -------------------------------- */