From 7579c34f5f63fe5c7250351a8c4f0afebc3cbafc Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Thu, 29 Sep 2005 04:10:40 +0000
Subject: [PATCH] * sig is done, but need to add proper handling of linebreaks

---
 webcit/ChangeLog     |  4 +++-
 webcit/messages.c    | 29 ++++++++++++++++++++++++++---
 webcit/preferences.c | 39 +++++++++++++++++++++++++++++++--------
 3 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 3c41e7945..451b942ae 100644
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 625.30  2005/09/29 04:10:40  ajc
+* sig is done, but need to add proper handling of linebreaks
+
 Revision 625.29  2005/09/29 02:54:17  ajc
 * Began implementing the "signature" feature.  It doesn't work yet.
 
@@ -3087,4 +3090,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
 	* webserver.c: warning fix
-
diff --git a/webcit/messages.c b/webcit/messages.c
index a87651e0a..f41c12694 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -8,6 +8,7 @@
 #include "webcit.h"
 #include "vcard.h"
 #include "webserver.h"
+#include "groupdav.h"
 
 
 /* Address book entry (keep it short and sweet, it's just a quickie lookup
@@ -2349,10 +2350,12 @@ void post_message(void)
 void display_enter(void)
 {
 	char buf[SIZ];
+	char ebuf[SIZ];
 	long now;
 	struct wc_attachment *att;
 	int recipient_required = 0;
 	int recipient_bad = 0;
+	int i;
 
 	if (strlen(bstr("force_room")) > 0) {
 		gotoroom(bstr("force_room"));
@@ -2517,19 +2520,36 @@ void display_enter(void)
 
 	wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
 
+	/* If we're continuing from a previous edit, put our partially-composed message back... */
 	msgescputs(bstr("msgtext"));
+
+	/* If we're forwarding a message, insert it here... */
 	if (atol(bstr("fwdquote")) > 0L) {
 		wprintf("<br><div align=center><i>");
 		wprintf(_("--- forwarded message ---"));
 		wprintf("</i></div><br>");
 		pullquote_message(atol(bstr("fwdquote")), 1);
 	}
+
+	/* If we're replying quoted, insert the quote here... */
 	else if (atol(bstr("replyquote")) > 0L) {
 		wprintf("<br>"
 			"<blockquote>");
 		pullquote_message(atol(bstr("replyquote")), 0);
 		wprintf("</blockquote>");
 	}
+
+	/* Insert our signature if appropriate... */
+	if ( (WC->is_mailbox) && (strcmp(bstr("sig_inserted"), "yes")) ) {
+		get_preference("use_sig", buf, sizeof buf);
+		if (!strcasecmp(buf, "yes")) {
+			get_preference("signature", ebuf, sizeof ebuf);
+			euid_unescapize(buf, ebuf);
+			wprintf("<br>--<br>");
+			msgescputs(buf);
+		}
+	}
+
 	wprintf("</textarea>");
 	wprintf("</center><br />\n");
 
@@ -2576,6 +2596,11 @@ void display_enter(void)
 	wprintf("\">&nbsp;"
 		"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
 
+	/* Make sure we only insert our signature once */
+	if (strcmp(bstr("sig_inserted"), "yes")) {
+		wprintf("<INPUT TYPE=\"hidden\" NAME=\"sig_inserted\" VALUE=\"yes\">\n");
+	}
+
 	wprintf("</form>\n");
 
 	wprintf("</td></tr></table></div>\n");
@@ -2636,9 +2661,7 @@ void confirm_move_msg(void)
 	wprintf("<br />\n");
 
 	wprintf("<form METHOD=\"POST\" ACTION=\"/move_msg\">\n");
-	wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
-		bstr("msgid"));
-
+	wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
 
 	wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
 	serv_puts("LKRA");
diff --git a/webcit/preferences.c b/webcit/preferences.c
index 342477123..e832a772c 100644
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -7,6 +7,7 @@
 
 #include "webcit.h"
 #include "webserver.h"
+#include "groupdav.h"
 
 
 
@@ -173,6 +174,7 @@ void set_preference(char *key, char *value, int save_to_server) {
 void display_preferences(void)
 {
 	output_headers(1, 1, 2, 0, 0, 0);
+	char ebuf[300];
 	char buf[256];
 
 	wprintf("<div id=\"banner\">\n");
@@ -241,7 +243,7 @@ void display_preferences(void)
 	wprintf("</td></tr>\n");
 
 	/*
-	 * Calendar hour format
+	 * Signature
 	 */
 	get_preference("use_sig", buf, sizeof buf);
 	if (buf[0] == 0) strcpy(buf, "no");
@@ -249,21 +251,34 @@ void display_preferences(void)
 	wprintf(_("Attach signature to email messages?"));
 	wprintf("</td><td>");
 
-	wprintf("<input type=\"radio\" name=\"use_sig\" VALUE=\"no\"");
+	wprintf("	<script type=\"text/javascript\">					"
+		"	function show_or_hide_sigbox() {					"
+		"		if ( $F('yes_sig') ) {						"
+		"			$('signature_box').style.display = 'inline';		"
+		"		}								"
+		"		else {								"
+		"			$('signature_box').style.display = 'none';		"
+		"		}								"
+		"	}									"
+		"	</script>								"
+	);
+
+	wprintf("<input type=\"radio\" id=\"no_sig\" name=\"use_sig\" VALUE=\"no\"");
 	if (!strcasecmp(buf, "no")) wprintf(" checked");
-	wprintf(">");
+	wprintf(" onChange=\"show_or_hide_sigbox();\" >");
 	wprintf(_("No signature"));
 	wprintf("<br></input>\n");
 
-	wprintf("<input type=\"radio\" name=\"use_sig\" VALUE=\"yes\"");
+	wprintf("<input type=\"radio\" id=\"yes_sig\" name=\"use_sig\" VALUE=\"yes\"");
 	if (!strcasecmp(buf, "yes")) wprintf(" checked");
-	wprintf(">");
+	wprintf(" onChange=\"show_or_hide_sigbox();\" >");
 	wprintf(_("Use this signature:"));
 	wprintf("<div id=\"signature_box\">"
 		"<br><textarea name=\"signature\" cols=\"40\" rows=\"5\">"
 	);
-	get_preference("signature", buf, sizeof buf);
-	msgescputs(buf);
+	get_preference("signature", ebuf, sizeof ebuf);
+	euid_unescapize(buf, ebuf);
+	escputs(buf);
 	wprintf("</textarea>"
 		"</div>"
 	);
@@ -272,6 +287,10 @@ void display_preferences(void)
 
 	wprintf("</td></tr>\n");
 
+	wprintf("	<script type=\"text/javascript\">	"
+		"	show_or_hide_sigbox();			"
+		"	</script>				"
+	);
 
 
 	wprintf("</table>\n"
@@ -296,6 +315,8 @@ void display_preferences(void)
  */
 void set_preferences(void)
 {
+	char ebuf[300];
+
 	if (strlen(bstr("change_button")) == 0) {
 		safestrncpy(WC->ImportantMessage, 
 			_("Cancelled.  No settings were changed."),
@@ -310,7 +331,9 @@ void set_preferences(void)
 	set_preference("roomlistview", bstr("roomlistview"), 0);
 	set_preference("calhourformat", bstr("calhourformat"), 0);
 	set_preference("use_sig", bstr("use_sig"), 0);
-	set_preference("signature", bstr("signature"), 1);
+
+	euid_escapize(ebuf, bstr("signature"));
+	set_preference("signature", ebuf, 1);
 
 	display_main_menu();
 }
-- 
2.39.2