X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsubst.c;h=ab4edce38692746f02a8a89f06cd0ab4ba8f9637;hb=01dab5c387efaa597377d1264e832474f30a754b;hp=a4200f8230c2fe7b413697e4a1cf42d5538cefad;hpb=3b520412e78975f14eb993f513f590d7b3c5ceb1;p=citadel.git

diff --git a/webcit/subst.c b/webcit/subst.c
index a4200f823..ab4edce38 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -679,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;
@@ -695,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;
@@ -758,7 +759,7 @@ void StrBufAppendTemplateStr(StrBuf *Target,
 		break;
 */
 	default:
-		StrBufAppendBufPlain(Target, Source, 0, 0);
+		StrBufAppendBufPlain(Target, Source, -1, 0);
 	}
 }
 
@@ -1526,8 +1527,7 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *big, const StrBuf *BaseKey)
 		char *MinorPtr;
 
 #ifdef _DIRENT_HAVE_D_NAMLEN
-		d_namelen = filedir_entry->d_namelen;
-
+		d_namelen = filedir_entry->d_namlen;
 #else
 		d_namelen = strlen(filedir_entry->d_name);
 #endif
@@ -1984,6 +1984,7 @@ typedef struct _HashIterator {
 	RetrieveHashlistFunc GetHash;
 	HashDestructorFunc Destructor;
 	SubTemplFunc DoSubTemplate;
+	FilterByParamFunc Filter;
 } HashIterator;
 
 void RegisterITERATOR(const char *Name, long len, 
@@ -1992,6 +1993,7 @@ void RegisterITERATOR(const char *Name, long len,
 		      RetrieveHashlistFunc GetHash, 
 		      SubTemplFunc DoSubTempl,
 		      HashDestructorFunc Destructor,
+		      FilterByParamFunc Filter,
 		      CtxType ContextType, 
 		      CtxType XPectContextType, 
 		      int Flags)
@@ -2005,6 +2007,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;
@@ -2158,6 +2161,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);
 				}