X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ffloors.c;h=5d1ba0ce42278554ff4a5029107cd4ea93c3e838;hb=83a596532ec7b9b8da83137ea18425bd525ba9ac;hp=31cd1c8106a46d9231c66180556f751741b5b28e;hpb=8eacce58cbc89e62b60fbdd0d3e1c5238f2bef1a;p=citadel.git

diff --git a/webcit/floors.c b/webcit/floors.c
index 31cd1c810..5d1ba0ce4 100644
--- a/webcit/floors.c
+++ b/webcit/floors.c
@@ -6,25 +6,6 @@
  */
 
 
-#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"
 
@@ -46,7 +27,9 @@ void display_floorconfig(char *prepend_html)
         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>"
+                "<SPAN CLASS=\"titlebar\">");
+	wprintf(_("Add/change/delete floors"));
+	wprintf("</SPAN>"
                 "</TD></TR></TABLE>\n"
                 "</div>\n<div id=\"content\">\n"
         );
@@ -58,40 +41,46 @@ void display_floorconfig(char *prepend_html)
 	}
 
 	serv_printf("LFLR");
-	serv_gets(buf);
+	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("<SPAN CLASS=\"titlebar\">");
+		wprintf(_("Error"));
+		wprintf("</SPAN>\n");
         	wprintf("</TD></TR></TABLE>\n");
         	wprintf("%s<br />\n", &buf[4]);
 		wDumpContent(1);
 		return;
 	}
 
-	wprintf("<center><TABLE BORDER=1 WIDTH=99%% 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")) {
+	wprintf("<div id=\"fix_scrollbar_bug\">"
+		"<TABLE BORDER=1 WIDTH=100%% bgcolor=\"#ffffff\">\n"
+		"<TR><TH>");
+	wprintf(_("Floor number"));
+	wprintf("</TH><TH>");
+	wprintf(_("Floor name"));
+	wprintf("</TH><TH>");
+	wprintf(_("Number of rooms"));
+	wprintf("</TH></TR>\n");
+
+	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);
 		if (refcount == 0) {
 			wprintf("</TD><TD>"
 				"<A HREF=\"/delete_floor?floornum=%d\">"
-				"<FONT SIZE=-1>(delete floor)</A>"
-				"</FONT><br />", floornum
-			);
+				"<FONT SIZE=-1>", floornum);
+			wprintf(_("(delete floor)"));
+			wprintf("</A></FONT><br />");
 		}
 		wprintf("<FONT SIZE=-1>"
 			"<A HREF=\"/display_editfloorpic&"
-			"which_floor=%d\">(edit graphic)</A>",
-			floornum);
-		wprintf("</TD></TR></TABLE>");
+			"which_floor=%d\">", floornum);
+		wprintf(_("(edit graphic)"));
+		wprintf("</A></TD></TR></TABLE>");
 		wprintf("</TD>");
 
 		wprintf("<TD>"
@@ -102,8 +91,8 @@ void display_floorconfig(char *prepend_html)
 			"VALUE=\"%s\" MAXLENGTH=\"250\">\n",
 			floornum, floorname);
 		wprintf("<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
-			"VALUE=\"Change name\">"
-			"</FORM></TD>");
+			"VALUE=\"%s\">"
+			"</FORM></TD>", _("Change name"));
 
 		wprintf("<TD>%d</TD></TR>\n", refcount);
 	}
@@ -113,11 +102,11 @@ void display_floorconfig(char *prepend_html)
 		"<INPUT TYPE=\"text\" NAME=\"floorname\" "
 		"MAXLENGTH=\"250\">\n"
 		"<INPUT TYPE=\"SUBMIT\" NAME=\"sc\" "
-		"VALUE=\"Create new floor\">"
+		"VALUE=\"%s\">"
 		"</FORM></TD>"
-		"<TD>&nbsp;</TD></TR>\n");
+		"<TD>&nbsp;</TD></TR>\n", _("Create new floor"));
 
-	wprintf("</table></center>\n");
+	wprintf("</table></div>\n");
 	wDumpContent(1);
 }
 
@@ -131,10 +120,10 @@ 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, "Floor has been deleted.");
+		sprintf(message, _("Floor has been deleted."));
 	}
 	else {
 		sprintf(message, "%s", &buf[4]);
@@ -152,10 +141,10 @@ void create_floor(void) {
 	strcpy(floorname, bstr("floorname"));
 
 	serv_printf("CFLR %s|1", floorname);
-	serv_gets(buf);
+	serv_getln(buf, sizeof buf);
 
 	if (buf[0] == '2') {
-		sprintf(message, "New floor has been created.");
+		sprintf(message, _("New floor has been created."));
 	} else {
 		sprintf(message, "%s", &buf[4]);
 	}
@@ -174,7 +163,7 @@ 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, "%s", &buf[4]);