* Edit user: markup was showing through because USERLIST:PASSWD was not defined;...

[citadel.git] / webcit / useredit.c

diff --git a/webcit/useredit.c b/webcit/useredit.c
index 37320a55d2c34836d46019dd3fdb7f52ada3a9f1..17bd25a74ff4c2aed4864027c8ee1333a93c36bc 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -250,7 +250,7 @@ HashList *iterate_load_userlist(StrBuf *Target, WCTemplputParams *TP)
        int len;
        WCTemplputParams SubTP;
 
-       memset(&TP, 0, sizeof(WCTemplputParams));       
+       memset(&SubTP, 0, sizeof(WCTemplputParams));    
         serv_puts("LIST");
         serv_getln(buf, sizeof buf);
         if (buf[0] == '1') {
@@ -267,7 +267,7 @@ HashList *iterate_load_userlist(StrBuf *Target, WCTemplputParams *TP)
                        Put(Hash, nnn, nUsed, ul, DeleteUserListEntry); 
                }
                FreeStrBuf(&Buf);
-               SubTP.ContextType = CTX_USERLIST;
+               SubTP.Filter.ContextType = CTX_USERLIST;
                SortIt = RetrieveSort(&SubTP, HKEY("USER"), HKEY("user:uid"), 0);
                if (SortIt != NULL)
                        SortByPayload(Hash, SortIt);
@@ -285,6 +285,12 @@ void tmplput_USERLIST_UserName(StrBuf *Target, WCTemplputParams *TP)
        StrBufAppendTemplate(Target, TP, ul->UserName, 0);
 }
 
+void tmplput_USERLIST_Password(StrBuf *Target, WCTemplputParams *TP)
+{
+       UserListEntry *ul = (UserListEntry*) CTX;
+       StrBufAppendTemplate(Target, TP, ul->Passvoid, 0);
+}
+
 void tmplput_USERLIST_AccessLevelNo(StrBuf *Target, WCTemplputParams *TP)
 {
        UserListEntry *ul = (UserListEntry*) CTX;
@@ -529,7 +535,7 @@ void display_edituser(char *supplied_username, int is_new) {
                else {
                        WCTemplputParams SubTP;
                        memset(&SubTP, 0, sizeof(WCTemplputParams));
-                       SubTP.ContextType = CTX_USERLIST;
+                       SubTP.Filter.ContextType = CTX_USERLIST;
                        SubTP.Context = UL;
                        output_headers(1, 0, 0, 0, 1, 0);
                        DoTemplate(HKEY("userlist_detailview"), NULL, &SubTP);
@@ -686,6 +692,7 @@ InitModule_USEREDIT
        WebcitAddUrlHandler(HKEY("create_user"), create_user, 0);
 
        RegisterNamespace("USERLIST:USERNAME",      0, 1, tmplput_USERLIST_UserName, CTX_USERLIST);
+       RegisterNamespace("USERLIST:PASSWD",        0, 1, tmplput_USERLIST_Password, CTX_USERLIST);
        RegisterNamespace("USERLIST:ACCLVLNO",      0, 0, tmplput_USERLIST_AccessLevelNo, CTX_USERLIST);
        RegisterNamespace("USERLIST:ACCLVLSTR",     0, 0, tmplput_USERLIST_AccessLevelStr, CTX_USERLIST);
        RegisterNamespace("USERLIST:UID",           0, 0, tmplput_USERLIST_UID, CTX_USERLIST);