* Replaced serv_gets() with serv_getln() - which now requires the caller

[citadel.git] / webcit / sysmsgs.c

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 7021ad16e84d5e96e213de9f4681dae5798b2c2f..9f8800754517f0aabf549ab07ae580cdb4193fce 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -1,87 +1,109 @@
+/*
+ * $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 <ctype.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>
 #include "webcit.h"
-#include "child.h"
+
 
 /*
  * display the form for editing something (room info, bio, etc)
  */
 void display_edit(char *description, char *check_cmd,
-               char *read_cmd, char *save_cmd) {
-       char buf[256];
+                 char *read_cmd, char *save_cmd, int with_room_banner)
+{
+       char buf[SIZ];
 
        serv_puts(check_cmd);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
 
-       if (buf[0]!='2') {
-               display_error(&buf[4]);
+       if (buf[0] != '2') {
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
-               }
-
-        printf("HTTP/1.0 200 OK\n");
-       output_headers(1, "bottom");
+       }
+       if (with_room_banner) {
+               output_headers(1, 1, 1, 0, 0, 0, 0);
+       }
+       else {
+               output_headers(1, 1, 0, 0, 0, 0, 0);
+       }
 
-        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
-        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-        wprintf("<B>Edit ");
-       escputs(description);
-        wprintf("</B></FONT></TD></TR></TABLE>\n");
+       svprintf("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("<br />");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"%s\">\n", save_cmd);
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save\">");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
-       wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=30 COLS=80 WIDTH=80>");
+       wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft "
+               "ROWS=10 COLS=80 WIDTH=80>\n");
        serv_puts(read_cmd);
-       serv_gets(buf);
-       if (buf[0] == '1') server_to_text();
-       wprintf("</TEXTAREA><P>\n");
+       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("&nbsp;");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><br />\n");
 
        wprintf("</FORM></CENTER>\n");
+       do_template("endbox");
        wDumpContent(1);
-       }
+}
 
 
 /*
  * save a screen which was displayed with display_edit()
  */
-void save_edit(char *description, char *enter_cmd, int regoto) {
-       char buf[256];
+void save_edit(char *description, char *enter_cmd, int regoto)
+{
+       char buf[SIZ];
 
-       if (strcmp(bstr("sc"),"Save")) {
-               printf("HTTP/1.0 200 OK\n");
-               output_headers(1, "bottom");
-               wprintf("Cancelled.  %s was not saved.<BR>\n", description);
-               wDumpContent(1);
+       if (strcmp(bstr("sc"), "Save")) {
+               sprintf(WC->ImportantMessage,
+                       "Cancelled.  %s was not saved.\n", description);
+               display_main_menu();
                return;
-               }
-
+       }
        serv_puts(enter_cmd);
-       serv_gets(buf);
-       if (buf[0]!='4') {
-               display_error(&buf[4]);
+       serv_getln(buf, sizeof buf);
+       if (buf[0] != '4') {
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
-               }
-
-       text_to_server(bstr("msgtext"));
+       }
+       text_to_server(bstr("msgtext"), 0);
        serv_puts("000");
 
        if (regoto) {
-               gotoroom(wc_roomname, 1);
-               }
-       else {
-               printf("HTTP/1.0 200 OK\n");
-               output_headers(1, "bottom");
-               wprintf("%s has been saved.\n", description);
-               wDumpContent(1);
-               }
-       }       
+               smart_goto(WC->wc_roomname);
+       } else {
+               sprintf(WC->ImportantMessage,
+                       "%s has been saved.\n", description);
+               display_main_menu();
+               return;
+       }
+}