/*
- * $Id: $
+ * $Id$
*/
/**
* \defgroup Sieve view/edit sieve config
);
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=\"%ld\">\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
*/
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
*/
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, "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;");
}
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') {
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);
+ action, fileinto, redirect, automsg, final, my_addresses);
serv_printf("");
}
serv_puts("stop;");
serv_puts("000");
-
}
char this_name[64];
char buf[256];
- if (strlen(bstr("save_button")) == 0) {
+ if (IsEmptyStr(bstr("save_button"))) {
strcpy(WC->ImportantMessage,
_("Cancelled. Changes were not saved."));
display_main_menu();
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("<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\">"
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");
" \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%%>");
- 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");
projects / citadel.git / blobdiff