/*
* $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)
{
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 */
+ /* start of first column */
wprintf("<ul class=\"adminitems col1\">");
wprintf("<li><a href=\"knrooms\">");
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"),
}
-/**
- * \brief System administration menu
+/*
+ * System administration menu
*/
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)
{
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");
wDumpContent(1);
}
-/**
- * \brief Interactive window to perform generic Citadel server commands.
+/*
+ * Interactive window to perform generic Citadel server commands.
*/
void do_generic(void)
{
char *junk;
size_t len;
- if (IsEmptyStr(bstr("sc_button"))) {
+ if (!havebstr("sc_button")) {
display_main_menu();
return;
}
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>");
}
-/**
- * \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) {
}
-/**
- * \brief Display the wait / input dialog while restarting the server.
+/*
+ * Display the wait / input dialog while restarting the server.
*/
void display_shutdown(void)
{
"<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");
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
serv_getln(buf, sizeof buf); // should we care?
wprintf("<html>\n"
"<head>\n"
- "<meta http-equiv=\"refresh\" content=\"65; 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... "));
}
}
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? */
+ 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]);
-
}
}
}
-
-
-/*@}*/