* shuffled members of wcsession -> do a make clean or everything will burst in your...

[citadel.git] / webcit / mainmenu.c

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index d9337fda4cbb66a969a378666081fe2fc90fc9ee..5233204e15f740a03af1078766a321ced9c25537 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;");
@@ -275,7 +275,7 @@ void do_generic(void)
        serv_getln(buf, sizeof buf);
 
        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"));
@@ -369,7 +369,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 +384,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 +409,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();                    
        }
 }