use the same way to display all banners and services contents

[citadel.git] / webcit / inetconf.c

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 85f98153bd195058e17e9d97b3aae7e86f5b4714..7fa0f3b9c5118329bbd09a8f695c4604b0ff51b8 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -27,6 +27,7 @@ void display_inetconf(void)
                ic_smarthost,
                ic_rbl,
                ic_spamass,
+               ic_masq,
                ic_max
        };
        char *ic_spec[ic_max];
@@ -35,12 +36,15 @@ void display_inetconf(void)
        char *ic_boxtitle[ic_max];
        char *ic_desc[ic_max];
 
-       ic_keyword[0] = _("localhost");
-       ic_keyword[1] = _("directory");
-       ic_keyword[2] = _("gatewaydomain");
-       ic_keyword[3] = _("smarthost");
-       ic_keyword[4] = _("rbl");
-       ic_keyword[5] = _("spamassassin");
+       /* DON'T NEVER EVER AGAIN TRANSLATE CITADEL COMMANDS! */
+       ic_keyword[0] = "localhost";
+       ic_keyword[1] = "directory";
+       ic_keyword[2] = "gatewaydomain";
+       ic_keyword[3] = "smarthost";
+       ic_keyword[4] = "rbl";
+       ic_keyword[5] = "spamassassin";
+       ic_keyword[6] = "masqdomain";
+       
 
        ic_boxtitle[0] = _("Local host aliases");
        ic_boxtitle[1] = _("Directory domains");
@@ -48,6 +52,7 @@ void display_inetconf(void)
        ic_boxtitle[3] = _("Smart hosts");
        ic_boxtitle[4] = _("RBL hosts");
        ic_boxtitle[5] = _("SpamAssassin hosts");
+       ic_boxtitle[6] = _("Masqueradable domains");
 
        ic_desc[0] = _("(domains for which this host receives mail)");
        ic_desc[1] = _("(domains mapped with the Global Address Book)");
@@ -55,6 +60,7 @@ void display_inetconf(void)
        ic_desc[3] = _("(if present, forward all outbound mail to one of these hosts)");
        ic_desc[4] = _("(hosts running a Realtime Blackhole List)");
        ic_desc[5] = _("(hosts running the SpamAssassin service)");
+       ic_desc[6] = _("(Domains as which users are allowed to masquerade)");
 
        for (i=0; i<ic_max; ++i) {
                ic_spec[i] = strdup("");
@@ -76,12 +82,12 @@ void display_inetconf(void)
 
                if (which >= 0) {
                        ic_spec[which] = realloc(ic_spec[which], strlen(ic_spec[which]) + strlen(ename) + 2);
-                       if (strlen(ic_spec[which]) > 0) strcat(ic_spec[which], "\n");
+                       if (!IsEmptyStr(ic_spec[which])) strcat(ic_spec[which], "\n");
                        strcat(ic_spec[which], ename);
                }
                else {
                        ic_misc = realloc(ic_misc, strlen(ic_misc) + strlen(buf) + 2);
-                       if (strlen(ic_misc) > 0) strcat(ic_misc, "\n");
+                       if (!IsEmptyStr(ic_misc)) strcat(ic_misc, "\n");
                        strcat(ic_misc, buf);
                }
 
@@ -89,12 +95,12 @@ void display_inetconf(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Internet configuration"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table border=0 width=100%%><tr><td valign=top>\n");
@@ -108,7 +114,7 @@ void display_inetconf(void)
                escputs(ic_desc[which]);
                wprintf("</span><br />");
                wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>\n");
-               if (strlen(ic_spec[which]) > 0) {
+               if (!IsEmptyStr(ic_spec[which])) {
                        for (i=0; i<num_tokens(ic_spec[which], '\n'); ++i) {
                                wprintf("<TR><TD ALIGN=LEFT>");
                                extract_token(buf, ic_spec[which], i, '\n', sizeof buf);
@@ -124,8 +130,9 @@ void display_inetconf(void)
                                wprintf("</font></a></TD></TR>\n");
                        }
                }
-               wprintf("<FORM METHOD=\"POST\" action=\"save_inetconf\">\n"
-                       "<TR><TD>"
+               wprintf("<FORM METHOD=\"POST\" action=\"save_inetconf\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<TR><TD>"
                        "<INPUT TYPE=\"text\" NAME=\"ename\" MAXLENGTH=\"64\">"
                        "<INPUT TYPE=\"hidden\" NAME=\"etype\" VALUE=\"%s\">", ic_keyword[which]);
                wprintf("</TD><TD ALIGN=RIGHT>"
@@ -163,7 +170,7 @@ void save_inetconf(void) {
        if (buf[0] == '1') while (serv_getln(buf, SIZ), strcmp(buf, "000")) {
                extract_token(ename, buf, 0, '|', SIZ);
                extract_token(etype, buf, 1, '|', SIZ);
-               if (strlen(buf) == 0) {
+               if (IsEmptyStr(buf)) {
                        /** skip blank lines */
                }
                else if ((!strcasecmp(ename, bstr("ename")))
@@ -173,7 +180,7 @@ void save_inetconf(void) {
                        sprintf(WC->ImportantMessage, _("%s has been deleted."), ename);
                }
                else {
-                       if (strlen(newconfig) > 0) strcat(newconfig, "\n");
+                       if (!IsEmptyStr(newconfig)) strcat(newconfig, "\n");
                        strcat(newconfig, buf);
                }
        }