* Corrected overly-escaped reply-to addresses in "reply" button

[citadel.git] / webcit / siteconfig.c

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index a2ac49c1a01964f7106de2c2c2ba2bf4a5aa6b9b..bd78bb1206f6d3be5f22d545d351c0bc616ff0d0 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -418,7 +418,7 @@ void display_siteconfig(void)
                        break;
                case 25:
                        if (!strcasecmp(whichmenu, "network")) {
-                               wprintf("<TR><TD>SMTP listener port (-1 to disable)</TD><TD>");
+                               wprintf("<TR><TD>SMTP MTA port (-1 to disable)</TD><TD>");
                                wprintf("<INPUT TYPE=\"text\" NAME=\"c_smtp_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
                                wprintf("</TD></TR>\n");
                        }
@@ -548,6 +548,16 @@ void display_siteconfig(void)
                                wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_ip_addr\" VALUE=\"%s\">", buf);
                        }
                        break;
+               case 39:
+                       if (!strcasecmp(whichmenu, "network")) {
+                               wprintf("<TR><TD>SMTP MSA port (-1 to disable)</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_msa_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_msa_port\" VALUE=\"%s\">", buf);
+                       }
+                       break;
                }
        }
 
@@ -614,6 +624,7 @@ void display_siteconfig(void)
 
        wprintf("</TABLE><CENTER>");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
+       wprintf("&nbsp;");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">\n");
        wprintf("</CENTER></FORM>\n");
        do_template("endbox");
@@ -665,7 +676,7 @@ void siteconfig(void)
        serv_printf("%s", ((!strcasecmp(bstr("c_aide_zap"), "yes") ? "1" : "0")));
        serv_printf("%s", bstr("c_imap_port"));
        serv_printf("%s", bstr("c_net_freq"));
-       serv_printf("%s", bstr("c_disable_newu"));
+       serv_printf("%s", ((!strcasecmp(bstr("c_disable_newu"), "yes") ? "1" : "0")));
        serv_printf("1");       /* placeholder -- deprecated */
        serv_printf("%s", bstr("c_purge_hour"));
        serv_printf("%s", bstr("c_ldap_host"));
@@ -674,6 +685,7 @@ void siteconfig(void)
        serv_printf("%s", bstr("c_ldap_bind_dn"));
        serv_printf("%s", bstr("c_ldap_bind_pw"));
        serv_printf("%s", bstr("c_ip_addr"));
+       serv_printf("%s", bstr("c_msa_port"));
        serv_printf("000");
 
        serv_printf("SPEX site|%d|%d", atoi(bstr("sitepolicy")), atoi(bstr("sitevalue")));