* add new 'Context' Parameter to the template call

[citadel.git] / webcit / mainmenu.c

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index 8673df5d8c76ba78e4aee7d87f884cbe139e387e..040294d62d9da0e939e52b9a9917856770cc7e84 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -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)
 {
@@ -21,10 +16,10 @@ void display_main_menu(void)
                "<table width=\"100%%\" cellspacing=\"10px\" 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\">");
@@ -113,19 +108,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", 7,
+       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_pushemail", _("Edit your push email settings"));
+                      "display_pushemail", _("Edit your push email settings"),
+                      "display_openids", _("Manage your OpenIDs")
+       );
 
        wprintf("</td><td width=50%%>");
 
@@ -150,8 +147,8 @@ void display_main_menu(void)
 }
 
 
-/**
- * \brief System administration menu
+/*
+ * System administration menu
  */
 void display_aide_menu(void)
 {
@@ -200,8 +197,8 @@ 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)
 {
@@ -224,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");
@@ -244,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)
 {
@@ -254,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;
        }
@@ -264,8 +261,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("beginbox", NULL);
 
        wprintf("<table border=0><tr><td>Command:</td><td><tt>");
        escputs(bstr("g_cmd"));
@@ -303,14 +300,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) {
@@ -324,10 +322,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);
@@ -337,8 +335,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)
 {
@@ -378,8 +376,8 @@ void display_shutdown(void)
                if ((message == NULL) || (IsEmptyStr(message)))
                {
                        output_headers(1, 1, 1, 0, 0, 0);
-                       svprintf("BOXTITLE", WCS_STRING, _("Message to your Users:"));
-                       do_template("beginbox");
+                       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"
@@ -387,7 +385,7 @@ void display_shutdown(void)
                                "</form>\n",
                                _("The citadel server has to be restarted. It 'll be back in a minute.")
                                );
-                       do_template("endbox");
+                       do_template("endbox", NULL);
                        wDumpContent(1);
 
                        
@@ -411,13 +409,23 @@ void display_shutdown(void)
        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]);
-
                }
        }
 }
 
+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);
+}