X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fuseredit.c;h=3194c0159167a937d4f4364ee2381b7f54381709;hb=1a9e08616fa839db9a46a4f2c6d9e34420150b81;hp=604dbf24b956794c4dac3d8d3b6c593159bad3c9;hpb=e78df325a7ac1b7aa213335a39dfb2ef1f0b0202;p=citadel.git diff --git a/webcit/useredit.c b/webcit/useredit.c index 604dbf24b..3194c0159 100644 --- a/webcit/useredit.c +++ b/webcit/useredit.c @@ -1,228 +1,555 @@ /* * $Id$ - * - * Administrative screen to add/change/delete user accounts - * */ - #include "webcit.h" #include "webserver.h" -void select_user_to_edit(char *message, char *preselect) +/* + * 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) { - char buf[SIZ]; - char username[SIZ]; + output_headers(1, 0, 0, 0, 1, 0); + do_template("aide_edituser_select", NULL); + 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; +} UserListEntry; - output_headers(1, 1, 2, 0, 1, 0, 0); - wprintf("
\n"); - wprintf("" - "
" - "" - ""); - wprintf(_("Edit or delete users")); - wprintf("
\n" - "
\n
\n" - ); - if (message != NULL) wprintf(message); +UserListEntry* NewUserListOneEntry(StrBuf *SerializedUser, const char *Pos) +{ + 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; +} - wprintf("
\n"); +void DeleteUserListEntry(void *vUserList) +{ + UserListEntry *ul = (UserListEntry*) vUserList; + if (!ul) return; + FreeStrBuf(&ul->UserName); + FreeStrBuf(&ul->Passvoid); + free(ul); +} + +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->DaysTillPurge = -1; + return ul; +} - svprintf("BOXTITLE", WCS_STRING, _("Add users")); - do_template("beginbox"); +/* + * Sort by Username + */ +int CompareUserListName(const void *vUser1, const void *vUser2) +{ + UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1); + UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2); - wprintf(_("To create a new user account, enter the desired " - "user name in the box below and click 'Create'.")); - wprintf("

"); + return strcmp(ChrPtr(u1->UserName), ChrPtr(u2->UserName)); +} - wprintf("
\n"); - wprintf(_("New user: ")); - wprintf("
\n" - "" - "
\n", _("Create")); +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)); +} - do_template("endbox"); +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]; +} - wprintf("
"); +/* + * Sort by access level + */ +int CompareAccessLevel(const void *vUser1, const void *vUser2) +{ + UserListEntry *u1 = (UserListEntry*) GetSearchPayload(vUser1); + UserListEntry *u2 = (UserListEntry*) GetSearchPayload(vUser2); - svprintf("BOXTITLE", WCS_STRING, _("Edit or Delete users")); - do_template("beginbox"); + return (u1->AccessLevel > u2->AccessLevel); +} - wprintf(_("To edit an existing user account, select the user " - "name from the list and click 'Edit'.")); - wprintf("

"); - - wprintf("
" - "
\n"); - wprintf("
\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); +} + +void tmplput_USERLIST_AccessLevelNo(StrBuf *Target, WCTemplputParams *TP) +{ + UserListEntry *ul = (UserListEntry*) CTX; + + StrBufAppendPrintf(Target, "%d", ul->AccessLevel, 0); +} + +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; + + 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; - wprintf("", _("Edit configuration")); - wprintf("", _("Edit address book entry")); - wprintf("", _("Delete user"), _("Delete this user?")); - wprintf("
\n"); - do_template("endbox"); + StrBufAppendPrintf(Target, "%d", ul->nLogons, 0); +} - wprintf("
\n"); +void tmplput_USERLIST_nPosts(StrBuf *Target, WCTemplputParams *TP) +{ + UserListEntry *ul = (UserListEntry*) CTX; - wDumpContent(1); + 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; +} -/* - * Locate the message number of a user's vCard in the current room +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 (TP->Tokens->Params[3]->Type == TYPE_LONG) + return (TP->Tokens->Params[3]->lvalue == ul->AccessLevel); + else + return 0; +} + +/* + * 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; + int Done; + 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); + Done = 0; /* Search for the user's vCard */ - serv_puts("MSGS ALL"); - serv_getln(buf, sizeof buf); - if (buf[0] == '1') while (serv_getln(buf, sizeof 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_getln(buf, sizeof buf); - if (buf[0]=='1') { - while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) { - 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")) { - vcard_msgnum = stuff->msgnum; + if (load_msg_ptrs("MSGS ALL||||1", &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_getln(buf, sizeof 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 + lprintf(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) { + wcsession *WCC = WC; + 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_getln(buf, sizeof buf); - if (buf[0] != '2') { - serv_printf("CRE8 1|%s|5|||1|", roomname); - serv_getln(buf, sizeof buf); - serv_printf("GOTO %s||1", roomname); - serv_getln(buf, sizeof buf); - if (buf[0] != '2') { - sprintf(error_message, - "" - "%s

\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 (GetServerStatus(Buf, NULL) != 2) { + FlushStrBuf(WCC->ImportantMsg); + StrBufAppendBuf(WCC->ImportantMsg, Buf, 4); + 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, - "%s

\n", - _("An error occurred while trying to create or edit this address book entry.") - ); - select_user_to_edit(error_message, username); + if (VCMsg == NULL) { + StrBufPlain(WCC->ImportantMsg, + _("An error occurred while trying to create or edit this address book entry."), + 0); + 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. - */ -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 display_edituser(const char *supplied_username, int is_new) { + const char *Pos; + wcsession *WCC = WC; + UserListEntry* UL; + StrBuf *Buf; + char username[256]; if (supplied_username != NULL) { safestrncpy(username, supplied_username, sizeof username); @@ -231,155 +558,82 @@ void display_edituser(char *supplied_username, int is_new) { safestrncpy(username, bstr("username"), sizeof username); } + Buf = NewStrBuf(); serv_printf("AGUP %s", username); - serv_getln(buf, sizeof buf); - if (buf[0] != '2') { - sprintf(error_message, - "" - "%s

\n", &buf[4]); - select_user_to_edit(error_message, username); - return; - } - - extract_token(username, &buf[4], 0, '|', sizeof username); - extract_token(password, &buf[4], 1, '|', sizeof password); - 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 (strlen(bstr("edit_abe_button")) > 0) { - display_edit_address_book_entry(username, usernum); + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) != 2) { + FlushStrBuf(WCC->ImportantMsg); + StrBufAppendBuf(WCC->ImportantMsg, Buf, 4); + select_user_to_edit(username); + FreeStrBuf(&Buf); return; } - - if (strlen(bstr("delete_button")) > 0) { - delete_user(username); - return; - } - - output_headers(1, 1, 2, 0, 0, 0, 0); - wprintf("
\n"); - wprintf("
"); - wprintf(""); - wprintf(_("Edit user account: ")); - escputs(username); - wprintf("
\n"); - wprintf("
\n
\n"); - - wprintf("
" - "
\n"); - wprintf("
\n" - "\n"); - wprintf("\n" - "\n", - is_new, usernum); - - wprintf("\n", flags); - - wprintf("
"); - - wprintf("\n"); - - wprintf("\n"); - - wprintf("\n"); - - wprintf("\n"); - - wprintf("\n"); - - now = time(NULL); - wprintf(""); - - wprintf("\n"); - - wprintf("
"); - wprintf(_("Password")); - wprintf("" - "
"); - wprintf(_("Number of logins")); - wprintf("" - "
"); - wprintf(_("Messages submitted")); - wprintf("" - "
"); - wprintf(_("Access level")); - wprintf("" - "
"); - wprintf(_("User ID number")); - wprintf("" - "
"); - wprintf(_("Date and time of last login")); - wprintf("" - "
"); - wprintf(_("Auto-purge after this many days")); - wprintf("" - "
\n"); - - wprintf("\n" - " " - "\n" - "

\n", _("Save changes"), _("Cancel")); - - wprintf("
\n"); - wprintf("
\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]; + wcsession *WCC = WC; int is_new = 0; + unsigned int flags = 0; + const char *username; - is_new = atoi(bstr("is_new")); + is_new = ibstr("is_new"); + username = bstr("username"); - if (strlen(bstr("ok_button")) == 0) { - safestrncpy(message, _("Changes were not saved."), sizeof message); - } + if (!havebstr("ok_button")) { + StrBufPlain(WCC->ImportantMsg, _("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 (GetServerStatus(Buf, NULL) == 2) { + FlushStrBuf(WCC->ImportantMsg); + StrBufAppendBuf(WCC->ImportantMsg, Buf, 4); + } + else { + 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"), @@ -387,70 +641,158 @@ void edituser(void) { bstr("lastcall"), bstr("purgedays") ); - serv_getln(buf, sizeof buf); - if (buf[0] != '2') { - sprintf(message, - "" - "%s

\n", &buf[4]); - } - else { - safestrncpy(message, "", sizeof message); + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) == 2) { + StrBufAppendBuf(WCC->ImportantMsg, Buf, 4); } + 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); } } - +/* + * burge a user + * username the name of the user to remove + */ void delete_user(char *username) { - char buf[SIZ]; - char message[SIZ]; - + wcsession *WCC = WC; + StrBuf *Buf; + + Buf = NewStrBuf(); serv_printf("ASUP %s|0|0|0|0|0|", username); - serv_getln(buf, sizeof buf); - if (buf[0] != '2') { - sprintf(message, - "" - "%s

\n", &buf[4]); - } - else { - safestrncpy(message, "", sizeof message); - } - select_user_to_edit(message, bstr("username")); + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, NULL) != 2) + StrBufAppendBuf(WCC->ImportantMsg, Buf, 4); + + select_user_to_edit( bstr("username")); + FreeStrBuf(&Buf); } - +/* + * create a new user + * take the web environment username and create it on the citadel server + */ void create_user(void) { - char buf[SIZ]; - char error_message[SIZ]; - char username[SIZ]; - - safestrncpy(username, bstr("username"), sizeof username); + wcsession *WCC = WC; + long FullState; + StrBuf *Buf; + const char *username; + Buf = NewStrBuf(); + username = bstr("username"); serv_printf("CREU %s", username); - serv_getln(buf, sizeof buf); - - if (buf[0] == '2') { - sprintf(WC->ImportantMessage, - _("A new user has been created.")); + StrBuf_ServGetln(Buf); + if (GetServerStatus(Buf, &FullState) == 2) { + sprintf(WC->ImportantMessage, _("A new user has been created.")); display_edituser(username, 1); } + else if (FullState == 570) { + StrBufPlain(WCC->ImportantMsg, + _("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."), + 0); + select_user_to_edit(NULL); + } else { - sprintf(error_message, - "" - "%s

\n", &buf[4]); - select_user_to_edit(error_message, NULL); + StrBufAppendBuf(WCC->ImportantMsg, Buf, 4); + select_user_to_edit(NULL); } + FreeStrBuf(&Buf); +} + +void _select_user_to_edit(void) { + select_user_to_edit(NULL); } + +void _display_edituser(void) { + display_edituser(NULL, 0); +} + + +void +InitModule_USEREDIT +(void) +{ + 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); + + 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); + + RegisterIterator("USERLIST", 0, NULL, iterate_load_userlist, NULL, DeleteHash, CTX_USERLIST, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE); + + + + 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); + +}