#define MAX_SCRIPTS 100
#define MAX_RULES 50
#define RULES_SCRIPT "__WebCit_Generated_Script__"
-<<<<<<< HEAD
-
-
-/*
- * 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);
-
- wc_printf("<div id=\"banner\">\n");
- wc_printf("<img src=\"static/webcit_icons/essen/32x32/config.png\">");
- wc_printf("<h1>");
- wc_printf(_("View/edit server-side mail filters"));
- wc_printf("</h1>\n");
- wc_printf("</div>\n");
-
- wc_printf("<div id=\"content\" class=\"service\">\n");
-
- wc_printf("<table class=\"sieve_background\">"
- "<tr><td valign=top>\n");
-
- wc_printf(_("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>"));
-
- wc_printf("</td></tr></table>\n");
- wDumpContent(1);
-}
-
-
-/*
- * view/edit sieve config
- */
-void display_sieve(void)
-{
- char script_names[MAX_SCRIPTS][64];
- int num_scripts = 0;
- int active_script = (-1);
- char buf[SIZ]; /* Don't make this buffer smaller or it will restrict line length */
- 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);
-
- serv_puts("MSIV listscripts");
- serv_getln(buf, sizeof(buf));
- if (buf[0] == '1') while (serv_getln(buf, sizeof(buf)), strcmp(buf, "000")) {
- if (num_scripts < MAX_SCRIPTS) {
- extract_token(script_names[num_scripts], buf, 0, '|', 64);
- if (extract_int(buf, 1) > 0) {
- active_script = num_scripts;
- if (!strcasecmp(script_names[num_scripts], RULES_SCRIPT)) {
- rules_script_is_active = 1;
- }
- }
- ++num_scripts;
- }
- }
-
- output_headers(1, 1, 2, 0, 0, 0);
-
- wc_printf("<script type=\"text/javascript\"> \n"
- " \n"
- "var previously_active_script; \n"
- " \n"
- "function ToggleSievePanels() { \n"
- " d = ($('sieveform').bigaction.options[$('sieveform').bigaction.selectedIndex].value); \n"
- " for (i=0; i<3; ++i) { \n"
- " if (i == d) { \n"
- " $('sievediv' + i).style.display = 'block'; \n"
- " } \n"
- " else { \n"
- " $('sievediv' + i).style.display = 'none'; \n"
- " } \n"
- " } \n"
- "} \n"
- " \n"
- "function ToggleScriptPanels() { \n"
- " d = ($('sieveform').active_script.options[$('sieveform').active_script.selectedIndex].value); \n"
- " if ($('script_' + previously_active_script)) { \n"
- " $('script_' + previously_active_script).style.display = 'none'; \n"
- " } \n"
- " $('script_' + d).style.display = 'block'; \n"
- " previously_active_script = d; \n"
- "} \n"
- " \n"
- "</script> \n"
- );
-
- wc_printf("<div id=\"banner\">\n");
- wc_printf("<img src=\"static/webcit_icons/essen/32x32/config.png\">");
- wc_printf("<h1>");
- wc_printf(_("View/edit server-side mail filters"));
- wc_printf("</h1>\n");
- wc_printf("</div>\n");
-
- wc_printf("<div id=\"content\" class=\"service\">\n");
-
- wc_printf("<table class=\"sieve_background\">"
- "<tr><td valign=top>\n");
-
-
- wc_printf("<form id=\"sieveform\" method=\"post\" action=\"save_sieve\">\n");
- wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-
- wc_printf(_("When new mail arrives: "));
- wc_printf("<select name=\"bigaction\" size=1 onChange=\"ToggleSievePanels();\">\n");
-
- wc_printf("<option %s value=\"0\">", ((active_script < 0) ? "selected" : ""));
- wc_printf(_("Leave it in my inbox without filtering"));
- wc_printf("</option>\n");
-
- wc_printf("<option %s value=\"1\">", ((rules_script_is_active) ? "selected" : ""));
- wc_printf(_("Filter it according to rules selected below"));
- wc_printf("</option>\n");
-
- wc_printf("<option %s value=\"2\">",
- (((active_script >= 0) && (!rules_script_is_active)) ? "selected" : ""));
- wc_printf(_("Filter it through a manually edited script (advanced users only)"));
- wc_printf("</option>\n");
-
- wc_printf("</select>");
-
-
-
- /* The "no filtering" div */
-
- wc_printf("<div id=\"sievediv0\" style=\"display:none\">\n");
- wc_printf("<div align=\"center\"><br><br>");
- wc_printf(_("Your incoming mail will not be filtered through any scripts."));
- wc_printf("<br><br></div>\n");
- wc_printf("</div>\n");
-
- /* The "webcit managed scripts" div */
-
- wc_printf("<div id=\"sievediv1\" style=\"display:none\">\n");
- display_rules_editor_inner_div();
- wc_printf("</div>\n");
-
- /* The "I'm smart and can write my own Sieve scripts" div */
-
- wc_printf("<div id=\"sievediv2\" style=\"display:none\">\n");
-
- if (num_scripts > 0) {
- wc_printf(_("The currently active script is: "));
- wc_printf("<select name=\"active_script\" size=1 onChange=\"ToggleScriptPanels();\">\n");
- for (i=0; i<num_scripts; ++i) {
- if (strcasecmp(script_names[i], RULES_SCRIPT)) {
- wc_printf("<option %s value=\"%s\">%s</option>\n",
- ((active_script == i) ? "selected" : ""),
- script_names[i],
- script_names[i]
- );
- }
- }
- wc_printf("</select>\n");
- }
-
- wc_printf(" ");
- wc_printf("<a href=\"display_add_remove_scripts\">%s</a>\n", _("Add or delete scripts"));
-
- wc_printf("<br>\n");
-
- if (num_scripts > 0) {
- for (i=0; i<num_scripts; ++i) {
- if (strcasecmp(script_names[i], RULES_SCRIPT)) {
- wc_printf("<div id=\"script_%s\" style=\"display:none\">\n", script_names[i]);
- wc_printf("<textarea name=\"text_%s\" wrap=soft rows=20 cols=80 width=80>\n",
- script_names[i]);
- serv_printf("MSIV getscript|%s", script_names[i]);
- serv_getln(buf, sizeof buf);
- if (buf[0] == '1') while(serv_getln(buf, sizeof (buf)), strcmp(buf, "000")) {
- wc_printf("%s\n", buf);
- }
- wc_printf("</textarea>\n");
- wc_printf("</div>\n");
- }
- }
- }
-
- wc_printf("<script type=\"text/javascript\"> \n"
- "ToggleScriptPanels(); \n"
- "</script> \n"
- );
-
- wc_printf("</div>\n");
-
-
- /* The rest of this is common for all panels... */
-
- wc_printf("<div align=\"center\"><br>");
- wc_printf("<input type=\"submit\" name=\"save_button\" value=\"%s\">", _("Save changes"));
- wc_printf(" ");
- wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
- wc_printf("</div></form>\n");
-
- wc_printf("</td></tr></table>\n");
-
- wc_printf("<script type=\"text/javascript\"> \n"
- "ToggleSievePanels(); \n"
- "</script> \n"
- );
-
- wDumpContent(1);
-
-}
-
-
-
-=======
-#define FOO 1
->>>>>>> 1423eb9402b934a3f524a9b7bfd593e9b004cc0a
+/*#define FOO 1*/
/*
* Helper function for output_sieve_rule() to output strings with quotes escaped
*/
}
void display_add_remove_scripts(char *message);
+void display_rules_editor_inner_div(void);
char buf[256];
if (!havebstr("save_button")) {
- strcpy(WC->ImportantMessage,
- _("Cancelled. Changes were not saved."));
+ AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
display_main_menu();
return;
}
}
}
- strcpy(WC->ImportantMessage, _("Your changes have been saved."));
+ AppendImportantMessage(_("Your changes have been saved."), -1);
display_main_menu();
return;
}
serv_puts("000");
#if FOO
display_add_remove_scripts(_("A new script has been created. Return to the script editing screen to edit and activate it."));
+#else
+ output_headers(1, 1, 2, 0, 0, 0);
+ do_template("sieve_add");
+ wDumpContent(1);
#endif
return;
}
#if FOO
display_add_remove_scripts(&buf[4]);
+#else
+ output_headers(1, 1, 2, 0, 0, 0);
+ do_template("sieve_add");
+ wDumpContent(1);
#endif
}
serv_getln(buf, sizeof buf);
#if FOO
display_add_remove_scripts(&buf[4]);
+#else
+ output_headers(1, 1, 2, 0, 0, 0);
+ do_template("sieve_add");
+ wDumpContent(1);
#endif
}
output_headers(1, 1, 2, 0, 0, 0);
- wc_printf("<script type=\"text/javascript\"> \n"
- " \n"
- "var previously_active_script; \n"
- " \n"
- "function ToggleSievePanels() { \n"
- " d = ($('sieveform').bigaction.options[$('sieveform').bigaction.selectedIndex].value); \n"
- " for (i=0; i<3; ++i) { \n"
- " if (i == d) { \n"
- " $('sievediv' + i).style.display = 'block'; \n"
- " } \n"
- " else { \n"
- " $('sievediv' + i).style.display = 'none'; \n"
- " } \n"
- " } \n"
- "} \n"
- " \n"
- "function ToggleScriptPanels() { \n"
- " d = ($('sieveform').active_script.options[$('sieveform').active_script.selectedIndex].value); \n"
- " if ($('script_' + previously_active_script)) { \n"
- " $('script_' + previously_active_script).style.display = 'none'; \n"
- " } \n"
- " $('script_' + d).style.display = 'block'; \n"
- " previously_active_script = d; \n"
- "} \n"
- " \n"
- "</script> \n"
- );
+ wc_printf("<script type=\"text/javascript\">\n"
+ "\n"
+ "var previously_active_script;\n"
+ "\n"
+ "function ToggleSievePanels() {\n"
+ " d = ($('sieveform').bigaction.options[$('sieveform').bigaction.selectedIndex].value);\n"
+ " for (i=0; i<3; ++i) {\n"
+ " if (i == d) {\n"
+ " $('sievediv' + i).style.display = 'block';\n"
+ " }\n"
+ " else {\n"
+ " $('sievediv' + i).style.display = 'none';\n"
+ " }\n"
+ " }\n"
+ "}\n"
+ "\n"
+ "function ToggleScriptPanels() {\n"
+ " d = ($('sieveform').active_script.options[$('sieveform').active_script.selectedIndex].value);\n"
+ " if ($('script_' + previously_active_script)) {\n"
+ " $('script_' + previously_active_script).style.display = 'none';\n"
+ " }\n"
+ " $('script_' + d).style.display = 'block';\n"
+ " previously_active_script = d;\n"
+ "}\n"
+ "\n"
+ "</script>\n"
+);
wc_printf("<div id=\"banner\">\n");
- wc_printf("<img src=\"static/advanpage2_48x.gif\">");
+ wc_printf("<img src=\"static/webcit_icons/essen/32x32/config.png\">");
wc_printf("<h1>");
wc_printf(_("View/edit server-side mail filters"));
wc_printf("</h1>\n");
wc_printf("<div id=\"content\" class=\"service\">\n");
- wc_printf("<table class=\"sieve_background\">"
- "<tr><td valign=top>\n");
+ wc_printf("<table class=\"sieve_background\">\n"
+ "<tr>\n<td valign=top>\n");
wc_printf("<form id=\"sieveform\" method=\"post\" action=\"save_sieve\">\n");
wc_printf(_("Filter it through a manually edited script (advanced users only)"));
wc_printf("</option>\n");
- wc_printf("</select>");
+ wc_printf("</select>\n\n");
);
}
}
- wc_printf("</select>\n");
+ wc_printf("</select>\n\n");
}
wc_printf(" ");
wc_printf("<table border=0 cellspacing=10><tr valign=top><td>\n");
- do_template("beginbox_1");
+ do_template("box_begin_1");
StrBufAppendBufPlain(WC->WBuf, _("Add a new script"), -1, 0);
- do_template("beginbox_2");
+ do_template("box_begin_2");
wc_printf(_("To create a new script, enter the desired "
"script name in the box below and click 'Create'."));
"<input type=\"submit\" name=\"create_button\" value=\"%s\">"
"</form></center>\n", _("Create"));
- do_template("endbox");
+ do_template("box_end");
- do_template("beginbox_1");
+ do_template("box_begin_1");
StrBufAppendBufPlain(WC->WBuf, _("Edit scripts"), -1, 0);
- do_template("beginbox_2");
+ do_template("box_begin_2");
wc_printf("<br><div align=center><a href=\"display_sieve\">%s</a><br><br>\n",
_("Return to the script editing screen")
);
- do_template("endbox");
+ do_template("box_end");
wc_printf("</td><td>");
- do_template("beginbox_1");
+ do_template("box_begin_1");
StrBufAppendBufPlain(WC->WBuf, _("Delete scripts"), -1, 0);
- do_template("beginbox_2");
+ do_template("box_begin_2");
wc_printf(_("To delete an existing script, select the script "
"name from the list and click 'Delete'."));
}
}
}
- wc_printf("</select><br>\n");
+ wc_printf("</select>\n\n<br>\n");
wc_printf("<input type=\"submit\" name=\"delete_button\" value=\"%s\" "
"onClick=\"return confirm('%s');\">", _("Delete script"), _("Delete this script?"));
wc_printf("</form></center>\n");
- do_template("endbox");
+ do_template("box_end");
wc_printf("</td></tr></table>\n");
* This script should get called by every onChange event...
*
*/
- wc_printf("<script type=\"text/javascript\"> \n"
- " \n"
- "var highest_active_rule = (-1); \n"
- " \n"
- "function UpdateRules() { \n");
+ wc_printf("<script type=\"text/javascript\">\n"
+ "\n"
+ "var highest_active_rule = (-1);\n"
+ "\n"
+ "function UpdateRules() {\n");
/*
* Show only the active rows...
*/
- wc_printf(" highest_active_rule = (-1); \n");
- wc_printf(" for (i=0; i<%d; ++i) { \n", MAX_RULES);
- wc_printf(" 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");
+ wc_printf(" highest_active_rule = (-1);\n");
+ wc_printf(" for (i=0; i<%d; ++i) {\n", MAX_RULES);
+ wc_printf(" 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...
*/
- wc_printf(" 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"
- " else { \n"
- " d.style.display = 'none'; \n"
- " } \n"
- " d = ($('hfield'+i).options[$('hfield'+i).selectedIndex].value); \n"
- " if (d == 'all') { \n"
- " $('div_size'+i).style.display = 'none'; \n"
- " $('div_compare'+i).style.display = 'none'; \n"
- " $('div_nocompare'+i).style.display = 'block'; \n"
- " } \n"
- " else if (d == 'size') { \n"
- " $('div_size'+i).style.display = 'block'; \n"
- " $('div_compare'+i).style.display = 'none'; \n"
- " $('div_nocompare'+i).style.display = 'none'; \n"
- " } \n"
- " else { \n"
- " $('div_size'+i).style.display = 'none'; \n"
- " $('div_compare'+i).style.display = 'block'; \n"
- " $('div_nocompare'+i).style.display = 'none'; \n"
- " } \n"
- " d = ($('action'+i).options[$('action'+i).selectedIndex].value); \n"
- " if (d == 'fileinto') { \n"
- " $('div_fileinto'+i).style.display = 'block'; \n"
- " $('div_redirect'+i).style.display = 'none'; \n"
- " $('div_automsg'+i).style.display = 'none'; \n"
- " } else if (d == 'redirect') { \n"
- " $('div_fileinto'+i).style.display = 'none'; \n"
- " $('div_redirect'+i).style.display = 'block'; \n"
- " $('div_automsg'+i).style.display = 'none'; \n"
- " } else if ((d == 'reject') || (d == 'vacation')) { \n"
- " $('div_fileinto'+i).style.display = 'none'; \n"
- " $('div_redirect'+i).style.display = 'none'; \n"
- " $('div_automsg'+i).style.display = 'block'; \n"
- " } else { \n"
- " $('div_fileinto'+i).style.display = 'none'; \n"
- " $('div_redirect'+i).style.display = 'none'; \n"
- " $('div_automsg'+i).style.display = 'none'; \n"
- " } \n"
- " if (highest_active_rule < %d) { \n", MAX_RULES-1 );
- wc_printf(" $('div_addrule').style.display = 'block'; \n"
- " } else { \n"
- " $('div_addrule').style.display = 'none'; \n"
- " } \n"
- " } \n"
- "} \n"
+ wc_printf(" 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"
+ " else {\n"
+ " d.style.display = 'none';\n"
+ " }\n"
+ " d = ($('hfield'+i).options[$('hfield'+i).selectedIndex].value);\n"
+ " if (d == 'all') {\n"
+ " $('div_size'+i).style.display = 'none'; \n"
+ " $('div_compare'+i).style.display = 'none';\n"
+ " $('div_nocompare'+i).style.display = 'block';\n"
+ " }\n"
+ " else if (d == 'size') {\n"
+ " $('div_size'+i).style.display = 'block'; \n"
+ " $('div_compare'+i).style.display = 'none';\n"
+ " $('div_nocompare'+i).style.display = 'none';\n"
+ " }\n"
+ " else {\n"
+ " $('div_size'+i).style.display = 'none'; \n"
+ " $('div_compare'+i).style.display = 'block';\n"
+ " $('div_nocompare'+i).style.display = 'none';\n"
+ " }\n"
+ " d = ($('action'+i).options[$('action'+i).selectedIndex].value);\n"
+ " if (d == 'fileinto') {\n"
+ " $('div_fileinto'+i).style.display = 'block';\n"
+ " $('div_redirect'+i).style.display = 'none';\n"
+ " $('div_automsg'+i).style.display = 'none';\n"
+ " } else if (d == 'redirect') {\n"
+ " $('div_fileinto'+i).style.display = 'none';\n"
+ " $('div_redirect'+i).style.display = 'block';\n"
+ " $('div_automsg'+i).style.display = 'none';\n"
+ " } else if ((d == 'reject') || (d == 'vacation')) {\n"
+ " $('div_fileinto'+i).style.display = 'none';\n"
+ " $('div_redirect'+i).style.display = 'none';\n"
+ " $('div_automsg'+i).style.display = 'block';\n"
+ " } else {\n"
+ " $('div_fileinto'+i).style.display = 'none';\n"
+ " $('div_redirect'+i).style.display = 'none';\n"
+ " $('div_automsg'+i).style.display = 'none';\n"
+ " }\n"
+ " if (highest_active_rule < %d) {\n", MAX_RULES-1 );
+ wc_printf(" $('div_addrule').style.display = 'block';\n"
+ " } else {\n"
+ " $('div_addrule').style.display = 'none';\n"
+ " }\n"
+ " }\n"
+ "}\n"
/*
* Add a rule (really, just un-hide it)
*/
- "function AddRule() { \n"
- " highest_active_rule = highest_active_rule + 1; \n"
- " $('active'+highest_active_rule).checked = true; \n"
- " UpdateRules(); \n"
- "} \n"
+ "function AddRule() {\n"
+ " highest_active_rule = highest_active_rule + 1;\n"
+ " $('active'+highest_active_rule).checked = true;\n"
+ " UpdateRules();\n"
+ "}\n"
/*
* Swap two rules
*/
- "function SwapRules(ra, rb) { \n"
- " \n"
- " var things = new Array(); \n"
- " things[0] = 'hfield'; \n"
- " things[1] = 'compare'; \n"
- " things[2] = 'htext'; \n"
- " things[3] = 'action'; \n"
- " things[4] = 'fileinto'; \n"
- " things[5] = 'redirect'; \n"
- " things[6] = 'final'; \n"
- " things[7] = 'sizecomp'; \n"
- " things[8] = 'sizeval'; \n"
- " things[9] = 'automsg'; \n"
- " \n"
- " for (i=0; i<=9; ++i) { \n"
- " tempval=$(things[i]+ra).value; \n"
- " $(things[i]+ra).value = $(things[i]+rb).value; \n"
- " $(things[i]+rb).value = tempval; \n"
- " } \n"
- "} \n"
+ "function SwapRules(ra, rb) {\n"
+ "\n"
+ " var things = new Array();\n"
+ " things[0] = 'hfield';\n"
+ " things[1] = 'compare';\n"
+ " things[2] = 'htext';\n"
+ " things[3] = 'action';\n"
+ " things[4] = 'fileinto';\n"
+ " things[5] = 'redirect';\n"
+ " things[6] = 'final';\n"
+ " things[7] = 'sizecomp';\n"
+ " things[8] = 'sizeval';\n"
+ " things[9] = 'automsg';\n"
+ "\n"
+ " for (i=0; i<=9; ++i) {\n"
+ " tempval=$(things[i]+ra).value;\n"
+ " $(things[i]+ra).value = $(things[i]+rb).value;\n"
+ " $(things[i]+rb).value = tempval;\n"
+ " }\n"
+ "}\n"
/*
* Delete a rule (percolate the deleted rule out to the end, then deactivate it)
*/
- "function DeleteRule(rd) { \n"
- " for (j=rd; j<=highest_active_rule; ++j) { \n"
- " SwapRules(j, (j+1)); \n"
- " } \n"
- " $('active'+highest_active_rule).checked = false; \n"
- "} \n"
- "</script> \n"
- );
+ "function DeleteRule(rd) {\n"
+ " for (j=rd; j<=highest_active_rule; ++j) {\n"
+ " SwapRules(j, (j+1));\n"
+ " }\n"
+ " $('active'+highest_active_rule).checked = false;\n"
+ "}\n"
+ "</script>\n"
+ );
wc_printf("<br>");
/* now generate the table row */
- wc_printf("<tr id=\"rule%d\" bgcolor=\"#%s\">",
+ wc_printf("<tr id=\"rule%d\" class=\"%s\">",
i,
- ((i%2) ? "DDDDDD" : "FFFFFF")
+ ((i%2) ? "odd" : "even")
);
- wc_printf("<td width=5%% align=\"center\">");
+ wc_printf("<td width=5%% align=\"center\">\n");
- wc_printf("<div style=\"display:none\">");
- wc_printf("<input type=\"checkbox\" name=\"active%d\" id=\"active%d\" %s>",
+ wc_printf("<div style=\"display:none\">\n");
+ wc_printf("<input type=\"checkbox\" name=\"active%d\" id=\"active%d\" %s>\n",
i, i,
(active ? "checked" : "")
);
- wc_printf("</div>");
+ wc_printf("</div>\n");
if (i>0) wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
"<img border=\"0\" src=\"static/webcit_icons/up_pointer.gif\" "
- "title=\"%s\"/></a>",
+ "title=\"%s\"/></a>\n",
i-1, i, _("Move rule up") );
wc_printf("<a href=\"javascript:SwapRules(%d,%d);UpdateRules();\">"
"<img id=\"movedown%d\" border=\"0\" src=\"static/webcit_icons/down_pointer.gif\" "
- "title=\"%s\"/></a>",
+ "title=\"%s\"/></a>\n",
i, i+1, i, _("Move rule down") );
wc_printf("<a href=\"javascript:DeleteRule(%d);UpdateRules();\">"
"<img id=\"delete%d\" border=\"0\" src=\"static/webcit_icons/delete.gif\" "
- "title=\"%s\"/></a>",
+ "title=\"%s\"/></a>\n",
i, i, _("Delete rule") );
- wc_printf("</td>");
+ wc_printf("</td>\n\n\n");
- wc_printf("<td width=5%% align=\"center\">");
- wc_printf("<font size=+2>%d</font>", i+1);
- wc_printf("</td>");
+ wc_printf("<td width=5%% align=\"center\">\n");
+ wc_printf("<font size=+2>%d</font>\n", i+1);
+ wc_printf("</td>\n");
wc_printf("<td width=20%%>%s ", _("If") );
wc_printf("<select id=\"hfield%d\" name=\"hfield%d\" size=1 onChange=\"UpdateRules();\">",
i, i);
for (j=0; j<15; ++j) {
- wc_printf("<option %s value=\"%s\">%s</option>",
+ wc_printf("<option %s value=\"%s\">%s</option>\n",
( (!strcasecmp(hfield, hfield_values[j][0])) ? "selected" : ""),
hfield_values[j][0],
hfield_values[j][1]
);
}
- wc_printf("</select>");
+ wc_printf("</select>\n\n");
wc_printf("</td>");
wc_printf("<td width=20%%>");
{ "notmatches", _("does not match") }
};
- wc_printf("<div id=\"div_compare%d\">", i);
- wc_printf("<select id=\"compare%d\" name=\"compare%d\" size=1 onChange=\"UpdateRules();\">",
+ wc_printf("<div id=\"div_compare%d\">\n", i);
+ wc_printf("<select id=\"compare%d\" name=\"compare%d\" size=1 onChange=\"UpdateRules();\">\n",
i, i);
for (j=0; j<6; ++j) {
- wc_printf("<option %s value=\"%s\">%s</option>",
+ wc_printf("<option %s value=\"%s\">%s</option>\n",
( (!strcasecmp(compare, compare_values[j][0])) ? "selected" : ""),
compare_values[j][0],
compare_values[j][1]
);
}
- wc_printf("</select>");
+ wc_printf("</select>\n\n");
wc_printf("<input type=\"text\" id=\"htext%d\" name=\"htext%d\" value=\"", i, i);
escputs(htext);
- wc_printf("\"></div>");
+ wc_printf("\">\n</div>\n");
wc_printf("<div id=\"div_nocompare%d\">", i);
wc_printf("%s", _("(All messages)"));
- wc_printf("</div>");
+ wc_printf("</div>\n");
char *sizecomp_values[2][2] = {
{ "larger", _("is larger than") },
{ "smaller", _("is smaller than") }
};
- wc_printf("<div id=\"div_size%d\">", i);
- wc_printf("<select id=\"sizecomp%d\" name=\"sizecomp%d\" size=1 onChange=\"UpdateRules();\">",
+ wc_printf("<div id=\"div_size%d\">\n", i);
+ wc_printf("<select id=\"sizecomp%d\" name=\"sizecomp%d\" size=1 onChange=\"UpdateRules();\">\n",
i, i);
for (j=0; j<2; ++j) {
- wc_printf("<option %s value=\"%s\">%s</option>",
+ wc_printf("<option %s value=\"%s\">%s</option>\n",
( (!strcasecmp(sizecomp, sizecomp_values[j][0])) ? "selected" : ""),
sizecomp_values[j][0],
sizecomp_values[j][1]
);
}
- wc_printf("</select>");
+ wc_printf("</select>\n\n");
wc_printf("<input type=\"text\" id=\"sizeval%d\" name=\"sizeval%d\" value=\"%d\">",
i, i, sizeval);
{ "vacation", _("Vacation") }
};
- wc_printf("<td width=20%%>");
- wc_printf("<select id=\"action%d\" name=\"action%d\" size=1 onChange=\"UpdateRules();\">",
+ wc_printf("<td width=20%%>\n");
+ wc_printf("<select id=\"action%d\" name=\"action%d\" size=1 onChange=\"UpdateRules();\">\n",
i, i);
for (j=0; j<6; ++j) {
- wc_printf("<option %s value=\"%s\">%s</option>",
+ wc_printf("<option %s value=\"%s\">%s</option>\n",
( (!strcasecmp(action, action_values[j][0])) ? "selected" : ""),
action_values[j][0],
action_values[j][1]
);
}
- wc_printf("</select>");
+ wc_printf("</select>\n\n");
- wc_printf("<div id=\"div_fileinto%d\">", i);
- wc_printf("<select name=\"fileinto%d\" id=\"fileinto%d\">", i, i);
+ wc_printf("<div id=\"div_fileinto%d\">\n", i);
+ wc_printf("<select name=\"fileinto%d\" id=\"fileinto%d\">\n", i, i);
for (j=0; j<num_roomnames; ++j) {
wc_printf("<option ");
if (!strcasecmp(rooms[j].name, fileinto)) {
escputs(rooms[j].name);
wc_printf("</option>\n");
}
- wc_printf("</select>\n");
+ wc_printf("</select>\n\n");
wc_printf("</div>");
- wc_printf("<div id=\"div_redirect%d\">", i);
+ wc_printf("<div id=\"div_redirect%d\">\n", i);
wc_printf("<input type=\"text\" id=\"redirect%d\" name=\"redirect%d\" value=\"", i, i);
escputs(redirect);
- wc_printf("\"></div>");
+ wc_printf("\">\n</div>\n");
- wc_printf("<div id=\"div_automsg%d\">", i);
+ wc_printf("<div id=\"div_automsg%d\">\n", i);
wc_printf(_("Message:"));
- wc_printf("<br>");
+ wc_printf("<br>\n");
wc_printf("<textarea name=\"automsg%d\" id=\"automsg%d\" wrap=soft rows=5>\n", i, i);
escputs(automsg);
wc_printf("</textarea>");
- wc_printf("</div>");
+ wc_printf("</div>\n");
- wc_printf("</td>");
+ wc_printf("</td>\n");
char *final_values[2][2] = {
{ "continue", _("continue processing") },
{ "stop", _("stop") }
};
- wc_printf("<td width=10%% align=\"center\">%s</td>", _("and then") );
+ wc_printf("<td width=10%% align=\"center\">%s</td>\n", _("and then") );
- wc_printf("<td width=20%%>");
- wc_printf("<select name=\"final%d\" id=\"final%d\" size=1 onChange=\"UpdateRules();\">",
+ wc_printf("<td width=20%%>\n");
+ wc_printf("<select name=\"final%d\" id=\"final%d\" size=1 onChange=\"UpdateRules();\">\n",
i, i);
for (j=0; j<2; ++j) {
- wc_printf("<option %s value=\"%s\">%s</option>",
+ wc_printf("<option %s value=\"%s\">%s</option>\n",
( (!strcasecmp(final, final_values[j][0])) ? "selected" : ""),
final_values[j][0],
final_values[j][1]
);
}
- wc_printf("</select>");
- wc_printf("</td>");
+ wc_printf("</select>\n\n");
+ wc_printf("</td>\n");
wc_printf("</tr>\n");
}
- wc_printf("</table>");
+ wc_printf("</table>\n");
wc_printf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">%s</a><br></div>\n",
_("Add rule")
);
- wc_printf("<script type=\"text/javascript\"> \n");
- wc_printf("UpdateRules(); \n");
- wc_printf("</script> \n");
+ wc_printf("<script type=\"text/javascript\">\n");
+ wc_printf("UpdateRules();\n");
+ wc_printf("</script>\n");
free(rooms);
}
Ruleset->Name = NewStrBufPlain(NULL, StrLength(Line));
StrBufExtract_NextToken(Ruleset->Name, Line, &pch, '|');
Ruleset->IsActive = StrBufExtractNext_int(Line, &pch, '|');
+ Ruleset->Content = NULL;
if (!strcasecmp(ChrPtr(Ruleset->Name), RULES_SCRIPT))
{
if (num_scripts > have_rules_script)
{
- long rc;
+ long rc = 0;
long len;
const char *Key;
void *vRuleset;
SieveRule *Rule = (SieveRule *)CTX;
return Rule->active;
}
-
-
-/*
-void tmplput_SieveRule_hfield(StrBuf *Target, WCTemplputParams *TP)
-{
- SieveRule *Rule = (SieveRule *)CTX;
- StrBufAppendTemplate(Target, TP, Rule->hfield, 0);
-}
-void tmplput_SieveRule_compare(StrBuf *Target, WCTemplputParams *TP)
-{
- SieveRule *Rule = (SieveRule *)CTX;
- StrBufAppendTemplate(Target, TP, Rule->compare, 0);
-}
-*/
void tmplput_SieveRule_htext(StrBuf *Target, WCTemplputParams *TP)
{
SieveRule *Rule = (SieveRule *)CTX;
StrBufAppendTemplate(Target, TP, Rule->htext, 0);
}
-/*
-void tmplput_SieveRule_sizecomp(StrBuf *Target, WCTemplputParams *TP)
-{
- SieveRule *Rule = (SieveRule *)CTX;
- StrBufAppendTemplate(Target, TP, Rule->sizecomp, 0);
-}
-void tmplput_SieveRule_action(StrBuf *Target, WCTemplputParams *TP)
-{
- SieveRule *Rule = (SieveRule *)CTX;
- StrBufAppendTemplate(Target, TP, Rule->action, 0);
- }*/
void tmplput_SieveRule_fileinto(StrBuf *Target, WCTemplputParams *TP)
{
SieveRule *Rule = (SieveRule *)CTX;
SieveRule *Rule = (SieveRule *)CTX;
StrBufAppendTemplate(Target, TP, Rule->automsg, 0);
}
-/*
-void tmplput_SieveRule_final(StrBuf *Target, WCTemplputParams *TP)
+void tmplput_SieveRule_sizeval(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+ StrBufAppendPrintf(Target, "%d", Rule->sizeval);
+}
+
+void tmplput_SieveRule_lookup_FileIntoRoom(StrBuf *Target, WCTemplputParams *TP)
{
+ void *vRoom;
SieveRule *Rule = (SieveRule *)CTX;
- StrBufAppendTemplate(Target, TP, Rule->final, 0);
+ wcsession *WCC = WC;
+ HashList *Rooms = GetRoomListHashLKRA(Target, TP);
+
+ GetHash(Rooms, SKEY(Rule->fileinto), &vRoom);
+ WCC->ThisRoom = (folder*) vRoom;
}
-*/
+
void FreeSieveRule(void *vRule)
{
- SieveRule *Rule = (SieveRule*) Rule;
+ SieveRule *Rule = (SieveRule*) vRule;
FreeStrBuf(&Rule->htext);
FreeStrBuf(&Rule->fileinto);
int Done = 0;
SieveRule *Rule;
+ SieveRules = NewHash(1, Flathash);
serv_printf("MSIV getscript|"RULES_SCRIPT);
Line = NewStrBuf();
EncodedRule = NewStrBuf();
StrBuf_ServGetln(Line);
if (GetServerStatus(Line, NULL) == 1)
{
- SieveRules = NewHash(1, Flathash);
-
while(!Done && (StrBuf_ServGetln(Line) >= 0) )
if ( (StrLength(Line)==3) &&
!strcmp(ChrPtr(Line), "000"))
StrBufExtract_NextToken(Line, EncodedRule, &pch, '|');
Rule->final = (eSieveFinal) GetTokenDefine(SKEY(Line), econtinue);
Put(SieveRules, IKEY(n), Rule, FreeSieveRule);
+ n++;
}
}
}
+ while (n < MAX_RULES) {
+ Rule = (SieveRule*) malloc(sizeof(SieveRule));
+ memset(Rule, 0, sizeof(SieveRule));
+ Put(SieveRules, IKEY(n), Rule, FreeSieveRule);
+
+ n++;
+ }
+
+
FreeStrBuf(&EncodedRule);
FreeStrBuf(&Line);
return SieveRules;
RegisterTokenParamDefine(HKEY("continue"), econtinue);
RegisterTokenParamDefine(HKEY("stop"), estop);
- RegisterIterator("SIEVE:SCRIPTS", 0, NULL, GetSieveRules, NULL, NULL, CTX_SIEVELIST, CTX_NONE, IT_NOFLAG);
-
- RegisterIterator("SIEVE:RULES", 0, NULL, GetSieveRules, NULL, DeleteHash, CTX_SIEVESCRIPT, CTX_NONE, IT_NOFLAG);
+ RegisterIterator("SIEVE:SCRIPTS", 0, NULL, GetSieveScriptListing, NULL, NULL, CTX_SIEVELIST, CTX_NONE, IT_NOFLAG);
RegisterConditional(HKEY("COND:SIEVE:SCRIPT:ACTIVE"), 0, ConditionalSieveScriptIsActive, CTX_SIEVELIST);
RegisterConditional(HKEY("COND:SIEVE:SCRIPT:ISRULES"), 0, ConditionalSieveScriptIsRulesScript, CTX_SIEVELIST);
- RegisterNamespace("SIEVE:SCRIPT:NAME", 0, 1, tmplput_SieveScriptName, NULL, CTX_ROOMS);
+ RegisterNamespace("SIEVE:SCRIPT:NAME", 0, 1, tmplput_SieveScriptName, NULL, CTX_SIEVELIST);
RegisterNamespace("SIEVE:SCRIPT:CONTENT", 0, 1, tmplput_SieveScriptContent, NULL, CTX_SIEVELIST);
+ RegisterIterator("SIEVE:RULES", 0, NULL, GetSieveRules, NULL, DeleteHash, CTX_SIEVESCRIPT, CTX_NONE, IT_NOFLAG);
+
RegisterConditional(HKEY("COND:SIEVE:ACTIVE"), 1, ConditionalSieveRule_Active, CTX_SIEVESCRIPT);
RegisterConditional(HKEY("COND:SIEVE:HFIELD"), 1, ConditionalSieveRule_hfield, CTX_SIEVESCRIPT);
RegisterConditional(HKEY("COND:SIEVE:COMPARE"), 1, ConditionalSieveRule_compare, CTX_SIEVESCRIPT);
RegisterConditional(HKEY("COND:SIEVE:FINAL"), 1, ConditionalSieveRule_final, CTX_SIEVESCRIPT);
RegisterConditional(HKEY("COND:SIEVE:THISROOM"), 1, ConditionalSieveRule_ThisRoom, CTX_SIEVESCRIPT);
- //RegisterNamespace("SIEVE:SCRIPT:HFIELD", 0, 1, tmplput_SieveRule_hfield, NULL, CTX_SIEVESCRIPT);
- //RegisterNamespace("SIEVE:SCRIPT:COMPARE", 0, 1, tmplput_SieveRule_compare, NULL, CTX_SIEVESCRIPT);
RegisterNamespace("SIEVE:SCRIPT:HTEXT", 0, 1, tmplput_SieveRule_htext, NULL, CTX_SIEVESCRIPT);
- //RegisterNamespace("SIEVE:SCRIPT:SIZECOMP", 0, 1, tmplput_SieveRule_sizecomp, NULL, CTX_SIEVESCRIPT);
- ///RegisterNamespace("SIEVE:SCRIPT:ACTION", 0, 1, tmplput_SieveRule_action, NULL, CTX_SIEVESCRIPT);
+ RegisterNamespace("SIEVE:SCRIPT:SIZE", 0, 1, tmplput_SieveRule_sizeval, NULL, CTX_SIEVESCRIPT);
RegisterNamespace("SIEVE:SCRIPT:FILEINTO", 0, 1, tmplput_SieveRule_fileinto, NULL, CTX_SIEVESCRIPT);
RegisterNamespace("SIEVE:SCRIPT:REDIRECT", 0, 1, tmplput_SieveRule_redirect, NULL, CTX_SIEVESCRIPT);
RegisterNamespace("SIEVE:SCRIPT:AUTOMSG", 0, 1, tmplput_SieveRule_automsg, NULL, CTX_SIEVESCRIPT);
- ///RegisterNamespace("SIEVE:SCRIPT:FINAL", 0, 1, tmplput_SieveRule_final, NULL, CTX_SIEVESCRIPT);
+
+ /* fetch our room into WCC->ThisRoom, to evaluate while iterating over rooms with COND:THIS:THAT:ROOM */
+ RegisterNamespace("SIEVE:SCRIPT:LOOKUP_FILEINTO", 0, 1, tmplput_SieveRule_lookup_FileIntoRoom, NULL, CTX_SIEVESCRIPT);
#if FOO
WebcitAddUrlHandler(HKEY("display_sieve"), "", 0, display_sieve, 0);
projects / citadel.git / blobdiff