* cleaning HTML/CSS codes

[citadel.git] / webcit / siteconfig.c

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 39ef9f6d54a4d5247a7c26d678a79c128d21f882..203fdefacc53586fa60e135c398fe55034acf1b3 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"),
@@ -66,7 +63,7 @@ void display_siteconfig(void)
                _("Directory"),
                _("Auto-purger"),
                _("Indexing/Journaling"),
-               _("Funambol Intergraton")
+               _("Push Email")
        };
 
        sprintf(general, "<center><h1>%s</h1><table border=\"0\">",
@@ -107,10 +104,11 @@ void display_siteconfig(void)
                        _("Warning: these facilities are resource intensive.")
        );
        sprintf(funambol, "<center><h1>%s</h1><table border=\"0\">",
-               _("Funambol Push Email Intergration")
+               _("Push Email")
                );
 
        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")) {
@@ -528,11 +526,12 @@ void display_siteconfig(void)
                        sprintf(&network[strlen(network)], "</TD></TR>\n");
                        break;
                case 52:
-                       sprintf(&general[strlen(general)], "<TR><TD>");
-                       sprintf(&general[strlen(general)], _("Use system authentication"));
-                       sprintf(&general[strlen(general)], "</TD><TD><input type=\"checkbox\" NAME=\"c_auth_mode\" VALUE=\"yes\" %s>",
-                               ((atoi(buf) != 0) ? "CHECKED" : ""));
-                       sprintf(&general[strlen(general)], "</TD></TR>\n");
+                       sprintf(&access[strlen(access)], "<TR><TD>");
+                       sprintf(&access[strlen(access)], _("Enable host based authentication mode"));
+                       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:
                        sprintf(&funambol[strlen(funambol)], "<TR><TD>");
@@ -559,7 +558,7 @@ 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;
                }
@@ -637,24 +636,24 @@ void display_siteconfig(void)
        sprintf(&directory[strlen(directory)], "</table>");
        sprintf(&purger[strlen(purger)], "</table>");
        sprintf(&idxjnl[strlen(idxjnl)], "</table>");
-       sprintf(&funambol[strlen(funambol)], "</table");
+       sprintf(&funambol[strlen(funambol)], "</table>");
 
        tabbed_dialog(8, tabnames);
 
-       begin_tab(0, 7);        client_write(general, strlen(general));          end_tab(0, 7);
-       begin_tab(1, 7);        client_write(access, strlen(access));            end_tab(1, 7);
-       begin_tab(2, 7);        client_write(network, strlen(network));          end_tab(2, 7);
-       begin_tab(3, 7);        client_write(tuning, strlen(tuning));            end_tab(3, 7);
-       begin_tab(4, 7);        client_write(directory, strlen(directory));      end_tab(4, 7);
-       begin_tab(5, 7);        client_write(purger, strlen(purger));            end_tab(5, 7);
-       begin_tab(6, 7);        client_write(idxjnl, strlen(idxjnl));            end_tab(6, 7);
+       begin_tab(0, 8);        client_write(general, strlen(general));          end_tab(0, 8);
+       begin_tab(1, 8);        client_write(access, strlen(access));            end_tab(1, 8);
+       begin_tab(2, 8);        client_write(network, strlen(network));          end_tab(2, 8);
+       begin_tab(3, 8);        client_write(tuning, strlen(tuning));            end_tab(3, 8);
+       begin_tab(4, 8);        client_write(directory, strlen(directory));      end_tab(4, 8);
+       begin_tab(5, 8);        client_write(purger, strlen(purger));            end_tab(5, 8);
+       begin_tab(6, 8);        client_write(idxjnl, strlen(idxjnl));            end_tab(6, 8);
        begin_tab(7, 8);        client_write(funambol, strlen(funambol));        end_tab(7, 8);
        wprintf("<div align=\"center\"><br>");
        wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
        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,7 +727,7 @@ 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"));