* --pedantic cleanup.
[citadel.git] / webcit / mainmenu.c
index c7966490c9a00f55c554a0a6a667f898eec92daa..60de06cb5be02e70e2fdb9eb89ddeef23220dcac 100644 (file)
@@ -1,30 +1,31 @@
 /*
  * $Id$
  */
-/**
- * \defgroup DispAdvancedMenu Displays the "advanced" (main) menu.
- * \ingroup MenuInfrastructure
- *
- */
-/*@{*/
+
 #include "webcit.h"
 
-/**
- * \brief The Main Menu
+/*
+ * The Main Menu
  */
 void display_main_menu(void)
 {
+       begin_burst();
+       output_headers(1, 0, 0, 0, 1, 0);
+       DoTemplate(HKEY("display_main_menu"), NULL, NULL, 0);
+       end_burst();
+
+/*
        char buf[SIZ];
        output_headers(1, 1, 1, 0, 0, 0);
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"advanced\">"
-               "<tr><td colspan=\"2\">\n");
+               "<table width=\"100%%\" cellspacing=\"10\" cellpadding=\"0\">"
+               "<tr><td colspan=\"2\" class=\"advanced\">\n");
 
-       svprintf("BOXTITLE", WCS_STRING, _("Basic commands"));
-       do_template("beginbox");
+       svput("BOXTITLE", WCS_STRING, _("Basic commands"));
+       do_template("beginbox", NULL);
 
-       /**< start of first column */
+       / * start of first column * /
        wprintf("<ul class=\"adminitems col1\">");
 
        wprintf("<li><a href=\"knrooms\">");
@@ -55,7 +56,7 @@ void display_main_menu(void)
 
        wprintf("</ul>\n");
 
-       /* start of second column */
+       / * start of second column * /
 
        wprintf("<ul class=\"adminitems col2\">");
 
@@ -87,7 +88,7 @@ void display_main_menu(void)
 
        wprintf("</ul>\n");
 
-       /* start of third column */
+       / * start of third column * /
 
        wprintf("<ul class=\"adminitems lastcol\">");
 
@@ -113,18 +114,21 @@ void display_main_menu(void)
 
        wprintf("&nbsp;");
 
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        wprintf("</td></tr>"
                "<tr valign=top><td width=50%%>");
 
-       print_menu_box(_("Your info"), "adminitems", 6,
+       print_menu_box(_("Your info"), "adminitems", 8,
                       "display_preferences", _("Change your preferences and settings"),
                       "display_reg", _("Update your contact information"),
                       "display_changepw", _("Change your password"),
                       "display_editbio", _("Enter your 'bio'"),
                       "display_editpic", _("Edit your online photo"), 
-                      "display_sieve", _("View/edit server-side mail filters"));
+                      "display_sieve", _("View/edit server-side mail filters"),
+                      "display_pushemail", _("Edit your push email settings"),
+                      "display_openids", _("Manage your OpenIDs")
+       );
 
        wprintf("</td><td width=50%%>");
 
@@ -146,14 +150,20 @@ void display_main_menu(void)
 
        wprintf("</td></tr></table></div>");
        wDumpContent(2);
+*/
 }
 
 
-/**
- * \brief System administration menu
+/*
+ * System administration menu
  */
 void display_aide_menu(void)
 {
+       begin_burst();
+       output_headers(1, 0, 0, 0, 1, 0);
+       DoTemplate(HKEY("display_aide_menu"), NULL, NULL, 0);
+       end_burst();
+/*
        output_headers(1, 1, 2, 0, 0, 0);
 
         wprintf("<div id=\"banner\">\n");
@@ -195,12 +205,13 @@ void display_aide_menu(void)
 
        wprintf("</td></tr></table></div>");
        wDumpContent(2);
+*/
 }
 
 
 
-/**
- * \brief Display the screen to enter a generic server command
+/*
+ * Display the screen to enter a generic server command
  */
 void display_generic(void)
 {
@@ -223,7 +234,7 @@ void display_generic(void)
        wprintf("<br />\n");
 
        wprintf("<form method=\"post\" action=\"do_generic\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
        wprintf(_("Enter command:"));
        wprintf("<br /><input type=\"text\" name=\"g_cmd\" size=80 maxlength=\"250\"><br />\n");
@@ -243,8 +254,8 @@ void display_generic(void)
        wDumpContent(1);
 }
 
-/**
- * \brief Interactive window to perform generic Citadel server commands.
+/*
+ * Interactive window to perform generic Citadel server commands.
  */
 void do_generic(void)
 {
@@ -253,7 +264,7 @@ void do_generic(void)
        char *junk;
        size_t len;
 
-       if (IsEmptyStr(bstr("sc_button"))) {
+       if (!havebstr("sc_button")) {
                display_main_menu();
                return;
        }
@@ -263,8 +274,8 @@ void do_generic(void)
        serv_printf("%s", bstr("g_cmd"));
        serv_getln(buf, sizeof buf);
 
-       svprintf("BOXTITLE", WCS_STRING, _("Server command results"));
-       do_template("beginbox");
+       svput("BOXTITLE", WCS_STRING, _("Server command results"));
+       do_template("beginboxx", NULL);
 
        wprintf("<table border=0><tr><td>Command:</td><td><tt>");
        escputs(bstr("g_cmd"));
@@ -302,14 +313,15 @@ void do_generic(void)
        wprintf("<hr />");
        wprintf("<a href=\"display_generic\">Enter another command</a><br />\n");
        wprintf("<a href=\"display_advanced\">Return to menu</a>\n");
-       do_template("endbox");
+       do_template("endbox", NULL);
        wDumpContent(1);
 }
 
 
-/**
- * \brief Display the menubar.  
- * \param as_single_page Set to display HTML headers and footers -- otherwise it's assumed
+/*
+ * 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) {
@@ -323,10 +335,10 @@ void display_menubar(int as_single_page) {
                        "body   { text-decoration: none; }\n"
                        "</style>\n"
                        "</head>\n");
-               do_template("background");
+               do_template("background", NULL);
        }
 
-       do_template("menubar");
+       do_template("menubar", NULL);
 
        if (as_single_page) {
                wDumpContent(2);
@@ -336,8 +348,8 @@ void display_menubar(int as_single_page) {
 }
 
 
-/**
- * \brief Display the wait / input dialog while restarting the server.
+/*
+ * Display the wait / input dialog while restarting the server.
  */
 void display_shutdown(void)
 {
@@ -345,78 +357,73 @@ 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);
-                       svprintf("BOXTITLE", WCS_STRING, _("Message to your Users:"));
-                       do_template("beginbox");
-                       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");
-                       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... "));
-                       
+                       serv_getln(buf, sizeof buf); /* TODO: should we care? */
+                       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)
                { /* upsie. maybe the server is not running as daemon? */
-                       wprintf("<html><head></head><body>Attention: %s</body></html>", &buf[4]);
-
+                       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();                    
        }
 }
 
+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);
+}