X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsubst.c;h=e76044f48b5619685c8bff4bc3e4e084e831ee92;hb=f4b016bdea7281682d9031c905e0f9ae4c92f685;hp=fd72242b2f7c37cfce01b6d399b13bc70326666f;hpb=972cd0d4d4784a16ba6c30ed1348266ca452cbfa;p=citadel.git

diff --git a/webcit/subst.c b/webcit/subst.c
index fd72242b2..e76044f48 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -1907,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
@@ -1933,23 +1935,28 @@ const StrBuf *DoTemplate(const char *templatename, long len, StrBuf *Target, WCT
 	{
 		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(LOG_WARNING, "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);
 
 }
@@ -2133,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;
 				}
@@ -2235,10 +2242,20 @@ int conditional_ITERATE_FIRSTN(StrBuf *Target, WCTemplputParams *TP)
 	return Ctx->n == 0;
 }
 
+int conditional_ITERATE_ISMOD(StrBuf *Target, WCTemplputParams *TP)
+{
+	IterateStruct *Ctx = CTX(CTX_ITERATE);
+	
+	return Ctx->n == 0;
+}
+
 int conditional_ITERATE_LASTN(StrBuf *Target, WCTemplputParams *TP)
 {
 	IterateStruct *Ctx = CTX(CTX_ITERATE);
-	return Ctx->LastN;
+
+	long divisor = GetTemplateTokenNumber(Target, TP, 2, 1);
+	long expectRemainder = GetTemplateTokenNumber(Target, TP, 2, 1);
+	return Ctx->n % divisor == expectRemainder;
 }
 
 
@@ -2656,7 +2673,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;
@@ -2748,7 +2765,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) {
@@ -2971,6 +2988,9 @@ InitModule_SUBST
 	RegisterConditional("COND:ITERATE:FIRSTN", 2, 
 			    conditional_ITERATE_FIRSTN, 
 			    CTX_ITERATE);
+	RegisterConditional("COND:ITERATE:ISMOD", 3, 
+			    conditional_ITERATE_ISMOD, 
+			    CTX_ITERATE);
 
 	RegisterNamespace("ITERATE:ODDEVEN", 0, 0, tmplput_ITERATE_ODDEVEN, NULL, CTX_ITERATE);
 	RegisterNamespace("ITERATE:KEY", 0, 0, tmplput_ITERATE_KEY, NULL, CTX_ITERATE);
@@ -2988,9 +3008,9 @@ 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);
@@ -3016,9 +3036,11 @@ void
 ServerShutdownModule_SUBST
 (void)
 {
+	FreeStrBuf(&textPlainType);
+
 	DeleteHash(&TemplateCache);
 	DeleteHash(&LocalTemplateCache);
-
+	
 	DeleteHash(&GlobalNS);
 	DeleteHash(&Iterators);
 	DeleteHash(&Conditionals);