* move serv_info into the session, here we can control its de/allocation the right...

[citadel.git] / webcit / sieve.c

diff --git a/webcit/sieve.c b/webcit/sieve.c
index d4d00dab74771c026a5db96cd60bc1e8f8981f87..ee9449883117ee8ebc9158904ffb80ea2fc5df76 100644 (file)
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -49,7 +49,7 @@ void display_sieve(void)
        int i;
        int rules_script_is_active = 0;
 
-       if (!serv_info.serv_supports_sieve) {
+       if (!WC->serv_info->serv_supports_sieve) {
                display_no_sieve();
                return;
        }
@@ -355,6 +355,13 @@ void output_sieve_rule(char *hfield, char *compare, char *htext, char *sizecomp,
                );
        }
 
+       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,
@@ -539,7 +546,7 @@ void parse_fields_from_rule_editor(void) {
                        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("");
+                       serv_puts("");
                }
 
 
@@ -649,7 +656,7 @@ void display_add_remove_scripts(char *message)
        wprintf("<table border=0 cellspacing=10><tr valign=top><td>\n");
 
        svput("BOXTITLE", WCS_STRING, _("Add a new script"));
-       do_template("beginbox");
+       do_template("beginboxx", NULL);
 
        wprintf(_("To create a new script, enter the desired "
                "script name in the box below and click 'Create'."));
@@ -662,19 +669,19 @@ void display_add_remove_scripts(char *message)
                "<input type=\"submit\" name=\"create_button\" value=\"%s\">"
                "</form></center>\n", _("Create"));
 
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        svput("BOXTITLE", WCS_STRING, _("Edit scripts"));
-       do_template("beginbox");
+       do_template("beginboxx", NULL);
        wprintf("<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>");
 
        svput("BOXTITLE", WCS_STRING, _("Delete scripts"));
-       do_template("beginbox");
+       do_template("beginboxx", NULL);
 
        wprintf(_("To delete an existing script, select the script "
                "name from the list and click 'Delete'."));
@@ -702,7 +709,7 @@ void display_add_remove_scripts(char *message)
         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");
+       do_template("endbox", NULL);
 
        wprintf("</td></tr></table>\n");
 
@@ -983,7 +990,7 @@ void display_rules_editor_inner_div(void) {
 
                wprintf("<td width=20%%>%s ", _("If") );
 
-               char *hfield_values[14][2] = {
+               char *hfield_values[15][2] = {
                        {       "from",         _("From")               },
                        {       "tocc",         _("To or Cc")           },
                        {       "subject",      _("Subject")            },
@@ -996,13 +1003,14 @@ 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();\">",
                        i, i);
-               for (j=0; j<14; ++j) {
+               for (j=0; j<15; ++j) {
                        wprintf("<option %s value=\"%s\">%s</option>",
                                ( (!strcasecmp(hfield, hfield_values[j][0])) ? "selected" : ""),
                                hfield_values[j][0],