Parametrize the escaping of the IMPORTANTMESSAGE token.

diff --git a/webcit/static/t/listsub/display.html b/webcit/static/t/listsub/display.html
index 558a2e4688b714079750063a934acf7de5fe3198..f2f63c243abd3a81f403f7d0df3d8793ad19efed 100644 (file)
--- 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 5be82d88d6873d87c9f3279e9333321c62af5e5f..fcc38a3634547300c07d2e02f5b0a1f87554fb14 100644 (file)
--- 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 e7ffa97049f451a394ca0dbd3aa64c6c50c5727d..5bbd0822fcef19957944b4e8cd21f17483480b5d 100644 (file)
--- 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 4e3b2f86a3975099dd38b923a91f484dd37859f4..4c78cb6b250a407a8b8ec1aa37ece04c0e688bcf 100644 (file)
--- 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);