0) {
+ StrBufAppendBuf(refs, msgn, 0);
}
PutBstr(HKEY("references"), refs);
}
@@ -1442,20 +1572,25 @@ void display_enter(void)
/*
* If this is a Reply or a ReplyAll, copy the sender's email into the To: field
*/
- if ( (!strcasecmp(bstr("replying_mode"), "reply"))
- || (!strcasecmp(bstr("replying_mode"), "replyall"))
- ) {
- StrBuf *to_rcpt = NewStrBuf();
- if (!IsEmptyStr(rfca)) {
- StrBufAppendPrintf(to_rcpt, "%s <%s>", from, rfca);
+ if ((ReplyMode == eReply) || (ReplyMode == eReplyAll)) {
+ StrBuf *to_rcpt;
+
+ if ((StrLength(replyto) > 0) && (ReplyMode == eReplyAll)) {
+ to_rcpt = NewStrBuf();
+ StrBufAppendBuf(to_rcpt, replyto, 0);
+ }
+
+ else if ( (StrLength(rfca) > 0) && (message_originated_locally == 0) ) {
+ to_rcpt = NewStrBuf();
+ StrBufAppendBuf(to_rcpt, from, 0);
+ StrBufAppendBufPlain(to_rcpt, HKEY(" <"), 0);
+ StrBufAppendBuf(to_rcpt, rfca, 0);
+ StrBufAppendBufPlain(to_rcpt, HKEY(">"), 0);
}
+
else {
- StrBufAppendPrintf(to_rcpt, "%s", from);
- if ( (!IsEmptyStr(node))
- && (strcasecmp(node, ChrPtr(WC->serv_info->serv_nodename)))
- ) {
- StrBufAppendPrintf(to_rcpt, " @ %s", node);
- }
+ to_rcpt = from;
+ from = NULL;
}
PutBstr(HKEY("recp"), to_rcpt);
}
@@ -1463,40 +1598,61 @@ void display_enter(void)
/*
* Only if this is a ReplyAll, copy all recipients into the Cc: field
*/
- if ( (!strcasecmp(bstr("replying_mode"), "replyall"))
- ) {
- StrBuf *cc_rcpt = NewStrBuf();
- if (!IsEmptyStr(rcpt)) {
- StrBufAppendPrintf(cc_rcpt, "%s", rcpt);
- }
- if ( (!IsEmptyStr(rcpt)) && (!IsEmptyStr(cccc)) ) {
- StrBufAppendPrintf(cc_rcpt, ", ");
+ if (ReplyMode == eReplyAll) {
+ StrBuf *cc_rcpt = rcpt;
+ rcpt = NULL;
+ if ((StrLength(cccc) > 0) && (StrLength(replyto) == 0)) {
+ if (cc_rcpt != NULL) {
+ StrBufAppendPrintf(cc_rcpt, ", ");
+ StrBufAppendBuf(cc_rcpt, cccc, 0);
+ }
+ else {
+ cc_rcpt = cccc;
+ cccc = NULL;
+ }
}
- if (!IsEmptyStr(cccc)) {
- StrBufAppendPrintf(cc_rcpt, "%s", cccc);
+ if (cc_rcpt != NULL) {
+ PutBstr(HKEY("cc"), cc_rcpt);
}
- PutBstr(HKEY("cc"), cc_rcpt);
}
- }
+ // We might not need these logs anymore.
+ syslog(LOG_DEBUG, "wefw = %s", ChrPtr(wefw));
+ syslog(LOG_DEBUG, "msgn = %s", ChrPtr(msgn));
+ syslog(LOG_DEBUG, "from = %s", ChrPtr(from));
+ syslog(LOG_DEBUG, "rfca = %s", ChrPtr(rfca));
+ syslog(LOG_DEBUG, "rcpt = %s", ChrPtr(rcpt));
+ syslog(LOG_DEBUG, "cccc = %s", ChrPtr(cccc));
+ syslog(LOG_DEBUG, "replyto = %s", ChrPtr(replyto));
+ syslog(LOG_DEBUG, "nvto = %s", ChrPtr(nvto));
+ syslog(LOG_DEBUG, "local = %d" , message_originated_locally);
+
+ FreeStrBuf(&wefw);
+ FreeStrBuf(&msgn);
+ FreeStrBuf(&from);
+ FreeStrBuf(&rfca);
+ FreeStrBuf(&rcpt);
+ FreeStrBuf(&cccc);
+ }
+ FreeStrBuf(&Line);
/*
* Otherwise proceed normally.
* Do a custom room banner with no navbar...
*/
-
if (recipient_required) {
const StrBuf *Recp = NULL;
const StrBuf *Cc = NULL;
const StrBuf *Bcc = NULL;
- const StrBuf *Wikipage = NULL;
+ StrBuf *wikipage = NULL;
StrBuf *CmdBuf = NULL;
const char CMD[] = "ENT0 0|%s|%d|0||%s||%s|%s|%s";
Recp = sbstr("recp");
Cc = sbstr("cc");
Bcc = sbstr("bcc");
- Wikipage = sbstr("page");
+ wikipage = NewStrBufDup(sbstr("page"));
+ str_wiki_index(wikipage);
CmdBuf = NewStrBufPlain(NULL,
sizeof (CMD) +
@@ -1504,7 +1660,7 @@ void display_enter(void)
StrLength(display_name) +
StrLength(Cc) +
StrLength(Bcc) +
- StrLength(Wikipage));
+ StrLength(wikipage));
StrBufPrintf(CmdBuf,
CMD,
@@ -1513,22 +1669,27 @@ void display_enter(void)
ChrPtr(display_name),
ChrPtr(Cc),
ChrPtr(Bcc),
- ChrPtr(Wikipage));
+ ChrPtr(wikipage)
+ );
serv_puts(ChrPtr(CmdBuf));
- serv_getln(buf, sizeof buf);
- FreeStrBuf(&CmdBuf);
+ StrBuf_ServGetln(CmdBuf);
+ free(wikipage);
- if (!strncmp(buf, "570", 3)) { /* 570 means we have an invalid recipient listed */
- if (havebstr("recp") &&
- havebstr("cc" ) &&
- havebstr("bcc" )) {
- recipient_bad = 1; /* TODO: and now????? */
- }
+ rc = GetServerStatusMsg(CmdBuf, &Result, 0, 0);
+
+ if ( (Result == 570) /* invalid or missing recipient(s) */
+ || (Result == 550) /* higher access required to send Internet mail */
+ ) {
+ /* These errors will have been displayed and are excusable */
}
- else if (buf[0] != '2') { /* Any other error means that we cannot continue */
- wc_printf("%s
\n", &buf[4]); /* TODO -> important message */
+ else if (rc != 2) { /* Any other error means that we cannot continue */
+ AppendImportantMessage(ChrPtr(CmdBuf) + 4, StrLength(CmdBuf) - 4);
+ FreeStrBuf(&CmdBuf);
+ fixview();
+ readloop(readnew, eUseDefault);
return;
}
+ FreeStrBuf(&CmdBuf);
}
if (recipient_required)
PutBstr(HKEY("__RCPTREQUIRED"), NewStrBufPlain(HKEY("1")));
@@ -1543,16 +1704,16 @@ void display_enter(void)
return;
}
+
/*
* delete a message
*/
-void delete_msg(void)
-{
+void delete_msg(void) {
long msgid;
- char buf[SIZ];
-
+ StrBuf *Line;
+
msgid = lbstr("msgid");
-
+ Line = NewStrBuf();
if ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0) { /* Delete from Trash is a real delete */
serv_printf("DELE %ld", msgid);
}
@@ -1560,8 +1721,11 @@ void delete_msg(void)
serv_printf("MOVE %ld|_TRASH_|0", msgid);
}
- serv_getln(buf, sizeof buf);
- sprintf(WC->ImportantMessage, "%s", &buf[4]);
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 0);
+
+ fixview();
+
readloop(readnew, eUseDefault);
}
@@ -1569,76 +1733,27 @@ void delete_msg(void)
/*
* move a message to another room
*/
-void move_msg(void)
-{
+void move_msg(void) {
long msgid;
- char buf[SIZ];
msgid = lbstr("msgid");
if (havebstr("move_button")) {
- sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
- serv_puts(buf);
- serv_getln(buf, sizeof buf);
- sprintf(WC->ImportantMessage, "%s", &buf[4]);
+ StrBuf *Line;
+ serv_printf("MOVE %ld|%s", msgid, bstr("target_room"));
+ Line = NewStrBuf();
+ StrBuf_ServGetln(Line);
+ GetServerStatusMsg(Line, NULL, 1, 0);
+ FreeStrBuf(&Line);
} else {
- sprintf(WC->ImportantMessage, (_("The message was not moved.")));
+ AppendImportantMessage(_("The message was not moved."), -1);
}
+ fixview();
readloop(readnew, eUseDefault);
}
-/*
- * Confirm move of a message
- */
-void confirm_move_msg(void)
-{
- char buf[SIZ];
- char targ[SIZ];
-
- output_headers(1, 1, 2, 0, 0, 0);
- wc_printf("\n");
- wc_printf("
");
- wc_printf(_("Confirm move of message"));
- wc_printf("
");
- wc_printf("\n");
-
- wc_printf("\n");
-
- wc_printf("
");
-
- wc_printf(_("Move this message to:"));
- wc_printf("
\n");
-
- wc_printf("\n");
-
- wc_printf("\n");
- wDumpContent(1);
-}
-
-
/*
* Generic function to output an arbitrary MIME attachment from
* message being composed
@@ -1647,8 +1762,7 @@ void confirm_move_msg(void)
* filename Fake filename to give
* force_download Nonzero to force set the Content-Type: header to "application/octet-stream"
*/
-void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
-{
+void postpart(StrBuf *partnum, StrBuf *filename, int force_download) {
void *vPart;
StrBuf *content_type;
wc_mime_attachment *part;
@@ -1679,72 +1793,69 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download)
}
-/*
- * Generic function to output an arbitrary MIME part from an arbitrary
- * message number on the server.
- *
- * msgnum Number of the item on the citadel server
- * partnum The MIME part to be output
- * force_download Nonzero to force set the Content-Type: header to "application/octet-stream"
- */
-void mimepart(int force_download)
-{
+// Generic function to output an arbitrary MIME part from an arbitrary
+// message number on the server.
+//
+// msgnum message number on the citadel server
+// partnum MIME part number to be output
+// force_download Nonzero to force set the Content-Type: header to "application/octet-stream"
+
+void view_or_download_mimepart(int force_download) {
long msgnum;
- StrBuf *att;
- wcsession *WCC = WC;
- StrBuf *Buf;
off_t bytes;
- StrBuf *ContentType = NewStrBufPlain(HKEY("application/octet-stream"));
- const char *CT;
+ StrBuf *Buf;
+ StrBuf *ContentType;
+ StrBuf *PartNum;
- att = Buf = NewStrBuf();
- msgnum = StrBufExtract_long(WCC->Hdr->HR.ReqLine, 0, '/');
- StrBufExtract_token(att, WCC->Hdr->HR.ReqLine, 1, '/');
+ PartNum = NewStrBuf();
- serv_printf("OPNA %ld|%s", msgnum, ChrPtr(att));
- StrBuf_ServGetln(Buf);
- if (GetServerStatus(Buf, NULL) == 2) {
- StrBufCutLeft(Buf, 4);
- bytes = StrBufExtract_long(Buf, 0, '|');
- if (!force_download) {
- StrBufExtract_token(ContentType, Buf, 3, '|');
- }
+ msgnum = StrBufExtract_long(WC->Hdr->HR.ReqLine, 0, '/');
+ StrBufExtract_token(PartNum, WC->Hdr->HR.ReqLine, 1, '/');
- serv_read_binary(WCC->WBuf, bytes, Buf);
- serv_puts("CLOS");
- StrBuf_ServGetln(Buf);
- CT = ChrPtr(ContentType);
+ Buf = NewStrBuf();
+ serv_printf("DLAT %ld|%s", msgnum, ChrPtr(PartNum)); // DLAT will return: 6XX length|-1|filename|cbtype|cbcharset
+ StrBuf_ServGetln(Buf);
+ FreeStrBuf(&PartNum);
- if (!force_download) {
- if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) {
- StrBufExtract_token(Buf, WCC->Hdr->HR.ReqLine, 2, '/');
- CT = GuessMimeByFilename(SKEY(Buf));
- }
- if (!strcasecmp(ChrPtr(ContentType), "application/octet-stream")) {
- CT = GuessMimeType(SKEY(WCC->WBuf));
- }
- }
- http_transmit_thing(CT, 0);
- } else {
- 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");
+ if (GetServerStatus(Buf, NULL) != 6) {
+ FreeStrBuf(&Buf);
+ hprintf("HTTP/1.1 500 error\r\n"
+ "Pragma: no-cache\r\n"
+ "Cache-Control: no-store\r\n"
+ "Expires: -1\r\n"
+ "Content-Type: text/plain\r\n"
+ );
begin_burst();
- wc_printf(_("An error occurred while retrieving this part: %s\n"),
- ChrPtr(Buf));
- end_burst();
+ wc_printf(_("An error occurred while retrieving this part: %s\n"), "--");
+ return;
}
- FreeStrBuf(&ContentType);
+
+ StrBufCutLeft(Buf, 4);
+ bytes = StrBufExtract_long(Buf, 0, '|');
+
+ if (force_download) {
+ ContentType = NewStrBufPlain(HKEY("application/octet-stream"));
+ }
+ else {
+ ContentType = NewStrBuf();
+ StrBufExtract_token(ContentType, Buf, 3, '|');
+ }
+
FreeStrBuf(&Buf);
+ Buf = NewStrBuf();
+ StrBuf_ServGetBLOBBuffered(Buf, bytes);
+
+ WC->WBuf = Buf;
+ Buf = NULL;
+ http_transmit_thing(ChrPtr(ContentType), 0);
+ FreeStrBuf(&ContentType);
}
/*
* Read any MIME part of a message, from the server, into memory.
*/
-StrBuf *load_mimepart(long msgnum, char *partnum)
-{
+StrBuf *load_mimepart(long msgnum, char *partnum) {
off_t bytes;
StrBuf *Buf;
@@ -1765,15 +1876,14 @@ StrBuf *load_mimepart(long msgnum, char *partnum)
}
}
+
/*
* Read any MIME part of a message, from the server, into memory.
*/
-void MimeLoadData(wc_mime_attachment *Mime)
-{
+void MimeLoadData(wc_mime_attachment *Mime) {
StrBuf *Buf;
const char *Ptr;
off_t bytes;
- /* TODO: is there a chance the content type is different from the one we know? */
serv_printf("DLAT %ld|%s", Mime->msgnum, ChrPtr(Mime->PartNum));
Buf = NewStrBuf();
@@ -1785,26 +1895,28 @@ void MimeLoadData(wc_mime_attachment *Mime)
if (Mime->Charset == NULL) Mime->Charset = NewStrBuf();
StrBufExtract_NextToken(Mime->Charset, Buf, &Ptr, '|');
- if (Mime->Data == NULL)
+ if (Mime->Data == NULL) {
Mime->Data = NewStrBufPlain(NULL, bytes);
+ }
StrBuf_ServGetBLOBBuffered(Mime->Data, bytes);
}
else {
FlushStrBuf(Mime->Data);
- /* TODO XImportant message */
}
FreeStrBuf(&Buf);
}
void view_mimepart(void) {
- mimepart(0);
+ view_or_download_mimepart(0);
}
+
void download_mimepart(void) {
- mimepart(1);
+ view_or_download_mimepart(1);
}
+
void view_postpart(void) {
StrBuf *filename = NewStrBuf();
StrBuf *partnum = NewStrBuf();
@@ -1818,6 +1930,7 @@ void view_postpart(void) {
FreeStrBuf(&partnum);
}
+
void download_postpart(void) {
StrBuf *filename = NewStrBuf();
StrBuf *partnum = NewStrBuf();
@@ -1832,7 +1945,6 @@ void download_postpart(void) {
}
-
void show_num_attachments(void) {
wc_printf("%d", GetCount(WC->attachments));
}
@@ -1846,51 +1958,80 @@ void h_do_search(void) { readloop(do_search, eUseDefault);}
void h_readgt(void) { readloop(readgt, eUseDefault);}
void h_readlt(void) { readloop(readlt, eUseDefault);}
-void jsonMessageListHdr(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(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();
-}
-
/* Output message list in JSON format */
void jsonMessageList(void) {
+ StrBuf *View = NewStrBuf();
const StrBuf *room = sbstr("room");
long oper = (havebstr("query")) ? do_search : readnew;
- WC->is_ajax = 1;
+ StrBufPrintf(View, "%d", VIEW_JSON_LIST);
+ putbstr("view", View);;
gotoroom(room);
readloop(oper, eUseDefault);
- WC->is_ajax = 0;
}
+
+void FreeReadLoopHandlerSet(void *v) {
+ RoomRenderer *Handler = (RoomRenderer *) v;
+ FreeStrBuf(&Handler->FetchMessageList);
+ if (Handler->MessageFieldList != NULL) {
+ free(Handler->MessageFieldList);
+ }
+ free(Handler);
+}
+
+
void RegisterReadLoopHandlerset(
int RoomType,
GetParamsGetServerCall_func GetParamsGetServerCall,
+ PrintViewHeader_func PrintPageHeader,
PrintViewHeader_func PrintViewHeader,
load_msg_ptrs_detailheaders LH,
LoadMsgFromServer_func LoadMsgFromServer,
RenderView_or_Tail_func RenderView_or_Tail,
- View_Cleanup_func ViewCleanup
+ View_Cleanup_func ViewCleanup,
+ const char **browseListFields
)
{
+ long count = 0;
+ long i = 0;
RoomRenderer *Handler;
Handler = (RoomRenderer*) malloc(sizeof(RoomRenderer));
Handler->RoomType = RoomType;
Handler->GetParamsGetServerCall = GetParamsGetServerCall;
+ Handler->PrintPageHeader = PrintPageHeader;
Handler->PrintViewHeader = PrintViewHeader;
Handler->LoadMsgFromServer = LoadMsgFromServer;
Handler->RenderView_or_Tail = RenderView_or_Tail;
Handler->ViewCleanup = ViewCleanup;
Handler->LHParse = LH;
- Put(ReadLoopHandler, IKEY(RoomType), Handler, NULL);
+ if (browseListFields != NULL) {
+ while (browseListFields[count] != NULL) {
+ count ++;
+ }
+ Handler->HeaderCount = count;
+ Handler->MessageFieldList = (eMessageField*) malloc(sizeof(eMessageField) * count);
+ Handler->FetchMessageList = NewStrBufPlain(NULL, 5 * count + 4 + 5);
+ StrBufPlain(Handler->FetchMessageList, HKEY("time\n"));
+ for (i = 0; i < count; i++) {
+ if (!GetFieldFromMnemonic(&Handler->MessageFieldList[i], browseListFields[i])) {
+ fprintf(stderr, "Unknown message header: %s\n", browseListFields[i]);
+ exit(1);
+ }
+ StrBufAppendBufPlain(Handler->FetchMessageList, browseListFields[i], 4, 0);
+ StrBufAppendBufPlain(Handler->FetchMessageList, HKEY("\n"), 0);
+ }
+ StrBufAppendBufPlain(Handler->FetchMessageList, HKEY("000"), 0);
+ }
+ else {
+ Handler->FetchMessageList = NULL;
+ Handler->MessageFieldList = NULL;
+ }
+
+ Put(ReadLoopHandler, IKEY(RoomType), Handler, FreeReadLoopHandlerSet);
}
void
@@ -1902,7 +2043,7 @@ InitModule_MSG
PRF_YESNO,
NULL);
RegisterPreference("signature", _("Use this signature:"), PRF_QP_STRING, NULL);
- RegisterPreference("default_header_charset",
+ RegisterPreference("default_header_charset",
_("Default character set for email headers:"),
PRF_STRING,
NULL);
@@ -1928,7 +2069,6 @@ InitModule_MSG
WebcitAddUrlHandler(HKEY("post"), "", 0, post_message, PROHIBIT_STARTPAGE);
WebcitAddUrlHandler(HKEY("move_msg"), "", 0, move_msg, PROHIBIT_STARTPAGE);
WebcitAddUrlHandler(HKEY("delete_msg"), "", 0, delete_msg, PROHIBIT_STARTPAGE);
- WebcitAddUrlHandler(HKEY("confirm_move_msg"), "", 0, confirm_move_msg, PROHIBIT_STARTPAGE);
WebcitAddUrlHandler(HKEY("msg"), "", 0, embed_message, NEED_URL);
WebcitAddUrlHandler(HKEY("message"), "", 0, handle_one_message, NEED_URL|XHTTP_COMMANDS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
WebcitAddUrlHandler(HKEY("printmsg"), "", 0, print_message, NEED_URL);
@@ -1944,7 +2084,6 @@ InitModule_MSG
/* json */
WebcitAddUrlHandler(HKEY("roommsgs"), "", 0, jsonMessageList,0);
- return ;
}
void