X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmainmenu.c;h=98e58f59c05d08d7270492e5598de824e1304187;hb=6ec73d6906542ea2f8cca2e62f7625ee2e17ae03;hp=c7966490c9a00f55c554a0a6a667f898eec92daa;hpb=3051e63651cd7cc4249641f3c91a54a107fefe47;p=citadel.git

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index c7966490c..98e58f59c 100644
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -1,206 +1,36 @@
 /*
  * $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)
 {
-	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");
-
-	svprintf("BOXTITLE", WCS_STRING, _("Basic commands"));
-	do_template("beginbox");
-
-	/**< start of first column */
-	wprintf("<ul class=\"adminitems col1\">");
-
-	wprintf("<li><a href=\"knrooms\">");
-	wprintf(_("List known rooms"));
-	wprintf("</a><span>");
-	wprintf(_("Where can I go from here?"));
-	wprintf("</span></li>\n");
-
-	wprintf("<li><a href=\"gotonext\">");
-	wprintf(_("Goto next room"));
-	wprintf("</a><span>");
-	wprintf(_("...with <em>unread</em> messages"));
-	wprintf("</span></li>\n");
-
-	wprintf("<li><a href=\"skip\">");
-	wprintf(_("Skip to next room"));
-	wprintf("</a><span>");
-	wprintf(_("(come back here later)"));
-	wprintf("</span></li>\n");
-
-	if ((!IsEmptyStr(WC->ugname)) && (strcasecmp(WC->ugname, WC->wc_roomname))) {
-		wprintf("<li><a href=\"ungoto\">");
-		wprintf(_("Ungoto"));
-		wprintf("</a><span>");
-		wprintf(_("(oops! Back to %s)"), WC->ugname);
-		wprintf("</span></li>\n");
-	}
-
-	wprintf("</ul>\n");
-
-	/* start of second column */
-
-	wprintf("<ul class=\"adminitems col2\">");
-
-	wprintf("<li><a href=\"readnew\">");
-	wprintf(_("Read new messages"));
-	wprintf("</a><span>");
-	wprintf(_("...in this room"));
-	wprintf("</span></li>\n");
-
-	wprintf("<li><a href=\"readfwd\">");
-	wprintf(_("Read all messages"));
-	wprintf("</a><span>");
-	wprintf(_("...old <EM>and</EM> new"));
-	wprintf("</span></li>\n");
-
-	wprintf("<li><a href=\"display_enter\">");
-	wprintf(_("Enter a message"));
-	wprintf("</a><span>");
-	wprintf(_("(post in this room)"));
-	wprintf("</span></li>\n");
-
-	if (WC->room_flags & QR_VISDIR) {
-		wprintf("<li><a href=\"display_room_directory\">");
-		wprintf(_("File library"));
-		wprintf("</a><span>");
-		wprintf(_("(List files available for download)"));
-		wprintf("</span></li>\n");
-	}
-
-	wprintf("</ul>\n");
-
-	/* start of third column */
-
-	wprintf("<ul class=\"adminitems lastcol\">");
-
-	wprintf("<li><a href=\"summary\">");
-	wprintf(_("Summary page"));
-	wprintf("</a><span>");
-	wprintf(_("Summary of my account"));
-	wprintf("</span></li>\n");
-
-	wprintf("<li><a href=\"userlist\">\n");
-	wprintf(_("User list"));
-	wprintf("</a><span>");
-	wprintf(_("(all registered users)"));
-	wprintf("</span></li>\n");
-
-	wprintf("<li><a href=\"termquit\" TARGET=\"_top\">");
-	wprintf(_("Log off"));
-	wprintf("</a><span>");
-	wprintf(_("Bye!"));
-	wprintf("</span></li>\n");
-
-	wprintf("</ul>\n");
-
-	wprintf("&nbsp;");
-
-	do_template("endbox");
-
-	wprintf("</td></tr>"
-		"<tr valign=top><td width=50%%>");
-
-	print_menu_box(_("Your info"), "adminitems", 6,
-		       "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"));
-
-	wprintf("</td><td width=50%%>");
-
-	snprintf(buf, SIZ, _("Zap (forget) this room (%s)"), WC->wc_roomname);
-
-	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"),
-			       "display_entroom", _("Create a new room"),
-			       "display_zap",buf,
-			       "zapped_list",_("List all forgotten rooms"));
-	else
-		print_menu_box(_("Advanced room commands"),"adminitems", 4,
-			       "display_private", _("Go to a 'hidden' room"),
-			       "display_entroom", _("Create a new room"),
-			       "display_zap",buf,
-			       "zapped_list",_("List all forgotten rooms"));
-
-	wprintf("</td></tr></table></div>");
-	wDumpContent(2);
+	begin_burst();
+	output_headers(1, 0, 0, 0, 1, 0);
+	DoTemplate(HKEY("display_main_menu"), NULL, &NoCtx);
+	end_burst();
 }
 
 
-/**
- * \brief System administration menu
+/*
+ * System administration menu
  */
 void display_aide_menu(void)
 {
-	output_headers(1, 1, 2, 0, 0, 0);
-
-        wprintf("<div id=\"banner\">\n");
-        wprintf("<h1>");
-	wprintf(_("System Administration Menu"));
-        wprintf("</h1>");
-        wprintf("</div>\n");
-
-	wprintf("<div id=\"content\" class=\"service\">");
-
-	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table> "
-		"<tr valign=top><td width=50%% valign=\"top\">");
-
-	print_menu_box(_("Global Configuration"), "adminitems", 4,
-		       "display_siteconfig", _("Edit site-wide configuration"), 
-		       "display_inetconf",_("Domain names and Internet mail configuration"),
-		       "display_netconf", _("Configure replication with other Citadel servers"), 
-		       "display_smtpqueue", _("View the outbound SMTP queue"));
-	
-	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%% 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"));
-
-	wprintf("</td></tr></table></div>");
-	wDumpContent(2);
+	begin_burst();
+	output_headers(1, 0, 0, 0, 1, 0);
+	DoTemplate(HKEY("display_aide_menu"), NULL, &NoCtx);
+	end_burst();
 }
 
 
 
-/**
- * \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 +53,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");
@@ -232,7 +62,7 @@ void display_generic(void)
 	wprintf("<br /><textarea name=\"g_input\" rows=10 cols=80 width=80></textarea><br />\n");
 
 	wprintf("<font size=-2>");
-	wprintf(_("Detected host header is %s://%s"), (is_https ? "https" : "http"), WC->http_host);
+	wprintf(_("Detected host header is %s://%s"), (is_https ? "https" : "http"), ChrPtr(WC->Hdr->HR.http_host));
 	wprintf("</font>\n");
 	wprintf("<input type=\"submit\" name=\"sc_button\" value=\"%s\">", _("Send command"));
 	wprintf("&nbsp;");
@@ -243,73 +73,85 @@ 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)
 {
-	char buf[SIZ];
-	char gcontent[SIZ];
+
+	wcsession *WCC = WC;
+	int Done = 0;
+	StrBuf *Buf;
 	char *junk;
 	size_t len;
 
-	if (IsEmptyStr(bstr("sc_button"))) {
+	if (!havebstr("sc_button")) {
 		display_main_menu();
 		return;
 	}
 
 	output_headers(1, 1, 0, 0, 0, 0);
-
-	serv_printf("%s", bstr("g_cmd"));
-	serv_getln(buf, sizeof buf);
-
-	svprintf("BOXTITLE", WCS_STRING, _("Server command results"));
-	do_template("beginbox");
+	Buf = NewStrBuf();
+	serv_puts(bstr("g_cmd"));
+	StrBuf_ServGetln(Buf);
+	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"));
+	StrEscAppend(WCC->WBuf, sbstr("g_cmd"), NULL, 0, 0);
 	wprintf("</tt></td></tr><tr><td>Result:</td><td><tt>");
-	escputs(buf);
+	StrEscAppend(WCC->WBuf, Buf, NULL, 0, 0);
+	StrBufAppendBufPlain(WCC->WBuf, HKEY("<br>\n"), 0);
 	wprintf("</tt></td></tr></table><br />\n");
-
-	if (buf[0] == '8') {
-		serv_printf("\n\n000");
-	}
-	if ((buf[0] == '1') || (buf[0] == '8')) {
-		while (serv_getln(gcontent, sizeof gcontent), strcmp(gcontent, "000")) {
-			escputs(gcontent);
-			wprintf("<br />\n");
+	
+	switch (GetServerStatus(Buf, NULL)) {
+	case 8:
+		serv_puts("\n\n000");
+		if ( (StrLength(Buf)==3) && 
+		     !strcmp(ChrPtr(Buf), "000")) {
+			StrBufAppendBufPlain(WCC->WBuf, HKEY("\000"), 0);
+			break;
 		}
-		wprintf("000");
-	}
-	if (buf[0] == '4') {
+	case 1:
+		while (!Done) {
+			StrBuf_ServGetln(Buf);
+			if ( (StrLength(Buf)==3) && 
+			     !strcmp(ChrPtr(Buf), "000")) {
+				Done = 1;
+			}
+			StrEscAppend(WCC->WBuf, Buf, NULL, 0, 0);
+			StrBufAppendBufPlain(WCC->WBuf, HKEY("<br>\n"), 0);
+		}
+		break;
+	case 4:
 		text_to_server(bstr("g_input"));
 		serv_puts("000");
-	}
-	if (buf[0] == '6') {
-		len = atol(&buf[4]);
-		junk = malloc(len);
-		serv_read(junk, len);
-		free(junk);
-	}
-	if (buf[0] == '7') {
-		len = atol(&buf[4]);
+		break;
+	case 6:
+		len = atol(&ChrPtr(Buf)[4]);
+		StrBuf_ServGetBLOBBuffered(Buf, len);
+		break;
+	case 7:
+		len = atol(&ChrPtr(Buf)[4]);
 		junk = malloc(len);
 		memset(junk, 0, len);
 		serv_write(junk, len);
 		free(junk);
 	}
+	
 	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);
+	FreeStrBuf(&Buf);
 	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 +165,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 +178,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 +187,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);
-		lingering_close(WC->http_sock);
+		begin_burst();
+		output_headers(1, 0, 0, 0, 1, 0);
+		DoTemplate(HKEY("display_serverrestart"), NULL, &NoCtx);
+		end_burst();
+		lingering_close(WC->Hdr->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, &NoCtx);
+			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, &NoCtx);
+			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, &NoCtx);
+		end_burst();			
 	}
 }
 
+void _display_menubar(void) { display_menubar(0); }
 
-/*@}*/
+void 
+InitModule_MAINMENU
+(void)
+{
+	WebcitAddUrlHandler(HKEY("display_aide_menu"), "", 0, display_aide_menu, 0);
+	WebcitAddUrlHandler(HKEY("server_shutdown"), "", 0, display_shutdown, 0);
+	WebcitAddUrlHandler(HKEY("display_main_menu"), "", 0, display_main_menu, 0);
+	WebcitAddUrlHandler(HKEY("display_generic"), "", 0, display_generic, 0);
+	WebcitAddUrlHandler(HKEY("do_generic"), "", 0, do_generic, 0);
+	WebcitAddUrlHandler(HKEY("display_menubar"), "", 0, _display_menubar, 0);
+}