Rework templating context access so contexts can be accessed through several layers

[citadel.git] / webcit / mainmenu.c

diff --git a/webcit/mainmenu.c b/webcit/mainmenu.c
index cbf9dc38f44007c7658d737af306bbbed9c966a7..31aec39861201d1ab941a9dc5b0ebc399d66a754 100644 (file)
--- a/webcit/mainmenu.c
+++ b/webcit/mainmenu.c
@@ -41,7 +41,6 @@ void do_generic(void)
                return;
        }
 
-        memset(&SubTP, 0, sizeof(WCTemplputParams));
        Buf = NewStrBuf();
        serv_puts(bstr("g_cmd"));
        StrBuf_ServGetln(Buf);
@@ -91,11 +90,11 @@ void do_generic(void)
        begin_burst();
        output_headers(1, 0, 0, 0, 1, 0);
 
-        SubTP.Filter.ContextType = CTX_STRBUF;
-        SubTP.Context = Buf;
-
-        DoTemplate(HKEY("aide_display_generic_result"), NULL, &SubTP);
-
+       StackContext(NULL, &SubTP, Buf, CTX_STRBUF, 0, NULL);
+       {
+               DoTemplate(HKEY("aide_display_generic_result"), NULL, &SubTP);
+       }
+       UnStackContext(&SubTP);
         wDumpContent(1);
 
        FreeStrBuf(&Buf);