final touches on dkim test harness

[citadel.git] / webcit / sysmsgs.c

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 4e7e343348843a6b0f05122348e0def6d44f0e1c..99f84533ebad507d4b8335a1d21c41ebd43ea5e5 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -3,78 +3,15 @@
  *
  * 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.
- *
- * 
- * 
- * 
  */
 
 #include "webcit.h"
 
-
-/**
- *  display the form for editing something (room info, bio, etc)
- *  description the descriptive text for the box
- *  check_cmd command to check????
- *  read_cmd read answer from citadel server???
- *  save_cmd save comand to the citadel server??
- *  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)
-{
-       StrBuf *Line;
-
-       serv_puts(check_cmd);
-       Line = NewStrBuf();
-       StrBuf_ServGetln(Line);
-       if (GetServerStatusMsg(Line, NULL, 1, 2) != 2) {
-               FreeStrBuf(&Line);
-               display_main_menu();
-               FreeStrBuf(&Line);
-               return;
-       }
-       if (with_room_banner) {
-               output_headers(1, 1, 1, 0, 0, 0);
-       }
-       else {
-               output_headers(1, 1, 0, 0, 0, 0);
-       }
-
-       do_template("box_begin_1");
-       StrBufAppendPrintf (WC->WBuf, _("Edit %s"), description);
-       do_template("box_begin_2");
-
-       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);
-
-       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);
-       StrBuf_ServGetln(Line);
-       if (GetServerStatusMsg(Line, NULL, 0, 0) == 1)
-               server_to_text();
-       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("box_end");
-       wDumpContent(1);
-       FreeStrBuf(&Line);
-}
-
-
 /**
  *  save a screen which was displayed with display_edit()
  *  description the window title???
@@ -84,51 +21,58 @@ void display_edit(char *description, char *check_cmd,
 void save_edit(char *description, char *enter_cmd, int regoto)
 {
        StrBuf *Line;
+       const StrBuf *templ;
 
        if (!havebstr("save_button")) {
                AppendImportantMessage(_("Cancelled.  %s was not saved."), -1);
                display_main_menu();
                return;
        }
+       templ = sbstr("template");
        Line = NewStrBuf();
        serv_puts(enter_cmd);
        StrBuf_ServGetln(Line);
        if (GetServerStatusMsg(Line, NULL, 1, 0) != 4) {
+               putlbstr("success", 0);
                FreeStrBuf(&Line);
-               display_main_menu();
+               if (templ != NULL) {
+                       output_headers(1, 0, 0, 0, 0, 0);       
+                       DoTemplate(SKEY(templ), NULL, &NoCtx);
+                       end_burst();
+               }
+               else {
+                       display_main_menu();
+               }
                return;
        }
        FreeStrBuf(&Line);
        text_to_server(bstr("msgtext"));
        serv_puts("000");
 
-       if (regoto) {
+       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 {
-               AppendImportantMessage(description, -1);
-               AppendImportantMessage(_(" has been saved."), -1);
                display_main_menu();
                return;
        }
 }
 
 
-void display_editinfo(void){ display_edit(_("Room info"), "EINF 0", "RINF", "editinfo", 1);}
 void editinfo(void) {save_edit(_("Room info"), "EINF 1", 1);}
-void display_editbio(void) {
-       char buf[SIZ];
-
-       snprintf(buf, SIZ, "RBIO %s", ChrPtr(WC->wc_fullname));
-       display_edit(_("Your bio"), "NOOP", buf, "editbio", 3);
-}
 void editbio(void) { save_edit(_("Your bio"), "EBIO", 0); }
 
 void 
 InitModule_SYSMSG
 (void)
 {
-       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);
 }