X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsieve.c;h=cce70574ae927c451f165af0488e47215e27ac8c;hb=b26e3e79fcb15dc1b46f4c7710a6bafdc6472950;hp=dd049cf82a81ea894a682a1da77ae0c428a74cc6;hpb=f6e3cd67388eae6f1c6736a56c916f1a22072237;p=citadel.git diff --git a/webcit/sieve.c b/webcit/sieve.c index dd049cf82..cce70574a 100644 --- a/webcit/sieve.c +++ b/webcit/sieve.c @@ -1,28 +1,26 @@ /* - * Copyright (c) 1996-2011 by the citadel.org team + * 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 as - * published by the Free Software Foundation; either version 3 of the - * License, or (at your option) any later version. + * 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. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 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 50 #define RULES_SCRIPT "__WebCit_Generated_Script__" -/*#define FOO 1*/ /* * Helper function for output_sieve_rule() to output strings with quotes escaped @@ -42,13 +40,6 @@ void osr_sanitize(char *str) { } } -void display_add_remove_scripts(char *message); -void display_rules_editor_inner_div(void); - - - - - /* * Output parseable Sieve script code based on rules input @@ -203,7 +194,6 @@ void output_sieve_rule(char *hfield, char *compare, char *htext, char *sizecomp, serv_printf("{"); } - /* Do action */ if (!strcasecmp(action, "keep")) { @@ -230,26 +220,22 @@ 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. */ } - /* * Translate the fields from the rule editor into something we can save... */ @@ -351,7 +337,10 @@ void parse_fields_from_rule_editor(void) { redirect, automsg, final ); - CtdlEncodeBase64(encoded_rule, rule, strlen(rule)+1, 0); + size_t len = CtdlEncodeBase64(encoded_rule, rule, strlen(rule)+1, 0); + if (encoded_rule[len - 1] == '\n') { + encoded_rule[len - 1] = '\0'; + } serv_printf("# WEBCIT_RULE|%d|%s|", i, encoded_rule); output_sieve_rule(hfield, compare, htext, sizecomp, sizeval, action, fileinto, redirect, automsg, final, my_addresses); @@ -366,7 +355,6 @@ void parse_fields_from_rule_editor(void) { } - /* * save sieve config */ @@ -374,7 +362,6 @@ void save_sieve(void) { int bigaction; char script_names[MAX_SCRIPTS][64]; int num_scripts = 0; - int active_script = (-1); /* this throws a 'set but not used' warning , check this ! */ int i; char this_name[64]; char buf[256]; @@ -392,9 +379,6 @@ 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; } } @@ -441,6 +425,15 @@ void save_sieve(void) { return; } + +void display_sieve_add_or_delete(void) { + output_headers(1, 1, 2, 0, 0, 0); + do_template("sieve_add"); + wDumpContent(1); +} + + + /* * create a new script * take the web environment script name and create it on the citadel server @@ -450,43 +443,25 @@ void create_script(void) { serv_printf("MSIV getscript|%s", bstr("script_name")); serv_getln(buf, sizeof buf); - if (buf[0] == '1') { + if (buf[0] == '1') { // does script exist already? while (serv_getln(buf, sizeof(buf)), strcmp(buf, "000")) { - /* flush */ + // yes -- flush the output } -#if FOO - display_add_remove_scripts(_("A script by that name already exists.")); -#endif - return; } - - serv_printf("MSIV putscript|%s", bstr("script_name")); - serv_getln(buf, sizeof buf); - if (buf[0] == '4') { - serv_puts("keep;"); - 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; + else { + // no -- safe to create a new one by this name + serv_printf("MSIV putscript|%s", bstr("script_name")); + serv_getln(buf, sizeof buf); + if (buf[0] == '4') { + serv_puts("keep;"); + serv_puts("000"); + } } -#if FOO - display_add_remove_scripts(&buf[4]); -#else - output_headers(1, 1, 2, 0, 0, 0); - do_template("sieve_add"); - wDumpContent(1); -#endif + display_sieve_add_or_delete(); } - - /* * delete a script */ @@ -495,15 +470,8 @@ void delete_script(void) { serv_printf("MSIV deletescript|%s", bstr("script_name")); 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 + display_sieve_add_or_delete(); } - /* @@ -511,692 +479,11 @@ void delete_script(void) { */ void display_no_sieve(void) { - output_headers(1, 1, 2, 0, 0, 0); + output_headers(1, 1, 1, 0, 0, 0); do_template("sieve_none"); wDumpContent(1); } -#if FOO -/* - * 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("\n" -); - - wc_printf("
\n"); - - wc_printf("\n"); - - - wc_printf("\n"); - - wc_printf(" |
\n");
-
- do_template("box_begin_1");
- StrBufAppendBufPlain(WC->WBuf, _("Add a new script"), -1, 0);
- do_template("box_begin_2");
-
- wc_printf(_("To create a new script, enter the desired "
- "script name in the box below and click 'Create'."));
- wc_printf(" "); - - wc_printf(" | ");
-
- do_template("box_begin_1");
- StrBufAppendBufPlain(WC->WBuf, _("Delete scripts"), -1, 0);
- do_template("box_begin_2");
-
- wc_printf(_("To delete an existing script, select the script "
- "name from the list and click 'Delete'."));
- wc_printf(" "); - - wc_printf(" |
\n"); - - wc_printf("" - "\n", - i-1, i, _("Move rule up") ); - - wc_printf("" - "\n", - i, i+1, i, _("Move rule down") ); - - wc_printf("" - "\n", - i, i, _("Delete rule") ); - - wc_printf(" | \n\n\n"); - - wc_printf(" \n"); - - if (i>0) wc_printf("\n"); - wc_printf("%d\n", i+1); - wc_printf(" | \n"); - - wc_printf("%s ", _("If") ); - - char *hfield_values[15][2] = { - { "from", _("From") }, - { "tocc", _("To or Cc") }, - { "subject", _("Subject") }, - { "replyto", _("Reply-to") }, - { "sender", _("Sender") }, - { "resentfrom", _("Resent-From") }, - { "resentto", _("Resent-To") }, - { "envfrom", _("Envelope From") }, - { "envto", _("Envelope To") }, - { "xmailer", _("X-Mailer") }, - { "xspamflag", _("X-Spam-Flag") }, - { "xspamstatus", _("X-Spam-Status") }, - { "listid", _("List-ID") }, - { "size", _("Message size") }, - { "all", _("All") } - }; - - wc_printf("\n\n"); - wc_printf(" | "); - - wc_printf("");
-
- char *compare_values[6][2] = {
- { "contains", _("contains") },
- { "notcontains", _("does not contain") },
- { "is", _("is") },
- { "isnot", _("is not") },
- { "matches", _("matches") },
- { "notmatches", _("does not match") }
- };
-
- wc_printf(" \n", i);
- wc_printf("\n\n");
-
- wc_printf("\n \n");
-
- wc_printf("", i);
- wc_printf("%s", _("(All messages)"));
- wc_printf(" \n");
-
- char *sizecomp_values[2][2] = {
- { "larger", _("is larger than") },
- { "smaller", _("is smaller than") }
- };
-
- wc_printf("\n", i);
- wc_printf("\n\n");
-
- wc_printf("",
- i, i, sizeval);
- wc_printf("bytes");
- wc_printf(" ");
-
- wc_printf(" | ");
-
- char *action_values[6][2] = {
- { "keep", _("Keep") },
- { "discard", _("Discard silently") },
- { "reject", _("Reject") },
- { "fileinto", _("Move message to") },
- { "redirect", _("Forward to") },
- { "vacation", _("Vacation") }
- };
-
- wc_printf("\n");
- wc_printf("\n\n");
-
- wc_printf(" \n", i);
- wc_printf("\n\n");
- wc_printf(" ");
-
- wc_printf("\n", i);
- wc_printf("\n \n");
-
- wc_printf("\n", i);
- wc_printf(_("Message:"));
- wc_printf(" \n");
-
- wc_printf("\n"); - wc_printf(""); - wc_printf(" | \n");
-
- char *final_values[2][2] = {
- { "continue", _("continue processing") },
- { "stop", _("stop") }
- };
-
- wc_printf("%s | \n", _("and then") ); - - wc_printf("\n"); - wc_printf("\n\n"); - wc_printf(" | \n"); - - wc_printf("\n"); - - } - - wc_printf("