X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsubst.c;h=cca998a4014eae990d10473cb20ce374f3edc390;hb=5b9736dec3d511d35fb4a86ff913afcf9d7a811c;hp=45af8bf9978bc71cc80708560d439c1fb05c5305;hpb=d3865a3e08f6e62ded13210dccb4da0d26eee532;p=citadel.git

diff --git a/webcit/subst.c b/webcit/subst.c
index 45af8bf99..cca998a40 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -14,6 +14,8 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
+#include <stdarg.h>
+#define SHOW_ME_VAPPEND_PRINTF
 
 #include "webcit.h"
 #include "webserver.h"
@@ -26,9 +28,21 @@ HashList *TemplateCache;
 HashList *LocalTemplateCache;
 
 HashList *GlobalNS;
+HashList *Iterators;
+HashList *Contitionals;
+
+int LoadTemplates = 0;
+
+#define SV_GETTEXT 1
+#define SV_CONDITIONAL 2
+#define SV_NEG_CONDITIONAL 3
+#define SV_CUST_STR_CONDITIONAL 4
+#define SV_SUBTEMPL 5
+#define SV_PREEVALUATED 6
 
 typedef struct _WCTemplate {
 	StrBuf *Data;
+	StrBuf *FileName;
 	int nTokensUsed;
 	int TokenSpace;
 	WCTemplateToken **Tokens;
@@ -37,10 +51,18 @@ typedef struct _WCTemplate {
 typedef struct _HashHandler {
 	int nMinArgs;
 	int nMaxArgs;
+	int ContextRequired;
 	WCHandlerFunc HandlerFunc;
 }HashHandler;
 
-void RegisterNS(const char *NSName, long len, int nMinArgs, int nMaxArgs, WCHandlerFunc HandlerFunc)
+void *load_template(StrBuf *filename, StrBuf *Key, HashList *PutThere);
+
+void RegisterNS(const char *NSName, 
+		long len, 
+		int nMinArgs, 
+		int nMaxArgs, 
+		WCHandlerFunc HandlerFunc, 
+		int ContextRequired)
 {
 	HashHandler *NewHandler;
 	
@@ -48,9 +70,39 @@ void RegisterNS(const char *NSName, long len, int nMinArgs, int nMaxArgs, WCHand
 	NewHandler->nMinArgs = nMinArgs;
 	NewHandler->nMaxArgs = nMaxArgs;
 	NewHandler->HandlerFunc = HandlerFunc;	
+	NewHandler->ContextRequired = ContextRequired;
 	Put(GlobalNS, NSName, len, NewHandler, NULL);
 }
 
+void FreeToken(WCTemplateToken **Token)
+{
+	int i; 
+	FreeStrBuf(&(*Token)->FlatToken);
+	if ((*Token)->HaveParameters) 
+		for (i = 0; i < (*Token)->nParameters; i++)
+			free((*Token)->Params[i]);
+	free(*Token);
+	*Token = NULL;
+}
+
+
+
+void FreeWCTemplate(void *vFreeMe)
+{
+	int i;
+	WCTemplate *FreeMe = (WCTemplate*)vFreeMe;
+
+	if (FreeMe->TokenSpace > 0) {
+		for (i = 0; i < FreeMe->nTokensUsed; i ++) {
+			FreeToken(&FreeMe->Tokens[i]);
+		}
+		free(FreeMe->Tokens);
+	}
+	FreeStrBuf(&FreeMe->FileName);
+	FreeStrBuf(&FreeMe->Data);
+	free(FreeMe);
+}
+
 
 /**
  * \brief debugging function to print array to log
@@ -67,10 +119,10 @@ void VarPrintEntry(const char *Key, void *vSubst, int odd)
 
 	switch(ptr->wcs_type) {
 	case WCS_STRING:
-		lprintf(1, "  -> %s\n", ptr->wcs_value);
+		lprintf(1, "  -> %s\n", ChrPtr(ptr->wcs_value));
 		break;
 	case WCS_SERVCMD:
-		lprintf(1, "  -> Server [%s]\n", ptr->wcs_value);
+		lprintf(1, "  -> Server [%s]\n", ChrPtr(ptr->wcs_value));
 		break;
 	case WCS_FUNCTION:
 		lprintf(1, "  -> function at [%0xd]\n", ptr->wcs_function);
@@ -88,7 +140,6 @@ void VarPrintEntry(const char *Key, void *vSubst, int odd)
 void clear_substs(struct wcsession *wc) {
 
 	if (wc->vars != NULL) {
-	
 		DeleteHash(&wc->vars);
 	}
 }
@@ -100,19 +151,99 @@ void clear_local_substs(void) {
 	clear_substs (WC);
 }
 
+int NeedNewBuf(type)
+{
+	switch(type) {
+	case WCS_STRING:
+	case WCS_SERVCMD:
+	case WCS_STRBUF:
+		return 1;
+	case WCS_FUNCTION:
+	case WCS_STRBUF_REF:
+	case WCS_LONG:
+	default:
+		return 0;
+	}
+}
+
+void FlushPayload(wcsubst *ptr, int reusestrbuf, int type)
+{
+	int NeedNew = NeedNewBuf(type);
+	switch(ptr->wcs_type) {
+	case WCS_STRING:
+	case WCS_SERVCMD:
+	case WCS_STRBUF:
+		if (reusestrbuf && NeedNew) {
+			FlushStrBuf(ptr->wcs_value);
+		}
+		else {
+			
+			FreeStrBuf(&ptr->wcs_value);
+			ptr->wcs_value = NULL;
+		}
+		break;
+	case WCS_FUNCTION:
+		ptr->wcs_function = NULL;
+		if (reusestrbuf && NeedNew)
+			ptr->wcs_value = NewStrBuf();
+		break;
+	case WCS_STRBUF_REF:
+		ptr->wcs_value = NULL;
+		if (reusestrbuf && NeedNew)
+			ptr->wcs_value = NewStrBuf();
+		break;
+	case WCS_LONG:
+		ptr->lvalue = 0;
+		if (reusestrbuf && NeedNew)
+			ptr->wcs_value = NewStrBuf();
+		break;
+	default:
+		if (reusestrbuf && NeedNew)
+			ptr->wcs_value = NewStrBuf();
+		break;
+	}
+}
+
+
 /**
  * \brief destructor; kill one entry.
  */
 void deletevar(void *data)
 {
 	wcsubst *ptr = (wcsubst*)data;
-//		if ((wc->vars->wcs_type == WCS_STRING)
-//		   || (wc->vars->wcs_type == WCS_SERVCMD)) {
-	if (ptr->wcs_type != WCS_FUNCTION)
-		free(ptr->wcs_value);
+	FlushPayload(ptr, 0, ptr->wcs_type);
 	free(ptr);	
 }
 
+
+wcsubst *NewSubstVar(const char *keyname, int keylen, int type)
+{
+	wcsubst* ptr;
+	struct wcsession *WCC = WC;
+
+	ptr = (wcsubst *) malloc(sizeof(wcsubst));
+	memset(ptr, 0, sizeof(wcsubst));
+
+	ptr->wcs_type = type;
+	safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
+	Put(WCC->vars, keyname, keylen, ptr,  deletevar);
+
+	switch(ptr->wcs_type) {
+	case WCS_STRING:
+	case WCS_SERVCMD:
+		ptr->wcs_value = NewStrBuf();
+		break;
+	case WCS_STRBUF:
+	case WCS_FUNCTION:
+	case WCS_STRBUF_REF:
+	case WCS_LONG:
+	default:
+		break;
+	}
+	return ptr;
+}
+
+
 /**
  * \brief Add a substitution variable (local to this session) (strlen version...)
  * \param keyname the replacementstring to substitute
@@ -123,7 +254,6 @@ void deletevar(void *data)
 void SVPRINTF(char *keyname, int keytype, const char *format,...)
 {
 	va_list arg_ptr;
-	char wbuf[SIZ];
 	void *vPtr;
 	wcsubst *ptr = NULL;
 	size_t keylen;
@@ -137,25 +267,18 @@ void SVPRINTF(char *keyname, int keytype, const char *format,...)
 	/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
 	if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
 		ptr = (wcsubst*)vPtr;
-		if (ptr->wcs_value != NULL)
-			free(ptr->wcs_value);
+		FlushPayload(ptr, keytype, keytype);
+		ptr->wcs_type = keytype;
 	}
 	else 	/** Otherwise allocate a new one */
 	{
-		ptr = (wcsubst *) malloc(sizeof(wcsubst));
-		safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
-		Put(WCC->vars, keyname, keylen, ptr,  deletevar);
+		ptr = NewSubstVar(keyname, keylen, keytype);
 	}
 
-	/** Format the string and save it */
-
+	/** Format the string */
 	va_start(arg_ptr, format);
-	vsnprintf(wbuf, sizeof wbuf, format, arg_ptr);
+	StrBufVAppendPrintf(ptr->wcs_value, format, arg_ptr);
 	va_end(arg_ptr);
-
-	ptr->wcs_function = NULL;
-	ptr->wcs_type = keytype;
-	ptr->wcs_value = strdup(wbuf);
 }
 
 /**
@@ -168,12 +291,10 @@ void SVPRINTF(char *keyname, int keytype, const char *format,...)
 void svprintf(char *keyname, size_t keylen, int keytype, const char *format,...)
 {
 	va_list arg_ptr;
-	char wbuf[SIZ];
 	void *vPtr;
 	wcsubst *ptr = NULL;
 	struct wcsession *WCC = WC;
-	size_t len;
-	
+		
 	/**
 	 * First look if we're doing a replacement of
 	 * an existing key
@@ -181,26 +302,18 @@ void svprintf(char *keyname, size_t keylen, int keytype, const char *format,...)
 	/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
 	if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
 		ptr = (wcsubst*)vPtr;
-		if (ptr->wcs_value != NULL)
-			free(ptr->wcs_value);
+		FlushPayload(ptr, 1, keytype);
+		ptr->wcs_type = keytype;
 	}
 	else 	/** Otherwise allocate a new one */
 	{
-		ptr = (wcsubst *) malloc(sizeof(wcsubst));
-		safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
-		Put(WCC->vars, keyname, keylen, ptr,  deletevar);
+		ptr = NewSubstVar(keyname, keylen, keytype);
 	}
 
 	/** Format the string and save it */
-
 	va_start(arg_ptr, format);
-	len = vsnprintf(wbuf, sizeof wbuf, format, arg_ptr);
+	StrBufVAppendPrintf(ptr->wcs_value, format, arg_ptr);
 	va_end(arg_ptr);
-
-	ptr->wcs_value = (char*) malloc(len + 1);
-	memcpy(ptr->wcs_value, wbuf, len + 1);
-	ptr->wcs_function = NULL;
-	ptr->wcs_type = keytype;
 }
 
 /**
@@ -224,19 +337,45 @@ void SVPut(char *keyname, size_t keylen, int keytype, char *Data)
 	/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
 	if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
 		ptr = (wcsubst*)vPtr;
-		if (ptr->wcs_value != NULL)
-			free(ptr->wcs_value);
+		FlushPayload(ptr, 1, keytype);
+		ptr->wcs_type = keytype;
 	}
 	else 	/** Otherwise allocate a new one */
 	{
-		ptr = (wcsubst *) malloc(sizeof(wcsubst));
-		safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
-		Put(WCC->vars, keyname, keylen, ptr,  deletevar);
+		ptr = NewSubstVar(keyname, keylen, keytype);
 	}
+	StrBufAppendBufPlain(ptr->wcs_value, Data, -1, 0);
+}
+
+/**
+ * \brief Add a substitution variable (local to this session)
+ * \param keyname the replacementstring to substitute
+ * \param keytype the kind of the key
+ * \param format the format string ala printf
+ * \param ... the arguments to substitute in the formatstring
+ */
+void SVPutLong(char *keyname, size_t keylen, long Data)
+{
+	void *vPtr;
+	wcsubst *ptr = NULL;
+	struct wcsession *WCC = WC;
 
-	ptr->wcs_function = NULL;
-	ptr->wcs_type = keytype;
-	ptr->wcs_value = strdup(Data);
+	
+	/**
+	 * First look if we're doing a replacement of
+	 * an existing key
+	 */
+	/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
+	if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
+		ptr = (wcsubst*)vPtr;
+		FlushPayload(ptr, 1, WCS_LONG);
+		ptr->wcs_type = WCS_LONG;
+	}
+	else 	/** Otherwise allocate a new one */
+	{
+		ptr = NewSubstVar(keyname, keylen, WCS_LONG);
+	}
+	ptr->lvalue = Data;
 }
 
 /**
@@ -244,7 +383,7 @@ void SVPut(char *keyname, size_t keylen, int keytype, char *Data)
  * \param keyname the keystring to substitute
  * \param fcn_ptr the function callback to give the substitution string
  */
-void SVCallback(char *keyname, size_t keylen, var_callback_fptr fcn_ptr)
+void SVCallback(char *keyname, size_t keylen, WCHandlerFunc fcn_ptr)
 {
 	wcsubst *ptr;
 	void *vPtr;
@@ -257,48 +396,68 @@ void SVCallback(char *keyname, size_t keylen, var_callback_fptr fcn_ptr)
 	/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
 	if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
 		ptr = (wcsubst*)vPtr;
-		if (ptr->wcs_value != NULL)
-			free(ptr->wcs_value);
+		FlushPayload(ptr, 1, WCS_FUNCTION);
+		ptr->wcs_type = WCS_FUNCTION;
 	}
 	else 	/** Otherwise allocate a new one */
 	{
-		ptr = (wcsubst *) malloc(sizeof(wcsubst));
-		safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
-		Put(WCC->vars, keyname, keylen, ptr,  deletevar);
+		ptr = NewSubstVar(keyname, keylen, WCS_FUNCTION);
 	}
 
-	ptr->wcs_value = NULL;
-	ptr->wcs_type = WCS_FUNCTION;
 	ptr->wcs_function = fcn_ptr;
 }
-inline void SVCALLBACK(char *keyname, var_callback_fptr fcn_ptr)
+inline void SVCALLBACK(char *keyname, WCHandlerFunc fcn_ptr)
 {
 	SVCallback(keyname, strlen(keyname), fcn_ptr);
 }
 
 
 
+void SVPUTBuf(const char *keyname, int keylen, const StrBuf *Buf, int ref)
+{
+	wcsubst *ptr;
+	void *vPtr;
+	struct wcsession *WCC = WC;
+
+	/**
+	 * First look if we're doing a replacement of
+	 * an existing key
+	 */
+	/*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
+	if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
+		ptr = (wcsubst*)vPtr;
+		FlushPayload(ptr, 0, (ref)?WCS_STRBUF_REF:WCS_STRBUF);
+		ptr->wcs_type = (ref)?WCS_STRBUF_REF:WCS_STRBUF;
+	}
+	else 	/** Otherwise allocate a new one */
+	{
+		ptr = NewSubstVar(keyname, keylen, (ref)?WCS_STRBUF_REF:WCS_STRBUF);
+	}
+	ptr->wcs_value = (StrBuf*)Buf;
+}
+
 /**
  * \brief back end for print_value_of() ... does a server command
  * \param servcmd server command to execute on the citadel server
  */
-void pvo_do_cmd(char *servcmd) {
+void pvo_do_cmd(StrBuf *Target, StrBuf *servcmd) {
 	char buf[SIZ];
+	int len;
 
-	serv_puts(servcmd);
-	serv_getln(buf, sizeof buf);
+	serv_puts(ChrPtr(servcmd));
+	len = serv_getln(buf, sizeof buf);
 
 	switch(buf[0]) {
 		case '2':
 		case '3':
 		case '5':
-			wprintf("%s\n", &buf[4]);
+			StrBufAppendPrintf(Target, "%s\n", &buf[4]);
 			break;
 		case '1':
-			fmout("CENTER");
+			_fmout(Target, "CENTER");
 			break;
 		case '4':
-			wprintf("%s\n", &buf[4]);
+			StrBufAppendPrintf(Target, "%s\n", &buf[4]);
 			serv_puts("000");
 			break;
 	}
@@ -308,33 +467,112 @@ void pvo_do_cmd(char *servcmd) {
  * \brief Print the value of a variable
  * \param keyname get a key to print
  */
-void print_value_of(const char *keyname, size_t keylen) {
+void print_value_of(StrBuf *Target, WCTemplateToken *Token, void *Context, int ContextType) {
 	struct wcsession *WCC = WC;
 	wcsubst *ptr;
-	void *fcn();
 	void *vVar;
 
 	/*if (WCC->vars != NULL) PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
-	if (keyname[0] == '=') {
-		DoTemplate(keyname+1, keylen - 1);
+	/// TODO: debricated!
+	if (Token->pName[0] == '=') {
+		DoTemplate(Token->pName+1, Token->NameEnd - 1, NULL, NULL, 0);
 	}
+
+//////TODO: if param[1] == "U" -> urlescape
+/// X -> escputs
 	/** Page-local variables */
-	if ((WCC->vars!= NULL) && GetHash(WCC->vars, keyname, keylen, &vVar)) {
+	if ((WCC->vars!= NULL) && GetHash(WCC->vars, Token->pName, Token->NameEnd, &vVar)) {
+		ptr = (wcsubst*) vVar;
+		switch(ptr->wcs_type) {
+		case WCS_STRING:
+			StrBufAppendBuf(Target, ptr->wcs_value, 0);
+			break;
+		case WCS_SERVCMD:
+			pvo_do_cmd(Target, ptr->wcs_value);
+			break;
+		case WCS_FUNCTION:
+			(*ptr->wcs_function) (Target, Token->nParameters, Token, Context, ContextType);
+			break;
+		case WCS_STRBUF:
+		case WCS_STRBUF_REF:
+			StrBufAppendBuf(Target, ptr->wcs_value, 0);
+			break;
+		case WCS_LONG:
+			StrBufAppendPrintf(Target, "%ld", ptr->lvalue);
+			break;
+		default:
+			lprintf(1,"WARNING: invalid value in SV-Hash at %s!\n", Token->pName);
+			StrBufAppendPrintf(Target, "<pre>WARNING: \ninvalid value in SV-Hash at %s!\n</pre>", Token->pName);
+		}
+	}
+}
+
+int CompareSubstToToken(TemplateParam *ParamToCompare, TemplateParam *ParamToLookup)
+{
+	struct wcsession *WCC = WC;
+	wcsubst *ptr;
+	void *vVar;
+
+	if ((WCC->vars!= NULL) && GetHash(WCC->vars, ParamToLookup->Start, 
+					  ParamToLookup->len, &vVar)) {
 		ptr = (wcsubst*) vVar;
 		switch(ptr->wcs_type) {
 		case WCS_STRING:
-			wprintf("%s", (const char*)ptr->wcs_value);
+		case WCS_STRBUF:
+		case WCS_STRBUF_REF:
+			if (ParamToCompare->Type == TYPE_STR)
+				return ((ParamToCompare->len == StrLength(ptr->wcs_value)) &&
+					(strcmp(ParamToCompare->Start, ChrPtr(ptr->wcs_value)) == 0));
+			else
+				return ParamToCompare->lvalue == StrTol(ptr->wcs_value);
 			break;
 		case WCS_SERVCMD:
-			pvo_do_cmd(ptr->wcs_value);
+			return 1; 
 			break;
 		case WCS_FUNCTION:
-			(*ptr->wcs_function) ();
+			return 1;
+		case WCS_LONG:
+			if (ParamToCompare->Type == TYPE_STR)
+				return 0;
+			else 
+				return ParamToCompare->lvalue == ptr->lvalue;
 			break;
 		default:
-			lprintf(1,"WARNING: invalid value in SV-Hash at %s!", keyname);
+			lprintf(1,"WARNING: invalid value in SV-Hash at %s!\n", 
+				ParamToLookup->Start);
 		}
 	}
+	return 0;
+}
+
+int CompareSubstToStrBuf(StrBuf *Compare, TemplateParam *ParamToLookup)
+{
+	struct wcsession *WCC = WC;
+	wcsubst *ptr;
+	void *vVar;
+
+	if ((WCC->vars!= NULL) && GetHash(WCC->vars, ParamToLookup->Start, 
+					  ParamToLookup->len, &vVar)) {
+		ptr = (wcsubst*) vVar;
+		switch(ptr->wcs_type) {
+		case WCS_STRING:
+		case WCS_STRBUF:
+		case WCS_STRBUF_REF:
+			return ((StrLength(Compare) == StrLength(ptr->wcs_value)) &&
+				(strcmp(ChrPtr(Compare), ChrPtr(ptr->wcs_value)) == 0));
+		case WCS_SERVCMD:
+			return 1; 
+			break;
+		case WCS_FUNCTION:
+			return 1;
+		case WCS_LONG:
+			return StrTol(Compare) == ptr->lvalue;
+		default:
+			lprintf(1,"WARNING: invalid value in SV-Hash at %s!\n", 
+				ParamToLookup->Start);
+		}
+	}
+	return 0;
 }
 
 
@@ -352,7 +590,7 @@ void PutNewToken(WCTemplate *Template, WCTemplateToken *NewToken)
 				sizeof(WCTemplateToken*) * 
 				Template->TokenSpace * 2);
 			memcpy(NewTokens, Template->Tokens, 
-			       sizeof(WCTemplateToken) * Template->nTokensUsed);
+			       sizeof(WCTemplateToken*) * Template->nTokensUsed);
 			free(Template->Tokens);
 			Template->TokenSpace *= 2;
 			Template->Tokens = NewTokens;
@@ -361,7 +599,7 @@ void PutNewToken(WCTemplate *Template, WCTemplateToken *NewToken)
 	Template->Tokens[(Template->nTokensUsed)++] = NewToken;
 }
 
-TemplateParam *GetNextParamter(StrBuf *Buf, const char **pCh, const char *pe)
+TemplateParam *GetNextParameter(StrBuf *Buf, const char **pCh, const char *pe, WCTemplateToken *Token, WCTemplate *pTmpl)
 {
 	const char *pch = *pCh;
 	const char *pchs, *pche;
@@ -389,13 +627,22 @@ TemplateParam *GetNextParamter(StrBuf *Buf, const char **pCh, const char *pe)
 		}
 		pche = pch;
 		if (*pch != quote) {
-			lprintf(1, "Error evaluating template param [%s]\n", *pCh);
+			lprintf(1, "Error (in '%s' line %ld); "
+				"evaluating template param [%s] in Token [%s]\n",
+				ChrPtr(pTmpl->FileName),
+				Token->Line,
+				ChrPtr(Token->FlatToken),
+				*pCh);
 			pch ++;
 			free(Parm);
 			return NULL;
 		}
 		else {
 			StrBufPeek(Buf, pch, -1, '\0');		
+			if (LoadTemplates > 1) {			
+				lprintf(1, "DBG: got param [%s] %ld %ld\n", 
+					pchs, pche - pchs, strlen(pchs));
+			}
 			Parm->Start = pchs;
 			Parm->len = pche - pchs;
 			pch ++; /* move after trailing quote */
@@ -418,7 +665,12 @@ TemplateParam *GetNextParamter(StrBuf *Buf, const char **pCh, const char *pe)
 		}
 		else {
 			Parm->lvalue = 0;
-			lprintf(1, "Error evalating template long param [%s]", *pCh);
+			lprintf(1, "Error (in '%s' line %ld); "
+				"evaluating long template param [%s] in Token [%s]\n",
+				ChrPtr(pTmpl->FileName),
+				Token->Line,
+				ChrPtr(Token->FlatToken),
+				*pCh);
 			free(Parm);
 			return NULL;
 		}
@@ -426,6 +678,7 @@ TemplateParam *GetNextParamter(StrBuf *Buf, const char **pCh, const char *pe)
 	while ((*pch == ' ' )||
 	       (*pch == '\t')||
 	       (*pch == '\r')||
+	       (*pch == ',' )||
 	       (*pch == '\n')) pch ++;
 
 	*pCh = pch;
@@ -435,18 +688,23 @@ TemplateParam *GetNextParamter(StrBuf *Buf, const char **pCh, const char *pe)
 WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf, 
 				       const char *pStart, 
 				       const char *pTmplStart, 
-				       const char *pTmplEnd)
+				       const char *pTmplEnd, 
+				       long Line,
+				       WCTemplate *pTmpl)
 {
 	const char *pch;
 	TemplateParam *Param;
 	WCTemplateToken *NewToken = (WCTemplateToken*)malloc(sizeof(WCTemplateToken));
 
-	NewToken->IsGettext = 0;
+	NewToken->Flags = 0;
+	NewToken->Line = Line + 1;
 	NewToken->pTokenStart = pTmplStart;
 	NewToken->TokenStart = pTmplStart - pStart;
 	NewToken->TokenEnd =  (pTmplEnd - pStart) - NewToken->TokenStart;
 	NewToken->pTokenEnd = pTmplEnd;
 	NewToken->NameEnd = NewToken->TokenEnd - 2;
+	NewToken->PreEval = NULL;
+	NewToken->FlatToken = NewStrBufPlain(pTmplStart + 2, pTmplEnd - pTmplStart - 2);
 	
 	StrBufPeek(Buf, pTmplStart, + 1, '\0');
 	StrBufPeek(Buf, pTmplEnd, -1, '\0');
@@ -455,17 +713,24 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
 	NewToken->HaveParameters = 0;;
 	NewToken->nParameters = 0;
 
-	while (pch <= pTmplEnd - 1) {
+	while (pch < pTmplEnd - 1) {
 		if (*pch == '(') {
 			StrBufPeek(Buf, pch, -1, '\0');
 			NewToken->NameEnd = pch - NewToken->pName;
 			pch ++;
-			while (pch <= pTmplEnd - 1) {
-				Param = GetNextParamter(Buf, &pch, pTmplEnd - 1);
+			while (pch < pTmplEnd - 1) {
+				Param = GetNextParameter(Buf, &pch, pTmplEnd - 1, NewToken, pTmpl);
 				if (Param != NULL) {
 					NewToken->HaveParameters = 1;
 					if (NewToken->nParameters > MAXPARAM) {
-						lprintf(1, "Only %ld Tokens supported!\n", MAXPARAM);
+						lprintf(1, "Error (in '%s' line %ld); "
+							"only [%ld] Params allowed in Tokens [%s]\n",
+							ChrPtr(pTmpl->FileName),
+							NewToken->Line,
+							MAXPARAM,
+							ChrPtr(NewToken->FlatToken));
+						free(Param);
+						FreeToken(&NewToken);
 						return NULL;
 					}
 					NewToken->Params[NewToken->nParameters++] = Param;
@@ -473,85 +738,319 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
 				else break;
 			}
 			if((NewToken->NameEnd == 1) &&
-			   (NewToken->HaveParameters == 1) && 
-			   (NewToken->nParameters == 1) &&
-			   (*(NewToken->pName) == '_'))
-				NewToken->IsGettext = 1;
+			   (NewToken->HaveParameters == 1))
+			   
+			{
+				if ((NewToken->nParameters == 1) &&
+				    (*(NewToken->pName) == '_'))
+					NewToken->Flags = SV_GETTEXT;
+				else if ((NewToken->nParameters == 1) &&
+					 (*(NewToken->pName) == '='))
+					NewToken->Flags = SV_SUBTEMPL;
+				else if ((NewToken->nParameters >= 2) &&
+					 (*(NewToken->pName) == '%'))
+					NewToken->Flags = SV_CUST_STR_CONDITIONAL;
+				else if ((NewToken->nParameters >= 2) &&
+					 (*(NewToken->pName) == '?'))
+					NewToken->Flags = SV_CONDITIONAL;
+				else if ((NewToken->nParameters >=2) &&
+					 (*(NewToken->pName) == '!'))
+					NewToken->Flags = SV_NEG_CONDITIONAL;
+			}
 		}
 		else pch ++;		
 	}
+	
+	if (NewToken->Flags == 0) {
+		/* If we're able to find out more about the token, do it now while its fresh. */
+		void *vVar;
+		if (GetHash(GlobalNS, NewToken->pName, NewToken->NameEnd, &vVar)) {
+			HashHandler *Handler;
+			Handler = (HashHandler*) vVar;
+			if ((NewToken->nParameters < Handler->nMinArgs) || 
+			    (NewToken->nParameters > Handler->nMaxArgs)) {
+				lprintf(1, "Handler [%s] (in '%s' line %ld); "
+					"doesn't work with %ld params [%s]\n", 
+					NewToken->pName,
+					ChrPtr(pTmpl->FileName),
+					NewToken->Line,
+					NewToken->nParameters, 
+					ChrPtr(NewToken->FlatToken));
+			}
+			else {
+				NewToken->PreEval = Handler;
+				NewToken->Flags = SV_PREEVALUATED;		
+			}
+		}		
+	}
+
 	return NewToken;
 }
 
-void FreeWCTemplate(void *vFreeMe)
-{
-	int i;
-	WCTemplate *FreeMe = (WCTemplate*)vFreeMe;
 
-	if (FreeMe->TokenSpace > 0) {
-		for (i = 0; i < FreeMe->nTokensUsed; i ++) {
-			free(FreeMe->Tokens[i]);
-		}
-		free(FreeMe->Tokens);
+
+int EvaluateConditional(StrBuf *Target, WCTemplateToken *Token, WCTemplate *pTmpl, void *Context, int Neg, int state, int ContextType)
+{
+	void *vConditional = NULL;
+	ConditionalStruct *Cond;
+
+	if ((Token->Params[0]->len == 1) &&
+	    (Token->Params[0]->Start[0] == 'X'))
+		return (state != 0)?Token->Params[1]->lvalue:0;
+
+	if (!GetHash(Contitionals, 
+		 Token->Params[0]->Start,
+		 Token->Params[0]->len,
+		 &vConditional) || 
+	    (vConditional == NULL)) {
+		lprintf(1, "Conditional [%s] (in '%s' line %ld); Not found![%s]\n", 
+			Token->Params[0]->Start,
+			ChrPtr(pTmpl->FileName),
+			Token->Line,
+			ChrPtr(Token->FlatToken));
+		StrBufAppendPrintf(
+			Target, 
+			"<pre>\nConditional [%s] (in '%s' line %ld); Not found!\n[%s]\n</pre>\n", 
+			Token->Params[0]->Start,
+			ChrPtr(pTmpl->FileName),
+			Token->Line,
+			ChrPtr(Token->FlatToken));
+		return 0;
 	}
-	free(FreeMe);
+	    
+	Cond = (ConditionalStruct *) vConditional;
+
+	if (Token->nParameters < Cond->nParams) {
+		lprintf(1, "Conditional [%s] (in '%s' line %ld); needs %ld Params![%s]\n", 
+			Token->Params[0]->Start,
+			ChrPtr(pTmpl->FileName),
+			Token->Line,
+			Cond->nParams,
+			ChrPtr(Token->FlatToken));
+		StrBufAppendPrintf(
+			Target, 
+			"<pre>\nConditional [%s] (in '%s' line %ld); needs %ld Params!\n[%s]\n</pre>\n", 
+			Token->Params[0]->Start,
+			ChrPtr(pTmpl->FileName),
+			Token->Line,
+			Cond->nParams,
+			ChrPtr(Token->FlatToken));
+		return 0;
+	}
+	if (Cond->CondF(Token, Context, ContextType) == Neg)
+		return Token->Params[1]->lvalue;
+	return 0;
 }
 
-void EvaluateToken(StrBuf *Target, WCTemplateToken *Token)
+int EvaluateToken(StrBuf *Target, WCTemplateToken *Token, WCTemplate *pTmpl, void *Context, int state, int ContextType)
 {
+	HashHandler *Handler;
 	void *vVar;
 // much output, since pName is not terminated...
 //	lprintf(1,"Doing token: %s\n",Token->pName);
-	if (Token->IsGettext)
+
+	switch (Token->Flags) {
+	case SV_GETTEXT:
 		TmplGettext(Target, Token->nParameters, Token);
-	else if (GetHash(GlobalNS, Token->pName, Token->NameEnd, &vVar)) {
-		HashHandler *Handler;
-		Handler = (HashHandler*) vVar;
-		if ((Token->nParameters < Handler->nMinArgs) || 
-		    (Token->nParameters < Handler->nMaxArgs)) {
-			lprintf(1, "Handler [%s] doesn't work with %ld params", 
+		break;
+	case SV_CONDITIONAL: /** Forward conditional evaluation */
+		return EvaluateConditional(Target, Token, pTmpl, Context, 1, state, ContextType);
+		break;
+	case SV_NEG_CONDITIONAL: /** Reverse conditional evaluation */
+		return EvaluateConditional(Target, Token, pTmpl, Context, 0, state, ContextType);
+		break;
+	case SV_CUST_STR_CONDITIONAL: /** Conditional put custom strings from params */
+		if (Token->nParameters >= 6) {
+			if (EvaluateConditional(Target, Token, pTmpl, Context, 0, state, ContextType))
+				StrBufAppendBufPlain(Target, 
+						     Token->Params[5]->Start,
+						     Token->Params[5]->len,
+						     0);
+			else
+				StrBufAppendBufPlain(Target, 
+						     Token->Params[4]->Start,
+						     Token->Params[4]->len,
+						     0);
+		}
+		break;
+	case SV_SUBTEMPL:
+		if (Token->nParameters == 1)
+			DoTemplate(Token->Params[0]->Start, Token->Params[0]->len, NULL, NULL, ContextType);
+		break;
+	case SV_PREEVALUATED:
+		Handler = (HashHandler*) Token->PreEval;
+		if ((Handler->ContextRequired != CTX_NONE) &&
+		    (Handler->ContextRequired != ContextType)) {
+			lprintf(1, "Handler [%s] (in '%s' line %ld); "
+				"requires context of type %ld, have %ld [%s]\n", 
 				Token->pName,
-				Token->nParameters);
+				ChrPtr(pTmpl->FileName),
+				Token->Line,
+				Handler->ContextRequired, 
+				ContextType,
+				ChrPtr(Token->FlatToken));
+			StrBufAppendPrintf(
+				Target, 
+				"<pre>\nHandler [%s] (in '%s' line %ld);"
+				" requires context of type %ld, have %ld!\n[%s]\n</pre>\n", 
+				Token->pName,
+				ChrPtr(pTmpl->FileName),
+				Token->Line,
+				Handler->ContextRequired, 
+				ContextType,
+				ChrPtr(Token->FlatToken));
+			return -1;
+
+		}
+		Handler->HandlerFunc(Target, 
+				     Token->nParameters,
+				     Token,
+				     Context, 
+				     ContextType); 
+		break;		
+	default:
+		if (GetHash(GlobalNS, Token->pName, Token->NameEnd, &vVar)) {
+			Handler = (HashHandler*) vVar;
+			if ((Handler->ContextRequired != CTX_NONE) &&
+			    (Handler->ContextRequired != ContextType)) {
+				lprintf(1, "Handler [%s] (in '%s' line %ld); "
+					"requires context of type %ld, have %ld [%s]\n", 
+					Token->pName,
+					ChrPtr(pTmpl->FileName),
+					Token->Line,
+					Handler->ContextRequired, 
+					ContextType,
+					ChrPtr(Token->FlatToken));
+				StrBufAppendPrintf(
+					Target, 
+					"<pre>\nHandler [%s] (in '%s' line %ld);"
+					" requires context of type %ld, have %ld!\n[%s]\n</pre>\n", 
+					Token->pName,
+					ChrPtr(pTmpl->FileName),
+					Token->Line,
+					Handler->ContextRequired, 
+					ContextType,
+					ChrPtr(Token->FlatToken));
+				return -1;
+			}
+			else if ((Token->nParameters < Handler->nMinArgs) || 
+				 (Token->nParameters > Handler->nMaxArgs)) {
+				lprintf(1, "Handler [%s] (in '%s' line %ld); "
+					"doesn't work with %ld params [%s]\n", 
+					Token->pName,
+					ChrPtr(pTmpl->FileName),
+					Token->Line,
+					Token->nParameters, 
+					ChrPtr(Token->FlatToken));
+				StrBufAppendPrintf(
+					Target, 
+					"<pre>\nHandler [%s] (in '%s' line %ld);"
+					" doesn't work with %ld params!\n[%s]\n</pre>\n", 
+					Token->pName,
+					ChrPtr(pTmpl->FileName),
+					Token->Line,
+					Token->nParameters,
+					ChrPtr(Token->FlatToken));
+			}
+			else {
+				Handler->HandlerFunc(Target, 
+						     Token->nParameters,
+						     Token,
+						     Context, 
+						     ContextType); /*TODO: subset of that */
+				
+			}
 		}
 		else {
-			Handler->HandlerFunc(Target, 
-					     Token->nParameters,
-					     &Token); /*TODO: subset of that */
-		
-			
+			print_value_of(Target, Token, Context, ContextType);
 		}
 	}
-	else {
-		print_value_of(Token->pName, Token->NameEnd);
-	}
+	return 0;
 }
 
-void ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target)
+void ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, void *Context, int ContextType)
 {
+	WCTemplate *pTmpl = Tmpl;
 	int done = 0;
-	int i;
+	int i, state;
 	const char *pData, *pS;
 	long len;
 
-	pS = pData = ChrPtr(Tmpl->Data);
-	len = StrLength(Tmpl->Data);
+	if (LoadTemplates != 0) {			
+		if (LoadTemplates > 1)
+			lprintf(1, "DBG: ----- loading:  [%s] ------ \n", 
+				ChrPtr(Tmpl->FileName));
+		pTmpl = load_template(Tmpl->FileName, NULL, NULL);
+		if(pTmpl == NULL) {
+			StrBufAppendPrintf(
+				Target, 
+				"<pre>\nError loading Template [%s]\n See Logfile for details\n</pre>\n", 
+				ChrPtr(Tmpl->FileName));
+			return;
+		}
+
+	}
+
+	pS = pData = ChrPtr(pTmpl->Data);
+	len = StrLength(pTmpl->Data);
 	i = 0;
+	state = 0;
 	while (!done) {
-		if (i >= Tmpl->nTokensUsed) {
-			StrBufAppendBufPlain(Target, pData, len, 0);
+		if (i >= pTmpl->nTokensUsed) {
+			StrBufAppendBufPlain(Target, 
+					     pData, 
+					     len - (pData - pS), 0);
 			done = 1;
 		}
 		else {
 			StrBufAppendBufPlain(
 				Target, pData, 
-				Tmpl->Tokens[i]->pTokenStart - pData, 0);
-			EvaluateToken(Target, Tmpl->Tokens[i]);
-			pData = Tmpl->Tokens[i++]->pTokenEnd + 1;
+				pTmpl->Tokens[i]->pTokenStart - pData, 0);
+			state = EvaluateToken(Target, pTmpl->Tokens[i], pTmpl, Context, state, ContextType);
+			while ((state != 0) && (i+1 < pTmpl->nTokensUsed)) {
+			/* condition told us to skip till its end condition */
+				i++;
+				if ((pTmpl->Tokens[i]->Flags == SV_CONDITIONAL) ||
+				    (pTmpl->Tokens[i]->Flags == SV_NEG_CONDITIONAL)) {
+					if (state == EvaluateConditional(
+						    Target,
+						    pTmpl->Tokens[i], 
+						    pTmpl,
+						    Context, 
+						    pTmpl->Tokens[i]->Flags,
+						    state, 
+						    ContextType))
+						state = 0;
+				}
+			}
+			pData = pTmpl->Tokens[i++]->pTokenEnd + 1;
+			if (i > pTmpl->nTokensUsed)
+				done = 1;
 		}
 	}
+	if (LoadTemplates != 0) {
+		FreeWCTemplate(pTmpl);
+	}
 }
 
 
+/**
+ * \brief Display a variable-substituted template
+ * \param templatename template file to load
+ */
+void *prepare_template(StrBuf *filename, StrBuf *Key, HashList *PutThere)
+{
+	WCTemplate *NewTemplate;
+	NewTemplate = (WCTemplate *) malloc(sizeof(WCTemplate));
+	NewTemplate->Data = NULL;
+	NewTemplate->FileName = NewStrBufDup(filename);
+	NewTemplate->nTokensUsed = 0;
+	NewTemplate->TokenSpace = 0;
+	NewTemplate->Tokens = NULL;
+
+	Put(PutThere, ChrPtr(Key), StrLength(Key), NewTemplate, FreeWCTemplate);
+	return NewTemplate;
+}
 
 /**
  * \brief Display a variable-substituted template
@@ -562,6 +1061,7 @@ void *load_template(StrBuf *filename, StrBuf *Key, HashList *PutThere)
 	int fd;
 	struct stat statbuf;
 	const char *pS, *pE, *pch, *Err;
+	long Line;
 	int pos;
 	WCTemplate *NewTemplate;
 
@@ -580,6 +1080,7 @@ void *load_template(StrBuf *filename, StrBuf *Key, HashList *PutThere)
 
 	NewTemplate = (WCTemplate *) malloc(sizeof(WCTemplate));
 	NewTemplate->Data = NewStrBufPlain(NULL, statbuf.st_size);
+	NewTemplate->FileName = NewStrBufDup(filename);
 	NewTemplate->nTokensUsed = 0;
 	NewTemplate->TokenSpace = 0;
 	NewTemplate->Tokens = NULL;
@@ -592,20 +1093,26 @@ void *load_template(StrBuf *filename, StrBuf *Key, HashList *PutThere)
 	}
 	close(fd);
 
+	Line = 0;
 	pS = pch = ChrPtr(NewTemplate->Data);
 	pE = pS + StrLength(NewTemplate->Data);
 	while (pch < pE) {
 		const char *pts, *pte;
 		int InQuotes = 0;
 		int InDoubleQuotes = 0;
+
+		/** Find one <? > */
 		pos = (-1);
 		for (; pch < pE; pch ++) {
 			if ((*pch=='<')&&(*(pch + 1)=='?'))
 				break;
+			if (*pch=='\n') Line ++;
 		}
 		if (pch >= pE)
 			continue;
 		pts = pch;
+
+		/** Found one? parse it. */
 		for (; pch < pE - 1; pch ++) {
 			if (*pch == '"')
 				InDoubleQuotes = ! InDoubleQuotes;
@@ -621,23 +1128,37 @@ void *load_template(StrBuf *filename, StrBuf *Key, HashList *PutThere)
 			continue;
 		pte = pch;
 		PutNewToken(NewTemplate, 
-			    NewTemplateSubstitute(NewTemplate->Data, pS, pts, pte));
+			    NewTemplateSubstitute(NewTemplate->Data, pS, pts, pte, Line, NewTemplate));
 		pch ++;
 	}
-	Put(PutThere, ChrPtr(Key), StrLength(Key), NewTemplate, FreeWCTemplate);
+	if (LoadTemplates == 0)
+		Put(PutThere, ChrPtr(Key), StrLength(Key), NewTemplate, FreeWCTemplate);
 	return NewTemplate;
 }
 
+
+///void PrintTemplate(const char *Key, void *vSubst, int odd)
+const char* PrintTemplate(void *vSubst)
+{
+	WCTemplate *Tmpl = vSubst;
+
+	return ChrPtr(Tmpl->FileName);
+
+}
+
+
 /**
  * \brief Display a variable-substituted template
  * \param templatename template file to load
  */
-void DoTemplate(const char *templatename, long len) 
+void DoTemplate(const char *templatename, long len, StrBuf *Target, void *Context, int ContextType) 
 {
 	HashList *Static;
 	HashList *StaticLocal;
 	void *vTmpl;
-
+	
+	if (Target == NULL)
+		Target = WC->WBuf;
 	if (WC->is_mobile) {
 		Static = WirelessTemplateCache;
 		StaticLocal = WirelessLocalTemplateCache;
@@ -647,14 +1168,26 @@ void DoTemplate(const char *templatename, long len)
 		StaticLocal = LocalTemplateCache;
 	}
 
+	if (len == 0)
+	{
+		lprintf (1, "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;
+	}
+
 	if (!GetHash(StaticLocal, templatename, len, &vTmpl) &&
 	    !GetHash(Static, templatename, len, &vTmpl)) {
-		printf ("didn't find %s\n", templatename);
+		lprintf (1, "didn't find Template [%s] %ld %ld\n", templatename, len , (long)strlen(templatename));
+		StrBufAppendPrintf(Target, "<pre>\ndidn't find Template [%s] %ld %ld\n</pre>", 
+				   templatename, len, 
+				   (long)strlen(templatename));
+///		dbg_PrintHash(Static, PrintTemplate, NULL);
+//		PrintHash(Static, VarPrintTransition, PrintTemplate);
 		return;
 	}
 	if (vTmpl == NULL) 
 		return;
-	ProcessTemplate(vTmpl, WC->WBuf);	
+	ProcessTemplate(vTmpl, Target, Context, ContextType);
 }
 
 int LoadTemplateDir(const char *DirName, HashList *wireless, HashList *big)
@@ -672,6 +1205,7 @@ int LoadTemplateDir(const char *DirName, HashList *wireless, HashList *big)
 	StrBufPrintf(Dir, "%s/t", DirName);
 	filedir = opendir (ChrPtr(Dir));
 	if (filedir == NULL) {
+		FreeStrBuf(&Dir);
 		return 0;
 	}
 
@@ -691,6 +1225,8 @@ int LoadTemplateDir(const char *DirName, HashList *wireless, HashList *big)
 			d_without_ext --;
 		if ((d_without_ext == 0) || (d_namelen < 3))
 			continue;
+		if ((d_namelen > 1) && filedir_entry->d_name[d_namelen - 1] == '~')
+			continue; /* Ignore backup files... */
 
 		IsMobile = (strstr(filedir_entry->d_name, ".m.html")!= NULL);
 		PStart = filedir_entry->d_name;
@@ -701,8 +1237,11 @@ int LoadTemplateDir(const char *DirName, HashList *wireless, HashList *big)
 		StrBufPlain(Tag, filedir_entry->d_name, MinorPtr - filedir_entry->d_name);
 
 
-		printf("%s %d %s\n",ChrPtr(FileName), IsMobile, ChrPtr(Tag));
-		load_template(FileName, Tag, (IsMobile)?wireless:big);		
+		lprintf(1, "%s %d %s\n",ChrPtr(FileName), IsMobile, ChrPtr(Tag));
+		if (LoadTemplates == 0)
+			load_template(FileName, Tag, (IsMobile)?wireless:big);
+		else
+			prepare_template(FileName, Tag, (IsMobile)?wireless:big);
 	}
 	closedir(filedir);
 	FreeStrBuf(&FileName);
@@ -721,66 +1260,288 @@ void InitTemplateCache(void)
 			LocalTemplateCache);
 }
 
-void tmplput_serv_ip(StrBuf *Target, int nArgs, WCTemplateToken **Tokens)
+void tmplput_serv_ip(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
 	StrBufAppendPrintf(Target, "%d", WC->ctdl_pid);
 }
 
-void tmplput_serv_nodename(StrBuf *Target, int nArgs, WCTemplateToken **Tokens)
+void tmplput_serv_nodename(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
-	escputs(serv_info.serv_nodename); ////TODO: respcect Target
+	StrEscAppend(Target, NULL, serv_info.serv_nodename, 0, 0);
 }
 
-void tmplput_serv_humannode(StrBuf *Target, int nArgs, WCTemplateToken **Tokens)
+void tmplput_serv_humannode(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
-	escputs(serv_info.serv_humannode);////TODO: respcect Target
+	StrEscAppend(Target, NULL, serv_info.serv_humannode, 0, 0);
 }
 
-void tmplput_serv_fqdn(StrBuf *Target, int nArgs, WCTemplateToken **Tokens)
+void tmplput_serv_fqdn(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
-	escputs(serv_info.serv_fqdn);////TODO: respcect Target
+	StrEscAppend(Target, NULL, serv_info.serv_fqdn, 0, 0);
 }
 
-void tmmplput_serv_software(StrBuf *Target, int nArgs, WCTemplateToken **Tokens)
+void tmmplput_serv_software(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
-	escputs(serv_info.serv_software);////TODO: respcect Target
+	StrEscAppend(Target, NULL, serv_info.serv_software, 0, 0);
 }
 
-void tmplput_serv_rev_level(StrBuf *Target, int nArgs, WCTemplateToken **Tokens)
+void tmplput_serv_rev_level(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
 	StrBufAppendPrintf(Target, "%d.%02d",
 			    serv_info.serv_rev_level / 100,
 			    serv_info.serv_rev_level % 100);
 }
 
-void tmmplput_serv_bbs_city(StrBuf *Target, int nArgs, WCTemplateToken **Tokens)
+void tmmplput_serv_bbs_city(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
-	escputs(serv_info.serv_bbs_city);////TODO: respcect Target
+	StrEscAppend(Target, NULL, serv_info.serv_bbs_city, 0, 0);
 }
 
-void tmplput_current_user(StrBuf *Target, int nArgs, WCTemplateToken **Tokens)
+void tmplput_current_user(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
-	escputs(WC->wc_fullname);////TODO: respcect Target
+	StrEscAppend(Target, NULL, WC->wc_fullname, 0, 0);
 }
 
-void tmplput_current_room(StrBuf *Target, int nArgs, WCTemplateToken **Tokens)
+void tmplput_current_room(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
-	escputs(WC->wc_roomname);////TODO: respcect Target
+	StrEscAppend(Target, NULL, WC->wc_roomname, 0, 0);
+}
+
+
+typedef struct _HashIterator {
+	HashList *StaticList;
+	int AdditionalParams;
+	int ContextType;
+	RetrieveHashlistFunc GetHash;
+	HashDestructorFunc Destructor;
+	SubTemplFunc DoSubTemplate;
+} HashIterator;
+
+void tmpl_iterate_subtmpl(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+	void *vIt;
+	HashIterator *It;
+	HashList *List;
+	HashPos  *it;
+	long len; 
+	const char *Key;
+	void *vContext;
+	StrBuf *SubBuf;
+	int oddeven = 0;
+	
+	if (!GetHash(Iterators, 
+		     Tokens->Params[0]->Start,
+		     Tokens->Params[0]->len,
+		     &vIt)) {
+		lprintf(1, "unknown Iterator [%s] (in line %ld); "
+			" [%s]\n", 
+			Tokens->Params[0]->Start,
+			Tokens->Line,
+			ChrPtr(Tokens->FlatToken));
+		StrBufAppendPrintf(
+			Target,
+			"<pre>\nunknown Iterator [%s] (in line %ld); \n"
+			" [%s]\n</pre>", 
+			Tokens->Params[0]->Start,
+			Tokens->Line,
+			ChrPtr(Tokens->FlatToken));
+		return;
+	}
+
+	It = (HashIterator*) vIt;
+
+	if (Tokens->nParameters < It->AdditionalParams + 2) {
+		lprintf(1, "Iterator [%s] (in line %ld); "
+			"doesn't work with %ld params [%s]\n", 
+			Tokens->Params[0]->Start,
+			Tokens->Line,
+			Tokens->nParameters, 
+			ChrPtr(Tokens->FlatToken));
+		StrBufAppendPrintf(
+			Target,
+			"<pre>Iterator [%s] \n(in line %ld);\n"
+			"doesn't work with %ld params \n[%s]\n</pre>", 
+			Tokens->Params[0]->Start,
+			Tokens->Line,
+			Tokens->nParameters, 
+			ChrPtr(Tokens->FlatToken));
+		return;
+	}
+
+	if (It->StaticList == NULL)
+		List = It->GetHash(Target, nArgs, Tokens, Context, ContextType);
+	else
+		List = It->StaticList;
+
+	SubBuf = NewStrBuf();
+	it = GetNewHashPos();
+	while (GetNextHashPos(List, it, &len, &Key, &vContext)) {
+		svprintf(HKEY("ITERATE:ODDEVEN"), WCS_STRING, "%s", 
+			 (oddeven) ? "odd" : "even");
+		svprintf(HKEY("ITERATE:KEY"), WCS_STRING, "%s", Key);
+
+		if (It->DoSubTemplate != NULL)
+			It->DoSubTemplate(SubBuf, vContext, Tokens);
+		DoTemplate(Tokens->Params[1]->Start,
+			   Tokens->Params[1]->len,
+			   SubBuf, vContext,
+			   It->ContextType);
+			
+		StrBufAppendBuf(Target, SubBuf, 0);
+		FlushStrBuf(SubBuf);
+		oddeven = ~ oddeven;
+	}
+	FreeStrBuf(&SubBuf);
+	DeleteHashPos(&it);
+	if (It->Destructor != NULL)
+		It->Destructor(&List);
+}
+
+int ConditionalVar(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+	void *vsubst;
+	wcsubst *subst;
+	
+	if (!GetHash(WC->vars, 
+		     Tokens->Params[2]->Start,
+		     Tokens->Params[2]->len,
+		     &vsubst))
+		return 0;
+	subst = (wcsubst*) vsubst;
+	if ((subst->ContextRequired != CTX_NONE) &&
+	    (subst->ContextRequired != ContextType)) {
+		lprintf(1,"  WARNING: Conditional requires Context: [%ld]!\n", Tokens->Params[2]->Start);
+		return -1;
+	}
+
+	switch(subst->wcs_type) {
+	case WCS_FUNCTION:
+		return (subst->wcs_function!=NULL);
+	case WCS_SERVCMD:
+		lprintf(1, "  -> Server [%s]\n", subst->wcs_value);////todo
+		return 1;
+	case WCS_STRING:
+	case WCS_STRBUF:
+	case WCS_STRBUF_REF:
+		if (Tokens->nParameters < 4)
+			return 1;
+		return (strcmp(Tokens->Params[3]->Start, ChrPtr(subst->wcs_value)) == 0);
+	case WCS_LONG:
+		if (Tokens->nParameters < 4)
+			return (subst->lvalue != 0);
+		return (subst->lvalue == Tokens->Params[3]->lvalue);
+	default:
+		lprintf(1,"  WARNING: invalid type: [%ld]!\n", subst->wcs_type);
+		return -1;
+	}
+	return 0;
+}
+
+void RegisterITERATOR(const char *Name, long len, 
+		      int AdditionalParams, 
+		      HashList *StaticList, 
+		      RetrieveHashlistFunc GetHash, 
+		      SubTemplFunc DoSubTempl,
+		      HashDestructorFunc Destructor,
+		      int ContextType)
+{
+	HashIterator *It = (HashIterator*)malloc(sizeof(HashIterator));
+	It->StaticList = StaticList;
+	It->AdditionalParams = AdditionalParams;
+	It->GetHash = GetHash;
+	It->DoSubTemplate = DoSubTempl;
+	It->Destructor = Destructor;
+	It->ContextType = ContextType;
+	Put(Iterators, Name, len, It, NULL);
+}
+
+void RegisterConditional(const char *Name, long len, 
+			 int nParams,
+			 WCConditionalFunc CondF, 
+			 int ContextRequired)
+{
+	ConditionalStruct *Cond = (ConditionalStruct*)malloc(sizeof(ConditionalStruct));
+	Cond->nParams = nParams;
+	Cond->CondF = CondF;
+	Cond->ContextRequired = ContextRequired;
+	Put(Contitionals, Name, len, Cond, NULL);
+}
+
+void tmpl_do_boxed(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+	if (nArgs == 2) {
+		StrBuf *Headline = NewStrBuf();
+		DoTemplate(Tokens->Params[1]->Start, 
+			   Tokens->Params[1]->len,
+			   Headline, 
+			   Context, 
+			   ContextType);
+		SVPutBuf("BOXTITLE", Headline, 0);
+	}
+	
+	DoTemplate(HKEY("beginbox"), Target, Context, ContextType);
+	DoTemplate(Tokens->Params[0]->Start, 
+		   Tokens->Params[0]->len,
+		   Target, 
+		   Context, 
+		   ContextType);
+	DoTemplate(HKEY("endbox"), Target, Context, ContextType);
+}
+
+void tmpl_do_tabbed(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+	StrBuf **TabNames;
+	int i, ntabs, nTabs;
+
+	nTabs = ntabs = Tokens->nParameters / 2;
+	TabNames = (StrBuf **) malloc(ntabs * sizeof(StrBuf*));
+
+	for (i = 0; i < ntabs; i++) {
+		TabNames[i] = NewStrBuf();
+		if (Tokens->Params[i * 2]->len > 0) {
+			DoTemplate(Tokens->Params[i * 2]->Start, 
+				   Tokens->Params[i * 2]->len,
+				   TabNames[i],
+				   Context,
+				   ContextType);
+		}
+		else { 
+			/** A Tab without subject? we can't count that, add it as silent */
+			nTabs --;
+		}
+	}
+
+	StrTabbedDialog(Target, nTabs, TabNames);
+	for (i = 0; i < ntabs; i++) {
+		StrBeginTab(Target, i, nTabs);
+
+		DoTemplate(Tokens->Params[i * 2 + 1]->Start, 
+			   Tokens->Params[i * 2 + 1]->len,
+			   Target,
+			   Context, 
+			   ContextType);
+		StrEndTab(Target, i, nTabs);
+	}
 }
 
 void 
 InitModule_SUBST
 (void)
 {
-	RegisterNS(HKEY("SERV_PID"), 0, 0, tmplput_serv_ip);
-	RegisterNS(HKEY("SERV_NODENAME"), 0, 0, tmplput_serv_nodename);
-	RegisterNS(HKEY("SERV_HUMANNODE"), 0, 0, tmplput_serv_humannode);
-	RegisterNS(HKEY("SERV_FQDN"), 0, 0, tmplput_serv_fqdn);
-	RegisterNS(HKEY("SERV_SOFTWARE"), 0, 0, tmmplput_serv_software);
-	RegisterNS(HKEY("SERV_REV_LEVEL"), 0, 0, tmplput_serv_rev_level);
-	RegisterNS(HKEY("SERV_BBS_CITY"), 0, 0, tmmplput_serv_bbs_city);
-	RegisterNS(HKEY("CURRENT_USER"), 0, 0, tmplput_current_user);
-	RegisterNS(HKEY("CURRENT_ROOM"), 0, 0, tmplput_current_room);
+	RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, CTX_NONE);
+	RegisterNamespace("SERV:NODENAME", 0, 0, tmplput_serv_nodename, CTX_NONE);
+	RegisterNamespace("SERV:HUMANNODE", 0, 0, tmplput_serv_humannode, CTX_NONE);
+	RegisterNamespace("SERV:FQDN", 0, 0, tmplput_serv_fqdn, CTX_NONE);
+	RegisterNamespace("SERV:SOFTWARE", 0, 0, tmmplput_serv_software, CTX_NONE);
+	RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, CTX_NONE);
+	RegisterNamespace("SERV:BBS_CITY", 0, 0, tmmplput_serv_bbs_city, CTX_NONE);
+///	RegisterNamespace("SERV:LDAP_SUPP", 0, 0, tmmplput_serv_ldap_enabled, 0);
+	RegisterNamespace("CURRENT_USER", 0, 0, tmplput_current_user, CTX_NONE);
+	RegisterNamespace("CURRENT_ROOM", 0, 0, tmplput_current_room, CTX_NONE);
+	RegisterNamespace("ITERATE", 2, 100, tmpl_iterate_subtmpl, CTX_NONE);
+	RegisterNamespace("DOBOXED", 1, 2, tmpl_do_boxed, CTX_NONE);
+	RegisterNamespace("DOTABBED", 2, 100, tmpl_do_tabbed, CTX_NONE);
+	RegisterConditional(HKEY("COND:SUBST"), 3, ConditionalVar, CTX_NONE);
 }
 
 /*@}*/