X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsieve.c;h=ae08f608a21e5b059506877ac65cd975c2d2d4cd;hb=f5c1330914acc193f96892efc191a32ee537dfb5;hp=944057eac784622d01443050dc263dbaeea6b84c;hpb=75b650b277116624d37e059a9adf16930424c645;p=citadel.git

diff --git a/webcit/sieve.c b/webcit/sieve.c
index 944057eac..ae08f608a 100644
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -1,29 +1,54 @@
-/* 
- * $Id: $
- */
-/**
- * \defgroup Sieve view/edit sieve config
- * \ingroup WebcitDisplayItems
- */
-/*@{*/
 #include "webcit.h"
 
 #define MAX_SCRIPTS	100
-#define MAX_RULES	25
+#define MAX_RULES	50
 #define RULES_SCRIPT	"__WebCit_Generated_Script__"
 
-/**
- * \brief view/edit sieve config
+
+/*
+ * dummy panel indicating to the user that the server doesn't support Sieve
+ */
+void display_no_sieve(void) {
+
+	output_headers(1, 1, 2, 0, 0, 0);
+
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<img src=\"static/advanpage2_48x.gif\">");
+	wc_printf("<h1>");
+	wc_printf(_("View/edit server-side mail filters"));
+	wc_printf("</h1>\n");
+	wc_printf("</div>\n");
+
+	wc_printf("<div id=\"content\" class=\"service\">\n");
+
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"sieve_background\">"
+		"<tr><td valign=top>\n");
+
+	wc_printf(_("This installation of Citadel was built without support for server-side mail filtering."
+		"<br>Please contact your system administrator if you require this feature.<br>"));
+
+	wc_printf("</td></tr></table></div>\n");
+	wDumpContent(1);
+}
+
+
+/*
+ * view/edit sieve config
  */
 void display_sieve(void)
 {
 	char script_names[MAX_SCRIPTS][64];
 	int num_scripts = 0;
 	int active_script = (-1);
-	char buf[256];
+	char buf[SIZ];		/* Don't make this buffer smaller or it will restrict line length */
 	int i;
 	int rules_script_is_active = 0;
-	
+
+	if (!WC->serv_info->serv_supports_sieve) {
+		display_no_sieve();
+		return;
+	}
 
 	memset(script_names, 0, sizeof script_names);
 
@@ -44,7 +69,7 @@ void display_sieve(void)
 
 	output_headers(1, 1, 2, 0, 0, 0);
 
-	wprintf("<script type=\"text/javascript\">					\n"
+	wc_printf("<script type=\"text/javascript\">					\n"
 		"									\n"
 		"var previously_active_script;						\n"
 		"									\n"
@@ -72,116 +97,117 @@ void display_sieve(void)
 		"</script>								\n"
 	);
 
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-	wprintf("<SPAN CLASS=\"titlebar\">"
-		"<img src=\"static/advanpage2_48x.gif\">");
-	wprintf(_("View/edit server-side mail filters"));
-	wprintf("</SPAN>\n");
-	wprintf("</TD></TR></TABLE>\n");
-	wprintf("</div>\n<div id=\"content\">\n");
-
-	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table border=0 width=100%% bgcolor=\"#FFFFFF\">"
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<img src=\"static/advanpage2_48x.gif\">");
+	wc_printf("<h1>");
+	wc_printf(_("View/edit server-side mail filters"));
+	wc_printf("</h1>\n");
+	wc_printf("</div>\n");
+
+	wc_printf("<div id=\"content\" class=\"service\">\n");
+
+	wc_printf("<div class=\"fix_scrollbar_bug\">"
+		"<table class=\"sieve_background\">"
 		"<tr><td valign=top>\n");
 
 
-	wprintf("<form id=\"sieveform\" method=\"post\" action=\"save_sieve\">\n");
+	wc_printf("<form id=\"sieveform\" method=\"post\" action=\"save_sieve\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-	wprintf(_("When new mail arrives: "));
-        wprintf("<select name=\"bigaction\" size=1 onChange=\"ToggleSievePanels();\">\n");
+	wc_printf(_("When new mail arrives: "));
+        wc_printf("<select name=\"bigaction\" size=1 onChange=\"ToggleSievePanels();\">\n");
 
-	wprintf("<option %s value=\"0\">", ((active_script < 0) ? "selected" : ""));
-	wprintf(_("Leave it in my inbox without filtering"));
-	wprintf("</option>\n");
+	wc_printf("<option %s value=\"0\">", ((active_script < 0) ? "selected" : ""));
+	wc_printf(_("Leave it in my inbox without filtering"));
+	wc_printf("</option>\n");
 
-	wprintf("<option %s value=\"1\">", ((rules_script_is_active) ? "selected" : ""));
-	wprintf(_("Filter it according to rules selected below"));
-	wprintf("</option>\n");
+	wc_printf("<option %s value=\"1\">", ((rules_script_is_active) ? "selected" : ""));
+	wc_printf(_("Filter it according to rules selected below"));
+	wc_printf("</option>\n");
 
-	wprintf("<option %s value=\"2\">",
+	wc_printf("<option %s value=\"2\">",
 			(((active_script >= 0) && (!rules_script_is_active)) ? "selected" : ""));
-	wprintf(_("Filter it through a manually edited script (advanced users only)"));
-	wprintf("</option>\n");
+	wc_printf(_("Filter it through a manually edited script (advanced users only)"));
+	wc_printf("</option>\n");
 
-	wprintf("</select>");
+	wc_printf("</select>");
 
 
 
 	/* The "no filtering" div */
 
-	wprintf("<div id=\"sievediv0\" style=\"display:none\">\n");
-	wprintf("<div align=\"center\"><br /><br />");
-	wprintf(_("Your incoming mail will not be filtered through any scripts."));
-	wprintf("<br /><br /></div>\n");
-	wprintf("</div>\n");
+	wc_printf("<div id=\"sievediv0\" style=\"display:none\">\n");
+	wc_printf("<div align=\"center\"><br /><br />");
+	wc_printf(_("Your incoming mail will not be filtered through any scripts."));
+	wc_printf("<br /><br /></div>\n");
+	wc_printf("</div>\n");
 
 	/* The "webcit managed scripts" div */
 
-	wprintf("<div id=\"sievediv1\" style=\"display:none\">\n");
+	wc_printf("<div id=\"sievediv1\" style=\"display:none\">\n");
 	display_rules_editor_inner_div();
-	wprintf("</div>\n");
+	wc_printf("</div>\n");
 
 	/* The "I'm smart and can write my own Sieve scripts" div */
 
-	wprintf("<div id=\"sievediv2\" style=\"display:none\">\n");
+	wc_printf("<div id=\"sievediv2\" style=\"display:none\">\n");
 
 	if (num_scripts > 0) {
-		wprintf(_("The currently active script is: "));
-        	wprintf("<select name=\"active_script\" size=1 onChange=\"ToggleScriptPanels();\">\n");
+		wc_printf(_("The currently active script is: "));
+        	wc_printf("<select name=\"active_script\" size=1 onChange=\"ToggleScriptPanels();\">\n");
 		for (i=0; i<num_scripts; ++i) {
 			if (strcasecmp(script_names[i], RULES_SCRIPT)) {
-				wprintf("<option %s value=\"%s\">%s</option>\n",
+				wc_printf("<option %s value=\"%s\">%s</option>\n",
 					((active_script == i) ? "selected" : ""),
 					script_names[i],
 					script_names[i]
 				);
 			}
 		}
-		wprintf("</select>\n");
+		wc_printf("</select>\n");
 	}
 
-	wprintf("&nbsp;&nbsp;&nbsp;");
-	wprintf("<a href=\"display_add_remove_scripts\">%s</a>\n", _("Add or delete scripts"));
+	wc_printf("&nbsp;&nbsp;&nbsp;");
+	wc_printf("<a href=\"display_add_remove_scripts\">%s</a>\n", _("Add or delete scripts"));
 
-	wprintf("<br />\n");
+	wc_printf("<br />\n");
 
 	if (num_scripts > 0) {
 		for (i=0; i<num_scripts; ++i) {
 			if (strcasecmp(script_names[i], RULES_SCRIPT)) {
-				wprintf("<div id=\"script_%s\" style=\"display:none\">\n", script_names[i]);
-				wprintf("<textarea name=\"text_%s\" wrap=soft rows=20 cols=80 width=80>\n",
+				wc_printf("<div id=\"script_%s\" style=\"display:none\">\n", script_names[i]);
+				wc_printf("<textarea name=\"text_%s\" wrap=soft rows=20 cols=80 width=80>\n",
 					script_names[i]);
 				serv_printf("MSIV getscript|%s", script_names[i]);
 				serv_getln(buf, sizeof buf);
 				if (buf[0] == '1') while(serv_getln(buf, sizeof (buf)), strcmp(buf, "000")) {
-					wprintf("%s\n", buf);
+					wc_printf("%s\n", buf);
 				}
-				wprintf("</textarea>\n");
-				wprintf("</div>\n");
+				wc_printf("</textarea>\n");
+				wc_printf("</div>\n");
 			}
 		}
 	}
 
-	wprintf("<script type=\"text/javascript\">	\n"
+	wc_printf("<script type=\"text/javascript\">	\n"
 		"ToggleScriptPanels();			\n"
 		"</script>				\n"
 	);
 
-	wprintf("</div>\n");
+	wc_printf("</div>\n");
 
 
 	/* The rest of this is common for all panels... */
 
-	wprintf("<div align=\"center\"><br>");
-	wprintf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
-	wprintf("&nbsp;");
-	wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
-	wprintf("</div></form>\n");
+	wc_printf("<div align=\"center\"><br>");
+	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\">\n", _("Cancel"));
+	wc_printf("</div></form>\n");
 
-	wprintf("</td></tr></table></div>\n");
+	wc_printf("</td></tr></table></div>\n");
 
-	wprintf("<script type=\"text/javascript\">	\n"
+	wc_printf("<script type=\"text/javascript\">	\n"
 		"ToggleSievePanels();			\n"
 		"</script>				\n"
 	);
@@ -192,14 +218,15 @@ void display_sieve(void)
 
 
 
-/**
- * \brief	Helper function for output_sieve_rule() to output strings with quotes escaped
+/*
+ * Helper function for output_sieve_rule() to output strings with quotes escaped
  */
 void osr_sanitize(char *str) {
-	int i;
+	int i, len;
 
 	if (str == NULL) return;
-	for (i=0; i<strlen(str); ++i) {
+	len = strlen(str);
+	for (i=0; i<len; ++i) {
 		if (str[i]=='\"') {
 			str[i] = '\'' ;
 		}
@@ -210,21 +237,155 @@ void osr_sanitize(char *str) {
 }
 
 
-/**
- * \brief	Output parseable Sieve script code based on rules input
+/*
+ * Output parseable Sieve script code based on rules input
  */
 void output_sieve_rule(char *hfield, char *compare, char *htext, char *sizecomp, int sizeval,
-			char *action, char *fileinto, char *redirect, char *automsg, char *final)
+			char *action, char *fileinto, char *redirect, char *automsg, char *final,
+			char *my_addresses)
 {
+	char *comp1 = "";
+	char *comp2 = "";
 
 	osr_sanitize(htext);
 	osr_sanitize(fileinto);
 	osr_sanitize(redirect);
 	osr_sanitize(automsg);
 
-	/* FIXME ... do conditional */
+	/* Prepare negation and match operators that will be used iff we apply a conditional */
+
+	if (!strcasecmp(compare, "contains")) {
+		comp1 = "";
+		comp2 = ":contains";
+	}
+	else if (!strcasecmp(compare, "notcontains")) {
+		comp1 = "not";
+		comp2 = ":contains";
+	}
+	else if (!strcasecmp(compare, "is")) {
+		comp1 = "";
+		comp2 = ":is";
+	}
+	else if (!strcasecmp(compare, "isnot")) {
+		comp1 = "not";
+		comp2 = ":is";
+	}
+	else if (!strcasecmp(compare, "matches")) {
+		comp1 = "";
+		comp2 = ":matches";
+	}
+	else if (!strcasecmp(compare, "notmatches")) {
+		comp1 = "not";
+		comp2 = ":matches";
+	}
+
+	/* Now do the conditional */
+
+	if (!strcasecmp(hfield, "from")) {
+		serv_printf("if%s header %s \"From\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "tocc")) {
+		serv_printf("if%s header %s [\"To\", \"Cc\"] \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "subject")) {
+		serv_printf("if%s header %s \"Subject\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "replyto")) {
+		serv_printf("if%s header %s \"Reply-to\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "sender")) {
+		serv_printf("if%s header %s \"Sender\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "resentfrom")) {
+		serv_printf("if%s header %s \"Resent-from\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "resentto")) {
+		serv_printf("if%s header %s \"Resent-to\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "xmailer")) {
+		serv_printf("if%s header %s \"X-Mailer\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "xspamflag")) {
+		serv_printf("if%s header %s \"X-Spam-Flag\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "xspamstatus")) {
+		serv_printf("if%s header %s \"X-Spam-Status\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "listid")) {
+		serv_printf("if%s header %s \"List-ID\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "envfrom")) {
+		serv_printf("if%s envelope %s \"From\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "envto")) {
+		serv_printf("if%s envelope %s \"To\" \"%s\"",
+			comp1, comp2,
+			htext
+		);
+	}
+
+	else if (!strcasecmp(hfield, "size")) {
+		if (!strcasecmp(sizecomp, "larger")) {
+			serv_printf("if size :over %d", sizeval);
+		}
+		else if (!strcasecmp(sizecomp, "smaller")) {
+			serv_printf("if size :under %d", sizeval);
+		}
+		else {	/* failsafe - should never get here, but just in case... */
+			serv_printf("if size :over 1");
+		}
+	}
 
 	/* Open braces if we're in a conditional loop */
+
 	if (strcasecmp(hfield, "all")) {
 		serv_printf("{");
 	}
@@ -233,34 +394,34 @@ void output_sieve_rule(char *hfield, char *compare, char *htext, char *sizecomp,
 	/* Do action */
 
 	if (!strcasecmp(action, "keep")) {
-		serv_printf("	keep;");
+		serv_printf("keep;");
 	}
 
 	else if (!strcasecmp(action, "discard")) {
-		serv_printf("	discard;");
+		serv_printf("discard;");
 	}
 
 	else if (!strcasecmp(action, "reject")) {
-		serv_printf("	reject \"%s\";", automsg);
+		serv_printf("reject \"%s\";", automsg);
 	}
 
 	else if (!strcasecmp(action, "fileinto")) {
-		serv_printf("	fileinto \"%s\";", fileinto);
+		serv_printf("fileinto \"%s\";", fileinto);
 	}
 
 	else if (!strcasecmp(action, "redirect")) {
-		serv_printf("	redirect \"%s\";", redirect);
+		serv_printf("redirect \"%s\";", redirect);
 	}
 
 	else if (!strcasecmp(action, "vacation")) {
-		serv_printf("	vacation \"%s\";", automsg);
+		serv_printf("vacation :addresses [%s]\n\"%s\";", my_addresses, automsg);
 	}
 
 
 	/* Do 'final' action */
 
 	if (!strcasecmp(final, "stop")) {
-		serv_printf("	stop;");
+		serv_printf("stop;");
 	}
 
 
@@ -276,8 +437,8 @@ void output_sieve_rule(char *hfield, char *compare, char *htext, char *sizecomp,
 
 
 
-/**
- * \brief Translate the fields from the rule editor into something we can save...
+/*
+ * Translate the fields from the rule editor into something we can save...
  */
 void parse_fields_from_rule_editor(void) {
 
@@ -292,13 +453,27 @@ void parse_fields_from_rule_editor(void) {
 	char redirect[256];
 	char automsg[1024];
 	char final[32];
-
 	int i;
 	char buf[256];
 	char fname[256];
 	char rule[2048];
 	char encoded_rule[4096];
+	char my_addresses[4096];
+	
+	/* Enumerate my email addresses in case they are needed for a vacation rule */
+	my_addresses[0] = 0;
+	serv_puts("GVEA");
+	serv_getln(buf, sizeof buf);
+	if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+		if (!IsEmptyStr(my_addresses)) {
+			strcat(my_addresses, ",\n");
+		}
+		strcat(my_addresses, "\"");
+		strcat(my_addresses, buf);
+		strcat(my_addresses, "\"");
+	}
 
+	/* Now generate the script and write it to the Citadel server */
 	serv_printf("MSIV putscript|%s|", RULES_SCRIPT);
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '4') {
@@ -324,39 +499,39 @@ void parse_fields_from_rule_editor(void) {
 		strcpy(rule, "");
 
 		sprintf(fname, "active%d", i);
-		active = !strcasecmp(bstr(fname), "on") ;
+		active = !strcasecmp(BSTR(fname), "on") ;
 
 		if (active) {
 
 			sprintf(fname, "hfield%d", i);
-			safestrncpy(hfield, bstr(fname), sizeof hfield);
+			safestrncpy(hfield, BSTR(fname), sizeof hfield);
 	
 			sprintf(fname, "compare%d", i);
-			safestrncpy(compare, bstr(fname), sizeof compare);
+			safestrncpy(compare, BSTR(fname), sizeof compare);
 	
 			sprintf(fname, "htext%d", i);
-			safestrncpy(htext, bstr(fname), sizeof htext);
+			safestrncpy(htext, BSTR(fname), sizeof htext);
 	
 			sprintf(fname, "sizecomp%d", i);
-			safestrncpy(sizecomp, bstr(fname), sizeof sizecomp);
+			safestrncpy(sizecomp, BSTR(fname), sizeof sizecomp);
 	
 			sprintf(fname, "sizeval%d", i);
-			sizeval = atoi(bstr(fname));
+			sizeval = IBSTR(fname);
 	
 			sprintf(fname, "action%d", i);
-			safestrncpy(action, bstr(fname), sizeof action);
+			safestrncpy(action, BSTR(fname), sizeof action);
 	
 			sprintf(fname, "fileinto%d", i);
-			safestrncpy(fileinto, bstr(fname), sizeof fileinto);
+			safestrncpy(fileinto, BSTR(fname), sizeof fileinto);
 	
 			sprintf(fname, "redirect%d", i);
-			safestrncpy(redirect, bstr(fname), sizeof redirect);
+			safestrncpy(redirect, BSTR(fname), sizeof redirect);
 	
 			sprintf(fname, "automsg%d", i);
-			safestrncpy(automsg, bstr(fname), sizeof automsg);
+			safestrncpy(automsg, BSTR(fname), sizeof automsg);
 	
 			sprintf(fname, "final%d", i);
-			safestrncpy(final, bstr(fname), sizeof final);
+			safestrncpy(final, BSTR(fname), sizeof final);
 	
 			snprintf(rule, sizeof rule, "%d|%s|%s|%s|%s|%d|%s|%s|%s|%s|%s",
 				active, hfield, compare, htext, sizecomp, sizeval, action, fileinto,
@@ -366,8 +541,8 @@ void parse_fields_from_rule_editor(void) {
 			CtdlEncodeBase64(encoded_rule, rule, strlen(rule)+1, 0);
 			serv_printf("# WEBCIT_RULE|%d|%s|", i, encoded_rule);
 			output_sieve_rule(hfield, compare, htext, sizecomp, sizeval,
-					action, fileinto, redirect, automsg, final);
-			serv_printf("");
+					action, fileinto, redirect, automsg, final, my_addresses);
+			serv_puts("");
 		}
 
 
@@ -375,13 +550,12 @@ void parse_fields_from_rule_editor(void) {
 
 	serv_puts("stop;");
 	serv_puts("000");
-
 }
 
 
 
-/**
- * \brief save sieve config
+/*
+ * save sieve config
  */
 void save_sieve(void) {
 	int bigaction;
@@ -392,7 +566,7 @@ void save_sieve(void) {
 	char this_name[64];
 	char buf[256];
 
-	if (strlen(bstr("save_button")) == 0) {
+	if (!havebstr("save_button")) {
 		strcpy(WC->ImportantMessage,
 			_("Cancelled.  Changes were not saved."));
 		display_main_menu();
@@ -413,7 +587,7 @@ void save_sieve(void) {
 		}
 	}
 
-	bigaction = atoi(bstr("bigaction"));
+	bigaction = ibstr("bigaction");
 
 	if (bigaction == 0) {
 		serv_puts("MSIV setactive||");
@@ -442,9 +616,9 @@ void save_sieve(void) {
 				serv_getln(buf, sizeof buf);
 				if (buf[0] == '4') {
 					snprintf(this_name, sizeof this_name, "text_%s", script_names[i]);
-					striplt(bstr(this_name));
-					serv_printf("%s", bstr(this_name));
-					serv_puts("000");
+					striplt((char *)BSTR(this_name)); /* TODO: get rid of typecast*/
+					serv_write(BSTR(this_name), strlen(BSTR(this_name)));
+					serv_puts("\n000");
 				}
 			}
 		}
@@ -456,8 +630,8 @@ void save_sieve(void) {
 }
 
 
-/**
- * \brief show a list of available scripts to add/remove them
+/*
+ * show a list of available scripts to add/remove them
  */
 void display_add_remove_scripts(char *message)
 {
@@ -465,54 +639,59 @@ void display_add_remove_scripts(char *message)
 	char script_name[256];
 
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<table width=100%% border=0 bgcolor=#444455><tr>"
-		"<td>"
-		"<span class=\"titlebar\">"
-		"<img src=\"static/advanpage2_48x.gif\">");
-	wprintf(_("Add or delete scripts"));
-	wprintf("</span></td></tr></table>\n"
-		"</div>\n<div id=\"content\">\n"
-	);
+	wc_printf("<div id=\"banner\">\n");
+	wc_printf("<img src=\"static/advanpage2_48x.gif\">");
+	wc_printf(_("Add or delete scripts"));
+	wc_printf("</h1>\n");
+	wc_printf("</div>\n");
+	
+	wc_printf("<div id=\"content\" class=\"service\">\n");
 
-	if (message != NULL) wprintf(message);
+	if (message != NULL) {
+		wc_printf("%s", message);
+	}
 
-	wprintf("<table border=0 cellspacing=10><tr valign=top><td>\n");
+	wc_printf("<table border=0 cellspacing=10><tr valign=top><td>\n");
 
-	svprintf("BOXTITLE", WCS_STRING, _("Add a new script"));
-	do_template("beginbox");
+	do_template("beginbox_1", NULL);
+	StrBufAppendBufPlain(WC->WBuf, _("Add a new script"), -1, 0);
+	do_template("beginbox_2", NULL);
 
-	wprintf(_("To create a new script, enter the desired "
+	wc_printf(_("To create a new script, enter the desired "
 		"script name in the box below and click 'Create'."));
-	wprintf("<br /><br />");
+	wc_printf("<br /><br />");
 
-        wprintf("<center><form method=\"POST\" action=\"create_script\">\n");
-        wprintf(_("Script name: "));
-        wprintf("<input type=\"text\" name=\"script_name\"><br />\n"
+        wc_printf("<center><form method=\"POST\" action=\"create_script\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+        wc_printf(_("Script name: "));
+        wc_printf("<input type=\"text\" name=\"script_name\"><br />\n"
         	"<input type=\"submit\" name=\"create_button\" value=\"%s\">"
 		"</form></center>\n", _("Create"));
 
-	do_template("endbox");
+	do_template("endbox", NULL);
 
-	svprintf("BOXTITLE", WCS_STRING, _("Edit scripts"));
-	do_template("beginbox");
-	wprintf("<br /><div align=center><a href=\"display_sieve\">%s</a><br /><br />\n",
+	do_template("beginbox_1", NULL);
+	StrBufAppendBufPlain(WC->WBuf, _("Edit scripts"), -1, 0);
+	do_template("beginbox_2", NULL);
+	wc_printf("<br /><div align=center><a href=\"display_sieve\">%s</a><br /><br />\n",
 		_("Return to the script editing screen")
 	);
-	do_template("endbox");
+	do_template("endbox", NULL);
 
-	wprintf("</td><td>");
+	wc_printf("</td><td>");
 
-	svprintf("BOXTITLE", WCS_STRING, _("Delete scripts"));
-	do_template("beginbox");
+	do_template("beginbox_1", NULL);
+	StrBufAppendBufPlain(WC->WBuf, _("Delete scripts"), -1, 0);
+	do_template("beginbox_2", NULL);
 
-	wprintf(_("To delete an existing script, select the script "
+	wc_printf(_("To delete an existing script, select the script "
 		"name from the list and click 'Delete'."));
-	wprintf("<br /><br />");
+	wc_printf("<br /><br />");
 	
-        wprintf("<center>"
+        wc_printf("<center>"
 		"<form method=\"POST\" action=\"delete_script\">\n");
-        wprintf("<select name=\"script_name\" size=10 style=\"width:100%%\">\n");
+	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+        wc_printf("<select name=\"script_name\" size=10 style=\"width:100%%\">\n");
 
         serv_puts("MSIV listscripts");
         serv_getln(buf, sizeof buf);
@@ -520,28 +699,28 @@ void display_add_remove_scripts(char *message)
                 while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                         extract_token(script_name, buf, 0, '|', sizeof script_name);
 			if ( (extract_int(buf, 1) == 0) && (strcasecmp(script_name, RULES_SCRIPT)) ) {
-                        	wprintf("<option>");
+                        	wc_printf("<option>");
                         	escputs(script_name);
-                        	wprintf("</option>\n");
+                        	wc_printf("</option>\n");
 			}
                 }
         }
-        wprintf("</select><br />\n");
+        wc_printf("</select><br />\n");
 
-        wprintf("<input type=\"submit\" name=\"delete_button\" value=\"%s\" "
+        wc_printf("<input type=\"submit\" name=\"delete_button\" value=\"%s\" "
 		"onClick=\"return confirm('%s');\">", _("Delete script"), _("Delete this script?"));
-        wprintf("</form></center>\n");
-	do_template("endbox");
+        wc_printf("</form></center>\n");
+	do_template("endbox", NULL);
 
-	wprintf("</td></tr></table>\n");
+	wc_printf("</td></tr></table>\n");
 
 	wDumpContent(1);
 }
 
 
 
-/**
- * \brief delete a script
+/*
+ * delete a script
  */
 void delete_script(void) {
 	char buf[256];
@@ -553,8 +732,8 @@ void delete_script(void) {
 		
 
 
-/**
- * \brief create a new script
+/*
+ * create a new script
  * take the web environment script name and create it on the citadel server
  */
 void create_script(void) {
@@ -640,13 +819,29 @@ void display_rules_editor_inner_div(void) {
  * This script should get called by every onChange event...
  *
  */
-	wprintf("<script type=\"text/javascript\">					\n"
+	wc_printf("<script type=\"text/javascript\">					\n"
 		"									\n"
 		"var highest_active_rule = (-1);					\n"
 		"									\n"
-		"function UpdateRules() {						\n"
-		"  for (i=0; i<%d; ++i) {						\n", MAX_RULES);
-	wprintf("    d = ($('movedown'+i));						\n"
+		"function UpdateRules() {						\n");
+/*
+ * Show only the active rows...
+ */
+	wc_printf("  highest_active_rule = (-1);						\n");
+	wc_printf("  for (i=0; i<%d; ++i) {						\n", MAX_RULES);
+	wc_printf("   if ($('active'+i).checked) {					\n"
+		"     $('rule' + i).style.display = 'block';				\n"
+		"     highest_active_rule = i;						\n"
+		"   }									\n"
+		"   else {								\n"
+		"     $('rule' + i).style.display = 'none';				\n"
+		"   }									\n"
+		"  }									\n");
+/*
+ * Show only the fields relevant to the rules...
+ */
+	wc_printf("  for (i=0; i<=highest_active_rule; ++i) {				\n"
+		"    d = ($('movedown'+i));						\n"
 		"    if (i < highest_active_rule) {					\n"
 		"      d.style.display = 'block';					\n"
 		"    }									\n"
@@ -688,25 +883,11 @@ void display_rules_editor_inner_div(void) {
 		"      $('div_automsg'+i).style.display = 'none';			\n"
 		"    }									\n"
 		"    if (highest_active_rule < %d) {					\n", MAX_RULES-1 );
-	wprintf("      $('div_addrule').style.display = 'block';			\n"
+	wc_printf("      $('div_addrule').style.display = 'block';			\n"
 		"    } else {								\n"
 		"      $('div_addrule').style.display = 'none';				\n"
 		"    }									\n"
 		"  }									\n"
-	);
-/*
- * Show only the active rows...
- */
-	wprintf("  highest_active_rule = (-1);						\n");
-	wprintf("  for (i=0; i<%d; ++i) {						\n", MAX_RULES);
-	wprintf("   if ($('active'+i).checked) {					\n"
-		"     $('rule' + i).style.display = 'block';				\n"
-		"     highest_active_rule = i;						\n"
-		"   }									\n"
-		"   else {								\n"
-		"     $('rule' + i).style.display = 'none';				\n"
-		"   }									\n"
-		"  }									\n"
 		"}									\n"
 /*
  * Add a rule (really, just un-hide it)
@@ -743,8 +924,8 @@ void display_rules_editor_inner_div(void) {
  * Delete a rule (percolate the deleted rule out to the end, then deactivate it)
  */
 		"function DeleteRule(rd) {						\n"
-		"  for (i=rd; i<highest_active_rule; ++i) {				\n"
-		"    SwapRules(i, (i+1));						\n"
+		"  for (j=rd; j<=highest_active_rule; ++j) {				\n"
+		"    SwapRules(j, (j+1));						\n"
 		"  }									\n"
 		"  $('active'+highest_active_rule).checked = false;			\n"
 		"}									\n"
@@ -752,9 +933,9 @@ void display_rules_editor_inner_div(void) {
 	);
 
 
-	wprintf("<br />");
+	wc_printf("<br />");
 
-	wprintf("<table cellpadding=2 width=100%%>");
+	wc_printf("<table cellpadding=2 width=100%%>");
 
 	for (i=0; i<MAX_RULES; ++i) {
 
@@ -773,44 +954,44 @@ void display_rules_editor_inner_div(void) {
 		
 		/* now generate the table row */
 
-		wprintf("<tr id=\"rule%d\" bgcolor=\"#%s\">",
+		wc_printf("<tr id=\"rule%d\" bgcolor=\"#%s\">",
 			i,
 			((i%2) ? "DDDDDD" : "FFFFFF")
 		);
 
-		wprintf("<td width=5%% align=\"center\">");
+		wc_printf("<td width=5%% align=\"center\">");
 
-		wprintf("<div style=\"display:none\">");
-		wprintf("<input type=\"checkbox\" name=\"active%d\" id=\"active%d\" %s>",
+		wc_printf("<div style=\"display:none\">");
+		wc_printf("<input type=\"checkbox\" name=\"active%d\" id=\"active%d\" %s>",
 			i, i,
 			(active ? "checked" : "")
 		);
-		wprintf("</div>");
+		wc_printf("</div>");
 
-		if (i>0) wprintf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
+		if (i>0) wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
 			"<img border=\"0\" src=\"static/up_pointer.gif\" "
 			"title=\"%s\"/></a>",
 			i-1, i, _("Move rule up") );
 
-		wprintf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
+		wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
 			"<img id=\"movedown%d\" border=\"0\" src=\"static/down_pointer.gif\" "
 			"title=\"%s\"/></a>",
 			i, i+1, i, _("Move rule down") );
 
-		wprintf("<a href=\"javascript:DeleteRule(%d);UpdateRules();\">"
+		wc_printf("<a href=\"javascript:DeleteRule(%d);UpdateRules();\">"
 			"<img id=\"delete%d\" border=\"0\" src=\"static/delete.gif\" "
 			"title=\"%s\"/></a>",
 			i, i, _("Delete rule") );
 
-		wprintf("</td>");
+		wc_printf("</td>");
 
-		wprintf("<td width=5%% align=\"center\">");
-		wprintf("<font size=+2>%d</font>", i+1);
-		wprintf("</td>");
+		wc_printf("<td width=5%% align=\"center\">");
+		wc_printf("<font size=+2>%d</font>", i+1);
+		wc_printf("</td>");
 
-		wprintf("<td width=20%%>%s ", _("If") );
+		wc_printf("<td width=20%%>%s ", _("If") );
 
-		char *hfield_values[14][2] = {
+		char *hfield_values[15][2] = {
 			{	"from",		_("From")		},
 			{	"tocc",		_("To or Cc")		},
 			{	"subject",	_("Subject")		},
@@ -823,75 +1004,78 @@ void display_rules_editor_inner_div(void) {
 			{	"xmailer",	_("X-Mailer")		},
 			{	"xspamflag",	_("X-Spam-Flag")	},
 			{	"xspamstatus",	_("X-Spam-Status")	},
+			{	"listid",	_("List-ID")		},
 			{	"size",		_("Message size")	},
 			{	"all",		_("All")		}
 		};
 
-		wprintf("<select id=\"hfield%d\" name=\"hfield%d\" size=1 onChange=\"UpdateRules();\">",
+		wc_printf("<select id=\"hfield%d\" name=\"hfield%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
-		for (j=0; j<14; ++j) {
-			wprintf("<option %s value=\"%s\">%s</option>",
+		for (j=0; j<15; ++j) {
+			wc_printf("<option %s value=\"%s\">%s</option>",
 				( (!strcasecmp(hfield, hfield_values[j][0])) ? "selected" : ""),
 				hfield_values[j][0],
 				hfield_values[j][1]
 			);
 		}
 
-		wprintf("</select>");
-		wprintf("</td>");
+		wc_printf("</select>");
+		wc_printf("</td>");
 
-		wprintf("<td width=20%%>");
+		wc_printf("<td width=20%%>");
 
-		char *compare_values[4][2] = {
+		char *compare_values[6][2] = {
 			{	"contains",	_("contains")		},
 			{	"notcontains",	_("does not contain")	},
 			{	"is",		_("is")			},
-			{	"isnot",	_("is not")		}
+			{	"isnot",	_("is not")		},
+			{	"matches",	_("matches")		},
+			{	"notmatches",	_("does not match")	}
 		};
 
-		wprintf("<div id=\"div_compare%d\">", i);
-		wprintf("<select id=\"compare%d\" name=\"compare%d\" size=1 onChange=\"UpdateRules();\">",
+		wc_printf("<div id=\"div_compare%d\">", i);
+		wc_printf("<select id=\"compare%d\" name=\"compare%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
-		for (j=0; j<4; ++j) {
-			wprintf("<option %s value=\"%s\">%s</option>",
+		for (j=0; j<6; ++j) {
+			wc_printf("<option %s value=\"%s\">%s</option>",
 				( (!strcasecmp(compare, compare_values[j][0])) ? "selected" : ""),
 				compare_values[j][0],
 				compare_values[j][1]
 			);
 		}
-		wprintf("</select>");
+		wc_printf("</select>");
 
-		wprintf("<input type=\"text\" id=\"htext%d\" name=\"htext%d\" value=\"", i, i);
+		wc_printf("<input type=\"text\" id=\"htext%d\" name=\"htext%d\" value=\"", i, i);
 		escputs(htext);
-		wprintf("\"></div>");
+		wc_printf("\"></div>");
 
-		wprintf("<div id=\"div_nocompare%d\">", i);
-		wprintf("%s", _("(All messages)"));
-		wprintf("</div>");
+		wc_printf("<div id=\"div_nocompare%d\">", i);
+		wc_printf("%s", _("(All messages)"));
+		wc_printf("</div>");
 
 		char *sizecomp_values[2][2] = {
 			{	"larger",	_("is larger than")	},
 			{	"smaller",	_("is smaller than")	}
 		};
 
-		wprintf("<div id=\"div_size%d\">", i);
-		wprintf("<select id=\"sizecomp%d\" name=\"sizecomp%d\" size=1 onChange=\"UpdateRules();\">",
+		wc_printf("<div id=\"div_size%d\">", i);
+		wc_printf("<select id=\"sizecomp%d\" name=\"sizecomp%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
 		for (j=0; j<2; ++j) {
-			wprintf("<option %s value=\"%s\">%s</option>",
+			wc_printf("<option %s value=\"%s\">%s</option>",
 				( (!strcasecmp(sizecomp, sizecomp_values[j][0])) ? "selected" : ""),
 				sizecomp_values[j][0],
 				sizecomp_values[j][1]
 			);
 		}
-		wprintf("</select>");
+		wc_printf("</select>");
 
-		wprintf("<input type=\"text\" id=\"sizeval%d\" name=\"sizeval%d\" value=\"%d\">",
+		wc_printf("<input type=\"text\" id=\"sizeval%d\" name=\"sizeval%d\" value=\"%d\">",
 			i, i, sizeval);
-		wprintf("bytes");
-		wprintf("</div>");
+		wc_printf("bytes");
+		wc_printf("</div>");
 
-		wprintf("</td>");
+		wc_printf("</td>");
 
 		char *action_values[6][2] = {
 			{	"keep",		_("Keep")		},
@@ -902,85 +1086,94 @@ void display_rules_editor_inner_div(void) {
 			{	"vacation",	_("Vacation")		}
 		};
 
-		wprintf("<td width=20%%>");
-		wprintf("<select id=\"action%d\" name=\"action%d\" size=1 onChange=\"UpdateRules();\">",
+		wc_printf("<td width=20%%>");
+		wc_printf("<select id=\"action%d\" name=\"action%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
 		for (j=0; j<6; ++j) {
-			wprintf("<option %s value=\"%s\">%s</option>",
+			wc_printf("<option %s value=\"%s\">%s</option>",
 				( (!strcasecmp(action, action_values[j][0])) ? "selected" : ""),
 				action_values[j][0],
 				action_values[j][1]
 			);
 		}
-		wprintf("</select>");
+		wc_printf("</select>");
 
-		wprintf("<div id=\"div_fileinto%d\">", i);
-		wprintf("<select name=\"fileinto%d\" id=\"fileinto%d\">", i, i);
+		wc_printf("<div id=\"div_fileinto%d\">", i);
+		wc_printf("<select name=\"fileinto%d\" id=\"fileinto%d\">", i, i);
 		for (j=0; j<num_roomnames; ++j) {
-			wprintf("<option ");
+			wc_printf("<option ");
 			if (!strcasecmp(rooms[j].name, fileinto)) {
-				wprintf("selected ");
+				wc_printf("selected ");
 			}
-			wprintf("value=\"");
-			urlescputs(rooms[j].name);
-			wprintf("\">");
+			wc_printf("value=\"");
 			escputs(rooms[j].name);
-			wprintf("</option>\n");
+			wc_printf("\">");
+			escputs(rooms[j].name);
+			wc_printf("</option>\n");
 		}
-		wprintf("</select>\n");
-		wprintf("</div>");
+		wc_printf("</select>\n");
+		wc_printf("</div>");
 
-		wprintf("<div id=\"div_redirect%d\">", i);
-		wprintf("<input type=\"text\" id=\"redirect%d\" name=\"redirect%d\" value=\"", i, i);
+		wc_printf("<div id=\"div_redirect%d\">", i);
+		wc_printf("<input type=\"text\" id=\"redirect%d\" name=\"redirect%d\" value=\"", i, i);
 		escputs(redirect);
-		wprintf("\"></div>");
+		wc_printf("\"></div>");
 
-		wprintf("<div id=\"div_automsg%d\">", i);
-		wprintf(_("Message:"));
-		wprintf("<br />");
-		wprintf("<textarea name=\"automsg%d\" id=\"automsg%d\" wrap=soft rows=5>\n", i, i);
+		wc_printf("<div id=\"div_automsg%d\">", i);
+		wc_printf(_("Message:"));
+		wc_printf("<br />");
+		wc_printf("<textarea name=\"automsg%d\" id=\"automsg%d\" wrap=soft rows=5>\n", i, i);
 		escputs(automsg);
-		wprintf("</textarea>");
-		wprintf("</div>");
+		wc_printf("</textarea>");
+		wc_printf("</div>");
 
-		wprintf("</td>");
+		wc_printf("</td>");
 
 		char *final_values[2][2] = {
 			{	"continue",	_("continue processing")	},
 			{	"stop",		_("stop")			}
 		};
 
-		wprintf("<td width=10%% align=\"center\">%s</td>", _("and then") );
+		wc_printf("<td width=10%% align=\"center\">%s</td>", _("and then") );
 
-		wprintf("<td width=20%%>");
-		wprintf("<select name=\"final%d\" id=\"final%d\" size=1 onChange=\"UpdateRules();\">",
+		wc_printf("<td width=20%%>");
+		wc_printf("<select name=\"final%d\" id=\"final%d\" size=1 onChange=\"UpdateRules();\">",
 			i, i);
 		for (j=0; j<2; ++j) {
-			wprintf("<option %s value=\"%s\">%s</option>",
+			wc_printf("<option %s value=\"%s\">%s</option>",
 				( (!strcasecmp(final, final_values[j][0])) ? "selected" : ""),
 				final_values[j][0],
 				final_values[j][1]
 			);
 		}
-		wprintf("</select>");
-		wprintf("</td>");
+		wc_printf("</select>");
+		wc_printf("</td>");
 
-		wprintf("</tr>\n");
+		wc_printf("</tr>\n");
 
 	}
 
-	wprintf("</table>");
-	wprintf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">Add rule</a><br /></div>\n");
+	wc_printf("</table>");
+	wc_printf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">%s</a><br /></div>\n",
+		_("Add rule")
+	);
 
-	wprintf("<script type=\"text/javascript\">					\n");
-	wprintf("UpdateRules();								\n");
-	wprintf("</script>								\n");
+	wc_printf("<script type=\"text/javascript\">					\n");
+	wc_printf("UpdateRules();								\n");
+	wc_printf("</script>								\n");
 
 	free(rooms);
 }
 
+void _display_add_remove_scripts(void) {display_add_remove_scripts(NULL);}
 
-
-
-
-/*@}*/
+void 
+InitModule_SIEVE
+(void)
+{
+	WebcitAddUrlHandler(HKEY("display_sieve"), "", 0, display_sieve, 0);
+	WebcitAddUrlHandler(HKEY("save_sieve"), "", 0, save_sieve, 0);
+	WebcitAddUrlHandler(HKEY("display_add_remove_scripts"), "", 0, _display_add_remove_scripts, 0);
+	WebcitAddUrlHandler(HKEY("create_script"), "", 0, create_script, 0);
+	WebcitAddUrlHandler(HKEY("delete_script"), "", 0, delete_script, 0);
+}