]> code.citadel.org Git - citadel.git/blobdiff - webcit/sieve.c
* Fixed a bug in the 'Delete Rule' logic.
[citadel.git] / webcit / sieve.c
index 89c5c56ac372f5489e572e89ba984a63eab829fb..45324730bb1c6996aab3997dcce633f4b5242287 100644 (file)
@@ -192,6 +192,216 @@ void display_sieve(void)
 
 
 
+/**
+ * \brief      Helper function for output_sieve_rule() to output strings with quotes escaped
+ */
+void osr_sanitize(char *str) {
+       int i;
+
+       if (str == NULL) return;
+       for (i=0; i<strlen(str); ++i) {
+               if (str[i]=='\"') {
+                       str[i] = '\'' ;
+               }
+               else if (isspace(str[i])) {
+                       str[i] = ' ';
+               }
+       }
+}
+
+
+/**
+ * \brief      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)
+{
+       char *comp1 = "";
+       char *comp2 = "";
+
+       osr_sanitize(htext);
+       osr_sanitize(fileinto);
+       osr_sanitize(redirect);
+       osr_sanitize(automsg);
+
+       /* Prepare negation and match operators that will be used iff we apply a conditional */
+
+       if (!strcasecmp(compare, "contains")) {
+               comp1 = "";
+               comp2 = ":contains";
+       }
+       else if (!strcasecmp(compare, "notcontains")) {
+               comp1 = "not";
+               comp2 = ":contains";
+       }
+       else if (!strcasecmp(compare, "is")) {
+               comp1 = "";
+               comp2 = ":is";
+       }
+       else if (!strcasecmp(compare, "isnot")) {
+               comp1 = "not";
+               comp2 = ":is";
+       }
+       else if (!strcasecmp(compare, "matches")) {
+               comp1 = "";
+               comp2 = ":matches";
+       }
+       else if (!strcasecmp(compare, "notmatches")) {
+               comp1 = "not";
+               comp2 = ":matches";
+       }
+
+       /* Now do the conditional */
+
+       if (!strcasecmp(hfield, "from")) {
+               serv_printf("if%s header %s \"From\" \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "tocc")) {
+               serv_printf("if%s header %s [\"To\", \"Cc\"] \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "subject")) {
+               serv_printf("if%s header %s \"Subject\" \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "replyto")) {
+               serv_printf("if%s header %s \"Reply-to\" \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "sender")) {
+               serv_printf("if%s header %s \"Sender\" \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "resentfrom")) {
+               serv_printf("if%s header %s \"Resent-from\" \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "resentto")) {
+               serv_printf("if%s header %s \"Resent-to\" \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "xmailer")) {
+               serv_printf("if%s header %s \"X-Mailer\" \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "xspamflag")) {
+               serv_printf("if%s header %s \"X-Spam-Flag\" \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "xspamstatus")) {
+               serv_printf("if%s header %s \"X-Spam-Status\" \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "envfrom")) {
+               serv_printf("if%s envelope %s \"From\" \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "envto")) {
+               serv_printf("if%s envelope %s \"To\" \"%s\"",
+                       comp1, comp2,
+                       htext
+               );
+       }
+
+       else if (!strcasecmp(hfield, "size")) {
+               if (!strcasecmp(sizecomp, "larger")) {
+                       serv_printf("if size :over %d", sizeval);
+               }
+               else if (!strcasecmp(sizecomp, "smaller")) {
+                       serv_printf("if size :under %d", sizeval);
+               }
+               else {  /* failsafe - should never get here, but just in case... */
+                       serv_printf("if size :over 1");
+               }
+       }
+
+       /* Open braces if we're in a conditional loop */
+
+       if (strcasecmp(hfield, "all")) {
+               serv_printf("{");
+       }
+
+
+       /* Do action */
+
+       if (!strcasecmp(action, "keep")) {
+               serv_printf("keep;");
+       }
+
+       else if (!strcasecmp(action, "discard")) {
+               serv_printf("discard;");
+       }
+
+       else if (!strcasecmp(action, "reject")) {
+               serv_printf("reject \"%s\";", automsg);
+       }
+
+       else if (!strcasecmp(action, "fileinto")) {
+               serv_printf("fileinto \"%s\";", fileinto);
+       }
+
+       else if (!strcasecmp(action, "redirect")) {
+               serv_printf("redirect \"%s\";", redirect);
+       }
+
+       else if (!strcasecmp(action, "vacation")) {
+               serv_printf("vacation \"%s\";", 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...
  */
@@ -229,6 +439,11 @@ void parse_fields_from_rule_editor(void) {
        serv_puts("# to use these rules as the basis for another script,");
        serv_puts("# copy them to another script and save that instead.");
        serv_puts("");
+       serv_puts("require \"fileinto\";");
+       serv_puts("require \"reject\";");
+       serv_puts("require \"vacation\";");
+       serv_puts("require \"envelope\";");
+       serv_puts("");
 
        for (i=0; i<MAX_RULES; ++i) {
                
@@ -237,49 +452,54 @@ void parse_fields_from_rule_editor(void) {
                sprintf(fname, "active%d", i);
                active = !strcasecmp(bstr(fname), "on") ;
 
-               sprintf(fname, "hfield%d", i);
-               safestrncpy(hfield, bstr(fname), sizeof hfield);
-
-               sprintf(fname, "compare%d", i);
-               safestrncpy(compare, bstr(fname), sizeof compare);
-
-               sprintf(fname, "htext%d", i);
-               safestrncpy(htext, bstr(fname), sizeof htext);
-
-               sprintf(fname, "sizecomp%d", i);
-               safestrncpy(sizecomp, bstr(fname), sizeof sizecomp);
-
-               sprintf(fname, "sizeval%d", i);
-               sizeval = atoi(bstr(fname));
-
-               sprintf(fname, "action%d", i);
-               safestrncpy(action, bstr(fname), sizeof action);
-
-               sprintf(fname, "fileinto%d", i);
-               safestrncpy(fileinto, bstr(fname), sizeof fileinto);
-
-               sprintf(fname, "redirect%d", i);
-               safestrncpy(redirect, bstr(fname), sizeof redirect);
-
-               sprintf(fname, "automsg%d", i);
-               safestrncpy(automsg, bstr(fname), sizeof automsg);
-
-               sprintf(fname, "final%d", i);
-               safestrncpy(final, bstr(fname), sizeof final);
+               if (active) {
 
-               snprintf(rule, sizeof rule, "%d|%s|%s|%s|%s|%d|%s|%s|%s|%s|%s",
-                       active, hfield, compare, htext, sizecomp, sizeval, action, fileinto,
-                       redirect, automsg, final
-               );
-
-               CtdlEncodeBase64(encoded_rule, rule, strlen(rule)+1, 0);
-               serv_printf("# WEBCIT_RULE|%d|%s|", i, encoded_rule);
-
-               /* FIXME: this is where we need to generate Sieve code based on the rule */
+                       sprintf(fname, "hfield%d", i);
+                       safestrncpy(hfield, bstr(fname), sizeof hfield);
+       
+                       sprintf(fname, "compare%d", i);
+                       safestrncpy(compare, bstr(fname), sizeof compare);
+       
+                       sprintf(fname, "htext%d", i);
+                       safestrncpy(htext, bstr(fname), sizeof htext);
+       
+                       sprintf(fname, "sizecomp%d", i);
+                       safestrncpy(sizecomp, bstr(fname), sizeof sizecomp);
+       
+                       sprintf(fname, "sizeval%d", i);
+                       sizeval = atoi(bstr(fname));
+       
+                       sprintf(fname, "action%d", i);
+                       safestrncpy(action, bstr(fname), sizeof action);
+       
+                       sprintf(fname, "fileinto%d", i);
+                       safestrncpy(fileinto, bstr(fname), sizeof fileinto);
+       
+                       sprintf(fname, "redirect%d", i);
+                       safestrncpy(redirect, bstr(fname), sizeof redirect);
+       
+                       sprintf(fname, "automsg%d", i);
+                       safestrncpy(automsg, bstr(fname), sizeof automsg);
+       
+                       sprintf(fname, "final%d", i);
+                       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,
+                               redirect, automsg, final
+                       );
+       
+                       CtdlEncodeBase64(encoded_rule, rule, strlen(rule)+1, 0);
+                       serv_printf("# WEBCIT_RULE|%d|%s|", i, encoded_rule);
+                       output_sieve_rule(hfield, compare, htext, sizecomp, sizeval,
+                                       action, fileinto, redirect, automsg, final);
+                       serv_printf("");
+               }
 
 
        }
 
+       serv_puts("stop;");
        serv_puts("000");
 
 }
@@ -550,9 +770,25 @@ void display_rules_editor_inner_div(void) {
                "                                                                       \n"
                "var highest_active_rule = (-1);                                        \n"
                "                                                                       \n"
-               "function UpdateRules() {                                               \n"
-               "  for (i=0; i<%d; ++i) {                                               \n", MAX_RULES);
-       wprintf("    d = ($('movedown'+i));                                             \n"
+               "function UpdateRules() {                                               \n");
+/*
+ * Show only the active rows...
+ */
+       wprintf("  highest_active_rule = (-1);                                          \n");
+       wprintf("  for (i=0; i<%d; ++i) {                                               \n", MAX_RULES);
+       wprintf("   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...
+ */
+       wprintf("  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"
@@ -599,20 +835,6 @@ void display_rules_editor_inner_div(void) {
                "      $('div_addrule').style.display = 'none';                         \n"
                "    }                                                                  \n"
                "  }                                                                    \n"
-       );
-/*
- * Show only the active rows...
- */
-       wprintf("  highest_active_rule = (-1);                                          \n");
-       wprintf("  for (i=0; i<%d; ++i) {                                               \n", MAX_RULES);
-       wprintf("   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"
                "}                                                                      \n"
 /*
  * Add a rule (really, just un-hide it)
@@ -649,8 +871,8 @@ void display_rules_editor_inner_div(void) {
  * Delete a rule (percolate the deleted rule out to the end, then deactivate it)
  */
                "function DeleteRule(rd) {                                              \n"
-               "  for (i=rd; i<highest_active_rule; ++i) {                             \n"
-               "    SwapRules(i, (i+1));                                               \n"
+               "  for (j=rd; j<=highest_active_rule; ++j) {                            \n"
+               "    SwapRules(j, (j+1));                                               \n"
                "  }                                                                    \n"
                "  $('active'+highest_active_rule).checked = false;                     \n"
                "}                                                                      \n"
@@ -748,17 +970,19 @@ void display_rules_editor_inner_div(void) {
 
                wprintf("<td width=20%%>");
 
-               char *compare_values[4][2] = {
+               char *compare_values[6][2] = {
                        {       "contains",     _("contains")           },
                        {       "notcontains",  _("does not contain")   },
                        {       "is",           _("is")                 },
-                       {       "isnot",        _("is not")             }
+                       {       "isnot",        _("is not")             },
+                       {       "matches",      _("matches")            },
+                       {       "notmatches",   _("does not match")     }
                };
 
                wprintf("<div id=\"div_compare%d\">", i);
                wprintf("<select id=\"compare%d\" name=\"compare%d\" size=1 onChange=\"UpdateRules();\">",
                        i, i);
-               for (j=0; j<4; ++j) {
+               for (j=0; j<6; ++j) {
                        wprintf("<option %s value=\"%s\">%s</option>",
                                ( (!strcasecmp(compare, compare_values[j][0])) ? "selected" : ""),
                                compare_values[j][0],
@@ -889,5 +1113,4 @@ void display_rules_editor_inner_div(void) {
 
 
 
-
 /*@}*/