X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsiteconfig.c;h=253e1a5763c57292979cbaad45e071ac9635aa38;hb=6f49b72635d2c113c126eab5579fc5f1a8928bc6;hp=dede757680390795fccc3f398ef7994d726ebc5e;hpb=b094c568dfdab8c614b7deeb03db65f1b951e715;p=citadel.git

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index dede75768..253e1a576 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -1,7 +1,7 @@
 /*
  * Administrative screen for site-wide configuration
  *
- * Copyright (c) 1996-2012 by the citadel.org team
+ * Copyright (c) 1996-2014 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
  * modify it under the terms of the GNU General Public License, version 3.
@@ -15,6 +15,8 @@
 #include "webcit.h"
 #include "webserver.h"
 
+CtxType CTX_SRVLOG = CTX_NONE;
+
 HashList *ZoneHash = NULL;
 
 ConstStr ExpirePolicyString = {CStrOf(roompolicy)     };
@@ -113,7 +115,7 @@ void LoadZoneFiles(void)
 	Put(ZoneHash, HKEY("UTC"), ZName, HFreeStrBuf);
 	zones = icaltimezone_get_builtin_timezones();
 	for (z = 0; z < zones->num_elements; ++z) {
-		/* syslog(9, "Location: %-40s tzid: %s\n",
+		/* syslog(LOG_DEBUG, "Location: %-40s tzid: %s\n",
 			icaltimezone_get_location(icalarray_element_at(zones, z)),
 			icaltimezone_get_tzid(icalarray_element_at(zones, z))
 		); */
@@ -185,7 +187,7 @@ CfgMapping ServerConfig[] = {
 	{CFG_STR, 0, 0, "", HKEY("c_smtps_port")},
 	{CFG_YES, 0, 0, "", HKEY("c_enable_fulltext")},
 	{CFG_YES, 0, 0, "", HKEY("c_auto_cull")},
-	{CFG_YES, 0, 0, "", HKEY("c_instant_expunge")},
+	{CFG_YES, 0, 0, "", HKEY("reserved3")},
 	{CFG_YES, 0, 0, "", HKEY("c_allow_spoofing")},
 	{CFG_YES, 0, 0, "", HKEY("c_journal_email")},
 	{CFG_YES, 0, 0, "", HKEY("c_journal_pubmsgs")},
@@ -208,7 +210,11 @@ CfgMapping ServerConfig[] = {
 	{CFG_STR, 0, 0, "", HKEY("c_pop3_fetch")},
 	{CFG_STR, 0, 0, "", HKEY("c_pop3_fastest")},
 	{CFG_YES, 0, 0, "", HKEY("c_spam_flag_only")},
-	{CFG_YES, 0, 0, "", HKEY("c_guest_logins")}
+	{CFG_YES, 0, 0, "", HKEY("c_guest_logins")},
+	{CFG_STR, 0, 0, "", HKEY("c_port_number")},
+	{CFG_STR, 0, 0, "", HKEY("c_ctdluid")},
+	{CFG_STR, 0, 0, "", HKEY("c_nntp_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_nntps_port")}
 };
 
 
@@ -472,11 +478,12 @@ void
 InitModule_SITECONFIG
 (void)
 {
+	RegisterCTX(CTX_SRVLOG);
 	WebcitAddUrlHandler(HKEY("siteconfig"), "", 0, siteconfig, CTX_NONE);
 
 	RegisterNamespace("SERV:CFG", 1, 2, tmplput_servcfg, NULL, CTX_NONE);
-	RegisterConditional(HKEY("COND:SERVCFG"), 3, ConditionalServCfg, CTX_NONE);
-	RegisterConditional(HKEY("COND:SERVCFG:CTXSTRBUF"), 4, ConditionalServCfgCTXStrBuf, CTX_STRBUF);
+	RegisterConditional("COND:SERVCFG", 3, ConditionalServCfg, CTX_NONE);
+	RegisterConditional("COND:SERVCFG:CTXSTRBUF", 4, ConditionalServCfgCTXStrBuf, CTX_STRBUF);
 	RegisterIterator("PREF:ZONE", 0, ZoneHash, NULL, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
 
 	REGISTERTokenParamDefine(roompolicy);
@@ -494,11 +501,11 @@ InitModule_SITECONFIG
 	REGISTERTokenParamDefine(CFG_SMTP_FROM_CORRECT);
 	REGISTERTokenParamDefine(CFG_SMTP_FROM_REJECT);
 
-	RegisterConditional(HKEY("COND:EXPIRE:MODE"), 2, ConditionalExpire, CTX_NONE);
+	RegisterConditional("COND:EXPIRE:MODE", 2, ConditionalExpire, CTX_NONE);
 	RegisterNamespace("EXPIRE:VALUE", 1, 2, tmplput_ExpireValue, NULL, CTX_NONE);
 	RegisterNamespace("EXPIRE:MODE", 1, 2, tmplput_ExpireMode, NULL, CTX_NONE);
 
-	RegisterConditional(HKEY("COND:SERVCFG:THISLOGENABLE"), 4, ConditionalServCfgThisLogEnabled, CTX_SRVLOG);
+	RegisterConditional("COND:SERVCFG:THISLOGENABLE", 4, ConditionalServCfgThisLogEnabled, CTX_SRVLOG);
 	RegisterIterator("SERVCFG:LOGENABLE", 0, NULL, iterate_GetSrvLogEnable, NULL, DeleteHash, CTX_SRVLOG, CTX_NONE, IT_NOFLAG);
 	RegisterNamespace("SERVCFG:LOGNAME", 0, 1, tmplput_servcfg_LogName, NULL, CTX_SRVLOG);
 }