* Rearranged the code in "Site-wide configuration" and "Generic

          server command" to avoid nested server operations

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 4ab732d87c6477f8de4bdfe407652f36e5c1f944..8ddee1f8b571e0e6d30671b5969a90b8d3266f3f 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 26 22:52:13 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * Rearranged the code in "Site-wide configuration" and "Generic
+         server command" to avoid nested server operations
+
 Wed Jun 23 21:43:30 EDT 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * webcit.c: added "back, top, next" buttons to bottom of each page
        * menubar.html: replaced "User list" with "Page another user"

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 543a86ce186e1606e6192fee22fbe82849d8c3d1..70183d589f2bb35ec0a9aa77bbe8e4e53990f248 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -261,11 +261,13 @@ void do_generic(void)
                display_main_menu();
                return;
        }
-       serv_printf("%s", bstr("g_cmd"));
-       serv_gets(buf);
 
        printf("HTTP/1.0 200 OK\n");
        output_headers(1);
+
+       serv_printf("%s", bstr("g_cmd"));
+       serv_gets(buf);
+
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770077><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
        wprintf("<B>Server command results</B>\n");

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index f2b43ecb364d8388c982a89a6bdcc34d121a58d5..0b596a2984b0302f4d27442e288865be84b7aeb4 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -19,14 +19,20 @@ void display_siteconfig(void)
        char buf[256];
        int i;
 
+       printf("HTTP/1.0 200 OK\n");
+       output_headers(1);
+
        serv_printf("CONF get");
        serv_gets(buf);
        if (buf[0] != '1') {
-               display_error(&buf[4]);
+               wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=770000><TR><TD>");
+               wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
+               wprintf("<B>Error</B>\n");
+               wprintf("</FONT></TD></TR></TABLE><BR>\n");
+               wprintf("%s<BR>\n", &buf[4]);
+               wDumpContent(1);
                return;
        }
-       printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
 
        wprintf("<TABLE WIDTH=100% BORDER=0 BGCOLOR=007700><TR><TD>");
        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>Site configuration");
@@ -37,7 +43,7 @@ void display_siteconfig(void)
 
        i = 0;
        while (serv_gets(buf), strcmp(buf, "000")) {
-               switch (i++) {
+               switch (++i) {
                case 1:
                        wprintf("<TR><TD>Node name</TD><TD>");
                        wprintf("<INPUT TYPE=\"text\" NAME=\"c_nodename\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);