* templatize user editing
[citadel.git] / webcit / useredit.c
index f8a685513e0dad4eb53596ada245128ce6527c27..f016b2e21df45ed5c61f8be932f701caa3b3306d 100644 (file)
  * \param preselect which user should be selected in the browser
  */
 void select_user_to_edit(char *message, char *preselect)
-{
+{/*
        char buf[SIZ];
        char username[SIZ];
+ */
+       output_headers(1, 0, 0, 0, 1, 0);
+       do_template("edituser_select", NULL);
+        end_burst();
+
+/*
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table width=100%% border=0 bgcolor=#444455><tr>"
-               "<td>"
-               "<span class=\"titlebar\">"
-               "<img src=\"static/usermanag_48x.gif\">");
+       wprintf("<img src=\"static/usermanag_48x.gif\">");
+        wprintf("<h1>");
        wprintf(_("Edit or delete users"));
-       wprintf("</span></td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+        wprintf("</h1>");
+        wprintf("</div>");
+
+        wprintf("<div id=\"content\" class=\"service\">\n");
 
        if (message != NULL) wprintf(message);
 
-       wprintf("<TABLE border=0 CELLSPACING=10><TR VALIGN=TOP><TD>\n");
+       wprintf("<table border=0 cellspacing=10><tr valign=top><td>\n");
 
-       svprintf("BOXTITLE", WCS_STRING, _("Add users"));
-       do_template("beginbox");
+       svput("BOXTITLE", WCS_STRING, _("Add users"));
+       do_template("beginbox", NULL);
 
        wprintf(_("To create a new user account, enter the desired "
                "user name in the box below and click 'Create'."));
        wprintf("<br /><br />");
 
-        wprintf("<CENTER><FORM METHOD=\"POST\" action=\"create_user\">\n");
+        wprintf("<center><form method=\"POST\" action=\"create_user\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
         wprintf(_("New user: "));
         wprintf("<input type=\"text\" name=\"username\"><br />\n"
                "<input type=\"submit\" name=\"create_button\" value=\"%s\">"
-               "</FORM></CENTER>\n", _("Create"));
+               "</form></center>\n", _("Create"));
 
-       do_template("endbox");
+       do_template("endbox", NULL);
 
-       wprintf("</TD><TD>");
+       wprintf("</td><td>");
 
-       svprintf("BOXTITLE", WCS_STRING, _("Edit or Delete users"));
-       do_template("beginbox");
+       svput("BOXTITLE", WCS_STRING, _("Edit or Delete users"));
+       do_template("beginbox", NULL);
 
        wprintf(_("To edit an existing user account, select the user "
                "name from the list and click 'Edit'."));
        wprintf("<br /><br />");
        
-        wprintf("<CENTER>"
-               "<FORM METHOD=\"POST\" action=\"display_edituser\">\n");
-        wprintf("<SELECT NAME=\"username\" SIZE=10 STYLE=\"width:100%%\">\n");
+        wprintf("<center>"
+               "<form method=\"POST\" action=\"display_edituser\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+        wprintf("<select name=\"username\" size=10 style=\"width:100%%\">\n");
         serv_puts("LIST");
         serv_getln(buf, sizeof buf);
         if (buf[0] == '1') {
                 while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                         extract_token(username, buf, 0, '|', sizeof username);
-                        wprintf("<OPTION");
+                        wprintf("<option");
                        if (preselect != NULL)
                           if (!strcasecmp(username, preselect))
-                             wprintf(" SELECTED");
+                             wprintf(" selected");
                        wprintf(">");
                         escputs(username);
                         wprintf("\n");
                 }
         }
-        wprintf("</SELECT><br />\n");
+        wprintf("</select><br />\n");
 
         wprintf("<input type=\"submit\" name=\"edit_config_button\" value=\"%s\">", _("Edit configuration"));
         wprintf("<input type=\"submit\" name=\"edit_abe_button\" value=\"%s\">", _("Edit address book entry"));
         wprintf("<input type=\"submit\" name=\"delete_button\" value=\"%s\" "
                "onClick=\"return confirm('%s');\">", _("Delete user"), _("Delete this user?"));
-        wprintf("</FORM></CENTER>\n");
-       do_template("endbox");
+        wprintf("</form></center>\n");
+       do_template("endbox", NULL);
 
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</td></tr></table>\n");
 
        wDumpContent(1);
+*/
+}
+
+
+typedef struct _UserListEntry {
+       int UID;
+       int AccessLevel;
+       int nLogons;
+       int nPosts;
+
+       StrBuf *UserName;
+       StrBuf *Passvoid;
+       StrBuf *LastLogon;
+       time_t LastLogonT;
+       /* Just available for Single users to view: */
+       unsigned int Flags;
+       int DaysTillPurge;
+} UserListEntry;
+
+
+UserListEntry* NewUserListOneEntry(StrBuf *SerializedUser)
+{
+       UserListEntry *ul;
+
+       if (StrLength(SerializedUser) < 8) 
+               return NULL;
+
+       ul = (UserListEntry*) malloc(sizeof(UserListEntry));
+       ul->UserName = NewStrBuf();
+       ul->LastLogon = NewStrBuf();
+       ul->Passvoid = NewStrBuf();
+
+       StrBufExtract_token(ul->UserName, SerializedUser, 0, '|');
+       StrBufExtract_token(ul->Passvoid, SerializedUser, 1, '|');
+       ul->Flags = (unsigned int)StrBufExtract_long(SerializedUser, 2, '|');
+       ul->nLogons = StrBufExtract_int(SerializedUser, 3, '|');
+       ul->nPosts = StrBufExtract_int(SerializedUser, 4, '|');
+       ul->AccessLevel = StrBufExtract_int(SerializedUser, 5, '|');
+       ul->UID = StrBufExtract_int(SerializedUser, 6, '|');
+       StrBufExtract_token(ul->LastLogon, SerializedUser, 7, '|');
+       /// TODO: ul->LastLogon -> ulLastLogonT
+       ul->DaysTillPurge = StrBufExtract_int(SerializedUser, 8, '|');
+       return ul;
+}
+
+void DeleteUserListEntry(void *vUserList)
+{
+       UserListEntry *ul = (UserListEntry*) vUserList;
+       FreeStrBuf(&ul->UserName);
+       FreeStrBuf(&ul->LastLogon);
+       FreeStrBuf(&ul->Passvoid);
+       free(ul);
+}
+
+UserListEntry* NewUserListEntry(StrBuf *SerializedUserList)
+{
+       UserListEntry *ul;
+
+       if (StrLength(SerializedUserList) < 8) 
+               return NULL;
+
+       ul = (UserListEntry*) malloc(sizeof(UserListEntry));
+       ul->UserName = NewStrBuf();
+       ul->LastLogon = NewStrBuf();
+       ul->Passvoid = NewStrBuf();
+
+       StrBufExtract_token(ul->UserName, SerializedUserList, 0, '|');
+       ul->AccessLevel = StrBufExtract_int(SerializedUserList, 1, '|');
+       ul->UID = StrBufExtract_int(SerializedUserList, 2, '|');
+       StrBufExtract_token(ul->LastLogon, SerializedUserList, 3, '|');
+       /// TODO: ul->LastLogon -> ulLastLogonT
+       ul->nLogons = StrBufExtract_int(SerializedUserList, 4, '|');
+       ul->nPosts = StrBufExtract_int(SerializedUserList, 5, '|');
+       StrBufExtract_token(ul->Passvoid, SerializedUserList, 6, '|');
+       ul->Flags = 0;
+       ul->DaysTillPurge = -1;
+       return ul;
+}
+
+/*
+ * Sort by Username
+ */
+int CompareUserListName(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+
+       return strcmp(ChrPtr(u1->UserName), ChrPtr(u2->UserName));
+}
+int CompareUserListNameRev(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+       return strcmp(ChrPtr(u2->UserName), ChrPtr(u1->UserName));
+}
+
+/*
+ * Sort by AccessLevel
+ */
+int CompareAccessLevel(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+
+       return (u1->AccessLevel > u2->AccessLevel);
+}
+int CompareAccessLevelRev(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+
+       return (u2->AccessLevel > u1->AccessLevel);
+}
+
+
+/*
+ * Sort by UID
+ */
+int CompareUID(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+
+       return (u1->UID > u2->UID);
+}
+int CompareUIDRev(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+
+       return (u2->UID > u1->UID);
 }
 
+/*
+ * Sort By Date /// TODO!
+ */
+int CompareLastLogon(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+
+       return (u1->LastLogonT > u2->LastLogonT);
+}
+int CompareLastLogonRev(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+
+       return (u2->LastLogonT > u1->LastLogonT);
+}
+
+/*
+ * Sort By Number of Logons
+ */
+int ComparenLogons(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+
+       return (u1->nLogons > u2->nLogons);
+}
+int ComparenLogonsRev(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+
+       return (u2->nLogons > u1->nLogons);
+}
+
+/*
+ * Sort By Number of Posts
+ */
+int ComparenPosts(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+
+       return (u1->nPosts > u2->nPosts);
+}
+int ComparenPostsRev(const void *vUser1, const void *vUser2)
+{
+       UserListEntry *u1 = (UserListEntry*) vUser1;
+       UserListEntry *u2 = (UserListEntry*) vUser2;
+
+       return (u2->nPosts > u1->nPosts);
+}
 
 
+HashList *iterate_load_userlist(WCTemplateToken *Token)
+{
+       HashList *Hash;
+       char buf[SIZ];
+       StrBuf *Buf;
+       UserListEntry* ul;
+       char nnn[64];
+       int nUsed;
+       int Order;
+       int len;
+       
+        serv_puts("LIST");
+        serv_getln(buf, sizeof buf);
+        if (buf[0] == '1') {
+               Hash = NewHash(1, NULL);
+
+               Buf = NewStrBuf();
+               while ((len = StrBuf_ServGetln(Buf),
+                       strcmp(ChrPtr(Buf), "000"))) {
+                       ul = NewUserListEntry(Buf);
+                       if (ul == NULL)
+                               continue;
+                       nUsed = GetCount(Hash);
+                       nUsed = snprintf(nnn, sizeof(nnn), "%d", nUsed+1);
+                       Put(Hash, nnn, nUsed, ul, DeleteUserListEntry); 
+               }
+               FreeStrBuf(&Buf);
+               Order = ibstr("SortOrder");
+               switch (ibstr("SortBy")){
+               case 1: /*NAME*/
+                       SortByPayload(Hash, (Order)? 
+                                     CompareUserListName:
+                                     CompareUserListNameRev);
+                       break;
+               case 2: /*AccessLevel*/
+                       SortByPayload(Hash, (Order)? 
+                                     CompareAccessLevel:
+                                     CompareAccessLevelRev);
+                       break;
+               case 3: /*nLogons*/
+                       SortByPayload(Hash, (Order)? 
+                                     ComparenLogons:
+                                     ComparenLogonsRev);
+                       break;
+               case 4: /*UID*/
+                       SortByPayload(Hash, (Order)? 
+                                     CompareUID:
+                                     CompareUIDRev);
+                       break;
+               case 5: /*LastLogon*/
+                       SortByPayload(Hash, (Order)? 
+                                     CompareLastLogon:
+                                     CompareLastLogonRev);
+                       break;
+               case 6: /* nLogons */
+                       SortByPayload(Hash, (Order)? 
+                                     ComparenLogons:
+                                     ComparenLogonsRev);
+                       break;
+               case 7: /* Posts */
+                       SortByPayload(Hash, (Order)? 
+                                     ComparenPosts:
+                                     ComparenPostsRev);
+                       break;
+               }
+               return Hash;
+        }
+       return NULL;
+}
+
+
+void tmplput_USERLIST_UserName(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+/// TODO: X
+       StrBufAppendBuf(Target, ul->UserName, 0);
+}
+
+void tmplput_USERLIST_AccessLevelNo(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+
+       StrBufAppendPrintf(Target, "%d", ul->AccessLevel, 0);
+}
+
+void tmplput_USERLIST_AccessLevelStr(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+       
+       StrBufAppendBufPlain(Target, _(axdefs[ul->AccessLevel]), -1, 0);
+}
+
+void tmplput_USERLIST_UID(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+
+       StrBufAppendPrintf(Target, "%d", ul->UID, 0);
+}
+
+void tmplput_USERLIST_LastLogonNo(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+
+       StrBufAppendBuf(Target, ul->LastLogon, 0);
+}
+void tmplput_USERLIST_LastLogonStr(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+       StrEscAppend(Target, NULL, asctime(localtime(&ul->LastLogonT)), 0, 0);
+}
+
+void tmplput_USERLIST_nLogons(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+
+       StrBufAppendPrintf(Target, "%d", ul->nLogons, 0);
+}
+
+void tmplput_USERLIST_nPosts(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+
+       StrBufAppendPrintf(Target, "%d", ul->nPosts, 0);
+}
+
+void tmplput_USERLIST_Flags(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+
+       StrBufAppendPrintf(Target, "%d", ul->Flags, 0);
+}
+
+void tmplput_USERLIST_DaysTillPurge(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+
+       StrBufAppendPrintf(Target, "%d", ul->DaysTillPurge, 0);
+}
+
+int ConditionalUser(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+       if (havebstr("usernum")) {
+               return ibstr("usernum") == ul->UID;
+       }
+       else if (havebstr("username")) {
+               return strcmp(bstr("username"), ChrPtr(ul->UserName)) == 0;
+       }
+       else 
+               return 0;
+}
+
+int ConditionalFlagINetEmail(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+       return (ul->Flags & US_INTERNET) != 0;
+}
+
+int ConditionalUserAccess(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       UserListEntry *ul = (UserListEntry*) Context;
+
+       if (Tokens->Params[3]->Type == TYPE_LONG)
+               return (Tokens->Params[3]->lvalue == ul->AccessLevel);
+       else
+               return 0;
+}
+
 /**
  * \brief Locate the message number of a user's vCard in the current room
  * \param username the plaintext name of the user
@@ -135,8 +494,8 @@ TRYAGAIN:
                                if (!strncasecmp(buf, "part=", 5)) {
                                        extract_token(partnum, &buf[5], 2, '|', sizeof partnum);
                                        extract_token(content_type, &buf[5], 4, '|', sizeof content_type);
-                                       if (!strcasecmp(content_type,
-                                          "text/x-vcard")) {
+                                       if (  (!strcasecmp(content_type, "text/x-vcard"))
+                                          || (!strcasecmp(content_type, "text/vcard")) ) {
                                                vcard_msgnum = stuff->msgnum;
                                        }
                                }
@@ -189,7 +548,7 @@ void display_edit_address_book_entry(char *username, long usernum) {
                serv_getln(buf, sizeof buf);
                if (buf[0] != '2') {
                        sprintf(error_message,
-                               "<img src=\"static/error.gif\" ALIGN=CENTER>"
+                               "<img src=\"static/error.gif\" align=center>"
                                "%s<br /><br />\n", &buf[4]);
                        select_user_to_edit(error_message, username);
                        return;
@@ -200,20 +559,58 @@ void display_edit_address_book_entry(char *username, long usernum) {
 
        if (vcard_msgnum < 0) {
                sprintf(error_message,
-                       "<img src=\"static/error.gif\" ALIGN=CENTER>%s<br /><br />\n",
+                       "<img src=\"static/error.gif\" align=center>%s<br /><br />\n",
                        _("An error occurred while trying to create or edit this address book entry.")
                );
                select_user_to_edit(error_message, username);
                return;
        }
 
-       do_edit_vcard(vcard_msgnum, "1", "select_user_to_edit");
+       do_edit_vcard(vcard_msgnum, "1", "select_user_to_edit", roomname);
 }
 
 
+void display_edituser(char *supplied_username, int is_new) {
+       UserListEntry* UL;
+       StrBuf *Buf;
+       char error_message[1024];
+       char MajorStatus;
+       char username[256];
 
+       if (supplied_username != NULL) {
+               safestrncpy(username, supplied_username, sizeof username);
+       }
+       else {
+               safestrncpy(username, bstr("username"), sizeof username);
+       }
 
-/**
+       Buf = NewStrBuf();
+       serv_printf("AGUP %s", username);
+       StrBuf_ServGetln(Buf);
+       MajorStatus = ChrPtr(Buf)[0];
+       StrBufCutLeft(Buf, 4);
+       if (MajorStatus != '2') {
+               ///TODO ImportantMessage
+               sprintf(error_message,
+                       "<img src=\"static/error.gif\" align=center>"
+                       "%s<br /><br />\n", ChrPtr(Buf));
+               select_user_to_edit(error_message, username);
+               FreeStrBuf(&Buf);
+               return;
+       }
+       else {
+               UL = NewUserListOneEntry(Buf);
+               output_headers(1, 0, 0, 0, 1, 0);
+               DoTemplate(HKEY("userlist_detailview"), NULL, (void*) UL, CTX_USERLIST);
+               end_burst();
+               
+       }
+       FreeStrBuf(&Buf);
+}
+
+
+
+/* *
  * \brief Edit a user.  
  * If supplied_username is null, look in the "username"
  * web variable for the name of the user to edit.
@@ -222,7 +619,7 @@ void display_edit_address_book_entry(char *username, long usernum) {
  * to send the user to the vCard editor next.
  * \param supplied_username user to look up or NULL if to search in the environment
  * \param is_new should we create the user?
- */
+ * /
 void display_edituser(char *supplied_username, int is_new) {
        char buf[1024];
        char error_message[1024];
@@ -250,7 +647,7 @@ void display_edituser(char *supplied_username, int is_new) {
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                sprintf(error_message,
-                       "<img src=\"static/error.gif\" ALIGN=CENTER>"
+                       "<img src=\"static/error.gif\" align=center>"
                        "%s<br /><br />\n", &buf[4]);
                select_user_to_edit(error_message, username);
                return;
@@ -266,126 +663,135 @@ void display_edituser(char *supplied_username, int is_new) {
        lastcall = extract_long(&buf[4], 7);
        purgedays = extract_long(&buf[4], 8);
 
-       if (strlen(bstr("edit_abe_button")) > 0) {
+       if (havebstr("edit_abe_button")) {
                display_edit_address_book_entry(username, usernum);
                return;
        }
 
-       if (strlen(bstr("delete_button")) > 0) {
+       if (havebstr("delete_button")) {
                delete_user(username);
                return;
        }
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Edit user account: "));
        escputs(username);
-       wprintf("</SPAN></TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+        wprintf("</h1>");
+        wprintf("</div>");
+
+        wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
-       wprintf("<FORM METHOD=\"POST\" action=\"edituser\">\n"
-               "<INPUT TYPE=\"hidden\" NAME=\"username\" VALUE=\"");
+               "<table class=\"useredit_background\"><tr><td>\n");
+       wprintf("<form method=\"POST\" action=\"edituser\">\n"
+               "<input type=\"hidden\" name=\"username\" value=\"");
        escputs(username);
        wprintf("\">\n");
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"is_new\" VALUE=\"%d\">\n"
-               "<INPUT TYPE=\"hidden\" NAME=\"usernum\" VALUE=\"%ld\">\n",
+       wprintf("<input type=\"hidden\" name=\"is_new\" value=\"%d\">\n"
+               "<input type=\"hidden\" name=\"usernum\" value=\"%ld\">\n",
                is_new, usernum);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"flags\" VALUE=\"%d\">\n", flags);
+       wprintf("<input type=\"hidden\" name=\"flags\" value=\"%d\">\n", flags);
 
-       wprintf("<CENTER><TABLE>");
+       wprintf("<center><table>");
 
-       wprintf("<TR><TD>");
+       wprintf("<tr><td>");
+       wprintf(_("User name:"));
+       wprintf("</td><td>"
+               "<input type=\"text\" name=\"newname\" value=\"");
+       escputs(username);
+       wprintf("\" maxlength=\"63\"></td></tr>\n");
+
+       wprintf("<tr><td>");
        wprintf(_("Password"));
-       wprintf("</TD><TD>"
-               "<INPUT TYPE=\"password\" NAME=\"password\" VALUE=\"");
+       wprintf("</td><td>"
+               "<input type=\"password\" name=\"password\" value=\"");
        escputs(password);
-       wprintf("\" MAXLENGTH=\"20\"></TD></TR>\n");
+       wprintf("\" maxlength=\"20\"></td></tr>\n");
 
        wprintf("<tr><td>");
        wprintf(_("Permission to send Internet mail"));
        wprintf("</td><td>");
        wprintf("<input type=\"checkbox\" name=\"inetmail\" value=\"yes\" ");
        if (flags & US_INTERNET) {
-               wprintf("CHECKED ");
+               wprintf("checked ");
        }
        wprintf("></td></tr>\n");
 
-       wprintf("<TR><TD>");
+       wprintf("<tr><td>");
        wprintf(_("Number of logins"));
-       wprintf("</TD><TD>"
-               "<INPUT TYPE=\"text\" NAME=\"timescalled\" VALUE=\"");
+       wprintf("</td><td>"
+               "<input type=\"text\" name=\"timescalled\" value=\"");
        wprintf("%d", timescalled);
-       wprintf("\" MAXLENGTH=\"6\"></TD></TR>\n");
+       wprintf("\" maxlength=\"6\"></td></tr>\n");
 
-       wprintf("<TR><TD>");
+       wprintf("<tr><td>");
        wprintf(_("Messages submitted"));
-       wprintf("</TD><TD>"
-               "<INPUT TYPE=\"text\" NAME=\"msgsposted\" VALUE=\"");
+       wprintf("</td><td>"
+               "<input type=\"text\" name=\"msgsposted\" value=\"");
        wprintf("%d", msgsposted);
-       wprintf("\" MAXLENGTH=\"6\"></TD></TR>\n");
+       wprintf("\" maxlength=\"6\"></td></tr>\n");
 
-       wprintf("<TR><TD>");
+       wprintf("<tr><td>");
        wprintf(_("Access level"));
-       wprintf("</TD><TD>"
-               "<SELECT NAME=\"axlevel\">\n");
+       wprintf("</td><td>"
+               "<select name=\"axlevel\">\n");
        for (i=0; i<7; ++i) {
-               wprintf("<OPTION ");
+               wprintf("<option ");
                if (axlevel == i) {
-                       wprintf("SELECTED ");
+                       wprintf("selected ");
                }
-               wprintf("VALUE=\"%d\">%d - %s</OPTION>\n",
+               wprintf("value=\"%d\">%d - %s</option>\n",
                        i, i, axdefs[i]);
        }
-       wprintf("</SELECT></TD></TR>\n");
+       wprintf("</select></td></tr>\n");
 
-       wprintf("<TR><TD>");
+       wprintf("<tr><td>");
        wprintf(_("User ID number"));
-       wprintf("</TD><TD>"
-               "<INPUT TYPE=\"text\" NAME=\"usernum\" VALUE=\"");
+       wprintf("</td><td>"
+               "<input type=\"text\" name=\"usernum\" value=\"");
        wprintf("%ld", usernum);
-       wprintf("\" MAXLENGTH=\"7\"></TD></TR>\n");
+       wprintf("\" maxlength=\"7\"></td></tr>\n");
 
        now = time(NULL);
-       wprintf("<TR><TD>");
+       wprintf("<tr><td>");
        wprintf(_("Date and time of last login"));
-       wprintf("</TD><TD>"
-               "<SELECT NAME=\"lastcall\">\n");
+       wprintf("</td><td>"
+               "<select name=\"lastcall\">\n");
 
-       wprintf("<OPTION SELECTED VALUE=\"%ld\">", lastcall);
+       wprintf("<option selected value=\"%ld\">", lastcall);
        escputs(asctime(localtime(&lastcall)));
-       wprintf("</OPTION>\n");
+       wprintf("</option>\n");
 
-       wprintf("<OPTION VALUE=\"%ld\">", now);
+       wprintf("<option value=\"%ld\">", now);
        escputs(asctime(localtime(&now)));
-       wprintf("</OPTION>\n");
+       wprintf("</option>\n");
 
-       wprintf("</SELECT></TD></TR>");
+       wprintf("</select></td></tr>");
 
-       wprintf("<TR><TD>");
+       wprintf("<tr><td>");
        wprintf(_("Auto-purge after this many days"));
-       wprintf("</TD><TD>"
-               "<INPUT TYPE=\"text\" NAME=\"purgedays\" VALUE=\"");
+       wprintf("</td><td>"
+               "<input type=\"text\" name=\"purgedays\" value=\"");
        wprintf("%d", purgedays);
-       wprintf("\" MAXLENGTH=\"5\"></TD></TR>\n");
+       wprintf("\" maxlength=\"5\"></td></tr>\n");
 
-       wprintf("</TABLE>\n");
+       wprintf("</table>\n");
 
-       wprintf("<INPUT type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">\n"
+       wprintf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">\n"
                "&nbsp;"
-               "<INPUT type=\"submit\" NAME=\"cancel\" VALUE=\"%s\">\n"
-               "<br /><br /></FORM>\n", _("Save changes"), _("Cancel"));
+               "<input type=\"submit\" name=\"cancel\" value=\"%s\">\n"
+               "<br /><br /></form>\n", _("Save changes"), _("Cancel"));
 
-       wprintf("</CENTER>\n");
+       wprintf("</center>\n");
        wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 
 }
-
+*/
 
 /**
  * \brief do the backend operation of the user edit on the server
@@ -395,23 +801,40 @@ void edituser(void) {
        char buf[SIZ];
        int is_new = 0;
        unsigned int flags = 0;
+       char *username;
 
-       is_new = atoi(bstr("is_new"));
+       is_new = ibstr("is_new");
+       safestrncpy(message, "", sizeof message);
+       username = bstr("username");
 
-       if (strlen(bstr("ok_button")) == 0) {
+       if (!havebstr("ok_button")) {
                safestrncpy(message, _("Changes were not saved."), sizeof message);
        }
+       
        else {
-               flags = atoi(bstr("flags"));
-               if (!strcasecmp(bstr("inetmail"), "yes")) {
+               flags = ibstr("flags");
+               if (yesbstr("inetmail")) {
                        flags |= US_INTERNET;
                }
                else {
                        flags &= ~US_INTERNET ;
                }
 
+               if ((havebstr("newname")) && (strcasecmp(bstr("username"), bstr("newname")))) {
+                       serv_printf("RENU %s|%s", bstr("username"), bstr("newname"));
+                       serv_getln(buf, sizeof buf);
+                       if (buf[0] != '2') {
+                               sprintf(&message[strlen(message)],
+                                       "<img src=\"static/error.gif\" align=center>"
+                                       "%s<br /><br />\n", &buf[4]);
+                       }
+                       else {
+                               username = bstr("newname");
+                       }
+               }
+
                serv_printf("ASUP %s|%s|%d|%s|%s|%s|%s|%s|%s|",
-                       bstr("username"),
+                       username,
                        bstr("password"),
                        flags,
                        bstr("timescalled"),
@@ -423,13 +846,10 @@ void edituser(void) {
                );
                serv_getln(buf, sizeof buf);
                if (buf[0] != '2') {
-                       sprintf(message,
-                               "<img src=\"static/error.gif\" ALIGN=CENTER>"
+                       sprintf(&message[strlen(message)],
+                               "<img src=\"static/error.gif\" align=center>"
                                "%s<br /><br />\n", &buf[4]);
                }
-               else {
-                       safestrncpy(message, "", sizeof message);
-               }
        }
 
        /**
@@ -437,14 +857,14 @@ void edituser(void) {
         * the vCard edit screen.
         */
        if (is_new) {
-               display_edit_address_book_entry( bstr("username"), atol(bstr("usernum")) );
+               display_edit_address_book_entry(username, lbstr("usernum") );
        }
        else {
-               select_user_to_edit(message, bstr("username"));
+               select_user_to_edit(message, username);
        }
 }
 
-/**
+/*
  * \brief burge a user 
  * \param username the name of the user to remove
  */
@@ -456,7 +876,7 @@ void delete_user(char *username) {
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                sprintf(message,
-                       "<img src=\"static/error.gif\" ALIGN=CENTER>"
+                       "<img src=\"static/error.gif\" align=center>"
                        "%s<br /><br />\n", &buf[4]);
        }
        else {
@@ -482,13 +902,22 @@ void create_user(void) {
        serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
-               sprintf(WC->ImportantMessage,
-                       _("A new user has been created."));
+               sprintf(WC->ImportantMessage, _("A new user has been created."));
                display_edituser(username, 1);
        }
+       else if (!strncmp(buf, "570", 3)) {
+               sprintf(error_message,
+                       "<img src=\"static/error.gif\" align=center>"
+                       "%s<br /><br />\n",
+                       _("You are attempting to create a new user from within Citadel "
+                       "while running in host based authentication mode.  In this mode, "
+                       "you must create new users on the host system, not within Citadel.")
+               );
+               select_user_to_edit(error_message, NULL);
+       }
        else {
                sprintf(error_message,
-                       "<img src=\"static/error.gif\" ALIGN=CENTER>"
+                       "<img src=\"static/error.gif\" align=center>"
                        "%s<br /><br />\n", &buf[4]);
                select_user_to_edit(error_message, NULL);
        }
@@ -496,5 +925,35 @@ void create_user(void) {
 }
 
 
+void _select_user_to_edit(void){select_user_to_edit(NULL, NULL);}
+void _display_edituser(void) {display_edituser(NULL, 0);}
 
+void 
+InitModule_USEREDIT
+(void)
+{
+       WebcitAddUrlHandler(HKEY("select_user_to_edit"), _select_user_to_edit, 0);
+       WebcitAddUrlHandler(HKEY("display_edituser"), _display_edituser, 0);
+       WebcitAddUrlHandler(HKEY("edituser"), edituser, 0);
+       WebcitAddUrlHandler(HKEY("create_user"), create_user, 0);
+
+       RegisterNamespace("USERLIST:USERNAME",      0, 1, tmplput_USERLIST_UserName, 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);
+       RegisterNamespace("USERLIST:LASTLOGON:STR", 0, 0, tmplput_USERLIST_LastLogonStr, CTX_USERLIST);
+       RegisterNamespace("USERLIST:LASTLOGON:NO",  0, 0, tmplput_USERLIST_LastLogonNo, CTX_USERLIST);
+       RegisterNamespace("USERLIST:NLOGONS",       0, 0, tmplput_USERLIST_nLogons, CTX_USERLIST);
+       RegisterNamespace("USERLIST:NPOSTS",        0, 0, tmplput_USERLIST_nPosts, CTX_USERLIST);
+                                                   
+       RegisterNamespace("USERLIST:FLAGS",         0, 0, tmplput_USERLIST_Flags, CTX_USERLIST);
+       RegisterNamespace("USERLIST:DAYSTILLPURGE", 0, 0, tmplput_USERLIST_DaysTillPurge, CTX_USERLIST);
+
+       RegisterConditional(HKEY("COND:USERNAME"),  0,    ConditionalUser, CTX_USERLIST);
+       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);
+}
 /*@}*/