From 5a6650312901e9b2cc71cf9e9cd5ee341886e3cf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Thu, 15 Oct 2009 08:58:56 +0000
Subject: [PATCH] * add K (after j...) escaper for combined html + json; *
 escape mail subjects and senders with 'K'; This will fix problems with html
 tags in mailsubjects

---
 webcit/static/t/mailsummary_json_section.html | 2 +-
 webcit/subst.c                                | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/webcit/static/t/mailsummary_json_section.html b/webcit/static/t/mailsummary_json_section.html
index cb03fbceb..48a414b91 100644
--- a/webcit/static/t/mailsummary_json_section.html
+++ b/webcit/static/t/mailsummary_json_section.html
@@ -1 +1 @@
-[<?MAIL:SUMM:N>,"<?MAIL:SUMM:SUBJECT("J")>","<?MAIL:SUMM:FROM("J")>",<?MAIL:SUMM:DATENO>,"<?MAIL:SUMM:DATEBRIEF>",<?%("COND:MAIL:SUMM:UNREAD",1, 0, 0, "true","false")> ] <??("COND:ITERATE:LASTN", 1)> , <??("X",1)> 
\ No newline at end of file
+[<?MAIL:SUMM:N>,"<?MAIL:SUMM:SUBJECT("K")>","<?MAIL:SUMM:FROM("K")>",<?MAIL:SUMM:DATENO>,"<?MAIL:SUMM:DATEBRIEF>",<?%("COND:MAIL:SUMM:UNREAD",1, 0, 0, "true","false")> ]<?%("COND:ITERATE:LASTN", 1, "", "", "", ",")>
diff --git a/webcit/subst.c b/webcit/subst.c
index eea66ae6b..7b189e4af 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -1073,6 +1073,9 @@ void StrBufAppendTemplate(StrBuf *Target,
 	case 'J':
 		StrECMAEscAppend(Target, Source, NULL);
 	  break;
+	case 'K':
+		StrHtmlEcmaEscAppend(Target, Source, NULL, 0, 0);
+	  break;
 	case 'U':
 		StrBufUrlescAppend(Target, Source, NULL);
 		break;
-- 
2.39.2