]> code.citadel.org Git - citadel.git/blobdiff - webcit/mainmenu.c
Added some glue code for attachment of an OpenID to
[citadel.git] / webcit / mainmenu.c
index 7842e50b96e39639877d0770715c593ad53ac47c..cf1ea9bf2abeef28daec83b776945690826833ca 100644 (file)
@@ -18,10 +18,10 @@ void display_main_menu(void)
        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=\"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");
 
        /**< start of first column */
@@ -118,19 +118,22 @@ void display_main_menu(void)
        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"),
@@ -253,7 +256,7 @@ void do_generic(void)
        char *junk;
        size_t len;
 
-       if (IsEmptyStr(bstr("sc_button"))) {
+       if (!havebstr("sc_button")) {
                display_main_menu();
                return;
        }
@@ -263,7 +266,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>");
@@ -356,13 +359,19 @@ void display_shutdown(void)
                else {
                        wprintf("<html>\n"
                                "<head>\n"
-                               "<meta http-equiv=\"refresh\" content=\"5; URL=knrooms\"/>\n"
+                               "<meta http-equiv=\"refresh\" content=\"15; URL=knrooms\"/>\n"
                                "</head>\n"
                                "<body bgcolor=\"#FFFFFF\">\n"
-                               "Please wait while the citadel server is restarted... "
-                               "</body>\n</html>\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;
@@ -370,30 +379,34 @@ void display_shutdown(void)
                message = bstr("message");
                if ((message == NULL) || (IsEmptyStr(message)))
                {
-                       wprintf("<html>\n"
-                               "<head>\n"
-                               "</head>\n"
-                               "<body bgcolor=\"#FFFFFF\">\n"
-                               "<form action=\"server_shutdown\">\n"
+                       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=\"message\">\n"
+                               "<input type=\"text\" name=\"message\" value=\"%s\">\n"
                                "<input type=\"submit\" value=\"go\">\n"
-                               "</form>\n"
-                               "</body>\n</html>\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=\"5; URL=server_shutdown?when=now&\"/>\n"
+                               "<meta http-equiv=\"refresh\" content=\"15; URL=knrooms\"/>\n"
                                "</head>\n"
                                "<body bgcolor=\"#FFFFFF\">\n"
-                               "Please wait while your users are being paged, the citadel server will be restarted after that... "
-                               "</body>\n</html>\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... "));
                        
                }
        }