\n");
-
- wc_printf(" \n"
- );
-
- wDumpContent(1);
-
-}
-
-
-
+/*#define FOO 1*/
/*
* Helper function for output_sieve_rule() to output strings with quotes escaped
*/
@@ -252,6 +40,13 @@ 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
@@ -583,8 +378,7 @@ void save_sieve(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;
}
@@ -640,68 +434,328 @@ void save_sieve(void) {
}
}
- strcpy(WC->ImportantMessage, _("Your changes have been saved."));
+ AppendImportantMessage(_("Your changes have been saved."), -1);
display_main_menu();
return;
}
-
/*
- * show a list of available scripts to add/remove them
+ * create a new script
+ * take the web environment script name and create it on the citadel server
*/
-void display_add_remove_scripts(char *message)
-{
+void create_script(void) {
char buf[256];
- char script_name[256];
- output_headers(1, 1, 2, 0, 0, 0);
- wc_printf("
\n");
+ serv_printf("MSIV getscript|%s", bstr("script_name"));
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '1') {
+ while (serv_getln(buf, sizeof(buf)), strcmp(buf, "000")) {
+ /* flush */
+ }
+#if FOO
+ display_add_remove_scripts(_("A script by that name already exists."));
+#endif
+ return;
+ }
- wc_printf("
\n");
-
- if (message != NULL) {
- wc_printf("%s", message);
+ 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;
}
- wc_printf("
\n");
+#if FOO
+ display_add_remove_scripts(&buf[4]);
+#else
+ output_headers(1, 1, 2, 0, 0, 0);
+ do_template("sieve_add");
+ wDumpContent(1);
+#endif
+}
- do_template("beginbox_1");
- StrBufAppendBufPlain(WC->WBuf, _("Add a new script"), -1, 0);
- do_template("beginbox_2");
- wc_printf(_("To create a new script, enter the desired "
- "script name in the box below and click 'Create'."));
- wc_printf("%s \n",
- _("Return to the script editing screen")
- );
- do_template("endbox");
+ 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
+}
+
- wc_printf("
");
- do_template("beginbox_1");
- StrBufAppendBufPlain(WC->WBuf, _("Delete scripts"), -1, 0);
- do_template("beginbox_2");
+/*
+ * dummy panel indicating to the user that the server doesn't support Sieve
+ */
+void display_no_sieve(void) {
- wc_printf(_("To delete an existing script, select the script "
- "name from the list and click 'Delete'."));
+ output_headers(1, 1, 2, 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("
");
+ wc_printf("
");
+ wc_printf(_("View/edit server-side mail filters"));
+ wc_printf(" \n");
+ wc_printf("
\n");
+
+ wc_printf("
\n"
+ "\n\n");
+
+
+ wc_printf("\n");
+
+ wc_printf("
\n");
+
+ wc_printf(" \n"
+ );
+
+ wDumpContent(1);
+
+}
+
+
+
+
+/*
+ * show a list of available scripts to add/remove them
+ */
+void display_add_remove_scripts(char *message)
+{
+ char buf[256];
+ char script_name[256];
+
+ output_headers(1, 1, 2, 0, 0, 0);
+ wc_printf("
\n");
+ wc_printf("
");
+ wc_printf(_("Add or delete scripts"));
+ wc_printf("\n");
+ wc_printf("
\n");
+
+ wc_printf("
\n");
+
+ if (message != NULL) {
+ wc_printf("%s", message);
+ }
+
+ 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("%s \n",
+ _("Return to the script editing screen")
+ );
+ do_template("box_end");
+
+ 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(""
@@ -721,12 +775,12 @@ void display_add_remove_scripts(char *message)
}
}
}
- wc_printf(" \n");
- do_template("endbox");
+ do_template("box_end");
wc_printf("
\n");
@@ -735,48 +789,6 @@ void display_add_remove_scripts(char *message)
-/*
- * delete a script
- */
-void delete_script(void) {
- char buf[256];
-
- serv_printf("MSIV deletescript|%s", bstr("script_name"));
- serv_getln(buf, sizeof buf);
- display_add_remove_scripts(&buf[4]);
-}
-
-
-
-/*
- * create a new script
- * take the web environment script name and create it on the citadel server
- */
-void create_script(void) {
- char buf[256];
-
- serv_printf("MSIV getscript|%s", bstr("script_name"));
- serv_getln(buf, sizeof buf);
- if (buf[0] == '1') {
- while (serv_getln(buf, sizeof(buf)), strcmp(buf, "000")) {
- /* flush */
- }
- display_add_remove_scripts(_("A script by that name already exists."));
- return;
- }
-
- serv_printf("MSIV putscript|%s", bstr("script_name"));
- serv_getln(buf, sizeof buf);
- if (buf[0] == '4') {
- serv_puts("keep;");
- serv_puts("000");
- display_add_remove_scripts(_("A new script has been created. Return to the script editing screen to edit and activate it."));
- return;
- }
-
- display_add_remove_scripts(&buf[4]);
-}
-
@@ -835,118 +847,118 @@ void display_rules_editor_inner_div(void) {
* This script should get called by every onChange event...
*
*/
- wc_printf(" \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"
+ "\n"
+ );
wc_printf("
");
@@ -970,40 +982,40 @@ void display_rules_editor_inner_div(void) {
/* now generate the table row */
- wc_printf("
",
+ wc_printf(" ",
i,
- ((i%2) ? "DDDDDD" : "FFFFFF")
+ ((i%2) ? "odd" : "even")
);
- wc_printf("");
+ wc_printf(" \n");
- wc_printf("\n");
if (i>0) wc_printf(""
- " ",
+ ""
- " ",
+ ""
- " ",
+ " ");
+ wc_printf("\n\n\n");
- wc_printf("");
- wc_printf("%d ", i+1);
- wc_printf(" ");
+ wc_printf("\n");
+ wc_printf("%d \n", i+1);
+ wc_printf(" \n");
wc_printf("%s ", _("If") );
@@ -1028,14 +1040,14 @@ void display_rules_editor_inner_div(void) {
wc_printf("",
i, i);
for (j=0; j<15; ++j) {
- wc_printf("%s ",
+ wc_printf("%s \n",
( (!strcasecmp(hfield, hfield_values[j][0])) ? "selected" : ""),
hfield_values[j][0],
hfield_values[j][1]
);
}
- wc_printf(" ");
+ wc_printf("\n\n");
wc_printf(" ");
wc_printf("");
@@ -1049,42 +1061,42 @@ void display_rules_editor_inner_div(void) {
{ "notmatches", _("does not match") }
};
- wc_printf("", i);
- wc_printf("
",
+ wc_printf("\n", i);
+ wc_printf("\n",
i, i);
for (j=0; j<6; ++j) {
- wc_printf("%s ",
+ wc_printf("%s \n",
( (!strcasecmp(compare, compare_values[j][0])) ? "selected" : ""),
compare_values[j][0],
compare_values[j][1]
);
}
- wc_printf(" ");
+ wc_printf("\n\n");
wc_printf("
");
+ wc_printf("\">\n ", i);
wc_printf("%s", _("(All messages)"));
- wc_printf("
");
+ wc_printf("\n");
char *sizecomp_values[2][2] = {
{ "larger", _("is larger than") },
{ "smaller", _("is smaller than") }
};
- wc_printf("", i);
- wc_printf("
",
+ wc_printf("\n", i);
+ wc_printf("
\n",
i, i);
for (j=0; j<2; ++j) {
- wc_printf("%s ",
+ wc_printf("%s \n",
( (!strcasecmp(sizecomp, sizecomp_values[j][0])) ? "selected" : ""),
sizecomp_values[j][0],
sizecomp_values[j][1]
);
}
- wc_printf(" ");
+ wc_printf("\n\n");
wc_printf("
",
i, i, sizeval);
@@ -1102,20 +1114,20 @@ void display_rules_editor_inner_div(void) {
{ "vacation", _("Vacation") }
};
- wc_printf("
");
- wc_printf("",
+ wc_printf("\n");
+ wc_printf("\n",
i, i);
for (j=0; j<6; ++j) {
- wc_printf("%s ",
+ wc_printf("%s \n",
( (!strcasecmp(action, action_values[j][0])) ? "selected" : ""),
action_values[j][0],
action_values[j][1]
);
}
- wc_printf(" ");
+ wc_printf("\n\n");
- wc_printf("", i);
- wc_printf("
", i, i);
+ wc_printf("\n", i);
+ wc_printf("\n", i, i);
for (j=0; j\n");
}
- wc_printf(" \n");
+ wc_printf("\n\n");
wc_printf("
");
- wc_printf("", i);
+ wc_printf("
\n", i);
wc_printf("
");
+ wc_printf("\">\n
", i);
+ wc_printf("
\n", i);
wc_printf(_("Message:"));
- wc_printf("
");
+ wc_printf("
");
+ wc_printf(" \n");
char *final_values[2][2] = {
{ "continue", _("continue processing") },
{ "stop", _("stop") }
};
- wc_printf("
%s ", _("and then") );
+ wc_printf("
%s \n", _("and then") );
- wc_printf("
");
- wc_printf("",
+ wc_printf("\n");
+ wc_printf("\n",
i, i);
for (j=0; j<2; ++j) {
- wc_printf("%s ",
+ wc_printf("%s \n",
( (!strcasecmp(final, final_values[j][0])) ? "selected" : ""),
final_values[j][0],
final_values[j][1]
);
}
- wc_printf(" ");
- wc_printf(" ");
+ wc_printf(" \n\n");
+ wc_printf(" \n");
wc_printf("
\n");
}
- wc_printf("
");
+ wc_printf("\n");
wc_printf("
\n",
_("Add rule")
);
- wc_printf(" \n");
+ wc_printf("\n");
free(rooms);
}
-
void _display_add_remove_scripts(void) {display_add_remove_scripts(NULL);}
+#endif
+
+
+typedef struct __SieveListing {
+ int IsActive;
+ int IsRulesScript;
+ StrBuf *Name;
+ StrBuf *Content;
+} SieveListing;
+
+int ConditionalSieveScriptIsActive(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveListing *SieveList = (SieveListing *)CTX;
+ return SieveList->IsActive;
+}
+int ConditionalSieveScriptIsRulesScript(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveListing *SieveList = (SieveListing *)CTX;
+ return SieveList->IsActive;
+}
+void tmplput_SieveScriptName(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveListing *SieveList = (SieveListing *)CTX;
+ StrBufAppendTemplate(Target, TP, SieveList->Name, 0);
+}
+void tmplput_SieveScriptContent(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveListing *SieveList = (SieveListing *)CTX;
+ StrBufAppendTemplate(Target, TP, SieveList->Content, 0);
+}
+void FreeSieveListing(void *vSieveListing)
+{
+ SieveListing *List = (SieveListing*) vSieveListing;
+
+ FreeStrBuf(&List->Name);
+ free(List);
+}
+
+HashList *GetSieveScriptListing(StrBuf *Target, WCTemplputParams *TP)
+{
+ wcsession *WCC = WC;
+ StrBuf *Line;
+ int num_scripts = 0;
+ int rules_script_active = 0;
+ int have_rules_script = 0;
+ const char *pch;
+ HashPos *it;
+ int Done = 0;
+ SieveListing *Ruleset;
+
+ if (WCC->KnownSieveScripts != NULL)
+ return WCC->KnownSieveScripts;
+
+ serv_puts("MSIV listscripts");
+ Line = NewStrBuf();
+ StrBuf_ServGetln(Line);
+ if (GetServerStatus(Line, NULL) == 1)
+ {
+ WCC->KnownSieveScripts = NewHash(1, Flathash);
+
+ while(!Done && (StrBuf_ServGetln(Line) >= 0) )
+ if ( (StrLength(Line)==3) &&
+ !strcmp(ChrPtr(Line), "000"))
+ {
+ Done = 1;
+ }
+ else
+ {
+ pch = NULL;
+ Ruleset = (SieveListing *) malloc(sizeof(SieveListing));
+ 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))
+ {
+ Ruleset->IsRulesScript = 1;
+ have_rules_script = 1;
+ if (Ruleset->IsActive)
+ {
+ rules_script_active = 1;
+ PutBstr(HKEY("__SIEVE:RULESSCRIPT"), NewStrBufPlain(HKEY("1")));
+ }
+ }
+ Put(WCC->KnownSieveScripts, IKEY(num_scripts), Ruleset, FreeSieveListing);
+
+ ++num_scripts;
+ }
+ }
+ if ((num_scripts > 0) && (rules_script_active == 0))
+ PutBstr(HKEY("__SIEVE:EXTERNAL_SCRIPT"), NewStrBufPlain(HKEY("1")));
+
+ if (num_scripts > have_rules_script)
+ {
+ long rc = 0;
+ long len;
+ const char *Key;
+ void *vRuleset;
+
+ /*
+ * ok; we have custom scripts, expose that via bstr, and load the payload.
+ */
+ PutBstr(HKEY("__SIEVE:HAVE_EXTERNAL_SCRIPT"), NewStrBufPlain(HKEY("1")));
+
+ it = GetNewHashPos(WCC->KnownSieveScripts, 0);
+ while (GetNextHashPos(WCC->KnownSieveScripts, it, &len, &Key, &vRuleset) &&
+ (vRuleset != NULL))
+ {
+ Ruleset = (SieveListing *) vRuleset;
+
+ /*
+ * its the webcit rule? we don't need to load that here.
+ */
+ if (Ruleset->IsRulesScript)
+ continue;
+
+ if (!serv_printf("MSIV getscript|%s", ChrPtr(Ruleset->Name)))
+ break;
+ StrBuf_ServGetln(Line);
+ if (GetServerStatus(Line, NULL) == 1)
+ {
+ Ruleset->Content = NewStrBuf();
+ while(!Done && (rc = StrBuf_ServGetln(Line), rc >= 0) )
+ if ( (StrLength(Line)==3) &&
+ !strcmp(ChrPtr(Line), "000"))
+ {
+ Done = 1;
+ }
+ else
+ {
+ if (StrLength(Ruleset->Content)>0)
+ StrBufAppendBufPlain(Ruleset->Content, HKEY("\n"), 0);
+ StrBufAppendBuf(Ruleset->Content, Line, 0);
+ }
+ if (rc < 0) break;
+ }
+ }
+ }
+ FreeStrBuf(&Line);
+ return WCC->KnownSieveScripts;
+}
+
+
+typedef enum __eSieveHfield
+{
+ from,
+ tocc,
+ subject,
+ replyto,
+ sender,
+ resentfrom,
+ resentto,
+ envfrom,
+ envto,
+ xmailer,
+ xspamflag,
+ xspamstatus,
+ listid,
+ size,
+ all
+} eSieveHfield;
+
+typedef enum __eSieveCompare {
+ contains,
+ notcontains,
+ is,
+ isnot,
+ matches,
+ notmatches
+} eSieveCompare;
+
+typedef enum __eSieveAction {
+ keep,
+ discard,
+ reject,
+ fileinto,
+ redirect,
+ vacation
+} eSieveAction;
+
+
+typedef enum __eSieveSizeComp {
+ larger,
+ smaller
+} eSieveSizeComp;
+
+typedef enum __eSieveFinal {
+ econtinue,
+ estop
+} eSieveFinal;
+
+
+typedef struct __SieveRule {
+ int active;
+ int sizeval;
+ eSieveHfield hfield;
+ eSieveCompare compare;
+ StrBuf *htext;
+ eSieveSizeComp sizecomp;
+ eSieveAction Action;
+ StrBuf *fileinto;
+ StrBuf *redirect;
+ StrBuf *automsg;
+ eSieveFinal final;
+}SieveRule;
+
+
+
+int ConditionalSieveRule_hfield(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+
+ return GetTemplateTokenNumber(Target,
+ TP,
+ 3,
+ from)
+ ==
+ Rule->hfield;
+}
+int ConditionalSieveRule_compare(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+ return GetTemplateTokenNumber(Target,
+ TP,
+ 3,
+ contains)
+ ==
+ Rule->compare;
+}
+int ConditionalSieveRule_action(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+ return GetTemplateTokenNumber(Target,
+ TP,
+ 3,
+ keep)
+ ==
+ Rule->Action;
+}
+int ConditionalSieveRule_sizecomp(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+ return GetTemplateTokenNumber(Target,
+ TP,
+ 3,
+ larger)
+ ==
+ Rule->sizecomp;
+}
+int ConditionalSieveRule_final(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+ return GetTemplateTokenNumber(Target,
+ TP,
+ 3,
+ econtinue)
+ ==
+ Rule->final;
+}
+int ConditionalSieveRule_ThisRoom(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+ return GetTemplateTokenNumber(Target,
+ TP,
+ 3,
+ econtinue)
+ ==
+ Rule->final;
+}
+int ConditionalSieveRule_Active(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+ return Rule->active;
+}
+void tmplput_SieveRule_htext(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+ StrBufAppendTemplate(Target, TP, Rule->htext, 0);
+}
+void tmplput_SieveRule_fileinto(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+ StrBufAppendTemplate(Target, TP, Rule->fileinto, 0);
+}
+void tmplput_SieveRule_redirect(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+ StrBufAppendTemplate(Target, TP, Rule->redirect, 0);
+}
+void tmplput_SieveRule_automsg(StrBuf *Target, WCTemplputParams *TP)
+{
+ SieveRule *Rule = (SieveRule *)CTX;
+ StrBufAppendTemplate(Target, TP, Rule->automsg, 0);
+}
+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;
+ 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*) vRule;
+
+ FreeStrBuf(&Rule->htext);
+ FreeStrBuf(&Rule->fileinto);
+ FreeStrBuf(&Rule->redirect);
+ FreeStrBuf(&Rule->automsg);
+
+ free(Rule);
+}
+
+#define WC_RULE_HEADER "# WEBCIT_RULE|"
+HashList *GetSieveRules(StrBuf *Target, WCTemplputParams *TP)
+{
+ StrBuf *Line;
+ StrBuf *EncodedRule;
+ int n;
+ const char *pch;
+ HashList *SieveRules = NULL;
+ 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)
+ {
+ while(!Done && (StrBuf_ServGetln(Line) >= 0) )
+ if ( (StrLength(Line)==3) &&
+ !strcmp(ChrPtr(Line), "000"))
+ {
+ Done = 1;
+ }
+ else
+ {
+ pch = NULL;
+ /* We just care for our encoded header and skip everything else */
+ if ((StrLength(Line) > sizeof(WC_RULE_HEADER) - 1) &&
+ (!strncasecmp(ChrPtr(Line), HKEY(WC_RULE_HEADER))))
+ {
+ StrBufSkip_NTokenS(Line, &pch, '|', 1);
+ n = StrBufExtractNext_int(Line, &pch, '|');
+ StrBufExtract_NextToken(EncodedRule, Line, &pch, '|');
+ StrBufDecodeBase64(EncodedRule);
+
+ Rule = (SieveRule*) malloc(sizeof(SieveRule));
+
+ Rule->htext = NewStrBufPlain (NULL, StrLength(EncodedRule));
+
+ Rule->fileinto = NewStrBufPlain (NULL, StrLength(EncodedRule));
+ Rule->redirect = NewStrBufPlain (NULL, StrLength(EncodedRule));
+ Rule->automsg = NewStrBufPlain (NULL, StrLength(EncodedRule));
+
+ /* Grab our existing values to populate */
+ pch = NULL;
+ Rule->active = StrBufExtractNext_int(EncodedRule, &pch, '|');
+ StrBufExtract_NextToken(Line, EncodedRule, &pch, '|');
+
+ Rule->hfield = (eSieveHfield) GetTokenDefine(SKEY(Line), tocc);
+ StrBufExtract_NextToken(Line, EncodedRule, &pch, '|');
+ Rule->compare = (eSieveCompare) GetTokenDefine(SKEY(Line), contains);
+ StrBufExtract_NextToken(Rule->htext, EncodedRule, &pch, '|');
+ StrBufExtract_NextToken(Line, EncodedRule, &pch, '|');
+ Rule->sizecomp = (eSieveSizeComp) GetTokenDefine(SKEY(Line), larger);
+ Rule->sizeval = StrBufExtractNext_int(EncodedRule, &pch, '|');
+ StrBufExtract_NextToken(Line, EncodedRule, &pch, '|');
+ Rule->Action = (eSieveAction) GetTokenDefine(SKEY(Line), keep);
+ StrBufExtract_NextToken(Rule->fileinto, EncodedRule, &pch, '|');
+ StrBufExtract_NextToken(Rule->redirect, EncodedRule, &pch, '|');
+ StrBufExtract_NextToken(Rule->automsg, EncodedRule, &pch, '|');
+ 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;
+}
+
+void
+SessionDetachModule_SIEVE
+(wcsession *sess)
+{
+ DeleteHash(&sess->KnownSieveScripts);
+}
void
InitModule_SIEVE
(void)
{
+ REGISTERTokenParamDefine(from);
+ REGISTERTokenParamDefine(tocc);
+ REGISTERTokenParamDefine(subject);
+ REGISTERTokenParamDefine(replyto);
+ REGISTERTokenParamDefine(sender);
+ REGISTERTokenParamDefine(resentfrom);
+ REGISTERTokenParamDefine(resentto);
+ REGISTERTokenParamDefine(envfrom);
+ REGISTERTokenParamDefine(envto);
+ REGISTERTokenParamDefine(xmailer);
+ REGISTERTokenParamDefine(xspamflag);
+ REGISTERTokenParamDefine(xspamstatus);
+ REGISTERTokenParamDefine(listid);
+ REGISTERTokenParamDefine(size);
+ REGISTERTokenParamDefine(all);
+
+ REGISTERTokenParamDefine(contains);
+ REGISTERTokenParamDefine(notcontains);
+ REGISTERTokenParamDefine(is);
+ REGISTERTokenParamDefine(isnot);
+ REGISTERTokenParamDefine(matches);
+ REGISTERTokenParamDefine(notmatches);
+
+ REGISTERTokenParamDefine(keep);
+ REGISTERTokenParamDefine(discard);
+ REGISTERTokenParamDefine(reject);
+ REGISTERTokenParamDefine(fileinto);
+ REGISTERTokenParamDefine(redirect);
+ REGISTERTokenParamDefine(vacation);
+
+ REGISTERTokenParamDefine(larger);
+ REGISTERTokenParamDefine(smaller);
+
+ /* these are c-keyworads, so do it by hand. */
+ RegisterTokenParamDefine(HKEY("continue"), econtinue);
+ RegisterTokenParamDefine(HKEY("stop"), estop);
+
+ 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_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:ACTION"), 1, ConditionalSieveRule_action, CTX_SIEVESCRIPT);
+ RegisterConditional(HKEY("COND:SIEVE:SIZECOMP"), 1, ConditionalSieveRule_sizecomp, 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:HTEXT", 0, 1, tmplput_SieveRule_htext, 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);
+
+ /* 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);
- WebcitAddUrlHandler(HKEY("save_sieve"), "", 0, save_sieve, 0);
WebcitAddUrlHandler(HKEY("display_add_remove_scripts"), "", 0, _display_add_remove_scripts, 0);
+#endif
+ WebcitAddUrlHandler(HKEY("save_sieve"), "", 0, save_sieve, 0);
+
WebcitAddUrlHandler(HKEY("create_script"), "", 0, create_script, 0);
WebcitAddUrlHandler(HKEY("delete_script"), "", 0, delete_script, 0);
}
![](\"static/advanpage2_48x.gif\")
");
- wc_printf("![](\"static/webcit_icons/essen/32x32/config.png\"){kind=icon}
");
+ wc_printf("![](\"static/up_pointer.gif\")
",
+ "![](\"static/webcit_icons/up_pointer.gif\"){kind=icon}
\n",
i-1, i, _("Move rule up") );
wc_printf(""
- "![](\"static/down_pointer.gif\")
",
+ "![](\"static/webcit_icons/down_pointer.gif\"){kind=icon}
\n",
i, i+1, i, _("Move rule down") );
wc_printf(""
- "![](\"static/delete.gif\")
",
+ "![](\"static/webcit_icons/delete.gif\"){kind=icon}
\n",
i, i, _("Delete rule") );
- wc_printf("