X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ffloors.c;h=b4dceb6a0a2d4cb093908bb081e1d75b1207e913;hb=aa8ca3b0af3efdabd8559b886efb3164319bdce1;hp=37b471594438fa2483bfb39e489a4da94095bc26;hpb=85df07f3bde6b66c24c3197945b0a2da04cce72a;p=citadel.git

diff --git a/webcit/floors.c b/webcit/floors.c
index 37b471594..b4dceb6a0 100644
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -1,28 +1,11 @@
 /*
+ * $Id$
+ *
  * Administrative screens for floor maintenance
  *
  */
 
 
-#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"
 
@@ -41,35 +24,41 @@ void display_floorconfig(char *prepend_html)
 	char floorname[SIZ];
 	int refcount;
 
-	output_headers(3);
-
+        output_headers(1, 1, 2, 0, 0, 0, 0);
+        wprintf("<div id=\"banner\">\n"
+                "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+                "<SPAN CLASS=\"titlebar\">Add/change/delete floors</SPAN>"
+                "</TD></TR></TABLE>\n"
+                "</div>\n<div id=\"content\">\n"
+        );
+                                                                                                                             
 	if (prepend_html != NULL) {
+		wprintf("<br /><b><i>");
 		client_write(prepend_html, strlen(prepend_html));
+		wprintf("</i></b><br /><br />\n");
 	}
 
-	serv_printf("LFLR");	/* FIXME put a real test here */
-	serv_gets(buf);
+	serv_printf("LFLR");
+	serv_getln(buf, sizeof buf);
 	if (buf[0] != '1') {
         	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
         	wprintf("<SPAN CLASS=\"titlebar\">Error</SPAN>\n");
-        	wprintf("</TD></TR></TABLE><BR>\n");
-        	wprintf("%s<BR>\n", &buf[4]);
+        	wprintf("</TD></TR></TABLE>\n");
+        	wprintf("%s<br />\n", &buf[4]);
 		wDumpContent(1);
 		return;
 	}
 
-	svprintf("BOXTITLE", WCS_STRING, "Floor configuration");
-	do_template("beginbox");
-
-	wprintf("<TABLE BORDER=1 WIDTH=100%>\n"
+	wprintf("<div id=\"fix_scrollbar_bug\">"
+		"<TABLE BORDER=1 WIDTH=100%% bgcolor=\"#ffffff\">\n"
 		"<TR><TH>Floor number</TH>"
 		"<TH>Floor name</TH>"
 		"<TH>Number of rooms</TH></TR>\n"
 	);
 
-	while (serv_gets(buf), strcmp(buf, "000")) {
+	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 		floornum = extract_int(buf, 0);
-		extract(floorname, buf, 1);
+		extract_token(floorname, buf, 1, '|', sizeof floorname);
 		refcount = extract_int(buf, 2);
 
 		wprintf("<TR><TD><TABLE border=0><TR><TD>%d", floornum);
@@ -77,7 +66,7 @@ void display_floorconfig(char *prepend_html)
 			wprintf("</TD><TD>"
 				"<A HREF=\"/delete_floor?floornum=%d\">"
 				"<FONT SIZE=-1>(delete floor)</A>"
-				"</FONT><BR>", floornum
+				"</FONT><br />", floornum
 			);
 		}
 		wprintf("<FONT SIZE=-1>"
@@ -110,8 +99,7 @@ void display_floorconfig(char *prepend_html)
 		"</FORM></TD>"
 		"<TD>&nbsp;</TD></TR>\n");
 
-	wprintf("</TABLE>\n");
-	do_template("endbox");
+	wprintf("</table></div>\n");
 	wDumpContent(1);
 }
 
@@ -125,14 +113,13 @@ void delete_floor(void) {
 	floornum = atoi(bstr("floornum"));
 
 	serv_printf("KFLR %d|1", floornum);
-	serv_gets(buf);
+	serv_getln(buf, sizeof buf);
 
 	if (buf[0] == '2') {
-		sprintf(message, "<B><I>Floor has been deleted."
-				"</I></B><BR><BR>\n");
+		sprintf(message, "Floor has been deleted.");
 	}
 	else {
-		sprintf(message, "<B><I>%s</I></B>><BR>", &buf[4]);
+		sprintf(message, "%s", &buf[4]);
 	}
 
 	display_floorconfig(message);
@@ -147,9 +134,13 @@ void create_floor(void) {
 	strcpy(floorname, bstr("floorname"));
 
 	serv_printf("CFLR %s|1", floorname);
-	serv_gets(buf);
+	serv_getln(buf, sizeof buf);
 
-	sprintf(message, "<B><I>%s</I></B>><BR>", &buf[4]);
+	if (buf[0] == '2') {
+		sprintf(message, "New floor has been created.");
+	} else {
+		sprintf(message, "%s", &buf[4]);
+	}
 
 	display_floorconfig(message);
 }
@@ -165,9 +156,9 @@ void rename_floor(void) {
 	strcpy(floorname, bstr("floorname"));
 
 	serv_printf("EFLR %d|%s", floornum, floorname);
-	serv_gets(buf);
+	serv_getln(buf, sizeof buf);
 
-	sprintf(message, "<B><I>%s</I></B>><BR>", &buf[4]);
+	sprintf(message, "%s", &buf[4]);
 
 	display_floorconfig(message);
 }