");
- wDumpContent(2);
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ DoTemplate(HKEY("aide_display_menu"), NULL, &NoCtx);
+ end_burst();
}
-
-/*
- * Display the screen to enter a generic server command
- */
-void display_generic(void)
-{
- output_headers(1, 1, 2, 0, 0, 0);
- wprintf("
\n");
-
- wprintf("
\n");
- wDumpContent(1);
-}
-
/*
* Interactive window to perform generic Citadel server commands.
*/
void do_generic(void)
{
- char buf[SIZ];
- char gcontent[SIZ];
+ WCTemplputParams SubTP;
+ int Done = 0;
+ StrBuf *Buf;
+ StrBuf *LineBuf;
char *junk;
size_t len;
@@ -256,176 +41,132 @@ void do_generic(void)
return;
}
- output_headers(1, 1, 0, 0, 0, 0);
-
- serv_printf("%s", bstr("g_cmd"));
- serv_getln(buf, sizeof buf);
-
- svput("BOXTITLE", WCS_STRING, _("Server command results"));
- do_template("beginbox", NULL);
-
- wprintf("
Command: ");
- escputs(bstr("g_cmd"));
- wprintf(" Result: ");
- escputs(buf);
- 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");
+ memset(&SubTP, 0, sizeof(WCTemplputParams));
+ Buf = NewStrBuf();
+ serv_puts(bstr("g_cmd"));
+ StrBuf_ServGetln(Buf);
+
+ switch (GetServerStatus(Buf, NULL)) {
+ case 8:
+ serv_puts("\n\n000");
+ if ( (StrLength(Buf)==3) &&
+ !strcmp(ChrPtr(Buf), "000")) {
+ StrBufAppendBufPlain(Buf, HKEY("\000"), 0);
+ break;
}
- wprintf("000");
- }
- if (buf[0] == '4') {
+ case 1:
+ LineBuf = NewStrBuf();
+ StrBufAppendBufPlain(Buf, HKEY("\n"), 0);
+ while (!Done) {
+ if (StrBuf_ServGetln(LineBuf) < 0)
+ break;
+ if ( (StrLength(LineBuf)==3) &&
+ !strcmp(ChrPtr(LineBuf), "000")) {
+ Done = 1;
+ }
+ StrBufAppendBuf(Buf, LineBuf, 0);
+ StrBufAppendBufPlain(Buf, HKEY("\n"), 0);
+ }
+ FreeStrBuf(&LineBuf);
+ break;
+ case 2:
+ 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);
+ break;
}
- wprintf("
");
- wprintf("
Enter another command \n");
- wprintf("
Return to menu \n");
- do_template("endbox", NULL);
- wDumpContent(1);
-}
-
-
-/*
- * Display the menubar.
- *
- * Set 'as_single_page' to display HTML headers and footers -- otherwise it's assumed
- * that the menubar is being embedded in another page.
- */
-void display_menubar(int as_single_page) {
-
- if (as_single_page) {
- output_headers(0, 0, 0, 0, 0, 0);
- wprintf("\n"
- "\n"
- "
MenuBar \n"
- "\n"
- "\n");
- do_template("background", NULL);
- }
+
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
- do_template("menubar", NULL);
+ SubTP.Filter.ContextType = CTX_STRBUF;
+ SubTP.Context = Buf;
- if (as_single_page) {
- wDumpContent(2);
- }
+ DoTemplate(HKEY("aide_display_generic_result"), NULL, &SubTP);
+ wDumpContent(1);
+ FreeStrBuf(&Buf);
}
-
/*
* Display the wait / input dialog while restarting the server.
*/
void display_shutdown(void)
{
- char buf[SIZ];
+ StrBuf *Line;
char *when;
+ Line = NewStrBuf();
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"
- "
%s "
- "\n\n",
- _("Please wait while the Citadel server is restarted... ")
- );
- }
- wDumpContent(0);
- lingering_close(WC->http_sock);
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 5);
+
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ DoTemplate(HKEY("aide_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", NULL);
- wprintf("
\n"
- " \n"
- " \n"
- " \n"
- " \n",
- _("The citadel server has to be restarted. It 'll be back in a minute.")
- );
- do_template("endbox", NULL);
- wDumpContent(1);
-
-
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ DoTemplate(HKEY("aide_display_serverrestart_page"), 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... "));
-
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 0);
+
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ DoTemplate(HKEY("aide_display_serverrestart_page"), 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]);
- }
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 2);
+
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+ DoTemplate(HKEY("aide_display_menu"), NULL, &NoCtx);
+ end_burst();
}
+ FreeStrBuf(&Line);
}
-void _display_menubar(void) { display_menubar(0); }
-
void
InitModule_MAINMENU
(void)
{
- WebcitAddUrlHandler(HKEY("display_aide_menu"), display_aide_menu, 0);
- WebcitAddUrlHandler(HKEY("server_shutdown"), display_shutdown, 0);
- WebcitAddUrlHandler(HKEY("display_main_menu"), display_main_menu, 0);
- WebcitAddUrlHandler(HKEY("display_generic"), display_generic, 0);
- WebcitAddUrlHandler(HKEY("do_generic"), do_generic, 0);
- WebcitAddUrlHandler(HKEY("display_menubar"), _display_menubar, 0);
+ WebcitAddUrlHandler(HKEY("display_aide_menu"), "", 0, display_aide_menu, 0);
+ WebcitAddUrlHandler(HKEY("server_shutdown"), "", 0, display_shutdown, 0);
+ WebcitAddUrlHandler(HKEY("display_main_menu"), "", 0, display_main_menu, 0);
+ WebcitAddUrlHandler(HKEY("do_generic"), "", 0, do_generic, 0);
}