When a client of any protocol handler sends a command to initiate SSL/TLS on a connec...

[citadel.git] / webcit / mainmenu.c

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 8942e93905b0e2b1758d3393070385dbb5701348..c7317213b20efd141f930f27d6af32a928880932 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -1,10 +1,23 @@
-#include "webcit.h"
-
 /*
- * The Main Menu
+ * 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.
  */
-void display_main_menu(void)
-{
+
+#include "webcit.h"
+
+// 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);
@@ -12,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);
@@ -24,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;
@@ -41,7 +48,6 @@ void do_generic(void)
                return;
        }
 
-        memset(&SubTP, 0, sizeof(WCTemplputParams));
        Buf = NewStrBuf();
        serv_puts(bstr("g_cmd"));
        StrBuf_ServGetln(Buf);
@@ -87,39 +93,43 @@ void do_generic(void)
                free(junk);
                break;
        }
-       
-       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("aide_display_serverrestart"), NULL, &NoCtx);
@@ -143,7 +153,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);
@@ -152,21 +164,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)