*/
/*@{*/
#include "webcit.h"
-#include "vcard.h"
#include "webserver.h"
#include "groupdav.h"
* \param buf the stringbuffer to process
*/
void utf8ify_rfc822_string(char *buf) {
- char *start, *end;
+ char *start, *end, *next, *nextend, *ptr;
char newbuf[1024];
char charset[128];
char encoding[16];
char *isav; /**< Saved pointer to input buffer */
char *osav; /**< Saved pointer to output buffer */
int passes = 0;
- int i, len;
+ int i, len, delta;
int illegal_non_rfc2047_encoding = 0;
/** Sometimes, badly formed messages contain strings which were simply
}
}
+ /* pre evaluate the first pair */
+ nextend = end = NULL;
+ len = strlen(buf);
+ start = strstr(buf, "=?");
+ if (start != NULL)
+ end = strstr(start, "?=");
+
+ while ((start != NULL) && (end != NULL))
+ {
+ next = strstr(end, "=?");
+ if (next != NULL)
+ nextend = strstr(next, "?=");
+ if (nextend == NULL)
+ next = NULL;
+
+ /* did we find two partitions */
+ if ((next != NULL) &&
+ ((next - end) > 2))
+ {
+ ptr = end + 2;
+ while ((ptr < next) &&
+ (isspace(*ptr) ||
+ (*ptr == '\r') ||
+ (*ptr == '\n') ||
+ (*ptr == '\t')))
+ ptr ++;
+ /* did we find a gab just filled with blanks? */
+ if (ptr == next)
+ {
+ memmove (end + 2,
+ next,
+ len - (next - start));
+
+ /* now terminate the gab at the end */
+ delta = (next - end) - 2;
+ len -= delta;
+ buf[len] = '\0';
+
+ /* move next to its new location. */
+ next -= delta;
+ nextend -= delta;
+ }
+ }
+ /* our next-pair is our new first pair now. */
+ start = next;
+ end = nextend;
+ }
+
/** Now we handle foreign character sets properly encoded
* in RFC2047 format.
*/
}
len = strlen(v->prop[i].value);
-
+ /* if we have some untagged QP, detect it here. */
+ if (!is_qp && (strstr(v->prop[i].value, "=?")!=NULL))
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(v->prop[i].value);
+#endif
+
if (is_qp) {
// %ff can become 6 bytes in utf8
thisvalue = malloc(len * 2 + 3);
}
else if (!strcasecmp(firsttoken, "email")) {
+ size_t len;
if (!IsEmptyStr(mailto)) strcat(mailto, "<br />");
- long len;
strcat(mailto,
"<a href=\"display_enter"
"?force_room=_MAIL_?recp=");
- urlesc(&mailto[strlen(mailto)], fullname);
- urlesc(&mailto[strlen(mailto)], " <");
- urlesc(&mailto[strlen(mailto)], thisvalue);
- urlesc(&mailto[strlen(mailto)], ">");
+ len = strlen(mailto);
+ urlesc(&mailto[len], SIZ - len, fullname);
+ len = strlen(mailto);
+ urlesc(&mailto[len], SIZ - len, " <");
+ len = strlen(mailto);
+ urlesc(&mailto[len], SIZ - len, thisvalue);
+ len = strlen(mailto);
+ urlesc(&mailto[len], SIZ - len, ">");
strcat(mailto, "\">");
len = strlen(mailto);
name = vcard_get_prop(v, "n", 1, 0, 0);
if (name != NULL) {
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(name);
+#endif
strcpy(buf, name);
this_alpha = buf[0];
}
};
-/**
- * \brief I wanna SEE that message!
- * \param msgnum the citadel number of the message to display
- * \param printable_view are we doing a print view?
- * \param section Optional for encapsulated message/rfc822 submessage)
+/*
+ * I wanna SEE that message!
+ *
+ * msgnum Message number to display
+ * printable_view Nonzero to display a printable view
+ * section Optional for encapsulated message/rfc822 submessage
*/
void read_message(long msgnum, int printable_view, char *section) {
char buf[SIZ];
- char mime_partnum[256];
- char mime_name[256];
- char mime_filename[256];
- char escaped_mime_filename[256];
- char mime_content_type[256];
- char mime_charset[256];
- char mime_disposition[256];
+ char mime_partnum[256] = "";
+ char mime_name[256] = "";
+ char mime_filename[256] = "";
+ char escaped_mime_filename[256] = "";
+ char mime_content_type[256] = "";
+ char mime_charset[256] = "";
+ char mime_disposition[256] = "";
int mime_length;
struct attach_link *attach_links = NULL;
int num_attach_links = 0;
- char mime_submessages[256];
- char m_subject[256];
- char m_cc[1024];
- char from[256];
- char node[256];
- char rfca[256];
- char reply_to[512];
- char reply_all[4096];
- char now[64];
+ char mime_submessages[256] = "";
+ char m_subject[256] = "";
+ char m_cc[1024] = "";
+ char from[256] = "";
+ char node[256] = "";
+ char rfca[256] = "";
+ char reply_to[512] = "";
+ char reply_all[4096] = "";
+ char now[64] = "";
int format_type = 0;
int nhdr = 0;
int bq = 0;
int i = 0;
- char vcard_partnum[256];
- char cal_partnum[256];
+ char vcard_partnum[256] = "";
+ char cal_partnum[256] = "";
char *part_source = NULL;
- char msg4_partnum[32];
+ char msg4_partnum[32] = "";
#ifdef HAVE_ICONV
iconv_t ic = (iconv_t)(-1) ;
char *ibuf; /**< Buffer of characters to be converted */
char *osav; /**< Saved pointer to output buffer */
#endif
- strcpy(from, "");
- strcpy(node, "");
- strcpy(rfca, "");
- strcpy(reply_to, "");
- strcpy(reply_all, "");
- strcpy(vcard_partnum, "");
- strcpy(cal_partnum, "");
strcpy(mime_content_type, "text/plain");
strcpy(mime_charset, "us-ascii");
strcpy(mime_submessages, "");
attach_links = realloc(attach_links,
(num_attach_links*sizeof(struct attach_link)));
safestrncpy(attach_links[num_attach_links-1].partnum, mime_partnum, 32);
- urlesc(escaped_mime_filename, mime_filename);
+ urlesc(escaped_mime_filename, 265, mime_filename);
snprintf(attach_links[num_attach_links-1].html, 1024,
"<img src=\"static/diskette_24x.gif\" "
"border=0 align=middle>\n"
strcpy(vcard_partnum, mime_partnum);
}
- if (!strcasecmp(mime_content_type, "text/calendar")) {
+ if ( (!strcasecmp(mime_content_type, "text/calendar"))
+ || (!strcasecmp(mime_content_type, "application/ics")) ) {
strcpy(cal_partnum, mime_partnum);
}
strcpy(mime_content_type, "text/plain");
while (serv_getln(buf, sizeof buf), (!IsEmptyStr(buf))) {
if (!strcmp(buf, "000")) {
- wprintf("<i>");
- wprintf(_("unexpected end of message"));
- wprintf(" (2)</i><br /><br />\n");
+ /* This is not necessarily an error condition. See bug #226. */
goto ENDBODY;
}
if (!strncasecmp(buf, "X-Citadel-MSG4-Partnum:", 23)) {
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
}
- /** If there are attached submessages, display them now... */
+ENDBODY: /* If there are attached submessages, display them now... */
+
if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) {
for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
extract_token(buf, mime_submessages, i, '|', sizeof buf);
part_source = NULL;
}
-ENDBODY:
wprintf("</div>\n");
/** end everythingamundo table */
char from[256];
char node[256];
char rfca[256];
+ char to[256];
char reply_to[512];
char now[256];
int format_type = 0;
}
if (!strncasecmp(buf, "rcpt=", 5)) {
wprintf(_("to "));
- wprintf("%s ", &buf[5]);
+ strcpy(to, &buf[5]);
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(to);
+#endif
+ wprintf("%s ", to);
}
if (!strncasecmp(buf, "time=", 5)) {
webcit_fmt_date(now, atol(&buf[5]), 0);
);
wprintf("<td width=%d%%>", SUBJ_COL_WIDTH_PCT);
- escputs(WC->summ[num].subj);
+
+ escputs(WC->summ[num].subj);//////////////////////////////////TODO: QP DECODE
wprintf("</td>");
wprintf("<td width=%d%%>", SENDER_COL_WIDTH_PCT);
safestrncpy(WC->summ[nummsgs-1].subj,
_("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
if (!IsEmptyStr(fullname)) {
+#ifdef HAVE_ICONV
+ /** Handle senders with RFC2047 encoding */
+ utf8ify_rfc822_string(fullname);
+#endif
safestrncpy(WC->summ[nummsgs-1].from,
fullname, sizeof WC->summ[nummsgs-1].from);
}
if (!IsEmptyStr(subject)) {
- safestrncpy(WC->summ[nummsgs-1].subj, subject,
- sizeof WC->summ[nummsgs-1].subj);
- }
#ifdef HAVE_ICONV
/** Handle subjects with RFC2047 encoding */
- utf8ify_rfc822_string(WC->summ[nummsgs-1].subj);
+ utf8ify_rfc822_string(subject);
#endif
+ safestrncpy(WC->summ[nummsgs-1].subj, subject,
+ sizeof WC->summ[nummsgs-1].subj);
+ }
if (strlen(WC->summ[nummsgs-1].subj) > 75) {
strcpy(&WC->summ[nummsgs-1].subj[72], "...");
}
* new messages.
*/
strcpy(old_msgs, "");
- if (is_summary) {
+ if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
serv_puts("GTSN");
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
if (WCC->wc_default_view == VIEW_CALENDAR) { /**< calendar */
is_calendar = 1;
- strcpy(cmd, "MSGS ALL");
+ strcpy(cmd, "MSGS ALL|||1");
maxmsgs = 32767;
}
if (WCC->wc_default_view == VIEW_TASKS) { /**< tasks */
goto DONE;
}
- if (is_summary) {
+ if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
for (a = 0; a < nummsgs; ++a) {
/** Are you a new message, or an old message? */
if (is_summary) {
addrbook[num_ab-1].ab_msgnum = WCC->msgarr[a];
}
else if (is_calendar) {
- display_calendar(WCC->msgarr[a]);
+ display_calendar(WCC->msgarr[a], WCC->summ[a].is_new);
}
else if (is_tasks) {
- display_task(WCC->msgarr[a]);
+ display_task(WCC->msgarr[a], WCC->summ[a].is_new);
}
else if (is_notes) {
- display_note(WCC->msgarr[a]);
+ display_note(WCC->msgarr[a], WCC->summ[a].is_new);
}
else {
if (displayed_msgs == NULL) {
* ... this is where the actual message gets transmitted to the server.
*/
void post_mime_to_server(void) {
- char boundary[SIZ];
+ char top_boundary[SIZ];
+ char alt_boundary[SIZ];
int is_multipart = 0;
static int seq = 0;
struct wc_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,
+ getpid(),
+ ++seq
+ );
+ sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
+ serv_info.serv_fqdn,
+ getpid(),
+ ++seq
+ );
/** RFC2045 requires this, and some clients look for it... */
serv_puts("MIME-Version: 1.0");
}
if (is_multipart) {
- sprintf(boundary, "Citadel--Multipart--%s--%04x--%04x",
- serv_info.serv_fqdn,
- getpid(),
- ++seq
- );
-
/** Remember, serv_printf() appends an extra newline */
serv_printf("Content-type: multipart/mixed; "
- "boundary=\"%s\"\n", boundary);
+ "boundary=\"%s\"\n", top_boundary);
serv_printf("This is a multipart message in MIME format.\n");
- serv_printf("--%s", boundary);
+ serv_printf("--%s", top_boundary);
}
+
+
+ /* Remember, serv_printf() appends an extra newline */
+ serv_printf("Content-type: multipart/alternative; "
+ "boundary=\"%s\"\n", alt_boundary);
+ serv_printf("This is a multipart message in MIME format.\n");
+ serv_printf("--%s", alt_boundary);
+
+ serv_puts("Content-type: text/plain; charset=utf-8");
+ serv_puts("Content-Transfer-Encoding: quoted-printable");
+ serv_puts("");
+ txtmail = html_to_ascii(bstr("msgtext"), 0, 80, 0);
+ text_to_server_qp(txtmail); /** Transmit message in quoted-printable encoding */
+ free(txtmail);
+
+ serv_printf("--%s", alt_boundary);
+
serv_puts("Content-type: text/html; charset=utf-8");
serv_puts("Content-Transfer-Encoding: quoted-printable");
serv_puts("");
serv_puts("<html><body>\r\n");
text_to_server_qp(bstr("msgtext")); /** Transmit message in quoted-printable encoding */
serv_puts("</body></html>\r\n");
+
+
+ serv_printf("--%s--", alt_boundary);
+
+
+
+
if (is_multipart) {
if (encoded == NULL) break;
encoded_strlen = CtdlEncodeBase64(encoded, att->data, att->length, 1);
- serv_printf("--%s", boundary);
+ serv_printf("--%s", top_boundary);
serv_printf("Content-type: %s", att->content_type);
serv_printf("Content-disposition: attachment; "
"filename=\"%s\"", att->filename);
serv_puts("");
free(encoded);
}
- serv_printf("--%s--", boundary);
+ serv_printf("--%s--", top_boundary);
}
serv_puts("000");
wprintf("</td></tr>");
if (recipient_required) {
-
+ char *ccraw;
+ char *copy;
+ size_t len;
wprintf("<tr><th><label for=\"recp_id\"> ");
wprintf(_("To:"));
wprintf("</label></th>"
"<td><input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
- escputs(bstr("recp"));
+ ccraw = bstr("recp");
+ len = strlen(ccraw);
+ copy = (char*) malloc(len * 2 + 1);
+ memcpy(copy, ccraw, len + 1);
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(copy);
+#endif
+ escputs(copy);
+ free(copy);
wprintf("\" size=45 maxlength=1000 />");
wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
wprintf("</td><td rowspan=\"3\" align=\"left\" valign=\"top\">");
wprintf(_("CC:"));
wprintf("</label></th>"
"<td><input autocomplete=\"off\" type=\"text\" name=\"cc\" id=\"cc_id\" value=\"");
- escputs(bstr("cc"));
+ ccraw = bstr("cc");
+ len = strlen(ccraw);
+ copy = (char*) malloc(len * 2 + 1);
+ memcpy(copy, ccraw, len + 1);
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(copy);
+#endif
+ escputs(copy);
+ free(copy);
wprintf("\" size=45 maxlength=1000 />");
wprintf("<div class=\"auto_complete\" id=\"cc_name_choices\"></div>");
wprintf("</td></tr>");
wprintf(_("BCC:"));
wprintf("</label></th>"
"<td><input autocomplete=\"off\" type=\"text\" name=\"bcc\" id=\"bcc_id\" value=\"");
- escputs(bstr("bcc"));
+ ccraw = bstr("bcc");
+ len = strlen(ccraw);
+ copy = (char*) malloc(len * 2 + 1);
+ memcpy(copy, ccraw, len + 1);
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(copy);
+#endif
+ escputs(copy);
+ free(copy);
wprintf("\" size=45 maxlength=1000 />");
wprintf("<div class=\"auto_complete\" id=\"bcc_name_choices\"></div>");
wprintf("</td></tr>");
}
wprintf("</label></th>"
"<td colspan=\"2\">"
- "<input type=\"text\" name=\"subject\" id=\"subject_id\" value=\" ");
+ "<input type=\"text\" name=\"subject\" id=\"subject_id\" value=\"");
escputs(bstr("subject"));
wprintf("\" size=45 maxlength=70>\n");
wprintf("</td></tr>");
}
}
- wprintf("</textarea>");
+ wprintf("</textarea>\n");
+ /** Make sure we only insert our signature once */
+ /** We don't care if it was there or not before, it needs to be there now. */
+ wprintf("<input type=\"hidden\" name=\"sig_inserted\" value=\"yes\">\n");
+
/**
* The following template embeds the TinyMCE richedit control, and automatically
* transforms the textarea into a richedit textarea.
wprintf("</div>"); /* End of "attachment buttons" div */
- /** Make sure we only insert our signature once */
- if (strcmp(bstr("sig_inserted"), "yes")) {
- wprintf("<input type=\"hidden\" name=\"sig_inserted\" value=\"yes\">\n");
- }
-
wprintf("</td></tr></table>");
wprintf("</form>\n");
projects / citadel.git / blobdiff