* we were loosing the message Data blob in some weird edge cases. be a bit more paran...
[citadel.git] / webcit / msg_renderers.c
index 97b454abdbdf3cfa4f1ee2c4361f3ca6503c2eff..c7cb3670ede8325451db6bfc355f022c0c7e42a6 100644 (file)
@@ -1,5 +1,6 @@
 #include "webcit.h"
 #include "webserver.h"
+#include "groupdav.h"
 
 /*
  * message index functions
@@ -60,14 +61,18 @@ void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc e
        Put(MsgHeaderHandler, HeaderName, HdrNLen, ev, NULL);
 }
 
-void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, RenderMimeFunc MimeRenderer)
+void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, 
+                         RenderMimeFunc MimeRenderer,
+                         int InlineRenderable,
+                         int Priority)
 {
        RenderMimeFuncStruct *f;
 
        f = (RenderMimeFuncStruct*) malloc(sizeof(RenderMimeFuncStruct));
        f->f = MimeRenderer;
        Put(MimeRenderHandler, HeaderName, HdrNLen, f, NULL);
-       
+       if (InlineRenderable)
+               RegisterEmbeddableMimeType(HeaderName, HdrNLen, 10000 - Priority);
 }
 
 /*----------------------------------------------------------------------------*/
@@ -463,16 +468,19 @@ void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset
 {
        const StrBuf *TemplateMime;
 
-       Mime->Data = NewStrBufPlain(NULL, Mime->length);
+       if (Mime->Data == NULL) 
+               Mime->Data = NewStrBufPlain(NULL, Mime->length);
+       else 
+               FlushStrBuf(Mime->Data);
        read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, Mime->PartNum, &TemplateMime);
 /*
        if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) {
                for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
                        extract_token(buf, mime_submessages, i, '|', sizeof buf);
                        / ** use printable_view to suppress buttons * /
-                       wprintf("<blockquote>");
+                       wc_printf("<blockquote>");
                        read_message(Mime->msgnum, 1, ChrPtr(Mime->Section));
-                       wprintf("</blockquote>");
+                       wc_printf("</blockquote>");
                }
        }
 */
@@ -490,7 +498,7 @@ void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundC
                        || (!strcasecmp(&(ChrPtr(WCC->wc_roomname)[11]), USERCONFIGROOM))
                        || (WC->wc_view == VIEW_ADDRESSBOOK)
                        ) {
-                       StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld&partnum=%s\">",
+                       StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld?partnum=%s\">",
                                Mime->msgnum, ChrPtr(Mime->PartNum));
                        StrBufAppendPrintf(Buf, "[%s]</a>", _("edit"));
                }
@@ -527,10 +535,13 @@ void render_MIME_VNote(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundC
                        vnote_free(v);
                        Mime->Data = Buf;
                }
-               else
-                       Mime->Data = NewStrBuf();
+               else {
+                       if (Mime->Data == NULL)
+                               Mime->Data = NewStrBuf();
+                       else
+                               FlushStrBuf(Mime->Data);
+               }
        }
-
 }
 
 void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
@@ -674,7 +685,10 @@ int Conditional_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
 
 void examine_text(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
-       Msg->MsgBody->Data = NewStrBufPlain(NULL, SIZ);
+       if (Msg->MsgBody->Data == NULL)
+               Msg->MsgBody->Data = NewStrBufPlain(NULL, SIZ);
+       else
+               FlushStrBuf(Msg->MsgBody->Data);
 }
 
 void examine_msg4_partnum(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
@@ -798,6 +812,21 @@ void tmplput_EDIT_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
        FreeStrBuf(&Buf);
 }
 
+void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP)
+{
+       const StrBuf *Mime;
+        long msgnum;
+       StrBuf *Buf;
+
+       msgnum = locate_message_by_uid(BSTR("page"));
+       if (msgnum >= 0L) {
+               Buf = NewStrBuf();
+               read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime);
+               StrBufAppendTemplate(Target, TP, Buf, 1);
+               FreeStrBuf(&Buf);
+       }
+}
+
 void tmplput_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
 {
        message_summary *Msg = (message_summary*) CTX;
@@ -816,7 +845,6 @@ void render_MAIL_variformat(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 
 void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
 {
-       StrBuf *cs = NULL;
        const char *ptr, *pte;
        const char *BufPtr = NULL;
        StrBuf *Line;
@@ -824,12 +852,13 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
        StrBuf *Line2;
        StrBuf *Target;
 
-       int ConvertIt = 1;
        int bn = 0;
        int bq = 0;
        int i;
        long len;
 #ifdef HAVE_ICONV
+       StrBuf *cs = NULL;
+       int ConvertIt = 1;
        iconv_t ic = (iconv_t)(-1) ;
 #endif
 
@@ -899,11 +928,11 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
                                StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
                        for (i = bq; i < bn; i++)                               
                                StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
-
+#ifdef HAVE_ICONV
                        if (ConvertIt) {
                                StrBufConvert(Line, Line1, &ic);
                        }
-
+#endif
                        StrBufAppendBufPlain(Target, HKEY("<tt>"), 0);
                        UrlizeText(Line1, Line, Line2);
 
@@ -1046,8 +1075,9 @@ void tmplput_MIME_LoadData(StrBuf *Target, WCTemplputParams *TP)
        wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
        wc_mime_attachment *att;
        
-       if ( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))||
-            (!strcasecmp(ChrPtr(mime->Disposition), "attachment")) ) 
+       if (( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))||
+             (!strcasecmp(ChrPtr(mime->Disposition), "attachment"))) && 
+           (strcasecmp(ChrPtr(mime->ContentType), "application/ms-tnef")!=0))
        {
                
                int n;
@@ -1074,98 +1104,6 @@ void tmplput_MIME_Length(StrBuf *Target, WCTemplputParams *TP)
        StrBufAppendPrintf(Target, "%ld", mime->length);
 }
 
-/* startmsg is an index within the message list.
- * starting_from is the Citadel message number to be supplied to a "MSGS GT" operation
- */
-long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMessages, long starting_from)
-{
-       StrBuf *TmpBuf;
-       wcsession *WCC = WC;
-       void *vMsg;
-       int lo, hi;
-       long ret;
-       long hklen;
-       const char *key;
-       int done = 0;
-       int nItems;
-       HashPos *At;
-       long vector[16];
-       WCTemplputParams SubTP;
-
-       memset(&SubTP, 0, sizeof(WCTemplputParams));
-       SubTP.Filter.ContextType = CTX_LONGVECTOR;
-       SubTP.Context = &vector;
-       TmpBuf = NewStrBufPlain(NULL, SIZ);
-       At = GetNewHashPos(WCC->summ, nMessages);
-       nItems = GetCount(WCC->summ);
-       ret = nMessages;
-       vector[0] = 7;
-       vector[2] = 1;
-       vector[1] = startmsg;
-       vector[3] = 0;
-       vector[7] = starting_from;
-
-       while (!done) {
-               vector[3] = abs(nMessages);
-               lo = GetHashPosCounter(At);
-               if (nMessages > 0) {
-                       if (lo + nMessages >= nItems) {
-                               hi = nItems - 1;
-                               vector[3] = nItems - lo;
-                               if (startmsg == lo) 
-                                       ret = vector[3];
-                       }
-                       else {
-                               hi = lo + nMessages - 1;
-                       }
-               } else {
-                       if (lo + nMessages < -1) {
-                               hi = 0;
-                       }
-                       else {
-                               if ((lo % abs(nMessages)) != 0) {
-                                       int offset = (lo % abs(nMessages) *
-                                                     (nMessages / abs(nMessages)));
-                                       hi = lo + offset;
-                                       vector[3] = abs(offset);
-                                       if (startmsg == lo)
-                                                ret = offset;
-                               }
-                               else
-                                       hi = lo + nMessages;
-                       }
-               }
-               done = !GetNextHashPos(WCC->summ, At, &hklen, &key, &vMsg);
-               
-               /*
-                * Bump these because although we're thinking in zero base, the user
-                * is a drooling idiot and is thinking in one base.
-                */
-               vector[4] = lo + 1;
-               vector[5] = hi + 1;
-               vector[6] = lo;
-               FlushStrBuf(TmpBuf);
-               dbg_print_longvector(vector);
-               DoTemplate(HKEY("select_messageindex"), TmpBuf, &SubTP);
-               StrBufAppendBuf(Selector, TmpBuf, 0);
-       }
-       vector[6] = 0;
-       FlushStrBuf(TmpBuf);
-       if (maxmsgs == 9999999) {
-               vector[1] = 1;
-               ret = maxmsgs;
-       }
-       else
-               vector[1] = 0;          
-       vector[2] = 0;
-       dbg_print_longvector(vector);
-       DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &SubTP);
-       StrBufAppendBuf(Selector, TmpBuf, 0);
-       FreeStrBuf(&TmpBuf);
-       DeleteHashPos(&At);
-       return ret;
-}
-
 HashList *iterate_get_registered_Attachments(StrBuf *Target, WCTemplputParams *TP)
 {
        return WC->attachments;
@@ -1214,7 +1152,6 @@ readloop_struct rlid[] = {
 /* Spit out the new summary view. This is basically a static page, so clients can cache the layout, all the dirty work is javascript :) */
 void new_summary_view(void) {
        DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
-       DoTemplate(HKEY("trailing"),NULL,&NoCtx);
 }
 
 
@@ -1251,7 +1188,9 @@ int mailview_RenderView_or_Tail(SharedMessageStatus *Stat,
 {
        WCTemplputParams SubTP;
 
-       DoTemplate(HKEY("mailsummary_json"),NULL, &SubTP);
+       if (WC->is_ajax)
+               DoTemplate(HKEY("mailsummary_json"),NULL, &SubTP);
+       
        return 0;
 }
 
@@ -1259,175 +1198,15 @@ int mailview_Cleanup(void **ViewSpecific)
 {
        /* Note: wDumpContent() will output one additional </div> tag. */
        /* We ought to move this out into template */
-       if (WC->is_ajax) 
+       if (WC->is_ajax)
                end_burst();
        else
                wDumpContent(1);
-       return 0;
-}
-
 
-
-typedef struct _bbsview_stuct {
-       StrBuf *BBViewToolBar;
-       StrBuf *MessageDropdown;
-       long *displayed_msgs;
-       int a;
-}bbsview_struct;
-
-int bbsview_GetParamsGetServerCall(SharedMessageStatus *Stat, 
-                                  void **ViewSpecific, 
-                                  long oper, 
-                                  char *cmd, 
-                                  long len)
-{
-       bbsview_struct *VS;
-
-       VS = (bbsview_struct*) malloc(sizeof(bbsview_struct));
-       memset(VS, 0, sizeof(bbsview_struct));
-       *ViewSpecific = (void*)VS;
-       Stat->defaultsortorder = 1;
-       Stat->startmsg = -1;
-       Stat->sortit = 1;
-       
-       rlid[oper].cmd(cmd, len);
-       
-       if (havebstr("maxmsgs"))
-               Stat->maxmsgs = ibstr("maxmsgs");
-       if (Stat->maxmsgs == 0) Stat->maxmsgs = DEFAULT_MAXMSGS;
-       
-       if (havebstr("startmsg")) {
-               Stat->startmsg = lbstr("startmsg");
-       }
-       if (lbstr("SortOrder") == 2) {
-               Stat->reverse = 1;
-               Stat->num_displayed = -DEFAULT_MAXMSGS;
-       }
-       else {
-               Stat->reverse = 0;
-               Stat->num_displayed = DEFAULT_MAXMSGS;
-       }
-
-       return 200;
-}
-
-int bbsview_PrintViewHeader(SharedMessageStatus *Stat, void **ViewSpecific)
-{
-       bbsview_struct *VS;
-       WCTemplputParams SubTP;
-
-       VS = (bbsview_struct*)*ViewSpecific;
-
-       VS->BBViewToolBar = NewStrBufPlain(NULL, SIZ);
-       VS->MessageDropdown = NewStrBufPlain(NULL, SIZ);
-
-       /*** startmsg->maxmsgs = **/DrawMessageDropdown(VS->MessageDropdown, 
-                                                       Stat->maxmsgs, 
-                                                       Stat->startmsg,
-                                                       Stat->num_displayed, 
-                                                       Stat->lowest_found-1);
-       if (Stat->num_displayed < 0) {
-               Stat->startmsg += Stat->maxmsgs;
-               if (Stat->num_displayed != Stat->maxmsgs)                               
-                       Stat->maxmsgs = abs(Stat->maxmsgs) + 1;
-               else
-                       Stat->maxmsgs = abs(Stat->maxmsgs);
-
-       }
-       if (Stat->nummsgs > 0) {
-               memset(&SubTP, 0, sizeof(WCTemplputParams));
-               SubTP.Filter.ContextType = CTX_STRBUF;
-               SubTP.Context = VS->MessageDropdown;
-               DoTemplate(HKEY("msg_listselector_top"), VS->BBViewToolBar, &SubTP);
-               StrBufAppendBuf(WC->WBuf, VS->BBViewToolBar, 0);
-               FlushStrBuf(VS->BBViewToolBar);
-       }
-       return 200;
-}
-
-int bbsview_LoadMsgFromServer(SharedMessageStatus *Stat, 
-                             void **ViewSpecific, 
-                             message_summary* Msg, 
-                             int is_new, 
-                             int i)
-{
-       bbsview_struct *VS;
-
-       VS = (bbsview_struct*)*ViewSpecific;
-       if (VS->displayed_msgs == NULL) {
-               VS->displayed_msgs = malloc(sizeof(long) *
-                                           ((Stat->maxmsgs < Stat->nummsgs) ? 
-                                            Stat->maxmsgs + 1 : 
-                                            Stat->nummsgs + 1));
-       }
-       if ((i >= Stat->startmsg) && (i < Stat->startmsg + Stat->maxmsgs)) {
-               VS->displayed_msgs[Stat->num_displayed] = Msg->msgnum;
-               Stat->num_displayed++;
-       }
-       return 200;
-}
-
-
-int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, 
-                              void **ViewSpecific, 
-                              long oper)
-{
-       wcsession *WCC = WC;
-       bbsview_struct *VS;
-       WCTemplputParams SubTP;
-       const StrBuf *Mime;
-
-       VS = (bbsview_struct*)*ViewSpecific;
-       if (Stat->nummsgs == 0) {
-               wprintf("<div class=\"nomsgs\"><br><em>");
-               switch (oper) {
-               case readnew:
-                       wprintf(_("No new messages."));
-                       break;
-               case readold:
-                       wprintf(_("No old messages."));
-                       break;
-               default:
-                       wprintf(_("No messages here."));
-               }
-               wprintf("</em><br></div>\n");
-       }
-       else 
-       {
-               if (VS->displayed_msgs != NULL) {
-                       /* if we do a split bbview in the future, begin messages div here */
-                       int a;/// todo  
-                       for (a=0; a < Stat->num_displayed; ++a) {
-                               read_message(WCC->WBuf, HKEY("view_message"), VS->displayed_msgs[a], NULL, &Mime);
-                       }
-                       
-                       /* if we do a split bbview in the future, end messages div here */
-                       
-                       free(VS->displayed_msgs);
-                       VS->displayed_msgs = NULL;
-               }
-               memset(&SubTP, 0, sizeof(WCTemplputParams));
-               SubTP.Filter.ContextType = CTX_STRBUF;
-               SubTP.Context = VS->MessageDropdown;
-               DoTemplate(HKEY("msg_listselector_bottom"), VS->BBViewToolBar, &SubTP);
-               StrBufAppendBuf(WCC->WBuf, VS->BBViewToolBar, 0);
-       }
        return 0;
-
 }
 
 
-int bbsview_Cleanup(void **ViewSpecific)
-{
-       bbsview_struct *VS;
-
-       VS = (bbsview_struct*)*ViewSpecific;
-       end_burst();
-       FreeStrBuf(&VS->BBViewToolBar);
-       FreeStrBuf(&VS->MessageDropdown);
-       free(VS);
-       return 0;
-}
 
 void 
 InitModule_MSGRENDERERS
@@ -1441,14 +1220,6 @@ InitModule_MSGRENDERERS
                mailview_RenderView_or_Tail,
                mailview_Cleanup);
 
-       RegisterReadLoopHandlerset(
-               VIEW_BBS,
-               bbsview_GetParamsGetServerCall,
-               bbsview_PrintViewHeader,
-               bbsview_LoadMsgFromServer,
-               bbsview_RenderView_or_Tail,
-               bbsview_Cleanup);
-
        RegisterSortFunc(HKEY("date"), 
                         NULL, 0,
                         summcmp_date,
@@ -1468,30 +1239,31 @@ InitModule_MSGRENDERERS
                         groupchange_sender,
                         CTX_MAILSUM);
 
-       RegisterNamespace("SUMM:COUNT", 0, 0, tmplput_SUMM_COUNT, CTX_NONE);
+       RegisterNamespace("SUMM:COUNT", 0, 0, tmplput_SUMM_COUNT, NULL, CTX_NONE);
        /* iterate over all known mails in WC->summ */
        RegisterIterator("MAIL:SUMM:MSGS", 0, NULL, iterate_get_mailsumm_All,
                         NULL,NULL, CTX_MAILSUM, CTX_NONE, IT_NOFLAG);
 
-       RegisterNamespace("MAIL:SUMM:DATEBRIEF", 0, 0, tmplput_MAIL_SUMM_DATE_BRIEF, CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:DATEFULL", 0, 0, tmplput_MAIL_SUMM_DATE_FULL, CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:DATENO",  0, 0, tmplput_MAIL_SUMM_DATE_NO,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:N",       0, 0, tmplput_MAIL_SUMM_N,        CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:FROM",    0, 2, tmplput_MAIL_SUMM_FROM,     CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:TO",      0, 2, tmplput_MAIL_SUMM_TO,       CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:SUBJECT", 0, 4, tmplput_MAIL_SUMM_SUBJECT,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:NTATACH", 0, 0, tmplput_MAIL_SUMM_NATTACH,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:CCCC", 0, 2, tmplput_MAIL_SUMM_CCCC,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:H_NODE", 0, 2, tmplput_MAIL_SUMM_H_NODE,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:ALLRCPT", 0, 2, tmplput_MAIL_SUMM_ALLRCPT,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY,  CTX_NONE);
-       RegisterNamespace("MAIL:EDITTEXT", 1, 2, tmplput_EDIT_MAIL_BODY,  CTX_NONE);
+       RegisterNamespace("MAIL:SUMM:DATEBRIEF", 0, 0, tmplput_MAIL_SUMM_DATE_BRIEF, NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:DATEFULL", 0, 0, tmplput_MAIL_SUMM_DATE_FULL, NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:DATENO",  0, 0, tmplput_MAIL_SUMM_DATE_NO,  NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:N",       0, 0, tmplput_MAIL_SUMM_N,        NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:FROM",    0, 2, tmplput_MAIL_SUMM_FROM,     NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:TO",      0, 2, tmplput_MAIL_SUMM_TO,       NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:SUBJECT", 0, 4, tmplput_MAIL_SUMM_SUBJECT,  NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:NTATACH", 0, 0, tmplput_MAIL_SUMM_NATTACH,  NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:CCCC", 0, 2, tmplput_MAIL_SUMM_CCCC, NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:H_NODE", 0, 2, tmplput_MAIL_SUMM_H_NODE,  NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:ALLRCPT", 0, 2, tmplput_MAIL_SUMM_ALLRCPT,  NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM,  NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA, NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE,  NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS,  NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO,  NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY,  NULL, CTX_MAILSUM);
+       RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY,  NULL, CTX_NONE);
+       RegisterNamespace("MAIL:EDITTEXT", 1, 2, tmplput_EDIT_MAIL_BODY,  NULL, CTX_NONE);
+       RegisterNamespace("MAIL:EDITWIKI", 1, 2, tmplput_EDIT_WIKI_BODY,  NULL, CTX_NONE);
        RegisterConditional(HKEY("COND:MAIL:SUMM:RFCA"), 0, Conditional_MAIL_SUMM_RFCA,  CTX_MAILSUM);
        RegisterConditional(HKEY("COND:MAIL:SUMM:CCCC"), 0, Conditional_MAIL_SUMM_CCCC,  CTX_MAILSUM);
        RegisterConditional(HKEY("COND:MAIL:SUMM:UNREAD"), 0, Conditional_MAIL_SUMM_UNREAD, CTX_MAILSUM);
@@ -1517,34 +1289,36 @@ InitModule_MSGRENDERERS
                         NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
 
        /* Parts of a mime attachent */
-       RegisterNamespace("MAIL:MIME:NAME", 0, 2, tmplput_MIME_Name, CTX_MIME_ATACH);
-       RegisterNamespace("MAIL:MIME:FILENAME", 0, 2, tmplput_MIME_FileName, CTX_MIME_ATACH);
-       RegisterNamespace("MAIL:MIME:PARTNUM", 0, 2, tmplput_MIME_PartNum, CTX_MIME_ATACH);
-       RegisterNamespace("MAIL:MIME:MSGNUM", 0, 2, tmplput_MIME_MsgNum, CTX_MIME_ATACH);
-       RegisterNamespace("MAIL:MIME:DISPOSITION", 0, 2, tmplput_MIME_Disposition, CTX_MIME_ATACH);
-       RegisterNamespace("MAIL:MIME:CONTENTTYPE", 0, 2, tmplput_MIME_ContentType, CTX_MIME_ATACH);
-       RegisterNamespace("MAIL:MIME:CHARSET", 0, 2, tmplput_MIME_Charset, CTX_MIME_ATACH);
-       RegisterNamespace("MAIL:MIME:LENGTH", 0, 2, tmplput_MIME_Length, CTX_MIME_ATACH);
-       RegisterNamespace("MAIL:MIME:DATA", 0, 2, tmplput_MIME_Data, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:NAME", 0, 2, tmplput_MIME_Name, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:FILENAME", 0, 2, tmplput_MIME_FileName, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:PARTNUM", 0, 2, tmplput_MIME_PartNum, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:MSGNUM", 0, 2, tmplput_MIME_MsgNum, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:DISPOSITION", 0, 2, tmplput_MIME_Disposition, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:CONTENTTYPE", 0, 2, tmplput_MIME_ContentType, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:CHARSET", 0, 2, tmplput_MIME_Charset, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:LENGTH", 0, 2, tmplput_MIME_Length, NULL, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:DATA", 0, 2, tmplput_MIME_Data, NULL, CTX_MIME_ATACH);
        /* load the actual attachment into WC->attachments; no output!!! */
-       RegisterNamespace("MAIL:MIME:LOADDATA", 0, 0, tmplput_MIME_LoadData, CTX_MIME_ATACH);
+       RegisterNamespace("MAIL:MIME:LOADDATA", 0, 0, tmplput_MIME_LoadData, NULL, CTX_MIME_ATACH);
 
        /* iterate the WC->attachments; use the above tokens for their contents */
        RegisterIterator("MSG:ATTACHNAMES", 0, NULL, iterate_get_registered_Attachments, 
                         NULL, NULL, CTX_MIME_ATACH, CTX_NONE, IT_NOFLAG);
 
        /* mime renderers translate an attachment into webcit viewable html text */
-       RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL);
-       RegisterMimeRenderer(HKEY("text/vnote"), render_MIME_VNote);
-       RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard);
-       RegisterMimeRenderer(HKEY("text/vcard"), render_MIME_VCard);
-       RegisterMimeRenderer(HKEY("text/calendar"), render_MIME_ICS);
-       RegisterMimeRenderer(HKEY("application/ics"), render_MIME_ICS);
-       RegisterMimeRenderer(HKEY("text/x-citadel-variformat"), render_MAIL_variformat);
-       RegisterMimeRenderer(HKEY("text/plain"), render_MAIL_text_plain);
-       RegisterMimeRenderer(HKEY("text"), render_MAIL_text_plain);
-       RegisterMimeRenderer(HKEY("text/html"), render_MAIL_html);
-       RegisterMimeRenderer(HKEY(""), render_MAIL_UNKNOWN);
+       RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL, 1, 150);
+       RegisterMimeRenderer(HKEY("text/vnote"), render_MIME_VNote, 1, 300);
+       RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard, 1, 201);
+       RegisterMimeRenderer(HKEY("text/vcard"), render_MIME_VCard, 1, 200);
+       RegisterMimeRenderer(HKEY("text/calendar"), render_MIME_ICS, 1, 501);
+       RegisterMimeRenderer(HKEY("application/ics"), render_MIME_ICS, 1, 500);
+       RegisterMimeRenderer(HKEY("text/x-citadel-variformat"), render_MAIL_variformat, 1, 2);
+       RegisterMimeRenderer(HKEY("text/plain"), render_MAIL_text_plain, 1, 3);
+       RegisterMimeRenderer(HKEY("text"), render_MAIL_text_plain, 1, 1);
+       RegisterMimeRenderer(HKEY("text/html"), render_MAIL_html, 1, 100);
+       RegisterMimeRenderer(HKEY(""), render_MAIL_UNKNOWN, 0, 0);
+       /* and finalize the anouncement to the server... */
+       CreateMimeStr();
 
        /* these headers are citserver replies to MSG4 and friends. one evaluator for each */
        RegisterMsgHdr(HKEY("nhdr"), examine_nhdr, 0);