X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsieve.c;h=214e7b4460759f252f02ed8be8e32fcfefd36ae7;hb=5d38a76f8f06640e3a3f097d584ac52336110f7c;hp=3110acd7cb2d20ce3d3034ed294fcd043c55583f;hpb=0f72e15a12dcc90e3dbfc01ff35c0e910a8d419e;p=citadel.git
diff --git a/webcit/sieve.c b/webcit/sieve.c
index 3110acd7c..214e7b446 100644
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -1,200 +1,29 @@
-/*
- * $Id$
- */
-/**
- * \defgroup Sieve view/edit sieve config
- * \ingroup WebcitDisplayItems
+/*
+ * Copyright (c) 1996-2012 by the citadel.org team
+ *
+ * This program is open source software. You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * FIXME: add logic to exclude the webcit-generated script from the manual script selection
*/
-/*@{*/
+
#include "webcit.h"
+CtxType CTX_SIEVELIST = CTX_NONE;
+CtxType CTX_SIEVESCRIPT = CTX_NONE;
+
#define MAX_SCRIPTS 100
-#define MAX_RULES 25
+#define MAX_RULES 50
#define RULES_SCRIPT "__WebCit_Generated_Script__"
-/**
- * \brief 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];
- int i;
- int rules_script_is_active = 0;
-
-
- 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);
-
- wprintf(" \n"
- );
-
- wprintf("
\n");
- wprintf("");
- wprintf("
");
- wprintf(_("View/edit server-side mail filters"));
- wprintf("
\n");
- wprintf("
\n");
-
- wprintf("
\n");
-
- wprintf("
"
- "
"
- "
\n");
-
-
- wprintf("\n");
-
- wprintf("
\n");
-
- wprintf(" \n"
- );
-
- wDumpContent(1);
-
-}
-
-
-/**
- * \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;
@@ -212,8 +41,8 @@ void osr_sanitize(char *str) {
}
-/**
- * \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,
@@ -326,6 +155,13 @@ void output_sieve_rule(char *hfield, char *compare, char *htext, char *sizecomp,
);
}
+ 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,
@@ -358,7 +194,6 @@ void output_sieve_rule(char *hfield, char *compare, char *htext, char *sizecomp,
serv_printf("{");
}
-
/* Do action */
if (!strcasecmp(action, "keep")) {
@@ -385,28 +220,24 @@ void output_sieve_rule(char *hfield, char *compare, char *htext, char *sizecomp,
serv_printf("vacation :addresses [%s]\n\"%s\";", my_addresses, automsg);
}
-
/* Do 'final' action */
if (!strcasecmp(final, "stop")) {
serv_printf("stop;");
}
-
/* Close the braces if we're in a conditional loop */
if (strcasecmp(hfield, "all")) {
serv_printf("}");
}
-
/* End of rule. */
}
-
-/**
- * \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) {
@@ -467,39 +298,39 @@ 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,
@@ -510,7 +341,7 @@ void parse_fields_from_rule_editor(void) {
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("");
}
@@ -518,26 +349,22 @@ void parse_fields_from_rule_editor(void) {
serv_puts("stop;");
serv_puts("000");
-
}
-
-/**
- * \brief save sieve config
+/*
+ * save sieve config
*/
void save_sieve(void) {
int bigaction;
char script_names[MAX_SCRIPTS][64];
int num_scripts = 0;
- int active_script = (-1);
int i;
char this_name[64];
char buf[256];
- if (IsEmptyStr(bstr("save_button"))) {
- strcpy(WC->ImportantMessage,
- _("Cancelled. Changes were not saved."));
+ if (!havebstr("save_button")) {
+ AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
display_main_menu();
return;
}
@@ -549,14 +376,11 @@ void save_sieve(void) {
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;
- }
++num_scripts;
}
}
- bigaction = atoi(bstr("bigaction"));
+ bigaction = ibstr("bigaction");
if (bigaction == 0) {
serv_puts("MSIV setactive||");
@@ -585,551 +409,557 @@ void save_sieve(void) {
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");
}
}
}
}
- strcpy(WC->ImportantMessage, _("Your changes have been saved."));
+ AppendImportantMessage(_("Your changes have been saved."), -1);
display_main_menu();
return;
}
-/**
- * \brief show a list of available scripts to add/remove them
- */
-void display_add_remove_scripts(char *message)
-{
- char buf[256];
- char script_name[256];
-
+void display_sieve_add_or_delete(void) {
output_headers(1, 1, 2, 0, 0, 0);
- wprintf("
\n");
-
- svprintf("BOXTITLE", WCS_STRING, _("Add a new script"));
- do_template("beginbox");
-
- wprintf(_("To create a new script, enter the desired "
- "script name in the box below and click 'Create'."));
- wprintf("
\n",
- _("Return to the script editing screen")
- );
- do_template("endbox");
-
- wprintf("
");
+ do_template("sieve_add");
+ wDumpContent(1);
+}
- svprintf("BOXTITLE", WCS_STRING, _("Delete scripts"));
- do_template("beginbox");
- wprintf(_("To delete an existing script, select the script "
- "name from the list and click 'Delete'."));
- wprintf("
");
-
- wprintf("
"
- "
\n");
- do_template("endbox");
+/*
+ * create a new script
+ * take the web environment script name and create it on the citadel server
+ */
+void create_script(void) {
+ char buf[256];
- wprintf("