From 3d947db0b6329cb24a060da0a923830e0ccce9f5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Wed, 18 Aug 2010 18:29:59 +0000
Subject: [PATCH] * add a comment token '--', whichs content will show up in
 the output if -T is active * fix typo

---
 webcit/subst.c     | 24 +++++++++++++++++++++---
 webcit/webserver.c |  4 ++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/webcit/subst.c b/webcit/subst.c
index ed060b173..2bcb8949f 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -34,7 +34,7 @@ HashList *Defines;
 
 int DumpTemplateI18NStrings = 0;
 int LoadTemplates = 0;
-int dbg_bactrace_template_errors = 0;
+int dbg_backtrace_template_errors = 0;
 WCTemplputParams NoCtx;
 StrBuf *I18nDump = NULL;
 
@@ -238,7 +238,7 @@ void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplpu
 	FreeStrBuf(&Info);
 	FreeStrBuf(&Error);
 /*
-	if (dbg_bactrace_template_errors)
+	if (dbg_backtrace_template_errors)
 		wc_backtrace(); 
 */
 }
@@ -273,7 +273,7 @@ void LogError (StrBuf *Target, const char *Type, const char *Format, ...)
 	FreeStrBuf(&Info);
 	FreeStrBuf(&Error);
 /*
-	if (dbg_bactrace_template_errors)
+	if (dbg_backtrace_template_errors)
 		wc_backtrace(); 
 */
 }
@@ -2166,6 +2166,23 @@ const StrBuf *DoTemplate(const char *templatename, long len, StrBuf *Target, WCT
 
 }
 
+
+void tmplput_Comment(StrBuf *Target, WCTemplputParams *TP)
+{
+	if (LoadTemplates != 0)
+	{
+		StrBuf *Comment;
+		const char *pch;
+		long len;
+
+		GetTemplateTokenString(Target, TP, 2, &pch, &len);
+		Comment = NewStrBufPlain(pch, len);
+		StrBufAppendTemplate(Target, TP, Comment, 1);
+
+		FreeStrBuf(&Comment);
+	}
+}
+
 /*-----------------------------------------------------------------------------
  *                      Iterators
  */
@@ -3149,6 +3166,7 @@ InitModule_SUBST
 (void)
 {
 	memset(&NoCtx, 0, sizeof(WCTemplputParams));
+	RegisterNamespace("--", 0, 2, tmplput_Comment, NULL, CTX_NONE);
 	RegisterNamespace("SORT:ICON", 1, 2, tmplput_SORT_ICON, NULL, CTX_NONE);
 	RegisterNamespace("SORT:ORDER", 1, 2, tmplput_SORT_ORDER, NULL, CTX_NONE);
 	RegisterNamespace("SORT:NEXT", 1, 2, tmplput_SORT_NEXT, NULL, CTX_NONE);
diff --git a/webcit/webserver.c b/webcit/webserver.c
index cfc1cb083..160844cdf 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -59,7 +59,7 @@ const char foobuf[32];
 const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;}
 #endif 
 extern int dbg_analyze_msg;
-extern int dbg_bactrace_template_errors;
+extern int dbg_backtrace_template_errors;
 extern int DumpTemplateI18NStrings;
 extern StrBuf *I18nDump;
 void InitTemplateCache(void);
@@ -165,7 +165,7 @@ int main(int argc, char **argv)
 		case 'T':
 			LoadTemplates = atoi(optarg);
 			dbg_analyze_msg = (LoadTemplates && (1<<1)) != 0;
-			dbg_bactrace_template_errors = (LoadTemplates && (1<<2)) != 0;
+			dbg_backtrace_template_errors = (LoadTemplates && (1<<2)) != 0;
 			break;
 		case 'Z':
 			DisableGzip = 1;
-- 
2.30.2