]> code.citadel.org Git - citadel.git/blobdiff - webcit/mainmenu.c
* add transitional beginboxx template and move some places to the new syntax
[citadel.git] / webcit / mainmenu.c
index 816c5683f62d9c21e8cbb6c1282811365f0da002..aa2e07396b41128bd858cf9dc972bab5a9d413af 100644 (file)
@@ -11,7 +11,7 @@ void display_main_menu(void)
 {
        begin_burst();
        output_headers(1, 0, 0, 0, 1, 0);
-       DoTemplate(HKEY("display_main_menu"), NULL, NULL);
+       DoTemplate(HKEY("display_main_menu"), NULL, NULL, 0);
        end_burst();
 
 /*
@@ -19,7 +19,7 @@ void display_main_menu(void)
        output_headers(1, 1, 1, 0, 0, 0);
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table width=\"100%%\" cellspacing=\"10px\" cellpadding=\"0\">"
+               "<table width=\"100%%\" cellspacing=\"10\" cellpadding=\"0\">"
                "<tr><td colspan=\"2\" class=\"advanced\">\n");
 
        svput("BOXTITLE", WCS_STRING, _("Basic commands"));
@@ -161,7 +161,7 @@ void display_aide_menu(void)
 {
        begin_burst();
        output_headers(1, 0, 0, 0, 1, 0);
-       DoTemplate(HKEY("display_aide_menu"), NULL, NULL);
+       DoTemplate(HKEY("display_aide_menu"), NULL, NULL, 0);
        end_burst();
 /*
        output_headers(1, 1, 2, 0, 0, 0);
@@ -275,7 +275,7 @@ void do_generic(void)
        serv_getln(buf, sizeof buf);
 
        svput("BOXTITLE", WCS_STRING, _("Server command results"));
-       do_template("beginbox", NULL);
+       do_template("beginboxx", NULL);
 
        wprintf("<table border=0><tr><td>Command:</td><td><tt>");
        escputs(bstr("g_cmd"));
@@ -357,75 +357,60 @@ void display_shutdown(void)
        char *when;
        
        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("<html><head></head><body>Attention: %s</body></html>", &buf[4]);
-
-               }
-               else {
-                       wprintf("<html>\n"
-                               "<head>\n"
-                               "<meta http-equiv=\"refresh\" content=\"15; URL=knrooms\"/>\n"
-                               "</head>\n"
-                               "<body bgcolor=\"#FFFFFF\">\n"
-                               "<img src=\"static/throbber.gif\" /> <font color=\"#AAAAAA\">%s </font>"
-                               "</body>\n</html>\n",
-                               _("Please wait while the Citadel server is restarted... ")
-                               );
+                       
+                       safestrncpy(WC->ImportantMessage,
+                                   &buf[4],
+                                   sizeof WC->ImportantMessage);
                }
-               wDumpContent(0);
+               begin_burst();
+               output_headers(1, 0, 0, 0, 1, 0);
+               DoTemplate(HKEY("display_serverrestart"), NULL, NULL, 0);
+               end_burst();
                lingering_close(WC->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("<form action=\"server_shutdown\">\n"
-                               "<input type=\"hidden\" name=\"when\" value=\"page\">\n"
-                               "<input type=\"text\" name=\"message\" value=\"%s\">\n"
-                               "<input type=\"submit\" value=\"go\">\n"
-                               "</form>\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("display_serverrestartpage"), NULL, NULL, 0);
+                       end_burst();
                }
                else
                {
-                       // TODO: page the users... wait longer...
                        serv_printf("SEXP broadcast|%s", message);
                        serv_getln(buf, sizeof buf); // should we care?
-                       wprintf("<html>\n"
-                               "<head>\n"
-                               "<meta http-equiv=\"refresh\" content=\"15; URL=knrooms\"/>\n"
-                               "</head>\n"
-                               "<body bgcolor=\"#FFFFFF\">\n"
-                               "<img src=\"static/throbber.gif\" /> <font color=\"#AAAAAA\">%s </font>"
-                               "</body>\n</html>\n",
-                               _("Please wait while your users are being paged, the citadel server will be restarted after that... "));
-                       
+                       begin_burst();
+                       output_headers(1, 0, 0, 0, 1, 0);
+                       DoTemplate(HKEY("display_serverrestartpagedo"), NULL, NULL, 0);
+                       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("<html><head></head><body>Attention: %s</body></html>", &buf[4]);
+
+               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, NULL, 0);
+               end_burst();                    
        }
 }