indent -kr -i8 -brf -bbb -fnc -l132 -nce on all of webcit-classic

[citadel.git] / webcit / mainmenu.c

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index c7317213b20efd141f930f27d6af32a928880932..3ec377c1624e814ab9d93b6d0307131129d7f424 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -1,3 +1,4 @@
+
 /*
  * The main menu and other things
  *
@@ -36,62 +37,67 @@ void display_aide_menu(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;
+       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;
        }
 
-       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) {
-                       if (StrBuf_ServGetln(LineBuf) < 0)
+       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;
-                       if ( (StrLength(LineBuf)==3) && 
-                            !strcmp(ChrPtr(LineBuf), "000")) {
-                               Done = 1;
                        }
-                       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);
        }
 
        // We may have been supplied with instructions regarding the location
@@ -105,16 +111,15 @@ void do_generic(void) {
        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);
+               wDumpContent(1);
        }
 
-       FreeStrBuf(&Buf);
 }
 
 
@@ -122,10 +127,10 @@ void do_generic(void) {
 void display_shutdown(void) {
        StrBuf *Line;
        char *when;
-       
+
        Line = NewStrBuf();
-       when=bstr("when");
-       if (strcmp(when, "now") == 0){
+       when = bstr("when");
+       if (strcmp(when, "now") == 0) {
                serv_printf("DOWN 1");
                StrBuf_ServGetln(Line);
                GetServerStatusMsg(Line, NULL, 1, 5);
@@ -141,17 +146,15 @@ void display_shutdown(void) {
        }
        else if (strcmp(when, "page") == 0) {
                char *message;
-              
+
                message = bstr("message");
-               if ((message == NULL) || (IsEmptyStr(message)))
-               {
+               if ((message == NULL) || (IsEmptyStr(message))) {
                        begin_burst();
                        output_headers(1, 0, 0, 0, 1, 0);
                        DoTemplate(HKEY("aide_display_serverrestart_page"), NULL, &NoCtx);
                        end_burst();
                }
-               else
-               {
+               else {
                        serv_printf("SEXP broadcast|%s", message);
                        StrBuf_ServGetln(Line);
                        GetServerStatusMsg(Line, NULL, 1, 0);
@@ -159,7 +162,7 @@ void display_shutdown(void) {
                        begin_burst();
                        output_headers(1, 0, 0, 0, 1, 0);
                        DoTemplate(HKEY("aide_display_serverrestart_page"), NULL, &NoCtx);
-                       end_burst();                    
+                       end_burst();
                }
        }
        else if (!strcmp(when, "idle")) {
@@ -170,16 +173,13 @@ void display_shutdown(void) {
                begin_burst();
                output_headers(1, 0, 0, 0, 1, 0);
                DoTemplate(HKEY("aide_display_menu"), NULL, &NoCtx);
-               end_burst();                    
+               end_burst();
        }
        FreeStrBuf(&Line);
 }
 
 
-void 
-InitModule_MAINMENU
-(void)
-{
+void InitModule_MAINMENU(void) {
        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);