X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsysmsgs.c;h=70a46de99a846efe11543a0b50add0b8e2b64c22;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=dbe446a3f24df1926da67f829f35fd0d2d8a7dc7;hpb=fcb8c4169baa629eb3c1a4979c7c8c32f1560389;p=citadel.git

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index dbe446a3f..70a46de99 100644
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -1,3 +1,15 @@
+/*
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * This program is open source software.  You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "webcit.h"
 
 
@@ -12,14 +24,15 @@
 void display_edit(char *description, char *check_cmd,
 		  char *read_cmd, char *save_cmd, int with_room_banner)
 {
-	char buf[SIZ];
+	StrBuf *Line;
 
 	serv_puts(check_cmd);
-	serv_getln(buf, sizeof buf);
-
-	if (buf[0] != '2') {
-		safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
+	Line = NewStrBuf();
+	StrBuf_ServGetln(Line);
+	if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
+		FreeStrBuf(&Line);
 		display_main_menu();
+		FreeStrBuf(&Line);
 		return;
 	}
 	if (with_room_banner) {
@@ -29,9 +42,9 @@ void display_edit(char *description, char *check_cmd,
 		output_headers(1, 1, 0, 0, 0, 0);
 	}
 
-	do_template("beginbox_1", NULL);
+	do_template("box_begin_1");
 	StrBufAppendPrintf (WC->WBuf, _("Edit %s"), description);
-	do_template("beginbox_2", NULL);
+	do_template("box_begin_2");
 
 	wc_printf(_("Enter %s below. Text is formatted to the reader's browser."
 		" A newline is forced by preceding the next line by a blank."), description);
@@ -41,8 +54,8 @@ void display_edit(char *description, char *check_cmd,
 	wc_printf("<textarea name=\"msgtext\" wrap=soft "
 		"rows=10 cols=80 width=80>\n");
 	serv_puts(read_cmd);
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '1')
+	StrBuf_ServGetln(Line);
+	if (GetServerStatusMsg(Line, NULL, 0, 0) == 1)
 		server_to_text();
 	wc_printf("</textarea><div class=\"buttons\" >\n");
 	wc_printf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
@@ -50,8 +63,9 @@ void display_edit(char *description, char *check_cmd,
 	wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br>\n", _("Cancel"));
 	wc_printf("</div></form>\n");
 
-	do_template("endbox", NULL);
+	do_template("box_end");
 	wDumpContent(1);
+	FreeStrBuf(&Line);
 }
 
 
@@ -63,31 +77,30 @@ void display_edit(char *description, char *check_cmd,
  */
 void save_edit(char *description, char *enter_cmd, int regoto)
 {
-	char buf[SIZ];
+	StrBuf *Line;
 
 	if (!havebstr("save_button")) {
-		sprintf(WC->ImportantMessage,
-			_("Cancelled.  %s was not saved."),
-			description);
+		AppendImportantMessage(_("Cancelled.  %s was not saved."), -1);
 		display_main_menu();
 		return;
 	}
+	Line = NewStrBuf();
 	serv_puts(enter_cmd);
-	serv_getln(buf, sizeof buf);
-	if (buf[0] != '4') {
-		safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
+	StrBuf_ServGetln(Line);
+	if (GetServerStatusMsg(Line, NULL, 1, 0) != 4) {
+		FreeStrBuf(&Line);
 		display_main_menu();
 		return;
 	}
+	FreeStrBuf(&Line);
 	text_to_server(bstr("msgtext"));
 	serv_puts("000");
 
 	if (regoto) {
 		smart_goto(WC->CurRoom.name);
 	} else {
-		sprintf(WC->ImportantMessage,
-			_("%s has been saved."),
-			description);
+		AppendImportantMessage(description, -1);
+		AppendImportantMessage(_(" has been saved."), -1);
 		display_main_menu();
 		return;
 	}