The 'master user' account and password may now

[citadel.git] / webcit / siteconfig.c

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 206992e6b50911edaaee5a2eb866a7158891fcb8..236e93194a72e59a8f55a662cf1b3b15318154d4 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -33,30 +33,27 @@ void display_siteconfig(void)
        int mboxvalue = 0;
 
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<table class=\"siteconfig_banner\"><tr><td>"
-               "<span class=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Site configuration"));
-       wprintf("</span>"
-               "</td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service fix_scrollbar_bug\">\n");
 
        serv_printf("CONF get");
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
-               wprintf("<table class=\"siteconfig_banner\"><tr><td>");
-               wprintf("<span class=\"titlebar\">");
+               wprintf("<div class=\"errormsg\">");
                wprintf(_("Error"));
-               wprintf("</span>\n");
-               wprintf("</td></tr></table><br />\n");
+               wprintf("<br />\n");
                wprintf("%s<br />\n", &buf[4]);
                wDumpContent(1);
+               wprintf("</div>\n");
                return;
        }
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"siteconfig_background\"><tr><td>");
+       wprintf("<table><tr><td>");
 
        char *tabnames[] = {
                _("General"),
@@ -111,6 +108,7 @@ void display_siteconfig(void)
                );
 
        wprintf("<form method=\"post\" action=\"siteconfig\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
 
        i = 0;
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -530,8 +528,9 @@ void display_siteconfig(void)
                case 52:
                        sprintf(&access[strlen(access)], "<TR><TD>");
                        sprintf(&access[strlen(access)], _("Enable host based authentication mode"));
-                       sprintf(&access[strlen(access)], "</TD><TD><input type=\"checkbox\" NAME=\"c_auth_mode\" VALUE=\"yes\" DISABLED %s>",
-                               ((atoi(buf) != 0) ? "CHECKED" : ""));
+                       sprintf(&access[strlen(access)], "</TD><TD><input type=\"hidden\" NAME=\"c_auth_mode\" VALUE=\"%s\">%s",
+                               buf,
+                               ((atoi(buf) != 0) ? "Yes" : "No"));
                        sprintf(&access[strlen(access)], "</TD></TR>\n");
                        break;
                case 53:
@@ -559,9 +558,32 @@ void display_siteconfig(void)
                        sprintf(&funambol[strlen(funambol)], "<TR><TD>");
                        sprintf(&funambol[strlen(funambol)], _("Funambol auth details (user:pass in Base64)"));
                        sprintf(&funambol[strlen(funambol)], "</TD><TD>");
-                       sprintf(&funambol[strlen(funambol)], "<input type=\"text\" NAME=\"c_funambol_auth\" MAXLENGTH=\"255\" VALUE=\"%s\">", buf);
+                       sprintf(&funambol[strlen(funambol)], "<input type=\"text\" NAME=\"c_funambol_auth\" MAXLENGTH=\"255\" VAUE=\"%s\">", buf);
                        sprintf(&funambol[strlen(funambol)], "</TD></TR>\n");
                        break;
+               case 57:
+                       sprintf(&network[strlen(network)], "<TR><TD>");
+                       sprintf(&network[strlen(network)], _("Perform RBL checks upon connect instead of after RCPT"));
+                       sprintf(&network[strlen(network)], "</TD><TD>");
+                       sprintf(&network[strlen(network)], "<input type=\"checkbox\" NAME=\"c_rbl_at_greeting\" VALUE=\"yes\" %s>",
+                               ((atoi(buf) != 0) ? "CHECKED" : ""));
+                       sprintf(&network[strlen(network)], "</TD></TR>\n");
+                       break;
+               case 58:
+                       sprintf(&access[strlen(access)], "<TR><TD>");
+                       sprintf(&access[strlen(access)], _("Master user name (blank to disable)"));
+                       sprintf(&access[strlen(access)], "</TD><TD>");
+                       sprintf(&access[strlen(access)], "<input type=\"text\" NAME=\"c_master_user\" MAXLENGTH=\"31\" VALUE=\"%s\">", buf);
+                       sprintf(&access[strlen(access)], "</TD></TR>\n");
+                       break;
+               case 59:
+                       sprintf(&access[strlen(access)], "<TR><TD>");
+                       sprintf(&access[strlen(access)], _("Master user password"));
+                       sprintf(&access[strlen(access)], "</TD><TD>");
+                       sprintf(&access[strlen(access)], "<input type=\"password\" NAME=\"c_master_pass\" MAXLENGTH=\"31\" VALUE=\"%s\">",
+                       buf);
+                       sprintf(&directory[strlen(directory)], "</TD></TR>\n");
+                       break;
                }
        
        }
@@ -654,7 +676,7 @@ void display_siteconfig(void)
        wprintf("&nbsp;");
        wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n", _("Cancel"));
        wprintf("</div></FORM>\n");
-       wprintf("</td></tr></table></div>\n");
+       wprintf("</td></tr></table>\n");
        wDumpContent(1);
 }
 
@@ -728,11 +750,14 @@ void siteconfig(void)
        serv_printf("%s", bstr("c_default_cal_zone"));
        serv_printf("%s", bstr("c_pftcpdict_port"));
        serv_printf("%s", bstr("c_mgesve_port"));
-       serv_printf("%s", ((!strcasecmp(bstr("c_auth_mode"), "yes") ? "1" : "0")));
+       serv_printf("%s", bstr("c_auth_mode"));
        serv_printf("%s", bstr("c_funambol_host"));
        serv_printf("%s", bstr("c_funambol_port"));
        serv_printf("%s", bstr("c_funambol_source"));
        serv_printf("%s", bstr("c_funambol_auth"));
+       serv_printf("%s", bstr("c_rbl_at_greeting"));
+       serv_printf("%s", bstr("c_master_user"));
+       serv_printf("%s", bstr("c_master_pass"));
        serv_printf("000");
 
        serv_printf("SPEX site|%d|%d", atoi(bstr("sitepolicy")), atoi(bstr("sitevalue")));