/*
* $Id$
*/
-/**
- * \defgroup Sieve view/edit sieve config
- * \ingroup WebcitDisplayItems
- */
-/*@{*/
+
#include "webcit.h"
#define MAX_SCRIPTS 100
-#define MAX_RULES 25
+#define MAX_RULES 50
#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 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 (!WC->serv_info->serv_supports_sieve) {
+ display_no_sieve();
+ return;
+ }
memset(script_names, 0, sizeof script_names);
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");
-/**
- * \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, len;
}
-/**
- * \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,
);
}
+ 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,
-/**
- * \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) {
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,
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("");
}
-/**
- * \brief save sieve config
+/*
+ * save sieve config
*/
void save_sieve(void) {
int bigaction;
char this_name[64];
char buf[256];
- if (IsEmptyStr(bstr("save_button"))) {
+ 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));
- 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");
}
}
}
}
-/**
- * \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)
{
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");
- 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=\"%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);
- 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=\"%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");
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) {
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],
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);
+}
projects / citadel.git / blobdiff