X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsiteconfig.c;h=5a2ee2e6f4f780db460788e1d6513f24fe9ad12c;hb=76f23da782e9e80dad0a8ae1336230da5a6fa124;hp=39ef9f6d54a4d5247a7c26d678a79c128d21f882;hpb=0b875b72e077d0975e229c8b35f548dfa75c9df1;p=citadel.git

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 39ef9f6d5..5a2ee2e6f 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -1,16 +1,14 @@
 /*
  * $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)
@@ -26,6 +24,8 @@ void display_siteconfig(void)
 	char purger[SIZ];
 	char idxjnl[SIZ];
 	char funambol[SIZ];
+	char pop3[SIZ];
+	
 	/** expire policy settings */
 	int sitepolicy = 0;
 	int sitevalue = 0;
@@ -33,30 +33,27 @@ void display_siteconfig(void)
 	int mboxvalue = 0;
 
 	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n"
-		"<table class=\"siteconfig_banner\"><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 class=\"siteconfig_banner\"><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 class=\"fix_scrollbar_bug\">"
-		"<table class=\"siteconfig_background\"><tr><td>");
+	wprintf("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" ><tr><td>");
 
 	char *tabnames[] = {
 		_("General"),
@@ -66,7 +63,8 @@ void display_siteconfig(void)
 		_("Directory"),
 		_("Auto-purger"),
 		_("Indexing/Journaling"),
-		_("Funambol Intergraton")
+		_("Push Email"),
+		_("Pop3")
 	};
 
 	sprintf(general, "<center><h1>%s</h1><table border=\"0\">",
@@ -107,10 +105,18 @@ void display_siteconfig(void)
 			_("Warning: these facilities are resource intensive.")
 	);
 	sprintf(funambol, "<center><h1>%s</h1><table border=\"0\">",
-		_("Funambol Push Email Intergration")
+		_("Push Email")
 		);
 
+	sprintf(pop3, "<center><h1>%s</h1><table border=\"0\">",
+		_("POP3")
+		);
+		
 	wprintf("<form method=\"post\" action=\"siteconfig\">\n");
+	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+	
+	sprintf(&general[strlen(general)], "<tr><td><a href=\"display_edithello\"> %s </a></td>",           _("Change Login Logo"));
+	sprintf(&general[strlen(general)],     "<td><a href=\"display_editgoodbuye\"> %s </a></td></tr>\n", _("Change Logout Logo"));
 
 	i = 0;
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -288,11 +294,11 @@ void display_siteconfig(void)
 			sprintf(&tuning[strlen(tuning)], "</td></tr>\n");
 			break;
 		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></TR>\n");
+			sprintf(&pop3[strlen(pop3)], "<tr><td>");
+			sprintf(&pop3[strlen(pop3)], _("POP3 listener port (-1 to disable)"));
+			sprintf(&pop3[strlen(pop3)], "</td><td>");
+			sprintf(&pop3[strlen(pop3)], "<input type=\"text\" name=\"c_pop3_port\" maxlength=\"5\" value=\"%s\">", buf);
+			sprintf(&pop3[strlen(pop3)], "</TD></TR>\n");
 			break;
 		case 24:
 			sprintf(&network[strlen(network)], "<TR><TD>");
@@ -348,8 +354,8 @@ void display_siteconfig(void)
 				sprintf(&purger[strlen(purger)], "<OPTION %s VALUE=\"%d\">%d:00%s</OPTION>\n",
 					((atoi(buf) == j) ? "SELECTED" : ""),
 					j,
-					((j == 0) ? 12 : ((j>12) ? j-12 : j)),
-					((j >= 12) ? "pm" : "am")
+					(get_time_format_cached() == WC_TIMEFORMAT_24) ? j : ((j == 0) ? 12 : ((j>12) ? j-12 : j)),
+					(get_time_format_cached() == WC_TIMEFORMAT_24) ? "" : ((j >= 12) ? "pm" : "am")
 				);
 			}
 			sprintf(&purger[strlen(purger)], "</SELECT>");
@@ -413,11 +419,11 @@ void display_siteconfig(void)
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
 		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");
+			sprintf(&pop3[strlen(pop3)], "<TR><TD>");
+			sprintf(&pop3[strlen(pop3)], _("POP3 over SSL port (-1 to disable)"));
+			sprintf(&pop3[strlen(pop3)], "</TD><TD>");
+			sprintf(&pop3[strlen(pop3)], "<input type=\"text\" NAME=\"c_pop3s_port\" MAXLENGTH=\"5\" VALUE=\"%s\">", buf);
+			sprintf(&pop3[strlen(pop3)], "</TD></TR>\n");
 			break;
 		case 41:
 			sprintf(&network[strlen(network)], "<TR><TD>");
@@ -485,33 +491,46 @@ void display_siteconfig(void)
 			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;
+			long len;
 			char this_zone[128];
+			char *ZName;
+			void *ZNamee;
+			HashList *List;
+			HashPos  *it;
+
+			List = NewHash(1, NULL);
+			len = sizeof("UTC") + 1;
+			ZName = malloc(len + 1);
+			memcpy(ZName, "UTC", len + 1);
+			Put(List, ZName, len, ZName, NULL);
 			zones = icaltimezone_get_builtin_timezones();
 			for (z = 0; z < zones->num_elements; ++z) {
 				strcpy(this_zone, icaltimezone_get_location(icalarray_element_at(zones, z)));
+				len = strlen(this_zone);
+				ZName = (char*)malloc(len +1);
+				memcpy(ZName, this_zone, len + 1);
+				Put(List, ZName, len, ZName, NULL);
+			}
+			SortByHashKey(List, 0);
+			it = GetNewHashPos();
+			while (GetNextHashPos(List, it, &len, &ZName, &ZNamee)) {
 				sprintf(&general[strlen(general)], "<option %s value=\"%s\">%s</option>\n",
-					(!strcasecmp(this_zone, buf) ? "selected" : ""),
-					this_zone, this_zone
+					(!strcasecmp((char*)ZName, buf) ? "selected" : ""),
+					ZName, ZName
 				);
 			}
+			DeleteHashPos(&it);
+			DeleteHash(&List);
 
 			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>");
@@ -528,11 +547,12 @@ void display_siteconfig(void)
 			sprintf(&network[strlen(network)], "</TD></TR>\n");
 			break;
 		case 52:
-			sprintf(&general[strlen(general)], "<TR><TD>");
-			sprintf(&general[strlen(general)], _("Use system authentication"));
-			sprintf(&general[strlen(general)], "</TD><TD><input type=\"checkbox\" NAME=\"c_auth_mode\" VALUE=\"yes\" %s>",
-				((atoi(buf) != 0) ? "CHECKED" : ""));
-			sprintf(&general[strlen(general)], "</TD></TR>\n");
+			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>");
@@ -557,11 +577,78 @@ void display_siteconfig(void)
 			break;
 		case 56:
 			sprintf(&funambol[strlen(funambol)], "<TR><TD>");
-			sprintf(&funambol[strlen(funambol)], _("Funambol auth details (user:pass in Base64)"));
+			sprintf(&funambol[strlen(funambol)], _("Funambol auth details (user:pass)"));
 			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;
+		case 62:
+			sprintf(&network[strlen(network)], "<tr><td>");
+			sprintf(&network[strlen(network)], _("XMPP (Jabber) client to server port (-1 to disable)"));
+			sprintf(&network[strlen(network)], "</td><td>");
+			sprintf(&network[strlen(network)], "<input type=\"text\" name=\"c_xmpp_c2s_port\" maxlength=\"5\" value=\"%s\">", buf);
+			sprintf(&network[strlen(network)], "</TD></TR>\n");
+			break;
+		case 63:
+			sprintf(&network[strlen(network)], "<tr><td>");
+			sprintf(&network[strlen(network)], _("XMPP (Jabber) server to server port (-1 to disable)"));
+			sprintf(&network[strlen(network)], "</td><td>");
+			sprintf(&network[strlen(network)], "<input type=\"hidden\" name=\"c_xmpp_s2s_port\" value=\"%s\">\n", buf);
+			sprintf(&network[strlen(network)], "</TD></TR>\n");
+			break;
+		case 64:
+			sprintf(&pop3[strlen(pop3)], "<tr><td>");
+			sprintf(&pop3[strlen(pop3)], _("POP3 fetch frequency in seconds"));
+			sprintf(&pop3[strlen(pop3)], "</td><td>");
+			sprintf(&pop3[strlen(pop3)], "<input type=\"text\" name=\"c_pop3_fetch\" MAXLENGTH=\"5\" value=\"%s\">\n", buf);
+			sprintf(&pop3[strlen(pop3)], "</TD></TR>\n");
+			break;
+		case 65:
+			sprintf(&pop3[strlen(pop3)], "<tr><td>");
+			sprintf(&pop3[strlen(pop3)], _("POP3 fastest fetch frequency in seconds"));
+			sprintf(&pop3[strlen(pop3)], "</td><td>");
+			sprintf(&pop3[strlen(pop3)], "<input type=\"text\" name=\"c_pop3_fastest\" MAXLENGTH=\"5\" value=\"%s\">\n", buf);
+			sprintf(&pop3[strlen(pop3)], "</TD></TR>\n");
+			break;
+			
 		}
 	
 	}
@@ -637,24 +724,26 @@ void display_siteconfig(void)
 	sprintf(&directory[strlen(directory)], "</table>");
 	sprintf(&purger[strlen(purger)], "</table>");
 	sprintf(&idxjnl[strlen(idxjnl)], "</table>");
-	sprintf(&funambol[strlen(funambol)], "</table");
-
-	tabbed_dialog(8, tabnames);
-
-	begin_tab(0, 7);	client_write(general, strlen(general));		 end_tab(0, 7);
-	begin_tab(1, 7);	client_write(access, strlen(access));		 end_tab(1, 7);
-	begin_tab(2, 7);	client_write(network, strlen(network));		 end_tab(2, 7);
-	begin_tab(3, 7);	client_write(tuning, strlen(tuning));		 end_tab(3, 7);
-	begin_tab(4, 7);	client_write(directory, strlen(directory));	 end_tab(4, 7);
-	begin_tab(5, 7);	client_write(purger, strlen(purger));		 end_tab(5, 7);
-	begin_tab(6, 7);	client_write(idxjnl, strlen(idxjnl));		 end_tab(6, 7);
-	begin_tab(7, 8);	client_write(funambol, strlen(funambol));	 end_tab(7, 8);
-	wprintf("<div align=\"center\"><br>");
+	sprintf(&funambol[strlen(funambol)], "</table>");
+	sprintf(&pop3[strlen(pop3)], "</table>");
+
+	tabbed_dialog(9, tabnames);
+
+	begin_tab(0, 9);	client_write(general, strlen(general));		 end_tab(0, 9);
+	begin_tab(1, 9);	client_write(access, strlen(access));		 end_tab(1, 9);
+	begin_tab(2, 9);	client_write(network, strlen(network));		 end_tab(2, 9);
+	begin_tab(3, 9);	client_write(tuning, strlen(tuning));		 end_tab(3, 9);
+	begin_tab(4, 9);	client_write(directory, strlen(directory));	 end_tab(4, 9);
+	begin_tab(5, 9);	client_write(purger, strlen(purger));		 end_tab(5, 9);
+	begin_tab(6, 9);	client_write(idxjnl, strlen(idxjnl));		 end_tab(6, 9);
+	begin_tab(7, 9);	client_write(funambol, strlen(funambol));	 end_tab(7, 9);
+	begin_tab(8, 9);	client_write(pop3, strlen(pop3));	 	 end_tab(8, 9);
+	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);
 }
 
@@ -680,14 +769,14 @@ void siteconfig(void)
 	serv_printf("%s", bstr("c_fqdn"));
 	serv_printf("%s", bstr("c_humannode"));
 	serv_printf("%s", bstr("c_phonenum"));
-	serv_printf("%s", ((!strcasecmp(bstr("c_creataide"), "yes") ? "1" : "0")));
+	serv_printf("%s", ((yesbstr("c_creataide") ? "1" : "0")));
 	serv_printf("%s", bstr("c_sleeping"));
 	serv_printf("%s", bstr("c_initax"));
-	serv_printf("%s", ((!strcasecmp(bstr("c_regiscall"), "yes") ? "1" : "0")));
-	serv_printf("%s", ((!strcasecmp(bstr("c_twitdetect"), "yes") ? "1" : "0")));
+	serv_printf("%s", ((yesbstr("c_regiscall") ? "1" : "0")));
+	serv_printf("%s", ((yesbstr("c_twitdetect") ? "1" : "0")));
 	serv_printf("%s", bstr("c_twitroom"));
 	serv_printf("%s", bstr("c_moreprompt"));
-	serv_printf("%s", ((!strcasecmp(bstr("c_restrict"), "yes") ? "1" : "0")));
+	serv_printf("%s", ((yesbstr("c_restrict") ? "1" : "0")));
 	serv_printf("%s", bstr("c_bbs_city"));
 	serv_printf("%s", bstr("c_sysadm"));
 	serv_printf("%s", bstr("c_maxsessions"));
@@ -701,11 +790,11 @@ 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("%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", ((yesbstr("c_rfc822_strict_from") ? "0" : "1"))); /* note: reverse bool */
+	serv_printf("%s", ((yesbstr("c_aide_zap") ? "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("%s", ((yesbstr("c_disable_newu") ? "1" : "0")));
 	serv_printf("1"); /* placeholder - this field is not in use */
 	serv_printf("%s", bstr("c_purge_hour"));
 	serv_printf("%s", bstr("c_ldap_host"));
@@ -718,26 +807,35 @@ void siteconfig(void)
 	serv_printf("%s", bstr("c_imaps_port"));
 	serv_printf("%s", bstr("c_pop3s_port"));
 	serv_printf("%s", bstr("c_smtps_port"));
-	serv_printf("%s", ((!strcasecmp(bstr("c_enable_fulltext"), "yes") ? "1" : "0")));
-	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", ((yesbstr("c_enable_fulltext") ? "1" : "0")));
+	serv_printf("%s", ((yesbstr("c_auto_cull") ? "1" : "0")));
+	serv_printf("%s", ((yesbstr("c_instant_expunge") ? "1" : "0")));
+	serv_printf("%s", ((yesbstr("c_allow_spoofing") ? "1" : "0")));
+	serv_printf("%s", ((yesbstr("c_journal_email") ? "1" : "0")));
+	serv_printf("%s", ((yesbstr("c_journal_pubmsgs") ? "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", ((!strcasecmp(bstr("c_auth_mode"), "yes") ? "1" : "0")));
+	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", ((yesbstr("c_rbl_at_greeting") ? "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", ((yesbstr("c_imap_keep_from") ? "1" : "0")));
+	serv_printf("%s", bstr("c_xmpp_c2s_port"));
+	serv_printf("%s", bstr("c_xmpp_s2s_port"));
+	serv_printf("%s", bstr("c_pop3_fetch"));
+	serv_printf("%s", bstr("c_pop3_fastest"));
 	serv_printf("000");
 
-	serv_printf("SPEX site|%d|%d", atoi(bstr("sitepolicy")), atoi(bstr("sitevalue")));
+	serv_printf("SPEX site|%d|%d", ibstr("sitepolicy"), ibstr("sitevalue"));
 	serv_getln(buf, sizeof buf);
-	serv_printf("SPEX mailboxes|%d|%d", atoi(bstr("mboxpolicy")), atoi(bstr("mboxvalue")));
+	serv_printf("SPEX mailboxes|%d|%d", ibstr("mboxpolicy"), ibstr("mboxvalue"));
 	serv_getln(buf, sizeof buf);
 
 	strcpy(serv_info.serv_default_cal_zone, bstr("c_default_cal_zone"));
@@ -747,5 +845,11 @@ void siteconfig(void)
 	display_aide_menu();
 }
 
-
+void 
+InitModule_SITECONFIG
+(void)
+{
+	WebcitAddUrlHandler(HKEY("display_siteconfig"), display_siteconfig, 0);
+	WebcitAddUrlHandler(HKEY("siteconfig"), siteconfig, 0);
+}
 /*@}*/