CtxType CTX_MAILSUM = CTX_NONE;
CtxType CTX_MIME_ATACH = CTX_NONE;
+HashList *MsgHeaderHandler = NULL;
+HashList *DflMsgHeaderHandler = NULL;
+
+
static inline void CheckConvertBufs(struct wcsession *WCC)
{
if (WCC->ConvertBuf1 == NULL)
}
+int EvaluateMsgHdr(const char *HeaderName, long HdrNLen, message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
+{
+ void *vHdr;
+ headereval* Hdr = NULL;
+ if (HdrNLen == 4) {
+ if (GetHash(DflMsgHeaderHandler, HeaderName, HdrNLen, &vHdr) &&
+ (vHdr != NULL)) {
+ Hdr = (headereval*)vHdr;
+ }
+ }
+ if (Hdr == NULL && GetHash(MsgHeaderHandler, HeaderName, HdrNLen, &vHdr) &&
+ (vHdr != NULL)) {
+ Hdr = (headereval*)vHdr;
+ }
+ if (Hdr == NULL)
+ return -1;
+ Hdr->evaluator(Msg, HdrLine, FoundCharset);
+ return Hdr->Type;
+}
void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc evaluator, int type)
{
ev = (headereval*) malloc(sizeof(headereval));
ev->evaluator = evaluator;
ev->Type = type;
+
+ if (HdrNLen == 4) {
+ eMessageField f;
+ if (GetFieldFromMnemonic(&f, HeaderName)) {
+ Put(DflMsgHeaderHandler, HeaderName, HdrNLen, ev, NULL);
+ return;
+ }
+ }
Put(MsgHeaderHandler, HeaderName, HdrNLen, ev, NULL);
}
Mime->Data = NewStrBufPlain(NULL, Mime->length);
else
FlushStrBuf(Mime->Data);
- read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, Mime->PartNum, &TemplateMime);
+ read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, Mime->PartNum, &TemplateMime, TP);
/*
if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) {
for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
*/
}
-void render_MIME_VCard(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
-{
- wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
- wcsession *WCC = WC;
- if (StrLength(Mime->Data) == 0)
- MimeLoadData(Mime);
- if (StrLength(Mime->Data) > 0) {
- StrBuf *Buf;
- Buf = NewStrBuf();
- /** If it's my vCard I can edit it */
- if ( (!strcasecmp(ChrPtr(WCC->CurRoom.name), USERCONFIGROOM))
- || (!strcasecmp(&(ChrPtr(WCC->CurRoom.name)[11]), USERCONFIGROOM))
- || (WC->CurRoom.view == VIEW_ADDRESSBOOK)
- ) {
- StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld?partnum=%s\">",
- Mime->msgnum, ChrPtr(Mime->PartNum));
- StrBufAppendPrintf(Buf, "[%s]</a>", _("edit"));
- }
-
- /* In all cases, display the full card */
- display_vcard(Buf, Mime, 0, 1, NULL, -1);
- FreeStrBuf(&Mime->Data);
- Mime->Data = Buf;
- }
-
-}
-
void render_MIME_ICS(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
{
wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
void examine_content_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
{
- void *vHdr;
- headereval *Hdr;
StrBuf *Token;
StrBuf *Value;
const char* sem;
}
StrBufTrim(Token);
- if (GetHash(MsgHeaderHandler, SKEY(Token), &vHdr) &&
- (vHdr != NULL)) {
- Hdr = (headereval*)vHdr;
- Hdr->evaluator(Msg, Value, FoundCharset);
- }
- else syslog(LOG_WARNING, "don't know how to handle content type sub-header[%s]\n", ChrPtr(Token));
+ if (EvaluateMsgHdr(SKEY(Token), Msg, Value, FoundCharset) < 0)
+ syslog(LOG_WARNING, "don't know how to handle content type sub-header[%s]\n", ChrPtr(Token));
}
FreeStrBuf(&Token);
FreeStrBuf(&Value);
perma_link = NewStrBufPlain(HKEY("/readfwd?go="));
StrBufUrlescAppend(perma_link, WC->CurRoom.name, NULL);
- View = SBSTR("view");
+ View = sbstr("view");
if (View != NULL) {
StrBufAppendBufPlain(perma_link, HKEY("?view="), 0);
StrBufAppendBuf(perma_link, View, 0);
MsgNum = LBstr(TKEY(0));
Buf = NewStrBuf();
- read_message(Buf, HKEY("view_message_replyquote"), MsgNum, NULL, &Mime);
+ read_message(Buf, HKEY("view_message_replyquote"), MsgNum, NULL, &Mime, TP);
StrBufAppendTemplate(Target, TP, Buf, 1);
FreeStrBuf(&Buf);
}
MsgNum = LBstr(TKEY(0));
Buf = NewStrBuf();
- read_message(Buf, HKEY("view_message_edit"), MsgNum, NULL, &Mime);
+ read_message(Buf, HKEY("view_message_edit"), MsgNum, NULL, &Mime, TP);
StrBufAppendTemplate(Target, TP, Buf, 1);
FreeStrBuf(&Buf);
}
free(wikipage);
if (msgnum >= 0L) {
Buf = NewStrBuf();
- read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime);
+ read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime, TP);
StrBufAppendTemplate(Target, TP, Buf, 1);
FreeStrBuf(&Buf);
}
{ {HKEY("readlt")}, servcmd_readlt }
};
+const char* fieldMnemonics[] = {
+ "from", /* A -> eAuthor */
+ "exti", /* E -> eXclusivID */
+ "rfca", /* F -> erFc822Addr */
+ "hnod", /* H -> eHumanNode */
+ "msgn", /* I -> emessageId */
+ "jrnl", /* J -> eJournal */
+ "rep2", /* K -> eReplyTo */
+ "list", /* L -> eListID */
+ "text", /* M -> eMesageText */
+ "node", /* N -> eNodeName */
+ "room", /* O -> eOriginalRoom */
+ "path", /* P -> eMessagePath */
+ "rcpt", /* R -> eRecipient */
+ "spec", /* S -> eSpecialField */
+ "time", /* T -> eTimestamp */
+ "subj", /* U -> eMsgSubject */
+ "nvto", /* V -> eenVelopeTo */
+ "wefw", /* W -> eWeferences */
+ "cccc" /* Y -> eCarbonCopY */
+};
+HashList *msgKeyLookup = NULL;
-int ParseMessageListHeaders_Detail(StrBuf *Line,
- const char **pos,
- message_summary *Msg,
- StrBuf *ConversionBuffer)
+int GetFieldFromMnemonic(eMessageField *f, const char* c)
{
- wcsession *WCC = WC;
- long len;
- long totallen;
-
- CheckConvertBufs(WCC);
-
- totallen = StrLength(Line);
- Msg->from = NewStrBufPlain(NULL, totallen);
- len = StrBufExtract_NextToken(ConversionBuffer, Line, pos, '|');
- if (len > 0) {
- /* Handle senders with RFC2047 encoding */
- StrBuf_RFC822_2_Utf8(Msg->from,
- ConversionBuffer,
- WCC->DefaultCharset,
- NULL,
- WCC->ConvertBuf1,
- WCC->ConvertBuf2);
- }
-
- /* node name */
- len = StrBufExtract_NextToken(ConversionBuffer, Line, pos, '|');
- if ((len > 0 ) &&
- ( ((WCC->CurRoom.QRFlags & QR_NETWORK)
- || ((strcasecmp(ChrPtr(ConversionBuffer), ChrPtr(WCC->serv_info->serv_nodename))
- && (strcasecmp(ChrPtr(ConversionBuffer), ChrPtr(WCC->serv_info->serv_fqdn))))))))
- {
- StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
- StrBufAppendBuf(Msg->from, ConversionBuffer, 0);
- }
-
- /* Internet address (not used)
- * StrBufExtract_token(Msg->inetaddr, Line, 4, '|');
- */
- StrBufSkip_NTokenS(Line, pos, '|', 1);
- Msg->subj = NewStrBufPlain(NULL, totallen);
-
- 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, '|');
- */
- len = 0;
- if (*pos != StrBufNOTNULL) {
- len = totallen - (*pos - ChrPtr(Line));
- StrBufPlain(ConversionBuffer, *pos, len);
- *pos = StrBufNOTNULL;
- if ((len > 0) &&
- (*(ChrPtr(ConversionBuffer) + len - 1) == '|'))
- StrBufCutRight(ConversionBuffer, 1);
- }
-
- if (len == 0)
- StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
- else {
- StrBuf_RFC822_2_Utf8(Msg->subj,
- ConversionBuffer,
- WCC->DefaultCharset,
- NULL,
- WCC->ConvertBuf1,
- WCC->ConvertBuf2);
+ void *v = NULL;
+ if (GetHash(msgKeyLookup, c, 4, &v)) {
+ *f = (eMessageField) v;
+ return 1;
}
-
- return 1;
-}
-
-
-int mailview_GetParamsGetServerCall(SharedMessageStatus *Stat,
- void **ViewSpecific,
- long oper,
- char *cmd,
- long len,
- char *filter,
- long flen)
-{
- DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
-
- return 200;
-}
-
-int mailview_Cleanup(void **ViewSpecific)
-{
- /* Note: wDumpContent() will output one additional </div> tag. */
- /* We ought to move this out into template */
- wDumpContent(1);
-
return 0;
}
-
-int json_GetParamsGetServerCall(SharedMessageStatus *Stat,
- void **ViewSpecific,
- long oper,
- char *cmd,
- long len,
- char *filter,
- long flen)
-{
- Stat->defaultsortorder = 2;
- Stat->sortit = 1;
- Stat->load_seen = 1;
- /* Generally using maxmsgs|startmsg is not required
- in mailbox view, but we have a 'safemode' for clients
- (*cough* Exploder) that simply can't handle too many */
- if (havebstr("maxmsgs")) Stat->maxmsgs = ibstr("maxmsgs");
- else Stat->maxmsgs = 9999999;
- if (havebstr("startmsg")) Stat->startmsg = lbstr("startmsg");
- snprintf(cmd, len, "MSGS %s|%s||1",
- (oper == do_search) ? "SEARCH" : "ALL",
- (oper == do_search) ? bstr("query") : ""
- );
-
- return 200;
-}
-int json_MessageListHdr(SharedMessageStatus *Stat, void **ViewSpecific)
-{
- /* TODO: make a generic function */
- hprintf("HTTP/1.1 200 OK\r\n");
- hprintf("Content-type: application/json; charset=utf-8\r\n");
- hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
- hprintf("Connection: close\r\n");
- hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
- begin_burst();
- return 0;
-}
-
-int json_RenderView_or_Tail(SharedMessageStatus *Stat,
- void **ViewSpecific,
- long oper)
+void FillMsgKeyLookupTable(void)
{
- DoTemplate(HKEY("mailsummary_json"),NULL, NULL);
-
- return 0;
-}
+ long i;
-int json_Cleanup(void **ViewSpecific)
-{
- /* Note: wDumpContent() will output one additional </div> tag. */
- /* We ought to move this out into template */
- end_burst();
+ msgKeyLookup = NewHash (1, FourHash);
- return 0;
+ for (i=0; i < 20; i++) {
+ if (fieldMnemonics[i] != NULL) {
+ Put(msgKeyLookup, fieldMnemonics[i], 4, (void*)i, reference_free_handler);
+ }
+ }
}
{
RegisterCTX(CTX_MAILSUM);
RegisterCTX(CTX_MIME_ATACH);
- RegisterReadLoopHandlerset(
- VIEW_MAILBOX,
- mailview_GetParamsGetServerCall,
- NULL, /* TODO: is this right? */
- NULL,
- ParseMessageListHeaders_Detail,
- NULL,
- NULL,
- mailview_Cleanup);
-
- RegisterReadLoopHandlerset(
- VIEW_JSON_LIST,
- json_GetParamsGetServerCall,
- json_MessageListHdr,
- NULL, /* TODO: is this right? */
- ParseMessageListHeaders_Detail,
- NULL,
- json_RenderView_or_Tail,
- json_Cleanup);
RegisterSortFunc(HKEY("date"),
NULL, 0,
/* mime renderers translate an attachment into webcit viewable html text */
RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL, 0, 150);
- 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);
#endif
RegisterMimeRenderer(HKEY(""), render_MAIL_UNKNOWN, 0, 0);
+ FillMsgKeyLookupTable();
+
/* these headers are citserver replies to MSG4 and friends. one evaluator for each */
RegisterMsgHdr(HKEY("nhdr"), examine_nhdr, 0);
RegisterMsgHdr(HKEY("type"), examine_type, 0);
ServerStartModule_MSGRENDERERS
(void)
{
+ DflMsgHeaderHandler = NewHash (1, FourHash);
MsgHeaderHandler = NewHash(1, NULL);
MimeRenderHandler = NewHash(1, NULL);
ReadLoopHandler = NewHash(1, NULL);
DeleteHash(&MsgHeaderHandler);
DeleteHash(&MimeRenderHandler);
DeleteHash(&ReadLoopHandler);
+ DeleteHash(&msgKeyLookup);
}
-
-
void
SessionDestroyModule_MSGRENDERERS
(wcsession *sess)
projects / citadel.git / blobdiff