* ParseMessageListHeaders_Detail(): don't use the tokenizer to read the subject;...

[citadel.git] / webcit / msg_renderers.c

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index f8fc38e67edd66e52cab11c98c584f6a09965a49..d3a7c423f2b86bef184cee2fb329365607b8ce79 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -495,7 +495,8 @@ void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset
 void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
 {
        wcsession *WCC = WC;
-       MimeLoadData(Mime);
+       if (StrLength(Mime->Data) == 0)
+               MimeLoadData(Mime);
        if (StrLength(Mime->Data) > 0) {
                StrBuf *Buf;
                Buf = NewStrBuf();
@@ -510,7 +511,7 @@ void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundC
                }
 
                /* In all cases, display the full card */
-               display_vcard(Buf, Mime->Data, 0, 1, NULL, Mime->msgnum);
+               display_vcard(Buf, Mime, 0, 1, NULL, -1);
                FreeStrBuf(&Mime->Data);
                Mime->Data = Buf;
        }
@@ -519,7 +520,8 @@ void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundC
 
 void render_MIME_VNote(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
 {
-       MimeLoadData(Mime);
+       if (StrLength(Mime->Data) == 0)
+               MimeLoadData(Mime);
        if (StrLength(Mime->Data) > 0) {
                struct vnote *v;
                StrBuf *Buf;
@@ -564,6 +566,7 @@ void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCha
 
 void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
+       const char *Ptr = NULL;
        wc_mime_attachment *Mime;
        StrBuf *Buf;
        
@@ -573,17 +576,17 @@ void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundChars
        Buf = NewStrBuf();
 
        Mime->Name = NewStrBuf();
-       StrBufExtract_token(Buf, HdrLine, 0, '|');
+       StrBufExtract_NextToken(Buf, HdrLine, &Ptr, '|');
        StrBuf_RFC822_to_Utf8(Mime->Name, Buf, WC->DefaultCharset, FoundCharset);
        StrBufTrim(Mime->Name);
 
-       StrBufExtract_token(Buf, HdrLine, 1, '|');
+       StrBufExtract_NextToken(Buf, HdrLine, &Ptr, '|');
        Mime->FileName = NewStrBuf();
        StrBuf_RFC822_to_Utf8(Mime->FileName, Buf, WC->DefaultCharset, FoundCharset);
        StrBufTrim(Mime->FileName);
 
        Mime->PartNum = NewStrBuf();
-       StrBufExtract_token(Mime->PartNum, HdrLine, 2, '|');
+       StrBufExtract_NextToken(Mime->PartNum, HdrLine, &Ptr, '|');
        StrBufTrim(Mime->PartNum);
        if (strchr(ChrPtr(Mime->PartNum), '.') != NULL) 
                Mime->level = 2;
@@ -591,18 +594,24 @@ void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundChars
                Mime->level = 1;
 
        Mime->Disposition = NewStrBuf();
-       StrBufExtract_token(Mime->Disposition, HdrLine, 3, '|');
+       StrBufExtract_NextToken(Mime->Disposition, HdrLine, &Ptr, '|');
 
        Mime->ContentType = NewStrBuf();
-       StrBufExtract_token(Mime->ContentType, HdrLine, 4, '|');
+       StrBufExtract_NextToken(Mime->ContentType, HdrLine, &Ptr, '|');
        StrBufTrim(Mime->ContentType);
        StrBufLowerCase(Mime->ContentType);
-
        if (!strcmp(ChrPtr(Mime->ContentType), "application/octet-stream")) {
                StrBufPlain(Mime->ContentType, 
                            GuessMimeByFilename(SKEY(Mime->FileName)), -1);
        }
-       Mime->length = StrBufExtract_int(HdrLine, 5, '|');
+
+       Mime->length = StrBufExtractNext_int(HdrLine, &Ptr, '|');
+
+       StrBufSkip_NTokenS(HdrLine, &Ptr, '|', 1);  /* cbid?? */
+
+       Mime->Charset = NewStrBuf();
+       StrBufExtract_NextToken(Mime->Charset, HdrLine, &Ptr, '|');
+
 
        if ( (StrLength(Mime->FileName) == 0) && (StrLength(Mime->Name) > 0) ) {
                StrBufAppendBuf(Mime->FileName, Mime->Name, 0);
@@ -824,12 +833,18 @@ void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP)
         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);
+       /* Insert the existing content of the wiki page into the editor.  But we only want
+        * to do this the first time -- if the user is uploading an attachment we don't want
+        * to do it again.
+        */
+       if (!havebstr("attach_button")) {
+               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);
+               }
        }
 }
 
@@ -1151,6 +1166,7 @@ void servcmd_readold(char *buf, long bufsize)
 }
 
 
+/* DO NOT REORDER OR REMOVE ANY OF THESE */
 readloop_struct rlid[] = {
        { {HKEY("do_search")},  servcmd_do_search       },
        { {HKEY("headers")},    servcmd_headers         },
@@ -1192,7 +1208,23 @@ int ParseMessageListHeaders_Detail(StrBuf *Line,
         */
        StrBufSkip_NTokenS(Line, pos, '|', 1);
        Msg->subj = NewStrBufPlain(NULL, StrLength(Line));
+
+       FlushStrBuf(ConversionBuffer);
+       /* we assume the subject is the last parameter inside of the list; 
+        * thus we don't use the tokenizer to fetch it, since it will hick up 
+        * on tokenizer chars inside of the subjects
        StrBufExtract_NextToken(ConversionBuffer,  Line, pos, '|');
+       */
+       if (*pos != StrBufNOTNULL) {
+               StrBufPlain(ConversionBuffer, *pos, 
+                           StrLength(Line) - (*pos - ChrPtr(Line)));
+               *pos = StrBufNOTNULL;
+               if ((StrLength(ConversionBuffer) > 0) &&
+                   (*(ChrPtr(ConversionBuffer) + 
+                      StrLength(ConversionBuffer) - 1) == '|'))
+                       StrBufCutRight(ConversionBuffer, 1);
+       }
+
        if (StrLength(ConversionBuffer) == 0)
                StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
        else {