X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsieve.c;h=cce70574ae927c451f165af0488e47215e27ac8c;hb=HEAD;hp=3761b11319efc22a03ef82f3beb1bc3ea2bcd42b;hpb=ac5438e4bce9943dafd0485161ed20939563b799;p=citadel.git

diff --git a/webcit/sieve.c b/webcit/sieve.c
index 3761b1131..2e3d61585 100644
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996-2012 by the citadel.org team
+ * Copyright (c) 1996-2020 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 version 3.
@@ -9,230 +9,23 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * FIXME: add logic to exclude the webcit-generated script from the manual script selection
+ * 
+ * Implementation note: this was kind of hacked up when we switched from Sieve to custom rules.
+ * As a result there's probably some cruft in here...
+ * ajc 2020jul12
+ *
  */
 
 #include "webcit.h"
 
+CtxType CTX_SIEVELIST = CTX_NONE;
+CtxType CTX_SIEVESCRIPT = CTX_NONE;
+
 #define MAX_SCRIPTS	100
 #define MAX_RULES	50
 #define RULES_SCRIPT	"__WebCit_Generated_Script__"
 
 
-/*
- * Helper function for output_sieve_rule() to output strings with quotes escaped
- */
-void osr_sanitize(char *str) {
-	int i, len;
-
-	if (str == NULL) return;
-	len = strlen(str);
-	for (i=0; i<len; ++i) {
-		if (str[i]=='\"') {
-			str[i] = '\'' ;
-		}
-		else if (isspace(str[i])) {
-			str[i] = ' ';
-		}
-	}
-}
-
-
-/*
- * 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 *my_addresses)
-{
-	char *comp1 = "";
-	char *comp2 = "";
-
-	osr_sanitize(htext);
-	osr_sanitize(fileinto);
-	osr_sanitize(redirect);
-	osr_sanitize(automsg);
-
-	/* 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("{");
-	}
-
-	/* Do action */
-
-	if (!strcasecmp(action, "keep")) {
-		serv_printf("keep;");
-	}
-
-	else if (!strcasecmp(action, "discard")) {
-		serv_printf("discard;");
-	}
-
-	else if (!strcasecmp(action, "reject")) {
-		serv_printf("reject \"%s\";", automsg);
-	}
-
-	else if (!strcasecmp(action, "fileinto")) {
-		serv_printf("fileinto \"%s\";", fileinto);
-	}
-
-	else if (!strcasecmp(action, "redirect")) {
-		serv_printf("redirect \"%s\";", redirect);
-	}
-
-	else if (!strcasecmp(action, "vacation")) {
-		serv_printf("vacation :addresses [%s]\n\"%s\";", my_addresses, automsg);
-	}
-
-	/* Do 'final' action */
-
-	if (!strcasecmp(final, "stop")) {
-		serv_printf("stop;");
-	}
-
-	/* Close the braces if we're in a conditional loop */
-
-	if (strcasecmp(hfield, "all")) {
-		serv_printf("}");
-	}
-
-	/* End of rule. */
-}
-
-
 /*
  * Translate the fields from the rule editor into something we can save...
  */
@@ -270,26 +63,12 @@ void parse_fields_from_rule_editor(void) {
 	}
 
 	/* Now generate the script and write it to the Citadel server */
-	serv_printf("MSIV putscript|%s|", RULES_SCRIPT);
+	serv_printf("PIBR");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '4') {
 		return;
 	}
 
-	serv_puts("# THIS SCRIPT WAS AUTOMATICALLY GENERATED BY WEBCIT.");
-	serv_puts("# ");
-	serv_puts("# Do not attempt to manually edit it.  If you do so,");
-	serv_puts("# your changes will be overwritten the next time WebCit");
-	serv_puts("# saves its mail filtering rule set.  If you really want");
-	serv_puts("# to use these rules as the basis for another script,");
-	serv_puts("# copy them to another script and save that instead.");
-	serv_puts("");
-	serv_puts("require \"fileinto\";");
-	serv_puts("require \"reject\";");
-	serv_puts("require \"vacation\";");
-	serv_puts("require \"envelope\";");
-	serv_puts("");
-
 	for (i=0; i<MAX_RULES; ++i) {
 		
 		strcpy(rule, "");
@@ -334,17 +113,15 @@ void parse_fields_from_rule_editor(void) {
 				redirect, automsg, final
 			);
 	
-			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, my_addresses);
+			size_t len = CtdlEncodeBase64(encoded_rule, rule, strlen(rule)+1, BASE64_NO_LINEBREAKS);
+			if (encoded_rule[len - 1] == '\n') {
+				encoded_rule[len - 1] = '\0';
+			}
+			serv_printf("rule|%d|%s|", i, encoded_rule);
 			serv_puts("");
 		}
-
-
 	}
 
-	serv_puts("stop;");
 	serv_puts("000");
 }
 
@@ -353,12 +130,6 @@ void parse_fields_from_rule_editor(void) {
  * save sieve config
  */
 void save_sieve(void) {
-	int bigaction;
-	char script_names[MAX_SCRIPTS][64];
-	int num_scripts = 0;
-	int i;
-	char this_name[64];
-	char buf[256];
 
 	if (!havebstr("save_button")) {
 		AppendImportantMessage(_("Cancelled.  Changes were not saved."), -1);
@@ -368,111 +139,26 @@ void save_sieve(void) {
 
 	parse_fields_from_rule_editor();
 
-	serv_puts("MSIV listscripts");
-	serv_getln(buf, sizeof(buf));
-	if (buf[0] == '1') while (serv_getln(buf, sizeof(buf)), strcmp(buf, "000")) {
-		if (num_scripts < MAX_SCRIPTS) {
-			extract_token(script_names[num_scripts], buf, 0, '|', 64);
-			++num_scripts;
-		}
-	}
-
-	bigaction = ibstr("bigaction");
-
-	if (bigaction == 0) {
-		serv_puts("MSIV setactive||");
-		serv_getln(buf, sizeof buf);
-	}
-
-	else if (bigaction == 1) {
-		serv_printf("MSIV setactive|%s|", RULES_SCRIPT);
-		serv_getln(buf, sizeof buf);
-	}
-
-	else if (bigaction == 2) {
-		serv_printf("MSIV setactive|%s|", bstr("active_script"));
-		serv_getln(buf, sizeof buf);
-	}
-
-	if (num_scripts > 0) {
-		for (i=0; i<num_scripts; ++i) {
-			/*
-			 * We only want to save the scripts from the "manually edited scripts"
-			 * screen.  The script that WebCit generates from its ruleset will be
-			 * auto-generated by parse_fields_from_rule_editor() and saved there.
-			 */
-			if (strcasecmp(script_names[i], RULES_SCRIPT)) {
-				serv_printf("MSIV putscript|%s|", script_names[i]);
-				serv_getln(buf, sizeof buf);
-				if (buf[0] == '4') {
-					snprintf(this_name, sizeof this_name, "text_%s", script_names[i]);
-					striplt((char *)BSTR(this_name)); /* TODO: get rid of typecast*/
-					serv_write(BSTR(this_name), strlen(BSTR(this_name)));
-					serv_puts("\n000");
-				}
-			}
-		}
-	}
-
 	AppendImportantMessage(_("Your changes have been saved."), -1);
 	display_main_menu();
 	return;
 }
 
 
-/*
- * create a new script
- * take the web environment script name and create it on the citadel server
- */
-void create_script(void) {
-	char buf[256];
-
-	serv_printf("MSIV getscript|%s", bstr("script_name"));
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '1') {
-		while (serv_getln(buf, sizeof(buf)), strcmp(buf, "000")) {
-			/* flush */
-		}
-		return;
-	}
-	
-	serv_printf("MSIV putscript|%s", bstr("script_name"));
-	serv_getln(buf, sizeof buf);
-	if (buf[0] == '4') {
-		serv_puts("keep;");
-		serv_puts("000");
-	output_headers(1, 1, 2, 0, 0, 0);
-	do_template("sieve_add");
-	wDumpContent(1);
-		return;
-	}
-
+void display_sieve_add_or_delete(void) {
 	output_headers(1, 1, 2, 0, 0, 0);
 	do_template("sieve_add");
 	wDumpContent(1);
 }
 
 
-/*
- * delete a script
- */
-void delete_script(void) {
-	char buf[256];
-
-	serv_printf("MSIV deletescript|%s", bstr("script_name"));
-	serv_getln(buf, sizeof buf);
-	output_headers(1, 1, 2, 0, 0, 0);
-	do_template("sieve_add");
-	wDumpContent(1);
-}
-
 
 /*
  * 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);
+	output_headers(1, 1, 1, 0, 0, 0);
 	do_template("sieve_none");
 	wDumpContent(1);
 }
@@ -487,22 +173,22 @@ typedef struct __SieveListing {
 
 int ConditionalSieveScriptIsActive(StrBuf *Target, WCTemplputParams *TP)
 {
-	SieveListing     *SieveList = (SieveListing *)CTX;
+	SieveListing     *SieveList = (SieveListing *)CTX(CTX_SIEVELIST);
 	return SieveList->IsActive;
 }
 int ConditionalSieveScriptIsRulesScript(StrBuf *Target, WCTemplputParams *TP)
 {
-	SieveListing     *SieveList = (SieveListing *)CTX;
+	SieveListing     *SieveList = (SieveListing *)CTX(CTX_SIEVELIST);
 	return SieveList->IsActive;
 }
 void tmplput_SieveScriptName(StrBuf *Target, WCTemplputParams *TP) 
 {
-	SieveListing     *SieveList = (SieveListing *)CTX;
+	SieveListing     *SieveList = (SieveListing *)CTX(CTX_SIEVELIST);
 	StrBufAppendTemplate(Target, TP, SieveList->Name, 0);
 }
 void tmplput_SieveScriptContent(StrBuf *Target, WCTemplputParams *TP) 
 {
-	SieveListing     *SieveList = (SieveListing *)CTX;
+	SieveListing     *SieveList = (SieveListing *)CTX(CTX_SIEVELIST);
 	StrBufAppendTemplate(Target, TP, SieveList->Content, 0);
 }
 void FreeSieveListing(void *vSieveListing)
@@ -682,7 +368,7 @@ typedef struct __SieveRule {
 
 int ConditionalSieveRule_hfield(StrBuf *Target, WCTemplputParams *TP)
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
 	
         return GetTemplateTokenNumber(Target, 
                                       TP, 
@@ -693,7 +379,7 @@ int ConditionalSieveRule_hfield(StrBuf *Target, WCTemplputParams *TP)
 }
 int ConditionalSieveRule_compare(StrBuf *Target, WCTemplputParams *TP)
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
         return GetTemplateTokenNumber(Target, 
                                       TP, 
                                       3, 
@@ -703,7 +389,7 @@ int ConditionalSieveRule_compare(StrBuf *Target, WCTemplputParams *TP)
 }
 int ConditionalSieveRule_action(StrBuf *Target, WCTemplputParams *TP)
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
         return GetTemplateTokenNumber(Target, 
                                       TP, 
                                       3, 
@@ -713,7 +399,7 @@ int ConditionalSieveRule_action(StrBuf *Target, WCTemplputParams *TP)
 }
 int ConditionalSieveRule_sizecomp(StrBuf *Target, WCTemplputParams *TP)
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
         return GetTemplateTokenNumber(Target, 
                                       TP, 
                                       3, 
@@ -723,7 +409,7 @@ int ConditionalSieveRule_sizecomp(StrBuf *Target, WCTemplputParams *TP)
 }
 int ConditionalSieveRule_final(StrBuf *Target, WCTemplputParams *TP)
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
         return GetTemplateTokenNumber(Target, 
                                       TP, 
                                       3, 
@@ -733,7 +419,7 @@ int ConditionalSieveRule_final(StrBuf *Target, WCTemplputParams *TP)
 }
 int ConditionalSieveRule_ThisRoom(StrBuf *Target, WCTemplputParams *TP)
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
         return GetTemplateTokenNumber(Target, 
                                       TP, 
                                       3, 
@@ -743,39 +429,39 @@ int ConditionalSieveRule_ThisRoom(StrBuf *Target, WCTemplputParams *TP)
 }
 int ConditionalSieveRule_Active(StrBuf *Target, WCTemplputParams *TP)
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
         return Rule->active;
 }
 void tmplput_SieveRule_htext(StrBuf *Target, WCTemplputParams *TP) 
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
 	StrBufAppendTemplate(Target, TP, Rule->htext, 0);
 }
 void tmplput_SieveRule_fileinto(StrBuf *Target, WCTemplputParams *TP) 
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
 	StrBufAppendTemplate(Target, TP, Rule->fileinto, 0);
 }
 void tmplput_SieveRule_redirect(StrBuf *Target, WCTemplputParams *TP) 
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
 	StrBufAppendTemplate(Target, TP, Rule->redirect, 0);
 }
 void tmplput_SieveRule_automsg(StrBuf *Target, WCTemplputParams *TP) 
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
 	StrBufAppendTemplate(Target, TP, Rule->automsg, 0);
 }
 void tmplput_SieveRule_sizeval(StrBuf *Target, WCTemplputParams *TP) 
 {
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
 	StrBufAppendPrintf(Target, "%d", Rule->sizeval);
 }
 
 void tmplput_SieveRule_lookup_FileIntoRoom(StrBuf *Target, WCTemplputParams *TP) 
 {
 	void *vRoom;
-	SieveRule     *Rule = (SieveRule *)CTX;
+	SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
         wcsession *WCC = WC;
 	HashList *Rooms = GetRoomListHashLKRA(Target, TP);
 
@@ -795,7 +481,7 @@ void FreeSieveRule(void *vRule)
 	free(Rule);
 }
 
-#define WC_RULE_HEADER "# WEBCIT_RULE|"
+#define WC_RULE_HEADER "rule|"
 HashList *GetSieveRules(StrBuf *Target, WCTemplputParams *TP)
 {
 	StrBuf *Line = NULL;
@@ -807,7 +493,7 @@ HashList *GetSieveRules(StrBuf *Target, WCTemplputParams *TP)
 	SieveRule *Rule = NULL;
 
 	SieveRules = NewHash(1, Flathash);
-	serv_printf("MSIV getscript|"RULES_SCRIPT);
+	serv_printf("GIBR");
 	Line = NewStrBuf();
 	EncodedRule = NewStrBuf();
 	StrBuf_ServGetln(Line);
@@ -823,8 +509,7 @@ HashList *GetSieveRules(StrBuf *Target, WCTemplputParams *TP)
 			{
 				pch = NULL;
 				/* We just care for our encoded header and skip everything else */
-				if ((StrLength(Line) > sizeof(WC_RULE_HEADER) - 1) &&
-				    (!strncasecmp(ChrPtr(Line), HKEY(WC_RULE_HEADER))))
+				if ((StrLength(Line) > sizeof(WC_RULE_HEADER) - 1) && (!strncasecmp(ChrPtr(Line), HKEY(WC_RULE_HEADER))))
 				{
 					StrBufSkip_NTokenS(Line, &pch, '|', 1);
 					n = StrBufExtractNext_int(Line, &pch, '|'); 
@@ -889,6 +574,8 @@ void
 InitModule_SIEVE
 (void)
 {
+	RegisterCTX(CTX_SIEVELIST);
+	RegisterCTX(CTX_SIEVESCRIPT);
 	REGISTERTokenParamDefine(from);		
 	REGISTERTokenParamDefine(tocc);		
 	REGISTERTokenParamDefine(subject);	
@@ -928,21 +615,21 @@ InitModule_SIEVE
 
 	RegisterIterator("SIEVE:SCRIPTS", 0, NULL, GetSieveScriptListing, NULL, NULL, CTX_SIEVELIST, CTX_NONE, IT_NOFLAG);
 
-	RegisterConditional(HKEY("COND:SIEVE:SCRIPT:ACTIVE"), 0, ConditionalSieveScriptIsActive, CTX_SIEVELIST);
-	RegisterConditional(HKEY("COND:SIEVE:SCRIPT:ISRULES"), 0, ConditionalSieveScriptIsRulesScript, CTX_SIEVELIST);
+	RegisterConditional("COND:SIEVE:SCRIPT:ACTIVE", 0, ConditionalSieveScriptIsActive, CTX_SIEVELIST);
+	RegisterConditional("COND:SIEVE:SCRIPT:ISRULES", 0, ConditionalSieveScriptIsRulesScript, CTX_SIEVELIST);
 	RegisterNamespace("SIEVE:SCRIPT:NAME", 0, 1, tmplput_SieveScriptName, NULL, CTX_SIEVELIST);
 	RegisterNamespace("SIEVE:SCRIPT:CONTENT", 0, 1, tmplput_SieveScriptContent, NULL, CTX_SIEVELIST);
 
  
 	RegisterIterator("SIEVE:RULES", 0, NULL, GetSieveRules, NULL, DeleteHash, CTX_SIEVESCRIPT, CTX_NONE, IT_NOFLAG);
 
-	RegisterConditional(HKEY("COND:SIEVE:ACTIVE"), 1, ConditionalSieveRule_Active, CTX_SIEVESCRIPT);
-	RegisterConditional(HKEY("COND:SIEVE:HFIELD"), 1, ConditionalSieveRule_hfield, CTX_SIEVESCRIPT);
-	RegisterConditional(HKEY("COND:SIEVE:COMPARE"), 1, ConditionalSieveRule_compare, CTX_SIEVESCRIPT);
-	RegisterConditional(HKEY("COND:SIEVE:ACTION"), 1, ConditionalSieveRule_action, CTX_SIEVESCRIPT);
-	RegisterConditional(HKEY("COND:SIEVE:SIZECOMP"), 1, ConditionalSieveRule_sizecomp, CTX_SIEVESCRIPT);
-	RegisterConditional(HKEY("COND:SIEVE:FINAL"), 1, ConditionalSieveRule_final, CTX_SIEVESCRIPT);
-	RegisterConditional(HKEY("COND:SIEVE:THISROOM"), 1, ConditionalSieveRule_ThisRoom, CTX_SIEVESCRIPT);
+	RegisterConditional("COND:SIEVE:ACTIVE", 1, ConditionalSieveRule_Active, CTX_SIEVESCRIPT);
+	RegisterConditional("COND:SIEVE:HFIELD", 1, ConditionalSieveRule_hfield, CTX_SIEVESCRIPT);
+	RegisterConditional("COND:SIEVE:COMPARE", 1, ConditionalSieveRule_compare, CTX_SIEVESCRIPT);
+	RegisterConditional("COND:SIEVE:ACTION", 1, ConditionalSieveRule_action, CTX_SIEVESCRIPT);
+	RegisterConditional("COND:SIEVE:SIZECOMP", 1, ConditionalSieveRule_sizecomp, CTX_SIEVESCRIPT);
+	RegisterConditional("COND:SIEVE:FINAL", 1, ConditionalSieveRule_final, CTX_SIEVESCRIPT);
+	RegisterConditional("COND:SIEVE:THISROOM", 1, ConditionalSieveRule_ThisRoom, CTX_SIEVESCRIPT);
 
 	RegisterNamespace("SIEVE:SCRIPT:HTEXT", 0, 1, tmplput_SieveRule_htext, NULL, CTX_SIEVESCRIPT);
 	RegisterNamespace("SIEVE:SCRIPT:SIZE", 0, 1, tmplput_SieveRule_sizeval, NULL, CTX_SIEVESCRIPT);
@@ -953,6 +640,5 @@ InitModule_SIEVE
 	/* fetch our room into WCC->ThisRoom, to evaluate while iterating over rooms with COND:THIS:THAT:ROOM */
 	RegisterNamespace("SIEVE:SCRIPT:LOOKUP_FILEINTO", 0, 1, tmplput_SieveRule_lookup_FileIntoRoom, NULL, CTX_SIEVESCRIPT);
 	WebcitAddUrlHandler(HKEY("save_sieve"), "", 0, save_sieve, 0);
-	WebcitAddUrlHandler(HKEY("create_script"), "", 0, create_script, 0);
-	WebcitAddUrlHandler(HKEY("delete_script"), "", 0, delete_script, 0);
+	WebcitAddUrlHandler(HKEY("display_sieve_add_or_delete"), "", 0, display_sieve_add_or_delete, 0);
 }