#include <stdarg.h>
#include <pthread.h>
#include <signal.h>
+
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#endif
+
#include "webcit.h"
#include "vcard.h"
#include "webserver.h"
};
+
+#ifdef HAVE_ICONV
+/* Handle subjects with RFC2047 encoding, such as:
+ * =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?=
+ */
+void utf8ify_rfc822_string(char *buf) {
+ char *start, *end;
+ char newbuf[1024];
+ char charset[128];
+ char encoding[16];
+ char istr[1024];
+ iconv_t ic = (iconv_t)(-1) ;
+ char *ibuf; /* Buffer of characters to be converted */
+ char *obuf; /* Buffer for converted characters */
+ size_t ibuflen; /* Length of input buffer */
+ size_t obuflen; /* Length of output buffer */
+ char *isav; /* Saved pointer to input buffer */
+ char *osav; /* Saved pointer to output buffer */
+
+ while (start=strstr(buf, "=?"), end=strstr(buf, "?="),
+ ((start != NULL) && (end != NULL) && (end > start)) )
+ {
+ extract_token(charset, start, 1, '?', sizeof charset);
+ extract_token(encoding, start, 2, '?', sizeof encoding);
+ extract_token(istr, start, 3, '?', sizeof istr);
+
+ strcpy(start, "");
+ ++end;
+ ++end;
+
+ ibuf = malloc(1024);
+ isav = ibuf;
+ if (!strcasecmp(encoding, "B")) { /* base64 */
+ ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr));
+ }
+ else if (!strcasecmp(encoding, "Q")) { /* quoted-printable */
+ ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, strlen(istr));
+ }
+ else {
+ strcpy(ibuf, istr); /* huh? */
+ ibuflen = strlen(istr);
+ }
+
+ ic = iconv_open("UTF-8", charset);
+ if (ic != (iconv_t)(-1) ) {
+ obuf = malloc(1024);
+ obuflen = 1024;
+ obuf = (char *) malloc(obuflen);
+ osav = obuf;
+ iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
+ osav[1024-obuflen] = 0;
+ snprintf(newbuf, sizeof newbuf, "%s%s%s", buf, osav, end);
+ strcpy(buf, newbuf);
+ free(osav);
+ iconv_close(ic);
+ }
+ else {
+ snprintf(newbuf, sizeof newbuf, "%s(unreadable)%s", buf, end);
+ strcpy(buf, newbuf);
+ }
+
+ free(isav);
+ }
+
+}
+#endif
+
+
/*
* Look for URL's embedded in a buffer and make them linkable. We use a
* target window in order to keep the BBS session in its own window.
if (v->numprops) for (i=0; i<(v->numprops); ++i) {
thisname = strdup(v->prop[i].name);
- extract_token(firsttoken, thisname, 0, ';');
+ extract_token(firsttoken, thisname, 0, ';', sizeof firsttoken);
for (j=0; j<num_tokens(thisname, ';'); ++j) {
- extract_token(buf, thisname, j, ';');
+ extract_token(buf, thisname, j, ';', sizeof buf);
if (!strcasecmp(buf, "encoding=quoted-printable")) {
is_qp = 1;
remove_token(thisname, j, ';');
if (strlen(phone) > 0) strcat(phone, "<br />");
strcat(phone, thisvalue);
for (j=0; j<num_tokens(thisname, ';'); ++j) {
- extract_token(buf, thisname, j, ';');
+ extract_token(buf, thisname, j, ';', sizeof buf);
if (!strcasecmp(buf, "tel"))
strcat(phone, "");
else if (!strcasecmp(buf, "work"))
if (pass == 2) {
wprintf("<TR><TD>Address:</TD><TD>");
for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
- extract_token(buf, thisvalue, j, ';');
+ extract_token(buf, thisvalue, j, ';', sizeof buf);
if (strlen(buf) > 0) {
escputs(buf);
if (j<3) wprintf("<br />");
if (pass == 1) {
wprintf("<TR BGCOLOR=\"#AAAAAA\">"
"<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
- "<IMG ALIGN=CENTER SRC=\"/static/vcard.gif\">"
+ "<IMG ALIGN=CENTER SRC=\"/static/viewcontacts_48x.gif\">"
"<FONT SIZE=+1><B>");
escputs(displayname);
wprintf("</B></FONT>");
*/
void read_message(long msgnum) {
char buf[SIZ];
- char mime_partnum[SIZ];
- char mime_filename[SIZ];
- char mime_content_type[SIZ];
- char mime_disposition[SIZ];
+ char mime_partnum[256];
+ char mime_filename[256];
+ char mime_content_type[256];
+ char mime_charset[256];
+ char mime_disposition[256];
int mime_length;
char mime_http[SIZ];
- char m_subject[SIZ];
- char from[SIZ];
- char node[SIZ];
- char rfca[SIZ];
+ char m_subject[256];
+ char from[256];
+ char node[256];
+ char rfca[256];
char reply_to[512];
- char now[SIZ];
+ char now[256];
int format_type = 0;
int nhdr = 0;
int bq = 0;
- char vcard_partnum[SIZ];
- char cal_partnum[SIZ];
+ int i = 0;
+ char vcard_partnum[256];
+ char cal_partnum[256];
char *part_source = NULL;
+#ifdef HAVE_ICONV
+ iconv_t ic = (iconv_t)(-1) ;
+ char *ibuf; /* Buffer of characters to be converted */
+ char *obuf; /* Buffer for converted characters */
+ size_t ibuflen; /* Length of input buffer */
+ size_t obuflen; /* Length of output buffer */
+ char *osav; /* Saved pointer to output buffer */
+#endif
strcpy(from, "");
strcpy(node, "");
strcpy(vcard_partnum, "");
strcpy(cal_partnum, "");
strcpy(mime_http, "");
+ strcpy(mime_content_type, "text/plain");
+ strcpy(mime_charset, "us-ascii");
serv_printf("MSG4 %ld", msgnum);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
wprintf("<STRONG>ERROR:</STRONG> %s<br />\n", &buf[4]);
return;
wprintf("<SPAN CLASS=\"message_header\">");
strcpy(m_subject, "");
- while (serv_gets(buf), strcasecmp(buf, "text")) {
+ while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
if (!strcmp(buf, "000")) {
wprintf("<I>unexpected end of message</I><br /><br />\n");
wprintf("</SPAN>\n");
if (!strncasecmp(buf, "from=", 5)) {
strcpy(from, &buf[5]);
wprintf("from <A HREF=\"/showuser&who=");
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(from);
+#endif
urlescputs(from);
wprintf("\">");
escputs(from);
if (!strncasecmp(buf, "rcpt=", 5))
wprintf("to %s ", &buf[5]);
if (!strncasecmp(buf, "time=", 5)) {
- fmt_date(now, atol(&buf[5]));
+ fmt_date(now, atol(&buf[5]), 0);
wprintf("%s ", now);
}
if (!strncasecmp(buf, "part=", 5)) {
- extract(mime_filename, &buf[5], 1);
- extract(mime_partnum, &buf[5], 2);
- extract(mime_disposition, &buf[5], 3);
- extract(mime_content_type, &buf[5], 4);
+ extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
+ extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
+ extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
+ extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
mime_length = extract_int(&buf[5], 5);
if (!strcasecmp(mime_disposition, "attachment")) {
"<A HREF=\"/output_mimepart?"
"msgnum=%ld&partnum=%s\" "
"TARGET=\"wc.%ld.%s\">"
- "<IMG SRC=\"/static/attachment.gif\" "
+ "<IMG SRC=\"/static/diskette_24x.gif\" "
"BORDER=0 ALIGN=MIDDLE>\n"
"Part %s: %s (%s, %d bytes)</A><br />\n",
msgnum, mime_partnum,
}
wprintf("</SPAN>");
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(m_subject);
+#endif
if (strlen(m_subject) > 0) {
wprintf("<br />"
"<SPAN CLASS=\"message_subject\">"
* Learn the content type
*/
strcpy(mime_content_type, "text/plain");
- while (serv_gets(buf), (strlen(buf) > 0)) {
+ while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) {
if (!strcmp(buf, "000")) {
wprintf("<I>unexpected end of message</I><br /><br />\n");
goto ENDBODY;
if (!strncasecmp(buf, "Content-type: ", 14)) {
safestrncpy(mime_content_type, &buf[14],
sizeof(mime_content_type));
+ for (i=0; i<strlen(mime_content_type); ++i) {
+ if (!strncasecmp(&mime_content_type[i], "charset=", 8)) {
+ safestrncpy(mime_charset, &mime_content_type[i+8],
+ sizeof mime_charset);
+ }
+ }
+ for (i=0; i<strlen(mime_content_type); ++i) {
+ if (mime_content_type[i] == ';') {
+ mime_content_type[i] = 0;
+ }
+ }
}
}
+ /* Set up a character set conversion if we need to (and if we can) */
+#ifdef HAVE_ICONV
+ if ( (strcasecmp(mime_charset, "us-ascii"))
+ && (strcasecmp(mime_charset, "UTF-8")) ) {
+ ic = iconv_open("UTF-8", mime_charset);
+ if (ic == (iconv_t)(-1) ) {
+ lprintf(5, "iconv_open() failed: %s\n", strerror(errno));
+ }
+ }
+#endif
+
/* Messages in legacy Citadel variformat get handled thusly... */
if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
fmout(NULL, "JUSTIFY");
/* Boring old 80-column fixed format text gets handled this way... */
else if (!strcasecmp(mime_content_type, "text/plain")) {
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0;
if (buf[strlen(buf)-1] == '\r') buf[strlen(buf)-1] = 0;
+
+#ifdef HAVE_ICONV
+ if (ic != (iconv_t)(-1) ) {
+ ibuf = buf;
+ ibuflen = strlen(ibuf);
+ obuflen = SIZ;
+ obuf = (char *) malloc(obuflen);
+ osav = obuf;
+ iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
+ osav[SIZ-obuflen] = 0;
+ safestrncpy(buf, osav, sizeof buf);
+ free(osav);
+ }
+#endif
+
while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
buf[strlen(buf) - 1] = 0;
if ((bq == 0) &&
else /* HTML is fun, but we've got to strip it first */
if (!strcasecmp(mime_content_type, "text/html")) {
- output_html();
+ output_html(mime_charset);
}
/* Unknown weirdness */
else {
wprintf("I don't know how to display %s<br />\n",
mime_content_type);
- while (serv_gets(buf), strcmp(buf, "000")) { }
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
}
-
/* Afterwards, offer links to download attachments 'n' such */
if (strlen(mime_http) > 0) {
wprintf("%s", mime_http);
/* end everythingamundo table */
wprintf("</TD></TR></TABLE>\n");
wprintf("</div><br />\n");
+
+#ifdef HAVE_ICONV
+ if (ic != (iconv_t)(-1) ) {
+ iconv_close(ic);
+ }
+#endif
}
memset(&summ, 0, sizeof(summ));
strcpy(summ.subj, "(no subject)");
- sprintf(buf, "MSG0 %ld|3", msgnum); /* ask for headers only with no MIME */
+ /* ask for headers only with no MIME */
+ sprintf(buf, "MSG0 %ld|3", msgnum);
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') return;
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (!strncasecmp(buf, "from=", 5)) {
strcpy(summ.from, &buf[5]);
}
if (!strncasecmp(buf, "subj=", 5)) {
- strcpy(summ.subj, &buf[5]);
+ if (strlen(&buf[5]) > 0) {
+ strcpy(summ.subj, &buf[5]);
+#ifdef HAVE_ICONV
+ /* Handle subjects with RFC2047 encoding */
+ utf8ify_rfc822_string(summ.subj);
+#endif
+ if (strlen(summ.subj) > 75) {
+ strcpy(&summ.subj[72], "...");
+ }
+ }
}
- if (!strncasecmp(buf, "rfca=", 5)) {
+ /* if (!strncasecmp(buf, "rfca=", 5)) {
strcat(summ.from, " <");
strcat(summ.from, &buf[5]);
strcat(summ.from, ">");
- }
+ } */
if (!strncasecmp(buf, "node=", 5)) {
if ( ((WC->room_flags & QR_NETWORK)
}
if (!strncasecmp(buf, "time=", 5)) {
- fmt_date(summ.date, atol(&buf[5]));
+ fmt_date(summ.date, atol(&buf[5]), 1); /* brief */
}
}
+
+#ifdef HAVE_ICONV
+ /* Handle senders with RFC2047 encoding */
+ utf8ify_rfc822_string(summ.from);
+#endif
+ if (strlen(summ.from) > 25) {
+ strcpy(&summ.from[22], "...");
+ }
wprintf("<TD>");
if (is_new) wprintf("<B>");
sprintf(buf, "MSG0 %ld|1", msgnum); /* ask for headers only */
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') return;
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (!strncasecmp(buf, "part=", 5)) {
- extract(mime_filename, &buf[5], 1);
- extract(mime_partnum, &buf[5], 2);
- extract(mime_disposition, &buf[5], 3);
- extract(mime_content_type, &buf[5], 4);
+ extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
+ extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
+ extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
+ extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
mime_length = extract_int(&buf[5], 5);
if (!strcasecmp(mime_content_type, "text/x-vcard")) {
i = num_tokens(namebuf, ' ');
if (i < 2) return;
- extract_token(lastname, namebuf, i-1, ' ');
+ extract_token(lastname, namebuf, i-1, ' ', sizeof lastname);
remove_token(namebuf, i-1, ' ');
strcpy(firstname, namebuf);
sprintf(namebuf, "%s; %s", lastname, firstname);
sprintf(buf, "MSG0 %ld|1", msgnum); /* ask for headers only */
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') return;
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (!strncasecmp(buf, "part=", 5)) {
- extract(mime_filename, &buf[5], 1);
- extract(mime_partnum, &buf[5], 2);
- extract(mime_disposition, &buf[5], 3);
- extract(mime_content_type, &buf[5], 4);
+ extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
+ extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
+ extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
+ extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
mime_length = extract_int(&buf[5], 5);
if (!strcasecmp(mime_content_type, "text/x-vcard")) {
wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
addrbook[i].ab_msgnum);
wprintf("&maxmsgs=1&summary=0&alpha=%s\">", bstr("alpha"));
+ vcard_n_prettyize(addrbook[i].ab_name);
escputs(addrbook[i].ab_name);
wprintf("</A></TD>\n");
++displayed;
nummsgs = 0;
maxload = sizeof(WC->msgarr) / sizeof(long) ;
serv_puts(servcmd);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
wprintf("<EM>%s</EM><br />\n", &buf[4]);
return (nummsgs);
}
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (nummsgs < maxload) {
WC->msgarr[nummsgs] = atol(buf);
++nummsgs;
strcpy(old_msgs, "");
if (is_summary) {
serv_puts("GTSN");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
strcpy(old_msgs, &buf[4]);
}
"<table border=0 cellspacing=0 "
"cellpadding=0 width=100%%>\n"
"<TR>"
- "<TD><I>Subject</I></TD>"
- "<TD><I>Sender</I></TD>"
- "<TD><I>Date</I></TD>"
+ "<TD align=center><b><i>Subject</i></b></TD>"
+ "<TD align=center><b><i>Sender</i></b></TD>"
+ "<TD align=center><b><i>Date</i></b></TD>"
"<TD></TD>"
"</TR>\n"
);
}
wprintf("<A HREF=\"/%s?startmsg=%ld"
- "&maxmsgs=999999&summary=1\">"
+ "&maxmsgs=%d&summary=1\">"
"Summary"
"</A>",
oper,
- WC->msgarr[0]);
+ WC->msgarr[0],
+ DEFAULT_MAXMSGS
+ );
wprintf("</td></tr></table></div>\n");
}
lo, hi);
}
wprintf("<OPTION VALUE=\"/%s?startmsg=%ld"
- "&maxmsgs=999999&summary=%d\">"
+ "&maxmsgs=9999999&summary=%d\">"
"ALL"
"</OPTION> ",
oper,
wDumpContent(1);
if (addrbook != NULL) free(addrbook);
+
+ /* If we got here via a mailbox view and are reading a single
+ * message, mark it as "seen." We do this after rendering the web page
+ * so it doesn't keep the user waiting.
+ */
+ if ( (maxmsgs == 1) && (WC->wc_view == VIEW_MAILBOX) ) {
+ serv_printf("SEEN %ld|1", startmsg);
+ serv_getln(buf, sizeof buf);
+ }
}
serv_printf("--%s", boundary);
}
- serv_puts("Content-type: text/html");
+ serv_puts("Content-type: text/html; charset=utf-8");
serv_puts("");
serv_puts("<HTML><BODY>\n");
text_to_server(bstr("msgtext"), 0);
bstr("recp"),
bstr("subject") );
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '4') {
post_mime_to_server();
if (strlen(bstr("recp")) > 0) {
sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (!strncmp(buf, "570", 3)) {
if (strlen(bstr("recp")) > 0) {
}
now = time(NULL);
- fmt_date(buf, now);
+ fmt_date(buf, now, 0);
strcat(&buf[strlen(buf)], " <I>from</I> ");
stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
if (strlen(bstr("recp")) > 0) {
now);
wprintf("%s<br>\n", buf); /* header bar */
- wprintf("<img src=\"static/enter.gif\" align=middle alt=\" \">");
+ wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
/* "onLoad=\"document.enterform.msgtext.focus();\" " */
wprintf("<font size=-1>Subject (optional):</font>"
"<input type=\"text\" name=\"subject\" value=\"");
"</script></center><br />\n");
/* Enumerate any attachments which are already in place... */
- wprintf("<img src=\"/static/attachment.gif\" border=0 "
+ wprintf("<img src=\"/static/diskette_24x.gif\" border=0 "
"align=middle height=16 width=16> Attachments: ");
wprintf("<select name=\"which_attachment\" size=1>");
for (att = WC->first_attachment; att != NULL; att = att->next) {
sprintf(buf, "DELE %ld", msgid);
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
wprintf("<EM>%s</EM><br />\n", &buf[4]);
wDumpContent(1);
wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
serv_puts("LKRA");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '1') {
- while (serv_gets(buf), strcmp(buf, "000")) {
- extract(targ, buf, 0);
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ extract_token(targ, buf, 0, '|', sizeof targ);
wprintf("<OPTION>");
escputs(targ);
wprintf("\n");
if (!strcasecmp(bstr("yesno"), "Move")) {
sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
wprintf("<EM>%s</EM><br />\n", &buf[4]);
} else {
wprintf("<EM>Message not moved.</EM><br />\n");
serv_puts("MSGS ALL");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
- if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
+ if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
ptr = malloc(sizeof(struct stuff_t));
ptr->msgnum = atol(buf);
ptr->next = stuff;
if (!strcasecmp(sc, "Delete selected")) {
serv_printf("DELE %ld", stuff->msgnum);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
}
}
projects / citadel.git / blobdiff