CONF STOREVAL fix off-by-one string termination
[citadel.git] / webcit / sieve.c
index a566c79410214d30f6982d7ed4bde0e751effe94..2e3d615853b4f09c68964856ed41ba3b2c358b03 100644 (file)
-/* 
- * $Id$
+/*
+ * 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.
+ *
+ * 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.
+ *
+ * 
+ * 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      25
+#define MAX_RULES      50
 #define RULES_SCRIPT   "__WebCit_Generated_Script__"
 
 
-/*
- * 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);
-
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<img src=\"static/advanpage2_48x.gif\">");
-       wprintf("<h1>");
-       wprintf(_("View/edit server-side mail filters"));
-       wprintf("</h1>\n");
-       wprintf("</div>\n");
-
-       wprintf("<div id=\"content\" class=\"service\">\n");
-
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"sieve_background\">"
-               "<tr><td valign=top>\n");
-
-       wprintf(_("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>"));
-
-       wprintf("</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];
-       int i;
-       int rules_script_is_active = 0;
-
-       if (!serv_info.serv_supports_sieve) {
-               display_no_sieve();
-               return;
-       }
-
-       memset(script_names, 0, sizeof script_names);
-
-       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);
-                       if (extract_int(buf, 1) > 0) {
-                               active_script = num_scripts;
-                               if (!strcasecmp(script_names[num_scripts], RULES_SCRIPT)) {
-                                       rules_script_is_active = 1;
-                               }
-                       }
-                       ++num_scripts;
-               }
-       }
-
-       output_headers(1, 1, 2, 0, 0, 0);
-
-       wprintf("<script type=\"text/javascript\">                                      \n"
-               "                                                                       \n"
-               "var previously_active_script;                                          \n"
-               "                                                                       \n"
-               "function ToggleSievePanels() {                                         \n"
-               " d = ($('sieveform').bigaction.options[$('sieveform').bigaction.selectedIndex].value); \n"
-               " for (i=0; i<3; ++i) {                                                 \n"
-               "  if (i == d) {                                                        \n"
-               "   $('sievediv' + i).style.display = 'block';                          \n"
-               "  }                                                                    \n"
-               "  else {                                                               \n"
-               "   $('sievediv' + i).style.display = 'none';                           \n"
-               "  }                                                                    \n"
-               " }                                                                     \n"
-               "}                                                                      \n"
-               "                                                                       \n"
-               "function ToggleScriptPanels() {                                        \n"
-               " d = ($('sieveform').active_script.options[$('sieveform').active_script.selectedIndex].value); \n"
-               " if ($('script_' + previously_active_script)) {                        \n"
-               "  $('script_' + previously_active_script).style.display = 'none';      \n"
-               " }                                                                     \n"
-               " $('script_' + d).style.display = 'block';                             \n"
-               " previously_active_script = d;                                         \n"
-               "}                                                                      \n"
-               "                                                                       \n"
-               "</script>                                                              \n"
-       );
-
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<img src=\"static/advanpage2_48x.gif\">");
-       wprintf("<h1>");
-       wprintf(_("View/edit server-side mail filters"));
-       wprintf("</h1>\n");
-       wprintf("</div>\n");
-
-       wprintf("<div id=\"content\" class=\"service\">\n");
-
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"sieve_background\">"
-               "<tr><td valign=top>\n");
-
-
-       wprintf("<form id=\"sieveform\" method=\"post\" action=\"save_sieve\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
-
-       wprintf(_("When new mail arrives: "));
-        wprintf("<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");
-
-       wprintf("<option %s value=\"1\">", ((rules_script_is_active) ? "selected" : ""));
-       wprintf(_("Filter it according to rules selected below"));
-       wprintf("</option>\n");
-
-       wprintf("<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");
-
-       wprintf("</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");
-
-       /* The "webcit managed scripts" div */
-
-       wprintf("<div id=\"sievediv1\" style=\"display:none\">\n");
-       display_rules_editor_inner_div();
-       wprintf("</div>\n");
-
-       /* The "I'm smart and can write my own Sieve scripts" div */
-
-       wprintf("<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");
-               for (i=0; i<num_scripts; ++i) {
-                       if (strcasecmp(script_names[i], RULES_SCRIPT)) {
-                               wprintf("<option %s value=\"%s\">%s</option>\n",
-                                       ((active_script == i) ? "selected" : ""),
-                                       script_names[i],
-                                       script_names[i]
-                               );
-                       }
-               }
-               wprintf("</select>\n");
-       }
-
-       wprintf("&nbsp;&nbsp;&nbsp;");
-       wprintf("<a href=\"display_add_remove_scripts\">%s</a>\n", _("Add or delete scripts"));
-
-       wprintf("<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",
-                                       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);
-                               }
-                               wprintf("</textarea>\n");
-                               wprintf("</div>\n");
-                       }
-               }
-       }
-
-       wprintf("<script type=\"text/javascript\">      \n"
-               "ToggleScriptPanels();                  \n"
-               "</script>                              \n"
-       );
-
-       wprintf("</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");
-
-       wprintf("</td></tr></table></div>\n");
-
-       wprintf("<script type=\"text/javascript\">      \n"
-               "ToggleSievePanels();                   \n"
-               "</script>                              \n"
-       );
-
-       wDumpContent(1);
-
-}
-
-
-
-/*
- * 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, "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...
  */
@@ -471,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, "");
@@ -535,623 +113,532 @@ 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);
-                       serv_printf("");
+                       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");
 }
 
 
-
 /*
  * save sieve config
  */
 void save_sieve(void) {
-       int bigaction;
-       char script_names[MAX_SCRIPTS][64];
-       int num_scripts = 0;
-       int active_script = (-1);
-       int i;
-       char this_name[64];
-       char buf[256];
 
        if (!havebstr("save_button")) {
-               strcpy(WC->ImportantMessage,
-                       _("Cancelled.  Changes were not saved."));
+               AppendImportantMessage(_("Cancelled.  Changes were not saved."), -1);
                display_main_menu();
                return;
        }
 
        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);
-                       if (extract_int(buf, 1) > 0) {
-                               active_script = num_scripts;
-                       }
-                       ++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_printf("%s", bstr(this_name));
-                                       serv_puts("000");
-                               }
-                       }
-               }
-       }
-
-       strcpy(WC->ImportantMessage, _("Your changes have been saved."));
+       AppendImportantMessage(_("Your changes have been saved."), -1);
        display_main_menu();
        return;
 }
 
 
-/*
- * show a list of available scripts to add/remove them
- */
-void display_add_remove_scripts(char *message)
-{
-       char buf[256];
-       char script_name[256];
-
+void display_sieve_add_or_delete(void) {
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<img src=\"static/advanpage2_48x.gif\">");
-       wprintf(_("Add or delete scripts"));
-       wprintf("</h1>\n");
-       wprintf("</div>\n");
-       
-       wprintf("<div id=\"content\" class=\"service\">\n");
-
-       if (message != NULL) wprintf(message);
-
-       wprintf("<table border=0 cellspacing=10><tr valign=top><td>\n");
-
-       svput("BOXTITLE", WCS_STRING, _("Add a new script"));
-       do_template("beginbox");
-
-       wprintf(_("To create a new script, enter the desired "
-               "script name in the box below and click 'Create'."));
-       wprintf("<br /><br />");
-
-        wprintf("<center><form method=\"POST\" action=\"create_script\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
-        wprintf(_("Script name: "));
-        wprintf("<input type=\"text\" name=\"script_name\"><br />\n"
-               "<input type=\"submit\" name=\"create_button\" value=\"%s\">"
-               "</form></center>\n", _("Create"));
-
-       do_template("endbox");
-
-       svput("BOXTITLE", WCS_STRING, _("Edit scripts"));
-       do_template("beginbox");
-       wprintf("<br /><div align=center><a href=\"display_sieve\">%s</a><br /><br />\n",
-               _("Return to the script editing screen")
-       );
-       do_template("endbox");
-
-       wprintf("</td><td>");
-
-       svput("BOXTITLE", WCS_STRING, _("Delete scripts"));
-       do_template("beginbox");
-
-       wprintf(_("To delete an existing script, select the script "
-               "name from the list and click 'Delete'."));
-       wprintf("<br /><br />");
-       
-        wprintf("<center>"
-               "<form method=\"POST\" action=\"delete_script\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
-        wprintf("<select name=\"script_name\" size=10 style=\"width:100%%\">\n");
-
-        serv_puts("MSIV listscripts");
-        serv_getln(buf, sizeof buf);
-        if (buf[0] == '1') {
-                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>");
-                               escputs(script_name);
-                               wprintf("</option>\n");
-                       }
-                }
-        }
-        wprintf("</select><br />\n");
-
-        wprintf("<input type=\"submit\" name=\"delete_button\" value=\"%s\" "
-               "onClick=\"return confirm('%s');\">", _("Delete script"), _("Delete this script?"));
-        wprintf("</form></center>\n");
-       do_template("endbox");
-
-       wprintf("</td></tr></table>\n");
-
+       do_template("sieve_add");
        wDumpContent(1);
 }
 
 
 
 /*
- * delete a script
+ * dummy panel indicating to the user that the server doesn't support Sieve
  */
-void delete_script(void) {
-       char buf[256];
+void display_no_sieve(void) {
 
-       serv_printf("MSIV deletescript|%s", bstr("script_name"));
-       serv_getln(buf, sizeof buf);
-       display_add_remove_scripts(&buf[4]);
+       output_headers(1, 1, 1, 0, 0, 0);
+       do_template("sieve_none");
+       wDumpContent(1);
 }
-               
 
 
-/*
- * 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 */
-               }
-               display_add_remove_scripts(_("A script by that name already exists."));
-               return;
-       }
-       
-       serv_printf("MSIV putscript|%s", bstr("script_name"));
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '4') {
-               serv_puts("keep;");
-               serv_puts("000");
-               display_add_remove_scripts(_("A new script has been created.  Return to the script editing screen to edit and activate it."));
-               return;
-       }
+typedef struct __SieveListing {
+       int IsActive;
+       int IsRulesScript;
+       StrBuf *Name;
+       StrBuf *Content;
+} SieveListing;
 
-       display_add_remove_scripts(&buf[4]);
+int ConditionalSieveScriptIsActive(StrBuf *Target, WCTemplputParams *TP)
+{
+       SieveListing     *SieveList = (SieveListing *)CTX(CTX_SIEVELIST);
+       return SieveList->IsActive;
 }
+int ConditionalSieveScriptIsRulesScript(StrBuf *Target, WCTemplputParams *TP)
+{
+       SieveListing     *SieveList = (SieveListing *)CTX(CTX_SIEVELIST);
+       return SieveList->IsActive;
+}
+void tmplput_SieveScriptName(StrBuf *Target, WCTemplputParams *TP) 
+{
+       SieveListing     *SieveList = (SieveListing *)CTX(CTX_SIEVELIST);
+       StrBufAppendTemplate(Target, TP, SieveList->Name, 0);
+}
+void tmplput_SieveScriptContent(StrBuf *Target, WCTemplputParams *TP) 
+{
+       SieveListing     *SieveList = (SieveListing *)CTX(CTX_SIEVELIST);
+       StrBufAppendTemplate(Target, TP, SieveList->Content, 0);
+}
+void FreeSieveListing(void *vSieveListing)
+{
+       SieveListing *List = (SieveListing*) vSieveListing;
 
+       FreeStrBuf(&List->Name);
+       free(List);
+}
 
+HashList *GetSieveScriptListing(StrBuf *Target, WCTemplputParams *TP)
+{
+        wcsession *WCC = WC;
+       StrBuf *Line;
+       int num_scripts = 0;
+       int rules_script_active = 0;
+       int have_rules_script = 0;
+       const char *pch;
+       HashPos  *it;
+       int Done = 0;
+       SieveListing *Ruleset;
 
+       if (WCC->KnownSieveScripts != NULL) {
+               return WCC->KnownSieveScripts;
+       }
 
-void display_rules_editor_inner_div(void) {
-       int i, j;
-       char buf[4096];
-       char rules[MAX_RULES][2048];
-
-       struct {
-               char name[128];
-       } *rooms = NULL;
-       int num_roomnames = 0;
-       int num_roomnames_alloc = 0;
-
-       int active;
-       char hfield[256];
-       char compare[32];
-       char htext[256];
-       char sizecomp[32];
-       int sizeval;
-       char action[32];
-       char fileinto[128];
-       char redirect[256];
-       char automsg[1024];
-       char final[32];
+       serv_puts("MSIV listscripts");
+       Line = NewStrBuf();
+       StrBuf_ServGetln(Line);
+       if (GetServerStatus(Line, NULL) == 1) 
+       {
+               WCC->KnownSieveScripts = NewHash(1, Flathash);
+
+               while(!Done && (StrBuf_ServGetln(Line) >= 0) )
+                       if ( (StrLength(Line)==3) && 
+                            !strcmp(ChrPtr(Line), "000")) 
+                       {
+                               Done = 1;
+                       }
+                       else
+                       {
+                               pch = NULL;
+                               Ruleset = (SieveListing *) malloc(sizeof(SieveListing));
+                               Ruleset->Name = NewStrBufPlain(NULL, StrLength(Line));
+                               StrBufExtract_NextToken(Ruleset->Name, Line, &pch, '|');
+                               Ruleset->IsActive = StrBufExtractNext_int(Line, &pch, '|'); 
+                               Ruleset->Content = NULL;
+
+                               if (!strcasecmp(ChrPtr(Ruleset->Name), RULES_SCRIPT))
+                               {
+                                       Ruleset->IsRulesScript = 1;
+                                       have_rules_script = 1;
+                                       if (Ruleset->IsActive)
+                                       {
+                                               rules_script_active = 1;
+                                               PutBstr(HKEY("__SIEVE:RULESSCRIPT"), NewStrBufPlain(HKEY("1")));
+                                       }
+                               }
+                               Put(WCC->KnownSieveScripts, IKEY(num_scripts), Ruleset, FreeSieveListing);
 
-       /* load the rules */
-       memset(rules, 0, sizeof rules);
-       serv_printf("MSIV getscript|%s", RULES_SCRIPT);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '1') while(serv_getln(buf, sizeof (buf)), strcmp(buf, "000")) {
-               if (!strncasecmp(buf, "# WEBCIT_RULE|", 14)) {
-                       j = extract_int(buf, 1);
-                       remove_token(buf, 0, '|');
-                       remove_token(buf, 0, '|');
-                       CtdlDecodeBase64(rules[j], buf, strlen(buf));
-               }
+                               ++num_scripts;
+                       }
        }
 
-       /* load the roomnames */
-       serv_puts("LKRA");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '1') {
-               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       ++num_roomnames;
-                       if (num_roomnames > num_roomnames_alloc) {
-                               num_roomnames_alloc += 250;
-                               rooms = realloc(rooms, (num_roomnames_alloc * 128));
+       if ((num_scripts > 0) && (rules_script_active == 0)) {
+               PutBstr(HKEY("__SIEVE:EXTERNAL_SCRIPT"), NewStrBufPlain(HKEY("1")));
+       }
+
+       if (num_scripts > have_rules_script)
+       {
+               long rc = 0;
+               long len;
+               const char *Key;
+               void *vRuleset;
+
+               /* 
+                * ok; we have custom scripts, expose that via bstr, and load the payload.
+                */
+               PutBstr(HKEY("__SIEVE:HAVE_EXTERNAL_SCRIPT"), NewStrBufPlain(HKEY("1")));
+
+               it = GetNewHashPos(WCC->KnownSieveScripts, 0);
+               while (GetNextHashPos(WCC->KnownSieveScripts, it, &len, &Key, &vRuleset) && 
+                      (vRuleset != NULL))
+               {
+                       Ruleset = (SieveListing *) vRuleset;
+                       serv_printf("MSIV getscript|%s", ChrPtr(Ruleset->Name));
+                       StrBuf_ServGetln(Line);
+                       if (GetServerStatus(Line, NULL) == 1) 
+                       {
+                               Ruleset->Content = NewStrBuf();
+                               Done = 0;
+                               while(!Done && (rc = StrBuf_ServGetln(Line), rc >= 0) )
+                                       if ( (StrLength(Line)==3) && 
+                                            !strcmp(ChrPtr(Line), "000")) 
+                                       {
+                                               Done = 1;
+                                       }
+                                       else
+                                       {
+                                               if (StrLength(Ruleset->Content)>0)
+                                                       StrBufAppendBufPlain(Ruleset->Content, HKEY("\n"), 0);
+                                               StrBufAppendBuf(Ruleset->Content, Line, 0);
+                                       }
+                               if (rc < 0) break;
                        }
-                       extract_token(rooms[num_roomnames-1].name, buf, 0, '|', 128);
                }
        }
+       FreeStrBuf(&Line);
+       return WCC->KnownSieveScripts;
+}
 
 
-/*
- * This script should get called by every onChange event...
- *
- */
-       wprintf("<script type=\"text/javascript\">                                      \n"
-               "                                                                       \n"
-               "var highest_active_rule = (-1);                                        \n"
-               "                                                                       \n"
-               "function UpdateRules() {                                               \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");
-/*
- * Show only the fields relevant to the rules...
- */
-       wprintf("  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"
-               "    else {                                                             \n"
-               "      d.style.display = 'none';                                        \n"
-               "    }                                                                  \n"
-               "    d = ($('hfield'+i).options[$('hfield'+i).selectedIndex].value);    \n"
-               "    if (d == 'all') {                                                  \n"
-               "      $('div_size'+i).style.display = 'none';                          \n"
-               "      $('div_compare'+i).style.display = 'none';                       \n"
-               "      $('div_nocompare'+i).style.display = 'block';                    \n"
-               "    }                                                                  \n"
-               "    else if (d == 'size') {                                            \n"
-               "      $('div_size'+i).style.display = 'block';                         \n"
-               "      $('div_compare'+i).style.display = 'none';                       \n"
-               "      $('div_nocompare'+i).style.display = 'none';                     \n"
-               "    }                                                                  \n"
-               "    else {                                                             \n"
-               "      $('div_size'+i).style.display = 'none';                          \n"
-               "      $('div_compare'+i).style.display = 'block';                      \n"
-               "      $('div_nocompare'+i).style.display = 'none';                     \n"
-               "    }                                                                  \n"
-               "    d = ($('action'+i).options[$('action'+i).selectedIndex].value);    \n"
-               "    if (d == 'fileinto') {                                             \n"
-               "      $('div_fileinto'+i).style.display = 'block';                     \n"
-               "      $('div_redirect'+i).style.display = 'none';                      \n"
-               "      $('div_automsg'+i).style.display = 'none';                       \n"
-               "    } else if (d == 'redirect') {                                      \n"
-               "      $('div_fileinto'+i).style.display = 'none';                      \n"
-               "      $('div_redirect'+i).style.display = 'block';                     \n"
-               "      $('div_automsg'+i).style.display = 'none';                       \n"
-               "    } else if ((d == 'reject') || (d == 'vacation'))  {                \n"
-               "      $('div_fileinto'+i).style.display = 'none';                      \n"
-               "      $('div_redirect'+i).style.display = 'none';                      \n"
-               "      $('div_automsg'+i).style.display = 'block';                      \n"
-               "    } else {                                                           \n"
-               "      $('div_fileinto'+i).style.display = 'none';                      \n"
-               "      $('div_redirect'+i).style.display = 'none';                      \n"
-               "      $('div_automsg'+i).style.display = 'none';                       \n"
-               "    }                                                                  \n"
-               "    if (highest_active_rule < %d) {                                    \n", MAX_RULES-1 );
-       wprintf("      $('div_addrule').style.display = 'block';                        \n"
-               "    } else {                                                           \n"
-               "      $('div_addrule').style.display = 'none';                         \n"
-               "    }                                                                  \n"
-               "  }                                                                    \n"
-               "}                                                                      \n"
-/*
- * Add a rule (really, just un-hide it)
- */
-               "function AddRule() {                                                   \n"
-               "  highest_active_rule = highest_active_rule + 1;                       \n"
-               "  $('active'+highest_active_rule).checked = true;                      \n"
-               "  UpdateRules();                                                       \n"
-               "}                                                                      \n"
-/*
- * Swap two rules
- */
-               "function SwapRules(ra, rb) {                                           \n"
-               "                                                                       \n"
-               "  var things = new Array();                                            \n"
-               "  things[0] = 'hfield';                                                \n"
-               "  things[1] = 'compare';                                               \n"
-               "  things[2] = 'htext';                                                 \n"
-               "  things[3] = 'action';                                                \n"
-               "  things[4] = 'fileinto';                                              \n"
-               "  things[5] = 'redirect';                                              \n"
-               "  things[6] = 'final';                                                 \n"
-               "  things[7] = 'sizecomp';                                              \n"
-               "  things[8] = 'sizeval';                                               \n"
-               "  things[9] = 'automsg';                                               \n"
-               "                                                                       \n"
-               "  for (i=0; i<=9; ++i) {                                               \n"
-               "    tempval=$(things[i]+ra).value;                                     \n"
-               "    $(things[i]+ra).value = $(things[i]+rb).value;                     \n"
-               "    $(things[i]+rb).value = tempval;                                   \n"
-               "  }                                                                    \n"
-               "}                                                                      \n"
-/*
- * Delete a rule (percolate the deleted rule out to the end, then deactivate it)
- */
-               "function DeleteRule(rd) {                                              \n"
-               "  for (j=rd; j<=highest_active_rule; ++j) {                            \n"
-               "    SwapRules(j, (j+1));                                               \n"
-               "  }                                                                    \n"
-               "  $('active'+highest_active_rule).checked = false;                     \n"
-               "}                                                                      \n"
-               "</script>                                                              \n"
-       );
+typedef enum __eSieveHfield 
+{
+       from,           
+       tocc,           
+       subject,        
+       replyto,        
+       sender, 
+       resentfrom,     
+       resentto,       
+       envfrom,        
+       envto,  
+       xmailer,        
+       xspamflag,      
+       xspamstatus,    
+       listid, 
+       size,           
+       all
+} eSieveHfield;
+
+typedef enum __eSieveCompare {
+       contains,
+       notcontains,
+       is,
+       isnot,
+       matches,
+       notmatches
+} eSieveCompare;
+
+typedef enum __eSieveAction {
+       keep,
+       discard,
+       reject,
+       fileinto,
+       redirect,
+       vacation
+} eSieveAction;
+
+
+typedef enum __eSieveSizeComp {
+       larger,
+       smaller
+} eSieveSizeComp;
+
+typedef enum __eSieveFinal {
+       econtinue,
+       estop
+} eSieveFinal;
+
+
+typedef struct __SieveRule {
+       int active;
+       int sizeval;
+       eSieveHfield hfield;
+       eSieveCompare compare;
+       StrBuf *htext;
+       eSieveSizeComp sizecomp;
+       eSieveAction Action;
+       StrBuf *fileinto;
+       StrBuf *redirect;
+       StrBuf *automsg;
+       eSieveFinal final;
+}SieveRule;
 
 
-       wprintf("<br />");
 
-       wprintf("<table cellpadding=2 width=100%%>");
+int ConditionalSieveRule_hfield(StrBuf *Target, WCTemplputParams *TP)
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+       
+        return GetTemplateTokenNumber(Target, 
+                                      TP, 
+                                      3, 
+                                      from)
+                ==
+                Rule->hfield;
+}
+int ConditionalSieveRule_compare(StrBuf *Target, WCTemplputParams *TP)
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+        return GetTemplateTokenNumber(Target, 
+                                      TP, 
+                                      3, 
+                                      contains)
+                ==
+               Rule->compare;
+}
+int ConditionalSieveRule_action(StrBuf *Target, WCTemplputParams *TP)
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+        return GetTemplateTokenNumber(Target, 
+                                      TP, 
+                                      3, 
+                                      keep)
+                ==
+               Rule->Action; 
+}
+int ConditionalSieveRule_sizecomp(StrBuf *Target, WCTemplputParams *TP)
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+        return GetTemplateTokenNumber(Target, 
+                                      TP, 
+                                      3, 
+                                      larger)
+                ==
+               Rule->sizecomp;
+}
+int ConditionalSieveRule_final(StrBuf *Target, WCTemplputParams *TP)
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+        return GetTemplateTokenNumber(Target, 
+                                      TP, 
+                                      3, 
+                                      econtinue)
+                ==
+               Rule->final;
+}
+int ConditionalSieveRule_ThisRoom(StrBuf *Target, WCTemplputParams *TP)
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+        return GetTemplateTokenNumber(Target, 
+                                      TP, 
+                                      3, 
+                                      econtinue)
+                ==
+               Rule->final;
+}
+int ConditionalSieveRule_Active(StrBuf *Target, WCTemplputParams *TP)
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+        return Rule->active;
+}
+void tmplput_SieveRule_htext(StrBuf *Target, WCTemplputParams *TP) 
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+       StrBufAppendTemplate(Target, TP, Rule->htext, 0);
+}
+void tmplput_SieveRule_fileinto(StrBuf *Target, WCTemplputParams *TP) 
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+       StrBufAppendTemplate(Target, TP, Rule->fileinto, 0);
+}
+void tmplput_SieveRule_redirect(StrBuf *Target, WCTemplputParams *TP) 
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+       StrBufAppendTemplate(Target, TP, Rule->redirect, 0);
+}
+void tmplput_SieveRule_automsg(StrBuf *Target, WCTemplputParams *TP) 
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+       StrBufAppendTemplate(Target, TP, Rule->automsg, 0);
+}
+void tmplput_SieveRule_sizeval(StrBuf *Target, WCTemplputParams *TP) 
+{
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+       StrBufAppendPrintf(Target, "%d", Rule->sizeval);
+}
 
-       for (i=0; i<MAX_RULES; ++i) {
+void tmplput_SieveRule_lookup_FileIntoRoom(StrBuf *Target, WCTemplputParams *TP) 
+{
+       void *vRoom;
+       SieveRule     *Rule = (SieveRule *)CTX(CTX_SIEVESCRIPT);
+        wcsession *WCC = WC;
+       HashList *Rooms = GetRoomListHashLKRA(Target, TP);
 
-               /* Grab our existing values to populate */
-               active = extract_int(rules[i], 0);
-               extract_token(hfield, rules[i], 1, '|', sizeof hfield);
-               extract_token(compare, rules[i], 2, '|', sizeof compare);
-               extract_token(htext, rules[i], 3, '|', sizeof htext);
-               extract_token(sizecomp, rules[i], 4, '|', sizeof sizecomp);
-               sizeval = extract_int(rules[i], 5);
-               extract_token(action, rules[i], 6, '|', sizeof action);
-               extract_token(fileinto, rules[i], 7, '|', sizeof fileinto);
-               extract_token(redirect, rules[i], 8, '|', sizeof redirect);
-               extract_token(automsg, rules[i], 9, '|', sizeof automsg);
-               extract_token(final, rules[i], 10, '|', sizeof final);
-               
-               /* now generate the table row */
-
-               wprintf("<tr id=\"rule%d\" bgcolor=\"#%s\">",
-                       i,
-                       ((i%2) ? "DDDDDD" : "FFFFFF")
-               );
-
-               wprintf("<td width=5%% align=\"center\">");
-
-               wprintf("<div style=\"display:none\">");
-               wprintf("<input type=\"checkbox\" name=\"active%d\" id=\"active%d\" %s>",
-                       i, i,
-                       (active ? "checked" : "")
-               );
-               wprintf("</div>");
-
-               if (i>0) wprintf("<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();\">"
-                       "<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();\">"
-                       "<img id=\"delete%d\" border=\"0\" src=\"static/delete.gif\" "
-                       "title=\"%s\"/></a>",
-                       i, i, _("Delete rule") );
-
-               wprintf("</td>");
-
-               wprintf("<td width=5%% align=\"center\">");
-               wprintf("<font size=+2>%d</font>", i+1);
-               wprintf("</td>");
-
-               wprintf("<td width=20%%>%s ", _("If") );
-
-               char *hfield_values[14][2] = {
-                       {       "from",         _("From")               },
-                       {       "tocc",         _("To or Cc")           },
-                       {       "subject",      _("Subject")            },
-                       {       "replyto",      _("Reply-to")           },
-                       {       "sender",       _("Sender")             },
-                       {       "resentfrom",   _("Resent-From")        },
-                       {       "resentto",     _("Resent-To")          },
-                       {       "envfrom",      _("Envelope From")      },
-                       {       "envto",        _("Envelope To")        },
-                       {       "xmailer",      _("X-Mailer")           },
-                       {       "xspamflag",    _("X-Spam-Flag")        },
-                       {       "xspamstatus",  _("X-Spam-Status")      },
-                       {       "size",         _("Message size")       },
-                       {       "all",          _("All")                }
-               };
-
-               wprintf("<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>",
-                               ( (!strcasecmp(hfield, hfield_values[j][0])) ? "selected" : ""),
-                               hfield_values[j][0],
-                               hfield_values[j][1]
-                       );
-               }
+       GetHash(Rooms, SKEY(Rule->fileinto), &vRoom);
+       WCC->ThisRoom = (folder*) vRoom;
+}
 
-               wprintf("</select>");
-               wprintf("</td>");
-
-               wprintf("<td width=20%%>");
-
-               char *compare_values[6][2] = {
-                       {       "contains",     _("contains")           },
-                       {       "notcontains",  _("does not contain")   },
-                       {       "is",           _("is")                 },
-                       {       "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();\">",
-                       i, i);
-               for (j=0; j<6; ++j) {
-                       wprintf("<option %s value=\"%s\">%s</option>",
-                               ( (!strcasecmp(compare, compare_values[j][0])) ? "selected" : ""),
-                               compare_values[j][0],
-                               compare_values[j][1]
-                       );
-               }
-               wprintf("</select>");
-
-               wprintf("<input type=\"text\" id=\"htext%d\" name=\"htext%d\" value=\"", i, i);
-               escputs(htext);
-               wprintf("\"></div>");
-
-               wprintf("<div id=\"div_nocompare%d\">", i);
-               wprintf("%s", _("(All messages)"));
-               wprintf("</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();\">",
-                       i, i);
-               for (j=0; j<2; ++j) {
-                       wprintf("<option %s value=\"%s\">%s</option>",
-                               ( (!strcasecmp(sizecomp, sizecomp_values[j][0])) ? "selected" : ""),
-                               sizecomp_values[j][0],
-                               sizecomp_values[j][1]
-                       );
-               }
-               wprintf("</select>");
-
-               wprintf("<input type=\"text\" id=\"sizeval%d\" name=\"sizeval%d\" value=\"%d\">",
-                       i, i, sizeval);
-               wprintf("bytes");
-               wprintf("</div>");
-
-               wprintf("</td>");
-
-               char *action_values[6][2] = {
-                       {       "keep",         _("Keep")               },
-                       {       "discard",      _("Discard silently")   },
-                       {       "reject",       _("Reject")             },
-                       {       "fileinto",     _("Move message to")    },
-                       {       "redirect",     _("Forward to")         },
-                       {       "vacation",     _("Vacation")           }
-               };
-
-               wprintf("<td width=20%%>");
-               wprintf("<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>",
-                               ( (!strcasecmp(action, action_values[j][0])) ? "selected" : ""),
-                               action_values[j][0],
-                               action_values[j][1]
-                       );
-               }
-               wprintf("</select>");
-
-               wprintf("<div id=\"div_fileinto%d\">", i);
-               wprintf("<select name=\"fileinto%d\" id=\"fileinto%d\">", i, i);
-               for (j=0; j<num_roomnames; ++j) {
-                       wprintf("<option ");
-                       if (!strcasecmp(rooms[j].name, fileinto)) {
-                               wprintf("selected ");
-                       }
-                       wprintf("value=\"");
-                       escputs(rooms[j].name);
-                       wprintf("\">");
-                       escputs(rooms[j].name);
-                       wprintf("</option>\n");
-               }
-               wprintf("</select>\n");
-               wprintf("</div>");
-
-               wprintf("<div id=\"div_redirect%d\">", i);
-               wprintf("<input type=\"text\" id=\"redirect%d\" name=\"redirect%d\" value=\"", i, i);
-               escputs(redirect);
-               wprintf("\"></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);
-               escputs(automsg);
-               wprintf("</textarea>");
-               wprintf("</div>");
-
-               wprintf("</td>");
-
-               char *final_values[2][2] = {
-                       {       "continue",     _("continue processing")        },
-                       {       "stop",         _("stop")                       }
-               };
-
-               wprintf("<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();\">",
-                       i, i);
-               for (j=0; j<2; ++j) {
-                       wprintf("<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>");
+void FreeSieveRule(void *vRule)
+{
+       SieveRule *Rule = (SieveRule*) vRule;
 
-               wprintf("</tr>\n");
+       FreeStrBuf(&Rule->htext);
+       FreeStrBuf(&Rule->fileinto);
+       FreeStrBuf(&Rule->redirect);
+       FreeStrBuf(&Rule->automsg);
+       
+       free(Rule);
+}
 
+#define WC_RULE_HEADER "rule|"
+HashList *GetSieveRules(StrBuf *Target, WCTemplputParams *TP)
+{
+       StrBuf *Line = NULL;
+       StrBuf *EncodedRule = NULL;
+       int n = 0;
+       const char *pch = NULL;
+       HashList *SieveRules = NULL;
+       int Done = 0;
+       SieveRule *Rule = NULL;
+
+       SieveRules = NewHash(1, Flathash);
+       serv_printf("GIBR");
+       Line = NewStrBuf();
+       EncodedRule = NewStrBuf();
+       StrBuf_ServGetln(Line);
+       if (GetServerStatus(Line, NULL) == 1) 
+       {
+               while(!Done && (StrBuf_ServGetln(Line) >= 0) )
+                       if ( (StrLength(Line)==3) && 
+                            !strcmp(ChrPtr(Line), "000")) 
+                       {
+                               Done = 1;
+                       }
+                       else
+                       {
+                               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))))
+                               {
+                                       StrBufSkip_NTokenS(Line, &pch, '|', 1);
+                                       n = StrBufExtractNext_int(Line, &pch, '|'); 
+                                       StrBufExtract_NextToken(EncodedRule, Line, &pch, '|');
+                                       StrBufDecodeBase64(EncodedRule);
+
+                                       Rule = (SieveRule*) malloc(sizeof(SieveRule));
+
+                                       Rule->htext = NewStrBufPlain (NULL, StrLength(EncodedRule));
+
+                                       Rule->fileinto = NewStrBufPlain (NULL, StrLength(EncodedRule));
+                                       Rule->redirect = NewStrBufPlain (NULL, StrLength(EncodedRule));
+                                       Rule->automsg = NewStrBufPlain (NULL, StrLength(EncodedRule));
+
+                                       /* Grab our existing values to populate */
+                                       pch = NULL;
+                                       Rule->active = StrBufExtractNext_int(EncodedRule, &pch, '|');
+                                       StrBufExtract_NextToken(Line, EncodedRule, &pch, '|');
+                                       
+                                       Rule->hfield = (eSieveHfield) GetTokenDefine(SKEY(Line), tocc);
+                                       StrBufExtract_NextToken(Line, EncodedRule, &pch, '|');
+                                       Rule->compare = (eSieveCompare) GetTokenDefine(SKEY(Line), contains);
+                                       StrBufExtract_NextToken(Rule->htext, EncodedRule, &pch, '|');
+                                       StrBufExtract_NextToken(Line, EncodedRule, &pch, '|');
+                                       Rule->sizecomp = (eSieveSizeComp) GetTokenDefine(SKEY(Line), larger);
+                                       Rule->sizeval = StrBufExtractNext_int(EncodedRule, &pch, '|');
+                                       StrBufExtract_NextToken(Line, EncodedRule, &pch, '|');
+                                       Rule->Action = (eSieveAction) GetTokenDefine(SKEY(Line), keep);
+                                       StrBufExtract_NextToken(Rule->fileinto, EncodedRule, &pch, '|');
+                                       StrBufExtract_NextToken(Rule->redirect, EncodedRule, &pch, '|');
+                                       StrBufExtract_NextToken(Rule->automsg, EncodedRule, &pch, '|');
+                                       StrBufExtract_NextToken(Line, EncodedRule, &pch, '|');
+                                       Rule->final = (eSieveFinal) GetTokenDefine(SKEY(Line), econtinue);
+                                       Put(SieveRules, IKEY(n), Rule, FreeSieveRule);
+                                       n++;
+                               }
+                       }
        }
 
-       wprintf("</table>");
-       wprintf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">%s</a><br /></div>\n",
-               _("Add rule")
-       );
+       while (n < MAX_RULES) {
+               Rule = (SieveRule*) malloc(sizeof(SieveRule));
+               memset(Rule, 0, sizeof(SieveRule));
+               Put(SieveRules, IKEY(n), Rule, FreeSieveRule);
+           
+               n++;
+       }
 
-       wprintf("<script type=\"text/javascript\">                                      \n");
-       wprintf("UpdateRules();                                                         \n");
-       wprintf("</script>                                                              \n");
 
-       free(rooms);
+       FreeStrBuf(&EncodedRule);
+       FreeStrBuf(&Line);
+       return SieveRules;
+}
+
+void
+SessionDetachModule_SIEVE
+(wcsession *sess)
+{
+       DeleteHash(&sess->KnownSieveScripts);
+}
+
+void 
+InitModule_SIEVE
+(void)
+{
+       RegisterCTX(CTX_SIEVELIST);
+       RegisterCTX(CTX_SIEVESCRIPT);
+       REGISTERTokenParamDefine(from);         
+       REGISTERTokenParamDefine(tocc);         
+       REGISTERTokenParamDefine(subject);      
+       REGISTERTokenParamDefine(replyto);      
+       REGISTERTokenParamDefine(sender);       
+       REGISTERTokenParamDefine(resentfrom);   
+       REGISTERTokenParamDefine(resentto);     
+       REGISTERTokenParamDefine(envfrom);      
+       REGISTERTokenParamDefine(envto);        
+       REGISTERTokenParamDefine(xmailer);      
+       REGISTERTokenParamDefine(xspamflag);    
+       REGISTERTokenParamDefine(xspamstatus);  
+       REGISTERTokenParamDefine(listid);       
+       REGISTERTokenParamDefine(size);         
+       REGISTERTokenParamDefine(all);
+
+       REGISTERTokenParamDefine(contains);
+       REGISTERTokenParamDefine(notcontains);
+       REGISTERTokenParamDefine(is);
+       REGISTERTokenParamDefine(isnot);
+       REGISTERTokenParamDefine(matches);
+       REGISTERTokenParamDefine(notmatches);
+
+       REGISTERTokenParamDefine(keep);
+       REGISTERTokenParamDefine(discard);
+       REGISTERTokenParamDefine(reject);
+       REGISTERTokenParamDefine(fileinto);
+       REGISTERTokenParamDefine(redirect);
+       REGISTERTokenParamDefine(vacation);
+
+       REGISTERTokenParamDefine(larger);
+       REGISTERTokenParamDefine(smaller);
+
+       /* these are c-keyworads, so do it by hand. */
+       RegisterTokenParamDefine(HKEY("continue"), econtinue);
+       RegisterTokenParamDefine(HKEY("stop"), estop);
+
+       RegisterIterator("SIEVE:SCRIPTS", 0, NULL, GetSieveScriptListing, NULL, NULL, CTX_SIEVELIST, CTX_NONE, IT_NOFLAG);
+
+       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("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);
+       RegisterNamespace("SIEVE:SCRIPT:FILEINTO", 0, 1, tmplput_SieveRule_fileinto, NULL, CTX_SIEVESCRIPT);
+       RegisterNamespace("SIEVE:SCRIPT:REDIRECT", 0, 1, tmplput_SieveRule_redirect, NULL, CTX_SIEVESCRIPT);
+       RegisterNamespace("SIEVE:SCRIPT:AUTOMSG", 0, 1, tmplput_SieveRule_automsg, NULL, CTX_SIEVESCRIPT);
+
+       /* 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("display_sieve_add_or_delete"), "", 0, display_sieve_add_or_delete, 0);
 }