X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsysmsgs.c;h=99f84533ebad507d4b8335a1d21c41ebd43ea5e5;hb=HEAD;hp=6c0ce1d04ae2d7241b135c0859cb2eb234063084;hpb=fd034bea666febed8eff22cf10f2b72b8b009665;p=citadel.git

diff --git a/webcit/sysmsgs.c b/webcit/sysmsgs.c
index 6c0ce1d04..99f84533e 100644
--- a/webcit/sysmsgs.c
+++ b/webcit/sysmsgs.c
@@ -1,78 +1,17 @@
 /*
- * Copyright (c) 1996-2011 by the citadel.org team
+ * 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 as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * 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.
- *
- * 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"
 
-
-/**
- *  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)
-{
-	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);
-	}
-
-	do_template("beginbox_1");
-	StrBufAppendPrintf (WC->WBuf, _("Edit %s"), description);
-	do_template("beginbox_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);
-	serv_getln(buf, sizeof buf);
-	if (buf[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("endbox");
-	wDumpContent(1);
-}
-
-
 /**
  *  save a screen which was displayed with display_edit()
  *  description the window title???
@@ -81,53 +20,59 @@ void display_edit(char *description, char *check_cmd,
  */
 void save_edit(char *description, char *enter_cmd, int regoto)
 {
-	char buf[SIZ];
+	StrBuf *Line;
+	const StrBuf *templ;
 
 	if (!havebstr("save_button")) {
-		sprintf(WC->ImportantMessage,
-			_("Cancelled.  %s was not saved."),
-			description);
+		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;
 	}
+	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 {
-		sprintf(WC->ImportantMessage,
-			_("%s has been saved."),
-			description);
 		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);
 }