* migrated SUBST stuff to hash

[citadel.git] / webcit / sieve.c

diff --git a/webcit/sieve.c b/webcit/sieve.c
index 2187d8296c2d4f3c3ddd91f8a821995a43397ceb..a566c79410214d30f6982d7ed4bde0e751effe94 100644 (file)
--- a/webcit/sieve.c
+++ b/webcit/sieve.c
@@ -513,7 +513,7 @@ void parse_fields_from_rule_editor(void) {
                        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);
@@ -563,7 +563,7 @@ void save_sieve(void) {
        char this_name[64];
        char buf[256];
 
-       if (IsEmptyStr(bstr("save_button"))) {
+       if (!havebstr("save_button")) {
                strcpy(WC->ImportantMessage,
                        _("Cancelled.  Changes were not saved."));
                display_main_menu();
@@ -584,7 +584,7 @@ void save_sieve(void) {
                }
        }
 
-       bigaction = atoi(bstr("bigaction"));
+       bigaction = ibstr("bigaction");
 
        if (bigaction == 0) {
                serv_puts("MSIV setactive||");
@@ -648,7 +648,7 @@ void display_add_remove_scripts(char *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 "
@@ -664,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")
@@ -673,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 "