* added gcc printf format checking to wprintf
[citadel.git] / webcit / mainmenu.c
index 4373c76a2d02fc33b4b4282bf3251b97bd703fe9..14b3cedc3fb1e7e25af947bcfd6a2c39e4dafdcb 100644 (file)
@@ -1,16 +1,11 @@
 /*
  * $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)
 {
@@ -18,18 +13,14 @@ void display_main_menu(void)
        output_headers(1, 1, 1, 0, 0, 0);
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table width=100%%>"
-               "<tr><td colspan=\"2\">\n");
+               "<table width=\"100%%\" cellspacing=\"10px\" cellpadding=\"0\">"
+               "<tr><td colspan=\"2\" class=\"advanced\">\n");
 
-       svprintf("BOXTITLE", WCS_STRING, _("Basic commands"));
+       svput("BOXTITLE", WCS_STRING, _("Basic commands"));
        do_template("beginbox");
 
-       wprintf("\n"
-               "<table border=0 cellspacing=1 cellpadding=1 width=99%%>"
-               "<tr>"
-               "<td>");        /**< start of first column */
-
-       wprintf("<ul class=\"adminitems\">");
+       /* start of first column */
+       wprintf("<ul class=\"adminitems col1\">");
 
        wprintf("<li><a href=\"knrooms\">");
        wprintf(_("List known rooms"));
@@ -59,9 +50,9 @@ void display_main_menu(void)
 
        wprintf("</ul>\n");
 
-       wprintf("</td><td>\n"); /* start of second column */
+       /* start of second column */
 
-       wprintf("<ul class=\"adminitems\">");
+       wprintf("<ul class=\"adminitems col2\">");
 
        wprintf("<li><a href=\"readnew\">");
        wprintf(_("Read new messages"));
@@ -91,9 +82,9 @@ void display_main_menu(void)
 
        wprintf("</ul>\n");
 
-       wprintf("</td><td>");   /* start of third column */
+       /* start of third column */
 
-       wprintf("<ul class=\"adminitems\">");
+       wprintf("<ul class=\"adminitems lastcol\">");
 
        wprintf("<li><a href=\"summary\">");
        wprintf(_("Summary page"));
@@ -115,25 +106,29 @@ void display_main_menu(void)
 
        wprintf("</ul>\n");
 
-       wprintf("</td></tr></table>\n");
+       wprintf("&nbsp;");
+
        do_template("endbox");
 
        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%%>");
 
        snprintf(buf, SIZ, _("Zap (forget) this room (%s)"), WC->wc_roomname);
 
-       if ((WC->axlevel >= 6) || (WC->is_room_aide)) 
+       if ( (WC->axlevel >= 6) || (WC->is_room_aide) || (WC->is_mailbox) )
                print_menu_box(_("Advanced room commands"),"adminitems", 5,
                               "display_editroom", _("Edit or delete this room"),
                               "display_private", _("Go to a 'hidden' room"),
@@ -152,25 +147,24 @@ void display_main_menu(void)
 }
 
 
-/**
- * \brief System administration menu
+/*
+ * System administration menu
  */
 void display_aide_menu(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
 
-        wprintf("<div id=\"banner\" class=\"service\">\n");
+        wprintf("<div id=\"banner\">\n");
         wprintf("<h1>");
        wprintf(_("System Administration Menu"));
         wprintf("</h1>");
-        wprintf("</div>");
+        wprintf("</div>\n");
 
-       wprintf("<div id=\"content\">");
+       wprintf("<div id=\"content\" class=\"service\">");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=99%%> "
-               "<tr valign=top><td width=50%% rowspan=2>");
-
+               "<table> "
+               "<tr valign=top><td width=50%% valign=\"top\">");
 
        print_menu_box(_("Global Configuration"), "adminitems", 4,
                       "display_siteconfig", _("Edit site-wide configuration"), 
@@ -178,18 +172,21 @@ void display_aide_menu(void)
                       "display_netconf", _("Configure replication with other Citadel servers"), 
                       "display_smtpqueue", _("View the outbound SMTP queue"));
        
-       print_menu_box(_("Shutdown Citadel"), "adminitems", 3, 
-                      "server_shutdown?when=now", _("Restart Imediate"),
-                      "server_shutdown?when=page", _("Restart after paging Users"),
-                      "server_shutdown?when=idle", _("Restart when everybody is idle."));
-
-       wprintf("</td><td width=50%%>");
+       wprintf("</td><td width=50%% valign=\"top\">");
 
        print_menu_box(_("User account management"), "adminitems", 2, 
                       "select_user_to_edit", _("Add, change, delete user accounts"),
                       "validate", _("Validate new users"));
 
-       wprintf("</td></tr><tr><td width=50%%>");
+       wprintf("</td></tr><tr><td width=50%% valign=\"top\">");
+
+
+       print_menu_box(_("Shutdown Citadel"), "adminitems", 3, 
+                      "server_shutdown?when=now", _("Restart Now"),
+                      "server_shutdown?when=page", _("Restart after paging users"),
+                      "server_shutdown?when=idle", _("Restart when all users are idle"));
+
+       wprintf("</td><td width=50%% valign=\"top\">");
 
        print_menu_box(_("Rooms and Floors"), "adminitems", 1, 
                       "display_floorconfig", _("Add, change, or delete floors"));
@@ -200,21 +197,19 @@ void display_aide_menu(void)
 
 
 
-
-
-/**
- * \brief Display the screen to enter a generic server command
+/*
+ * Display the screen to enter a generic server command
  */
 void display_generic(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<table class=\"mainmenu_banner\"><tr><td>"
-               "<span class=\"titlebar\">");
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<h1>");
        wprintf(_("Enter a server command"));
-       wprintf("</span></td></tr></table>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       wprintf("</h1>");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
                "<table class=\"mainmenu_background\"><tr><td>\n");
@@ -226,7 +221,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");
@@ -246,8 +241,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)
 {
@@ -256,7 +251,7 @@ void do_generic(void)
        char *junk;
        size_t len;
 
-       if (IsEmptyStr(bstr("sc_button"))) {
+       if (!havebstr("sc_button")) {
                display_main_menu();
                return;
        }
@@ -266,7 +261,7 @@ void do_generic(void)
        serv_printf("%s", bstr("g_cmd"));
        serv_getln(buf, sizeof buf);
 
-       svprintf("BOXTITLE", WCS_STRING, _("Server command results"));
+       svput("BOXTITLE", WCS_STRING, _("Server command results"));
        do_template("beginbox");
 
        wprintf("<table border=0><tr><td>Command:</td><td><tt>");
@@ -310,9 +305,10 @@ void do_generic(void)
 }
 
 
-/**
- * \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) {
@@ -339,4 +335,83 @@ void display_menubar(int as_single_page) {
 }
 
 
-/*@}*/
+/*
+ * Display the wait / input dialog while restarting the server.
+ */
+void display_shutdown(void)
+{
+       char buf[SIZ];
+       char *when;
+       
+       when=bstr("when");
+       if (!strcmp(when, "now")){
+               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... ")
+                               );
+               }
+               wDumpContent(0);
+               lingering_close(WC->http_sock);
+               sleeeeeeeeeep(10);
+               serv_printf("NOOP");
+               serv_printf("NOOP");
+       }
+       else if (!strcmp(when, "page")) {
+               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");
+                       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);
+
+                       
+               }
+               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... "));
+                       
+               }
+       }
+       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]);
+               }
+       }
+}