* move some more vars from the session context to strbuf (the use of StrBufAppendTemp...

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index 141a63a74f53dc0fca0d7199aeeaf870a85282f1..2aca9e37c782371d98a0f161cc2a3c4d66839ccb 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -64,6 +64,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
        int state=0;
        long len;
        const char *Key;
+       WCTemplputParams SubTP;
 
        Buf = NewStrBuf();
        lprintf(1, "----------%s---------MSG4 %ld|%s--------------\n", tmpl, msgnum, ChrPtr(PartNum));
@@ -213,8 +214,8 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
        else 
        {
                if ((StrLength(Msg->OtherNode)>0) && 
-                   (strcasecmp(ChrPtr(Msg->OtherNode), serv_info.serv_nodename)) &&
-                   (strcasecmp(ChrPtr(Msg->OtherNode), serv_info.serv_humannode)) ) 
+                   (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(serv_info.serv_nodename))) &&
+                   (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(serv_info.serv_humannode)) ))
                {
                        if (Msg->reply_to == NULL)
                                Msg->reply_to = NewStrBuf();
@@ -239,8 +240,10 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                evaluate_mime_part(Msg, Mime);
        }
        DeleteHashPos(&it);
-
-       DoTemplate(tmpl, tmpllen, Target, Msg, CTX_MAILSUM);
+       memset(&SubTP, 0, sizeof(WCTemplputParams));
+       SubTP.ContextType = CTX_MAILSUM;
+       SubTP.Context = Msg;
+       DoTemplate(tmpl, tmpllen, Target, &SubTP);
 
        DestroyMessageSummary(Msg);
        FreeStrBuf(&FoundCharset);
@@ -444,8 +447,8 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                                StrBufExtract_token(Buf2, Buf, 3, '|');
                                if ((StrLength(Buf2) !=0 ) &&
                                    ( ((WCC->room_flags & QR_NETWORK)
-                                      || ((strcasecmp(ChrPtr(Buf2), serv_info.serv_nodename)
-                                           && (strcasecmp(ChrPtr(Buf2), serv_info.serv_fqdn)))))))
+                                      || ((strcasecmp(ChrPtr(Buf2), ChrPtr(serv_info.serv_nodename))
+                                           && (strcasecmp(ChrPtr(Buf2), ChrPtr(serv_info.serv_fqdn))))))))
                                {
                                        StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
                                        StrBufAppendBuf(Msg->from, Buf2, 0);
@@ -512,7 +515,11 @@ long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMes
        int nItems;
        HashPos *At;
        long vector[16];
+       WCTemplputParams SubTP;
 
+       memset(&SubTP, 0, sizeof(WCTemplputParams));
+       SubTP.ContextType = CTX_LONGVECTOR;
+       SubTP.Context = &vector;
        TmpBuf = NewStrBuf();
        At = GetNewHashPos(WCC->summ, nMessages);
        nItems = GetCount(WCC->summ);
@@ -563,7 +570,7 @@ long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMes
                vector[6] = lo;
                FlushStrBuf(TmpBuf);
                dbg_print_longvector(vector);
-               DoTemplate(HKEY("select_messageindex"), TmpBuf, &vector, CTX_LONGVECTOR);
+               DoTemplate(HKEY("select_messageindex"), TmpBuf, &SubTP);
                StrBufAppendBuf(Selector, TmpBuf, 0);
        }
        vector[6] = 0;
@@ -571,7 +578,7 @@ long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMes
        vector[1] = lbstr("maxmsgs") == 9999999;
        vector[2] = 0;
        dbg_print_longvector(vector);
-       DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &vector, CTX_LONGVECTOR);
+       DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &SubTP);
        StrBufAppendBuf(Selector, TmpBuf, 0);
        FreeStrBuf(&TmpBuf);
        DeleteHashPos(&At);
@@ -591,7 +598,7 @@ void load_seen_flags(void)
        OldMsg = NewStrBuf();
        serv_puts("GTSN");
        StrBuf_ServGetln(OldMsg);
-       if (ChrPtr(OldMsg)[0] == '2') {
+       if (GetServerStatus(OldMsg, NULL) == 2) {
                StrBufCutLeft(OldMsg, 4);
        }
        else {
@@ -651,13 +658,14 @@ void readloop(long oper)
        int load_seen = 0;
        int sortit = 0;
        int defaultsortorder = 0;
+       WCTemplputParams SubTP;
 
        if (havebstr("is_summary") && (1 == (ibstr("is_summary"))))
                WCC->wc_view = VIEW_MAILBOX;
 
        switch (WCC->wc_view) {
        case VIEW_WIKI:
-               sprintf(buf, "wiki?room=%s&page=home", WCC->wc_roomname);
+               sprintf(buf, "wiki?room=%s&page=home", ChrPtr(WCC->wc_roomname));
                http_redirect(buf);
                return;
        case VIEW_CALBRIEF:
@@ -745,7 +753,10 @@ void readloop(long oper)
 
        if (sortit) {
                CompareFunc SortIt;
-               SortIt =  RetrieveSort(CTX_MAILSUM, NULL, 
+               memset(&SubTP, 0, sizeof(WCTemplputParams));
+               SubTP.ContextType = CTX_NONE;
+               SubTP.Context = NULL;
+               SortIt =  RetrieveSort(&SubTP, NULL, 
                                       HKEY("date"), defaultsortorder);
                if (SortIt != NULL)
                        SortByPayload(WCC->summ, SortIt);
@@ -784,7 +795,10 @@ void readloop(long oper)
                                maxmsgs = abs(maxmsgs);
 
                }
-               DoTemplate(HKEY("msg_listselector_top"), BBViewToolBar, MessageDropdown, CTX_STRBUF);
+               memset(&SubTP, 0, sizeof(WCTemplputParams));
+               SubTP.ContextType = CTX_STRBUF;
+               SubTP.Context = MessageDropdown;
+               DoTemplate(HKEY("msg_listselector_top"), BBViewToolBar, &SubTP);
                StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
                FlushStrBuf(BBViewToolBar);
                break;
@@ -821,7 +835,10 @@ void readloop(long oper)
                                addrbook[num_ab-1].ab_msgnum = Msg->msgnum;
                                break;
                        case VIEW_MAILBOX: /* here we just need the abstract, so render it now. */
-                               DoTemplate(HKEY("section_mailsummary"), NULL, Msg, CTX_MAILSUM);
+                               memset(&SubTP, 0, sizeof(WCTemplputParams));
+                               SubTP.ContextType = CTX_MAILSUM;
+                               SubTP.Context = Msg;
+                               DoTemplate(HKEY("section_mailsummary"), NULL, &SubTP);
                        
                                num_displayed++;
                                break;
@@ -865,7 +882,10 @@ void readloop(long oper)
                        free(displayed_msgs);
                        displayed_msgs = NULL;
                }
-               DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, MessageDropdown, CTX_STRBUF);
+               memset(&SubTP, 0, sizeof(WCTemplputParams));
+               SubTP.ContextType = CTX_STRBUF;
+               SubTP.Context = MessageDropdown;
+               DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, &SubTP);
                StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
 
                FreeStrBuf(&BBViewToolBar);
@@ -924,12 +944,12 @@ void post_mime_to_server(void) {
        char *txtmail = NULL;
 
        sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x",
-               serv_info.serv_fqdn,
+               ChrPtr(serv_info.serv_fqdn),
                getpid(),
                ++seq
        );
        sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
-               serv_info.serv_fqdn,
+               ChrPtr(serv_info.serv_fqdn),
                getpid(),
                ++seq
        );
@@ -1029,7 +1049,7 @@ void post_message(void)
        wcsession *WCC = WC;
        
        if (havebstr("force_room")) {
-               gotoroom(bstr("force_room"));
+               gotoroom(sbstr("force_room"));
        }
 
        if (havebstr("display_name")) {
@@ -1222,7 +1242,7 @@ void display_enter(void)
        now = time(NULL);
 
        if (havebstr("force_room")) {
-               gotoroom(bstr("force_room"));
+               gotoroom(sbstr("force_room"));
        }
 
        display_name = sbstr("display_name");
@@ -1254,7 +1274,7 @@ void display_enter(void)
         * message" command really means "add new entry."
         */
        if (WCC->wc_default_view == VIEW_ADDRESSBOOK) {
-               do_edit_vcard(-1, "", "", WCC->wc_roomname);
+               do_edit_vcard(-1, "", "", ChrPtr(WCC->wc_roomname));
                return;
        }
 
@@ -1331,7 +1351,7 @@ void display_enter(void)
 
        begin_burst();
        output_headers(1, 0, 0, 0, 1, 0);
-       DoTemplate(HKEY("edit_message"), NULL, NULL, CTX_NONE);
+       DoTemplate(HKEY("edit_message"), NULL, &NoCtx);
        end_burst();
 
        return;