* added gcc printf format checking to wprintf
[citadel.git] / webcit / sieve.c
index d0f2752797906bc4f53473abd1c27ea0d137f42b..cf68af89ae1eb3f19b364f15af1b8e3cf3749f74 100644 (file)
@@ -1,19 +1,44 @@
 /* 
- * $Id$
+ * $Id$
  */
-/**
- * \defgroup Sieve view/edit sieve config
- * \ingroup WebcitDisplayItems
- */
-/*@{*/
+
 #include "webcit.h"
 
 #define MAX_SCRIPTS    100
 #define MAX_RULES      25
 #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)
 {
@@ -23,7 +48,11 @@ void display_sieve(void)
        char buf[256];
        int i;
        int rules_script_is_active = 0;
-       
+
+       if (!serv_info.serv_supports_sieve) {
+               display_no_sieve();
+               return;
+       }
 
        memset(script_names, 0, sizeof script_names);
 
@@ -73,20 +102,21 @@ void display_sieve(void)
        );
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">"
-               "<img src=\"static/advanpage2_48x.gif\">");
+       wprintf("<img src=\"static/advanpage2_48x.gif\">");
+       wprintf("<h1>");
        wprintf(_("View/edit server-side mail filters"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>\n");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#FFFFFF\">"
+               "<table class=\"sieve_background\">"
                "<tr><td valign=top>\n");
 
 
        wprintf("<form id=\"sieveform\" method=\"post\" action=\"save_sieve\">\n");
+       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");
@@ -192,14 +222,15 @@ void display_sieve(void)
 
 
 
-/**
- * \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;
+       int i, len;
 
        if (str == NULL) return;
-       for (i=0; i<strlen(str); ++i) {
+       len = strlen(str);
+       for (i=0; i<len; ++i) {
                if (str[i]=='\"') {
                        str[i] = '\'' ;
                }
@@ -210,11 +241,12 @@ 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)
+                       char *action, char *fileinto, char *redirect, char *automsg, char *final,
+                       char *my_addresses)
 {
        char *comp1 = "";
        char *comp2 = "";
@@ -379,7 +411,7 @@ void output_sieve_rule(char *hfield, char *compare, char *htext, char *sizecomp,
        }
 
        else if (!strcasecmp(action, "vacation")) {
-               serv_printf("vacation \"%s\";", automsg);
+               serv_printf("vacation :addresses [%s]\n\"%s\";", my_addresses, automsg);
        }
 
 
@@ -402,8 +434,8 @@ void output_sieve_rule(char *hfield, char *compare, char *htext, char *sizecomp,
 
 
 
-/**
- * \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) {
 
@@ -418,13 +450,27 @@ void parse_fields_from_rule_editor(void) {
        char redirect[256];
        char automsg[1024];
        char final[32];
-
        int i;
        char buf[256];
        char fname[256];
        char rule[2048];
        char encoded_rule[4096];
+       char my_addresses[4096];
+       
+       /* Enumerate my email addresses in case they are needed for a vacation rule */
+       my_addresses[0] = 0;
+       serv_puts("GVEA");
+       serv_getln(buf, sizeof buf);
+       if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+               if (!IsEmptyStr(my_addresses)) {
+                       strcat(my_addresses, ",\n");
+               }
+               strcat(my_addresses, "\"");
+               strcat(my_addresses, buf);
+               strcat(my_addresses, "\"");
+       }
 
+       /* Now generate the script and write it to the Citadel server */
        serv_printf("MSIV putscript|%s|", RULES_SCRIPT);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '4') {
@@ -450,39 +496,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,
@@ -492,7 +538,7 @@ void parse_fields_from_rule_editor(void) {
                        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);
+                                       action, fileinto, redirect, automsg, final, my_addresses);
                        serv_printf("");
                }
 
@@ -501,13 +547,12 @@ 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;
@@ -518,7 +563,7 @@ void save_sieve(void) {
        char this_name[64];
        char buf[256];
 
-       if (strlen(bstr("save_button")) == 0) {
+       if (!havebstr("save_button")) {
                strcpy(WC->ImportantMessage,
                        _("Cancelled.  Changes were not saved."));
                display_main_menu();
@@ -539,7 +584,7 @@ void save_sieve(void) {
                }
        }
 
-       bigaction = atoi(bstr("bigaction"));
+       bigaction = ibstr("bigaction");
 
        if (bigaction == 0) {
                serv_puts("MSIV setactive||");
@@ -568,7 +613,7 @@ 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));
+                                       striplt((char*)BSTR(this_name)); /* TODO: get rid of typecast*/
                                        serv_printf("%s", bstr(this_name));
                                        serv_puts("000");
                                }
@@ -582,8 +627,8 @@ void save_sieve(void) {
 }
 
 
-/**
- * \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)
 {
@@ -592,20 +637,18 @@ void display_add_remove_scripts(char *message)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<table width=100%% border=0 bgcolor=#444455><tr>"
-               "<td>"
-               "<span class=\"titlebar\">"
-               "<img src=\"static/advanpage2_48x.gif\">");
+       wprintf("<img src=\"static/advanpage2_48x.gif\">");
        wprintf(_("Add or delete scripts"));
-       wprintf("</span></td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>\n");
+       wprintf("</div>\n");
+       
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        if (message != NULL) wprintf(message);
 
        wprintf("<table border=0 cellspacing=10><tr valign=top><td>\n");
 
-       svprintf("BOXTITLE", WCS_STRING, _("Add a new script"));
+       svput("BOXTITLE", WCS_STRING, _("Add a new script"));
        do_template("beginbox");
 
        wprintf(_("To create a new script, enter the desired "
@@ -613,6 +656,7 @@ void display_add_remove_scripts(char *message)
        wprintf("<br /><br />");
 
         wprintf("<center><form method=\"POST\" action=\"create_script\">\n");
+       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\">"
@@ -620,7 +664,7 @@ void display_add_remove_scripts(char *message)
 
        do_template("endbox");
 
-       svprintf("BOXTITLE", WCS_STRING, _("Edit scripts"));
+       svput("BOXTITLE", WCS_STRING, _("Edit scripts"));
        do_template("beginbox");
        wprintf("<br /><div align=center><a href=\"display_sieve\">%s</a><br /><br />\n",
                _("Return to the script editing screen")
@@ -629,7 +673,7 @@ void display_add_remove_scripts(char *message)
 
        wprintf("</td><td>");
 
-       svprintf("BOXTITLE", WCS_STRING, _("Delete scripts"));
+       svput("BOXTITLE", WCS_STRING, _("Delete scripts"));
        do_template("beginbox");
 
        wprintf(_("To delete an existing script, select the script "
@@ -638,6 +682,7 @@ void display_add_remove_scripts(char *message)
        
         wprintf("<center>"
                "<form method=\"POST\" action=\"delete_script\">\n");
+       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");
@@ -666,8 +711,8 @@ void display_add_remove_scripts(char *message)
 
 
 
-/**
- * \brief delete a script
+/*
+ * delete a script
  */
 void delete_script(void) {
        char buf[256];
@@ -679,8 +724,8 @@ void delete_script(void) {
                
 
 
-/**
- * \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) {
@@ -1110,9 +1155,3 @@ void display_rules_editor_inner_div(void) {
 
        free(rooms);
 }
-
-
-
-
-
-/*@}*/