* display single vcard by just calling read_message directly

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index 2a994617cab239cb102367cf3a76a30c2967bce3..b40cd542bf4dcdf78510de35db74edbe86487b98 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -12,7 +12,7 @@
 HashList *MsgHeaderHandler = NULL;
 HashList *MsgEvaluators = NULL;
 HashList *MimeRenderHandler = NULL;
-int analyze_msg = 0;
+int dbg_analyze_msg = 0;
 
 #define SUBJ_COL_WIDTH_PCT             50      /**< Mailbox view column width */
 #define SENDER_COL_WIDTH_PCT           30      /**< Mailbox view column width */
@@ -109,7 +109,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                        StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
                        
 #ifdef TECH_PREVIEW
-                       if (analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+                       if (dbg_analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
 #endif
                        /* look up one of the examine_* functions to parse the content */
                        if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
@@ -136,7 +136,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
                                if (StrLength(HdrToken) > 0) {
                                        StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
 #ifdef TECH_PREVIEW
-                                       if (analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+                                       if (dbg_analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
 #endif
                                        /* the examine*'s know how to do with mime headers too... */
                                        if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
@@ -235,7 +235,7 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, in
        }
        DeleteHashPos(&it);
        memset(&SubTP, 0, sizeof(WCTemplputParams));
-       SubTP.ContextType = CTX_MAILSUM;
+       SubTP.Filter.ContextType = CTX_MAILSUM;
        SubTP.Context = Msg;
        DoTemplate(tmpl, tmpllen, Target, &SubTP);
 
@@ -511,7 +511,7 @@ long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMes
        WCTemplputParams SubTP;
 
        memset(&SubTP, 0, sizeof(WCTemplputParams));
-       SubTP.ContextType = CTX_LONGVECTOR;
+       SubTP.Filter.ContextType = CTX_LONGVECTOR;
        SubTP.Context = &vector;
        TmpBuf = NewStrBuf();
        At = GetNewHashPos(WCC->summ, nMessages);
@@ -741,7 +741,7 @@ void readloop(long oper)
        nummsgs = load_msg_ptrs(cmd, with_headers);
        if (nummsgs == 0) {
                if (care_for_empty_list) {
-                       wprintf("<div align=\"center\"><br /><em>");
+                       wprintf("<div class=\"nomsgs\"><br><em>");
                        switch (oper) {
                        case readnew:
                                wprintf(_("No new messages."));
@@ -752,7 +752,7 @@ void readloop(long oper)
                        default:
                                wprintf(_("No messages here."));
                        }
-                       wprintf("</em><br /></div>\n");
+                       wprintf("</em><br></div>\n");
                        goto DONE;
                }
 
@@ -761,7 +761,7 @@ void readloop(long oper)
        if (sortit) {
                CompareFunc SortIt;
                memset(&SubTP, 0, sizeof(WCTemplputParams));
-               SubTP.ContextType = CTX_NONE;
+               SubTP.Filter.ContextType = CTX_NONE;
                SubTP.Context = NULL;
                SortIt =  RetrieveSort(&SubTP, NULL, 0,
                                       HKEY("date"), defaultsortorder);
@@ -800,7 +800,7 @@ void readloop(long oper)
 
                }
                memset(&SubTP, 0, sizeof(WCTemplputParams));
-               SubTP.ContextType = CTX_STRBUF;
+               SubTP.Filter.ContextType = CTX_STRBUF;
                SubTP.Context = MessageDropdown;
                DoTemplate(HKEY("msg_listselector_top"), BBViewToolBar, &SubTP);
                StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
@@ -890,7 +890,7 @@ void readloop(long oper)
                        displayed_msgs = NULL;
                }
                memset(&SubTP, 0, sizeof(WCTemplputParams));
-               SubTP.ContextType = CTX_STRBUF;
+               SubTP.Filter.ContextType = CTX_STRBUF;
                SubTP.Context = MessageDropdown;
                DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, &SubTP);
                StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
@@ -914,7 +914,10 @@ DONE:
        case VIEW_NOTES:
                break;
        case VIEW_ADDRESSBOOK:
-               do_addrbook_view(addrbook, num_ab);     /** Render the address book */
+               if (is_singlecard)
+                       read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), 0, NULL);
+               else
+                       do_addrbook_view(addrbook, num_ab);     /** Render the address book */
                break;
        case VIEW_MAILBOX: 
        case VIEW_BBS:
@@ -1655,7 +1658,9 @@ void new_summary_view(void) {
 void jsonMessageList(void) {
   const StrBuf *room = sbstr("room");
   WC->is_ajax = 1; 
-  smart_goto(room);
+  long oper = (havebstr("query")) ? do_search : readnew;
+  gotoroom(room);
+  readloop(oper);
   WC->is_ajax = 0;
 }