final touches on dkim test harness

[citadel.git] / webcit / sysmsgs.c

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 664a8b700490cadc5edc5b8e4d8a311e56ecb4ce..99f84533ebad507d4b8335a1d21c41ebd43ea5e5 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -1,105 +1,78 @@
 /*
- * $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.
  */
-/**
- * \defgroup ShowSysMsgs Editing of various text files on the Citadel server.
- */
-/*@{*/
-#include "webcit.h"
-
-
-/**
- * \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)
-{
-       char buf[SIZ];
-
-       serv_puts(check_cmd);
-       serv_getln(buf, sizeof buf);
-
-       if (buf[0] != '2') {
-               safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
-               display_main_menu();
-               return;
-       }
-       if (with_room_banner) {
-               output_headers(1, 1, 1, 0, 0, 0);
-       }
-       else {
-               output_headers(1, 1, 0, 0, 0, 0);
-       }
-
-       svprintf("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("<FORM METHOD=\"POST\" action=\"%s\">\n", save_cmd);
-       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("&nbsp;");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\"><br />\n", _("Cancel"));
-
-       wprintf("</FORM></div>\n");
-       do_template("endbox");
-       wDumpContent(1);
-}
 
+#include "webcit.h"
 
 /**
- * \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?
+ *  save a screen which was displayed with display_edit()
+ *  description the window title???
+ *  enter_cmd which command to enter at the citadel server???
+ *  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];
+       StrBuf *Line;
+       const StrBuf *templ;
 
-       if (strlen(bstr("save_button")) == 0) {
-               sprintf(WC->ImportantMessage,
-                       _("Cancelled.  %s was not saved."),
-                       description);
+       if (!havebstr("save_button")) {
+               AppendImportantMessage(_("Cancelled.  %s was not saved."), -1);
                display_main_menu();
                return;
        }
+       templ = sbstr("template");
+       Line = NewStrBuf();
        serv_puts(enter_cmd);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '4') {
-               safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
-               display_main_menu();
+       StrBuf_ServGetln(Line);
+       if (GetServerStatusMsg(Line, NULL, 1, 0) != 4) {
+               putlbstr("success", 0);
+               FreeStrBuf(&Line);
+               if (templ != NULL) {
+                       output_headers(1, 0, 0, 0, 0, 0);       
+                       DoTemplate(SKEY(templ), NULL, &NoCtx);
+                       end_burst();
+               }
+               else {
+                       display_main_menu();
+               }
                return;
        }
-       text_to_server(bstr("msgtext"), 0);
+       FreeStrBuf(&Line);
+       text_to_server(bstr("msgtext"));
        serv_puts("000");
 
-       if (regoto) {
-               smart_goto(WC->wc_roomname);
+       AppendImportantMessage(description, -1);
+       AppendImportantMessage(_(" has been saved."), -1);
+       putlbstr("success", 1);
+       if (templ != NULL) {
+               output_headers(1, 0, 0, 0, 0, 0);       
+               DoTemplate(SKEY(templ), NULL, &NoCtx);
+               end_burst();
+       }
+       else if (regoto) {
+               smart_goto(WC->CurRoom.name);
        } else {
-               sprintf(WC->ImportantMessage,
-                       _("%s has been saved."),
-                       description);
                display_main_menu();
                return;
        }
 }
 
 
-/*@}*/
+void editinfo(void) {save_edit(_("Room info"), "EINF 1", 1);}
+void editbio(void) { save_edit(_("Your bio"), "EBIO", 0); }
+
+void 
+InitModule_SYSMSG
+(void)
+{
+       WebcitAddUrlHandler(HKEY("editinfo"), "", 0, editinfo, 0);
+       WebcitAddUrlHandler(HKEY("editbio"), "", 0, editbio, 0);
+}