From e85a46714a5934ad9b3d1d424c045fc7047e3984 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 1 Jan 1999 07:01:48 +0000 Subject: [PATCH] * Added "add/edit room graphic" screens. * Added "add/edit floor graphic" screens. * Fixed display of floor graphic in known rooms list. --- webcit/ChangeLog | 3 +++ webcit/child.h | 9 +++------ webcit/graphics.c | 27 ++++++++++++++++++++++++++- webcit/mainmenu.c | 2 +- webcit/roomops.c | 17 +++++++++++------ webcit/webcit.c | 28 ++++++++++++++++++++++++++++ webcit/webcit.h | 1 + 7 files changed, 73 insertions(+), 14 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index cd1e63303..a37ff7649 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -3,6 +3,9 @@ Thu Dec 31 21:53:20 EST 1998 Art Cancro * "Finished" the MIME parser. * Got image uploads working. * Added "add/edit user photo" screens. + * Added "add/edit room graphic" screens. + * Added "add/edit floor graphic" screens. + * Fixed display of floor graphic in known rooms list. Wed Dec 30 20:36:13 EST 1998 Art Cancro * Wrote mime_parser.c for handling of image uploads. This will also diff --git a/webcit/child.h b/webcit/child.h index 90753141c..ac063593f 100644 --- a/webcit/child.h +++ b/webcit/child.h @@ -72,15 +72,12 @@ void delete_room(void); void validate(void); void mime_parser(char *, int, char *); void handle_multipart(char *, int, char *); -void display_graphics_upload(char *description, char *check_cmd, char *uplurl); +void display_graphics_upload(char *, char *, char *); void do_graphics_upload(char *upl_cmd); void serv_read(char *buf, int bytes); void serv_gets(char *strbuf); void serv_write(char *buf, int nbytes); void serv_puts(char *string); void serv_printf(const char *format, ...); - - - - - +void load_floorlist(void); +void select_floor_to_edit_pic(void); diff --git a/webcit/graphics.c b/webcit/graphics.c index 1844c0581..e08d7150f 100644 --- a/webcit/graphics.c +++ b/webcit/graphics.c @@ -27,8 +27,9 @@ void display_graphics_upload(char *description, char *check_cmd, char *uplurl) { wprintf("\n"); wprintf("
\n"); + + wprintf("
\n", uplurl, bstr("which_room")); wprintf("Please select a file to upload:
\n"); - wprintf("\n", uplurl); wprintf("\n"); wprintf("
"); wprintf("\n"); @@ -82,3 +83,27 @@ void do_graphics_upload(char *upl_cmd) { return; } } + + + +void select_floor_to_edit_pic(void) { + int a; + + printf("HTTP/1.0 200 OK\n"); + output_headers(1); + + wprintf("
"); + wprintf("Select floor to edit label graphic\n"); + wprintf("
\n"); + + load_floorlist(); + for (a=0; a<128; ++a) if (strlen(floorlist[a])>0) { + wprintf("", a); + escputs(floorlist[a]); + wprintf("\n"); + } + + wprintf("\n"); + wDumpContent(); + } diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c index 44ae0cb8f..d9d9d44b2 100644 --- a/webcit/mainmenu.c +++ b/webcit/mainmenu.c @@ -168,7 +168,7 @@ if ((axlevel>=6) || (is_room_aide)) { wprintf("
  • \n"); wprintf("Validate new users\n"); - wprintf("
  • \n"); + wprintf("
  • \n"); wprintf("Set or change a floor label graphic\n"); wprintf("
  • \n"); diff --git a/webcit/roomops.c b/webcit/roomops.c index ab5aa3c9d..5e61dbae6 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -46,7 +46,6 @@ void load_floorlist(void) { } - /* * remove a room from the march list */ @@ -127,11 +126,17 @@ void list_all_rooms_by_floor(void) { /* Floor name column */ wprintf(""); -/* FIX ... don't link to a floor pic that doesn't exist - wprintf("\"%s\"", - &floorlist[a][0]); - */ - escputs(&floorlist[a][0]); + serv_printf("OIMG _floorpic_|%d", a); + serv_gets(buf); + if (buf[0] == '2') { + serv_puts("CLOS"); + serv_gets(buf); + wprintf("\"%s\"", + a, &floorlist[a][0]); + } + else { + escputs(&floorlist[a][0]); + } wprintf(""); diff --git a/webcit/webcit.c b/webcit/webcit.c index 5f6703083..34e97a88a 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -775,6 +775,34 @@ void session_loop(void) { do_graphics_upload("UIMG 1|_userpic_"); } + else if (!strcasecmp(action, "display_editroompic")) { + display_graphics_upload("the graphic for this room", + "UIMG 0|_roompic_", + "/editroompic"); + } + + else if (!strcasecmp(action, "editroompic")) { + do_graphics_upload("UIMG 1|_roompic_"); + } + + else if (!strcasecmp(action, "select_floor_to_edit_pic")) { + select_floor_to_edit_pic(); + } + + else if (!strcasecmp(action, "display_editfloorpic")) { + sprintf(buf, "UIMG 0|_floorpic_|%s", + bstr("which_floor")); + display_graphics_upload("the graphic for this floor", + buf, + "/editfloorpic"); + } + + else if (!strcasecmp(action, "editfloorpic")) { + sprintf(buf, "UIMG 1|_floorpic_|%s", + bstr("which_floor")); + do_graphics_upload(buf); + } + /* When all else fails... */ else { printf("HTTP/1.0 200 OK\n"); diff --git a/webcit/webcit.h b/webcit/webcit.h index 06f18a571..94693ab0e 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -76,3 +76,4 @@ extern long uglsn; extern char *axdefs[]; extern int upload_length; extern char *upload; +extern char floorlist[128][256]; -- 2.30.2