From: Art Cancro Date: Tue, 26 Mar 2002 18:23:24 +0000 (+0000) Subject: * Don't display room banner on screens that don't pertain to a particular room X-Git-Tag: v7.86~6455 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=95f29c8f72f0f0dfdd6fc24ef8fc6f6f77c9edf9 * Don't display room banner on screens that don't pertain to a particular room * Initial prep for add/change/delete user accounts screen --- diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 29b6f3734..dfffe296d 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,4 +1,8 @@ $Log$ +Revision 323.16 2002/03/26 18:23:23 ajc +* Don't display room banner on screens that don't pertain to a particular room +* Initial prep for add/change/delete user accounts screen + Revision 323.15 2002/03/22 04:33:08 ajc * "vcard edit" button for _other_ users' My Citadel Config rooms as well @@ -758,3 +762,4 @@ Sun Dec 6 19:50:55 EST 1998 Art Cancro 1998-12-03 Nathan Bryant * webserver.c: warning fix + diff --git a/webcit/Makefile.in b/webcit/Makefile.in index 0fa91a9c2..aef57a3f7 100644 --- a/webcit/Makefile.in +++ b/webcit/Makefile.in @@ -25,11 +25,12 @@ distclean: clean webserver: webserver.o context_loop.o tools.o \ cookie_conversion.o locate_host.o \ webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o \ - roomops.o messages.o userlist.o paging.o sysmsgs.o vcard.o vcard_edit.o \ + roomops.o messages.o userlist.o paging.o sysmsgs.o useredit.o \ + vcard.o vcard_edit.o \ mime_parser.o graphics.o netconf.o siteconfig.o subst.o $(LIBOBJS) $(CC) webserver.o context_loop.o tools.o cookie_conversion.o \ webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o \ - roomops.o messages.o userlist.o paging.o sysmsgs.o \ + roomops.o messages.o userlist.o paging.o sysmsgs.o useredit.o \ locate_host.o siteconfig.o subst.o vcard.o vcard_edit.o \ mime_parser.o graphics.o netconf.o \ $(LIBOBJS) $(LIBS) -o webserver diff --git a/webcit/auth.c b/webcit/auth.c index 495730679..ac7acc8e2 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -194,7 +194,7 @@ void validate(void) char buf[SIZ]; int a; - output_headers(1); + output_headers(3); strcpy(buf, bstr("user")); if (strlen(buf) > 0) @@ -273,7 +273,7 @@ void display_reg(int during_login) char buf[SIZ]; int a; - output_headers(1); + output_headers(3); wprintf("
"); wprintf("
"); wprintf("
"); wprintf("Set/change %s\n", description); @@ -103,7 +103,7 @@ void select_floor_to_edit_pic(void) { int a; - output_headers(1); + output_headers(3); wprintf("
"); wprintf("\n"); if (WC->axlevel >= 6) { + wprintf("
  • \n"); + wprintf("Add, change, delete user accounts\n"); + wprintf("
  • \n"); wprintf("Validate new users\n"); diff --git a/webcit/netconf.c b/webcit/netconf.c index a7ca70a69..c6fa9941f 100644 --- a/webcit/netconf.c +++ b/webcit/netconf.c @@ -76,7 +76,7 @@ void edit_node(void) { void display_add_node(void) { - output_headers(1); + output_headers(3); wprintf("
    "); wprintf("Add new node"); @@ -111,7 +111,7 @@ void display_edit_node(void) strcpy(node, bstr("node")); - output_headers(1); + output_headers(3); wprintf("
    "); wprintf("Edit node configuration for "); @@ -162,7 +162,7 @@ void display_netconf(void) char buf[SIZ]; char node[SIZ]; - output_headers(1); + output_headers(3); wprintf("
    "); wprintf("Network configuration\n"); @@ -204,7 +204,7 @@ void display_confirm_delete_node(void) { char node[SIZ]; - output_headers(1); + output_headers(3); wprintf("
    "); wprintf("Confirm delete\n"); @@ -274,7 +274,7 @@ void add_node(void) serv_puts(buf); serv_gets(buf); if (buf[0] == '1') { - output_headers(1); + output_headers(3); server_to_text(); wprintf("Back to menu\n"); wDumpContent(1); diff --git a/webcit/paging.c b/webcit/paging.c index 9cdb897eb..0a88274b6 100644 --- a/webcit/paging.c +++ b/webcit/paging.c @@ -78,7 +78,7 @@ void page_user(void) char buf[SIZ]; char closewin[SIZ]; - output_headers(1); + output_headers(3); strcpy(recp, bstr("recp")); strcpy(sc, bstr("sc")); diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c index 2ae8a594d..cd56db498 100644 --- a/webcit/siteconfig.c +++ b/webcit/siteconfig.c @@ -34,7 +34,7 @@ void display_siteconfig(void) char buf[SIZ]; int i; - output_headers(1); + output_headers(3); serv_printf("CONF get"); serv_gets(buf); diff --git a/webcit/useredit.c b/webcit/useredit.c new file mode 100644 index 000000000..47ebb6535 --- /dev/null +++ b/webcit/useredit.c @@ -0,0 +1,79 @@ +/* + * Administrative screen to add/change/delete user accounts + * + */ + + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "webcit.h" + + + + + +void select_user_to_edit(void) +{ + char buf[SIZ]; + char username[SIZ]; + + output_headers(3); /* No room banner on this screen */ + + wprintf("
    "); + wprintf("" + "Add/change/delete user accounts" + "
    \n"); + + wprintf("" + "
    To edit an existing user account, select the user " + "name from the list and click 'Edit'.

    "); + + wprintf("
    \n"); + wprintf("
    \n"); + + wprintf(""); + wprintf("
    \n"); + + wprintf("    		" + "To create a new user account, enter the desired " + "user name in the box below and click 'Create'.

    "); + + wprintf("
    \n"); + wprintf("New user: "); + wprintf("
    \n" + "" + "
    \n"); + + wprintf("
    \n"); + + wDumpContent(1); +} + diff --git a/webcit/userlist.c b/webcit/userlist.c index 8fd97db35..aa73fc807 100644 --- a/webcit/userlist.c +++ b/webcit/userlist.c @@ -49,7 +49,7 @@ void userlist(void) strcpy(bptr->name, buf); bio = bptr; } - output_headers(1); + output_headers(3); serv_puts("LIST"); serv_gets(buf); @@ -113,7 +113,7 @@ void showuser(void) char buf[SIZ]; int have_pic; - output_headers(1); + output_headers(3); wprintf("
    "); diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c index 58047f7b8..af5df8bad 100644 --- a/webcit/vcard_edit.c +++ b/webcit/vcard_edit.c @@ -75,7 +75,7 @@ void edit_vcard(void) { inetemail[0] = 0; extrafields[0] = 0; - output_headers(1); + output_headers(3); strcpy(whatuser, ""); sprintf(buf, "MSG0 %s|1", bstr("msgnum") ); diff --git a/webcit/webcit.c b/webcit/webcit.c index c285ab108..f5ed5e0c0 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -1035,6 +1035,8 @@ void session_loop(struct httprequest *req) edit_vcard(); } else if (!strcasecmp(action, "submit_vcard")) { submit_vcard(); + } else if (!strcasecmp(action, "select_user_to_edit")) { + select_user_to_edit(); } else if (!strcasecmp(action, "diagnostics")) { output_headers(1); diff --git a/webcit/webcit.h b/webcit/webcit.h index f7c71210c..19e411f83 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -292,3 +292,4 @@ int pattern2(char *search, char *patn); void edit_vcard(void); void submit_vcard(void); void striplt(char *); +void select_user_to_edit(void);