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 */
* printable_view Nonzero to display a printable view
* section Optional for encapsulated message/rfc822 submessage
*/
-int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, int printable_view, const StrBuf *PartNum) {
+int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, int printable_view, const StrBuf *PartNum)
+{
+ wcsession *WCC = WC;
StrBuf *Buf;
StrBuf *HdrToken;
StrBuf *FoundCharset;
memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
Msg->MsgBody->msgnum = msgnum;
FoundCharset = NewStrBuf();
- while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
+ while ((StrBuf_ServGetlnBuffered(Buf)>=0) && !Done) {
if ( (StrLength(Buf)==3) &&
!strcmp(ChrPtr(Buf), "000"))
{
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) &&
state++;
}
}
- else lprintf(1, "don't know how to handle message header[%s]\n", ChrPtr(HdrToken));
+ else LogError(Target,
+ __FUNCTION__,
+ "don't know how to handle message header[%s]\n",
+ ChrPtr(HdrToken));
break;
case 1:/* Message Mime Header */
if (StrLength(Buf) == 0) {
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) &&
case 2: /* Message Body */
if (Msg->MsgBody->size_known > 0) {
- StrBuf_ServGetBLOB(Msg->MsgBody->Data, Msg->MsgBody->length);
+ StrBuf_ServGetBLOBBuffered(Msg->MsgBody->Data, Msg->MsgBody->length);
state ++;
/*/ todo: check next line, if not 000, append following lines */
}
else
{
if ((StrLength(Msg->OtherNode)>0) &&
- (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(serv_info.serv_nodename))) &&
- (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(serv_info.serv_humannode)) ))
+ (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(WCC->serv_info->serv_nodename))) &&
+ (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(WCC->serv_info->serv_humannode)) ))
{
if (Msg->reply_to == NULL)
Msg->reply_to = NewStrBuf();
}
DeleteHashPos(&it);
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_MAILSUM;
+ SubTP.Filter.ContextType = CTX_MAILSUM;
SubTP.Context = Msg;
DoTemplate(tmpl, tmpllen, Target, &SubTP);
*/
void embed_message(void) {
long msgnum = 0L;
+ wcsession *WCC = WC;
const StrBuf *Tmpl = sbstr("template");
- msgnum = StrTol(WC->UrlFragment2);
+ msgnum = StrTol(WCC->UrlFragment2);
if (StrLength(Tmpl) > 0)
- read_message(WC->WBuf, SKEY(Tmpl), msgnum, 0, NULL);
+ read_message(WCC->WBuf, SKEY(Tmpl), msgnum, 0, NULL);
else
- read_message(WC->WBuf, HKEY("view_message"), msgnum, 0, NULL);
+ read_message(WCC->WBuf, HKEY("view_message"), msgnum, 0, NULL);
}
serv_printf("MSG0 %ld|1", MsgNum); /* ask for headers only */
- StrBuf_ServGetln(Buf);
+ StrBuf_ServGetlnBuffered(Buf);
if (GetServerStatus(Buf, NULL) == 1) {
FreeStrBuf(&Buf);
return NULL;
Msg = (message_summary*)malloc(sizeof(message_summary));
memset(Msg, 0, sizeof(message_summary));
- while (len = StrBuf_ServGetln(Buf),
+ while (len = StrBuf_ServGetlnBuffered(Buf),
((len != 3) ||
strcmp(ChrPtr(Buf), "000")== 0)){
buf = ChrPtr(Buf);
long len;
int n;
int skipit;
+ const char *Ptr;
if (WCC->summ != NULL) {
DeleteHash(&WCC->summ);
Buf = NewStrBuf();
serv_puts(servcmd);
- StrBuf_ServGetln(Buf);
+ StrBuf_ServGetlnBuffered(Buf);
if (GetServerStatus(Buf, NULL) != 1) {
FreeStrBuf(&Buf);
return (nummsgs);
}
Buf2 = NewStrBuf();
- while (len = StrBuf_ServGetln(Buf),
+ while (len = StrBuf_ServGetlnBuffered(Buf),
((len != 3) ||
strcmp(ChrPtr(Buf), "000")!= 0))
{
if (nummsgs < maxload) {
skipit = 0;
+ Ptr = NULL;
Msg = (message_summary*)malloc(sizeof(message_summary));
memset(Msg, 0, sizeof(message_summary));
- Msg->msgnum = StrBufExtract_long(Buf, 0, '|');
- Msg->date = StrBufExtract_long(Buf, 1, '|');
+ Msg->msgnum = StrBufExtractNext_long(Buf, &Ptr, '|');
+ Msg->date = StrBufExtractNext_long(Buf, &Ptr, '|');
/*
* as citserver probably gives us messages in forward date sorting
* nummsgs should be the same order as the message date.
}
if (!skipit) {
Msg->from = NewStrBufPlain(NULL, StrLength(Buf));
- StrBufExtract_token(Buf2, Buf, 2, '|');
+ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
if (StrLength(Buf2) != 0) {
/** Handle senders with RFC2047 encoding */
StrBuf_RFC822_to_Utf8(Msg->from, Buf2, WCC->DefaultCharset, FoundCharset);
}
/** Nodename */
- StrBufExtract_token(Buf2, Buf, 3, '|');
+ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
if ((StrLength(Buf2) !=0 ) &&
( ((WCC->room_flags & QR_NETWORK)
- || ((strcasecmp(ChrPtr(Buf2), ChrPtr(serv_info.serv_nodename))
- && (strcasecmp(ChrPtr(Buf2), ChrPtr(serv_info.serv_fqdn))))))))
+ || ((strcasecmp(ChrPtr(Buf2), ChrPtr(WCC->serv_info->serv_nodename))
+ && (strcasecmp(ChrPtr(Buf2), ChrPtr(WCC->serv_info->serv_fqdn))))))))
{
StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
StrBufAppendBuf(Msg->from, Buf2, 0);
/** Not used:
StrBufExtract_token(Msg->inetaddr, Buf, 4, '|');
*/
-
+ StrBufSkip_NTokenS(Buf, &Ptr, '|', 1);
Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
- StrBufExtract_token(Buf2, Buf, 5, '|');
+ StrBufExtract_NextToken(Buf2, Buf, &Ptr, '|');
if (StrLength(Buf2) == 0)
StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
else {
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);
}
vector[6] = 0;
FlushStrBuf(TmpBuf);
- vector[1] = lbstr("maxmsgs") == 9999999;
+ 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);
int sortit = 0;
int defaultsortorder = 0;
WCTemplputParams SubTP;
+ char *ab_name;
if (havebstr("is_summary") && (1 == (ibstr("is_summary"))))
WCC->wc_view = VIEW_MAILBOX;
+ if (!WCC->is_ajax) {
+ output_headers(1, 1, 1, 0, 0, 0);
+ } else if (WCC->wc_view == VIEW_MAILBOX) {
+ jsonMessageListHdr();
+ }
+
switch (WCC->wc_view) {
case VIEW_WIKI:
sprintf(buf, "wiki?room=%s&page=home", ChrPtr(WCC->wc_roomname));
case VIEW_CALBRIEF:
case VIEW_CALENDAR:
load_seen = 1;
- strcpy(cmd, "MSGS ALL|||1");
+ strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
parse_calendar_view_request(&calv);
break;
}
}
- if (!WCC->is_ajax) {
- output_headers(1, 1, 1, 0, 0, 0);
- } else if (WCC->wc_view == VIEW_MAILBOX) {
- jsonMessageListHdr();
- }
+
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."));
default:
wprintf(_("No messages here."));
}
- wprintf("</em><br /></div>\n");
+ wprintf("</em><br></div>\n");
goto DONE;
}
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);
}
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);
display_note(Msg, Msg->is_new);
break;
case VIEW_ADDRESSBOOK:
- fetch_ab_name(Msg, buf);
+ ab_name = NULL;
+ fetch_ab_name(Msg, &ab_name);
++num_ab;
addrbook = realloc(addrbook,
(sizeof(addrbookent) * num_ab) );
- safestrncpy(addrbook[num_ab-1].ab_name, buf,
+ safestrncpy(addrbook[num_ab-1].ab_name, ab_name,
sizeof(addrbook[num_ab-1].ab_name));
addrbook[num_ab-1].ab_msgnum = Msg->msgnum;
+ free(ab_name);
break;
case VIEW_BBS: /* Tag the mails we want to show in bbview... */
default:
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);
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:
/** Note: wDumpContent() will output one additional </div> tag. */
if (WCC->wc_view != VIEW_MAILBOX) {
/* We ought to move this out into template */
- wprintf("</div>\n"); /** end of 'content' div */
wDumpContent(1);
} else {
end_burst();
char *txtmail = NULL;
sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x",
- ChrPtr(serv_info.serv_fqdn),
+ ChrPtr(WCC->serv_info->serv_fqdn),
getpid(),
++seq
);
sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
- ChrPtr(serv_info.serv_fqdn),
+ ChrPtr(WCC->serv_info->serv_fqdn),
getpid(),
++seq
);
*/
pch = strrchr(ChrPtr(att->FileName), '/');
if (pch != NULL) {
- StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName));
+ StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
}
pch = strrchr(ChrPtr(att->FileName), '\\');
if (pch != NULL) {
- StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName));
+ StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
}
/**
{
const StrBuf *ref = sbstr("references");
references = NewStrBufPlain(ChrPtr(ref), StrLength(ref));
- lprintf(9, "Converting: %s\n", ChrPtr(references));
+ if (*ChrPtr(references) == '|') { /* remove leading '|' if present */
+ StrBufCutLeft(references, 1);
+ }
StrBufReplaceChars(references, '|', '!');
- lprintf(9, "Converted: %s\n", ChrPtr(references));
}
if (havebstr("subject")) {
const StrBuf *Subj;
* partnum The MIME part to be output
* force_download Nonzero to force set the Content-Type: header to "application/octet-stream"
*/
-void mimepart(const char *msgnum, const char *partnum, int force_download)
+void mimepart(int force_download)
{
- char buf[256];
+ wcsession *WCC = WC;
+ StrBuf *Buf;
off_t bytes;
- char content_type[256];
-
- serv_printf("OPNA %s|%s", msgnum, partnum);
- serv_getln(buf, sizeof buf);
- if (buf[0] == '2') {
- bytes = extract_long(&buf[4], 0);
- if (force_download) {
- strcpy(content_type, "application/octet-stream");
- }
- else {
- extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
+ StrBuf *ContentType = NewStrBufPlain(HKEY("application/octet-stream"));
+ const char *CT;
+
+ Buf = NewStrBuf();
+ serv_printf("OPNA %s|%s", ChrPtr(WCC->UrlFragment2), ChrPtr(WCC->UrlFragment3));
+ StrBuf_ServGetlnBuffered(Buf);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ StrBufCutLeft(Buf, 4);
+ bytes = StrBufExtract_long(Buf, 0, '|');
+ if (!force_download) {
+ StrBufExtract_token(ContentType, Buf, 3, '|');
}
- output_headers(0, 0, 0, 0, 0, 0);
- read_server_binary(WC->WBuf, bytes);
+ read_server_binary(WCC->WBuf, bytes, Buf);
serv_puts("CLOS");
- serv_getln(buf, sizeof buf);
- http_transmit_thing(content_type, 0);
+ StrBuf_ServGetlnBuffered(Buf);
+ CT = ChrPtr(ContentType);
+
+ if (!force_download) {
+ if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) {
+ CT = GuessMimeByFilename(SKEY(WCC->UrlFragment4));
+ }
+ if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) {
+ CT = GuessMimeType(SKEY(WCC->WBuf));
+ }
+ }
+ output_headers(0, 0, 0, 0, 0, 0);
+ http_transmit_thing(CT, 0);
} else {
- hprintf("HTTP/1.1 404 %s\n", &buf[4]);
+ StrBufCutLeft(Buf, 4);
+ hprintf("HTTP/1.1 404 %s\n", ChrPtr(Buf));
output_headers(0, 0, 0, 0, 0, 0);
hprintf("Content-Type: text/plain\r\n");
- wprintf(_("An error occurred while retrieving this part: %s\n"), &buf[4]);
+ wprintf(_("An error occurred while retrieving this part: %s\n"),
+ ChrPtr(Buf));
end_burst();
}
+ FreeStrBuf(&ContentType);
+ FreeStrBuf(&Buf);
}
/*
* Read any MIME part of a message, from the server, into memory.
*/
-char *load_mimepart(long msgnum, char *partnum)
+StrBuf *load_mimepart(long msgnum, char *partnum)
{
- char buf[SIZ];
off_t bytes;
- char content_type[SIZ];
- char *content;
+ StrBuf *Buf;
+ Buf = NewStrBuf();
serv_printf("DLAT %ld|%s", msgnum, partnum);
- serv_getln(buf, sizeof buf);
- if (buf[0] == '6') {
- bytes = extract_long(&buf[4], 0);
- extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
-
- content = malloc(bytes + 2);
- serv_read(content, bytes);
+ StrBuf_ServGetlnBuffered(Buf);
+ if (GetServerStatus(Buf, NULL) == 6) {
+ StrBufCutLeft(Buf, 4);
+ bytes = StrBufExtract_long(Buf, 0, '|');
- content[bytes] = 0; /* null terminate for good measure */
- return(content);
+ StrBuf_ServGetBLOBBuffered(Buf, bytes);
+ return(Buf);
}
else {
+ FreeStrBuf(&Buf);
return(NULL);
}
}
*/
void MimeLoadData(wc_mime_attachment *Mime)
{
- char buf[SIZ];
+ StrBuf *Buf;
off_t bytes;
/* TODO: is there a chance the contenttype is different to the one we know? */
serv_printf("DLAT %ld|%s", Mime->msgnum, ChrPtr(Mime->PartNum));
- serv_getln(buf, sizeof buf);
- if (buf[0] == '6') {
- bytes = extract_long(&buf[4], 0);
-
+ Buf = NewStrBuf();
+ StrBuf_ServGetlnBuffered(Buf);
+ if (GetServerStatus(Buf, NULL) == 6) {
+ bytes = extract_long(&(ChrPtr(Buf)[4]), 0);
+
if (Mime->Data == NULL)
Mime->Data = NewStrBufPlain(NULL, bytes);
- StrBuf_ServGetBLOB(Mime->Data, bytes);
-
+ StrBuf_ServGetBLOBBuffered(Mime->Data, bytes);
}
else {
FlushStrBuf(Mime->Data);
/* TODO XImportant message */
}
+ FreeStrBuf(&Buf);
}
void view_mimepart(void) {
- mimepart(ChrPtr(WC->UrlFragment2),
- ChrPtr(WC->UrlFragment3),
- 0);
+ mimepart(0);
}
void download_mimepart(void) {
- mimepart(ChrPtr(WC->UrlFragment2),
- ChrPtr(WC->UrlFragment3),
- 1);
+ mimepart(1);
}
void view_postpart(void) {
/* 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(serv_info.serv_software));
+ 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();
}
/* 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) {
- output_headers(1,1,1,0,0,1);
begin_burst();
DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
DoTemplate(HKEY("trailing"),NULL,&NoCtx);
/** Output message list in JSON-format */
void jsonMessageList(void) {
const StrBuf *room = sbstr("room");
+ long oper = (havebstr("query")) ? do_search : readnew;
WC->is_ajax = 1;
- smart_goto(room);
+ gotoroom(room);
+ readloop(oper);
WC->is_ajax = 0;
}
InitModule_MSG
(void)
{
- RegisterPreference(HKEY("use_sig"),
+ RegisterPreference("use_sig",
_("Attach signature to email messages?"),
PRF_YESNO,
NULL);
- RegisterPreference(HKEY("signature"), _("Use this signature:"), PRF_QP_STRING, NULL);
- RegisterPreference(HKEY("default_header_charset"),
+ RegisterPreference("signature", _("Use this signature:"), PRF_QP_STRING, NULL);
+ RegisterPreference("default_header_charset",
_("Default character set for email headers:"),
PRF_STRING,
NULL);
- RegisterPreference(HKEY("defaultfrom"), _("Preferred email address"), PRF_STRING, NULL);
- RegisterPreference(HKEY("defaultname"),
+ RegisterPreference("defaultfrom", _("Preferred email address"), PRF_STRING, NULL);
+ RegisterPreference("defaultname",
_("Preferred display name for email messages"),
PRF_STRING,
NULL);
- RegisterPreference(HKEY("defaulthandle"),
+ RegisterPreference("defaulthandle",
_("Preferred display name for bulletin board posts"),
PRF_STRING,
NULL);
- RegisterPreference(HKEY("mailbox"),_("Mailbox view mode"), PRF_STRING, NULL);
+ RegisterPreference("mailbox",_("Mailbox view mode"), PRF_STRING, NULL);
WebcitAddUrlHandler(HKEY("readnew"), h_readnew, NEED_URL);
WebcitAddUrlHandler(HKEY("readold"), h_readold, NEED_URL);
/* json */
WebcitAddUrlHandler(HKEY("roommsgs"), jsonMessageList,0);
-
- WebcitAddUrlHandler(HKEY("mimepart"), view_mimepart, NEED_URL);
- WebcitAddUrlHandler(HKEY("mimepart_download"), download_mimepart, NEED_URL);
- WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL);
- WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL);
-
return ;
}