X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmainmenu.c;h=31aec39861201d1ab941a9dc5b0ebc399d66a754;hb=HEAD;hp=6bb1171a5665bbc386221db4479c3a3312a240bb;hpb=e4961bbeab85f60cd019135ba61421104f0b8ddc;p=citadel.git diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c index 6bb1171a5..2c326e001 100644 --- a/webcit/mainmenu.c +++ b/webcit/mainmenu.c @@ -1,14 +1,23 @@ /* - * $Id$ + * The main menu and other things + * + * Copyright (c) 1996-2021 by the citadel.org team + * + * This program is open source software. We call it open source, not + * free software, because Richard Stallman is a communist and an asshole. + * + * The program is licensed under the General Public License, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #include "webcit.h" -/* - * The Main Menu - */ -void display_main_menu(void) -{ +// The Main Menu +void display_main_menu(void) { begin_burst(); output_headers(1, 0, 0, 0, 1, 0); DoTemplate(HKEY("display_main_menu"), NULL, &NoCtx); @@ -16,11 +25,8 @@ void display_main_menu(void) } -/* - * System administration menu - */ -void display_aide_menu(void) -{ +// System administration menu +void display_aide_menu(void) { begin_burst(); output_headers(1, 0, 0, 0, 1, 0); DoTemplate(HKEY("aide_display_menu"), NULL, &NoCtx); @@ -28,11 +34,8 @@ void display_aide_menu(void) } -/* - * Interactive window to perform generic Citadel server commands. - */ -void do_generic(void) -{ +// 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; @@ -40,92 +43,102 @@ void do_generic(void) char *junk; size_t len; - if (!havebstr("sc_button")) { + if ( (!havebstr("sc_button")) && (!havebstr("ok_button")) && (!havebstr("cancel_button")) ) { display_main_menu(); return; } - 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; - } - case 1: - LineBuf = NewStrBuf(); - StrBufAppendBufPlain(Buf, HKEY("\n"), 0); - while (!Done) { - StrBuf_ServGetln(LineBuf); - if ( (StrLength(LineBuf)==3) && - !strcmp(ChrPtr(LineBuf), "000")) { - Done = 1; + if (havebstr("cancel_button")) { + AppendImportantMessage(_("Cancelled. Changes were not saved."), -1); + } + + 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")) { + StrBufAppendBufPlain(Buf, HKEY("\000"), 0); + break; } - StrBufAppendBuf(Buf, LineBuf, 0); + 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"); + 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; } - 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; + FreeStrBuf(&Buf); } - begin_burst(); - output_headers(1, 0, 0, 0, 1, 0); - - SubTP.Filter.ContextType = CTX_STRBUF; - SubTP.Context = Buf; - - DoTemplate(HKEY("aide_display_generic_result"), NULL, &SubTP); + // 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")); + } - wDumpContent(1); + // 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); + } - FreeStrBuf(&Buf); } -/* - * 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); @@ -146,7 +159,9 @@ void display_shutdown(void) 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("aide_display_serverrestart_page"), NULL, &NoCtx); @@ -155,21 +170,18 @@ void display_shutdown(void) } 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("aide_display_menu"), NULL, &NoCtx); end_burst(); } + FreeStrBuf(&Line); } + void InitModule_MAINMENU (void)