X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=ea2171d1512b73b794598099635fc5741467a2b4;hb=d120028b4c45f3c26d05186c8ba488fd2feef13f;hp=53e5461db9c5069eb6db88f8b565604667dc3970;hpb=dfc4e4e74075d10b9e607dbb942ac28ab3202763;p=citadel.git diff --git a/webcit/messages.c b/webcit/messages.c index 53e5461db..ea2171d15 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -5,33 +5,14 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_ICONV -#include -#endif - #include "webcit.h" #include "vcard.h" #include "webserver.h" +#include "groupdav.h" +#define SUBJ_COL_WIDTH_PCT 50 +#define SENDER_COL_WIDTH_PCT 30 +#define DATE_PLUS_BUTTONS_WIDTH_PCT 20 /* Address book entry (keep it short and sweet, it's just a quickie lookup * which we can use to get to the real meat and bones later) @@ -54,12 +35,13 @@ void utf8ify_rfc822_string(char *buf) { 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 */ + 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 */ + int passes = 0; while (start=strstr(buf, "=?"), end=strstr(buf, "?="), ((start != NULL) && (end != NULL) && (end > start)) ) @@ -68,9 +50,9 @@ void utf8ify_rfc822_string(char *buf) { extract_token(encoding, start, 2, '?', sizeof encoding); extract_token(istr, start, 3, '?', sizeof istr); - strcpy(start, ""); - ++end; + /*strcpy(start, ""); ++end; + ++end;*/ ibuf = malloc(1024); isav = ibuf; @@ -93,17 +75,44 @@ void utf8ify_rfc822_string(char *buf) { osav = obuf; iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen); osav[1024-obuflen] = 0; + + end = start; + end++; + strcpy(start, ""); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + strcpy(end, &end[1]); + snprintf(newbuf, sizeof newbuf, "%s%s%s", buf, osav, end); strcpy(buf, newbuf); free(osav); iconv_close(ic); } else { + end = start; + end++; + strcpy(start, ""); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + remove_token(end, 0, '?'); + strcpy(end, &end[1]); + snprintf(newbuf, sizeof newbuf, "%s(unreadable)%s", buf, end); strcpy(buf, newbuf); } free(isav); + + /* Since spammers will go to all sorts of absurd lengths to get their + * messages through, there are LOTS of corrupt headers out there. + * So, prevent a really badly formed RFC2047 header from throwing + * this function into an infinite loop. + */ + ++passes; + if (passes > 20) return; } } @@ -156,7 +165,7 @@ char buf[]; urlbuf[end - start] = 0; strncpy(outbuf, buf, start); - sprintf(&outbuf[start], "%cA HREF=%c%s%c TARGET=%c%s%c%c%s%c/A%c", + sprintf(&outbuf[start], "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c", LB, QU, urlbuf, QU, QU, TARGET, QU, RB, urlbuf, LB, RB); strcat(outbuf, &buf[end]); if ( strlen(outbuf) < 250 ) @@ -241,13 +250,13 @@ void display_parsed_vcard(struct vCard *v, int full) { char firsttoken[SIZ]; int pass; - char displayname[SIZ]; + char fullname[SIZ]; char title[SIZ]; char org[SIZ]; char phone[SIZ]; char mailto[SIZ]; - strcpy(displayname, ""); + strcpy(fullname, ""); strcpy(phone, ""); strcpy(mailto, ""); strcpy(title, ""); @@ -260,9 +269,9 @@ void display_parsed_vcard(struct vCard *v, int full) { escputs(name); } else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) { - strcpy(displayname, name); - vcard_n_prettyize(displayname); - escputs(displayname); + strcpy(fullname, name); + vcard_n_prettyize(fullname); + escputs(fullname); } else { wprintf(" "); @@ -312,15 +321,15 @@ void display_parsed_vcard(struct vCard *v, int full) { /* N is name, but only if there's no FN already there */ if (!strcasecmp(firsttoken, "n")) { - if (strlen(displayname) == 0) { - strcpy(displayname, thisvalue); - vcard_n_prettyize(displayname); + if (strlen(fullname) == 0) { + strcpy(fullname, thisvalue); + vcard_n_prettyize(fullname); } } /* FN (full name) is a true 'display name' field */ else if (!strcasecmp(firsttoken, "fn")) { - strcpy(displayname, thisvalue); + strcpy(fullname, thisvalue); } /* title */ @@ -336,11 +345,16 @@ void display_parsed_vcard(struct vCard *v, int full) { else if (!strcasecmp(firsttoken, "email")) { if (strlen(mailto) > 0) strcat(mailto, "
"); strcat(mailto, - ""); + strcat(mailto, "\">"); - urlesc(&mailto[strlen(mailto)], thisvalue); + stresc(&mailto[strlen(mailto)], thisvalue, 1, 1); strcat(mailto, ""); } else if (!strcasecmp(firsttoken, "tel")) { @@ -351,11 +365,11 @@ void display_parsed_vcard(struct vCard *v, int full) { if (!strcasecmp(buf, "tel")) strcat(phone, ""); else if (!strcasecmp(buf, "work")) - strcat(phone, " (work)"); + strcat(phone, _(" (work)")); else if (!strcasecmp(buf, "home")) - strcat(phone, " (home)"); + strcat(phone, _(" (home)")); else if (!strcasecmp(buf, "cell")) - strcat(phone, " (cell)"); + strcat(phone, _(" (cell)")); else { strcat(phone, " ("); strcat(phone, buf); @@ -365,7 +379,9 @@ void display_parsed_vcard(struct vCard *v, int full) { } else if (!strcasecmp(firsttoken, "adr")) { if (pass == 2) { - wprintf("Address:"); + wprintf(""); + wprintf(_("Address:")); + wprintf(""); for (j=0; j 0) { @@ -406,9 +422,9 @@ void display_parsed_vcard(struct vCard *v, int full) { if (pass == 1) { wprintf("" "" - "" + "" ""); - escputs(displayname); + escputs(fullname); wprintf(""); if (strlen(title) > 0) { wprintf("
"); @@ -422,10 +438,16 @@ void display_parsed_vcard(struct vCard *v, int full) { } wprintf("\n"); - if (strlen(phone) > 0) - wprintf("Telephone:%s\n", phone); - if (strlen(mailto) > 0) - wprintf("E-mail:%s\n", mailto); + if (strlen(phone) > 0) { + wprintf(""); + wprintf(_("Telephone:")); + wprintf("%s\n", phone); + } + if (strlen(mailto) > 0) { + wprintf(""); + wprintf(_("E-mail:")); + wprintf("%s\n", mailto); + } } } @@ -471,12 +493,10 @@ void display_vcard(char *vcard_source, char alpha, int full, char *storename) { } - - /* - * I wanna SEE that message! + * I wanna SEE that message! (Optional 'section' for encapsulated message/rfc822 submessage) */ -void read_message(long msgnum) { +void read_message(long msgnum, int printable_view, char *section) { char buf[SIZ]; char mime_partnum[256]; char mime_filename[256]; @@ -485,12 +505,15 @@ void read_message(long msgnum) { char mime_disposition[256]; int mime_length; char mime_http[SIZ]; + 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 now[256]; + char reply_all[4096]; + char now[64]; int format_type = 0; int nhdr = 0; int bq = 0; @@ -500,34 +523,40 @@ void read_message(long msgnum) { 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 */ + 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(rfca, ""); strcpy(reply_to, ""); + strcpy(reply_all, ""); strcpy(vcard_partnum, ""); strcpy(cal_partnum, ""); strcpy(mime_http, ""); strcpy(mime_content_type, "text/plain"); strcpy(mime_charset, "us-ascii"); + strcpy(mime_submessages, ""); - serv_printf("MSG4 %ld", msgnum); + serv_printf("MSG4 %ld|%s", msgnum, section); serv_getln(buf, sizeof buf); if (buf[0] != '1') { - wprintf("ERROR: %s
\n", &buf[4]); + wprintf(""); + wprintf(_("ERROR:")); + wprintf(" %s
\n", &buf[4]); return; } /* begin everythingamundo table */ - wprintf("
\n"); - wprintf("
\n"); + if (!printable_view) { + wprintf("
\n"); + wprintf("
\n"); + } /* begin message header table */ wprintf(""); strcpy(m_subject, ""); + strcpy(m_cc, ""); while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) { if (!strcmp(buf, "000")) { - wprintf("unexpected end of message

\n"); + wprintf(""); + wprintf(_("unexpected end of message")); + wprintf("

\n"); wprintf("\n"); return; } @@ -550,7 +582,8 @@ void read_message(long msgnum) { format_type = atoi(&buf[5]); if (!strncasecmp(buf, "from=", 5)) { strcpy(from, &buf[5]); - wprintf("from "); } - if (!strncasecmp(buf, "subj=", 5)) - strcpy(m_subject, &buf[5]); + if (!strncasecmp(buf, "subj=", 5)) { + safestrncpy(m_subject, &buf[5], sizeof m_subject); + } + if (!strncasecmp(buf, "cccc=", 5)) { + safestrncpy(m_cc, &buf[5], sizeof m_cc); + if (strlen(reply_all) > 0) { + strcat(reply_all, ", "); + } + safestrncpy(&reply_all[strlen(reply_all)], &buf[5], + (sizeof reply_all - strlen(reply_all)) ); + } if ((!strncasecmp(buf, "hnod=", 5)) - && (strcasecmp(&buf[5], serv_info.serv_humannode))) + && (strcasecmp(&buf[5], serv_info.serv_humannode))) { wprintf("(%s) ", &buf[5]); + } if ((!strncasecmp(buf, "room=", 5)) && (strcasecmp(&buf[5], WC->wc_roomname)) - && (strlen(&buf[5])>0) ) - wprintf("in %s> ", &buf[5]); + && (strlen(&buf[5])>0) ) { + wprintf(_("in ")); + wprintf("%s> ", &buf[5]); + } if (!strncasecmp(buf, "rfca=", 5)) { strcpy(rfca, &buf[5]); wprintf("<"); @@ -585,8 +630,16 @@ void read_message(long msgnum) { wprintf("@%s ", &buf[5]); } } - if (!strncasecmp(buf, "rcpt=", 5)) - wprintf("to %s ", &buf[5]); + if (!strncasecmp(buf, "rcpt=", 5)) { + wprintf(_("to ")); + escputs(&buf[5]); + wprintf(" "); + if (strlen(reply_all) > 0) { + strcat(reply_all, ", "); + } + safestrncpy(&reply_all[strlen(reply_all)], &buf[5], + (sizeof reply_all - strlen(reply_all)) ); + } if (!strncasecmp(buf, "time=", 5)) { fmt_date(now, atol(&buf[5]), 0); wprintf("%s ", now); @@ -599,28 +652,33 @@ void read_message(long msgnum) { extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type); mime_length = extract_int(&buf[5], 5); - if (!strcasecmp(mime_disposition, "attachment")) { + if (!strcasecmp(mime_content_type, "message/rfc822")) { + if (strlen(mime_submessages) > 0) { + strcat(mime_submessages, "|"); + } + strcat(mime_submessages, mime_partnum); + } + else if ((!strcasecmp(mime_disposition, "inline")) + && (!strncasecmp(mime_content_type, "image/", 6)) ){ snprintf(&mime_http[strlen(mime_http)], (sizeof(mime_http) - strlen(mime_http) - 1), - "" - "\n" - "Part %s: %s (%s, %d bytes)
\n", - msgnum, mime_partnum, - msgnum, mime_partnum, - mime_partnum, mime_filename, - mime_content_type, mime_length); + "", + msgnum, mime_partnum, mime_filename); } - - if ((!strcasecmp(mime_disposition, "inline")) - && (!strncasecmp(mime_content_type, "image/", 6)) ){ + else if ( (!strcasecmp(mime_disposition, "attachment")) + || (!strcasecmp(mime_disposition, "inline")) ) { snprintf(&mime_http[strlen(mime_http)], (sizeof(mime_http) - strlen(mime_http) - 1), - "", - msgnum, mime_partnum); + "" + "\n" + "%s (%s, %d bytes)
\n", + msgnum, mime_partnum, mime_filename, + msgnum, mime_partnum, + mime_filename, + mime_content_type, mime_length + ); } /*** begin handler prep ***/ @@ -660,42 +718,113 @@ void read_message(long msgnum) { wprintf(""); #ifdef HAVE_ICONV + utf8ify_rfc822_string(m_cc); utf8ify_rfc822_string(m_subject); #endif + if (strlen(m_cc) > 0) { + wprintf("
" + ""); + wprintf(_("CC:")); + wprintf(" "); + escputs(m_cc); + wprintf(""); + } if (strlen(m_subject) > 0) { wprintf("
" - "" - "Subject: %s" - "", m_subject - ); + ""); + wprintf(_("Subject:")); + wprintf(" "); + escputs(m_subject); + wprintf(""); } wprintf("\n"); /* start msg buttons */ - wprintf(""); } - wprintf("
\n"); + if (!printable_view) { + wprintf("\n"); + + /* Reply */ + if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) { + wprintf("is_mailbox) { + wprintf("?replyquote=%ld", msgnum); + } + wprintf("?recp="); + urlescputs(reply_to); + if (strlen(m_subject) > 0) { + wprintf("?subject="); + if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20"); + urlescputs(m_subject); + } + wprintf("\">[%s] ", _("Reply")); + } + + /* ReplyQuoted */ + if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) { + if (!WC->is_mailbox) { + wprintf("[%s] ", _("ReplyQuoted")); + } + } + + /* ReplyAll */ + if (WC->wc_view == VIEW_MAILBOX) { + wprintf("[%s] ", _("ReplyAll")); + } - /* Reply */ - wprintf("[Reply] "); + /* Forward */ + if (WC->wc_view == VIEW_MAILBOX) { + wprintf("[%s] ", _("Forward")); + } - if (WC->is_room_aide) { + /* If this is one of my own rooms, or if I'm an Aide or Room Aide, I can move/delete */ + if ( (WC->is_room_aide) || (WC->is_mailbox) ) { + /* Move */ + wprintf("[%s] ", + msgnum, _("Move")); - /* Move */ - wprintf("[Move] ", - msgnum); + /* Delete */ + wprintf("" + "[%s] ", msgnum, _("Delete this message?"), _("Delete") + ); + } + + /* Headers */ + wprintf("" + "[%s]", msgnum, msgnum, _("Headers")); - /* Delete */ - wprintf("" - "[Delete]", msgnum); - + + /* Print */ + wprintf("" + "[%s]", msgnum, msgnum, _("Print")); + + wprintf("
\n"); + wprintf("
\n"); /* Begin body */ wprintf(" 0)) { if (!strcmp(buf, "000")) { - wprintf("unexpected end of message

\n"); + wprintf(""); + wprintf(_("unexpected end of message")); + wprintf("

\n"); goto ENDBODY; } if (!strncasecmp(buf, "Content-type: ", 14)) { @@ -729,22 +860,27 @@ void read_message(long msgnum) { /* Set up a character set conversion if we need to (and if we can) */ #ifdef HAVE_ICONV + if (strchr(mime_charset, ';')) strcpy(strchr(mime_charset, ';'), ""); if ( (strcasecmp(mime_charset, "us-ascii")) - && (strcasecmp(mime_charset, "UTF-8")) ) { + && (strcasecmp(mime_charset, "UTF-8")) + && (strcasecmp(mime_charset, "")) + ) { ic = iconv_open("UTF-8", mime_charset); if (ic == (iconv_t)(-1) ) { - lprintf(5, "iconv_open() failed: %s\n", strerror(errno)); + lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n", + __FILE__, __LINE__, mime_charset, strerror(errno)); } } #endif /* Messages in legacy Citadel variformat get handled thusly... */ if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) { - fmout(NULL, "JUSTIFY"); + fmout("JUSTIFY"); } /* Boring old 80-column fixed format text gets handled this way... */ - else if (!strcasecmp(mime_content_type, "text/plain")) { + else if ( (!strcasecmp(mime_content_type, "text/plain")) + || (!strcasecmp(mime_content_type, "text")) ) { 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; @@ -789,13 +925,25 @@ void read_message(long msgnum) { /* Unknown weirdness */ else { - wprintf("I don't know how to display %s
\n", - mime_content_type); + wprintf(_("I don't know how to display %s"), mime_content_type); + wprintf("
\n", mime_content_type); while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { } } + /* If there are attached submessages, display them now... */ + if ( (strlen(mime_submessages) > 0) && (!section[0]) ) { + for (i=0; i"); + read_message(msgnum, 1, buf); + wprintf(""); + } + } + + /* Afterwards, offer links to download attachments 'n' such */ - if (strlen(mime_http) > 0) { + if ( (strlen(mime_http) > 0) && (!section[0]) ) { wprintf("%s", mime_http); } @@ -809,10 +957,10 @@ void read_message(long msgnum) { || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM)) || (WC->wc_view == VIEW_ADDRESSBOOK) ) { - wprintf("", + wprintf("", msgnum, vcard_partnum); - wprintf("[edit]"); + wprintf("[%s]", _("edit")); } /* In all cases, display the full card */ @@ -838,8 +986,384 @@ ENDBODY: wprintf("
\n"); /* end everythingamundo table */ - wprintf("
\n"); - wprintf("

\n"); + if (!printable_view) { + wprintf("\n"); + wprintf("

\n"); + } + +#ifdef HAVE_ICONV + if (ic != (iconv_t)(-1) ) { + iconv_close(ic); + } +#endif +} + + + +/* + * Unadorned HTML output of an individual message, suitable + * for placing in a hidden iframe, for printing, or whatever + */ +void embed_message(char *msgnum_as_string) { + long msgnum = 0L; + + msgnum = atol(msgnum_as_string); + begin_ajax_response(); + read_message(msgnum, 0, ""); + end_ajax_response(); +} + + +/* + * Printable view of a message + */ +void print_message(char *msgnum_as_string) { + long msgnum = 0L; + + msgnum = atol(msgnum_as_string); + output_headers(0, 0, 0, 0, 0, 0); + + wprintf("Content-type: text/html\r\n" + "Server: %s\r\n" + "Connection: close\r\n", + SERVER); + begin_burst(); + + wprintf("\r\n\r\n\n" + "Printable view\n" + "\n" + ); + + read_message(msgnum, 1, ""); + + wprintf("\n\n\n"); + wDumpContent(0); +} + + + +/* + * Display a message's headers + */ +void display_headers(char *msgnum_as_string) { + long msgnum = 0L; + char buf[1024]; + + msgnum = atol(msgnum_as_string); + output_headers(0, 0, 0, 0, 0, 0); + + wprintf("Content-type: text/plain\r\n" + "Server: %s\r\n" + "Connection: close\r\n", + SERVER); + begin_burst(); + + serv_printf("MSG2 %ld|3", msgnum); + serv_getln(buf, sizeof buf); + if (buf[0] == '1') { + while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { + wprintf("%s\n", buf); + } + } + + wDumpContent(0); +} + + + +/* + * Read message in simple, JavaScript-embeddable form for 'forward' + * or 'reply quoted' operations. + * + * NOTE: it is VITALLY IMPORTANT that we output no single-quotes or linebreaks + * in this function. Doing so would throw a JavaScript error in the + * 'supplied text' argument to the editor. + */ +void pullquote_message(long msgnum, int forward_attachments) { + char buf[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 *attachments = NULL; + int num_attachments = 0; + struct wc_attachment *att, *aptr; + char m_subject[256]; + char from[256]; + char node[256]; + char rfca[256]; + char reply_to[512]; + char now[256]; + int format_type = 0; + int nhdr = 0; + int bq = 0; + int i = 0; +#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(rfca, ""); + strcpy(reply_to, ""); + strcpy(mime_http, ""); + strcpy(mime_content_type, "text/plain"); + strcpy(mime_charset, "us-ascii"); + + serv_printf("MSG4 %ld", msgnum); + serv_getln(buf, sizeof buf); + if (buf[0] != '1') { + wprintf(_("ERROR:")); + wprintf("%s
", &buf[4]); + return; + } + + strcpy(m_subject, ""); + + while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) { + if (!strcmp(buf, "000")) { + wprintf(_("unexpected end of message")); + return; + } + if (!strncasecmp(buf, "nhdr=yes", 8)) + nhdr = 1; + if (nhdr == 1) + buf[0] = '_'; + if (!strncasecmp(buf, "type=", 5)) + format_type = atoi(&buf[5]); + if (!strncasecmp(buf, "from=", 5)) { + strcpy(from, &buf[5]); + wprintf(_("from ")); +#ifdef HAVE_ICONV + utf8ify_rfc822_string(from); +#endif + msgescputs(from); + } + if (!strncasecmp(buf, "subj=", 5)) { + strcpy(m_subject, &buf[5]); + } + if ((!strncasecmp(buf, "hnod=", 5)) + && (strcasecmp(&buf[5], serv_info.serv_humannode))) { + wprintf("(%s) ", &buf[5]); + } + if ((!strncasecmp(buf, "room=", 5)) + && (strcasecmp(&buf[5], WC->wc_roomname)) + && (strlen(&buf[5])>0) ) { + wprintf(_("in ")); + wprintf("%s> ", &buf[5]); + } + if (!strncasecmp(buf, "rfca=", 5)) { + strcpy(rfca, &buf[5]); + wprintf("<"); + msgescputs(rfca); + wprintf("> "); + } + + if (!strncasecmp(buf, "node=", 5)) { + strcpy(node, &buf[5]); + if ( ((WC->room_flags & QR_NETWORK) + || ((strcasecmp(&buf[5], serv_info.serv_nodename) + && (strcasecmp(&buf[5], serv_info.serv_fqdn))))) + && (strlen(rfca)==0) + ) { + wprintf("@%s ", &buf[5]); + } + } + if (!strncasecmp(buf, "rcpt=", 5)) { + wprintf(_("to ")); + wprintf("%s ", &buf[5]); + } + if (!strncasecmp(buf, "time=", 5)) { + fmt_date(now, atol(&buf[5]), 0); + wprintf("%s ", now); + } + + /* + * Save attachment info for later. We can't start downloading them + * yet because we're in the middle of a server transaction. + */ + if (!strncasecmp(buf, "part=", 5)) { + ++num_attachments; + attachments = realloc(attachments, (num_attachments * 1024)); + strcat(attachments, &buf[5]); + strcat(attachments, "\n"); + } + + } + + wprintf("
"); + +#ifdef HAVE_ICONV + utf8ify_rfc822_string(m_subject); +#endif + if (strlen(m_subject) > 0) { + wprintf(_("Subject:")); + wprintf(" "); + msgescputs(m_subject); + wprintf("
"); + } + + /* + * Begin body + */ + wprintf("
"); + + /* + * Learn the content type + */ + strcpy(mime_content_type, "text/plain"); + while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) { + if (!strcmp(buf, "000")) { + wprintf(_("unexpected end of message")); + goto ENDBODY; + } + if (!strncasecmp(buf, "Content-type: ", 14)) { + safestrncpy(mime_content_type, &buf[14], + sizeof(mime_content_type)); + for (i=0; i 0) && (isspace(buf[strlen(buf) - 1]))) + buf[strlen(buf) - 1] = 0; + if ((bq == 0) && + ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) { + wprintf("
"); + bq = 1; + } else if ((bq == 1) && + (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) { + wprintf("
"); + bq = 0; + } + wprintf(""); + url(buf); + msgescputs(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")) { + msgescputs(buf); + } + } + + /* 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; ilength = mime_length; + strcpy(att->content_type, mime_content_type); + strcpy(att->filename, mime_filename); + att->next = NULL; + att->data = load_mimepart(msgnum, mime_partnum); + + /* And add it to the list. */ + if (WC->first_attachment == NULL) { + WC->first_attachment = att; + } + else { + aptr = WC->first_attachment; + while (aptr->next != NULL) aptr = aptr->next; + aptr->next = att; + } + } + + } + free(attachments); + } #ifdef HAVE_ICONV if (ic != (iconv_t)(-1) ) { @@ -852,91 +1376,30 @@ ENDBODY: void display_summarized(int num) { char datebuf[64]; - wprintf(""); - if (WC->summ[num].is_new) wprintf(""); - wprintf("", - WC->msgarr[num]); - escputs(WC->summ[num].subj); - wprintf(""); - if (WC->summ[num].is_new) wprintf(""); - wprintf(""); - if (WC->summ[num].is_new) wprintf(""); - escputs(WC->summ[num].from); - if (WC->summ[num].is_new) wprintf(""); - wprintf(" "); - if (WC->summ[num].is_new) wprintf(""); - fmt_date(datebuf, WC->summ[num].date, 1); /* brief */ - escputs(datebuf); - if (WC->summ[num].is_new) wprintf(""); - wprintf(" "); - wprintf("" - "" - "\n", + wprintf("", + WC->summ[num].msgnum, + (WC->summ[num].is_new ? "bold" : "normal"), WC->summ[num].msgnum ); -} - -void summarize_message(int num, long msgnum, int is_new) { - char buf[SIZ]; - - memset(&WC->summ[num], 0, sizeof(struct message_summary)); - safestrncpy(WC->summ[num].subj, "(no subject)", sizeof WC->summ[num].subj); - WC->summ[num].is_new = is_new; - WC->summ[num].msgnum = msgnum; + wprintf("", SUBJ_COL_WIDTH_PCT); + escputs(WC->summ[num].subj); + wprintf(""); - /* ask for headers only with no MIME */ - sprintf(buf, "MSG0 %ld|3", msgnum); - serv_puts(buf); - serv_getln(buf, sizeof buf); - if (buf[0] != '1') return; + wprintf("", SENDER_COL_WIDTH_PCT); + escputs(WC->summ[num].from); + wprintf(""); - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { - if (!strncasecmp(buf, "from=", 5)) { - safestrncpy(WC->summ[num].from, &buf[5], sizeof WC->summ[num].from); - } - if (!strncasecmp(buf, "subj=", 5)) { - if (strlen(&buf[5]) > 0) { - safestrncpy(WC->summ[num].subj, &buf[5], - sizeof WC->summ[num].subj); -#ifdef HAVE_ICONV - /* Handle subjects with RFC2047 encoding */ - utf8ify_rfc822_string(WC->summ[num].subj); -#endif - if (strlen(WC->summ[num].subj) > 75) { - strcpy(&WC->summ[num].subj[72], "..."); - } - } - } + wprintf("", DATE_PLUS_BUTTONS_WIDTH_PCT); + fmt_date(datebuf, WC->summ[num].date, 1); /* brief */ + escputs(datebuf); + wprintf(""); - if (!strncasecmp(buf, "node=", 5)) { - if ( ((WC->room_flags & QR_NETWORK) - || ((strcasecmp(&buf[5], serv_info.serv_nodename) - && (strcasecmp(&buf[5], serv_info.serv_fqdn))))) - ) { - strcat(WC->summ[num].from, " @ "); - strcat(WC->summ[num].from, &buf[5]); - } - } + wprintf("\n"); +} - if (!strncasecmp(buf, "rcpt=", 5)) { - safestrncpy(WC->summ[num].to, &buf[5], sizeof WC->summ[num].to); - } - if (!strncasecmp(buf, "time=", 5)) { - WC->summ[num].date = atol(&buf[5]); - } - } - -#ifdef HAVE_ICONV - /* Handle senders with RFC2047 encoding */ - utf8ify_rfc822_string(WC->summ[num].from); -#endif - if (strlen(WC->summ[num].from) > 25) { - strcpy(&WC->summ[num].from[22], "..."); - } -} @@ -952,7 +1415,7 @@ void display_addressbook(long msgnum, char alpha) { struct message_summary summ; memset(&summ, 0, sizeof(summ)); - safestrncpy(summ.subj, "(no subject)", sizeof summ.subj); + safestrncpy(summ.subj, _("(no subject)"), sizeof summ.subj); sprintf(buf, "MSG0 %ld|1", msgnum); /* ask for headers only */ serv_puts(buf); @@ -986,10 +1449,10 @@ void display_addressbook(long msgnum, char alpha) { || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM)) || (WC->wc_view == VIEW_ADDRESSBOOK) ) { - wprintf("", + wprintf("", msgnum, vcard_partnum); - wprintf("[edit]"); + wprintf("[%s]", _("edit")); } free(vcard_source); @@ -1075,7 +1538,7 @@ void fetch_ab_name(long msgnum, char *namebuf) { for (i=0; iThis address book is empty.\n"); + wprintf("


"); + wprintf(_("This address book is empty.")); + wprintf("
\n"); return; } @@ -1135,7 +1600,7 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) { wprintf("Page: "); for (i=0; i<=num_pages; ++i) { if (i != page) { - wprintf("", i); + wprintf("", i); } else { wprintf(""); @@ -1177,9 +1642,9 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) { wprintf(""); - wprintf("", bstr("alpha")); + wprintf("?maxmsgs=1?summary=0?alpha=%s\">", bstr("alpha")); vcard_n_prettyize(addrbook[i].ab_name); escputs(addrbook[i].ab_name); wprintf("\n"); @@ -1195,12 +1660,29 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) { /* * load message pointers from the server */ -int load_msg_ptrs(char *servcmd) +int load_msg_ptrs(char *servcmd, int with_headers) { - char buf[SIZ]; + char buf[1024]; + time_t datestamp; + char fullname[128]; + char nodename[128]; + char inetaddr[128]; + char subject[256]; int nummsgs; int maxload = 0; + int num_summ_alloc = 0; + + if (with_headers) { + if (WC->num_summ != 0) { + free(WC->summ); + WC->num_summ = 0; + } + } + num_summ_alloc = 100; + WC->num_summ = 0; + WC->summ = malloc(num_summ_alloc * sizeof(struct message_summary)); + nummsgs = 0; maxload = sizeof(WC->msgarr) / sizeof(long) ; serv_puts(servcmd); @@ -1211,13 +1693,76 @@ int load_msg_ptrs(char *servcmd) } while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { if (nummsgs < maxload) { - WC->msgarr[nummsgs] = atol(buf); + WC->msgarr[nummsgs] = extract_long(buf, 0); + datestamp = extract_long(buf, 1); + extract_token(fullname, buf, 2, '|', sizeof fullname); + extract_token(nodename, buf, 3, '|', sizeof nodename); + extract_token(inetaddr, buf, 4, '|', sizeof inetaddr); + extract_token(subject, buf, 5, '|', sizeof subject); ++nummsgs; + + if (with_headers) { + if (nummsgs > num_summ_alloc) { + num_summ_alloc *= 2; + WC->summ = realloc(WC->summ, num_summ_alloc * sizeof(struct message_summary)); + } + ++WC->num_summ; + + memset(&WC->summ[nummsgs-1], 0, sizeof(struct message_summary)); + WC->summ[nummsgs-1].msgnum = WC->msgarr[nummsgs-1]; + safestrncpy(WC->summ[nummsgs-1].subj, _("(no subject)"), sizeof WC->summ[nummsgs-1].subj); + if (strlen(fullname) > 0) { + safestrncpy(WC->summ[nummsgs-1].from, fullname, sizeof WC->summ[nummsgs-1].from); + } + if (strlen(subject) > 0) { + 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); +#endif + if (strlen(WC->summ[nummsgs-1].subj) > 75) { + strcpy(&WC->summ[nummsgs-1].subj[72], "..."); + } + + if (strlen(nodename) > 0) { + if ( ((WC->room_flags & QR_NETWORK) + || ((strcasecmp(nodename, serv_info.serv_nodename) + && (strcasecmp(nodename, serv_info.serv_fqdn))))) + ) { + strcat(WC->summ[nummsgs-1].from, " @ "); + strcat(WC->summ[nummsgs-1].from, nodename); + } + } + + WC->summ[nummsgs-1].date = datestamp; + +#ifdef HAVE_ICONV + /* Handle senders with RFC2047 encoding */ + utf8ify_rfc822_string(WC->summ[nummsgs-1].from); +#endif + if (strlen(WC->summ[nummsgs-1].from) > 25) { + strcpy(&WC->summ[nummsgs-1].from[22], "..."); + } + } } } return (nummsgs); } +int longcmp_r(const void *s1, const void *s2) { + long l1; + long l2; + + l1 = *(long *)s1; + l2 = *(long *)s2; + + if (l1 > l2) return(-1); + if (l1 < l2) return(+1); + return(0); +} + int summcmp_subj(const void *s1, const void *s2) { struct message_summary *summ1; @@ -1287,11 +1832,11 @@ void readloop(char *oper) char cmd[SIZ]; char buf[SIZ]; char old_msgs[SIZ]; - int is_new = 0; int a, b; int nummsgs; long startmsg; int maxmsgs; + long *displayed_msgs = NULL; int num_displayed = 0; int is_summary = 0; int is_addressbook = 0; @@ -1299,14 +1844,10 @@ void readloop(char *oper) int is_calendar = 0; int is_tasks = 0; int is_notes = 0; - int remaining_messages; + int is_bbview = 0; int lo, hi; int lowest_displayed = (-1); int highest_displayed = 0; - long pn_previous = 0L; - long pn_current = 0L; - long pn_next = 0L; - int bg = 0; struct addrbookent *addrbook = NULL; int num_ab = 0; char *sortby = NULL; @@ -1315,6 +1856,7 @@ void readloop(char *oper) char *subjsort_button; char *sendsort_button; char *datesort_button; + int bbs_reverse = 0; startmsg = atol(bstr("startmsg")); maxmsgs = atoi(bstr("maxmsgs")); @@ -1329,13 +1871,19 @@ void readloop(char *oper) set_preference(sortpref_name, sortby, 1); } if (strlen(sortby) == 0) sortby = sortpref_value; - if (strlen(sortby) == 0) sortby = "msgid"; - if ( (strcasecmp(sortby, "msgid")) & (maxmsgs != 1) ) { - startmsg = 1; - maxmsgs = 9999999; + + /* mailbox sort */ + if (strlen(sortby) == 0) sortby = "rdate"; + + /* message board sort */ + if (!strcasecmp(sortby, "reverse")) { + bbs_reverse = 1; + } + else { + bbs_reverse = 0; } - output_headers(1, 1, 1, 0, 0, 0, 0); + output_headers(1, 1, 1, 0, 0, 0); /* When in summary mode, always show ALL messages instead of just * new or old. Otherwise, show what the user asked for. @@ -1358,11 +1906,13 @@ void readloop(char *oper) if ((WC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) { is_addressbook = 1; strcpy(cmd, "MSGS ALL"); - maxmsgs = 32767; + maxmsgs = 9999999; } if (is_summary) { - strcpy(cmd, "MSGS ALL"); + strcpy(cmd, "MSGS ALL|||1"); /* fetch header summary */ + startmsg = 1; + maxmsgs = 9999999; } /* Are we doing a summary view? If so, we need to know old messages @@ -1396,33 +1946,26 @@ void readloop(char *oper) maxmsgs = 32767; } - nummsgs = load_msg_ptrs(cmd); + nummsgs = load_msg_ptrs(cmd, is_summary); if (nummsgs == 0) { - if ((!is_tasks) && (!is_calendar) && (!is_notes)) { + if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) { + wprintf(""); if (!strcmp(oper, "readnew")) { - wprintf("No new messages.\n"); + wprintf(_("No new messages.")); } else if (!strcmp(oper, "readold")) { - wprintf("No old messages.\n"); + wprintf(_("No old messages.")); } else { - wprintf("No messages here.\n"); + wprintf(_("No messages here.")); } + wprintf("\n"); } goto DONE; } if (is_summary) { - if (WC->num_summ != 0) { - WC->num_summ = 0; - free(WC->summ); - } - WC->num_summ = nummsgs; - WC->summ = malloc(WC->num_summ*sizeof(struct message_summary)); for (a = 0; a < nummsgs; ++a) { - /* Gather summary information */ - summarize_message(a, WC->msgarr[a], is_new); - /* Are you a new message, or an old message? */ if (is_summary) { if (is_msg_in_mset(old_msgs, WC->msgarr[a])) { @@ -1435,12 +1978,12 @@ void readloop(char *oper) } } - if (startmsg == 0L) startmsg = WC->msgarr[0]; - remaining_messages = 0; - - for (a = 0; a < nummsgs; ++a) { - if (WC->msgarr[a] >= startmsg) { - ++remaining_messages; + if (startmsg == 0L) { + if (bbs_reverse) { + startmsg = WC->msgarr[(nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0]; + } + else { + startmsg = WC->msgarr[0]; } } @@ -1471,72 +2014,85 @@ void readloop(char *oper) } } - wprintf("
\n"); - if (!strcasecmp(sortby, "subject")) { - subjsort_button = "" ; + subjsort_button = "" ; } else if (!strcasecmp(sortby, "rsubject")) { - subjsort_button = "" ; + subjsort_button = "" ; } else { - subjsort_button = "" ; + subjsort_button = "" ; } if (!strcasecmp(sortby, "sender")) { - sendsort_button = "" ; + sendsort_button = "" ; } else if (!strcasecmp(sortby, "rsender")) { - sendsort_button = "" ; + sendsort_button = "" ; } else { - sendsort_button = "" ; + sendsort_button = "" ; } if (!strcasecmp(sortby, "date")) { - datesort_button = "" ; + datesort_button = "" ; } else if (!strcasecmp(sortby, "rdate")) { - datesort_button = "" ; + datesort_button = "" ; } else { - datesort_button = "" ; + datesort_button = "" ; } if (is_summary) { - wprintf("
" - "\n" - "" - "" - "" - "" - "" - "\n" + wprintf("\n"); /* end of 'content' div */ + + wprintf("\n" + ); + + /* note that Date and Delete are now in the same column */ + wprintf("
" + "
" + "
Subject %sSender %sDate %s
" + "" + ); + wprintf("" + "" + "" + "\n" , - subjsort_button, - sendsort_button, - datesort_button + SUBJ_COL_WIDTH_PCT, + _("Subject"), subjsort_button, + SENDER_COL_WIDTH_PCT, + _("Sender"), sendsort_button, + DATE_PLUS_BUTTONS_WIDTH_PCT, + _("Date"), datesort_button, + _("Delete") + ); + wprintf("
%s %s%s %s%s %s" + " " + "" + "
\n"); + + wprintf("
" + + "
\n" + + "" ); } for (a = 0; a < nummsgs; ++a) { if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) { - /* Learn which msgs "Prev" & "Next" buttons go to */ - pn_current = WC->msgarr[a]; - if (a > 0) pn_previous = WC->msgarr[a-1]; - if (a < (nummsgs-1)) pn_next = WC->msgarr[a+1]; - - /* If a tabular view, set up the line */ - if (is_summary) { - bg = 1 - bg; - wprintf("", - (bg ? "DDDDDD" : "FFFFFF") - ); - } - /* Display the message */ if (is_summary) { display_summarized(a); @@ -1560,128 +2116,151 @@ void readloop(char *oper) display_note(WC->msgarr[a]); } else { - read_message(WC->msgarr[a]); - } - - /* If a tabular view, finish the line */ - if (is_summary) { - wprintf("\n"); + if (displayed_msgs == NULL) { + displayed_msgs = malloc(sizeof(long) * + (maxmsgsmsgarr[a]; } if (lowest_displayed < 0) lowest_displayed = a; highest_displayed = a; ++num_displayed; - --remaining_messages; } } - if (is_summary) { - wprintf("
\n"); - } - - /* Bump these because although we're thinking in zero base, the user - * is a drooling idiot and is thinking in one base. + /* Set the "is_bbview" variable if it appears that we are looking at + * a classic bulletin board view. */ - ++lowest_displayed; - ++highest_displayed; + if ((!is_tasks) && (!is_calendar) && (!is_addressbook) + && (!is_notes) && (!is_singlecard) && (!is_summary)) { + is_bbview = 1; + } - /* If we're only looking at one message, do a prev/next thing */ - if (num_displayed == 1) { - if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) { + /* Output loop */ + if (displayed_msgs != NULL) { + if (bbs_reverse) { + qsort(displayed_msgs, num_displayed, sizeof(long), longcmp_r); + } - wprintf("
" - "\n" - "
" - "Reading #%d of %d messages.", - lowest_displayed, nummsgs); + /* if we do a split bbview in the future, begin messages div here */ - if (is_summary) { - wprintf("\n"); + for (a=0; a 0L) { - wprintf("" - "Previous \n", - oper, - pn_previous ); - } + /* if we do a split bbview in the future, end messages div here */ - if (pn_next > 0L) { - wprintf("" - "Next \n", - oper, - pn_next ); - } + free(displayed_msgs); + displayed_msgs = NULL; + } - wprintf("" - "Summary" - "", - oper, - WC->msgarr[0], - DEFAULT_MAXMSGS + if (is_summary) { + wprintf("
" + "
\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("\n"); - } + wprintf("
"); /* The preview pane will initially be empty */ } + /* 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 */ - if (num_displayed > 1) { - if ((!is_tasks) && (!is_calendar) && (!is_addressbook) - && (!is_notes) && (!is_singlecard)) { - - wprintf("Reading #", lowest_displayed, highest_displayed); + if (is_bbview) { + /* begin bbview scroller */ + wprintf(""); + wprintf(_("Reading #"), lowest_displayed, highest_displayed); - wprintf(" of %d messages.", nummsgs); + wprintf(" "); + wprintf(_("of %d messages."), nummsgs); - if (is_summary) { - wprintf("\n"); - } + /* forward/reverse */ + wprintf(" \n"); + /* end bbview scroller */ } - wprintf("\n"); DONE: if (is_tasks) { @@ -1696,6 +2275,7 @@ DONE: do_addrbook_view(addrbook, num_ab); /* Render the address book */ } + /* Note: wDumpContent() will output one additional
tag. */ wDumpContent(1); if (addrbook != NULL) free(addrbook); @@ -1704,15 +2284,6 @@ DONE: WC->num_summ = 0; free(WC->summ); } - - /* 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); - } } @@ -1728,6 +2299,9 @@ void post_mime_to_server(void) { char *encoded; size_t encoded_length; + /* RFC2045 requires this, and some clients look for it... */ + serv_puts("MIME-Version: 1.0"); + /* If there are attachments, we have to do multipart/mixed */ if (WC->first_attachment != NULL) { is_multipart = 1; @@ -1798,6 +2372,11 @@ void post_message(void) char buf[SIZ]; static long dont_post = (-1L); struct wc_attachment *att, *aptr; + int is_anonymous = 0; + + if (!strcasecmp(bstr("is_anonymous"), "yes")) { + is_anonymous = 1; + } if (WC->upload_length > 0) { @@ -1819,8 +2398,8 @@ void post_message(void) aptr->next = att; } - /* Netscape sends a simple filename, which is what we want, - * but Satan's browser sends an entire pathname. Reduce + /* 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. */ while (num_tokens(att->filename, '/') > 1) { @@ -1840,34 +2419,42 @@ void post_message(void) return; } - if (!strcasecmp(bstr("sc"), "Cancel")) { + if (strlen(bstr("cancel_button")) > 0) { sprintf(WC->ImportantMessage, - "Cancelled. Message was not posted."); - } else if (!strcasecmp(bstr("attach"), "Add")) { + _("Cancelled. Message was not posted.")); + } else if (strlen(bstr("attach_button")) > 0) { display_enter(); return; } else if (atol(bstr("postseq")) == dont_post) { sprintf(WC->ImportantMessage, - "Automatically cancelled because you have already " - "saved this message."); + _("Automatically cancelled because you have already " + "saved this message.")); } else { - sprintf(buf, "ENT0 1|%s|0|4|%s", + sprintf(buf, "ENT0 1|%s|%d|4|%s|||%s|%s", bstr("recp"), - bstr("subject") ); + is_anonymous, + bstr("subject"), + bstr("cc"), + bstr("bcc") + ); serv_puts(buf); serv_getln(buf, sizeof buf); if (buf[0] == '4') { post_mime_to_server(); - if (strlen(bstr("recp")) > 0) { - sprintf(WC->ImportantMessage, "Message has been sent.\n"); + if ( (strlen(bstr("recp")) > 0) + || (strlen(bstr("cc")) > 0) + || (strlen(bstr("bcc")) > 0) + ) { + sprintf(WC->ImportantMessage, _("Message has been sent.\n")); } else { - sprintf(WC->ImportantMessage, "Message has been posted.\n"); + sprintf(WC->ImportantMessage, _("Message has been posted.\n")); } dont_post = atol(bstr("postseq")); } else { - sprintf(WC->ImportantMessage, - "%s", &buf[4]); + sprintf(WC->ImportantMessage, "%s", &buf[4]); + display_enter(); + return; } } @@ -1884,13 +2471,22 @@ void post_message(void) void display_enter(void) { char buf[SIZ]; + char ebuf[SIZ]; long now; struct wc_attachment *att; + int recipient_required = 0; + int recipient_bad = 0; + int i; + int is_anonymous = 0; if (strlen(bstr("force_room")) > 0) { gotoroom(bstr("force_room")); } + if (!strcasecmp(bstr("is_anonymous"), "yes")) { + is_anonymous = 1; + } + /* Are we perhaps in an address book view? If so, then an "enter * message" command really means "add new entry." */ @@ -1917,97 +2513,225 @@ void display_enter(void) } #endif - /* Otherwise proceed normally. Do a custom room banner with no navbar... */ - output_headers(1, 1, 2, 0, 0, 0, 0); + /* + * Otherwise proceed normally. + * Do a custom room banner with no navbar... + */ + output_headers(1, 1, 2, 0, 0, 0); wprintf("
\n"); embed_room_banner(NULL, navbar_none); wprintf("
\n"); wprintf("
\n" - "
" + "
" "
"); - sprintf(buf, "ENT0 0|%s|0|0", bstr("recp")); - serv_puts(buf); + /* First test to see whether this is a room that requires recipients to be entered */ + serv_puts("ENT0 0"); serv_getln(buf, sizeof buf); - - if (!strncmp(buf, "570", 3)) { - if (strlen(bstr("recp")) > 0) { - svprintf("RECPERROR", WCS_STRING, - "%s
\n", - &buf[4] - ); - } - do_template("prompt_for_recipient"); - goto DONE; + if (!strncmp(buf, "570", 3)) { /* 570 means that we need a recipient here */ + recipient_required = 1; } - if (buf[0] != '2') { + else if (buf[0] != '2') { /* Any other error means that we cannot continue */ wprintf("%s
\n", &buf[4]); goto DONE; } + /* Now check our actual recipients if there are any */ + if (recipient_required) { + sprintf(buf, "ENT0 0|%s|%d|0||||%s|%s", bstr("recp"), is_anonymous, bstr("cc"), bstr("bcc")); + serv_puts(buf); + serv_getln(buf, sizeof buf); + + if (!strncmp(buf, "570", 3)) { /* 570 means we have an invalid recipient listed */ + if (strlen(bstr("recp")) + strlen(bstr("cc")) + strlen(bstr("bcc")) > 0) { + recipient_bad = 1; + } + } + else if (buf[0] != '2') { /* Any other error means that we cannot continue */ + wprintf("%s
\n", &buf[4]); + goto DONE; + } + } + + /* If we got this far, we can display the message entry screen. */ + now = time(NULL); fmt_date(buf, now, 0); - strcat(&buf[strlen(buf)], " from "); - stresc(&buf[strlen(buf)], WC->wc_username, 1, 1); + strcat(&buf[strlen(buf)], _(" from ")); + stresc(&buf[strlen(buf)], WC->wc_fullname, 1, 1); + + /* Don't need this anymore, it's in the input box below if (strlen(bstr("recp")) > 0) { - strcat(&buf[strlen(buf)], " to "); + strcat(&buf[strlen(buf)], _(" to ")); stresc(&buf[strlen(buf)], bstr("recp"), 1, 1); } - strcat(&buf[strlen(buf)], " in "); + */ + + strcat(&buf[strlen(buf)], _(" in ")); stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1); /* begin message entry screen */ - // wprintf("
\n"); - wprintf("
\n"); - wprintf("\n", - bstr("recp")); - wprintf("\n", - now); + wprintf("\n", now); - wprintf("%s
\n", buf); /* header bar */ wprintf("\""); - /* "onLoad=\"document.enterform.msgtext.focus();\" " */ - wprintf("Subject (optional):" + wprintf("%s\n", buf); /* header bar */ + if (WC->room_flags & QR_ANONOPT) { + wprintf(" " + "", + (is_anonymous ? "checked" : "") + ); + wprintf("Anonymous"); + } + wprintf("
\n"); /* header bar */ + + wprintf("\n"); + if (recipient_required) { + + wprintf("\n"); + + wprintf("\n"); + + wprintf("\n"); + + /* Initialize the autocomplete ajax helpers (found in wclib.js) */ + wprintf(" \n" + ); + } + + wprintf("
"); + wprintf(""); + wprintf(_("To:")); + wprintf(""); + wprintf("" + ""); + wprintf("
"); + wprintf("
"); + wprintf(""); + wprintf(_("CC:")); + wprintf(""); + wprintf("" + ""); + wprintf("
"); + wprintf("
"); + wprintf(""); + wprintf(_("BCC:")); + wprintf(""); + wprintf("" + ""); + wprintf("
"); + wprintf("
"); + wprintf(""); + wprintf(_("Subject (optional):")); + wprintf(""); + wprintf("" "" - " " - ); + wprintf("\" size=50 maxlength=70>\n"); - wprintf(" 0) { - wprintf("Send message"); + wprintf(" " - "\n"); - - wprintf("
\n" - " \n" - " \n" - "

\n"); + + /* If we're forwarding a message, insert it here... */ + if (atol(bstr("fwdquote")) > 0L) { + wprintf("
"); + wprintf(_("--- forwarded message ---")); + wprintf("

"); + pullquote_message(atol(bstr("fwdquote")), 1); + } + + /* If we're replying quoted, insert the quote here... */ + else if (atol(bstr("replyquote")) > 0L) { + wprintf("
" + "
"); + pullquote_message(atol(bstr("replyquote")), 0); + wprintf("
\n\n"); + } + + /* Insert our signature if appropriate... */ + if ( (WC->is_mailbox) && (strcmp(bstr("sig_inserted"), "yes")) ) { + get_preference("use_sig", buf, sizeof buf); + if (!strcasecmp(buf, "yes")) { + get_preference("signature", ebuf, sizeof ebuf); + euid_unescapize(buf, ebuf); + wprintf("
--
"); + for (i=0; i"); + } + else if (buf[i] == '<') { + wprintf("<"); + } + else if (buf[i] == '>') { + wprintf(">"); + } + else if (buf[i] == '&') { + wprintf("&"); + } + else if (buf[i] == '\"') { + wprintf("""); + } + else if (buf[i] == '\'') { + wprintf("'"); + } + else if (isprint(buf[i])) { + wprintf("%c", buf[i]); + } + } + } + } + + wprintf(""); + wprintf("
\n"); + + /* + * The following script embeds the TinyMCE richedit control, and automatically + * transforms the textarea into a richedit textarea. + */ + wprintf( + "\n" + "\n" + ); + /* Enumerate any attachments which are already in place... */ - wprintf(" Attachments: "); + wprintf(" "); + wprintf(_("Attachments:")); + wprintf(" "); wprintf("\n  " - "\n"); + "\n", _("Add")); + + /* Seth asked for these to be at the top *and* bottom... */ + wprintf(" " + "\n", _("Cancel")); + + /* Make sure we only insert our signature once */ + if (strcmp(bstr("sig_inserted"), "yes")) { + wprintf("\n"); + } wprintf("\n"); @@ -2034,10 +2774,6 @@ DONE: wDumpContent(1); - - - - void delete_msg(void) { long msgid; @@ -2045,10 +2781,15 @@ void delete_msg(void) msgid = atol(bstr("msgid")); - output_headers(1, 1, 1, 0, 0, 0, 0); + output_headers(1, 1, 1, 0, 0, 0); + + if (WC->wc_is_trash) { /* Delete from Trash is a real delete */ + serv_printf("DELE %ld", msgid); + } + else { /* Otherwise move it to Trash */ + serv_printf("MOVE %ld|_TRASH_|0", msgid); + } - sprintf(buf, "DELE %ld", msgid); - serv_puts(buf); serv_getln(buf, sizeof buf); wprintf("%s
\n", &buf[4]); @@ -2069,22 +2810,23 @@ void confirm_move_msg(void) msgid = atol(bstr("msgid")); - output_headers(1, 1, 1, 0, 0, 0, 0); - wprintf("
" - "
"); - wprintf("Confirm move of message\n"); - wprintf("
\n"); + output_headers(1, 1, 2, 0, 0, 0); + wprintf("
\n"); + wprintf("
"); + wprintf(""); + wprintf(_("Confirm move of message")); + wprintf("\n"); + wprintf("
\n"); + wprintf("
\n
\n"); wprintf("
"); - wprintf("Move this message to:
\n"); - - wprintf("
\n"); - wprintf("\n", - bstr("msgid")); + wprintf(_("Move this message to:")); + wprintf("
\n"); + wprintf("\n"); + wprintf("\n", bstr("msgid")); wprintf("\n"); wprintf("
\n"); - wprintf(""); + wprintf("", _("Move")); wprintf(" "); - wprintf(""); + wprintf("", _("Cancel")); wprintf("
\n"); wprintf("\n"); @@ -2118,66 +2860,15 @@ void move_msg(void) msgid = atol(bstr("msgid")); - output_headers(1, 1, 1, 0, 0, 0, 0); - - if (!strcasecmp(bstr("yesno"), "Move")) { + if (strlen(bstr("move_button")) > 0) { sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room")); serv_puts(buf); serv_getln(buf, sizeof buf); - wprintf("%s
\n", &buf[4]); + sprintf(WC->ImportantMessage, "%s", &buf[4]); } else { - wprintf("Message not moved.
\n"); - } - - wDumpContent(1); -} - -/* - * This gets called when a user selects multiple messages in a summary - * list and then clicks to perform a transformation of some sort on them - * (such as deleting them). - */ -void do_stuff_to_msgs(void) { - char buf[SIZ]; - char sc[SIZ]; - - struct stuff_t { - struct stuff_t *next; - long msgnum; - }; - - struct stuff_t *stuff = NULL; - struct stuff_t *ptr; - - - serv_puts("MSGS ALL"); - serv_getln(buf, sizeof buf); - - 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; - stuff = ptr; + sprintf(WC->ImportantMessage, (_("The message was not moved."))); } - strcpy(sc, bstr("sc")); - - while (stuff != NULL) { - - sprintf(buf, "msg_%ld", stuff->msgnum); - if (!strcasecmp(bstr(buf), "yes")) { - - if (!strcasecmp(sc, "Delete selected")) { - serv_printf("DELE %ld", stuff->msgnum); - serv_getln(buf, sizeof buf); - } - - } - - ptr = stuff->next; - free(stuff); - stuff = ptr; - } + readloop("readnew"); - readloop("readfwd"); }