X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsiteconfig.c;h=041bcb1c26f5b0928e8f79b39ce8768d2c2da6bb;hb=7f5c03bd732302f360f6840f0d815ad3e644416d;hp=82554e56ec7bb222c2e9783b2bb290ef423f72ce;hpb=6ec73d6906542ea2f8cca2e62f7625ee2e17ae03;p=citadel.git

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 82554e56e..041bcb1c2 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Administrative screen for site-wide configuration
  */
 
@@ -11,6 +9,91 @@
 
 HashList *ZoneHash = NULL;
 
+ConstStr ExpirePolicyString = {CStrOf(roompolicy)     };
+
+ConstStr ExpirePolicyStrings[][2] = {
+	{ { CStrOf(roompolicy)     } , { strof(roompolicy)     "_value", sizeof(strof(roompolicy)     "_value") - 1 } },
+	{ { CStrOf(floorpolicy)    } , { strof(floorpolicy)    "_value", sizeof(strof(floorpolicy)    "_value") - 1 } },
+	{ { CStrOf(sitepolicy)     } , { strof(sitepolicy)     "_value", sizeof(strof(sitepolicy)     "_value") - 1 } },
+	{ { CStrOf(mailboxespolicy)} , { strof(mailboxespolicy)"_value", sizeof(strof(mailboxespolicy)"_value") - 1 } }
+};
+
+void LoadExpirePolicy(GPEXWhichPolicy which)
+{
+	StrBuf *Buf;
+	wcsession *WCC = WC;
+	long State;
+	const char *Pos = NULL;
+
+	serv_printf("GPEX %s", ExpirePolicyStrings[which][0].Key);
+	Buf = NewStrBuf();
+	StrBuf_ServGetln(Buf);
+	WCC->Policy[which].loaded = 1;
+	if (GetServerStatus(Buf, &State) == 2) {
+		Pos = ChrPtr(Buf) + 4;
+		WCC->Policy[which].expire_mode = StrBufExtractNext_long(Buf, &Pos, '|');
+		WCC->Policy[which].expire_value = StrBufExtractNext_long(Buf, &Pos, '|');
+	}
+	else if (State == 550)
+		StrBufAppendBufPlain(WCC->ImportantMsg,
+				     _("Higher access is required to access this function."), -1, 0);
+	FreeStrBuf(&Buf);
+}
+
+void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which)
+{
+	StrBuf *Buf;
+	long State;
+
+	serv_printf("SPEX %s|%d|%d", 
+		            ExpirePolicyStrings[which][0].Key,
+		    ibcstr( ExpirePolicyStrings[which][1] ),
+		    ibcstr( ExpirePolicyStrings[which][1] )  );
+
+	Buf = NewStrBuf();
+	StrBuf_ServGetln(Buf);
+	GetServerStatus(Buf, &State);
+	if (State == 550)
+		StrBufAppendBufPlain(WC->ImportantMsg,
+				     _("Higher access is required to access this function."), -1, 0);
+	FreeStrBuf(&Buf);
+}
+
+int ConditionalExpire(StrBuf *Target, WCTemplputParams *TP)
+{
+	wcsession *WCC = WC;
+	GPEXWhichPolicy which;
+	int CompareWith;
+
+	which = GetTemplateTokenNumber(Target, TP, 2, 0);
+	CompareWith = GetTemplateTokenNumber(Target, TP, 3, 0);
+
+	if (WCC->Policy[which].loaded == 0) LoadExpirePolicy(which);
+	
+	return WCC->Policy[which].expire_mode == CompareWith;
+}
+
+void tmplput_ExpireValue(StrBuf *Target, WCTemplputParams *TP)
+{
+	GPEXWhichPolicy which;
+	wcsession *WCC = WC;
+		
+	which = GetTemplateTokenNumber(Target, TP, 0, 0);
+	if (WCC->Policy[which].loaded == 0) LoadExpirePolicy(which);
+	StrBufAppendPrintf(Target, "%d", WCC->Policy[which].expire_value);
+}
+
+
+void tmplput_ExpireMode(StrBuf *Target, WCTemplputParams *TP)
+{
+	GPEXWhichPolicy which;
+	wcsession *WCC = WC;
+		
+	which = GetTemplateTokenNumber(Target, TP, 2, 0);
+	if (WCC->Policy[which].loaded == 0) LoadExpirePolicy(which);
+	StrBufAppendPrintf(Target, "%d", WCC->Policy[which].expire_mode);
+}
+
 
 
 void LoadZoneFiles(void)
@@ -116,7 +199,8 @@ CfgMapping ServerConfig[] = {
 	{CFG_STR, HKEY("c_xmpp_s2s_port")},
 	{CFG_STR, HKEY("c_pop3_fetch")},
 	{CFG_STR, HKEY("c_pop3_fastest")},
-	{CFG_YES , HKEY("c_spam_flag_only")}
+	{CFG_YES , HKEY("c_spam_flag_only")},
+	{CFG_YES , HKEY("c_guest_logins")}
 };
 
 
@@ -126,9 +210,8 @@ CfgMapping ServerConfig[] = {
 void load_siteconfig(void)
 {
 	wcsession *WCC = WC;
-	StrBuf *Buf, *CfgToken;
+	StrBuf *Buf;
 	HashList *Cfg;
-	char buf[SIZ];
 	long len;
 	int i;
 	
@@ -136,14 +219,21 @@ void load_siteconfig(void)
 		WCC->ServCfg = NewHash(1, NULL);
 	Cfg = WCC->ServCfg;
 
+	Buf = NewStrBuf();
+
 	serv_printf("CONF get");
-	serv_getln(buf, sizeof buf);
+	StrBuf_ServGetln(Buf);
+	if (GetServerStatus(Buf, NULL) != 1) {
+		StrBufCutLeft(Buf, 4);
+		AppendImportantMessage(SKEY(Buf));
+		return;
+		
+	}
 	i = 0;
-	Buf = NewStrBuf();
-	while ((sizeof(ServerConfig) / sizeof(CfgMapping)) &&
-	       (len = StrBuf_ServGetln(Buf),
-		strcmp(ChrPtr(Buf), "000")) && 
-	       (i <= sizeof(ServerConfig))) 
+	while (len = StrBuf_ServGetln(Buf),
+	       (i <= (sizeof(ServerConfig) / sizeof(CfgMapping))) &&
+	       ((len != 3) || (strcmp(ChrPtr(Buf), "000")!= 0))
+		)
 	{
 		Put(Cfg,
 		    ServerConfig[i].Key, 
@@ -156,41 +246,22 @@ void load_siteconfig(void)
 		else
 			Buf = NULL;			
 	}
-	FreeStrBuf(&Buf);
-
-	serv_puts("GPEX site");
-	Buf = NewStrBuf();
-	CfgToken = NULL;
-	StrBuf_ServGetln(Buf);
-	if (GetServerStatus(Buf, NULL) == 2) {
-		StrBufCutLeft(Buf, 4);
-
-		CfgToken = NewStrBuf();
-		StrBufExtract_token(CfgToken, Buf, 0, '|');
-		Put(Cfg, HKEY("sitepolicy"), CfgToken, HFreeStrBuf);
-
-		CfgToken = NewStrBuf();
-		StrBufExtract_token(CfgToken, Buf, 1, '|');
-		Put(Cfg, HKEY("sitevalue"), CfgToken, HFreeStrBuf);
-	}
-
-	serv_puts("GPEX mailboxes");
-	StrBuf_ServGetln(Buf);
-	if (GetServerStatus(Buf, NULL) == 2) {
-		StrBufCutLeft(Buf, 4);
-
-		CfgToken = NewStrBuf();
-		StrBufExtract_token(CfgToken, Buf, 0, '|');
-		Put(Cfg, HKEY("mboxpolicy"), CfgToken, HFreeStrBuf);
-
-		CfgToken = NewStrBuf();
-		StrBufExtract_token(CfgToken, Buf, 1, '|');
-		Put(Cfg, HKEY("mboxvalue"), CfgToken, HFreeStrBuf);
+	if (strcmp(ChrPtr(Buf), "000")!=0)
+	{
+		/* WHOOOOPSI??? burn the lines we don't understand */
+		while ((len = StrBuf_ServGetln(Buf),
+			strcmp(ChrPtr(Buf), "000"))) {}
+		AppendImportantMessage(_("WARNING: Failed to parse Server Config; do you run a to new citserver?"), -1);
+		return;
 	}
 	FreeStrBuf(&Buf);
+
+	LoadExpirePolicy(sitepolicy);
+	LoadExpirePolicy(mailboxespolicy);
 }
 
 
+
 /**
  * parse siteconfig changes 
  */
@@ -233,10 +304,9 @@ void siteconfig(void)
 	}
         serv_puts("000");
 
-	serv_printf("SPEX site|%d|%d", ibstr("sitepolicy"), ibstr("sitevalue"));
-	serv_getln(buf, sizeof buf);
-	serv_printf("SPEX mailboxes|%d|%d", ibstr("mboxpolicy"), ibstr("mboxvalue"));
-	serv_getln(buf, sizeof buf);
+	SaveExpirePolicyFromHTTP(sitepolicy);
+	SaveExpirePolicyFromHTTP(mailboxespolicy);
+
 	FreeStrBuf(&WCC->serv_info->serv_default_cal_zone);
 	WCC->serv_info->serv_default_cal_zone = NewStrBufDup(sbstr("c_default_cal_zone"));
 
@@ -276,38 +346,42 @@ int ConditionalServCfg(StrBuf *Target, WCTemplputParams *TP)
 		if (TP->Tokens->nParameters == 3) {
 			return 1;
 		}
-		else if (TP->Tokens->Params[3]->Type == TYPE_STR)
-			return (strcmp(TP->Tokens->Params[3]->Start, ChrPtr(Buf)) == 0);
-		else return (StrTol(Buf) == TP->Tokens->Params[3]->lvalue);
+		else if (IS_NUMBER(TP->Tokens->Params[3]->Type))
+			return (StrTol(Buf) == GetTemplateTokenNumber (Target, TP, 3, 0));
+		else
+		{
+			const char *pch;
+			long len;
+			
+			GetTemplateTokenString(Target, TP, 3, &pch, &len);
+		
+			return ((len == StrLength(Buf)) &&
+				(strcmp(pch, ChrPtr(Buf)) == 0));
+		}
+
 	}
 	else return 0;
 }
 
-int ConditionalServCfgSubst(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalServCfgCTXStrBuf(StrBuf *Target, WCTemplputParams *TP)
 {
 	wcsession *WCC = WC;
 	void *vBuf;
 	StrBuf *Buf;
+	StrBuf *ZoneToCheck = (StrBuf*) CTX;
 
-	if (WCC->is_aide) {
+	if ((WCC->is_aide) || (ZoneToCheck == NULL)) {
 		if (WCC->ServCfg == NULL)
 			load_siteconfig();
 		GetHash(WCC->ServCfg, TKEY(2), &vBuf);
 		if (vBuf == NULL) return 0;
 		Buf = (StrBuf*) vBuf;
 
-		return CompareSubstToStrBuf(Buf, TP->Tokens->Params[3]);
+		return strcmp(ChrPtr(Buf), ChrPtr(ZoneToCheck)) == 0;
 	}
 	else return 0;
 }
 
-void CfgZoneTempl(StrBuf *TemplBuffer, WCTemplputParams *TP)
-{
-	StrBuf *Zone = (StrBuf*) CTX;
-
-	SVPutBuf("ZONENAME", Zone, 1);
-}
-
 void 
 InitModule_SITECONFIG
 (void)
@@ -316,8 +390,22 @@ InitModule_SITECONFIG
 
 	RegisterNamespace("SERV:CFG", 1, 2, tmplput_servcfg, NULL, CTX_NONE);
 	RegisterConditional(HKEY("COND:SERVCFG"), 3, ConditionalServCfg, CTX_NONE);
-	RegisterConditional(HKEY("COND:SERVCFG:SUBST"), 4, ConditionalServCfgSubst, CTX_NONE);
-	RegisterIterator("PREF:ZONE", 0, ZoneHash, NULL, CfgZoneTempl, NULL, CTX_PREF, CTX_NONE, IT_NOFLAG);
+	RegisterConditional(HKEY("COND:SERVCFG:CTXSTRBUF"), 4, ConditionalServCfgCTXStrBuf, CTX_STRBUF);
+	RegisterIterator("PREF:ZONE", 0, ZoneHash, NULL, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
+
+	REGISTERTokenParamDefine(roompolicy);
+	REGISTERTokenParamDefine(floorpolicy);
+	REGISTERTokenParamDefine(sitepolicy);
+	REGISTERTokenParamDefine(mailboxespolicy);
+
+	REGISTERTokenParamDefine(EXPIRE_NEXTLEVEL);
+	REGISTERTokenParamDefine(EXPIRE_MANUAL);
+	REGISTERTokenParamDefine(EXPIRE_NUMMSGS);
+	REGISTERTokenParamDefine(EXPIRE_AGE);
+
+	RegisterConditional(HKEY("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);
 }
 
 void