X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fuseredit.c;h=ef1be72b6b50b7fd2653ef25249fff7963f8bfe7;hb=4b4dc864ede7c5d8d956febe4a0afb422b78e7c4;hp=a1927f0d03a934991b82b9326672b8ee23889b94;hpb=8eacce58cbc89e62b60fbdd0d3e1c5238f2bef1a;p=citadel.git

diff --git a/webcit/useredit.c b/webcit/useredit.c
index a1927f0d0..ef1be72b6 100644
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -1,393 +1,744 @@
 /*
- * $Id$
+ * Copyright (c) 1996-2011 by the citadel.org team
  *
- * Administrative screen to add/change/delete user accounts
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
 #include "webcit.h"
 #include "webserver.h"
 
 
+/*
+ *  show a list of available users to edit them
+ *  message the header message???
+ *  preselect = which user should be selected in the browser
+ */
+void select_user_to_edit(const char *preselect)
+{
+	output_headers(1, 0, 0, 0, 1, 0);
+	do_template("aide_edituser_select");
+        end_burst();
+}
+
+
+typedef struct _UserListEntry {
+	int UID;
+	int AccessLevel;
+	int nLogons;
+	int nPosts;
 
+	StrBuf *UserName;
+	StrBuf *Passvoid;
+	time_t LastLogonT;
+	/* Just available for Single users to view: */
+	unsigned int Flags;
+	int DaysTillPurge;
+	int HasBio;
+} UserListEntry;
 
 
-void select_user_to_edit(char *message, char *preselect)
+UserListEntry* NewUserListOneEntry(StrBuf *SerializedUser, const char *Pos)
 {
-	char buf[SIZ];
-	char username[SIZ];
+	UserListEntry *ul;
+
+	if (StrLength(SerializedUser) < 8) 
+		return NULL;
+
+	ul = (UserListEntry*) malloc(sizeof(UserListEntry));
+	ul->UserName = NewStrBuf();
+	ul->Passvoid = NewStrBuf();
+
+	StrBufExtract_NextToken(ul->UserName,               SerializedUser, &Pos, '|');
+	StrBufExtract_NextToken(ul->Passvoid,               SerializedUser, &Pos, '|');
+	ul->Flags         = StrBufExtractNext_unsigned_long(SerializedUser, &Pos, '|');
+	ul->nLogons       = StrBufExtractNext_int(          SerializedUser, &Pos, '|');
+	ul->nPosts        = StrBufExtractNext_int(          SerializedUser, &Pos, '|');
+	ul->AccessLevel   = StrBufExtractNext_int(          SerializedUser, &Pos, '|');
+	ul->UID           = StrBufExtractNext_int(          SerializedUser, &Pos, '|');
+	ul->LastLogonT    = StrBufExtractNext_long(         SerializedUser, &Pos, '|');
+	ul->DaysTillPurge = StrBufExtractNext_int(          SerializedUser, &Pos, '|');
+	return ul;
+}
 
-	output_headers(1, 1, 2, 0, 1, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<table width=100%% border=0 bgcolor=#444455><tr>"
-		"<td>"
-		"<span class=\"titlebar\">"
-		"<img src=\"/static/users-icon.gif\">"
-		"Edit or delete users"
-		"</span></td></tr></table>\n"
-		"</div>\n<div id=\"content\">\n"
-	);
+void DeleteUserListEntry(void *vUserList)
+{
+	UserListEntry *ul = (UserListEntry*) vUserList;
+	if (!ul) return;
+	FreeStrBuf(&ul->UserName);
+	FreeStrBuf(&ul->Passvoid);
+	free(ul);
+}
 
-	if (message != NULL) wprintf(message);
+UserListEntry* NewUserListEntry(StrBuf *SerializedUserList)
+{
+	const char *Pos = NULL;
+	UserListEntry *ul;
+
+	if (StrLength(SerializedUserList) < 8) 
+		return NULL;
+
+	ul = (UserListEntry*) malloc(sizeof(UserListEntry));
+	ul->UserName = NewStrBuf();
+	ul->Passvoid = NewStrBuf();
+
+	StrBufExtract_NextToken(ul->UserName,    SerializedUserList, &Pos, '|');
+	ul->AccessLevel = StrBufExtractNext_int( SerializedUserList, &Pos, '|');
+	ul->UID         = StrBufExtractNext_int( SerializedUserList, &Pos, '|');
+	ul->LastLogonT  = StrBufExtractNext_long(SerializedUserList, &Pos, '|');
+	ul->nLogons     = StrBufExtractNext_int( SerializedUserList, &Pos, '|');
+	ul->nPosts      = StrBufExtractNext_int( SerializedUserList, &Pos, '|');
+	StrBufExtract_NextToken(ul->Passvoid,    SerializedUserList, &Pos, '|');
+	ul->Flags = 0;
+	ul->HasBio = 0;
+	ul->DaysTillPurge = -1;
+	return ul;
+}
 
-	wprintf("<TABLE border=0 CELLSPACING=10><TR VALIGN=TOP><TD>\n");
+/*
+ * Sort by Username
+ */
+int CompareUserListName(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
 
-	svprintf("BOXTITLE", WCS_STRING, "Add users");
-	do_template("beginbox");
+	return strcmp(ChrPtr(u1->UserName), ChrPtr(u2->UserName));
+}
 
-	wprintf("To create a new user account, enter the desired "
-		"user name in the box below and click 'Create'.<br /><br />");
+int CompareUserListNameRev(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
+	return strcmp(ChrPtr(u2->UserName), ChrPtr(u1->UserName));
+}
 
-        wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/create_user\">\n");
-        wprintf("New user: ");
-        wprintf("<input type=text name=username><br />\n"
-        	"<input type=submit value=\"Create\">"
-		"</FORM></CENTER>\n");
+int GroupchangeUserListName(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) vUser1;
+	UserListEntry *u2 = (UserListEntry*) vUser2;
+	return ChrPtr(u2->UserName)[0] != ChrPtr(u1->UserName)[0];
+}
 
-	do_template("endbox");
+/*
+ * Sort by access level
+ */
+int CompareAccessLevel(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
 
-	wprintf("</TD><TD>");
+	return (u1->AccessLevel > u2->AccessLevel);
+}
 
-	svprintf("BOXTITLE", WCS_STRING, "Edit or Delete users");
-	do_template("beginbox");
+int CompareAccessLevelRev(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
 
-	wprintf("To edit an existing user account, select the user "
-		"name from the list and click 'Edit'.<br /><br />");
-	
-        wprintf("<CENTER>"
-		"<FORM METHOD=\"POST\" ACTION=\"/display_edituser\">\n");
-        wprintf("<SELECT NAME=\"username\" SIZE=10 STYLE=\"width:100%%\">\n");
+	return (u2->AccessLevel > u1->AccessLevel);
+}
+
+int GroupchangeAccessLevel(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*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
+
+	return (u1->UID > u2->UID);
+}
+
+int CompareUIDRev(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
+
+	return (u2->UID > u1->UID);
+}
+
+int GroupchangeUID(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) vUser1;
+	UserListEntry *u2 = (UserListEntry*) vUser2;
+
+	return (u2->UID / 10) != (u1->UID / 10);
+}
+
+/*
+ * Sort By Date /// TODO!
+ */
+int CompareLastLogon(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
+
+	return (u1->LastLogonT > u2->LastLogonT);
+}
+
+int CompareLastLogonRev(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
+
+	return (u2->LastLogonT > u1->LastLogonT);
+}
+
+int GroupchangeLastLogon(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*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
+
+	return (u1->nLogons > u2->nLogons);
+}
+
+int ComparenLogonsRev(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
+
+	return (u2->nLogons > u1->nLogons);
+}
+
+int GroupchangenLogons(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) vUser1;
+	UserListEntry *u2 = (UserListEntry*) vUser2;
+
+	return (u2->nLogons / 100) != (u1->nLogons / 100);
+}
+
+/*
+ * Sort By Number of Posts
+ */
+int ComparenPosts(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
+
+	return (u1->nPosts > u2->nPosts);
+}
+
+int ComparenPostsRev(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1);
+	UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2);
+
+	return (u2->nPosts > u1->nPosts);
+}
+
+int GroupchangenPosts(const void *vUser1, const void *vUser2)
+{
+	UserListEntry *u1 = (UserListEntry*) vUser1;
+	UserListEntry *u2 = (UserListEntry*) vUser2;
+
+	return (u2->nPosts / 100) != (u1->nPosts / 100);
+}
+
+
+HashList *iterate_load_userlist(StrBuf *Target, WCTemplputParams *TP)
+{
+	int Done = 0;
+	CompareFunc SortIt;
+	HashList *Hash = NULL;
+	StrBuf *Buf;
+	UserListEntry* ul;
+	int len;
+	int UID;
+	void *vData;
+	WCTemplputParams SubTP;
+
+	memset(&SubTP, 0, sizeof(WCTemplputParams));	
         serv_puts("LIST");
-        serv_gets(buf);
-        if (buf[0] == '1') {
-                while (serv_gets(buf), strcmp(buf, "000")) {
-                        extract(username, buf, 0);
-                        wprintf("<OPTION");
-			if (preselect != NULL)
-			   if (!strcasecmp(username, preselect))
-			      wprintf(" SELECTED");
-			wprintf(">");
-                        escputs(username);
-                        wprintf("\n");
-                }
+	Buf = NewStrBuf();
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) == 1) {
+		Hash = NewHash(1, Flathash);
+
+		while (!Done) {
+			len = StrBuf_ServGetln(Buf);
+			if ((len <0) || 
+			    ((len == 3) &&
+			     !strcmp(ChrPtr(Buf), "000")))
+			{
+				Done = 1;
+				break;
+			}
+			ul = NewUserListEntry(Buf);
+			if (ul == NULL)
+				continue;
+
+			Put(Hash, IKEY(ul->UID), ul, DeleteUserListEntry); 
+		}
+
+		serv_puts("LBIO 1");
+		StrBuf_ServGetln(Buf);
+		if (GetServerStatus(Buf, NULL) == 1)
+			Done = 0;
+			while (!Done) {
+			len = StrBuf_ServGetln(Buf);
+			if ((len <0) || 
+			    ((len == 3) &&
+			     !strcmp(ChrPtr(Buf), "000")))
+			{
+				Done = 1;
+				break;
+			}
+			UID = atoi(ChrPtr(Buf));
+			if (GetHash(Hash, IKEY(UID), &vData) && vData != 0)
+			{
+				ul = (UserListEntry*)vData;
+				ul->HasBio = 1;
+			}
+		}
+		SubTP.Filter.ContextType = CTX_USERLIST;
+		SortIt = RetrieveSort(&SubTP, HKEY("USER"), HKEY("user:uid"), 0);
+		if (SortIt != NULL)
+			SortByPayload(Hash, SortIt);
+		else 
+			SortByPayload(Hash, CompareUID);
         }
-        wprintf("</SELECT><br />\n");
+	FreeStrBuf(&Buf);
+	return Hash;
+}
+
+
+void tmplput_USERLIST_UserName(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+	StrBufAppendTemplate(Target, TP, ul->UserName, 0);
+}
+
+void tmplput_USERLIST_Password(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+	StrBufAppendTemplate(Target, TP, ul->Passvoid, 0);
+}
 
-        wprintf("<input type=submit name=sc value=\"Edit configuration\">");
-        wprintf("<input type=submit name=sc value=\"Edit address book entry\">");
-        wprintf("<input type=submit name=sc value=\"Delete user\" "
-		"onClick=\"return confirm('Delete this user?');\">");
-        wprintf("</FORM></CENTER>\n");
-	do_template("endbox");
+void tmplput_USERLIST_AccessLevelNo(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
 
-	wprintf("</TD></TR></TABLE>\n");
+	StrBufAppendPrintf(Target, "%d", ul->AccessLevel, 0);
+}
 
-	wDumpContent(1);
+void tmplput_USERLIST_AccessLevelStr(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+	
+	StrBufAppendBufPlain(Target, _(axdefs[ul->AccessLevel]), -1, 0);
 }
 
+void tmplput_USERLIST_UID(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+
+	StrBufAppendPrintf(Target, "%d", ul->UID, 0);
+}
 
+void tmplput_USERLIST_LastLogonNo(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
 
-/* 
- * Locate the message number of a user's vCard in the current room
+	StrBufAppendPrintf(Target,"%ld", ul->LastLogonT, 0);
+}
+void tmplput_USERLIST_LastLogonStr(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+	StrEscAppend(Target, NULL, asctime(localtime(&ul->LastLogonT)), 0, 0);
+}
+
+void tmplput_USERLIST_nLogons(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+
+	StrBufAppendPrintf(Target, "%d", ul->nLogons, 0);
+}
+
+void tmplput_USERLIST_nPosts(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+
+	StrBufAppendPrintf(Target, "%d", ul->nPosts, 0);
+}
+
+void tmplput_USERLIST_Flags(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+
+	StrBufAppendPrintf(Target, "%d", ul->Flags, 0);
+}
+
+void tmplput_USERLIST_DaysTillPurge(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+
+	StrBufAppendPrintf(Target, "%d", ul->DaysTillPurge, 0);
+}
+
+int ConditionalUser(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+	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(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+	return (ul->Flags & US_INTERNET) != 0;
+}
+
+int ConditionalUserAccess(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+	
+	if (ul == NULL)
+		return 0;
+
+	return GetTemplateTokenNumber(Target, 
+				      TP, 
+				      3, 
+				      AxNewU)
+		==
+		ul->AccessLevel;
+}
+int ConditionalHaveBIO(StrBuf *Target, WCTemplputParams *TP)
+{
+	UserListEntry *ul = (UserListEntry*) CTX;
+	
+	if (ul == NULL)
+		return 0;
+	return ul->HasBio;
+}
+
+void tmplput_USER_BIO(StrBuf *Target, WCTemplputParams *TP)
+{
+	int Done = 0;
+	StrBuf *Buf;
+	const char *who;
+	long len;
+
+	GetTemplateTokenString(Target, TP, 0, &who, &len);
+
+	Buf = NewStrBuf();
+	serv_printf("RBIO %s", who);
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) == 1) {
+		StrBuf *BioBuf = NewStrBufPlain(NULL, SIZ);
+		while (!Done && StrBuf_ServGetln(Buf)>=0) {
+			if ( (StrLength(Buf)==3) && 
+			     !strcmp(ChrPtr(Buf), "000")) 
+				Done = 1;
+			else
+				StrBufAppendBuf(BioBuf, Buf, 0);
+		}
+		StrBufAppendTemplate(Target, TP, BioBuf, 1);
+		FreeStrBuf(&BioBuf);
+	}
+	FreeStrBuf(&Buf);
+}
+
+int Conditional_USER_HAS_PIC(StrBuf *Target, WCTemplputParams *TP)
+{
+	StrBuf *Buf;
+	const char *who;
+	long len;
+	int r = 0;
+
+	GetTemplateTokenString(Target, TP, 2, &who, &len);
+
+	Buf = NewStrBuf();
+	serv_printf("OIMG _userpic_|%s", who);
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) != 2) {
+		r = 1;
+	}
+	else {
+		r = 0;
+	}
+	serv_puts("CLOS");
+	StrBuf_ServGetln(Buf);
+	GetServerStatus(Buf, NULL);
+	FreeStrBuf(&Buf);
+	return(r);
+}
+
+
+/*
+ *  Locate the message number of a user's vCard in the current room
+ *  Returns the message id of his vcard
  */
-long locate_user_vcard(char *username, long usernum) {
-	char buf[SIZ];
+long locate_user_vcard_in_this_room(message_summary **VCMsg, wc_mime_attachment **VCAtt)
+{
+	wcsession *WCC = WC;
+	HashPos *at;
+	HashPos *att;
+	const char *HashKey;
+	long HKLen;
+	void *vMsg;
+	message_summary *Msg;
+	wc_mime_attachment *Att;
+	StrBuf *Buf;
 	long vcard_msgnum = (-1L);
-	char content_type[SIZ];
-	char partnum[SIZ];
 	int already_tried_creating_one = 0;
+	StrBuf *FoundCharset = NewStrBuf();
+	StrBuf *Error = NULL;
+	SharedMessageStatus Stat;
 
-	struct stuff_t {
-		struct stuff_t *next;
-		long msgnum;
-	};
-
-	struct stuff_t *stuff = NULL;
-	struct stuff_t *ptr;
 
+	Buf = NewStrBuf();
 TRYAGAIN:
+	memset(&Stat, 0, sizeof(SharedMessageStatus));
+	Stat.maxload = 10000;
+	Stat.lowest_found = (-1);
+	Stat.highest_found = (-1);
 	/* Search for the user's vCard */
-	serv_puts("MSGS ALL");
-	serv_gets(buf);
-	if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
-		ptr = malloc(sizeof(struct stuff_t));
-		ptr->msgnum = atol(buf);
-		ptr->next = stuff;
-		stuff = ptr;
-	}
-
-	/* Iterate through the message list looking for vCards */
-	while (stuff != NULL) {
-		serv_printf("MSG0 %ld|2", stuff->msgnum);
-		serv_gets(buf);
-		if (buf[0]=='1') {
-			while(serv_gets(buf), strcmp(buf, "000")) {
-				if (!strncasecmp(buf, "part=", 5)) {
-					extract(partnum, &buf[5], 2);
-					extract(content_type, &buf[5], 4);
-					if (!strcasecmp(content_type,
-					   "text/x-vcard")) {
-						vcard_msgnum = stuff->msgnum;
+	if (load_msg_ptrs("MSGS ALL||||1", NULL, &Stat, NULL) > 0) {
+		at = GetNewHashPos(WCC->summ, 0);
+		while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+			Msg = (message_summary*) vMsg;		
+			Msg->MsgBody =  (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
+			memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
+			Msg->MsgBody->msgnum = Msg->msgnum;
+
+			load_message(Msg, FoundCharset, &Error);
+			
+			if (Msg->AllAttach != NULL) {
+				att = GetNewHashPos(Msg->AllAttach, 0);
+				while (GetNextHashPos(Msg->AllAttach, att, &HKLen, &HashKey, &vMsg) && 
+				       (vcard_msgnum == -1)) {
+					Att = (wc_mime_attachment*) vMsg;
+					if (
+						(strcasecmp(ChrPtr(Att->ContentType), "text/x-vcard") == 0)
+						|| (strcasecmp(ChrPtr(Att->ContentType), "text/vcard") == 0)
+					) {
+						*VCAtt = Att;
+						*VCMsg = Msg;
+						vcard_msgnum = Msg->msgnum;
+						if (Att->Data == NULL) {
+							MimeLoadData(Att);
+						}
 					}
 				}
+				DeleteHashPos(&att);
 			}
+			FreeStrBuf(&Error);	/* don't care... */
+			
 		}
-
-		ptr = stuff->next;
-		free(stuff);
-		stuff = ptr;
+		DeleteHashPos(&at);		
 	}
 
 	/* If there's no vcard, create one */
-	if (vcard_msgnum < 0) if (already_tried_creating_one == 0) {
+	if ((*VCMsg == NULL) && (already_tried_creating_one == 0)) {
+		FlushStrBuf(Buf);
 		already_tried_creating_one = 1;
 		serv_puts("ENT0 1|||4");
-		serv_gets(buf);
-		if (buf[0] == '4') {
+		StrBuf_ServGetln(Buf);
+		if (GetServerStatus(Buf, NULL) == 4) {
 			serv_puts("Content-type: text/x-vcard");
 			serv_puts("");
 			serv_puts("begin:vcard");
 			serv_puts("end:vcard");
 			serv_puts("000");
 		}
+		else 
+			syslog(1, "Error while creating user vcard: %s\n", ChrPtr(Buf));
 		goto TRYAGAIN;
 	}
+	FreeStrBuf(&Buf);
+	FreeStrBuf(&FoundCharset);
 
 	return(vcard_msgnum);
 }
 
 
-/* 
- * Display the form for editing a user's address book entry
+/*
+ *  Display the form for editing a user's address book entry
+ *  username the name of the user
+ *  usernum the citadel-uid of the user
  */
-void display_edit_address_book_entry(char *username, long usernum) {
-	char roomname[SIZ];
-	char buf[SIZ];
-	char error_message[SIZ];
+void display_edit_address_book_entry(const char *username, long usernum) {
+	message_summary *VCMsg = NULL;
+	wc_mime_attachment *VCAtt = NULL;
+	StrBuf *roomname;
+	StrBuf *Buf;
 	long vcard_msgnum = (-1L);
 
 	/* Locate the user's config room, creating it if necessary */
-	sprintf(roomname, "%010ld.%s", usernum, USERCONFIGROOM);
-	serv_printf("GOTO %s||1", roomname);
-	serv_gets(buf);
-	if (buf[0] != '2') {
-		serv_printf("CRE8 1|%s|5|||1|", roomname);
-		serv_gets(buf);
-		serv_printf("GOTO %s||1", roomname);
-		serv_gets(buf);
-		if (buf[0] != '2') {
-			sprintf(error_message,
-				"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
-				"%s<br /><br />\n", &buf[4]);
-			select_user_to_edit(error_message, username);
+	Buf = NewStrBuf();
+	roomname = NewStrBuf();
+	StrBufPrintf(roomname, "%010ld.%s", usernum, USERCONFIGROOM);
+	serv_printf("GOTO %s||1", ChrPtr(roomname));
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) != 2) {
+		serv_printf("CRE8 1|%s|5|||1|", ChrPtr(roomname));
+		StrBuf_ServGetln(Buf);
+		GetServerStatus(Buf, NULL);
+		serv_printf("GOTO %s||1", ChrPtr(roomname));
+		StrBuf_ServGetln(Buf);
+		if (GetServerStatusMsg(Buf, NULL, 1, 2) != 2) {
+			select_user_to_edit(username);
+			FreeStrBuf(&Buf);
+			FreeStrBuf(&roomname);
 			return;
 		}
 	}
+	FreeStrBuf(&Buf);
 
-	vcard_msgnum = locate_user_vcard(username, usernum);
+	locate_user_vcard_in_this_room(&VCMsg, &VCAtt);
 
-	if (vcard_msgnum < 0) {
-		sprintf(error_message,
-			"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
-			"Could not create/edit vCard"
-			"<br /><br />\n"
-		);
-		select_user_to_edit(error_message, username);
+	if (VCMsg == NULL) {
+		AppendImportantMessage(_("An error occurred while trying to create or edit this address book entry."), -1);
+		select_user_to_edit(username);
+		FreeStrBuf(&roomname);
 		return;
 	}
 
-	do_edit_vcard(vcard_msgnum, "1", "/select_user_to_edit");
+	do_edit_vcard(vcard_msgnum, "1", 
+		      VCMsg,
+		      VCAtt,
+		      "select_user_to_edit", 
+		      ChrPtr(roomname));
+	FreeStrBuf(&roomname);
 }
 
-
-
-
 /*
- * Edit a user.  If supplied_username is null, look in the "username"
- * web variable for the name of the user to edit.
- * 
- * If "is_new" is set to nonzero, this screen will set the web variables
- * to send the user to the vCard editor next.
+ *  burge a user 
+ *  username the name of the user to remove
  */
-void display_edituser(char *supplied_username, int is_new) {
-	char buf[SIZ];
-	char error_message[SIZ];
-	time_t now;
-
-	char username[SIZ];
-	char password[SIZ];
-	unsigned int flags;
-	int timescalled;
-	int msgsposted;
-	int axlevel;
-	long usernum;
-	time_t lastcall;
-	int purgedays;
-	int i;
+void delete_user(char *username) {
+	StrBuf *Buf;
+	
+	Buf = NewStrBuf();
+	serv_printf("ASUP %s|0|0|0|0|0|", username);
+	StrBuf_ServGetln(Buf);
+	GetServerStatusMsg(Buf, NULL, 1, 2);
+
+	select_user_to_edit( bstr("username"));
+	FreeStrBuf(&Buf);
+}
+		
+
+void display_edituser(const char *supplied_username, int is_new) {
+	const char *Pos;
+	UserListEntry* UL;
+	StrBuf *Buf;
+	char username[256];
 
 	if (supplied_username != NULL) {
-		strcpy(username, supplied_username);
+		safestrncpy(username, supplied_username, sizeof username);
 	}
 	else {
-		strcpy(username, bstr("username") );
+		safestrncpy(username, bstr("username"), sizeof username);
 	}
 
+	Buf = NewStrBuf();
 	serv_printf("AGUP %s", username);
-	serv_gets(buf);
-	if (buf[0] != '2') {
-		sprintf(error_message,
-			"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
-			"%s<br /><br />\n", &buf[4]);
-		select_user_to_edit(error_message, username);
-		return;
-	}
-
-	extract(username, &buf[4], 0);
-	extract(password, &buf[4], 1);
-	flags = extract_int(&buf[4], 2);
-	timescalled = extract_int(&buf[4], 3);
-	msgsposted = extract_int(&buf[4], 4);
-	axlevel = extract_int(&buf[4], 5);
-	usernum = extract_long(&buf[4], 6);
-	lastcall = extract_long(&buf[4], 7);
-	purgedays = extract_long(&buf[4], 8);
-
-	if (!strcmp(bstr("sc"), "Edit address book entry")) {
-		display_edit_address_book_entry(username, usernum);
-		return;
-	}
-
-	if (!strcmp(bstr("sc"), "Delete user")) {
-		delete_user(username);
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatusMsg(Buf, NULL, 1, 2) != 2) {
+		select_user_to_edit(username);
+		FreeStrBuf(&Buf);
 		return;
 	}
-
-	output_headers(1, 1, 2, 0, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-	wprintf("<SPAN CLASS=\"titlebar\">"
-		"Edit user account: ");
-	escputs(username);
-	wprintf("</SPAN></TD></TR></TABLE>\n");
-	wprintf("</div>\n<div id=\"content\">\n");
-
-	wprintf("<center><table border=0 width=99%% bgcolor=\"#ffffff\"><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",
-		is_new, usernum);
-
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"flags\" VALUE=\"%d\">\n", flags);
-
-	wprintf("<CENTER><TABLE>");
-
-	wprintf("<TR><TD>Password</TD><TD>"
-		"<INPUT TYPE=\"password\" NAME=\"password\" VALUE=\"");
-	escputs(password);
-	wprintf("\" MAXLENGTH=\"20\"></TD></TR>\n");
-
-	wprintf("<TR><TD>Times logged in</TD><TD>"
-		"<INPUT TYPE=\"text\" NAME=\"timescalled\" VALUE=\"");
-	wprintf("%d", timescalled);
-	wprintf("\" MAXLENGTH=\"6\"></TD></TR>\n");
-
-	wprintf("<TR><TD>Messages posted</TD><TD>"
-		"<INPUT TYPE=\"text\" NAME=\"msgsposted\" VALUE=\"");
-	wprintf("%d", msgsposted);
-	wprintf("\" MAXLENGTH=\"6\"></TD></TR>\n");
-
-	wprintf("<TR><TD>Access level</TD><TD>"
-		"<SELECT NAME=\"axlevel\">\n");
-	for (i=0; i<7; ++i) {
-		wprintf("<OPTION ");
-		if (axlevel == i) {
-			wprintf("SELECTED ");
+	else {
+		Pos = ChrPtr(Buf) + 4;
+		UL = NewUserListOneEntry(Buf, Pos);
+		if ((UL != NULL) && havebstr("edit_abe_button")) {
+			display_edit_address_book_entry(username, UL->UID);
+		}
+		else if ((UL != NULL) && havebstr("delete_button")) {
+			delete_user(username);
+		}
+		else if (UL != NULL) {
+			WCTemplputParams SubTP;
+			memset(&SubTP, 0, sizeof(WCTemplputParams));
+			SubTP.Filter.ContextType = CTX_USERLIST;
+			SubTP.Context = UL;
+			output_headers(1, 0, 0, 0, 1, 0);
+			DoTemplate(HKEY("aide_edituser_detailview"), NULL, &SubTP);
+			end_burst();
 		}
-		wprintf("VALUE=\"%d\">%d - %s</OPTION>\n",
-			i, i, axdefs[i]);
+		DeleteUserListEntry(UL);
+		
 	}
-	wprintf("</SELECT></TD></TR>\n");
-
-	wprintf("<TR><TD>User ID number</TD><TD>"
-		"<INPUT TYPE=\"text\" NAME=\"usernum\" VALUE=\"");
-	wprintf("%ld", usernum);
-	wprintf("\" MAXLENGTH=\"7\"></TD></TR>\n");
-
-	now = time(NULL);
-	wprintf("<TR><TD>Date/time of last login</TD><TD>"
-		"<SELECT NAME=\"lastcall\">\n");
-
-	wprintf("<OPTION SELECTED VALUE=\"%ld\">", lastcall);
-	escputs(asctime(localtime(&lastcall)));
-	wprintf("</OPTION>\n");
-
-	wprintf("<OPTION VALUE=\"%ld\">", now);
-	escputs(asctime(localtime(&now)));
-	wprintf("</OPTION>\n");
-
-	wprintf("</SELECT></TD></TR>");
-
-	wprintf("<TR><TD>Auto-purge after days</TD><TD>"
-		"<INPUT TYPE=\"text\" NAME=\"purgedays\" VALUE=\"");
-	wprintf("%d", purgedays);
-	wprintf("\" MAXLENGTH=\"5\"></TD></TR>\n");
-
-	wprintf("</TABLE>\n");
-
-	wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"OK\">\n"
-		"&nbsp;"
-		"<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n"
-		"<br /><br /></FORM>\n");
-
-	wprintf("</CENTER>\n");
-	wprintf("</td></tr></table></center>\n");
-
-	wDumpContent(1);
-
+	FreeStrBuf(&Buf);
 }
 
-
-
+/*
+ *  do the backend operation of the user edit on the server
+ */
 void edituser(void) {
-	char message[SIZ];
-	char buf[SIZ];
 	int is_new = 0;
+	unsigned int flags = 0;
+	const char *username;
 
-	is_new = atoi(bstr("is_new"));
-
-	if (strcasecmp(bstr("action"), "OK")) {
-		strcpy(message, "Edit user cancelled.");
-	}
+	is_new = ibstr("is_new");
+	username = bstr("username");
 
+	if (!havebstr("ok_button")) {
+		AppendImportantMessage(_("Changes were not saved."), -1);
+	}	
 	else {
+		StrBuf *Buf = NewStrBuf();
+
+		flags = ibstr("flags");
+		if (yesbstr("inetmail")) {
+			flags |= US_INTERNET;
+		}
+		else {
+			flags &= ~US_INTERNET ;
+		}
 
-		serv_printf("ASUP %s|%s|%s|%s|%s|%s|%s|%s|%s|",
-			bstr("username"),
+		if ((havebstr("newname")) && (strcasecmp(bstr("username"), bstr("newname")))) {
+			serv_printf("RENU %s|%s", bstr("username"), bstr("newname"));
+			StrBuf_ServGetln(Buf);
+			if (GetServerStatusMsg(Buf, NULL, 1, 2) != 2) {
+				username = bstr("newname");
+			}
+		}
+
+		serv_printf("ASUP %s|%s|%d|%s|%s|%s|%s|%s|%s|",
+			username,
 			bstr("password"),
-			bstr("flags"),
+			flags,
 			bstr("timescalled"),
 			bstr("msgsposted"),
 			bstr("axlevel"),
@@ -395,70 +746,157 @@ void edituser(void) {
 			bstr("lastcall"),
 			bstr("purgedays")
 		);
-		serv_gets(buf);
-		if (buf[0] != '2') {
-			sprintf(message,
-				"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
-				"%s<br /><br />\n", &buf[4]);
-		}
-		else {
-			strcpy(message, "");
-		}
+		StrBuf_ServGetln(Buf);
+		GetServerStatusMsg(Buf, NULL, 1, 2);
+		FreeStrBuf(&Buf);
 	}
 
-	/* If we are in the middle of creating a new user, move on to
+	/*
+	 * If we are in the middle of creating a new user, move on to
 	 * 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(username);
 	}
 }
 
 
-void delete_user(char *username) {
-	char buf[SIZ];
-	char message[SIZ];
 
-	serv_printf("ASUP %s|0|0|0|0|0|", username);
-	serv_gets(buf);
-	if (buf[0] != '2') {
-		sprintf(message,
-			"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
-			"%s<br /><br />\n", &buf[4]);
+/*
+ *  create a new user
+ * take the web environment username and create it on the citadel server
+ */
+void create_user(void) {
+	long FullState;
+	StrBuf *Buf;
+	const char *username;
+
+	Buf = NewStrBuf();
+	username = bstr("username");
+	serv_printf("CREU %s", username);
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, &FullState) == 2) {
+		AppendImportantMessage(_("A new user has been created."), -1);
+		display_edituser(username, 1);
+	}
+	else if (FullState == 570) {
+		AppendImportantMessage(_("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."), 
+				       -1);
+		select_user_to_edit(NULL);
 	}
 	else {
-		strcpy(message, "");
+		AppendImportantMessage(ChrPtr(Buf) + 4, StrLength(Buf) - 4);
+		select_user_to_edit(NULL);
 	}
-	select_user_to_edit(message, bstr("username"));
+	FreeStrBuf(&Buf);
 }
-		
 
 
+void _select_user_to_edit(void) {
+	select_user_to_edit(NULL);
+}
 
-void create_user(void) {
-	char buf[SIZ];
-	char error_message[SIZ];
-	char username[SIZ];
 
-	strcpy(username, bstr("username"));
+void _display_edituser(void) {
+	display_edituser(NULL, 0);
+}
 
-	serv_printf("CREU %s", username);
-	serv_gets(buf);
+void showuser(void)
+{
+	output_headers(1, 0, 0, 0, 1, 0);
+	do_template("user_show");
+	end_burst();
+}
+
+
+void 
+InitModule_USEREDIT
+(void)
+{
+	WebcitAddUrlHandler(HKEY("showuser"), "", 0, showuser, 0);
+	WebcitAddUrlHandler(HKEY("select_user_to_edit"), "", 0, _select_user_to_edit, 0);
+	WebcitAddUrlHandler(HKEY("display_edituser"), "", 0, _display_edituser, 0);
+	WebcitAddUrlHandler(HKEY("edituser"), "", 0, edituser, 0);
+	WebcitAddUrlHandler(HKEY("create_user"), "", 0, create_user, 0);
+
+	RegisterNamespace("USERLIST:USERNAME",      0, 1, tmplput_USERLIST_UserName, NULL, CTX_USERLIST);
+	RegisterNamespace("USERLIST:PASSWD",        0, 1, tmplput_USERLIST_Password, NULL, CTX_USERLIST);
+	RegisterNamespace("USERLIST:ACCLVLNO",      0, 0, tmplput_USERLIST_AccessLevelNo, NULL, CTX_USERLIST);
+	RegisterNamespace("USERLIST:ACCLVLSTR",     0, 0, tmplput_USERLIST_AccessLevelStr, NULL, CTX_USERLIST);
+	RegisterNamespace("USERLIST:UID",           0, 0, tmplput_USERLIST_UID, NULL, CTX_USERLIST);
+	RegisterNamespace("USERLIST:LASTLOGON:STR", 0, 0, tmplput_USERLIST_LastLogonStr, NULL, CTX_USERLIST);
+	RegisterNamespace("USERLIST:LASTLOGON:NO",  0, 0, tmplput_USERLIST_LastLogonNo, NULL, CTX_USERLIST);
+	RegisterNamespace("USERLIST:NLOGONS",       0, 0, tmplput_USERLIST_nLogons, NULL, CTX_USERLIST);
+	RegisterNamespace("USERLIST:NPOSTS",        0, 0, tmplput_USERLIST_nPosts, NULL, CTX_USERLIST);
+						    
+	RegisterNamespace("USERLIST:FLAGS",         0, 0, tmplput_USERLIST_Flags, NULL, CTX_USERLIST);
+	RegisterNamespace("USERLIST:DAYSTILLPURGE", 0, 0, tmplput_USERLIST_DaysTillPurge, NULL, CTX_USERLIST);
+
+	RegisterNamespace("USER:BIO", 1, 2, tmplput_USER_BIO,  NULL, CTX_NONE);
+
+	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:USERLIST:HAVEBIO"), 0, ConditionalHaveBIO, CTX_USERLIST);
+
+	RegisterConditional(HKEY("COND:USER:PIC"), 1, Conditional_USER_HAS_PIC,  CTX_NONE);
+
+	RegisterIterator("USERLIST", 0, NULL, iterate_load_userlist, NULL, DeleteHash, CTX_USERLIST, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE);
+	
 
-	if (buf[0] == '2') {
-		/* sprintf(error_message, "<b>User has been created.</b>");
-		select_user_to_edit(error_message, username); */
-		display_edituser(username, 1);
-	}
-	else {
-		sprintf(error_message,
-			"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
-			"%s<br /><br />\n", &buf[4]);
-		select_user_to_edit(error_message, NULL);
-	}
 
+	RegisterSortFunc(HKEY("user:name"),
+			 HKEY("userlist"),
+			 CompareUserListName,
+			 CompareUserListNameRev,
+			 GroupchangeUserListName,
+			 CTX_USERLIST);
+	RegisterSortFunc(HKEY("user:accslvl"),
+			 HKEY("userlist"),
+			 CompareAccessLevel,
+			 CompareAccessLevelRev,
+			 GroupchangeAccessLevel,
+			 CTX_USERLIST);
+
+	RegisterSortFunc(HKEY("user:nlogons"),
+			 HKEY("userlist"),
+			 ComparenLogons,
+			 ComparenLogonsRev,
+			 GroupchangenLogons,
+			 CTX_USERLIST);
+
+	RegisterSortFunc(HKEY("user:uid"),
+			 HKEY("userlist"),
+			 CompareUID,
+			 CompareUIDRev,
+			 GroupchangeUID,
+			 CTX_USERLIST);
+
+	RegisterSortFunc(HKEY("user:lastlogon"),
+			 HKEY("userlist"),
+			 CompareLastLogon,
+			 CompareLastLogonRev,
+			 GroupchangeLastLogon,
+			 CTX_USERLIST);
+
+	RegisterSortFunc(HKEY("user:nmsgposts"),
+			 HKEY("userlist"),
+			 ComparenPosts,
+			 ComparenPostsRev,
+			 GroupchangenPosts,
+			 CTX_USERLIST);
+
+	REGISTERTokenParamDefine(AxDeleted);
+	REGISTERTokenParamDefine(AxNewU);
+	REGISTERTokenParamDefine(AxProbU);
+	REGISTERTokenParamDefine(AxLocU);
+	REGISTERTokenParamDefine(AxNetU);
+	REGISTERTokenParamDefine(AxPrefU);
+	REGISTERTokenParamDefine(AxAideU);
 }