* rework who.c so it doesn't use svput() and friends but rather preregistered callbac...

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 1983f166fd9a8fbae12b91be5161a35df845e621..91bbc4e86ac349c8755148e335f87288f8c4b70a 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -382,8 +382,10 @@ void hprintf(const char *format,...)
 }
 
 
-void put_trailing_javascript(void) {
-       wprintf("%s", ChrPtr(WC->trailing_javascript));
+void tmplput_trailing_javascript(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *vContext, int ContextType)
+{
+       struct wcsession *WCC = WC;
+       StrBufAppendBuf(WCC->WBuf, WCC->trailing_javascript, 0);
 }
 
 /*
@@ -397,7 +399,6 @@ void wDumpContent(int print_standard_html_footer)
 {
        if (print_standard_html_footer) {
                wprintf("</div> <!-- end of 'content' div -->\n");
-               svcallback("TRAILING_JAVASCRIPT", put_trailing_javascript);
                do_template("trailing", NULL);
        }
 
@@ -1965,4 +1966,5 @@ InitModule_WEBCIT
        RegisterNamespace("CSSLOCAL", 0, 0, tmplput_csslocal, CTX_NONE);
        RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, CTX_NONE);
        RegisterNamespace("OFFERSTARTPAGE", 0, 0, offer_start_page, CTX_NONE);
+       RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, CTX_NONE);
 }