Removed the unused second argument from the do_template() macro

[citadel.git] / webcit / sysmsgs.c

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 009cd051b7f6e5f7ad8f8a69d4be87d28fb7c320..6c0ce1d04ae2d7241b135c0859cb2eb234063084 100644 (file)
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -1,6 +1,21 @@
 /*
- * $Id$
+ * Copyright (c) 1996-2011 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 as
+ * published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+
 #include "webcit.h"
 
 
@@ -32,27 +47,28 @@ void display_edit(char *description, char *check_cmd,
                output_headers(1, 1, 0, 0, 0, 0);
        }
 
-       svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Edit %s"), description);
-       do_template("beginboxx", NULL);
+       do_template("beginbox_1");
+       StrBufAppendPrintf (WC->WBuf, _("Edit %s"), description);
+       do_template("beginbox_2");
 
-       wprintf(_("Enter %s below. Text is formatted to the reader's browser."
+       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);
 
-       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 "
+       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);
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1')
                server_to_text();
-       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("</div></form>\n");
+       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("endbox", NULL);
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -85,7 +101,7 @@ void save_edit(char *description, char *enter_cmd, int regoto)
        serv_puts("000");
 
        if (regoto) {
-               smart_goto(WC->wc_roomname);
+               smart_goto(WC->CurRoom.name);
        } else {
                sprintf(WC->ImportantMessage,
                        _("%s has been saved."),
@@ -101,7 +117,7 @@ void editinfo(void) {save_edit(_("Room info"), "EINF 1", 1);}
 void display_editbio(void) {
        char buf[SIZ];
 
-       snprintf(buf, SIZ, "RBIO %s", WC->wc_fullname);
+       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); }
@@ -110,8 +126,8 @@ void
 InitModule_SYSMSG
 (void)
 {
-       WebcitAddUrlHandler(HKEY("display_editinfo"), display_editinfo, 0);
-       WebcitAddUrlHandler(HKEY("editinfo"), editinfo, 0);
-       WebcitAddUrlHandler(HKEY("display_editbio"), display_editbio, 0);
-       WebcitAddUrlHandler(HKEY("editbio"), editbio, 0);
+       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);
 }