"); - bq = 1; - } else if ((bq == 1) && - (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) { - wprintf(""); - bq = 0; - } - wprintf(""); - url(buf, sizeof(buf)); - msgescputs1(buf); - wprintf("
"); - } - wprintf("
"); - } - - /** HTML just gets escaped and stuffed back into the editor */ - else if (!strcasecmp(mime_content_type, "text/html")) { - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { - strcat(buf, "\n"); - msgescputs(buf); - } - }//// TODO: charset? utf8? - - /** Unknown weirdness ... don't know how to handle this content type */ - else { - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { } - } - -ENDBODY: - /** end of body handler */ - - /* - * If there were attachments, we have to download them and insert them - * into the attachment chain for the forwarded message we are composing. - */ - if ( (forward_attachments) && (num_attachments) ) { - for (i=0; i
"); - if (!strcmp(oper, "readnew")) { + if (care_for_empty_list) { + wprintf("
"); + switch (oper) { + case readnew: wprintf(_("No new messages.")); - } else if (!strcmp(oper, "readold")) { + break; + case readold: wprintf(_("No old messages.")); - } else { + break; + default: wprintf(_("No messages here.")); } - wprintf("
"
- "
\n");
- wprintf(""
- ""
- "
| %s | \n"
- "%s | \n"
- "%s | "
- "
|---|
"
-
- "\n"); /**< end of 'fix_scrollbar_bug' div */
- wprintf("
"); /**< end of 'message_list' div */
-
- /** Here's the grab-it-to-resize-the-message-list widget */
- wprintf(""
- "
\n"
- );
-
- wprintf(""); /**< The preview pane will initially be empty */
- } else if (WCC->is_mobile) {
- wprintf("
");
- }
-
- /**
- * Bump these because although we're thinking in zero base, the user
- * is a drooling idiot and is thinking in one base.
- */
- ++lowest_displayed;
- ++highest_displayed;
-
- /**
- * If we're not currently looking at ALL requested
- * messages, then display the selector bar
+ NO_MSG_LOOP:
+ /*
+ * Done iterating the message list. now tasks we want to do after.
*/
- if (is_bbview) {
- /** begin bbview scroller */
- wprintf("\n");
- /** end bbview scroller */
+ FreeStrBuf(&BBViewToolBar);
+ FreeStrBuf(&MessageDropdown);
}
+
DONE:
- if (is_tasks) {
- do_tasks_view(); /** Render the task list */
- }
-
- if (is_calendar) {
+ switch (WCC->wc_view) {
+ case VIEW_WIKI:
+ break;
+ case VIEW_CALBRIEF:
+ case VIEW_CALENDAR:
render_calendar_view(&calv);
+ break;
+ case VIEW_TASKS:
+ do_tasks_view(); /** Render the task list */
+ break;
+ case VIEW_NOTES:
+ break;
+ case VIEW_ADDRESSBOOK:
+ if (is_singlecard)
+ read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), NULL);
+ else
+ do_addrbook_view(addrbook, num_ab); /** Render the address book */
+ break;
+ case VIEW_MAILBOX:
+ case VIEW_BBS:
+ default:
+ break;
}
-
- if (is_addressbook) {
- do_addrbook_view(addrbook, num_ab); /** Render the address book */
- }
-
/** Note: wDumpContent() will output one additional tag. */
- wprintf("\n"); /** end of 'content' div */
- wDumpContent(1);
-
- /** free the summary */
+ if (WCC->wc_view != VIEW_MAILBOX) {
+ /* We ought to move this out into template */
+ wDumpContent(1);
+ } else {
+ end_burst();
+ }
+ WCC->startmsg = 0;
+ WCC->maxmsgs = 0;
if (WCC->summ != NULL) {
DeleteHash(&WCC->summ);
}
if (addrbook != NULL) free(addrbook);
+ FreeStrBuf(&BBViewToolBar);
}
@@ -1669,24 +991,24 @@ DONE:
* ... this is where the actual message gets transmitted to the server.
*/
void post_mime_to_server(void) {
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
char top_boundary[SIZ];
char alt_boundary[SIZ];
int is_multipart = 0;
static int seq = 0;
- wc_attachment *att;
+ wc_mime_attachment *att;
char *encoded;
size_t encoded_length;
size_t encoded_strlen;
char *txtmail = NULL;
sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x",
- serv_info.serv_fqdn,
+ ChrPtr(WCC->serv_info->serv_fqdn),
getpid(),
++seq
);
sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
- serv_info.serv_fqdn,
+ ChrPtr(WCC->serv_info->serv_fqdn),
getpid(),
++seq
);
@@ -1738,17 +1060,17 @@ void post_mime_to_server(void) {
HashPos *it;
/* Add in the attachments */
- it = GetNewHashPos();
+ it = GetNewHashPos(WCC->attachments, 0);
while (GetNextHashPos(WCC->attachments, it, &len, &Key, &vAtt)) {
- att = (wc_attachment*)vAtt;
+ att = (wc_mime_attachment *)vAtt;
encoded_length = ((att->length * 150) / 100);
encoded = malloc(encoded_length);
if (encoded == NULL) break;
- encoded_strlen = CtdlEncodeBase64(encoded, att->data, att->length, 1);
+ encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), 1);
serv_printf("--%s", top_boundary);
- serv_printf("Content-type: %s", ChrPtr(att->content_type));
- serv_printf("Content-disposition: attachment; filename=\"%s\"", ChrPtr(att->filename));
+ serv_printf("Content-type: %s", ChrPtr(att->ContentType));
+ serv_printf("Content-disposition: attachment; filename=\"%s\"", ChrPtr(att->FileName));
serv_puts("Content-transfer-encoding: base64");
serv_puts("");
serv_write(encoded, encoded_strlen);
@@ -1780,13 +1102,13 @@ void post_message(void)
char buf[1024];
StrBuf *encoded_subject = NULL;
static long dont_post = (-1L);
- wc_attachment *att;
+ wc_mime_attachment *att;
int is_anonymous = 0;
const StrBuf *display_name = NULL;
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
if (havebstr("force_room")) {
- gotoroom(bstr("force_room"));
+ gotoroom(sbstr("force_room"));
}
if (havebstr("display_name")) {
@@ -1804,38 +1126,39 @@ void post_message(void)
lprintf(9, "%s:%d: we are uploading %d bytes\n", __FILE__, __LINE__, WCC->upload_length);
/** There's an attachment. Save it to this struct... */
- att = malloc(sizeof(wc_attachment));
- memset(att, 0, sizeof(wc_attachment));
+ att = malloc(sizeof(wc_mime_attachment));
+ memset(att, 0, sizeof(wc_mime_attachment ));
att->length = WCC->upload_length;
- att->content_type = NewStrBufPlain(WCC->upload_content_type, -1);
- att->filename = NewStrBufPlain(WCC->upload_filename, -1);
+ att->ContentType = NewStrBufPlain(WCC->upload_content_type, -1);
+ att->FileName = NewStrBufPlain(WCC->upload_filename, -1);
if (WCC->attachments == NULL)
WCC->attachments = NewHash(1, NULL);
/* And add it to the list. */
n = snprintf(N, sizeof N, "%d", GetCount(WCC->attachments) + 1);
- Put(WCC->attachments, N, n, att, free_attachment);
+ Put(WCC->attachments, N, n, att, DestroyMime);
/**
* Mozilla sends a simple filename, which is what we want,
* but Satan's Browser sends an entire pathname. Reduce
* the path to just a filename if we need to.
*/
- pch = strrchr(ChrPtr(att->filename), '/');
+ 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), '\\');
+ pch = strrchr(ChrPtr(att->FileName), '\\');
if (pch != NULL) {
- StrBufCutLeft(att->filename, pch - ChrPtr(att->filename));
+ StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
}
/**
* Transfer control of this memory from the upload struct
* to the attachment struct.
*/
- att->data = WCC->upload;
+ att->Data = NewStrBufPlain(WCC->upload, WCC->upload_length);
+ free(WCC->upload);
WCC->upload_length = 0;
WCC->upload = NULL;
display_enter();
@@ -1859,16 +1182,17 @@ void post_message(void)
const StrBuf *Bcc = NULL;
const StrBuf *Wikipage = NULL;
const StrBuf *my_email_addr = NULL;
- StrBuf *CmdBuf = NULL;;
+ StrBuf *CmdBuf = NULL;
StrBuf *references = NULL;
if (havebstr("references"))
{
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;
@@ -1909,7 +1233,7 @@ void post_message(void)
ChrPtr(references));
FreeStrBuf(&references);
- lprintf(9, "%s\n", CmdBuf);
+ lprintf(9, "%s\n", ChrPtr(CmdBuf));
serv_puts(ChrPtr(CmdBuf));
serv_getln(buf, sizeof buf);
FreeStrBuf(&CmdBuf);
@@ -1954,7 +1278,7 @@ void post_message(void)
* Otherwise, just go to the "read messages" loop.
*/
else {
- readloop("readnew");
+ readloop(readnew);
}
}
@@ -1967,21 +1291,18 @@ void post_message(void)
void display_enter(void)
{
char buf[SIZ];
- StrBuf *ebuf;
long now;
const StrBuf *display_name = NULL;
- /////wc_attachment *att;
int recipient_required = 0;
int subject_required = 0;
int recipient_bad = 0;
int is_anonymous = 0;
- long existing_page = (-1L);
- struct wcsession *WCC = WC;
+ wcsession *WCC = WC;
now = time(NULL);
if (havebstr("force_room")) {
- gotoroom(bstr("force_room"));
+ gotoroom(sbstr("force_room"));
}
display_name = sbstr("display_name");
@@ -1999,7 +1320,7 @@ void display_enter(void)
}
else if (buf[0] != '2') { /** Any other error means that we cannot continue */
sprintf(WCC->ImportantMessage, "%s", &buf[4]);
- readloop("readnew");
+ readloop(readnew);
return;
}
@@ -2013,7 +1334,7 @@ void display_enter(void)
* message" command really means "add new entry."
*/
if (WCC->wc_default_view == VIEW_ADDRESSBOOK) {
- do_edit_vcard(-1, "", "", WCC->wc_roomname);
+ do_edit_vcard(-1, "", NULL, NULL, "", ChrPtr(WCC->wc_roomname));
return;
}
@@ -2039,22 +1360,13 @@ void display_enter(void)
* Otherwise proceed normally.
* Do a custom room banner with no navbar...
*/
- output_headers(1, 1, 2, 0, 0, 0);
-/*
- wprintf("\n");
- wprintf("\n"
- "\n"); /* end of "fix_scrollbar_bug" div */
-
- /* NOTE: address_book_popup() will close the "content" div. Don't close it here. */
-DONE: address_book_popup();
- wDumpContent(1);
}
-
/**
* \brief delete a message
*/
@@ -2429,7 +1437,7 @@ void delete_msg(void)
serv_getln(buf, sizeof buf);
sprintf(WC->ImportantMessage, "%s", &buf[4]);
- readloop("readnew");
+ readloop(readnew);
}
@@ -2452,7 +1460,7 @@ void move_msg(void)
sprintf(WC->ImportantMessage, (_("The message was not moved.")));
}
- readloop("readnew");
+ readloop(readnew);
}
@@ -2512,26 +1520,232 @@ void confirm_move_msg(void)
wDumpContent(1);
}
-void readnew(void) { readloop("readnew");}
-void readold(void) { readloop("readold");}
-void readfwd(void) { readloop("readfwd");}
-void headers(void) { readloop("headers");}
-void do_search(void) { readloop("do_search");}
+
+/*
+ * Generic function to output an arbitrary MIME attachment from
+ * message being composed
+ *
+ * partnum The MIME part to be output
+ * 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 *vPart;
+ StrBuf *content_type;
+ wc_mime_attachment *part;
+
+ if (GetHash(WC->attachments, SKEY(partnum), &vPart) &&
+ (vPart != NULL)) {
+ part = (wc_mime_attachment*) vPart;
+ if (force_download) {
+ content_type = NewStrBufPlain(HKEY("application/octet-stream"));
+ }
+ else {
+ content_type = NewStrBufDup(part->ContentType);
+ }
+ StrBufAppendBuf(WC->WBuf, part->Data, 0);
+ http_transmit_thing(ChrPtr(content_type), 0);
+ } else {
+ hprintf("HTTP/1.1 404 %s\n", ChrPtr(partnum));
+ output_headers(0, 0, 0, 0, 0, 0);
+ hprintf("Content-Type: text/plain\r\n");
+ wprintf(_("An error occurred while retrieving this part: %s/%s\n"),
+ ChrPtr(partnum), ChrPtr(filename));
+ end_burst();
+ }
+ FreeStrBuf(&content_type);
+}
+
+
+/*
+ * 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)
+{
+ wcsession *WCC = WC;
+ StrBuf *Buf;
+ off_t bytes;
+ StrBuf *ContentType = NewStrBufPlain(HKEY("application/octet-stream"));
+ const char *CT;
+
+ Buf = NewStrBuf();
+ serv_printf("OPNA %s|%s", ChrPtr(WCC->UrlFragment2), ChrPtr(WCC->UrlFragment3));
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 2) {
+ StrBufCutLeft(Buf, 4);
+ bytes = StrBufExtract_long(Buf, 0, '|');
+ if (!force_download) {
+ StrBufExtract_token(ContentType, Buf, 3, '|');
+ }
+
+ read_server_binary(WCC->WBuf, bytes, Buf);
+ serv_puts("CLOS");
+ StrBuf_ServGetln(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));
+ }
+ }
+ 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");
+ 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.
+ */
+StrBuf *load_mimepart(long msgnum, char *partnum)
+{
+ off_t bytes;
+ StrBuf *Buf;
+
+ Buf = NewStrBuf();
+ serv_printf("DLAT %ld|%s", msgnum, partnum);
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 6) {
+ StrBufCutLeft(Buf, 4);
+ bytes = StrBufExtract_long(Buf, 0, '|');
+
+ StrBuf_ServGetBLOBBuffered(Buf, bytes);
+ return(Buf);
+ }
+ else {
+ FreeStrBuf(&Buf);
+ return(NULL);
+ }
+}
+
+/*
+ * Read any MIME part of a message, from the server, into memory.
+ */
+void MimeLoadData(wc_mime_attachment *Mime)
+{
+ 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));
+ Buf = NewStrBuf();
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 6) {
+ bytes = extract_long(&(ChrPtr(Buf)[4]), 0);
+
+ 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);
+}
+
+void download_mimepart(void) {
+ mimepart(1);
+}
+
+void view_postpart(void) {
+ postpart(WC->UrlFragment2,
+ WC->UrlFragment3,
+ 0);
+}
+void download_postpart(void) {
+ postpart(WC->UrlFragment2,
+ WC->UrlFragment3,
+ 1);
+}
+void h_readnew(void) { readloop(readnew);}
+void h_readold(void) { readloop(readold);}
+void h_readfwd(void) { readloop(readfwd);}
+void h_headers(void) { readloop(headers);}
+void h_do_search(void) { readloop(do_search);}
+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();
+}
+/* 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) {
+ begin_burst();
+ DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
+ DoTemplate(HKEY("trailing"),NULL,&NoCtx);
+ end_burst();
+}
+/** 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;
+ gotoroom(room);
+ readloop(oper);
+ WC->is_ajax = 0;
+}
void
InitModule_MSG
(void)
{
- WebcitAddUrlHandler(HKEY("readnew"), readnew, 0);
- WebcitAddUrlHandler(HKEY("readold"), readold, 0);
- WebcitAddUrlHandler(HKEY("readfwd"), readfwd, 0);
- WebcitAddUrlHandler(HKEY("headers"), headers, 0);
- WebcitAddUrlHandler(HKEY("do_search"), do_search, 0);
+ RegisterPreference("use_sig",
+ _("Attach signature to email messages?"),
+ PRF_YESNO,
+ NULL);
+ RegisterPreference("signature", _("Use this signature:"), PRF_QP_STRING, NULL);
+ RegisterPreference("default_header_charset",
+ _("Default character set for email headers:"),
+ PRF_STRING,
+ NULL);
+ RegisterPreference("defaultfrom", _("Preferred email address"), PRF_STRING, NULL);
+ RegisterPreference("defaultname",
+ _("Preferred display name for email messages"),
+ PRF_STRING,
+ NULL);
+ RegisterPreference("defaulthandle",
+ _("Preferred display name for bulletin board posts"),
+ 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);
+ WebcitAddUrlHandler(HKEY("readfwd"), h_readfwd, NEED_URL);
+ WebcitAddUrlHandler(HKEY("headers"), h_headers, NEED_URL);
+ WebcitAddUrlHandler(HKEY("do_search"), h_do_search, 0);
WebcitAddUrlHandler(HKEY("display_enter"), display_enter, 0);
WebcitAddUrlHandler(HKEY("post"), post_message, 0);
WebcitAddUrlHandler(HKEY("move_msg"), move_msg, 0);
@@ -2542,5 +1756,19 @@ InitModule_MSG
WebcitAddUrlHandler(HKEY("mobilemsg"), mobile_message_view, NEED_URL);
WebcitAddUrlHandler(HKEY("msgheaders"), display_headers, NEED_URL);
+ 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);
+
+ /* json */
+ WebcitAddUrlHandler(HKEY("roommsgs"), jsonMessageList,0);
return ;
}
+
+void
+SessionDetachModule_MSG
+(wcsession *sess)
+{
+ DeleteHash(&sess->summ);
+}