\n");
-
- wprintf("
\n");
- wDumpContent(1);
-}
-
-/*
- * Interactive window to perform generic Citadel server commands.
- */
-void do_generic(void)
-{
-
- wcsession *WCC = WC;
+// Handle generic server commands, possibly entered from a screen, possibly set up as a way to avoid custom code
+void do_generic(void) {
+ WCTemplputParams SubTP;
int Done = 0;
StrBuf *Buf;
+ StrBuf *LineBuf;
char *junk;
size_t len;
- if (!havebstr("sc_button")) {
+ if ( (!havebstr("sc_button")) && (!havebstr("ok_button")) && (!havebstr("cancel_button")) ) {
display_main_menu();
return;
}
- output_headers(1, 1, 0, 0, 0, 0);
-
- serv_puts(bstr("g_cmd"));
-
- svput("BOXTITLE", WCS_STRING, _("Server command results"));
- do_template("beginboxx", NULL);
+ if (havebstr("cancel_button")) {
+ AppendImportantMessage(_("Cancelled. Changes were not saved."), -1);
+ }
- wprintf("
| Command: | ");
- StrEscAppend(WCC->WBuf, sbstr("g_cmd"), NULL, 0, 0);
- wprintf(" |
| Result: | ");
- StrEscAppend(WCC->WBuf, Buf, NULL, 0, 0);
- StrBufAppendBufPlain(WCC->WBuf, HKEY("
\n"), 0);
- 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;
- }
- case 1:
- while (!Done) {
- StrBuf_ServGetln(Buf);
+ if (havebstr("ok_button")) {
+ 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")) {
- Done = 1;
+ !strcmp(ChrPtr(Buf), "000")) {
+ StrBufAppendBufPlain(Buf, HKEY("\000"), 0);
+ break;
+ }
+ 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);
}
- StrEscAppend(WCC->WBuf, Buf, NULL, 0, 0);
- StrBufAppendBufPlain(WCC->WBuf, HKEY("
\n"), 0);
+ FreeStrBuf(&LineBuf);
+ break;
+ case 2:
+ break;
+ case 4:
+ text_to_server(bstr("g_input"));
+ serv_puts("000");
+ 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;
}
- break;
- case 4:
- text_to_server(bstr("g_input"));
- serv_puts("000");
- 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);
+ FreeStrBuf(&Buf);
}
- 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);
+ // We may have been supplied with instructions regarding the location
+ // to which we must return after posting. If found, go there.
+ if (havebstr("return_to")) {
+ syslog(LOG_DEBUG, "return_to = %s", bstr("return_to"));
+ http_redirect(bstr("return_to"));
}
- do_template("menubar", NULL);
-
- if (as_single_page) {
- wDumpContent(2);
+ // Otherwise, do the generic result screen.
+ else {
+ begin_burst();
+ output_headers(1, 0, 0, 0, 1, 0);
+
+ StackContext(NULL, &SubTP, Buf, CTX_STRBUF, 0, NULL);
+ {
+ DoTemplate(HKEY("aide_display_generic_result"), NULL, &SubTP);
+ }
+ UnStackContext(&SubTP);
+ wDumpContent(1);
}
-
}
-/*
- * Display the wait / input dialog while restarting the server.
- */
-void display_shutdown(void)
-{
- char buf[SIZ];
+// Display the wait / input dialog while restarting the server.
+void display_shutdown(void) {
+ StrBuf *Line;
char *when;
+ Line = NewStrBuf();
when=bstr("when");
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? */
-
- safestrncpy(WC->ImportantMessage,
- &buf[4],
- sizeof WC->ImportantMessage);
- }
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 5);
+
begin_burst();
output_headers(1, 0, 0, 0, 1, 0);
- DoTemplate(HKEY("display_serverrestart"), NULL, &NoCtx);
+ DoTemplate(HKEY("aide_display_serverrestart"), NULL, &NoCtx);
end_burst();
lingering_close(WC->Hdr->http_sock);
sleeeeeeeeeep(10);
@@ -213,46 +153,41 @@ void display_shutdown(void)
{
begin_burst();
output_headers(1, 0, 0, 0, 1, 0);
- DoTemplate(HKEY("display_serverrestartpage"), NULL, &NoCtx);
+ DoTemplate(HKEY("aide_display_serverrestart_page"), NULL, &NoCtx);
end_burst();
}
else
{
serv_printf("SEXP broadcast|%s", message);
- serv_getln(buf, sizeof buf); /* TODO: should we care? */
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 0);
+
begin_burst();
output_headers(1, 0, 0, 0, 1, 0);
- DoTemplate(HKEY("display_serverrestartpagedo"), NULL, &NoCtx);
+ DoTemplate(HKEY("aide_display_serverrestart_page"), NULL, &NoCtx);
end_burst();
}
}
else if (!strcmp(when, "idle")) {
serv_printf("SCDN 3");
- serv_getln(buf, sizeof buf);
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 2);
- 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);
+ 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);
}