\n"); wprintf(""); - 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->Hdr->HR.http_host)); wprintf("\n"); wprintf("", _("Send command")); wprintf(" "); @@ -246,8 +78,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; @@ -258,49 +92,57 @@ 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"); + do_template("beginboxx", NULL); wprintf("
| Command: | "); - escputs(bstr("g_cmd")); + StrEscAppend(WCC->WBuf, sbstr("g_cmd"), NULL, 0, 0); wprintf(" |
| Result: | ");
- escputs(buf);
+ StrEscAppend(WCC->WBuf, Buf, NULL, 0, 0);
+ StrBufAppendBufPlain(WCC->WBuf, HKEY(" \n"), 0); wprintf(" |
\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("
\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_ServGetln(Buf); + if ( (StrLength(Buf)==3) && + !strcmp(ChrPtr(Buf), "000")) { + Done = 1; + } + StrEscAppend(WCC->WBuf, Buf, NULL, 0, 0); + StrBufAppendBufPlain(WCC->WBuf, HKEY("
\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("
"); wprintf("Enter another command
\n"); wprintf("Return to menu\n"); - do_template("endbox"); + do_template("endbox", NULL); wDumpContent(1); } @@ -322,10 +164,10 @@ void display_menubar(int as_single_page) { "body { text-decoration: none; }\n" "\n" "\n"); - do_template("background"); + do_template("background", NULL); } - do_template("menubar"); + do_template("menubar", NULL); if (as_single_page) { wDumpContent(2); @@ -344,75 +186,60 @@ void display_shutdown(void) char *when; when=bstr("when"); - if (!strcmp(when, "now")){ + if (strcmp(when, "now") == 0){ serv_printf("DOWN 1"); serv_getln(buf, sizeof buf); if (atol(buf) == 500) { /* upsie. maybe the server is not running as daemon? */ - wprintf("Attention: %s", &buf[4]); - - } - else { - wprintf("\n" - "\n" - "\n" - "\n" - "\n" - "
![](\"static/throbber.gif\")
%s "
- "\n\n",
- _("Please wait while the Citadel server is restarted... ")
- );
+
+ safestrncpy(WC->ImportantMessage,
+ &buf[4],
+ sizeof WC->ImportantMessage);
}
- wDumpContent(0);
- lingering_close(WC->http_sock);
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ DoTemplate(HKEY("display_serverrestart"), NULL, &NoCtx);
+ end_burst();
+ lingering_close(WC->Hdr->http_sock);
sleeeeeeeeeep(10);
serv_printf("NOOP");
serv_printf("NOOP");
}
- else if (!strcmp(when, "page")) {
+ else if (strcmp(when, "page") == 0) {
char *message;
message = bstr("message");
if ((message == NULL) || (IsEmptyStr(message)))
{
- output_headers(1, 1, 1, 0, 0, 0);
- svput("BOXTITLE", WCS_STRING, _("Message to your Users:"));
- do_template("beginbox");
- wprintf("\n",
- _("The citadel server has to be restarted. It 'll be back in a minute.")
- );
- do_template("endbox");
- wDumpContent(1);
-
-
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ DoTemplate(HKEY("display_serverrestartpage"), NULL, &NoCtx);
+ end_burst();
}
else
{
- // TODO: page the users... wait longer...
serv_printf("SEXP broadcast|%s", message);
- serv_getln(buf, sizeof buf); // should we care?
- wprintf("\n"
- "\n"
- "\n"
- "\n"
- "\n"
- " %s "
- "\n\n",
- _("Please wait while your users are being paged, the citadel server will be restarted after that... "));
-
+ serv_getln(buf, sizeof buf); /* TODO: should we care? */
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ DoTemplate(HKEY("display_serverrestartpagedo"), NULL, &NoCtx);
+ end_burst();
}
}
else if (!strcmp(when, "idle")) {
serv_printf("SCDN 3");
serv_getln(buf, sizeof buf);
- if (atol(buf) == 500) {
- /* oops ... maybe the server is not running as a daemon? */
- wprintf("Attention: %s", &buf[4]);
+
+ if (atol(buf) == 500)
+ { /* upsie. maybe the server is not running as daemon? */
+ safestrncpy(WC->ImportantMessage,
+ &buf[4],
+ sizeof WC->ImportantMessage);
}
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ DoTemplate(HKEY("display_aide_menu"), NULL, &NoCtx);
+ end_burst();
}
}