/*
- * $Id: $
+ * $Id$
*/
-/**
- * \defgroup Sieve view/edit sieve config
- * \ingroup WebcitDisplayItems
- */
-/*@{*/
+
#include "webcit.h"
#define MAX_SCRIPTS 100
#define MAX_RULES 25
#define RULES_SCRIPT "__WebCit_Generated_Script__"
-/**
- * \brief view/edit sieve config
+
+/*
+ * 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 buf[256];
int i;
int rules_script_is_active = 0;
-
+
+ if (!WC->serv_info->serv_supports_sieve) {
+ display_no_sieve();
+ return;
+ }
memset(script_names, 0, sizeof script_names);
);
wprintf("<div id=\"banner\">\n");
- wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
- wprintf("<SPAN CLASS=\"titlebar\">"
- "<img src=\"static/advanpage2_48x.gif\">");
+ wprintf("<img src=\"static/advanpage2_48x.gif\">");
+ wprintf("<h1>");
wprintf(_("View/edit server-side mail filters"));
- wprintf("</SPAN>\n");
- wprintf("</TD></TR></TABLE>\n");
- wprintf("</div>\n<div id=\"content\">\n");
+ wprintf("</h1>\n");
+ wprintf("</div>\n");
+
+ wprintf("<div id=\"content\" class=\"service\">\n");
wprintf("<div class=\"fix_scrollbar_bug\">"
- "<table border=0 width=100%% bgcolor=\"#FFFFFF\">"
+ "<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=\"%d\">\n", WC->nonce);
wprintf(_("When new mail arrives: "));
wprintf("<select name=\"bigaction\" size=1 onChange=\"ToggleSievePanels();\">\n");
-/**
- * \brief Helper function for output_sieve_rule() to output strings with quotes escaped
+/*
+ * Helper function for output_sieve_rule() to output strings with quotes escaped
*/
void osr_sanitize(char *str) {
- int i;
+ int i, len;
if (str == NULL) return;
- for (i=0; i<strlen(str); ++i) {
+ len = strlen(str);
+ for (i=0; i<len; ++i) {
if (str[i]=='\"') {
str[i] = '\'' ;
}
}
-/**
- * \brief Output parseable Sieve script code based on rules input
+/*
+ * 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 *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);
- /* FIXME ... do conditional */
+ /* 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;");
+ serv_printf("keep;");
}
else if (!strcasecmp(action, "discard")) {
- serv_printf(" discard;");
+ serv_printf("discard;");
}
else if (!strcasecmp(action, "reject")) {
- serv_printf(" reject \"%s\";", automsg);
+ serv_printf("reject \"%s\";", automsg);
}
else if (!strcasecmp(action, "fileinto")) {
- serv_printf(" fileinto \"%s\";", fileinto);
+ serv_printf("fileinto \"%s\";", fileinto);
}
else if (!strcasecmp(action, "redirect")) {
- serv_printf(" redirect \"%s\";", redirect);
+ serv_printf("redirect \"%s\";", redirect);
}
else if (!strcasecmp(action, "vacation")) {
- serv_printf(" vacation \"%s\";", automsg);
+ serv_printf("vacation :addresses [%s]\n\"%s\";", my_addresses, automsg);
}
/* Do 'final' action */
if (!strcasecmp(final, "stop")) {
- serv_printf(" stop;");
+ serv_printf("stop;");
}
-/**
- * \brief Translate the fields from the rule editor into something we can save...
+/*
+ * Translate the fields from the rule editor into something we can save...
*/
void parse_fields_from_rule_editor(void) {
char redirect[256];
char automsg[1024];
char final[32];
-
int i;
char buf[256];
char fname[256];
char rule[2048];
char encoded_rule[4096];
+ char my_addresses[4096];
+
+ /* Enumerate my email addresses in case they are needed for a vacation rule */
+ my_addresses[0] = 0;
+ serv_puts("GVEA");
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ if (!IsEmptyStr(my_addresses)) {
+ strcat(my_addresses, ",\n");
+ }
+ strcat(my_addresses, "\"");
+ strcat(my_addresses, buf);
+ strcat(my_addresses, "\"");
+ }
+ /* Now generate the script and write it to the Citadel server */
serv_printf("MSIV putscript|%s|", RULES_SCRIPT);
serv_getln(buf, sizeof buf);
if (buf[0] != '4') {
strcpy(rule, "");
sprintf(fname, "active%d", i);
- active = !strcasecmp(bstr(fname), "on") ;
+ active = !strcasecmp(BSTR(fname), "on") ;
if (active) {
sprintf(fname, "hfield%d", i);
- safestrncpy(hfield, bstr(fname), sizeof hfield);
+ safestrncpy(hfield, BSTR(fname), sizeof hfield);
sprintf(fname, "compare%d", i);
- safestrncpy(compare, bstr(fname), sizeof compare);
+ safestrncpy(compare, BSTR(fname), sizeof compare);
sprintf(fname, "htext%d", i);
- safestrncpy(htext, bstr(fname), sizeof htext);
+ safestrncpy(htext, BSTR(fname), sizeof htext);
sprintf(fname, "sizecomp%d", i);
- safestrncpy(sizecomp, bstr(fname), sizeof sizecomp);
+ safestrncpy(sizecomp, BSTR(fname), sizeof sizecomp);
sprintf(fname, "sizeval%d", i);
- sizeval = atoi(bstr(fname));
+ sizeval = IBSTR(fname);
sprintf(fname, "action%d", i);
- safestrncpy(action, bstr(fname), sizeof action);
+ safestrncpy(action, BSTR(fname), sizeof action);
sprintf(fname, "fileinto%d", i);
- safestrncpy(fileinto, bstr(fname), sizeof fileinto);
+ safestrncpy(fileinto, BSTR(fname), sizeof fileinto);
sprintf(fname, "redirect%d", i);
- safestrncpy(redirect, bstr(fname), sizeof redirect);
+ safestrncpy(redirect, BSTR(fname), sizeof redirect);
sprintf(fname, "automsg%d", i);
- safestrncpy(automsg, bstr(fname), sizeof automsg);
+ safestrncpy(automsg, BSTR(fname), sizeof automsg);
sprintf(fname, "final%d", i);
- safestrncpy(final, bstr(fname), sizeof final);
+ safestrncpy(final, BSTR(fname), sizeof final);
snprintf(rule, sizeof rule, "%d|%s|%s|%s|%s|%d|%s|%s|%s|%s|%s",
active, hfield, compare, htext, sizecomp, sizeval, action, fileinto,
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);
- serv_printf("");
+ action, fileinto, redirect, automsg, final, my_addresses);
+ serv_puts("");
}
serv_puts("stop;");
serv_puts("000");
-
}
-/**
- * \brief save sieve config
+/*
+ * save sieve config
*/
void save_sieve(void) {
int bigaction;
char this_name[64];
char buf[256];
- if (strlen(bstr("save_button")) == 0) {
+ if (!havebstr("save_button")) {
strcpy(WC->ImportantMessage,
_("Cancelled. Changes were not saved."));
display_main_menu();
}
}
- bigaction = atoi(bstr("bigaction"));
+ bigaction = ibstr("bigaction");
if (bigaction == 0) {
serv_puts("MSIV setactive||");
serv_getln(buf, sizeof buf);
if (buf[0] == '4') {
snprintf(this_name, sizeof this_name, "text_%s", script_names[i]);
- striplt(bstr(this_name));
+ striplt((char*)BSTR(this_name)); /* TODO: get rid of typecast*/
serv_printf("%s", bstr(this_name));
serv_puts("000");
}
}
-/**
- * \brief show a list of available scripts to add/remove them
+/*
+ * show a list of available scripts to add/remove them
*/
void display_add_remove_scripts(char *message)
{
output_headers(1, 1, 2, 0, 0, 0);
wprintf("<div id=\"banner\">\n");
- wprintf("<table width=100%% border=0 bgcolor=#444455><tr>"
- "<td>"
- "<span class=\"titlebar\">"
- "<img src=\"static/advanpage2_48x.gif\">");
+ wprintf("<img src=\"static/advanpage2_48x.gif\">");
wprintf(_("Add or delete scripts"));
- wprintf("</span></td></tr></table>\n"
- "</div>\n<div id=\"content\">\n"
- );
+ 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");
- svprintf("BOXTITLE", WCS_STRING, _("Add a new script"));
- do_template("beginbox");
+ svput("BOXTITLE", WCS_STRING, _("Add a new script"));
+ 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=\"%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);
- svprintf("BOXTITLE", WCS_STRING, _("Edit scripts"));
- do_template("beginbox");
+ svput("BOXTITLE", WCS_STRING, _("Edit scripts"));
+ 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>");
- svprintf("BOXTITLE", WCS_STRING, _("Delete scripts"));
- do_template("beginbox");
+ svput("BOXTITLE", WCS_STRING, _("Delete scripts"));
+ do_template("beginboxx", NULL);
wprintf(_("To delete an existing script, select the script "
"name from the list and click 'Delete'."));
wprintf("<center>"
"<form method=\"POST\" action=\"delete_script\">\n");
+ 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");
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");
-/**
- * \brief delete a script
+/*
+ * delete a script
*/
void delete_script(void) {
char buf[256];
-/**
- * \brief create a new script
+/*
+ * create a new script
* take the web environment script name and create it on the citadel server
*/
void create_script(void) {
" \n"
"var highest_active_rule = (-1); \n"
" \n"
- "function UpdateRules() { \n"
- " for (i=0; i<%d; ++i) { \n", MAX_RULES);
- wprintf(" d = ($('movedown'+i)); \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"
" $('div_addrule').style.display = 'none'; \n"
" } \n"
" } \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"
"} \n"
/*
* Add a rule (really, just un-hide it)
* Delete a rule (percolate the deleted rule out to the end, then deactivate it)
*/
"function DeleteRule(rd) { \n"
- " for (i=rd; i<highest_active_rule; ++i) { \n"
- " SwapRules(i, (i+1)); \n"
+ " for (j=rd; j<=highest_active_rule; ++j) { \n"
+ " SwapRules(j, (j+1)); \n"
" } \n"
" $('active'+highest_active_rule).checked = false; \n"
"} \n"
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],
wprintf("<td width=20%%>");
- char *compare_values[4][2] = {
+ char *compare_values[6][2] = {
{ "contains", _("contains") },
{ "notcontains", _("does not contain") },
{ "is", _("is") },
- { "isnot", _("is not") }
+ { "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<4; ++j) {
+ for (j=0; j<6; ++j) {
wprintf("<option %s value=\"%s\">%s</option>",
( (!strcasecmp(compare, compare_values[j][0])) ? "selected" : ""),
compare_values[j][0],
wprintf("selected ");
}
wprintf("value=\"");
- urlescputs(rooms[j].name);
+ escputs(rooms[j].name);
wprintf("\">");
escputs(rooms[j].name);
wprintf("</option>\n");
}
wprintf("</table>");
- wprintf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">Add rule</a><br /></div>\n");
+ wprintf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">%s</a><br /></div>\n",
+ _("Add rule")
+ );
wprintf("<script type=\"text/javascript\"> \n");
wprintf("UpdateRules(); \n");
free(rooms);
}
+void _display_add_remove_scripts(void) {display_add_remove_scripts(NULL);}
-
-
-
-/*@}*/
+void
+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);
+}
projects / citadel.git / blobdiff