* 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

diff --git a/webcit/static/t/mailsummary_json_section.html b/webcit/static/t/mailsummary_json_section.html
index cb03fbcebd3f0f3317a8f772d4dd81757129ac59..48a414b91439a5a38f675774d875b5f5472dc337 100644 (file)
--- 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 eea66ae6b98c06dcc30d58edea1a1b8dcb8c4060..7b189e4aff708778fce418d5f4151c03ba032a86 100644 (file)
--- 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;