#include "webcit.h"
#define MAX_SCRIPTS 100
-#define MAX_RULES 25
+#define MAX_RULES 50
#define RULES_SCRIPT "__WebCit_Generated_Script__"
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;
}
);
}
+ 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,
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("");
}
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");
}
}
}
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", NULL);
+ do_template("beginboxx", NULL);
wprintf(_("To create a new script, enter the desired "
"script name in the box below and click 'Create'."));
do_template("endbox", NULL);
svput("BOXTITLE", WCS_STRING, _("Edit scripts"));
- do_template("beginbox", NULL);
+ do_template("beginboxx", NULL);
wprintf("<br /><div align=center><a href=\"display_sieve\">%s</a><br /><br />\n",
_("Return to the script editing screen")
);
wprintf("</td><td>");
svput("BOXTITLE", WCS_STRING, _("Delete scripts"));
- do_template("beginbox", NULL);
+ do_template("beginboxx", NULL);
wprintf(_("To delete an existing script, select the script "
"name from the list and click 'Delete'."));
wprintf("<td width=20%%>%s ", _("If") );
- char *hfield_values[14][2] = {
+ char *hfield_values[15][2] = {
{ "from", _("From") },
{ "tocc", _("To or Cc") },
{ "subject", _("Subject") },
{ "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],
InitModule_SIEVE
(void)
{
- WebcitAddUrlHandler(HKEY("display_sieve"), display_sieve, 0);
- WebcitAddUrlHandler(HKEY("save_sieve"), save_sieve, 0);
- WebcitAddUrlHandler(HKEY("display_add_remove_scripts"), _display_add_remove_scripts, 0);
- WebcitAddUrlHandler(HKEY("create_script"), create_script, 0);
- WebcitAddUrlHandler(HKEY("delete_script"), delete_script, 0);
+ 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);
}