* add a Display name to our handlers; this will be used by DAV handlers.

[citadel.git] / webcit / sieve.c

diff --git a/webcit/sieve.c b/webcit/sieve.c
index a566c79410214d30f6982d7ed4bde0e751effe94..54977f2f86a9899c3466f73ee716b97b0974ae1d 100644 (file)
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -5,7 +5,7 @@
 #include "webcit.h"
 
 #define MAX_SCRIPTS    100
-#define MAX_RULES      25
+#define MAX_RULES      50
 #define RULES_SCRIPT   "__WebCit_Generated_Script__"
 
 
@@ -45,11 +45,11 @@ 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 (!serv_info.serv_supports_sieve) {
+       if (!WC->serv_info->serv_supports_sieve) {
                display_no_sieve();
                return;
        }
@@ -116,7 +116,7 @@ void display_sieve(void)
 
 
        wprintf("<form id=\"sieveform\" method=\"post\" action=\"save_sieve\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
        wprintf(_("When new mail arrives: "));
         wprintf("<select name=\"bigaction\" size=1 onChange=\"ToggleSievePanels();\">\n");
@@ -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("");
                }
 
 
@@ -613,9 +620,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((char*)BSTR(this_name)); /* TODO: get rid of typecast*/
-                                       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");
                                }
                        }
                }
@@ -644,37 +651,39 @@ void display_add_remove_scripts(char *message)
        
        wprintf("<div id=\"content\" class=\"service\">\n");
 
-       if (message != NULL) wprintf(message);
+       if (message != NULL) {
+               wprintf("%s", 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'."));
        wprintf("<br /><br />");
 
         wprintf("<center><form method=\"POST\" action=\"create_script\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\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");
+       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'."));
@@ -682,7 +691,7 @@ void display_add_remove_scripts(char *message)
        
         wprintf("<center>"
                "<form method=\"POST\" action=\"delete_script\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
         wprintf("<select name=\"script_name\" size=10 style=\"width:100%%\">\n");
 
         serv_puts("MSIV listscripts");
@@ -702,7 +711,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 +992,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 +1005,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],
@@ -1155,3 +1165,16 @@ void display_rules_editor_inner_div(void) {
 
        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);
+}