Removed the unused second argument from the do_template() macro

[citadel.git] / webcit / sieve.c

diff --git a/webcit/sieve.c b/webcit/sieve.c
index ae08f608a21e5b059506877ac65cd975c2d2d4cd..0db8f5ae0bca9b1cdc1ec4e0c26bb51ab867d5a5 100644 (file)
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 1996-2011 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.
+ *
+ * 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
+ */
+
 #include "webcit.h"
 
 #define MAX_SCRIPTS    100
@@ -21,14 +39,13 @@ void display_no_sieve(void) {
 
        wc_printf("<div id=\"content\" class=\"service\">\n");
 
-       wc_printf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"sieve_background\">"
+       wc_printf("<table class=\"sieve_background\">"
                "<tr><td valign=top>\n");
 
        wc_printf(_("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>"));
 
-       wc_printf("</td></tr></table></div>\n");
+       wc_printf("</td></tr></table>\n");
        wDumpContent(1);
 }
 
@@ -106,8 +123,7 @@ void display_sieve(void)
 
        wc_printf("<div id=\"content\" class=\"service\">\n");
 
-       wc_printf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"sieve_background\">"
+       wc_printf("<table class=\"sieve_background\">"
                "<tr><td valign=top>\n");
 
 
@@ -137,9 +153,9 @@ void display_sieve(void)
        /* The "no filtering" div */
 
        wc_printf("<div id=\"sievediv0\" style=\"display:none\">\n");
-       wc_printf("<div align=\"center\"><br /><br />");
+       wc_printf("<div align=\"center\"><br><br>");
        wc_printf(_("Your incoming mail will not be filtered through any scripts."));
-       wc_printf("<br /><br /></div>\n");
+       wc_printf("<br><br></div>\n");
        wc_printf("</div>\n");
 
        /* The "webcit managed scripts" div */
@@ -170,7 +186,7 @@ void display_sieve(void)
        wc_printf("&nbsp;&nbsp;&nbsp;");
        wc_printf("<a href=\"display_add_remove_scripts\">%s</a>\n", _("Add or delete scripts"));
 
-       wc_printf("<br />\n");
+       wc_printf("<br>\n");
 
        if (num_scripts > 0) {
                for (i=0; i<num_scripts; ++i) {
@@ -205,7 +221,7 @@ void display_sieve(void)
        wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
        wc_printf("</div></form>\n");
 
-       wc_printf("</td></tr></table></div>\n");
+       wc_printf("</td></tr></table>\n");
 
        wc_printf("<script type=\"text/javascript\">    \n"
                "ToggleSievePanels();                   \n"
@@ -653,40 +669,40 @@ void display_add_remove_scripts(char *message)
 
        wc_printf("<table border=0 cellspacing=10><tr valign=top><td>\n");
 
-       do_template("beginbox_1", NULL);
+       do_template("beginbox_1");
        StrBufAppendBufPlain(WC->WBuf, _("Add a new script"), -1, 0);
-       do_template("beginbox_2", NULL);
+       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("<br /><br />");
+       wc_printf("<br><br>");
 
         wc_printf("<center><form method=\"POST\" action=\"create_script\">\n");
        wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
         wc_printf(_("Script name: "));
-        wc_printf("<input type=\"text\" name=\"script_name\"><br />\n"
+        wc_printf("<input type=\"text\" name=\"script_name\"><br>\n"
                "<input type=\"submit\" name=\"create_button\" value=\"%s\">"
                "</form></center>\n", _("Create"));
 
-       do_template("endbox", NULL);
+       do_template("endbox");
 
-       do_template("beginbox_1", NULL);
+       do_template("beginbox_1");
        StrBufAppendBufPlain(WC->WBuf, _("Edit scripts"), -1, 0);
-       do_template("beginbox_2", NULL);
-       wc_printf("<br /><div align=center><a href=\"display_sieve\">%s</a><br /><br />\n",
+       do_template("beginbox_2");
+       wc_printf("<br><div align=center><a href=\"display_sieve\">%s</a><br><br>\n",
                _("Return to the script editing screen")
        );
-       do_template("endbox", NULL);
+       do_template("endbox");
 
        wc_printf("</td><td>");
 
-       do_template("beginbox_1", NULL);
+       do_template("beginbox_1");
        StrBufAppendBufPlain(WC->WBuf, _("Delete scripts"), -1, 0);
-       do_template("beginbox_2", NULL);
+       do_template("beginbox_2");
 
        wc_printf(_("To delete an existing script, select the script "
                "name from the list and click 'Delete'."));
-       wc_printf("<br /><br />");
+       wc_printf("<br><br>");
        
         wc_printf("<center>"
                "<form method=\"POST\" action=\"delete_script\">\n");
@@ -705,12 +721,12 @@ void display_add_remove_scripts(char *message)
                        }
                 }
         }
-        wc_printf("</select><br />\n");
+        wc_printf("</select><br>\n");
 
         wc_printf("<input type=\"submit\" name=\"delete_button\" value=\"%s\" "
                "onClick=\"return confirm('%s');\">", _("Delete script"), _("Delete this script?"));
         wc_printf("</form></center>\n");
-       do_template("endbox", NULL);
+       do_template("endbox");
 
        wc_printf("</td></tr></table>\n");
 
@@ -933,7 +949,7 @@ void display_rules_editor_inner_div(void) {
        );
 
 
-       wc_printf("<br />");
+       wc_printf("<br>");
 
        wc_printf("<table cellpadding=2 width=100%%>");
 
@@ -1121,7 +1137,7 @@ void display_rules_editor_inner_div(void) {
 
                wc_printf("<div id=\"div_automsg%d\">", i);
                wc_printf(_("Message:"));
-               wc_printf("<br />");
+               wc_printf("<br>");
                wc_printf("<textarea name=\"automsg%d\" id=\"automsg%d\" wrap=soft rows=5>\n", i, i);
                escputs(automsg);
                wc_printf("</textarea>");
@@ -1154,7 +1170,7 @@ void display_rules_editor_inner_div(void) {
        }
 
        wc_printf("</table>");
-       wc_printf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">%s</a><br /></div>\n",
+       wc_printf("<div id=\"div_addrule\"><a href=\"javascript:AddRule();\">%s</a><br></div>\n",
                _("Add rule")
        );