removed a bunch of blank comment lines

[citadel.git] / webcit / sysmsgs.c

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 009cd051b7f6e5f7ad8f8a69d4be87d28fb7c320..70a46de99a846efe11543a0b50add0b8e2b64c22 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -1,6 +1,15 @@
 /*
- * $Id$
+ * 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"
 
 
@@ -15,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) {
@@ -32,28 +42,30 @@ void display_edit(char *description, char *check_cmd,
                output_headers(1, 1, 0, 0, 0, 0);
        }
 
-       svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Edit %s"), description);
-       do_template("beginboxx", NULL);
+       do_template("box_begin_1");
+       StrBufAppendPrintf (WC->WBuf, _("Edit %s"), description);
+       do_template("box_begin_2");
 
-       wprintf(_("Enter %s below. Text is formatted to the reader's browser."
+       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);
 
-       wprintf("<form method=\"post\" action=\"%s\">\n", save_cmd);
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-       wprintf("<textarea name=\"msgtext\" wrap=soft "
+       wc_printf("<form method=\"post\" action=\"%s\">\n", save_cmd);
+       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       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();
-       wprintf("</textarea><div class=\"buttons\" >\n");
-       wprintf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
-       wprintf("&nbsp;");
-       wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br />\n", _("Cancel"));
-       wprintf("</div></form>\n");
+       wc_printf("</textarea><div class=\"buttons\" >\n");
+       wc_printf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
+       wc_printf("&nbsp;");
+       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);
 }
 
 
@@ -65,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->wc_roomname);
+               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;
        }
@@ -101,7 +112,7 @@ void editinfo(void) {save_edit(_("Room info"), "EINF 1", 1);}
 void display_editbio(void) {
        char buf[SIZ];
 
-       snprintf(buf, SIZ, "RBIO %s", WC->wc_fullname);
+       snprintf(buf, SIZ, "RBIO %s", ChrPtr(WC->wc_fullname));
        display_edit(_("Your bio"), "NOOP", buf, "editbio", 3);
 }
 void editbio(void) { save_edit(_("Your bio"), "EBIO", 0); }
@@ -110,8 +121,8 @@ void
 InitModule_SYSMSG
 (void)
 {
-       WebcitAddUrlHandler(HKEY("display_editinfo"), display_editinfo, 0);
-       WebcitAddUrlHandler(HKEY("editinfo"), editinfo, 0);
-       WebcitAddUrlHandler(HKEY("display_editbio"), display_editbio, 0);
-       WebcitAddUrlHandler(HKEY("editbio"), editbio, 0);
+       WebcitAddUrlHandler(HKEY("display_editinfo"), "", 0, display_editinfo, 0);
+       WebcitAddUrlHandler(HKEY("editinfo"), "", 0, editinfo, 0);
+       WebcitAddUrlHandler(HKEY("display_editbio"), "", 0, display_editbio, 0);
+       WebcitAddUrlHandler(HKEY("editbio"), "", 0, editbio, 0);
 }