From: Wilfried Göesgens <willi@citadel.org>
Date: Wed, 1 Oct 2008 20:41:22 +0000 (+0000)
Subject: * fix times of last user access and now
X-Git-Tag: v7.86~1887
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=e6b80ce244ae7d3b38d8fa2dd47ae095d19235d2

* fix times of last user access and now
---

diff --git a/webcit/http_datestring.c b/webcit/http_datestring.c
index d4c69bf6c..908e65424 100644
--- a/webcit/http_datestring.c
+++ b/webcit/http_datestring.c
@@ -74,15 +74,15 @@ void tmplput_nowno(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Con
 {
 	time_t now;
 	now = time(NULL);
-	StrBufAppendPrintf(Target, "%l", now);
+	StrBufAppendPrintf(Target, "%ld", now);
 }
 
 void 
 InitModule_DATE
 (void)
 {
-	RegisterNamespace("DATE:NOW:STR", 1, 2, tmplput_nowstr, CTX_NONE);
-	RegisterNamespace("DATE:NOW:NO", 1, 2, tmplput_nowno, CTX_NONE);
+	RegisterNamespace("DATE:NOW:STR", 0, 0, tmplput_nowstr, CTX_NONE);
+	RegisterNamespace("DATE:NOW:NO", 0, 0, tmplput_nowno, CTX_NONE);
 }
 
 /*@}*/
diff --git a/webcit/static/t/userlist_detailview.html b/webcit/static/t/userlist_detailview.html
index b0e5e9e3d..63814bf65 100644
--- a/webcit/static/t/userlist_detailview.html
+++ b/webcit/static/t/userlist_detailview.html
@@ -31,7 +31,7 @@
 <tr><td><?_("User ID number")></td><td><input type="text" name="usernum" value="<?USERLIST:UID>" maxlength="7"></td></tr>
 <tr><td><?_("Date and time of last login")></td><td><select name="lastcall">
   <option selected value="<?USERLIST:LASTLOGON:NO>"><?USERLIST:LASTLOGON:STR></option>
-  <option value="<?TIME:NOW:NO>"><?TIME:NOW:STR></option>
+  <option value="<?DATE:NOW:NO>"><?DATE:NOW:STR></option>
 </select></td></tr>
  
 <tr><td><?_("Auto-purge after this many days")></td><td><input type="text" name="purgedays" value="<?USERLIST:DAYSTILLPURGE>" maxlength="5"></td></tr>
diff --git a/webcit/useredit.c b/webcit/useredit.c
index f016b2e21..c97a0a91c 100644
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -137,7 +137,7 @@ UserListEntry* NewUserListOneEntry(StrBuf *SerializedUser)
 	ul->AccessLevel = StrBufExtract_int(SerializedUser, 5, '|');
 	ul->UID = StrBufExtract_int(SerializedUser, 6, '|');
 	StrBufExtract_token(ul->LastLogon, SerializedUser, 7, '|');
-	/// TODO: ul->LastLogon -> ulLastLogonT
+	ul->LastLogonT = StrTol(ul->LastLogon);
 	ul->DaysTillPurge = StrBufExtract_int(SerializedUser, 8, '|');
 	return ul;
 }
@@ -953,7 +953,6 @@ InitModule_USEREDIT
 	RegisterConditional(HKEY("COND:USERACCESS"), 0,   ConditionalUserAccess, CTX_USERLIST);
 	RegisterConditional(HKEY("COND:USERLIST:FLAG:USE_INTERNET"), 0, ConditionalFlagINetEmail, CTX_USERLIST);
 
-	RegisterConditional(HKEY("COND:USERNAME"), 0, ConditionalUser, CTX_USERLIST);
 	RegisterIterator("USERLIST", 0, NULL, iterate_load_userlist, NULL, DeleteHash, CTX_USERLIST);
 }
 /*@}*/