* Split the site configuration screen up into four different screens,
authorArt Cancro <ajc@citadel.org>
Wed, 27 Aug 2003 04:26:54 +0000 (04:26 +0000)
committerArt Cancro <ajc@citadel.org>
Wed, 27 Aug 2003 04:26:54 +0000 (04:26 +0000)
  and added a meta-menu

webcit/ChangeLog
webcit/siteconfig.c

index 51c6dd495bfbf516ef018978af880df07e45632a..047de8ce4403879a198fc33b2e7227fe08ff213f 100644 (file)
@@ -1,4 +1,8 @@
 $Log$
+Revision 500.24  2003/08/27 04:26:54  ajc
+* Split the site configuration screen up into four different screens,
+  and added a meta-menu
+
 Revision 500.23  2003/08/24 03:31:50  ajc
 * Finished the setup program
 * Bumped the internal version number to 5.01
@@ -1578,4 +1582,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-
index 762517cb3a7410c1582684efcd8c2d2897360f32..3e680233888160bd1561181eacb54542c0fb868a 100644 (file)
 void display_siteconfig(void)
 {
        char buf[SIZ];
+       char *whichmenu;
        int i;
 
        output_headers(3);
 
+       whichmenu = bstr("whichmenu");
+
+       svprintf("BOXTITLE", WCS_STRING, "Site configuration");
+       do_template("beginbox");
+
+       if (!strcmp(whichmenu, "")) {
+               wprintf("<TABLE border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
+
+               wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+                       "</TD><TD>"
+                       "<A HREF=\"/display_siteconfig?whichmenu=general\">"
+                       "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+                       "SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
+                       "</TD><TD>"
+                       "<A HREF=\"/display_siteconfig?whichmenu=general\">"
+                       "<B>General</B><BR>"
+                       "General site configuration items"
+                       "</A></TD></TR>\n"
+               );
+
+               wprintf("<TR><TD>"
+                       "</TD><TD>"
+                       "<A HREF=\"/display_siteconfig?whichmenu=access\">"
+                       "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+                       "SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
+                       "</TD><TD>"
+                       "<A HREF=\"/display_siteconfig?whichmenu=access\">"
+                       "<B>Access</B><BR>"
+                       "Access controls and site policy settings"
+                       "</A></TD></TR>\n"
+               );
+
+               wprintf("<TR BGCOLOR=\"#CCCCCC\"><TD>"
+                       "</TD><TD>"
+                       "<A HREF=\"/display_siteconfig?whichmenu=network\">"
+                       "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+                       "SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
+                       "</TD><TD>"
+                       "<A HREF=\"/display_siteconfig?whichmenu=network\">"
+                       "<B>Network</B><BR>"
+                       "Network services"
+                       "</A></TD></TR>\n"
+               );
+
+               wprintf("<TR><TD>"
+                       "</TD><TD>"
+                       "<A HREF=\"/display_siteconfig?whichmenu=tuning\">"
+                       "<IMG BORDER=\"0\" WIDTH=\"48\" HEIGHT=\"48\" "
+                       "SRC=\"/static/advanced-icon.gif\" ALT=\"&nbsp;\">"
+                       "</TD><TD>"
+                       "<A HREF=\"/display_siteconfig?whichmenu=tuning\">"
+                       "<B>Tuning</B><BR>"
+                       "Advanced server fine-tuning controls"
+                       "</A></TD></TR>\n"
+               );
+
+               wprintf("</TABLE>");
+
+               do_template("endbox");
+               wDumpContent(1);
+               return;
+       }
+
+       if (!strcasecmp(whichmenu, "general")) {
+               wprintf("<CENTER><H2>General site configuration items</H2></CENTER>\n");
+       }
+
+       if (!strcasecmp(whichmenu, "access")) {
+               wprintf("<CENTER><H2>Access controls and site policy settings</H2></CENTER>\n");
+       }
+
+       if (!strcasecmp(whichmenu, "network")) {
+               wprintf("<CENTER><H2>Network services</H2></CENTER>\n");
+       }
+
+       if (!strcasecmp(whichmenu, "tuning")) {
+               wprintf("<CENTER><H2>Advanced server fine-tuning controls</H2></CENTER>\n");
+       }
+
        serv_printf("CONF get");
        serv_gets(buf);
        if (buf[0] != '1') {
@@ -43,12 +123,11 @@ void display_siteconfig(void)
                wprintf("<SPAN CLASS=\"titlebar\">Error</SPAN>\n");
                wprintf("</TD></TR></TABLE><BR>\n");
                wprintf("%s<BR>\n", &buf[4]);
+               do_template("endbox");
                wDumpContent(1);
                return;
        }
 
-       svprintf("BOXTITLE", WCS_STRING, "Site configuration");
-       do_template("beginbox");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/siteconfig\">\n");
        wprintf("<TABLE border=0>\n");
@@ -57,155 +136,304 @@ void display_siteconfig(void)
        while (serv_gets(buf), strcmp(buf, "000")) {
                switch (++i) {
                case 1:
-                       wprintf("<TR><TD>Node name</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_nodename\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "general")) {
+                               wprintf("<TR><TD>Node name</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_nodename\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_nodename\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 2:
-                       wprintf("<TR><TD>Fully qualified domain name</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_fqdn\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "general")) {
+                               wprintf("<TR><TD>Fully qualified domain name</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_fqdn\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_fqdn\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 3:
-                       wprintf("<TR><TD>Human-readable node name</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_humannode\" MAXLENGTH=\"20\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "general")) {
+                               wprintf("<TR><TD>Human-readable node name</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_humannode\" MAXLENGTH=\"20\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_humannode\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 4:
-                       wprintf("<TR><TD>Landline telephone number</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_phonenum\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "general")) {
+                               wprintf("<TR><TD>Landline telephone number</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_phonenum\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_phonenum\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 5:
-                       wprintf("<TR><TD>Automatically grant room-aide status to users who create private rooms</TD><TD>");
-                       wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_creataide\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "access")) {
+                               wprintf("<TR><TD>Automatically grant room-aide status to users who create private rooms</TD><TD>");
+                               wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_creataide\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_creataide\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 6:
-                       wprintf("<TR><TD>Server connection idle timeout (in seconds)</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_sleeping\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "tuning")) {
+                               wprintf("<TR><TD>Server connection idle timeout (in seconds)</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_sleeping\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_sleeping\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 7:
-                       wprintf("<TR><TD>Initial access level for new users</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_initax\" MAXLENGTH=\"1\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "access")) {
+                               wprintf("<TR><TD>Initial access level for new users</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_initax\" MAXLENGTH=\"1\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_initax\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 8:
-                       wprintf("<TR><TD>Require registration for new users</TD><TD>");
-                       wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_regiscall\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "access")) {
+                               wprintf("<TR><TD>Require registration for new users</TD><TD>");
+                               wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_regiscall\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_regiscall\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 9:
-                       wprintf("<TR><TD>Move problem user messages to twitroom</TD><TD>");
-                       wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_twitdetect\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "access")) {
+                               wprintf("<TR><TD>Quarantine messages from problem users</TD><TD>");
+                               wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_twitdetect\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_twitdetect\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 10:
-                       wprintf("<TR><TD>Name of twitroom</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_twitroom\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "access")) {
+                               wprintf("<TR><TD>Name of quarantine room</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_twitroom\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_twitroom\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 11:
-                       wprintf("<TR><TD>Paginator prompt</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_moreprompt\" MAXLENGTH=\"79\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "general")) {
+                               wprintf("<TR><TD>Paginator prompt (for text mode clients)</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_moreprompt\" MAXLENGTH=\"79\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_moreprompt\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 12:
-                       wprintf("<TR><TD>Restrict access to Internet mail</TD><TD>");
-                       wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_restrict\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "access")) {
+                               wprintf("<TR><TD>Restrict access to Internet mail</TD><TD>");
+                               wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_restrict\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_restrict\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 13:
-                       wprintf("<TR><TD>Geographic location of this system</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_bbs_city\" MAXLENGTH=\"31\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "general")) {
+                               wprintf("<TR><TD>Geographic location of this system</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_bbs_city\" MAXLENGTH=\"31\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_bbs_city\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 14:
-                       wprintf("<TR><TD>Name of system administrator</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_sysadm\" MAXLENGTH=\"25\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "general")) {
+                               wprintf("<TR><TD>Name of system administrator</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_sysadm\" MAXLENGTH=\"25\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_sysadm\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 15:
-                       wprintf("<TR><TD>Maximum concurrent sessions</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_maxsessions\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "tuning")) {
+                               wprintf("<TR><TD>Maximum concurrent sessions</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_maxsessions\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_maxsessions\" VALUE=\"%s\">", buf);
+                       }
                        break;
-
                case 17:
-                       wprintf("<TR><TD>Default user purge time (days)</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_userpurge\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "tuning")) {
+                               wprintf("<TR><TD>Default user purge time (days)</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_userpurge\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_userpurge\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 18:
-                       wprintf("<TR><TD>Default room purge time (days)</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_roompurge\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "tuning")) {
+                               wprintf("<TR><TD>Default room purge time (days)</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_roompurge\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_roompurge\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 19:
-                       wprintf("<TR><TD>Name of room to log pages</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_logpages\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "access")) {
+                               wprintf("<TR><TD>Name of room to log pages</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_logpages\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_logpages\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 20:
-                       wprintf("<TR><TD>Access level required to create rooms</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_createax\" MAXLENGTH=\"1\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "access")) {
+                               wprintf("<TR><TD>Access level required to create rooms</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_createax\" MAXLENGTH=\"1\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_createax\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 21:
-                       wprintf("<TR><TD>Maximum message length</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_maxmsglen\" MAXLENGTH=\"20\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "tuning")) {
+                               wprintf("<TR><TD>Maximum message length</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_maxmsglen\" MAXLENGTH=\"20\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_maxmsglen\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 22:
-                       wprintf("<TR><TD>Minimum number of worker threads</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_min_workers\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "tuning")) {
+                               wprintf("<TR><TD>Minimum number of worker threads</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_min_workers\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_min_workers\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 23:
-                       wprintf("<TR><TD>Maximum number of worker threads</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_max_workers\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "tuning")) {
+                               wprintf("<TR><TD>Maximum number of worker threads</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_max_workers\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_max_workers\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 24:
-                       wprintf("<TR><TD>POP3 listener port (-1 to disable)</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_pop3_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "network")) {
+                               wprintf("<TR><TD>POP3 listener port (-1 to disable)</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_pop3_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_pop3_port\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 25:
-                       wprintf("<TR><TD>SMTP listener port (-1 to disable)</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_smtp_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "network")) {
+                               wprintf("<TR><TD>SMTP listener port (-1 to disable)</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_smtp_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_smtp_port\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 27:
-                       wprintf("<TR><TD>Allow aides to zap (forget) rooms</TD><TD>");
-                       wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_aide_zap\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "access")) {
+                               wprintf("<TR><TD>Allow aides to zap (forget) rooms</TD><TD>");
+                               wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_aide_zap\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_aide_zap\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 28:
-                       wprintf("<TR><TD>IMAP listener port (-1 to disable)</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_imap_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "network")) {
+                               wprintf("<TR><TD>IMAP listener port (-1 to disable)</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_imap_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_imap_port\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 29:
-                       wprintf("<TR><TD>Network run frequency (in seconds)</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_net_freq\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "network")) {
+                               wprintf("<TR><TD>Network run frequency (in seconds)</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_net_freq\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_net_freq\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 30:
-                       wprintf("<TR><TD>Disable self-service user account creation</TD><TD>");
-                       wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_disable_newu\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "access")) {
+                               wprintf("<TR><TD>Disable self-service user account creation</TD><TD>");
+                               wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_disable_newu\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_disable_newu\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 31:
-                       wprintf("<TR><TD>Allow system Aides access to mailboxes</TD><TD>");
-                       wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_aide_mailboxes\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "access")) {
+                               wprintf("<TR><TD>Allow system Aides access to mailboxes</TD><TD>");
+                               wprintf("<INPUT TYPE=\"checkbox\" NAME=\"c_aide_mailboxes\" VALUE=\"yes\" %s>", ((atoi(buf) != 0) ? "CHECKED" : ""));
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_aide_mailboxes\" VALUE=\"%s\">", buf);
+                       }
                        break;
                case 32:
-                       wprintf("<TR><TD>Hour to run database auto-purge (0-23)</TD><TD>");
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"c_purge_hour\" MAXLENGTH=\"2\" VALUE=\"%s\">", buf);
-                       wprintf("</TD></TR>\n");
+                       if (!strcasecmp(whichmenu, "tuning")) {
+                               wprintf("<TR><TD>Hour to run database auto-purge (0-23)</TD><TD>");
+                               wprintf("<INPUT TYPE=\"text\" NAME=\"c_purge_hour\" MAXLENGTH=\"2\" VALUE=\"%s\">", buf);
+                               wprintf("</TD></TR>\n");
+                       }
+                       else {
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"c_purge_hour\" VALUE=\"%s\">", buf);
+                       }
                        break;
                }
        }
@@ -224,14 +452,14 @@ void siteconfig(void)
        char buf[SIZ];
 
        if (strcasecmp(bstr("sc"), "OK")) {
-               display_main_menu();
+               display_siteconfig();
                return;
        }
        serv_printf("CONF set");
        serv_gets(buf);
        if (buf[0] != '4') {
                strcpy(WC->ImportantMessage, &buf[4]);
-               display_main_menu();
+               display_siteconfig();
                return;
        }
        serv_printf("%s", bstr("c_nodename"));
@@ -267,5 +495,6 @@ void siteconfig(void)
        serv_printf("%s", bstr("c_aide_mailboxes"));
        serv_printf("%s", bstr("c_purge_hour"));
        serv_printf("000");
-       display_success("System configuration has been updated.");
+       strcpy(WC->ImportantMessage, "System configuration has been updated.");
+       display_siteconfig();
 }