X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fsubst.c;h=7aa54bff8ad451b36691366c016413487941051a;hp=aa8d6665a863a9ef6417f71297cd8a81af9d86cd;hb=b98d9f087b3a24a9549470ab066c2aea187ecfba;hpb=7974c7b863e396a87e1479525a10db9b9cf93ca9

diff --git a/webcit/subst.c b/webcit/subst.c
index aa8d6665a..7aa54bff8 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -43,6 +43,7 @@ const char EmptyStr[]="";
 #define SV_PREEVALUATED 6
 
 
+
 /*
  * Dynamic content for variable substitution in templates
  */
@@ -71,8 +72,13 @@ typedef struct _HashHandler {
 	WCHandlerFunc HandlerFunc;
 }HashHandler;
 
+typedef enum _estate {
+	eNext,
+	eSkipTilEnd
+} TemplState;
+
 void *load_template(StrBuf *Target, WCTemplate *NewTemplate);
-int EvaluateConditional(StrBuf *Target, int Neg, int state, WCTemplputParams *TP);
+int EvaluateConditional(StrBuf *Target, int Neg, int state, WCTemplputParams **TPP);
 
 
 
@@ -83,46 +89,74 @@ typedef struct _SortStruct {
 	CompareFunc Reverse;
 	CompareFunc GroupChange;
 
-	long ContextType;
+	CtxType ContextType;
 }SortStruct;
 
-const char *CtxNames[]  = {
-	"Context NONE",
-	"Context SITECFG",
-	"Context SESSION",
-	"Context INETCFG",
-	"Context VNOTE",
-	"Context WHO",
-	"Context PREF",
-	"Context NODECONF",
-	"Context USERLIST",
-	"Context MAILSUM",
-	"Context MIME_ATACH",
-	"Context FILELIST",
-	"Context STRBUF",
-	"Context STRBUFARR",
-	"Context LONGVECTOR",
-	"Context ROOMS",
-	"Context FLOORS",
-	"Context ITERATE",
-	"Context ICAL",
-	"Context DavNamespace",
-	"Context TAB",
-	"Context VCARD",
-	"Context SIEVE List",
-	"Context SIEVE Script",
-	"Context MailQ-Item",
-	"Context MailQ-Recipient",
-	"Context ServLogStatus",
-	"Context UNKNOWN"
-};
+HashList *CtxList = NULL;
+
+static CtxType CtxCounter = CTX_NONE;
+
+CtxType CTX_STRBUF = CTX_NONE;
+CtxType CTX_STRBUFARR = CTX_NONE;
+CtxType CTX_LONGVECTOR = CTX_NONE;
+
+CtxType CTX_ITERATE = CTX_NONE;
+CtxType CTX_TAB = CTX_NONE;
+
+void HFreeContextType(void *pCtx)
+{
+	CtxTypeStruct *FreeStruct = (CtxTypeStruct *) pCtx;
+	FreeStrBuf(&FreeStruct->Name);
+	free(FreeStruct);
+}
+void PutContextType(const char *name, long len, CtxType TheCtx)
+{
+	CtxTypeStruct *NewStruct;
+
+	NewStruct = (CtxTypeStruct*) malloc(sizeof(CtxTypeStruct));
+	NewStruct->Name = NewStrBufPlain(name, len);
+	NewStruct->Type = TheCtx;
+
+	Put(CtxList, IKEY(NewStruct->Type), NewStruct, HFreeContextType);
+}
+void RegisterContextType(const char *name, long len, CtxType *TheCtx)
+{
+	if (*TheCtx != CTX_NONE)
+		return;
+
+	*TheCtx = ++CtxCounter;
+	PutContextType(name, len, *TheCtx);
+}
+
+CtxTypeStruct *GetContextType(CtxType Type)
+{
+	void *pv = NULL;
+	GetHash(CtxList, IKEY(Type), &pv);
+	return pv;
+}
 
-void StackContext(WCTemplputParams *Super, 
-		  WCTemplputParams *Sub, 
-		  void *Context,
-		  int ContextType,
-		  int nArgs,
-		  WCTemplateToken *Tokens)
+const char *UnknownContext = "CTX_UNKNOWN";
+
+const char *ContextName(CtxType ContextType)
+{
+	CtxTypeStruct *pCtx;
+
+	pCtx = GetContextType(ContextType);
+
+	if (pCtx != NULL) 
+		return ChrPtr(pCtx->Name);
+	else
+		return UnknownContext;
+}
+
+void StackDynamicContext(WCTemplputParams *Super, 
+			 WCTemplputParams *Sub, 
+			 void *Context,
+			 CtxType ContextType,
+			 int nArgs,
+			 WCTemplateToken *Tokens, 
+			 WCConditionalFunc ExitCtx, 
+			 long ExitCTXID)
 {
 	memset(Sub, 0, sizeof(WCTemplputParams));
 
@@ -130,12 +164,16 @@ void StackContext(WCTemplputParams *Super,
 		Sub->Sub = Super->Sub;
 		Super->Sub = Sub;
 	}
+	if (Sub->Sub != NULL)
+		Sub->Sub->Super = Sub;
 	Sub->Super = Super;
 	
 	Sub->Context = Context;
 	Sub->Filter.ContextType = ContextType;
 	Sub->nArgs = nArgs;
 	Sub->Tokens = Tokens;
+	Sub->ExitCtx = ExitCtx;
+	Sub->ExitCTXID = ExitCTXID;
 }
 
 void UnStackContext(WCTemplputParams *Sub)
@@ -144,9 +182,20 @@ void UnStackContext(WCTemplputParams *Sub)
 	{
 		Sub->Super->Sub = Sub->Sub;
 	}
+	if (Sub->Sub != NULL)
+	{
+		Sub->Sub->Super = Sub->Super;
+	}
+}
+void UnStackDynamicContext(StrBuf *Target, WCTemplputParams **TPP)
+{
+	WCTemplputParams *TP = *TPP;
+	WCTemplputParams *Super = TP->Super;
+	TP->ExitCtx(Target, TP);
+	*TPP = Super;
 }
 
-void *GetContextPayload(WCTemplputParams *TP, int ContextType)
+void *GetContextPayload(WCTemplputParams *TP, CtxType ContextType)
 {
 	WCTemplputParams *whichTP = TP;
 
@@ -167,13 +216,6 @@ void DestroySortStruct(void *vSort)
 	free (Sort);
 }
 
-const char *ContextName(int ContextType)
-{
-	if (ContextType < CTX_UNKNOWN)
-		return CtxNames[ContextType];
-	else
-		return CtxNames[CTX_UNKNOWN];
-}
 
 void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplputParams *TP, const char *Format, ...)
 {
@@ -202,7 +244,7 @@ void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplpu
 	}
 	if (TP->Tokens != NULL) 
 	{
-		syslog(1, "%s [%s]  (in '%s' line %ld); %s; [%s]\n", 
+		syslog(LOG_WARNING, "%s [%s]  (in '%s' line %ld); %s; [%s]\n", 
 		       Type, 
 		       Err, 
 		       ChrPtr(TP->Tokens->FileName),
@@ -212,7 +254,7 @@ void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplpu
 	}
 	else 
 	{
-		syslog(1, "%s: %s;\n", 
+		syslog(LOG_WARNING, "%s: %s;\n", 
 		       Type, 
 		       ChrPtr(Error));
 	}
@@ -276,13 +318,10 @@ void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplpu
 	FreeStrBuf(&Error);
 /*
 	if (dbg_backtrace_template_errors)
-		wc_backtrace(); 
+		wc_backtrace(LOG_DEBUG); 
 */
 }
 
-
-
-
 void LogError (StrBuf *Target, const char *Type, const char *Format, ...)
 {
 	wcsession *WCC;
@@ -297,7 +336,7 @@ void LogError (StrBuf *Target, const char *Type, const char *Format, ...)
 	StrBufVAppendPrintf(Error, Format, arg_ptr);
 	va_end(arg_ptr);
 
-	syslog(1, "%s", ChrPtr(Error));
+	syslog(LOG_WARNING, "%s", ChrPtr(Error));
 
 	WCC = WC;
 	if (WCC->WFBuf == NULL) WCC->WFBuf = NewStrBuf();
@@ -311,7 +350,7 @@ void LogError (StrBuf *Target, const char *Type, const char *Format, ...)
 	FreeStrBuf(&Error);
 /*
 	if (dbg_backtrace_template_errors)
-		wc_backtrace(); 
+		wc_backtrace(LOG_DEBUG); 
 */
 }
 
@@ -322,7 +361,7 @@ void RegisterNS(const char *NSName,
 		int nMaxArgs, 
 		WCHandlerFunc HandlerFunc, 
 		WCPreevalFunc PreevalFunc,
-		int ContextRequired)
+		CtxType ContextRequired)
 {
 	HashHandler *NewHandler;
 	
@@ -357,7 +396,7 @@ int CheckContext(StrBuf *Target, ContextFilter *Need, WCTemplputParams *TP, cons
 			return 1;
 
                 LogTemplateError(
-                        Target, ErrType, ERR_PARM1, TP,
+                        Target, ErrType, ERR_NAME, TP,
 			"  WARNING: requires Context: [%s], have [%s]!", 
 			ContextName(Need->ContextType), 
 			ContextName(TP->Filter.ContextType));
@@ -429,6 +468,7 @@ int HaveTemplateTokenString(StrBuf *Target,
 	case TYPE_STR:
 	case TYPE_BSTR:
 	case TYPE_PREFSTR:
+	case TYPE_ROOMPREFSTR:
 	case TYPE_GETTEXT:
 	case TYPE_SUBTEMPLATE:
 		return 1;
@@ -446,7 +486,6 @@ void GetTemplateTokenString(StrBuf *Target,
 			    long *len)
 {
 	StrBuf *Buf;
-///	WCTemplputParams SubTP;
 
 	if (N >= TP->Tokens->nParameters) {
 		LogTemplateError(Target, 
@@ -490,6 +529,19 @@ void GetTemplateTokenString(StrBuf *Target,
 		*Value = ChrPtr(Buf);
 		*len = StrLength(Buf);
 		break;
+	case TYPE_ROOMPREFSTR:
+		if (TP->Tokens->Params[N]->len == 0) {
+			LogTemplateError(Target, 
+					 "TokenParameter", N, TP, 
+					 "Requesting parameter %d; of type PREFSTR, empty lookup string not admitted.", N);
+			*len = 0;
+			*Value = EmptyStr;
+			break;
+		}
+		Buf = get_ROOM_PREFS(TKEY(N));
+		*Value = ChrPtr(Buf);
+		*len = StrLength(Buf);
+		break;
 	case TYPE_LONG:
 		LogTemplateError(Target, 
 				 "TokenParameter", N, TP, 
@@ -538,7 +590,7 @@ long GetTemplateTokenNumber(StrBuf *Target, WCTemplputParams *TP, int N, long df
 		LogTemplateError(Target, 
 				 "TokenParameter", N, TP, 
 				 "invalid token %d. this shouldn't have come till here.\n", N);
-		wc_backtrace(); 
+		wc_backtrace(LOG_DEBUG); 
 		return 0;
 	}
 
@@ -569,6 +621,19 @@ long GetTemplateTokenNumber(StrBuf *Target, WCTemplputParams *TP, int N, long df
 		if (get_PREF_LONG(TKEY(N), &Ret, dflt))
 			return Ret;
 		return 0;
+	case TYPE_ROOMPREFSTR:
+		LogTemplateError(Target, 
+				 "TokenParameter", N, TP, 
+				 "requesting a prefstring in param %d want a number", N);
+		if (TP->Tokens->Params[N]->len == 0) {
+			LogTemplateError(Target, 
+					 "TokenParameter", N, TP, 
+					 "Requesting parameter %d; of type PREFSTR, empty lookup string not admitted.", N);
+			return 0;
+		}
+		if (get_ROOM_PREFS_LONG(TKEY(N), &Ret, dflt))
+			return Ret;
+		return 0;
 	case TYPE_INTDEFINE:
 	case TYPE_LONG:
 		return TP->Tokens->Params[N]->lvalue;
@@ -614,6 +679,7 @@ void StrBufAppendTemplate(StrBuf *Target,
 	char EscapeAs = ' ';
 
 	if ((FormatTypeIndex < TP->Tokens->nParameters) &&
+	    (TP->Tokens->Params[FormatTypeIndex] != NULL) &&
 	    (TP->Tokens->Params[FormatTypeIndex]->Type == TYPE_STR) &&
 	    (TP->Tokens->Params[FormatTypeIndex]->len >= 1)) {
 		pFmt = TP->Tokens->Params[FormatTypeIndex]->Start;
@@ -630,10 +696,10 @@ void StrBufAppendTemplate(StrBuf *Target,
 		break;
 	case 'J':
 		StrECMAEscAppend(Target, Source, NULL);
-	  break;
+		break;
 	case 'K':
 		StrHtmlEcmaEscAppend(Target, Source, NULL, 0, 0);
-	  break;
+		break;
 	case 'U':
 		StrBufUrlescAppend(Target, Source, NULL);
 		break;
@@ -648,6 +714,55 @@ void StrBufAppendTemplate(StrBuf *Target,
 	}
 }
 
+/*
+ * puts string into the template and computes which escape methon we should use
+ * Source = the string we should put into the template
+ * FormatTypeIndex = where should we look for escape types if?
+ */
+void StrBufAppendTemplateStr(StrBuf *Target, 
+			     WCTemplputParams *TP,
+			     const char *Source, int FormatTypeIndex)
+{
+	const char *pFmt = NULL;
+	char EscapeAs = ' ';
+
+	if ((FormatTypeIndex < TP->Tokens->nParameters) &&
+	    (TP->Tokens->Params[FormatTypeIndex]->Type == TYPE_STR) &&
+	    (TP->Tokens->Params[FormatTypeIndex]->len >= 1)) {
+		pFmt = TP->Tokens->Params[FormatTypeIndex]->Start;
+		EscapeAs = *pFmt;
+	}
+
+	switch(EscapeAs)
+	{
+	case 'H':
+		StrEscAppend(Target, NULL, Source, 0, 2);
+		break;
+	case 'X':
+		StrEscAppend(Target, NULL, Source, 0, 0);
+		break;
+	case 'J':
+		StrECMAEscAppend(Target, NULL, Source);
+	  break;
+	case 'K':
+		StrHtmlEcmaEscAppend(Target, NULL, Source, 0, 0);
+	  break;
+	case 'U':
+		StrBufUrlescAppend(Target, NULL, Source);
+		break;
+/*
+	case 'F':
+		if (pFmt != NULL) 	pFmt++;
+		else			pFmt = "JUSTIFY";
+		if (*pFmt == '\0')	pFmt = "JUSTIFY";
+		FmOut(Target, pFmt, Source);
+		break;
+*/
+	default:
+		StrBufAppendBufPlain(Target, Source, -1, 0);
+	}
+}
+
 
 void PutNewToken(WCTemplate *Template, WCTemplateToken *NewToken)
 {
@@ -711,6 +826,14 @@ int GetNextParameter(StrBuf *Buf,
 			ParamBrace = 1;
 		}
 	}
+	else if (*pch == '.') {
+		Parm->Type = TYPE_ROOMPREFSTR;
+		pch ++;
+		if (*pch == '(') {
+			pch ++;
+			ParamBrace = 1;
+		}
+	}
 	else if (*pch == ';') {
 		Parm->Type = TYPE_PREFINT;
 		pch ++;
@@ -764,7 +887,7 @@ int GetNextParameter(StrBuf *Buf,
 		}
 		pche = pch;
 		if (*pch != quote) {
-			syslog(1, "Error (in '%s' line %ld); "
+			syslog(LOG_WARNING, "Error (in '%s' line %ld); "
 				"evaluating template param [%s] in Token [%s]\n",
 				ChrPtr(pTmpl->FileName),
 				Tokens->Line,
@@ -778,8 +901,8 @@ int GetNextParameter(StrBuf *Buf,
 		else {
 			StrBufPeek(Buf, pch, -1, '\0');		
 			if (LoadTemplates > 1) {			
-				syslog(1,
-					"DBG: got param [%s] %d %d\n", 
+				syslog(LOG_DEBUG,
+					"DBG: got param [%s] "SIZE_T_FMT" "SIZE_T_FMT"\n", 
 					pchs, pche - pchs, strlen(pchs)
 				);
 			}
@@ -810,7 +933,7 @@ int GetNextParameter(StrBuf *Buf,
 		else {
 			Parm->lvalue = 0;
 /* TODO whUT?
-			syslog(1, "Error (in '%s' line %ld); "
+			syslog(LOG_DEBUG, "Error (in '%s' line %ld); "
 				"evaluating long template param [%s] in Token [%s]\n",
 				ChrPtr(pTmpl->FileName),
 				Tokens->Line,
@@ -1074,13 +1197,17 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
 				if (Handler->PreEvalFunc != NULL)
 					Handler->PreEvalFunc(NewToken);
 			}
+		} else {
+			LogTemplateError(
+				NULL, "Token ", ERR_NAME, &TP,
+				" isn't known to us.");
 		}
 		break;
 	case SV_GETTEXT:
-		if (NewToken->nParameters !=1) {
+		if ((NewToken->nParameters < 1) || (NewToken->nParameters > 2)) {
 			LogTemplateError(                               
 				NULL, "Gettext", ERR_NAME, &TP,
-				"requires exactly 1 parameter, you gave %d params", 
+				"requires 1 or 2 parameter, you gave %d params", 
 				NewToken->nParameters);
 			NewToken->Flags = 0;
 			break;
@@ -1274,13 +1401,13 @@ void *load_template(StrBuf *Target, WCTemplate *NewTemplate)
 
 	fd = open(ChrPtr(NewTemplate->FileName), O_RDONLY);
 	if (fd <= 0) {
-		syslog(1, "ERROR: could not open template '%s' - %s\n",
+		syslog(LOG_WARNING, "ERROR: could not open template '%s' - %s\n",
 			ChrPtr(NewTemplate->FileName), strerror(errno));
 		return NULL;
 	}
 
 	if (fstat(fd, &statbuf) == -1) {
-		syslog(1, "ERROR: could not stat template '%s' - %s\n",
+		syslog(LOG_WARNING, "ERROR: could not stat template '%s' - %s\n",
 			ChrPtr(NewTemplate->FileName), strerror(errno));
 		return NULL;
 	}
@@ -1288,7 +1415,7 @@ void *load_template(StrBuf *Target, WCTemplate *NewTemplate)
 	NewTemplate->Data = NewStrBufPlain(NULL, statbuf.st_size + 1);
 	if (StrBufReadBLOB(NewTemplate->Data, &fd, 1, statbuf.st_size, &Err) < 0) {
 		close(fd);
-		syslog(1, "ERROR: reading template '%s' - %s<br>\n",
+		syslog(LOG_WARNING, "ERROR: reading template '%s' - %s<br>\n",
 			ChrPtr(NewTemplate->FileName), strerror(errno));
 		return NULL;
 	}
@@ -1399,8 +1526,13 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *big, const StrBuf *BaseKey)
 	{
 		char *MinorPtr;
 
-#ifdef _DIRENT_HAVE_D_NAMELEN
-		d_namelen = filedir_entry->d_namelen;
+#ifdef _DIRENT_HAVE_D_NAMLEN
+		d_namelen = filedir_entry->d_namlen;
+#else
+		d_namelen = strlen(filedir_entry->d_name);
+#endif
+
+#ifdef _DIRENT_HAVE_D_TYPE
 		d_type = filedir_entry->d_type;
 #else
 
@@ -1413,7 +1545,6 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *big, const StrBuf *BaseKey)
 #define IFTODT(mode)   (((mode) & 0170000) >> 12)
 #define DTTOIF(dirtype)        ((dirtype) << 12)
 #endif
-		d_namelen = strlen(filedir_entry->d_name);
 		d_type = DT_UNKNOWN;
 #endif
 		d_without_ext = d_namelen;
@@ -1435,7 +1566,7 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *big, const StrBuf *BaseKey)
 			char path[PATH_MAX];
 			snprintf(path, PATH_MAX, "%s/%s", 
 				 ChrPtr(DirName), filedir_entry->d_name);
-			if (stat(path, &s) == 0) {
+			if (lstat(path, &s) == 0) {
 				d_type = IFTODT(s.st_mode);
 			}
 		}
@@ -1463,7 +1594,7 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *big, const StrBuf *BaseKey)
 			LoadTemplateDir(SubDirectory, big, SubKey);
 
 			break;
-		case DT_LNK: /* TODO: check whether its a file or a directory */
+		case DT_LNK: 
 		case DT_REG:
 
 
@@ -1488,7 +1619,7 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *big, const StrBuf *BaseKey)
 			StrBufAppendBufPlain(Key, filedir_entry->d_name, MinorPtr - filedir_entry->d_name, 0);
 
 			if (LoadTemplates >= 1)
-				syslog(1, "%s %s\n", ChrPtr(FileName), ChrPtr(Key));
+				syslog(LOG_DEBUG, "%s %s\n", ChrPtr(FileName), ChrPtr(Key));
 			prepare_template(FileName, Key, big);
 		default:
 			break;
@@ -1574,15 +1705,16 @@ void InitTemplateCache(void)
  * \param state are we in conditional state?
  * \param ContextType what type of information does context giv us?
  */
-int EvaluateToken(StrBuf *Target, int state, WCTemplputParams *TP)
+int EvaluateToken(StrBuf *Target, int state, WCTemplputParams **TPP)
 {
 	const char *AppendMe;
 	long AppendMeLen;
 	HashHandler *Handler;
 	void *vVar;
+	WCTemplputParams *TP = *TPP;
 	
 /* much output, since pName is not terminated...
-	syslog(1,"Doing token: %s\n",Token->pName);
+	syslog(LOG_DEBUG,"Doing token: %s\n",Token->pName);
 */
 
 	switch (TP->Tokens->Flags) {
@@ -1592,24 +1724,24 @@ int EvaluateToken(StrBuf *Target, int state, WCTemplputParams *TP)
 	case SV_CONDITIONAL: /** Forward conditional evaluation */
 		Handler = (HashHandler*) TP->Tokens->PreEval;
 		if (!CheckContext(Target, &Handler->Filter, TP, "Conditional")) {
-			return -1;
+			return 0;
 		}
-		return EvaluateConditional(Target, 1, state, TP);
+		return EvaluateConditional(Target, 1, state, TPP);
 		break;
 	case SV_NEG_CONDITIONAL: /** Reverse conditional evaluation */
 		Handler = (HashHandler*) TP->Tokens->PreEval;
 		if (!CheckContext(Target, &Handler->Filter, TP, "Conditional")) {
-			return -1;
+			return 0;
 		}
-		return EvaluateConditional(Target, 0, state, TP);
+		return EvaluateConditional(Target, 0, state, TPP);
 		break;
 	case SV_CUST_STR_CONDITIONAL: /** Conditional put custom strings from params */
 		Handler = (HashHandler*) TP->Tokens->PreEval;
 		if (!CheckContext(Target, &Handler->Filter, TP, "Conditional")) {
-			return -1;
+			return 0;
 		}
 		if (TP->Tokens->nParameters >= 6) {
-			if (EvaluateConditional(Target, 0, state, TP)) {
+			if (EvaluateConditional(Target, 0, state, TPP)) {
 				GetTemplateTokenString(Target, TP, 5, &AppendMe, &AppendMeLen);
 				StrBufAppendBufPlain(Target, 
 						     AppendMe, 
@@ -1623,6 +1755,10 @@ int EvaluateToken(StrBuf *Target, int state, WCTemplputParams *TP)
 						     AppendMeLen,
 						     0);
 			}
+			if (*TPP != TP)
+			{
+				UnStackDynamicContext(Target, TPP);
+			}
 		}
 		else  {
 			LogTemplateError(
@@ -1637,7 +1773,7 @@ int EvaluateToken(StrBuf *Target, int state, WCTemplputParams *TP)
 	case SV_PREEVALUATED:
 		Handler = (HashHandler*) TP->Tokens->PreEval;
 		if (!CheckContext(Target, &Handler->Filter, TP, "Token")) {
-			return -1;
+			return 0;
 		}
 		Handler->HandlerFunc(Target, TP);
 		break;		
@@ -1645,7 +1781,7 @@ int EvaluateToken(StrBuf *Target, int state, WCTemplputParams *TP)
 		if (GetHash(GlobalNS, TP->Tokens->pName, TP->Tokens->NameEnd, &vVar)) {
 			Handler = (HashHandler*) vVar;
 			if (!CheckContext(Target, &Handler->Filter, TP, "Token")) {
-				return -1;
+				return 0;
 			}
 			else {
 				Handler->HandlerFunc(Target, TP);
@@ -1666,10 +1802,14 @@ const StrBuf *ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, WCTemplputParams
 {
 	WCTemplate *pTmpl = Tmpl;
 	int done = 0;
-	int i, state;
+	int i;
+	TemplState state;
 	const char *pData, *pS;
 	long len;
 	WCTemplputParams TP;
+	WCTemplputParams *TPtr = &TP;
+
+	memset(TPtr, 0, sizeof(WCTemplputParams));
 
 	memcpy(&TP.Filter, &CallingTP->Filter, sizeof(ContextFilter));
 
@@ -1679,7 +1819,7 @@ const StrBuf *ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, WCTemplputParams
 
 	if (LoadTemplates != 0) {			
 		if (LoadTemplates > 1)
-			syslog(1, "DBG: ----- loading:  [%s] ------ \n", 
+			syslog(LOG_DEBUG, "DBG: ----- loading:  [%s] ------ \n", 
 				ChrPtr(Tmpl->FileName));
 		pTmpl = duplicate_template(Tmpl);
 		if(load_template(Target, pTmpl) == NULL) {
@@ -1696,7 +1836,7 @@ const StrBuf *ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, WCTemplputParams
 	pS = pData = ChrPtr(pTmpl->Data);
 	len = StrLength(pTmpl->Data);
 	i = 0;
-	state = 0;
+	state = eNext;
 	while (!done) {
 		if (i >= pTmpl->nTokensUsed) {
 			StrBufAppendBufPlain(Target, 
@@ -1705,28 +1845,56 @@ const StrBuf *ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, WCTemplputParams
 			done = 1;
 		}
 		else {
+			int TokenRc = 0;
+
 			StrBufAppendBufPlain(
 				Target, pData, 
 				pTmpl->Tokens[i]->pTokenStart - pData, 0);
-			TP.Tokens = pTmpl->Tokens[i];
-			TP.nArgs = pTmpl->Tokens[i]->nParameters;
-			state = EvaluateToken(Target, state, &TP);
+			TPtr->Tokens = pTmpl->Tokens[i];
+			TPtr->nArgs = pTmpl->Tokens[i]->nParameters;
+
+		        TokenRc = EvaluateToken(Target, TokenRc, &TPtr);
+			if (TokenRc > 0)
+			{
+				state = eSkipTilEnd;
+			}
+			else if (TokenRc < 0)
+			{
+				if ((TPtr != &TP) &&
+				    (TPtr->ExitCTXID == -TokenRc))
+				{
+					UnStackDynamicContext(Target, &TPtr);
+				}
+				TokenRc = 0;
+			}
 
-			while ((state != 0) && (i+1 < pTmpl->nTokensUsed)) {
+			while ((state != eNext) && (i+1 < pTmpl->nTokensUsed)) {
 			/* condition told us to skip till its end condition */
 				i++;
-				TP.Tokens = pTmpl->Tokens[i];
-				TP.nArgs = pTmpl->Tokens[i]->nParameters;
+				TPtr->Tokens = pTmpl->Tokens[i];
+				TPtr->nArgs = pTmpl->Tokens[i]->nParameters;
 				if ((pTmpl->Tokens[i]->Flags == SV_CONDITIONAL) ||
-				    (pTmpl->Tokens[i]->Flags == SV_NEG_CONDITIONAL)) {
-					if (state == EvaluateConditional(
-						    Target, 
-						    pTmpl->Tokens[i]->Flags, 
-						    state, 
-						    &TP))
-						state = 0;
+				    (pTmpl->Tokens[i]->Flags == SV_NEG_CONDITIONAL))
+				{
+					int rc;
+				        rc = EvaluateConditional(
+						Target, 
+						pTmpl->Tokens[i]->Flags, 
+						TokenRc, 
+						&TPtr);
+					if (-rc == TokenRc)
+					{
+						TokenRc = 0;
+						state = eNext;
+						if ((TPtr != &TP) &&
+						    (TPtr->ExitCTXID == - rc))
+						{
+							UnStackDynamicContext(Target, &TPtr);
+						}
+					}
 				}
 			}
+
 			pData = pTmpl->Tokens[i++]->pTokenEnd + 1;
 			if (i > pTmpl->nTokensUsed)
 				done = 1;
@@ -1739,6 +1907,8 @@ const StrBuf *ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, WCTemplputParams
 
 }
 
+
+StrBuf *textPlainType;
 /**
  * \brief Display a variable-substituted template
  * \param templatename template file to load
@@ -1763,25 +1933,30 @@ const StrBuf *DoTemplate(const char *templatename, long len, StrBuf *Target, WCT
 
 	if (len == 0)
 	{
-		syslog(1, "Can't to load a template with empty name!\n");
+		syslog(LOG_WARNING, "Can't to load a template with empty name!\n");
 		StrBufAppendPrintf(Target, "<pre>\nCan't to load a template with empty name!\n</pre>");
-		return NULL;
+		return textPlainType;
 	}
 
 	if (!GetHash(StaticLocal, templatename, len, &vTmpl) &&
 	    !GetHash(Static, templatename, len, &vTmpl)) {
-		syslog(1, "didn't find Template [%s] %ld %ld\n", templatename, len , (long)strlen(templatename));
+		StrBuf *escapedString = NewStrBufPlain(NULL, len);
+		
+		StrHtmlEcmaEscAppend(escapedString, NULL, templatename, 1, 1);
+		syslog(LOG_WARNING, "didn't find Template [%s] %ld %ld\n", ChrPtr(escapedString), len , (long)strlen(templatename));
 		StrBufAppendPrintf(Target, "<pre>\ndidn't find Template [%s] %ld %ld\n</pre>", 
-				   templatename, len, 
+				   ChrPtr(escapedString), len, 
 				   (long)strlen(templatename));
+		WC->isFailure = 1;
 #if 0
 		dbg_PrintHash(Static, PrintTemplate, NULL);
 		PrintHash(Static, VarPrintTransition, PrintTemplate);
 #endif
-		return NULL;
+		FreeStrBuf(&escapedString);
+		return textPlainType;
 	}
 	if (vTmpl == NULL) 
-		return NULL;
+		return textPlainType;
 	return ProcessTemplate(vTmpl, Target, TP);
 
 }
@@ -1810,12 +1985,13 @@ void tmplput_Comment(StrBuf *Target, WCTemplputParams *TP)
 typedef struct _HashIterator {
 	HashList *StaticList;
 	int AdditionalParams;
-	int ContextType;
-	int XPectContextType;
+	CtxType ContextType;
+	CtxType XPectContextType;
 	int Flags;
 	RetrieveHashlistFunc GetHash;
 	HashDestructorFunc Destructor;
 	SubTemplFunc DoSubTemplate;
+	FilterByParamFunc Filter;
 } HashIterator;
 
 void RegisterITERATOR(const char *Name, long len, 
@@ -1824,8 +2000,9 @@ void RegisterITERATOR(const char *Name, long len,
 		      RetrieveHashlistFunc GetHash, 
 		      SubTemplFunc DoSubTempl,
 		      HashDestructorFunc Destructor,
-		      int ContextType, 
-		      int XPectContextType, 
+		      FilterByParamFunc Filter,
+		      CtxType ContextType, 
+		      CtxType XPectContextType, 
 		      int Flags)
 {
 	HashIterator *It;
@@ -1837,6 +2014,7 @@ void RegisterITERATOR(const char *Name, long len,
 	It->GetHash = GetHash;
 	It->DoSubTemplate = DoSubTempl;
 	It->Destructor = Destructor;
+	It->Filter = Filter;
 	It->ContextType = ContextType;
 	It->XPectContextType = XPectContextType;
 	It->Flags = Flags;
@@ -1962,7 +2140,7 @@ void tmpl_iterate_subtmpl(StrBuf *Target, WCTemplputParams *TP)
 				/** Ok, its us, lets see in which direction we should sort... */
 				    (havebstr("SortOrder"))) {
 					int SortOrder;
-					SortOrder = LBSTR("SortOrder");
+					SortOrder = lbstr("SortOrder");
 					if (SortOrder != 0)
 						DetectGroupChange = 1;
 				}
@@ -1990,6 +2168,13 @@ void tmpl_iterate_subtmpl(StrBuf *Target, WCTemplputParams *TP)
 		}
 		while (GetNextHashPos(List, it, &Status.KeyLen, &Status.Key, &vContext)) {
 			if ((Status.n >= StartAt) && (Status.n <= StopAt)) {
+
+				if ((It->Filter != NULL) &&
+				    !It->Filter(Status.Key, Status.KeyLen, vContext, Target, TP)) 
+				{
+					continue;
+				}
+
 				if (DetectGroupChange && Status.n > 0) {
 					Status.GroupChange = SortBy->GroupChange(vContext, vLastContext);
 				}
@@ -2068,22 +2253,25 @@ int conditional_ITERATE_LASTN(StrBuf *Target, WCTemplputParams *TP)
 /*-----------------------------------------------------------------------------
  *                      Conditionals
  */
-int EvaluateConditional(StrBuf *Target, int Neg, int state, WCTemplputParams *TP)
+int EvaluateConditional(StrBuf *Target, int Neg, int state, WCTemplputParams **TPP)
 {
 	ConditionalStruct *Cond;
 	int rc = 0;
 	int res;
+	WCTemplputParams *TP = *TPP;
 
 	if ((TP->Tokens->Params[0]->len == 1) &&
 	    (TP->Tokens->Params[0]->Start[0] == 'X'))
-		return (state != 0)?TP->Tokens->Params[1]->lvalue:0;
+	{
+		return - (TP->Tokens->Params[1]->lvalue);
+	}
 	    
 	Cond = (ConditionalStruct *) TP->Tokens->PreEval;
 	if (Cond == NULL) {
 		LogTemplateError(
 			Target, "Conditional", ERR_PARM1, TP,
 			"unknown!");
-		return 1;
+		return 0;
 	}
 
 	if (!CheckContext(Target, &Cond->Filter, TP, "Conditional")) {
@@ -2093,17 +2281,24 @@ int EvaluateConditional(StrBuf *Target, int Neg, int state, WCTemplputParams *TP
 	res = Cond->CondF(Target, TP);
 	if (res == Neg)
 		rc = TP->Tokens->Params[1]->lvalue;
+
 	if (LoadTemplates > 5) 
-		syslog(1, "<%s> : %d %d==%d\n", 
+		syslog(LOG_DEBUG, "<%s> : %d %d==%d\n", 
 			ChrPtr(TP->Tokens->FlatToken), 
 			rc, res, Neg);
+
+	if (TP->Sub != NULL)
+	{
+		*TPP = TP->Sub;
+	}
 	return rc;
 }
 
-void RegisterConditional(const char *Name, long len, 
-			 int nParams,
-			 WCConditionalFunc CondF, 
-			 int ContextRequired)
+void RegisterContextConditional(const char *Name, long len, 
+				int nParams,
+				WCConditionalFunc CondF, 
+				WCConditionalFunc ExitCtxCond,
+				int ContextRequired)
 {
 	ConditionalStruct *Cond;
 
@@ -2113,6 +2308,7 @@ void RegisterConditional(const char *Name, long len,
 	Cond->Filter.nMaxArgs = nParams;
 	Cond->Filter.nMinArgs = nParams;
 	Cond->CondF = CondF;
+	Cond->CondExitCtx = ExitCtxCond;
 	Cond->Filter.ContextType = ContextRequired;
 	Put(Conditionals, Name, len, Cond, NULL);
 }
@@ -2353,9 +2549,6 @@ void tmpl_do_tabbed(StrBuf *Target, WCTemplputParams *TP)
 	}
 	StackContext (TP, &SubTP, &TS, CTX_TAB, 0, NULL);
 	{
-////	TODO jetzt	memcpy (&SubTP, TP, sizeof(WCTemplputParams));
-//		SubTP.Filter.ControlContextType = ;
-
 		StrTabbedDialog(Target, nTabs, TabNames);
 		for (i = 0; i < ntabs; i++) {
 			memset(&TS, 0, sizeof(tab_struct));
@@ -2395,7 +2588,7 @@ void RegisterSortFunc(const char *name, long len,
 		      CompareFunc Forward, 
 		      CompareFunc Reverse, 
 		      CompareFunc GroupChange, 
-		      long ContextType)
+		      CtxType ContextType)
 {
 	SortStruct *NewSort;
 
@@ -2411,7 +2604,7 @@ void RegisterSortFunc(const char *name, long len,
 	NewSort->GroupChange = GroupChange;
 	NewSort->ContextType = ContextType;
 	if (ContextType == CTX_NONE) {
-		syslog(1, "sorting requires a context. CTX_NONE won't make it.\n");
+		syslog(LOG_WARNING, "sorting requires a context. CTX_NONE won't make it.\n");
 		exit(1);
 	}
 		
@@ -2460,7 +2653,7 @@ CompareFunc RetrieveSort(WCTemplputParams *TP,
 			LogTemplateError(
 				NULL, "Sorting", ERR_PARM1, TP,
 				"Illegal default sort: [%s]", Default);
-			wc_backtrace();
+			wc_backtrace(LOG_WARNING);
 		}
 	}
 	SortBy = (SortStruct*)vSortBy;
@@ -2470,7 +2663,7 @@ CompareFunc RetrieveSort(WCTemplputParams *TP,
 
 	/** Ok, its us, lets see in which direction we should sort... */
 	if (havebstr("SortOrder")) {
-		SortOrder = LBSTR("SortOrder");
+		SortOrder = lbstr("SortOrder");
 	}
 	else { /** Try to fallback to our remembered values... */
 		StrBuf *Buf = NULL;
@@ -2562,7 +2755,7 @@ int GetSortMetric(WCTemplputParams *TP, SortStruct **Next, SortStruct **Param, l
 
 	/** Ok, its us, lets see in which direction we should sort... */
 	if (havebstr("SortOrder")) {
-		*SortOrder = LBSTR("SortOrder");
+		*SortOrder = lbstr("SortOrder");
 	}
 	else { /** Try to fallback to our remembered values... */
 		if ((*Param)->PrefPrepend == NULL) {
@@ -2705,7 +2898,7 @@ void dbg_print_longvector(long *LongVector)
 			StrBufAppendPrintf(Buf, "%d: %ld]\n", i, LongVector[i]);
 
 	}
-	syslog(1, "%s", ChrPtr(Buf));
+	syslog(LOG_DEBUG, "%s", ChrPtr(Buf));
 	FreeStrBuf(&Buf);
 }
 
@@ -2751,6 +2944,9 @@ void
 InitModule_SUBST
 (void)
 {
+	RegisterCTX(CTX_TAB);
+	RegisterCTX(CTX_ITERATE);
+
 	memset(&NoCtx, 0, sizeof(WCTemplputParams));
 	RegisterNamespace("--", 0, 2, tmplput_Comment, NULL, CTX_NONE);
 	RegisterNamespace("SORT:ICON", 1, 2, tmplput_SORT_ICON, NULL, CTX_NONE);
@@ -2768,18 +2964,18 @@ InitModule_SUBST
 	RegisterNamespace("LONGVECTOR", 1, 1, tmplput_long_vector, NULL, CTX_LONGVECTOR);
 
 
-	RegisterConditional(HKEY("COND:CONTEXTSTR"), 3, ConditionalContextStr, CTX_STRBUF);
-	RegisterConditional(HKEY("COND:CONTEXTSTRARR"), 4, ConditionalContextStrinArray, CTX_STRBUFARR);
-	RegisterConditional(HKEY("COND:LONGVECTOR"), 4, ConditionalLongVector, CTX_LONGVECTOR);
+	RegisterConditional("COND:CONTEXTSTR", 3, ConditionalContextStr, CTX_STRBUF);
+	RegisterConditional("COND:CONTEXTSTRARR", 4, ConditionalContextStrinArray, CTX_STRBUFARR);
+	RegisterConditional("COND:LONGVECTOR", 4, ConditionalLongVector, CTX_LONGVECTOR);
 
 
-	RegisterConditional(HKEY("COND:ITERATE:ISGROUPCHANGE"), 2, 
+	RegisterConditional("COND:ITERATE:ISGROUPCHANGE", 2, 
 			    conditional_ITERATE_ISGROUPCHANGE, 
 			    CTX_ITERATE);
-	RegisterConditional(HKEY("COND:ITERATE:LASTN"), 2, 
+	RegisterConditional("COND:ITERATE:LASTN", 2, 
 			    conditional_ITERATE_LASTN, 
 			    CTX_ITERATE);
-	RegisterConditional(HKEY("COND:ITERATE:FIRSTN"), 2, 
+	RegisterConditional("COND:ITERATE:FIRSTN", 2, 
 			    conditional_ITERATE_FIRSTN, 
 			    CTX_ITERATE);
 
@@ -2799,14 +2995,21 @@ void
 ServerStartModule_SUBST
 (void)
 {
+	textPlainType = NewStrBufPlain(HKEY("text/plain"));
 	LocalTemplateCache = NewHash(1, NULL);
 	TemplateCache = NewHash(1, NULL);
-
 	GlobalNS = NewHash(1, NULL);
 	Iterators = NewHash(1, NULL);
 	Conditionals = NewHash(1, NULL);
 	SortHash = NewHash(1, NULL);
 	Defines = NewHash(1, NULL);
+	CtxList = NewHash(1, NULL);
+	
+	PutContextType(HKEY("CTX_NONE"), 0);
+
+	RegisterCTX(CTX_STRBUF);
+	RegisterCTX(CTX_STRBUFARR);
+	RegisterCTX(CTX_LONGVECTOR);
 }
 
 void
@@ -2820,14 +3023,17 @@ void
 ServerShutdownModule_SUBST
 (void)
 {
+	FreeStrBuf(&textPlainType);
+
 	DeleteHash(&TemplateCache);
 	DeleteHash(&LocalTemplateCache);
-
+	
 	DeleteHash(&GlobalNS);
 	DeleteHash(&Iterators);
 	DeleteHash(&Conditionals);
 	DeleteHash(&SortHash);
 	DeleteHash(&Defines);
+	DeleteHash(&CtxList);
 }