Performed a bunch of markup fixes suggested by validator.w3.org

[citadel.git] / webcit / sysmsgs.c

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 00b4181d246d12bf97eae784d812da38fb90f1ae..dbe446a3f24df1926da67f829f35fd0d2d8a7dc7 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 #include "webcit.h"
 
 
@@ -32,25 +29,26 @@ 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("beginbox_1", NULL);
+       StrBufAppendPrintf (WC->WBuf, _("Edit %s"), description);
+       do_template("beginbox_2", NULL);
 
-       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')
                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);
        wDumpContent(1);
@@ -85,7 +83,7 @@ void save_edit(char *description, char *enter_cmd, int regoto)
        serv_puts("000");
 
        if (regoto) {
-               smart_goto(WC->wc_roomname);
+               smart_goto(WC->CurRoom.name);
        } else {
                sprintf(WC->ImportantMessage,
                        _("%s has been saved."),
@@ -110,8 +108,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);
 }