*/
-#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"
-
-
-
void select_user_to_edit(char *message, char *preselect)
{
char buf[SIZ];
char username[SIZ];
- output_headers(1, 1, 0, 0, 0, 0, 0); /* No room banner on this screen */
+ 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/usermanag_48x.gif\">"
+ "Edit or delete users"
+ "</span></td></tr></table>\n"
+ "</div>\n<div id=\"content\">\n"
+ );
if (message != NULL) wprintf(message);
wprintf("<TABLE border=0 CELLSPACING=10><TR VALIGN=TOP><TD>\n");
+ svprintf("BOXTITLE", WCS_STRING, "Add users");
+ do_template("beginbox");
+
+ wprintf("To create a new user account, enter the desired "
+ "user name in the box below and click 'Create'.<br /><br />");
+
+ 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");
+
+ do_template("endbox");
+
+ wprintf("</TD><TD>");
+
svprintf("BOXTITLE", WCS_STRING, "Edit or Delete users");
do_template("beginbox");
wprintf("<CENTER>"
"<FORM METHOD=\"POST\" ACTION=\"/display_edituser\">\n");
- wprintf("<SELECT NAME=\"username\" SIZE=10>\n");
+ wprintf("<SELECT NAME=\"username\" SIZE=10 STYLE=\"width:100%%\">\n");
serv_puts("LIST");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '1') {
- while (serv_gets(buf), strcmp(buf, "000")) {
- extract(username, buf, 0);
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ extract_token(username, buf, 0, '|', sizeof username);
wprintf("<OPTION");
if (preselect != NULL)
if (!strcasecmp(username, preselect))
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");
- wprintf("</TD><TD>");
-
- svprintf("BOXTITLE", WCS_STRING, "Add users");
- do_template("beginbox");
-
- wprintf("To create a new user account, enter the desired "
- "user name in the box below and click 'Create'.<br /><br />");
-
- 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");
-
- do_template("endbox");
wprintf("</TD></TR></TABLE>\n");
wDumpContent(1);
TRYAGAIN:
/* Search for the user's vCard */
serv_puts("MSGS ALL");
- serv_gets(buf);
- if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
+ 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;
/* Iterate through the message list looking for vCards */
while (stuff != NULL) {
serv_printf("MSG0 %ld|2", stuff->msgnum);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0]=='1') {
- while(serv_gets(buf), strcmp(buf, "000")) {
+ while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (!strncasecmp(buf, "part=", 5)) {
- extract(partnum, &buf[5], 2);
- extract(content_type, &buf[5], 4);
+ 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 (vcard_msgnum < 0) if (already_tried_creating_one == 0) {
already_tried_creating_one = 1;
serv_puts("ENT0 1|||4");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '4') {
serv_puts("Content-type: text/x-vcard");
serv_puts("");
/* 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);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
serv_printf("CRE8 1|%s|5|||1|", roomname);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
serv_printf("GOTO %s||1", roomname);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
sprintf(error_message,
"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
int i;
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);
}
serv_printf("AGUP %s", username);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
sprintf(error_message,
"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
return;
}
- extract(username, &buf[4], 0);
- extract(password, &buf[4], 1);
+ 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);
return;
}
+ if (!strcmp(bstr("sc"), "Delete user")) {
+ delete_user(username);
+ 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></TD></TR></TABLE>\n");
wprintf("</div>\n<div id=\"content\">\n");
- do_template("beginbox_nt");
+ wprintf("<div id=\"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=\"");
escputs(username);
"<br /><br /></FORM>\n");
wprintf("</CENTER>\n");
- do_template("endbox");
-
+ wprintf("</td></tr></table></div>\n");
wDumpContent(1);
}
is_new = atoi(bstr("is_new"));
if (strcasecmp(bstr("action"), "OK")) {
- strcpy(message, "Edit user cancelled.");
+ safestrncpy(message, "Edit user cancelled.", sizeof message);
}
else {
bstr("lastcall"),
bstr("purgedays")
);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
sprintf(message,
"<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
"%s<br /><br />\n", &buf[4]);
}
else {
- strcpy(message, "");
+ safestrncpy(message, "", sizeof message);
}
}
}
+void delete_user(char *username) {
+ char buf[SIZ];
+ char message[SIZ];
+
+ serv_printf("ASUP %s|0|0|0|0|0|", username);
+ serv_getln(buf, sizeof buf);
+ if (buf[0] != '2') {
+ sprintf(message,
+ "<IMG SRC=\"static/error.gif\" ALIGN=CENTER>"
+ "%s<br /><br />\n", &buf[4]);
+ }
+ else {
+ safestrncpy(message, "", sizeof message);
+ }
+ select_user_to_edit(message, bstr("username"));
+}
+
+
void create_user(void) {
char error_message[SIZ];
char username[SIZ];
- strcpy(username, bstr("username"));
+ safestrncpy(username, bstr("username"), sizeof username);
serv_printf("CREU %s", username);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
/* sprintf(error_message, "<b>User has been created.</b>");
projects / citadel.git / blobdiff