X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsiteconfig.c;h=b3344e82083cacb14dd756e96144bd0000033a45;hb=a4b8457e8dab93c02bbed06dbcb12d2378cad34c;hp=1b866524e1472885ee780a4d1a6df2adb2436a4f;hpb=3abfd5bfcc3dd94bf554917f20144ca36dfc4218;p=citadel.git

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 1b866524e..b3344e820 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -1,57 +1,59 @@
 /*
  * $Id$
- *
- * Administrative screen for site-wide configuration
- *
  */
-
+/**
+ * \defgroup AdminConfig Administrative screen for site-wide configuration
+ * \ingroup CitadelConfig
+ */
+/*@{*/
 
 #include "webcit.h"
+#include "webserver.h"
 
-
+/**
+ * \brief display all configuration items
+ */
 void display_siteconfig(void)
 {
 	char buf[SIZ];
 	int i, j;
 
-	char general[SIZ];
+	char general[65536];
 	char access[SIZ];
 	char network[SIZ];
 	char tuning[SIZ];
 	char directory[SIZ];
 	char purger[SIZ];
-
-	/* expire policy settings */
+	char idxjnl[SIZ];
+	char funambol[SIZ];
+	/** expire policy settings */
 	int sitepolicy = 0;
 	int sitevalue = 0;
 	int mboxpolicy = 0;
 	int mboxvalue = 0;
 
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n"
-		"<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-		"<SPAN CLASS=\"titlebar\">");
+	wprintf("<div id=\"banner\">\n");
+	wprintf("<h1>");
 	wprintf(_("Site configuration"));
-	wprintf("</SPAN>"
-		"</TD></TR></TABLE>\n"
-		"</div>\n<div id=\"content\">\n"
-	);
+	wprintf("</h1>");
+	wprintf("</div>\n");
+
+	wprintf("<div id=\"content\" class=\"service fix_scrollbar_bug\">\n");
 
 	serv_printf("CONF get");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '1') {
-        	wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>");
-        	wprintf("<SPAN CLASS=\"titlebar\">");
+        	wprintf("<div class=\"errormsg\">");
 		wprintf(_("Error"));
-		wprintf("</SPAN>\n");
-        	wprintf("</TD></TR></TABLE><br />\n");
+        	wprintf("<br />\n");
         	wprintf("%s<br />\n", &buf[4]);
 		wDumpContent(1);
+		wprintf("</div>\n");
 		return;
 	}
 
-	wprintf("<div id=\"fix_scrollbar_bug\">"
-		"<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>");
+	wprintf("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" ><tr><td>");
 
 	char *tabnames[] = {
 		_("General"),
@@ -59,7 +61,9 @@ void display_siteconfig(void)
 		_("Network"),
 		_("Tuning"),
 		_("Directory"),
-		_("Auto-purger")
+		_("Auto-purger"),
+		_("Indexing/Journaling"),
+		_("Push Email")
 	};
 
 	sprintf(general, "<center><h1>%s</h1><table border=\"0\">",
@@ -82,8 +86,12 @@ void display_siteconfig(void)
 
 	sprintf(directory, "<center><h1>%s</h1><h2>%s</h2><table border=\"0\">",
 			_("Configure the LDAP connector for Citadel"),
-			_("Changes made on this screen will not take effect "
-			"until you restart the Citadel server.")
+			(serv_info.serv_supports_ldap
+			?	_("Changes made on this screen will not take effect "
+				"until you restart the Citadel server.")
+			:	_("NOTE: This Citadel server has been built without "
+				"LDAP support.  These options will have no effect.")
+			)
 	);
 
 	sprintf(purger, "<center><h1>%s</h1><h2>%s</h2><table border=\"0\">",
@@ -91,199 +99,215 @@ void display_siteconfig(void)
 			_("These settings may be overridden on a per-floor or per-room basis.")
 	);
 
+	sprintf(idxjnl, "<center><h1>%s</h1><h2>%s</h2><table border=\"0\">",
+			_("Indexing and Journaling"),
+			_("Warning: these facilities are resource intensive.")
+	);
+	sprintf(funambol, "<center><h1>%s</h1><table border=\"0\">",
+		_("Push Email")
+		);
 
 	wprintf("<form method=\"post\" action=\"siteconfig\">\n");
+	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
 
 	i = 0;
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-		switch (++i) {
-		case 1:
-			sprintf(&general[strlen(general)], "<TR><TD>");
+		switch (i++) {
+		case 0:
+			sprintf(&general[strlen(general)], "<tr><td>");
 			sprintf(&general[strlen(general)], _("Node name"));
-			sprintf(&general[strlen(general)], "</TD><TD>");
-			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_nodename\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
-			sprintf(&general[strlen(general)], "</TD></TR>\n");
+			sprintf(&general[strlen(general)], "</td><td>");
+			sprintf(&general[strlen(general)], "<input type=\"text\" name=\"c_nodename\" maxlength=\"15\" value=\"%s\">", buf);
+			sprintf(&general[strlen(general)], "</td></tr>\n");
 			break;
-		case 2:
-			sprintf(&general[strlen(general)], "<TR><TD>");
+		case 1:
+			sprintf(&general[strlen(general)], "<tr><td>");
 			sprintf(&general[strlen(general)], _("Fully qualified domain name"));
-			sprintf(&general[strlen(general)], "</TD><TD>");
-			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_fqdn\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
-			sprintf(&general[strlen(general)], "</TD></TR>\n");
+			sprintf(&general[strlen(general)], "</td><td>");
+			sprintf(&general[strlen(general)], "<input type=\"text\" name=\"c_fqdn\" maxlength=\"63\" value=\"%s\">", buf);
+			sprintf(&general[strlen(general)], "</td></tr>\n");
 			break;
-		case 3:
-			sprintf(&general[strlen(general)], "<TR><TD>");
+		case 2:
+			sprintf(&general[strlen(general)], "<tr><td>");
 			sprintf(&general[strlen(general)], _("Human-readable node name"));
-			sprintf(&general[strlen(general)], "</TD><TD>");
-			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_humannode\" MAXLENGTH=\"20\" VALUE=\"%s\">", buf);
-			sprintf(&general[strlen(general)], "</TD></TR>\n");
+			sprintf(&general[strlen(general)], "</td><td>");
+			sprintf(&general[strlen(general)], "<input type=\"text\" name=\"c_humannode\" maxlength=\"20\" value=\"%s\">", buf);
+			sprintf(&general[strlen(general)], "</td></tr>\n");
 			break;
-		case 4:
-			sprintf(&general[strlen(general)], "<TR><TD>");
+		case 3:
+			sprintf(&general[strlen(general)], "<tr><td>");
 			sprintf(&general[strlen(general)], _("Telephone number"));
-			sprintf(&general[strlen(general)], "</TD><TD>");
-			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_phonenum\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
-			sprintf(&general[strlen(general)], "</TD></TR>\n");
+			sprintf(&general[strlen(general)], "</td><td>");
+			sprintf(&general[strlen(general)], "<input type=\"text\" name=\"c_phonenum\" maxlength=\"15\" value=\"%s\">", buf);
+			sprintf(&general[strlen(general)], "</td></tr>\n");
 			break;
-		case 5:
-			sprintf(&access[strlen(access)], "<TR><TD>");
+		case 4:
+			sprintf(&access[strlen(access)], "<tr><td>");
 			sprintf(&access[strlen(access)], _("Automatically grant room-aide status to users who create private rooms"));
-			sprintf(&access[strlen(access)], "</TD><TD>");
-			sprintf(&access[strlen(access)], "<input type=\"checkbox\" NAME=\"c_creataide\" VALUE=\"yes\" %s>",
-				((atoi(buf) != 0) ? "CHECKED" : ""));
-			sprintf(&access[strlen(access)], "</TD></TR>\n");
+			sprintf(&access[strlen(access)], "</td><td>");
+			sprintf(&access[strlen(access)], "<input type=\"checkbox\" name=\"c_creataide\" value=\"yes\" %s>",
+				((atoi(buf) != 0) ? "checked" : ""));
+			sprintf(&access[strlen(access)], "</td></tr>\n");
 			break;
-		case 6:
-			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
+		case 5:
+			sprintf(&tuning[strlen(tuning)], "<tr><td>");
 			sprintf(&tuning[strlen(tuning)], _("Server connection idle timeout (in seconds)"));
-			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
-			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_sleeping\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
-			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
+			sprintf(&tuning[strlen(tuning)], "</td><td>");
+			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" name=\"c_sleeping\" maxlength=\"15\" value=\"%s\">", buf);
+			sprintf(&tuning[strlen(tuning)], "</td></tr>\n");
 			break;
-		case 7:
-			sprintf(&access[strlen(access)], "<TR><TD>");
+		case 6:
+			sprintf(&access[strlen(access)], "<tr><td>");
 			sprintf(&access[strlen(access)], _("Initial access level for new users"));
-			sprintf(&access[strlen(access)], "</TD><TD>");
-			sprintf(&access[strlen(access)], "<SELECT NAME=\"c_initax\" SIZE=\"1\">\n");
+			sprintf(&access[strlen(access)], "</td><td>");
+			sprintf(&access[strlen(access)], "<select name=\"c_initax\" size=\"1\">\n");
 			for (j=0; j<=6; ++j) {
-				sprintf(&access[strlen(access)], "<OPTION %s VALUE=\"%d\">%d - %s</OPTION>\n",
-					((atoi(buf) == j) ? "SELECTED" : ""),
+				sprintf(&access[strlen(access)], "<option %s value=\"%d\">%d - %s</option>\n",
+					((atoi(buf) == j) ? "selected" : ""),
 					j, j, axdefs[j]
 				);
 			}
-			sprintf(&access[strlen(access)], "</SELECT>");
-			sprintf(&access[strlen(access)], "</TD></TR>\n");
+			sprintf(&access[strlen(access)], "</select>");
+			sprintf(&access[strlen(access)], "</td></tr>\n");
 			break;
-		case 8:
-			sprintf(&access[strlen(access)], "<TR><TD>");
+		case 7:
+			sprintf(&access[strlen(access)], "<tr><td>");
 			sprintf(&access[strlen(access)], _("Require registration for new users"));
-			sprintf(&access[strlen(access)], "</TD><TD>");
-			sprintf(&access[strlen(access)], "<input type=\"checkbox\" NAME=\"c_regiscall\" VALUE=\"yes\" %s>",
-				((atoi(buf) != 0) ? "CHECKED" : ""));
-			sprintf(&access[strlen(access)], "</TD></TR>\n");
+			sprintf(&access[strlen(access)], "</td><td>");
+			sprintf(&access[strlen(access)], "<input type=\"checkbox\" name=\"c_regiscall\" value=\"yes\" %s>",
+				((atoi(buf) != 0) ? "checked" : ""));
+			sprintf(&access[strlen(access)], "</td></tr>\n");
 			break;
-		case 9:
-			sprintf(&access[strlen(access)], "<TR><TD>");
+		case 8:
+			sprintf(&access[strlen(access)], "<tr><td>");
 			sprintf(&access[strlen(access)], _("Quarantine messages from problem users"));
-			sprintf(&access[strlen(access)], "</TD><TD>");
-			sprintf(&access[strlen(access)], "<input type=\"checkbox\" NAME=\"c_twitdetect\" VALUE=\"yes\" %s>",
-				((atoi(buf) != 0) ? "CHECKED" : ""));
-			sprintf(&access[strlen(access)], "</TD></TR>\n");
+			sprintf(&access[strlen(access)], "</td><td>");
+			sprintf(&access[strlen(access)], "<input type=\"checkbox\" name=\"c_twitdetect\" value=\"yes\" %s>",
+				((atoi(buf) != 0) ? "checked" : ""));
+			sprintf(&access[strlen(access)], "</td></tr>\n");
 			break;
-		case 10:
-			sprintf(&access[strlen(access)], "<TR><TD>");
+		case 9:
+			sprintf(&access[strlen(access)], "<tr><td>");
 			sprintf(&access[strlen(access)], _("Name of quarantine room"));
-			sprintf(&access[strlen(access)], "</TD><TD>");
-			sprintf(&access[strlen(access)], "<input type=\"text\" NAME=\"c_twitroom\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
-			sprintf(&access[strlen(access)], "</TD></TR>\n");
+			sprintf(&access[strlen(access)], "</td><td>");
+			sprintf(&access[strlen(access)], "<input type=\"text\" name=\"c_twitroom\" maxlength=\"63\" value=\"%s\">", buf);
+			sprintf(&access[strlen(access)], "</td></tr>\n");
 			break;
-		case 11:
-			sprintf(&general[strlen(general)], "<TR><TD>");
+		case 10:
+			sprintf(&general[strlen(general)], "<tr><td>");
 			sprintf(&general[strlen(general)], _("Paginator prompt (for text mode clients)"));
-			sprintf(&general[strlen(general)], "</TD><TD>");
-			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_moreprompt\" MAXLENGTH=\"79\" VALUE=\"%s\">", buf);
-			sprintf(&general[strlen(general)], "</TD></TR>\n");
+			sprintf(&general[strlen(general)], "</td><td>");
+			sprintf(&general[strlen(general)], "<input type=\"text\" name=\"c_moreprompt\" maxlength=\"79\" value=\"%s\">", buf);
+			sprintf(&general[strlen(general)], "</td></tr>\n");
 			break;
-		case 12:
-			sprintf(&access[strlen(access)], "<TR><TD>");
+		case 11:
+			sprintf(&access[strlen(access)], "<tr><td>");
 			sprintf(&access[strlen(access)], _("Restrict access to Internet mail"));
-			sprintf(&access[strlen(access)], "</TD><TD>");
-			sprintf(&access[strlen(access)], "<input type=\"checkbox\" NAME=\"c_restrict\" VALUE=\"yes\" %s>",
-				((atoi(buf) != 0) ? "CHECKED" : ""));
-			sprintf(&access[strlen(access)], "</TD></TR>\n");
+			sprintf(&access[strlen(access)], "</td><td>");
+			sprintf(&access[strlen(access)], "<input type=\"checkbox\" name=\"c_restrict\" value=\"yes\" %s>",
+				((atoi(buf) != 0) ? "checked" : ""));
+			sprintf(&access[strlen(access)], "</td></tr>\n");
 			break;
-		case 13:
-			sprintf(&general[strlen(general)], "<TR><TD>");
+		case 12:
+			sprintf(&general[strlen(general)], "<tr><td>");
 			sprintf(&general[strlen(general)], _("Geographic location of this system"));
-			sprintf(&general[strlen(general)], "</TD><TD>");
-			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_bbs_city\" MAXLENGTH=\"31\" VALUE=\"%s\">", buf);
-			sprintf(&general[strlen(general)], "</TD></TR>\n");
+			sprintf(&general[strlen(general)], "</td><td>");
+			sprintf(&general[strlen(general)], "<input type=\"text\" name=\"c_bbs_city\" maxlength=\"31\" value=\"%s\">", buf);
+			sprintf(&general[strlen(general)], "</td></tr>\n");
 			break;
-		case 14:
-			sprintf(&general[strlen(general)], "<TR><TD>");
+		case 13:
+			sprintf(&general[strlen(general)], "<tr><td>");
 			sprintf(&general[strlen(general)], _("Name of system administrator"));
-			sprintf(&general[strlen(general)], "</TD><TD>");
-			sprintf(&general[strlen(general)], "<input type=\"text\" NAME=\"c_sysadm\" MAXLENGTH=\"25\" VALUE=\"%s\">", buf);
-			sprintf(&general[strlen(general)], "</TD></TR>\n");
+			sprintf(&general[strlen(general)], "</td><td>");
+			sprintf(&general[strlen(general)], "<input type=\"text\" name=\"c_sysadm\" MAXLENGTH=\"25\" VALUE=\"%s\">", buf);
+			sprintf(&general[strlen(general)], "</td></tr>\n");
 			break;
-		case 15:
-			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
+		case 14:
+			sprintf(&tuning[strlen(tuning)], "<tr><td>");
 			sprintf(&tuning[strlen(tuning)], _("Maximum concurrent sessions (0 = no limit)"));
-			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
-			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_maxsessions\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
+			sprintf(&tuning[strlen(tuning)], "</td><td>");
+			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" name=\"c_maxsessions\" maxlength=\"5\" value=\"%s\">", buf);
+			sprintf(&tuning[strlen(tuning)], "</td></tr>\n");
 			break;
-		case 17:
-			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
+		case 16:
+			sprintf(&tuning[strlen(tuning)], "<tr><td>");
 			sprintf(&tuning[strlen(tuning)], _("Default user purge time (days)"));
-			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
-			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_userpurge\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
+			sprintf(&tuning[strlen(tuning)], "</td><td>");
+			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" name=\"c_userpurge\" maxlength=\"5\" value=\"%s\">", buf);
+			sprintf(&tuning[strlen(tuning)], "</td></tr>\n");
 			break;
-		case 18:
-			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
+		case 17:
+			sprintf(&tuning[strlen(tuning)], "<tr><td>");
 			sprintf(&tuning[strlen(tuning)], _("Default room purge time (days)"));
-			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
-			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_roompurge\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
+			sprintf(&tuning[strlen(tuning)], "</td><td>");
+			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" name=\"c_roompurge\" maxlength=\"5\" value=\"%s\">", buf);
+			sprintf(&tuning[strlen(tuning)], "</td></tr>\n");
 			break;
-		case 19:
-			sprintf(&access[strlen(access)], "<TR><TD>");
+		case 18:
+			sprintf(&access[strlen(access)], "<tr><td>");
 			sprintf(&access[strlen(access)], _("Name of room to log pages"));
-			sprintf(&access[strlen(access)], "</TD><TD>");
-			sprintf(&access[strlen(access)], "<input type=\"text\" NAME=\"c_logpages\" MAXLENGTH=\"63\" VALUE=\"%s\">", buf);
-			sprintf(&access[strlen(access)], "</TD></TR>\n");
+			sprintf(&access[strlen(access)], "</td><td>");
+			sprintf(&access[strlen(access)], "<input type=\"text\" name=\"c_logpages\" maxlength=\"63\" value=\"%s\">", buf);
+			sprintf(&access[strlen(access)], "</td></tr>\n");
 			break;
-		case 20:
-			sprintf(&access[strlen(access)], "<TR><TD>");
+		case 19:
+			sprintf(&access[strlen(access)], "<tr><td>");
 			sprintf(&access[strlen(access)], _("Access level required to create rooms"));
-			sprintf(&access[strlen(access)], "</TD><TD>");
-			sprintf(&access[strlen(access)], "<SELECT NAME=\"c_createax\" SIZE=\"1\">\n");
+			sprintf(&access[strlen(access)], "</td><td>");
+			sprintf(&access[strlen(access)], "<select name=\"c_createax\" size=\"1\">\n");
 			for (j=0; j<=6; ++j) {
-				sprintf(&access[strlen(access)], "<OPTION %s VALUE=\"%d\">%d - %s</OPTION>\n",
-					((atoi(buf) == j) ? "SELECTED" : ""),
+				sprintf(&access[strlen(access)], "<option %s value=\"%d\">%d - %s</option>\n",
+					((atoi(buf) == j) ? "selected" : ""),
 					j, j, axdefs[j]
 				);
 			}
-			sprintf(&access[strlen(access)], "</SELECT>");
-			sprintf(&access[strlen(access)], "</TD></TR>\n");
+			sprintf(&access[strlen(access)], "</select>");
+			sprintf(&access[strlen(access)], "</td></tr>\n");
 			break;
-		case 21:
-			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
+		case 20:
+			sprintf(&tuning[strlen(tuning)], "<tr><td>");
 			sprintf(&tuning[strlen(tuning)], _("Maximum message length"));
-			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
-			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_maxmsglen\" MAXLENGTH=\"20\" VALUE=\"%s\">", buf);
-			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
+			sprintf(&tuning[strlen(tuning)], "</td><td>");
+			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" name=\"c_maxmsglen\" maxlength=\"20\" value=\"%s\">", buf);
+			sprintf(&tuning[strlen(tuning)], "</td></tr>\n");
 			break;
-		case 22:
-			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
+		case 21:
+			sprintf(&tuning[strlen(tuning)], "<tr><td>");
 			sprintf(&tuning[strlen(tuning)], _("Minimum number of worker threads"));
-			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
-			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_min_workers\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
+			sprintf(&tuning[strlen(tuning)], "</td><td>");
+			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" name=\"c_min_workers\" maxlength=\"5\" value=\"%s\">", buf);
+			sprintf(&tuning[strlen(tuning)], "</td></tr>\n");
 			break;
-		case 23:
-			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
+		case 22:
+			sprintf(&tuning[strlen(tuning)], "<tr><td>");
 			sprintf(&tuning[strlen(tuning)], _("Maximum number of worker threads"));
-			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
-			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" NAME=\"c_max_workers\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
-			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
+			sprintf(&tuning[strlen(tuning)], "</td><td>");
+			sprintf(&tuning[strlen(tuning)], "<input type=\"text\" name=\"c_max_workers\" maxlength=\"5\" value=\"%s\">", buf);
+			sprintf(&tuning[strlen(tuning)], "</td></tr>\n");
 			break;
-		case 24:
-			sprintf(&network[strlen(network)], "<TR><TD>");
+		case 23:
+			sprintf(&network[strlen(network)], "<tr><td>");
 			sprintf(&network[strlen(network)], _("POP3 listener port (-1 to disable)"));
-			sprintf(&network[strlen(network)], "</TD><TD>");
-			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_pop3_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+			sprintf(&network[strlen(network)], "</td><td>");
+			sprintf(&network[strlen(network)], "<input type=\"text\" name=\"c_pop3_port\" maxlength=\"5\" value=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 25:
+		case 24:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("SMTP MTA port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_smtp_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 27:
+		case 25:	/* note: reverse bool */
+			sprintf(&network[strlen(network)], "<TR><TD>");
+			sprintf(&network[strlen(network)], _("Correct forged From: lines during authenticated SMTP"));
+			sprintf(&network[strlen(network)], "</TD><TD>");
+			sprintf(&network[strlen(network)], "<input type=\"checkbox\" NAME=\"c_rfc822_strict_from\" VALUE=\"yes\" %s>",
+				((atoi(buf) == 0) ? "CHECKED" : ""));
+			sprintf(&network[strlen(network)], "</TD></TR>\n");
+			break;
+		case 26:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Allow aides to zap (forget) rooms"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
@@ -291,21 +315,21 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
-		case 28:
+		case 27:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("IMAP listener port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_imap_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 29:
+		case 28:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("Network run frequency (in seconds)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_net_freq\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 30:
+		case 29:
 			sprintf(&access[strlen(access)], "<TR><TD>");
 			sprintf(&access[strlen(access)], _("Disable self-service user account creation"));
 			sprintf(&access[strlen(access)], "</TD><TD>");
@@ -314,9 +338,6 @@ void display_siteconfig(void)
 			sprintf(&access[strlen(access)], "</TD></TR>\n");
 			break;
 		case 31:
-			/* position 31 is no longer in use */
-			break;
-		case 32:
 			sprintf(&purger[strlen(purger)], "<TR><TD>");
 			sprintf(&purger[strlen(purger)], _("Hour to run database auto-purge"));
 			sprintf(&purger[strlen(purger)], "</TD><TD>");
@@ -332,35 +353,35 @@ void display_siteconfig(void)
 			sprintf(&purger[strlen(purger)], "</SELECT>");
 			sprintf(&purger[strlen(purger)], "</TD></TR>\n");
 			break;
-		case 33:
+		case 32:
 			sprintf(&directory[strlen(directory)], "<TR><TD>");
 			sprintf(&directory[strlen(directory)], _("Host name of LDAP server (blank to disable)"));
 			sprintf(&directory[strlen(directory)], "</TD><TD>");
 			sprintf(&directory[strlen(directory)], "<input type=\"text\" NAME=\"c_ldap_host\" MAXLENGTH=\"127\" VALUE=\"%s\">", buf);
 			sprintf(&directory[strlen(directory)], "</TD></TR>\n");
 			break;
-		case 34:
+		case 33:
 			sprintf(&directory[strlen(directory)], "<TR><TD>");
 			sprintf(&directory[strlen(directory)], _("Port number of LDAP server (blank to disable)"));
 			sprintf(&directory[strlen(directory)], "</TD><TD>");
 			sprintf(&directory[strlen(directory)], "<input type=\"text\" NAME=\"c_ldap_port\" MAXLENGTH=\"127\" VALUE=\"%d\">", atoi(buf));
 			sprintf(&directory[strlen(directory)], "</TD></TR>\n");
 			break;
-		case 35:
+		case 34:
 			sprintf(&directory[strlen(directory)], "<TR><TD>");
 			sprintf(&directory[strlen(directory)], _("Base DN"));
 			sprintf(&directory[strlen(directory)], "</TD><TD>");
 			sprintf(&directory[strlen(directory)], "<input type=\"text\" NAME=\"c_ldap_base_dn\" MAXLENGTH=\"255\" VALUE=\"%s\">", buf);
 			sprintf(&directory[strlen(directory)], "</TD></TR>\n");
 			break;
-		case 36:
+		case 35:
 			sprintf(&directory[strlen(directory)], "<TR><TD>");
 			sprintf(&directory[strlen(directory)], _("Bind DN"));
 			sprintf(&directory[strlen(directory)], "</TD><TD>");
 			sprintf(&directory[strlen(directory)], "<input type=\"text\" NAME=\"c_ldap_bind_dn\" MAXLENGTH=\"255\" VALUE=\"%s\">", buf);
 			sprintf(&directory[strlen(directory)], "</TD></TR>\n");
 			break;
-		case 37:
+		case 36:
 			sprintf(&directory[strlen(directory)], "<TR><TD>");
 			sprintf(&directory[strlen(directory)], _("Password for bind DN"));
 			sprintf(&directory[strlen(directory)], "</TD><TD>");
@@ -368,50 +389,50 @@ void display_siteconfig(void)
 				buf);
 			sprintf(&directory[strlen(directory)], "</TD></TR>\n");
 			break;
-		case 38:
+		case 37:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("Server IP address (0.0.0.0 for 'any')"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_ip_addr\" MAXLENGTH=\"15\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 39:
+		case 38:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("SMTP MSA port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_msa_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 40:
+		case 39:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("IMAP over SSL port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_imaps_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 41:
+		case 40:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("POP3 over SSL port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_pop3s_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 42:
+		case 41:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("SMTP over SSL port (-1 to disable)"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
 			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_smtps_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 43:
-				sprintf(&general[strlen(general)], "<TR><TD>");
-				sprintf(&general[strlen(general)], _("Enable full text index (warning: resource intensive)"));
-				sprintf(&general[strlen(general)], "</TD><TD>");
-				sprintf(&general[strlen(general)], "<input type=\"checkbox\" NAME=\"c_enable_fulltext\" VALUE=\"yes\" %s>",
+		case 42:
+				sprintf(&idxjnl[strlen(idxjnl)], "<TR><TD>");
+				sprintf(&idxjnl[strlen(idxjnl)], _("Enable full text index"));
+				sprintf(&idxjnl[strlen(idxjnl)], "</TD><TD>");
+				sprintf(&idxjnl[strlen(idxjnl)], "<input type=\"checkbox\" NAME=\"c_enable_fulltext\" VALUE=\"yes\" %s>",
 					((atoi(buf) != 0) ? "CHECKED" : ""));
-				sprintf(&general[strlen(general)], "</TD></TR>\n");
+				sprintf(&idxjnl[strlen(idxjnl)], "</TD></TR>\n");
 			break;
-		case 44:
+		case 43:
 			sprintf(&tuning[strlen(tuning)], "<TR><TD>");
 			sprintf(&tuning[strlen(tuning)], _("Automatically delete committed database logs"));
 			sprintf(&tuning[strlen(tuning)], "</TD><TD>");
@@ -419,7 +440,7 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&tuning[strlen(tuning)], "</TD></TR>\n");
 			break;
-		case 45:
+		case 44:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("Instantly expunge deleted messages in IMAP"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
@@ -427,7 +448,7 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
-		case 46:
+		case 45:
 			sprintf(&network[strlen(network)], "<TR><TD>");
 			sprintf(&network[strlen(network)], _("Allow unauthenticated SMTP clients to spoof this site's domains"));
 			sprintf(&network[strlen(network)], "</TD><TD>");
@@ -435,7 +456,151 @@ void display_siteconfig(void)
 				((atoi(buf) != 0) ? "CHECKED" : ""));
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
+		case 46:
+			sprintf(&idxjnl[strlen(idxjnl)], "<TR><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], _("Perform journaling of email messages"));
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], "<input type=\"checkbox\" NAME=\"c_journal_email\" VALUE=\"yes\" %s>",
+				((atoi(buf) != 0) ? "CHECKED" : ""));
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD></TR>\n");
+			break;
+		case 47:
+			sprintf(&idxjnl[strlen(idxjnl)], "<TR><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], _("Perform journaling of non-email messages"));
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], "<input type=\"checkbox\" NAME=\"c_journal_pubmsgs\" VALUE=\"yes\" %s>",
+				((atoi(buf) != 0) ? "CHECKED" : ""));
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD></TR>\n");
+			break;
+		case 48:
+			sprintf(&idxjnl[strlen(idxjnl)], "<TR><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], _("Email destination of journalized messages"));
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD><TD>");
+			sprintf(&idxjnl[strlen(idxjnl)], "<input type=\"text\" NAME=\"c_journal_dest\" MAXLENGTH=\"127\" VALUE=\"%s\">", buf);
+			sprintf(&idxjnl[strlen(idxjnl)], "</TD></TR>\n");
+			break;
+		case 49:
+			if (strlen(buf) == 0) {
+				strcpy(buf, "UTC");
+			}
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
+			sprintf(&general[strlen(general)], "<TR><TD>");
+			sprintf(&general[strlen(general)], _("Default timezone for unzoned calendar items"));
+			sprintf(&general[strlen(general)], "</TD><TD>");
+			sprintf(&general[strlen(general)], "<select name=\"c_default_cal_zone\" size=\"1\">\n");
+
+			sprintf(&general[strlen(general)], "<option %s value=\"UTC\">UTC</option>\n",
+				(!strcasecmp(buf, "UTC") ? "selected" : "")
+			);
+
+			icalarray *zones;
+			int z;
+			char this_zone[128];
+			zones = icaltimezone_get_builtin_timezones();
+			for (z = 0; z < zones->num_elements; ++z) {
+				strcpy(this_zone, icaltimezone_get_location(icalarray_element_at(zones, z)));
+				sprintf(&general[strlen(general)], "<option %s value=\"%s\">%s</option>\n",
+					(!strcasecmp(this_zone, buf) ? "selected" : ""),
+					this_zone, this_zone
+				);
+			}
+
+			sprintf(&general[strlen(general)], "</select>");
+			sprintf(&general[strlen(general)], "</TD></TR>\n");
+#else /* WEBCIT_WITH_CALENDAR_SERVICE */
+			wprintf("<input type=\"hidden\" name=\"c_default_cal_zone\" value=\"%s\">\n", buf);
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
+			break;
+		case 50:
+			sprintf(&network[strlen(network)], "<TR><TD>");
+			sprintf(&network[strlen(network)], _("<a href=\"http://www.postfix.org/tcp_table.5.html\">Postfix TCP Dictionary Port </a> (-1 to disable)"));
+			sprintf(&network[strlen(network)], "</TD><TD>");
+			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_pftcpdict_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+			sprintf(&network[strlen(network)], "</TD></TR>\n");
+			break;
+		case 51:
+			sprintf(&network[strlen(network)], "<TR><TD>");
+			sprintf(&network[strlen(network)], _("ManageSieve Port (-1 to disable)"));
+			sprintf(&network[strlen(network)], "</TD><TD>");
+			sprintf(&network[strlen(network)], "<input type=\"text\" NAME=\"c_mgesve_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+			sprintf(&network[strlen(network)], "</TD></TR>\n");
+			break;
+		case 52:
+			sprintf(&access[strlen(access)], "<TR><TD>");
+			sprintf(&access[strlen(access)], _("Enable host based authentication mode"));
+			sprintf(&access[strlen(access)], "</TD><TD><input type=\"hidden\" NAME=\"c_auth_mode\" VALUE=\"%s\">%s",
+				buf,
+				((atoi(buf) != 0) ? "Yes" : "No"));
+			sprintf(&access[strlen(access)], "</TD></TR>\n");
+			break;
+		case 53:
+			sprintf(&funambol[strlen(funambol)], "<TR><TD>");
+			sprintf(&funambol[strlen(funambol)], _("Funambol server host (blank to disable)"));
+			sprintf(&funambol[strlen(funambol)], "</TD><TD>");
+			sprintf(&funambol[strlen(funambol)], "<input type=\"text\" NAME=\"c_funambol_host\" MAXLENGTH=\"255\" VALUE=\"%s\">", buf);
+			sprintf(&funambol[strlen(funambol)], "</TD></TR>\n");
+			break;
+		case 54:
+			sprintf(&funambol[strlen(funambol)], "<TR><TD>");
+			sprintf(&funambol[strlen(funambol)], _("Funambol server port "));
+			sprintf(&funambol[strlen(funambol)], "</TD><TD>");
+			sprintf(&funambol[strlen(funambol)], "<input type=\"text\" NAME=\"c_funambol_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+			sprintf(&funambol[strlen(funambol)], "</TD></TR>\n");
+			break;
+		case 55:
+			sprintf(&funambol[strlen(funambol)], "<TR><TD>");
+			sprintf(&funambol[strlen(funambol)], _("Funambol sync source"));
+			sprintf(&funambol[strlen(funambol)], "</TD><TD>");
+			sprintf(&funambol[strlen(funambol)], "<input type=\"text\" NAME=\"c_funambol_source\" MAXLENGTH=\"255\" VALUE=\"%s\">", buf);
+			sprintf(&funambol[strlen(funambol)], "</TD></TR>\n");
+			break;
+		case 56:
+			sprintf(&funambol[strlen(funambol)], "<TR><TD>");
+			sprintf(&funambol[strlen(funambol)], _("Funambol auth details (user:pass in Base64)"));
+			sprintf(&funambol[strlen(funambol)], "</TD><TD>");
+			sprintf(&funambol[strlen(funambol)], "<input type=\"text\" NAME=\"c_funambol_auth\" MAXLENGTH=\"255\" VALUE=\"%s\">", buf);
+			sprintf(&funambol[strlen(funambol)], "</TD></TR>\n");
+			break;
+		case 57:
+			sprintf(&network[strlen(network)], "<TR><TD>");
+			sprintf(&network[strlen(network)], _("Perform RBL checks upon connect instead of after RCPT"));
+			sprintf(&network[strlen(network)], "</TD><TD>");
+			sprintf(&network[strlen(network)], "<input type=\"checkbox\" NAME=\"c_rbl_at_greeting\" VALUE=\"yes\" %s>",
+				((atoi(buf) != 0) ? "CHECKED" : ""));
+			sprintf(&network[strlen(network)], "</TD></TR>\n");
+			break;
+		case 58:
+			sprintf(&access[strlen(access)], "<TR><TD>");
+			sprintf(&access[strlen(access)], _("Master user name (blank to disable)"));
+			sprintf(&access[strlen(access)], "</TD><TD>");
+			sprintf(&access[strlen(access)], "<input type=\"text\" NAME=\"c_master_user\" MAXLENGTH=\"31\" VALUE=\"%s\">", buf);
+			sprintf(&access[strlen(access)], "</TD></TR>\n");
+			break;
+		case 59:
+			sprintf(&access[strlen(access)], "<TR><TD>");
+			sprintf(&access[strlen(access)], _("Master user password"));
+			sprintf(&access[strlen(access)], "</TD><TD>");
+			sprintf(&access[strlen(access)], "<input type=\"password\" NAME=\"c_master_pass\" MAXLENGTH=\"31\" VALUE=\"%s\">",
+			buf);
+			sprintf(&directory[strlen(directory)], "</TD></TR>\n");
+			break;
+		case 60:
+			sprintf(&funambol[strlen(funambol)], "<TR><TD>");
+			sprintf(&funambol[strlen(funambol)], _("External pager tool (blank to disable)"));
+			sprintf(&funambol[strlen(funambol)], "</TD><TD>");
+			sprintf(&funambol[strlen(funambol)], "<input type=\"text\" NAME=\"c_pager_program\" MAXLENGTH=\"255\" VALUE=\"%s\">", buf);
+			sprintf(&funambol[strlen(funambol)], "</TD></TR>\n");
+			break;
+		case 61:
+			sprintf(&network[strlen(network)], "<TR><TD>");
+			sprintf(&network[strlen(network)], _("Keep original from headers in IMAP"));
+			sprintf(&network[strlen(network)], "</TD><TD>");
+			sprintf(&network[strlen(network)], "<input type=\"checkbox\" NAME=\"c_imap_keep_from\" VALUE=\"yes\" %s>",
+				((atoi(buf) != 0) ? "CHECKED" : ""));
+			sprintf(&network[strlen(network)], "</TD></TR>\n");
+			break;
 		}
+	
 	}
 
 	serv_puts("GPEX site");
@@ -508,39 +673,44 @@ void display_siteconfig(void)
 	sprintf(&tuning[strlen(tuning)], "</table>");
 	sprintf(&directory[strlen(directory)], "</table>");
 	sprintf(&purger[strlen(purger)], "</table>");
-
-	tabbed_dialog(6, tabnames);
-
-	begin_tab(0, 6);	wprintf("%s", general);		 end_tab(0, 6);
-	begin_tab(1, 6);	wprintf("%s", access);		 end_tab(1, 6);
-	begin_tab(2, 6);	wprintf("%s", network);		 end_tab(2, 6);
-	begin_tab(3, 6);	wprintf("%s", tuning);		 end_tab(3, 6);
-	begin_tab(4, 6);	wprintf("%s", directory);	 end_tab(4, 6);
-	begin_tab(5, 6);	wprintf("%s", purger);		 end_tab(5, 6);
-
-	wprintf("<div align=\"center\">");
+	sprintf(&idxjnl[strlen(idxjnl)], "</table>");
+	sprintf(&funambol[strlen(funambol)], "</table>");
+
+	tabbed_dialog(8, tabnames);
+
+	begin_tab(0, 8);	client_write(general, strlen(general));		 end_tab(0, 8);
+	begin_tab(1, 8);	client_write(access, strlen(access));		 end_tab(1, 8);
+	begin_tab(2, 8);	client_write(network, strlen(network));		 end_tab(2, 8);
+	begin_tab(3, 8);	client_write(tuning, strlen(tuning));		 end_tab(3, 8);
+	begin_tab(4, 8);	client_write(directory, strlen(directory));	 end_tab(4, 8);
+	begin_tab(5, 8);	client_write(purger, strlen(purger));		 end_tab(5, 8);
+	begin_tab(6, 8);	client_write(idxjnl, strlen(idxjnl));		 end_tab(6, 8);
+	begin_tab(7, 8);	client_write(funambol, strlen(funambol));	 end_tab(7, 8);
+	wprintf("<div class=\"tabcontent_submit\">");
 	wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
 	wprintf("&nbsp;");
 	wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n", _("Cancel"));
 	wprintf("</div></FORM>\n");
-	wprintf("</td></tr></table></div>\n");
+	wprintf("</td></tr></table>\n");
 	wDumpContent(1);
 }
 
-
+/**
+ * parse siteconfig changes 
+ */
 void siteconfig(void)
 {
 	char buf[256];
 
 	if (strlen(bstr("ok_button")) == 0) {
-		display_siteconfig();
+		display_aide_menu();
 		return;
 	}
 	serv_printf("CONF set");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '4') {
 		safestrncpy(WC->ImportantMessage, &buf[4], sizeof WC->ImportantMessage);
-		display_siteconfig();
+		display_aide_menu();
 		return;
 	}
 	serv_printf("%s", bstr("c_nodename"));
@@ -558,7 +728,7 @@ void siteconfig(void)
 	serv_printf("%s", bstr("c_bbs_city"));
 	serv_printf("%s", bstr("c_sysadm"));
 	serv_printf("%s", bstr("c_maxsessions"));
-	serv_printf("");  /* networking password -- deprecated */
+	serv_printf("");  /* placeholder - this field is not in use */
 	serv_printf("%s", bstr("c_userpurge"));
 	serv_printf("%s", bstr("c_roompurge"));
 	serv_printf("%s", bstr("c_logpages"));
@@ -568,12 +738,12 @@ void siteconfig(void)
 	serv_printf("%s", bstr("c_max_workers"));
 	serv_printf("%s", bstr("c_pop3_port"));
 	serv_printf("%s", bstr("c_smtp_port"));
-	serv_printf("");  /* moderation filter level -- not yet implemented */
+	serv_printf("%s", ((!strcasecmp(bstr("c_rfc822_strict_from"), "yes") ? "0" : "1"))); /* note: reverse bool */
 	serv_printf("%s", ((!strcasecmp(bstr("c_aide_zap"), "yes") ? "1" : "0")));
 	serv_printf("%s", bstr("c_imap_port"));
 	serv_printf("%s", bstr("c_net_freq"));
 	serv_printf("%s", ((!strcasecmp(bstr("c_disable_newu"), "yes") ? "1" : "0")));
-	serv_printf("1");
+	serv_printf("1"); /* placeholder - this field is not in use */
 	serv_printf("%s", bstr("c_purge_hour"));
 	serv_printf("%s", bstr("c_ldap_host"));
 	serv_printf("%s", bstr("c_ldap_port"));
@@ -589,6 +759,22 @@ void siteconfig(void)
 	serv_printf("%s", ((!strcasecmp(bstr("c_auto_cull"), "yes") ? "1" : "0")));
 	serv_printf("%s", ((!strcasecmp(bstr("c_instant_expunge"), "yes") ? "1" : "0")));
 	serv_printf("%s", ((!strcasecmp(bstr("c_allow_spoofing"), "yes") ? "1" : "0")));
+	serv_printf("%s", ((!strcasecmp(bstr("c_journal_email"), "yes") ? "1" : "0")));
+	serv_printf("%s", ((!strcasecmp(bstr("c_journal_pubmsgs"), "yes") ? "1" : "0")));
+	serv_printf("%s", bstr("c_journal_dest"));
+	serv_printf("%s", bstr("c_default_cal_zone"));
+	serv_printf("%s", bstr("c_pftcpdict_port"));
+	serv_printf("%s", bstr("c_mgesve_port"));
+	serv_printf("%s", bstr("c_auth_mode"));
+	serv_printf("%s", bstr("c_funambol_host"));
+	serv_printf("%s", bstr("c_funambol_port"));
+	serv_printf("%s", bstr("c_funambol_source"));
+	serv_printf("%s", bstr("c_funambol_auth"));
+	serv_printf("%s", ((!strcasecmp(bstr("c_rbl_at_greeting"), "yes") ? "1" : "0")));
+	serv_printf("%s", bstr("c_master_user"));
+	serv_printf("%s", bstr("c_master_pass"));
+	serv_printf("%s", bstr("c_pager_program"));
+	serv_printf("%s", ((!strcasecmp(bstr("c_imap_keep_from"), "yes") ? "1" : "0")));
 	serv_printf("000");
 
 	serv_printf("SPEX site|%d|%d", atoi(bstr("sitepolicy")), atoi(bstr("sitevalue")));
@@ -596,7 +782,12 @@ void siteconfig(void)
 	serv_printf("SPEX mailboxes|%d|%d", atoi(bstr("mboxpolicy")), atoi(bstr("mboxvalue")));
 	serv_getln(buf, sizeof buf);
 
+	strcpy(serv_info.serv_default_cal_zone, bstr("c_default_cal_zone"));
+
 	safestrncpy(WC->ImportantMessage, _("Your system configuration has been updated."),
 		sizeof WC->ImportantMessage);
-	display_siteconfig();
+	display_aide_menu();
 }
+
+
+/*@}*/