From 42ff6f76a8fd84b1e87d130a252533301f01d594 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Thu, 31 Dec 2015 13:04:00 +0100
Subject: [PATCH] Parametrize the escaping of the IMPORTANTMESSAGE token.

---
 webcit/static/t/listsub/display.html | 6 +++---
 webcit/static/t/login.html           | 2 +-
 webcit/static/t/trailing.html        | 2 +-
 webcit/webcit.c                      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/webcit/static/t/listsub/display.html b/webcit/static/t/listsub/display.html
index 558a2e468..f2f63c243 100644
--- a/webcit/static/t/listsub/display.html
+++ b/webcit/static/t/listsub/display.html
@@ -27,7 +27,7 @@
 <a href="listsub"><?_("Go back...")></a>
 </center>
 <?!("X", 11)><??("COND:BSTR", 12, "__FAIL")>
-<font size=+1><b><?_("ERROR")>: <?IMPORTANTMESSAGE></b></font><br><br>
+<font size=+1><b><?_("ERROR")>: <?IMPORTANTMESSAGE("X")></b></font><br><br>
 <??("X", 12)>
 <?!("X", 10)>
 
@@ -47,7 +47,7 @@
 <a href="listsub"><?_("Back...")></a>
 </center>
 <?!("X", 21)><??("COND:BSTR", 22, "__FAIL")>
-<font SIZE=+1><b><?_("ERROR")>: <?IMPORTANTMESSAGE></b></font>
+<font SIZE=+1><b><?_("ERROR")>: <?IMPORTANTMESSAGE("X")></b></font>
 <br><br>
 <?!("X", 22)>
 <?!("X", 20)>
@@ -62,7 +62,7 @@
 <li><?_("You waited too long to confirm your subscribe/unsubscribe request (the confirmation link is only valid for three days)")></li>
 <li><?_("You have <i>already</i> successfully confirmed your subscribe/unsubscribe request and are attempting to do it again.")></li>
 </ul>
-<?_("The error returned by the server was: ")><?IMPORTANTMESSAGE>
+<?_("The error returned by the server was: ")><?IMPORTANTMESSAGE("X")>
 <??("X", 32)>
 <??("X", 30)>
 
diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html
index 5be82d88d..fcc38a363 100644
--- a/webcit/static/t/login.html
+++ b/webcit/static/t/login.html
@@ -10,7 +10,7 @@
 			<div class="boxcontent">
 				<div id="hellomsg"><?SERV:MESG("hello")></div>
 				<?!("COND:IMPMSG", 1)>
-					<div class="login_message"><?IMPORTANTMESSAGE></div>
+					<div class="login_message"><?IMPORTANTMESSAGE("X")></div>
 				<?!("X", 1)>
 				<div class="login_image"><img src="image?name=hello" alt=""></div>
 				<span class="logbuttons">
diff --git a/webcit/static/t/trailing.html b/webcit/static/t/trailing.html
index e7ffa9704..5bbd0822f 100644
--- a/webcit/static/t/trailing.html
+++ b/webcit/static/t/trailing.html
@@ -5,7 +5,7 @@ style="visibility: hidden;"
 <?!("X", 1)>
 >
 <span class="imsg">
-<?IMPORTANTMESSAGE>
+<?IMPORTANTMESSAGE("X")>
 </span><br>
 </div>
 <?!("COND:IMPMSG", 2)>
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 4e3b2f86a..4c78cb6b2 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -908,7 +908,7 @@ void tmplput_importantmessage(StrBuf *Target, WCTemplputParams *TP)
 	
 	if (WCC != NULL) {
 		if (StrLength(WCC->ImportantMsg) > 0) {
-			StrEscAppend(Target, WCC->ImportantMsg, NULL, 0, 0);
+			StrBufAppendTemplate(Target, TP, WCC->ImportantMsg, 0);
 		}
 	}
 }
@@ -956,7 +956,7 @@ InitModule_WEBCIT
 	RegisterConditional("COND:IS_HTTPS", 0, Conditional_IS_HTTPS, CTX_NONE);
 
 	RegisterNamespace("CSSLOCAL", 0, 0, tmplput_csslocal, NULL, CTX_NONE);
-	RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, NULL, CTX_NONE);
+	RegisterNamespace("IMPORTANTMESSAGE", 0, 1, tmplput_importantmessage, NULL, CTX_NONE);
 	RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, NULL, CTX_NONE);
 	RegisterNamespace("URL:DISPLAYNAME", 0, 1, tmplput_HANDLER_DISPLAYNAME, NULL, CTX_NONE);
 	RegisterNamespace("PACKAGESTRING", 0, 1, tmplput_packagestring, NULL, CTX_NONE);
-- 
2.30.2