* added gcc printf format checking to wprintf

[citadel.git] / webcit / sysmsgs.c

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 9f8800754517f0aabf549ab07ae580cdb4193fce..00abb6cc5eefec13b01e683e6466c579f1093220 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -1,33 +1,21 @@
 /*
  * $Id$
- *
- * Editing of various text files on the Citadel server.
  */
-
-#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>
+/**
+ * \defgroup ShowSysMsgs Editing of various text files on the Citadel server.
+ * \ingroup WebcitDisplayItems
+ */
+/*@{*/
 #include "webcit.h"
 
 
-/*
- * display the form for editing something (room info, bio, etc)
+/**
+ * \brief display the form for editing something (room info, bio, etc)
+ * \param description the descriptive text for the box
+ * \param check_cmd command to check????
+ * \param read_cmd read answer from citadel server???
+ * \param save_cmd save comand to the citadel server??
+ * \param with_room_banner should we bisplay a room banner?
  */
 void display_edit(char *description, char *check_cmd,
                  char *read_cmd, char *save_cmd, int with_room_banner)
@@ -38,72 +26,79 @@ void display_edit(char *description, char *check_cmd,
        serv_getln(buf, sizeof buf);
 
        if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
+               safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
                display_main_menu();
                return;
        }
        if (with_room_banner) {
-               output_headers(1, 1, 1, 0, 0, 0, 0);
+               output_headers(1, 1, 1, 0, 0, 0);
        }
        else {
-               output_headers(1, 1, 0, 0, 0, 0, 0);
+               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("<CENTER>Enter %s below.  Text is formatted to\n", description);
-       wprintf("the <EM>reader's</EM> screen width.  To defeat the\n");
-       wprintf("formatting, indent a line at least one space.  \n");
-       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=\"%d\">\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=\"sc\" VALUE=\"Save\">");
+       wprintf("</textarea><div class=\"buttons\" >\n");
+       wprintf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
        wprintf("&nbsp;");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><br />\n");
+       wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\"><br />\n", _("Cancel"));
+       wprintf("</div></form>\n");
 
-       wprintf("</FORM></CENTER>\n");
        do_template("endbox");
        wDumpContent(1);
 }
 
 
-/*
- * save a screen which was displayed with display_edit()
+/**
+ * \brief save a screen which was displayed with display_edit()
+ * \param description the window title???
+ * \param enter_cmd which command to enter at the citadel server???
+ * \param regoto should we go to that room again after executing that command?
  */
 void save_edit(char *description, char *enter_cmd, int regoto)
 {
        char buf[SIZ];
 
-       if (strcmp(bstr("sc"), "Save")) {
+       if (!havebstr("save_button")) {
                sprintf(WC->ImportantMessage,
-                       "Cancelled.  %s was not saved.\n", description);
+                       _("Cancelled.  %s was not saved."),
+                       description);
                display_main_menu();
                return;
        }
        serv_puts(enter_cmd);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '4') {
-               strcpy(WC->ImportantMessage, &buf[4]);
+               safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
                display_main_menu();
                return;
        }
-       text_to_server(bstr("msgtext"), 0);
+       text_to_server(bstr("msgtext"));
        serv_puts("000");
 
        if (regoto) {
                smart_goto(WC->wc_roomname);
        } else {
                sprintf(WC->ImportantMessage,
-                       "%s has been saved.\n", description);
+                       _("%s has been saved."),
+                       description);
                display_main_menu();
                return;
        }
 }
+
+
+/*@}*/