* buybuy serv_read

[citadel.git] / webcit / mainmenu.c

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index d9337fda4cbb66a969a378666081fe2fc90fc9ee..f4420d978805626864bd98c32889894656f656f7 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -11,7 +11,7 @@ void display_main_menu(void)
 {
        begin_burst();
        output_headers(1, 0, 0, 0, 1, 0);
-       DoTemplate(HKEY("display_main_menu"), NULL, NULL, 0);
+       DoTemplate(HKEY("display_main_menu"), NULL, &NoCtx);
        end_burst();
 
 /*
@@ -19,7 +19,7 @@ void display_main_menu(void)
        output_headers(1, 1, 1, 0, 0, 0);
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table width=\"100%%\" cellspacing=\"10px\" cellpadding=\"0\">"
+               "<table width=\"100%%\" cellspacing=\"10\" cellpadding=\"0\">"
                "<tr><td colspan=\"2\" class=\"advanced\">\n");
 
        svput("BOXTITLE", WCS_STRING, _("Basic commands"));
@@ -161,7 +161,7 @@ void display_aide_menu(void)
 {
        begin_burst();
        output_headers(1, 0, 0, 0, 1, 0);
-       DoTemplate(HKEY("display_aide_menu"), NULL, NULL, 0);
+       DoTemplate(HKEY("display_aide_menu"), NULL, &NoCtx);
        end_burst();
 /*
        output_headers(1, 1, 2, 0, 0, 0);
@@ -243,7 +243,7 @@ void display_generic(void)
        wprintf("<br /><textarea name=\"g_input\" rows=10 cols=80 width=80></textarea><br />\n");
 
        wprintf("<font size=-2>");
-       wprintf(_("Detected host header is %s://%s"), (is_https ? "https" : "http"), WC->http_host);
+       wprintf(_("Detected host header is %s://%s"), (is_https ? "https" : "http"), ChrPtr(WC->http_host));
        wprintf("</font>\n");
        wprintf("<input type=\"submit\" name=\"sc_button\" value=\"%s\">", _("Send command"));
        wprintf("&nbsp;");
@@ -259,8 +259,10 @@ void display_generic(void)
  */
 void do_generic(void)
 {
-       char buf[SIZ];
-       char gcontent[SIZ];
+
+       wcsession *WCC = WC;
+       int Done = 0;
+       StrBuf *Buf;
        char *junk;
        size_t len;
 
@@ -271,45 +273,53 @@ void do_generic(void)
 
        output_headers(1, 1, 0, 0, 0, 0);
 
-       serv_printf("%s", bstr("g_cmd"));
-       serv_getln(buf, sizeof buf);
+       serv_puts(bstr("g_cmd"));
 
        svput("BOXTITLE", WCS_STRING, _("Server command results"));
-       do_template("beginbox", NULL);
+       do_template("beginboxx", NULL);
 
        wprintf("<table border=0><tr><td>Command:</td><td><tt>");
-       escputs(bstr("g_cmd"));
+       StrEscAppend(WCC->WBuf, sbstr("g_cmd"), NULL, 0, 0);
        wprintf("</tt></td></tr><tr><td>Result:</td><td><tt>");
-       escputs(buf);
+       StrEscAppend(WCC->WBuf, Buf, NULL, 0, 0);
+       StrBufAppendBufPlain(WCC->WBuf, HKEY("<br>\n"), 0);
        wprintf("</tt></td></tr></table><br />\n");
-
-       if (buf[0] == '8') {
-               serv_printf("\n\n000");
-       }
-       if ((buf[0] == '1') || (buf[0] == '8')) {
-               while (serv_getln(gcontent, sizeof gcontent), strcmp(gcontent, "000")) {
-                       escputs(gcontent);
-                       wprintf("<br />\n");
+       
+       switch (GetServerStatus(Buf, NULL)) {
+       case 8:
+               serv_puts("\n\n000");
+               if ( (StrLength(Buf)==3) && 
+                    !strcmp(ChrPtr(Buf), "000")) {
+                       StrBufAppendBufPlain(WCC->WBuf, HKEY("\000"), 0);
+                       break;
                }
-               wprintf("000");
-       }
-       if (buf[0] == '4') {
+       case 1:
+               while (!Done) {
+                       StrBuf_ServGetlnBuffered(Buf);
+                       if ( (StrLength(Buf)==3) && 
+                            !strcmp(ChrPtr(Buf), "000")) {
+                               Done = 1;
+                       }
+                       StrEscAppend(WCC->WBuf, Buf, NULL, 0, 0);
+                       StrBufAppendBufPlain(WCC->WBuf, HKEY("<br>\n"), 0);
+               }
+               break;
+       case 4:
                text_to_server(bstr("g_input"));
                serv_puts("000");
-       }
-       if (buf[0] == '6') {
-               len = atol(&buf[4]);
-               junk = malloc(len);
-               serv_read(junk, len);
-               free(junk);
-       }
-       if (buf[0] == '7') {
-               len = atol(&buf[4]);
+               break;
+       case 6:
+               len = atol(&ChrPtr(Buf)[4]);
+               StrBuf_ServGetBLOBBuffered(Buf, len);
+               break;
+       case 7:
+               len = atol(&ChrPtr(Buf)[4]);
                junk = malloc(len);
                memset(junk, 0, len);
                serv_write(junk, len);
                free(junk);
        }
+       
        wprintf("<hr />");
        wprintf("<a href=\"display_generic\">Enter another command</a><br />\n");
        wprintf("<a href=\"display_advanced\">Return to menu</a>\n");
@@ -369,7 +379,7 @@ void display_shutdown(void)
                }
                begin_burst();
                output_headers(1, 0, 0, 0, 1, 0);
-               DoTemplate(HKEY("display_serverrestart"), NULL, NULL, 0);
+               DoTemplate(HKEY("display_serverrestart"), NULL, &NoCtx);
                end_burst();
                lingering_close(WC->http_sock);
                sleeeeeeeeeep(10);
@@ -384,16 +394,16 @@ void display_shutdown(void)
                {
                        begin_burst();
                        output_headers(1, 0, 0, 0, 1, 0);
-                       DoTemplate(HKEY("display_serverrestartpage"), NULL, NULL, 0);
+                       DoTemplate(HKEY("display_serverrestartpage"), NULL, &NoCtx);
                        end_burst();
                }
                else
                {
                        serv_printf("SEXP broadcast|%s", message);
-                       serv_getln(buf, sizeof buf); // should we care?
+                       serv_getln(buf, sizeof buf); /* TODO: should we care? */
                        begin_burst();
                        output_headers(1, 0, 0, 0, 1, 0);
-                       DoTemplate(HKEY("display_serverrestartpagedo"), NULL, NULL, 0);
+                       DoTemplate(HKEY("display_serverrestartpagedo"), NULL, &NoCtx);
                        end_burst();                    
                }
        }
@@ -409,7 +419,7 @@ void display_shutdown(void)
                }
                begin_burst();
                output_headers(1, 0, 0, 0, 1, 0);
-               DoTemplate(HKEY("display_aide_menu"), NULL, NULL, 0);
+               DoTemplate(HKEY("display_aide_menu"), NULL, &NoCtx);
                end_burst();                    
        }
 }