* migrated SUBST stuff to hash

[citadel.git] / webcit / sysmsgs.c

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 7de39987929cbaebffca2f30d7e3075c9308f271..e336f0f774327e111a0f164fb6491ed77e7f31bf 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -37,28 +37,26 @@ void display_edit(char *description, char *check_cmd,
                output_headers(1, 1, 0, 0, 0, 0);
        }
 
-       svprintf("BOXTITLE", WCS_STRING, _("Edit %s"), description);
+       svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Edit %s"), description);
        do_template("beginbox");
 
-       wprintf("<div align=\"center\">");
-       wprintf(_("Enter %s below.  Text is formatted to "
-               "the reader's screen width.  To defeat the "
-               "formatting, indent a line at least one space."), description);
-       wprintf("<br />");
+       wprintf(_("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("<TEXTAREA NAME=\"msgtext\" wrap=soft "
-               "ROWS=10 COLS=80 WIDTH=80>\n");
+       wprintf("<form method=\"post\" action=\"%s\">\n", save_cmd);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<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><br /><br />\n");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">", _("Save changes"));
+       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("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br />\n", _("Cancel"));
+       wprintf("</div></form>\n");
 
-       wprintf("</FORM></div>\n");
        do_template("endbox");
        wDumpContent(1);
 }
@@ -74,7 +72,7 @@ void save_edit(char *description, char *enter_cmd, int regoto)
 {
        char buf[SIZ];
 
-       if (strlen(bstr("save_button")) == 0) {
+       if (!havebstr("save_button")) {
                sprintf(WC->ImportantMessage,
                        _("Cancelled.  %s was not saved."),
                        description);