X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=cfcf8ff94d3f2af60e6ccf9dc034fd03a48f24a8;hb=088ccd10d6dd7ca2bee8d3f7638a179c50726ae2;hp=f41c12694e93636bce623c91773b1b147d699225;hpb=7579c34f5f63fe5c7250351a8c4f0afebc3cbafc;p=citadel.git diff --git a/webcit/messages.c b/webcit/messages.c index f41c12694..cfcf8ff94 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -1,29 +1,64 @@ /* * $Id$ - * - * Functions which deal with the fetching and displaying of messages. + */ +/** + * \defgroup MsgDisp Functions which deal with the fetching and displaying of messages. + * \ingroup WebcitDisplayItems * */ - +/*@{*/ #include "webcit.h" #include "vcard.h" #include "webserver.h" #include "groupdav.h" +#define SUBJ_COL_WIDTH_PCT 50 /**< Mailbox view column width */ +#define SENDER_COL_WIDTH_PCT 30 /**< Mailbox view column width */ +#define DATE_PLUS_BUTTONS_WIDTH_PCT 20 /**< Mailbox view column width */ -/* Address book entry (keep it short and sweet, it's just a quickie lookup +/** + * 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) */ struct addrbookent { - char ab_name[64]; - long ab_msgnum; + char ab_name[64]; /**< name string */ + long ab_msgnum; /**< message number of address book entry */ }; #ifdef HAVE_ICONV -/* Handle subjects with RFC2047 encoding, such as: + +/** + * \brief Wrapper around iconv_open() + * Our version adds aliases for non-standard Microsoft charsets + * such as 'MS950', aliasing them to names like 'CP950' + * + * \param tocode Target encoding + * \param fromcode Source encoding + */ +iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode) +{ + iconv_t ic = (iconv_t)(-1) ; + ic = iconv_open(tocode, fromcode); + if (ic == (iconv_t)(-1) ) { + char alias_fromcode[64]; + if ( (strlen(fromcode) == 5) && (!strncasecmp(fromcode, "MS", 2)) ) { + safestrncpy(alias_fromcode, fromcode, sizeof alias_fromcode); + alias_fromcode[0] = 'C'; + alias_fromcode[1] = 'P'; + ic = iconv_open(tocode, alias_fromcode); + } + } + return(ic); +} + + +/** + * \brief Handle subjects with RFC2047 encoding + * such as: * =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?= + * \param buf the stringbuffer to process */ void utf8ify_rfc822_string(char *buf) { char *start, *end; @@ -32,13 +67,53 @@ 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; + int i; + int illegal_non_rfc2047_encoding = 0; + + /** Sometimes, badly formed messages contain strings which were simply + * written out directly in some foreign character set instead of + * using RFC2047 encoding. This is illegal but we will attempt to + * handle it anyway by converting from a user-specified default + * charset to UTF-8 if we see any nonprintable characters. + */ + for (i=0; i 126)) { + illegal_non_rfc2047_encoding = 1; + } + } + if (illegal_non_rfc2047_encoding) { + char default_header_charset[128]; + get_preference("default_header_charset", default_header_charset, sizeof default_header_charset); + if ( (strcasecmp(default_header_charset, "UTF-8")) && (strcasecmp(default_header_charset, "us-ascii")) ) { + ic = ctdl_iconv_open("UTF-8", default_header_charset); + if (ic != (iconv_t)(-1) ) { + ibuf = malloc(1024); + isav = ibuf; + safestrncpy(ibuf, buf, 1024); + ibuflen = strlen(ibuf); + obuflen = 1024; + obuf = (char *) malloc(obuflen); + osav = obuf; + iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen); + osav[1024-obuflen] = 0; + strcpy(buf, osav); + free(osav); + iconv_close(ic); + free(isav); + } + } + } + /** Now we handle foreign character sets properly encoded + * in RFC2047 format. + */ while (start=strstr(buf, "=?"), end=strstr(buf, "?="), ((start != NULL) && (end != NULL) && (end > start)) ) { @@ -46,26 +121,32 @@ void utf8ify_rfc822_string(char *buf) { 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 */ + 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 if (!strcasecmp(encoding, "Q")) { /**< quoted-printable */ + size_t len; + long pos; + + len = strlen(istr); + pos = 0; + while (pos < len) + { + if (istr[pos] == '_') istr[pos] = ' '; + pos++; + } + + ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len); } else { - strcpy(ibuf, istr); /* huh? */ + strcpy(ibuf, istr); /**< unknown encoding */ ibuflen = strlen(istr); } - ic = iconv_open("UTF-8", charset); + ic = ctdl_iconv_open("UTF-8", charset); if (ic != (iconv_t)(-1) ) { - obuf = malloc(1024); obuflen = 1024; obuf = (char *) malloc(obuflen); osav = obuf; @@ -87,34 +168,96 @@ void utf8ify_rfc822_string(char *buf) { 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; } } #endif -/* - * Look for URL's embedded in a buffer and make them linkable. We use a + + +/** + * \brief RFC2047-encode a header field if necessary. + * If no non-ASCII characters are found, the string + * will be copied verbatim without encoding. + * + * \param target Target buffer. + * \param maxlen Maximum size of target buffer. + * \param source Source string to be encoded. + */ +void rfc2047encode(char *target, int maxlen, char *source) +{ + int need_to_encode = 0; + int i; + unsigned char ch; + + if (target == NULL) return; + + for (i=0; i 126)) { + need_to_encode = 1; + } + } + + if (!need_to_encode) { + safestrncpy(target, source, maxlen); + return; + } + + strcpy(target, "=?UTF-8?Q?"); + for (i=0; i 126) || (ch == 61)) { + sprintf(&target[strlen(target)], "=%02X", ch); + } + else { + sprintf(&target[strlen(target)], "%c", ch); + } + } + + strcat(target, "?="); +} + + + + +/** + * \brief 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. + * \param buf the message buffer */ -void url(buf) -char buf[]; +void url(char *buf) { int pos; int start, end; - char ench; char urlbuf[SIZ]; char outbuf[1024]; - start = (-1); end = strlen(buf); - ench = 0; for (pos = 0; pos < strlen(buf); ++pos) { if (!strncasecmp(&buf[pos], "http://", 7)) @@ -126,25 +269,31 @@ char buf[]; if (start < 0) return; - if ((start > 0) && (buf[start - 1] == '<')) - ench = '>'; - if ((start > 0) && (buf[start - 1] == '[')) - ench = ']'; - if ((start > 0) && (buf[start - 1] == '(')) - ench = ')'; - if ((start > 0) && (buf[start - 1] == '{')) - ench = '}'; - for (pos = strlen(buf); pos > start; --pos) { - if ((buf[pos] == ' ') || (buf[pos] == ench)) + if ( (!isprint(buf[pos])) + || (isspace(buf[pos])) + || (buf[pos] == '{') + || (buf[pos] == '}') + || (buf[pos] == '|') + || (buf[pos] == '\\') + || (buf[pos] == '^') + || (buf[pos] == '[') + || (buf[pos] == ']') + || (buf[pos] == '`') + || (buf[pos] == '<') + || (buf[pos] == '>') + || (buf[pos] == '(') + || (buf[pos] == ')') + ) { end = pos; + } } strncpy(urlbuf, &buf[start], end - start); 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 ) @@ -152,8 +301,9 @@ char buf[]; } -/* - * Turn a vCard "n" (name) field into something displayable. +/** + * \brief Turn a vCard "n" (name) field into something displayable. + * \param name the name field to convert */ void vcard_n_prettyize(char *name) { @@ -187,10 +337,14 @@ void vcard_n_prettyize(char *name) -/* display_vcard() calls this after parsing the textual vCard into +/** + * \brief preparse a vcard name + * display_vcard() calls this after parsing the textual vCard into * our 'struct vCard' data object. * This gets called instead of display_parsed_vcard() if we are only looking * to extract the person's name instead of displaying the card. + * \param v the vcard to retrieve the name from + * \param storename where to put the name at */ void fetchname_parsed_vcard(struct vCard *v, char *storename) { char *name; @@ -207,7 +361,9 @@ void fetchname_parsed_vcard(struct vCard *v, char *storename) { -/* display_vcard() calls this after parsing the textual vCard into +/** + * \brief html print a vcard + * display_vcard() calls this after parsing the textual vCard into * our 'struct vCard' data object. * * Set 'full' to nonzero to display the full card, otherwise it will only @@ -218,6 +374,8 @@ void fetchname_parsed_vcard(struct vCard *v, char *storename) { * fields we understand, and then render them in a pretty fashion at the * end. Then we make a second pass, outputting all the fields we don't * understand in a simple two-column name/value format. + * \param v the vCard to display + * \param full display all items of the vcard? */ void display_parsed_vcard(struct vCard *v, int full) { int i, j; @@ -229,13 +387,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, ""); @@ -248,9 +406,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(" "); @@ -296,27 +454,27 @@ void display_parsed_vcard(struct vCard *v, int full) { thisvalue = strdup(v->prop[i].value); } - /*** Various fields we may encounter ***/ + /** Various fields we may encounter ***/ - /* N is name, but only if there's no FN already there */ + /** 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 */ + /** FN (full name) is a true 'display name' field */ else if (!strcasecmp(firsttoken, "fn")) { - strcpy(displayname, thisvalue); + strcpy(fullname, thisvalue); } - /* title */ + /** title */ else if (!strcasecmp(firsttoken, "title")) { strcpy(title, thisvalue); } - /* organization */ + /** organization */ else if (!strcasecmp(firsttoken, "org")) { strcpy(org, thisvalue); } @@ -324,10 +482,10 @@ void display_parsed_vcard(struct vCard *v, int full) { else if (!strcasecmp(firsttoken, "email")) { if (strlen(mailto) > 0) strcat(mailto, "
"); strcat(mailto, - ""); @@ -401,9 +559,9 @@ void display_parsed_vcard(struct vCard *v, int full) { if (pass == 1) { wprintf("" "" - "" + "" ""); - escputs(displayname); + escputs(fullname); wprintf(""); if (strlen(title) > 0) { wprintf("
"); @@ -436,12 +594,16 @@ void display_parsed_vcard(struct vCard *v, int full) { -/* - * Display a textual vCard +/** + * \brief Display a textual vCard * (Converts to a vCard object and then calls the actual display function) * Set 'full' to nonzero to display the whole card instead of a one-liner. * Or, if "storename" is non-NULL, just store the person's name in that * buffer instead of displaying the card at all. + * \param vcard_source the buffer containing the vcard text + * \param alpha what??? + * \param full should we usse all lines? + * \param storename where to store??? */ void display_vcard(char *vcard_source, char alpha, int full, char *storename) { struct vCard *v; @@ -472,10 +634,19 @@ void display_vcard(char *vcard_source, char alpha, int full, char *storename) { } -/* - * I wanna SEE that message! +struct attach_link { + char partnum[32]; + char html[1024]; +}; + + +/** + * \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) */ -void read_message(long msgnum, int printable_view) { +void read_message(long msgnum, int printable_view, char *section) { char buf[SIZ]; char mime_partnum[256]; char mime_filename[256]; @@ -483,7 +654,9 @@ void read_message(long msgnum, int printable_view) { char mime_charset[256]; char mime_disposition[256]; int mime_length; - char mime_http[SIZ]; + 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]; @@ -499,13 +672,14 @@ void read_message(long msgnum, int printable_view) { char vcard_partnum[256]; char cal_partnum[256]; char *part_source = NULL; + char msg4_partnum[32]; #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, ""); @@ -515,11 +689,11 @@ void read_message(long msgnum, int printable_view) { 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(""); @@ -528,27 +702,27 @@ void read_message(long msgnum, int printable_view) { return; } - /* begin everythingamundo table */ + /** begin everythingamundo table */ if (!printable_view) { - wprintf("
\n"); + wprintf("
\n"); wprintf("
\n"); } - /* begin message header table */ - wprintf("
\n"); + /** begin message header table */ + wprintf("\n"); + wprintf("\n"); - /* start msg buttons */ + /** start msg buttons */ if (!printable_view) { - wprintf(""); + wprintf(""); } - wprintf("
\n"); - wprintf(""); + wprintf(""); strcpy(m_subject, ""); strcpy(m_cc, ""); while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) { if (!strcmp(buf, "000")) { - wprintf(""); + wprintf(""); wprintf(_("unexpected end of message")); - wprintf("

\n"); - wprintf("\n"); + wprintf("

\n"); + wprintf("\n"); return; } if (!strncasecmp(buf, "nhdr=yes", 8)) @@ -560,14 +734,14 @@ void read_message(long msgnum, int printable_view) { if (!strncasecmp(buf, "from=", 5)) { strcpy(from, &buf[5]); wprintf(_("from ")); - wprintf(""); escputs(from); - wprintf(" "); + wprintf(" "); } if (!strncasecmp(buf, "subj=", 5)) { safestrncpy(m_subject, &buf[5], sizeof m_subject); @@ -609,13 +783,16 @@ void read_message(long msgnum, int printable_view) { } 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)) ); +#ifdef HAVE_ICONV + utf8ify_rfc822_string(&buf[5]); +#endif + escputs(&buf[5]); + wprintf(" "); } if (!strncasecmp(buf, "time=", 5)) { fmt_date(now, atol(&buf[5]), 0); @@ -629,30 +806,53 @@ void read_message(long msgnum, int printable_view) { extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type); mime_length = extract_int(&buf[5], 5); - if ((!strcasecmp(mime_disposition, "inline")) + 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), - "", + ++num_attach_links; + attach_links = realloc(attach_links, + (num_attach_links*sizeof(struct attach_link))); + safestrncpy(attach_links[num_attach_links-1].partnum, mime_partnum, 32); + snprintf(attach_links[num_attach_links-1].html, 1024, + "", msgnum, mime_partnum, mime_filename); } - else if ( (!strcasecmp(mime_disposition, "attachment")) - || (!strcasecmp(mime_disposition, "inline")) ) { - snprintf(&mime_http[strlen(mime_http)], - (sizeof(mime_http) - strlen(mime_http) - 1), - "" - "\n" - "Part %s: %s (%s, %d bytes)
\n", + else if ( ( (!strcasecmp(mime_disposition, "attachment")) + || (!strcasecmp(mime_disposition, "inline")) + || (!strcasecmp(mime_disposition, "")) + ) && (strlen(mime_content_type) > 0) + ) { + ++num_attach_links; + attach_links = realloc(attach_links, + (num_attach_links*sizeof(struct attach_link))); + safestrncpy(attach_links[num_attach_links-1].partnum, mime_partnum, 32); + snprintf(attach_links[num_attach_links-1].html, 1024, + "\n" + "%s (%s, %d bytes) [ " + "%s" + " | " + "%s" + " ]
\n", + mime_filename, + mime_content_type, mime_length, msgnum, mime_partnum, mime_filename, msgnum, mime_partnum, - mime_partnum, mime_filename, - mime_content_type, mime_length); + _("View"), + msgnum, mime_partnum, mime_filename, + _("Download") + ); } - /*** begin handler prep ***/ - if (!strcasecmp(mime_content_type, "text/x-vcard")) { + /** begin handler prep ***/ + if ( (!strcasecmp(mime_content_type, "text/x-vcard")) + || (!strcasecmp(mime_content_type, "text/vcard")) ) { strcpy(vcard_partnum, mime_partnum); } @@ -660,15 +860,20 @@ void read_message(long msgnum, int printable_view) { strcpy(cal_partnum, mime_partnum); } - /*** end handler prep ***/ + /** end handler prep ***/ } } - /* Generate a reply-to address */ + /** Generate a reply-to address */ if (strlen(rfca) > 0) { - strcpy(reply_to, rfca); + if (strlen(from) > 0) { + snprintf(reply_to, sizeof(reply_to), "%s <%s>", from, rfca); + } + else { + strcpy(reply_to, rfca); + } } else { if ( (strlen(node) > 0) @@ -686,122 +891,138 @@ void read_message(long msgnum, int printable_view) { wprintf("****"); } - wprintf(""); + 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(""); + wprintf(""); } if (strlen(m_subject) > 0) { wprintf("
" - ""); + ""); wprintf(_("Subject:")); wprintf(" "); escputs(m_subject); - wprintf(""); + wprintf(""); } - wprintf("		\n"); + wprintf("\n"); - /* Reply */ + /** Reply */ if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) { - wprintf("is_mailbox) { wprintf("?replyquote=%ld", msgnum); } wprintf("?recp="); urlescputs(reply_to); - wprintf("?subject="); - if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20"); - urlescputs(m_subject); + if (strlen(m_subject) > 0) { + wprintf("?subject="); + if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20"); + urlescputs(m_subject); + } wprintf("\">[%s] ", _("Reply")); } - /* ReplyQuoted */ + /** ReplyQuoted */ if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) { if (!WC->is_mailbox) { - wprintf(" 0) { + wprintf("?subject="); + if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20"); + urlescputs(m_subject); + } wprintf("\">[%s] ", _("ReplyQuoted")); } } - /* ReplyAll */ + /** ReplyAll */ if (WC->wc_view == VIEW_MAILBOX) { - wprintf(" 0) { + wprintf("?subject="); + if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20"); + urlescputs(m_subject); + } wprintf("\">[%s] ", _("ReplyAll")); } - /* Forward */ + /** Forward */ if (WC->wc_view == VIEW_MAILBOX) { - wprintf("[%s] ", _("Forward")); } - /* 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] ", + /** 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) || (WC->room_flags2 & QR2_COLLABDEL) ) { + /** Move */ + wprintf("[%s] ", msgnum, _("Move")); - /* Delete */ - wprintf("" "[%s] ", msgnum, _("Delete this message?"), _("Delete") ); } - wprintf("" + /** Headers */ + wprintf("" + "[%s]", msgnum, msgnum, _("Headers")); + + + /** Print */ + wprintf("" "[%s]", msgnum, msgnum, _("Print")); - wprintf("
\n"); + wprintf("
\n"); - /* Begin body */ - 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(""); + wprintf(""); wprintf(_("unexpected end of message")); - wprintf("

\n"); + wprintf("

\n"); goto ENDBODY; } - if (!strncasecmp(buf, "Content-type: ", 14)) { - safestrncpy(mime_content_type, &buf[14], - sizeof(mime_content_type)); + if (!strncasecmp(buf, "X-Citadel-MSG4-Partnum:", 23)) { + safestrncpy(msg4_partnum, &buf[23], sizeof(msg4_partnum)); + striplt(msg4_partnum); + } + if (!strncasecmp(buf, "Content-type:", 13)) { + safestrncpy(mime_content_type, &buf[13], sizeof(mime_content_type)); + striplt(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("
"); + ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) { + wprintf("
"); bq = 1; } else if ((bq == 1) && - (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) { - wprintf("
"); + (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) { + wprintf("
"); bq = 0; } - wprintf(""); + wprintf(""); url(buf); escputs(buf); - wprintf("
\n"); + wprintf("
\n"); } - wprintf("
"); + wprintf("
"); } - else /* HTML is fun, but we've got to strip it first */ + else /** HTML is fun, but we've got to strip it first */ if (!strcasecmp(mime_content_type, "text/html")) { - output_html(mime_charset); + output_html(mime_charset, (WC->wc_view == VIEW_WIKI ? 1 : 0)); } - /* Unknown weirdness */ + /** Unknown weirdness */ else { 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")) { } } - /* Afterwards, offer links to download attachments 'n' such */ - if (strlen(mime_http) > 0) { - wprintf("%s", mime_http); + /** 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 ( (num_attach_links > 0) && (!section[0]) ) { + for (i=0; i 0) { part_source = load_mimepart(msgnum, vcard_partnum); if (part_source != NULL) { - /* If it's my vCard I can edit it */ + /** If it's my vCard I can edit it */ if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM)) || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM)) || (WC->wc_view == VIEW_ADDRESSBOOK) ) { - wprintf("", msgnum, vcard_partnum); - wprintf("[%s]", _("edit")); + wprintf("[%s]", _("edit")); } - /* In all cases, display the full card */ + /** In all cases, display the full card */ display_vcard(part_source, 0, 1, NULL); } } - /* Handler for calendar parts */ + /** Handler for calendar parts */ if (strlen(cal_partnum) > 0) { part_source = load_mimepart(msgnum, cal_partnum); if (part_source != NULL) { @@ -925,14 +1171,18 @@ void read_message(long msgnum, int printable_view) { } ENDBODY: - wprintf("
\n"); + wprintf("
\n"); - /* end everythingamundo table */ + /** end everythingamundo table */ if (!printable_view) { - wprintf("
\n"); + wprintf("\n"); wprintf("

\n"); } + if (num_attach_links > 0) { + free(attach_links); + } + #ifdef HAVE_ICONV if (ic != (iconv_t)(-1) ) { iconv_close(ic); @@ -942,27 +1192,31 @@ ENDBODY: -/* - * Unadorned HTML output of an individual message, suitable +/** + * \brief Unadorned HTML output of an individual message, suitable * for placing in a hidden iframe, for printing, or whatever + * + * \param msgnum_as_string Message number, as a string instead of as a long int */ -void embed_message(void) { +void embed_message(char *msgnum_as_string) { long msgnum = 0L; - msgnum = atol(bstr("msgnum")); + msgnum = atol(msgnum_as_string); begin_ajax_response(); - read_message(msgnum, 0); + read_message(msgnum, 0, ""); end_ajax_response(); } -/* - * Printable view of a message +/** + * \brief Printable view of a message + * + * \param msgnum_as_string Message number, as a string instead of as a long int */ -void print_message(void) { +void print_message(char *msgnum_as_string) { long msgnum = 0L; - msgnum = atol(bstr("msgnum")); + msgnum = atol(msgnum_as_string); output_headers(0, 0, 0, 0, 0, 0); wprintf("Content-type: text/html\r\n" @@ -976,7 +1230,7 @@ void print_message(void) { "\n" ); - read_message(msgnum, 1); + read_message(msgnum, 1, ""); wprintf("\n\n\n"); wDumpContent(0); @@ -984,15 +1238,49 @@ void print_message(void) { -/* - * Read message in simple, JavaScript-embeddable form for 'forward' - * or 'reply quoted' operations. +/** + * \brief Display a message's headers + * + * \param msgnum_as_string Message number, as a string instead of as a long int + */ +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); +} + + + +/** + * \brief 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. + * + * \param msgnum Message number of the message we want to quote + * \param forward_attachments Nonzero if we want attachments to be forwarded */ -void pullquote_message(long msgnum, int forward_attachments) { +void pullquote_message(long msgnum, int forward_attachments, int include_headers) { char buf[SIZ]; char mime_partnum[256]; char mime_filename[256]; @@ -1000,8 +1288,8 @@ void pullquote_message(long msgnum, int forward_attachments) { char mime_charset[256]; char mime_disposition[256]; int mime_length; - char mime_http[SIZ]; char *attachments = NULL; + char *ptr = NULL; int num_attachments = 0; struct wc_attachment *att, *aptr; char m_subject[256]; @@ -1016,18 +1304,17 @@ void pullquote_message(long msgnum, int forward_attachments) { 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 */ + 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"); @@ -1046,90 +1333,101 @@ void pullquote_message(long msgnum, int forward_attachments) { 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 ")); + if (include_headers) { + 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); + 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]); + 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); } - } - 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"); + ptr = malloc( (strlen(buf) + ((attachments != NULL) ? strlen(attachments) : 0)) ) ; + if (ptr != NULL) { + ++num_attachments; + sprintf(ptr, "%s%s\n", + ((attachments != NULL) ? attachments : ""), + &buf[5] + ); + free(attachments); + attachments = ptr; + lprintf(9, "attachments=<%s>\n", attachments); + } } } - wprintf("
"); + if (include_headers) { + wprintf("
"); #ifdef HAVE_ICONV - utf8ify_rfc822_string(m_subject); + utf8ify_rfc822_string(m_subject); #endif - if (strlen(m_subject) > 0) { - wprintf(_("Subject:")); - wprintf(" "); - msgescputs(m_subject); + if (strlen(m_subject) > 0) { + wprintf(_("Subject:")); + wprintf(" "); + msgescputs(m_subject); + wprintf("
"); + } + + /** + * Begin body + */ wprintf("
"); } - /* - * Begin body - */ - wprintf("
"); - - /* + /** * Learn the content type */ strcpy(mime_content_type, "text/plain"); @@ -1152,21 +1450,29 @@ void pullquote_message(long msgnum, int forward_attachments) { mime_content_type[i] = 0; } } + 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("
"); + ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) { + wprintf("
"); bq = 1; } else if ((bq == 1) && - (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) { - wprintf("
"); + (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) { + wprintf("
"); bq = 0; } - wprintf(""); + wprintf(""); url(buf); msgescputs(buf); - wprintf("
"); + wprintf("
"); } - wprintf("
"); + wprintf("
"); } - /* HTML just gets escaped and stuffed back into the editor */ + /** 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); } } - /* Unknown weirdness ... don't know how to handle this content type */ + /** 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 */ + /** end of body handler */ /* * If there were attachments, we have to download them and insert them @@ -1241,12 +1548,12 @@ ENDBODY: /* * tracing ... uncomment if necessary * + */ lprintf(9, "fwd filename: %s\n", mime_filename); lprintf(9, "fwd partnum : %s\n", mime_partnum); lprintf(9, "fwd conttype: %s\n", mime_content_type); lprintf(9, "fwd dispose : %s\n", mime_disposition); lprintf(9, "fwd length : %d\n", mime_length); - */ if ( (!strcasecmp(mime_disposition, "inline")) || (!strcasecmp(mime_disposition, "attachment")) ) { @@ -1272,7 +1579,6 @@ ENDBODY: } } - free(attachments); } #ifdef HAVE_ICONV @@ -1280,41 +1586,50 @@ ENDBODY: iconv_close(ic); } #endif -} - - - - + if (attachments != NULL) { + free(attachments); + } +} +/** + * \brief Display one row in the mailbox summary view + * + * \param num The row number to be displayed + */ void display_summarized(int num) { char datebuf[64]; - wprintf(""); - if (WC->summ[num].is_new) wprintf(""); + wprintf("", + WC->summ[num].msgnum, + (WC->summ[num].is_new ? "bold" : "normal"), + WC->summ[num].msgnum + ); + + wprintf("", SUBJ_COL_WIDTH_PCT); escputs(WC->summ[num].subj); - if (WC->summ[num].is_new) wprintf(""); - wprintf(""); - if (WC->summ[num].is_new) wprintf(""); + wprintf(""); + + wprintf("", SENDER_COL_WIDTH_PCT); escputs(WC->summ[num].from); - if (WC->summ[num].is_new) wprintf(""); - wprintf(" "); - if (WC->summ[num].is_new) wprintf(""); + wprintf(""); + + wprintf("", DATE_PLUS_BUTTONS_WIDTH_PCT); fmt_date(datebuf, WC->summ[num].date, 1); /* brief */ escputs(datebuf); - if (WC->summ[num].is_new) wprintf(""); - wprintf(" "); - wprintf("" - "" - "\n", - WC->summ[num].msgnum - ); -} - + wprintf(""); + wprintf("\n"); +} +/** + * \brief display the adressbook overview + * \param msgnum the citadel message number + * \param alpha what???? + */ void display_addressbook(long msgnum, char alpha) { char buf[SIZ]; char mime_partnum[SIZ]; @@ -1342,7 +1657,8 @@ void display_addressbook(long msgnum, char alpha) { 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")) { + if ( (!strcasecmp(mime_content_type, "text/x-vcard")) + || (!strcasecmp(mime_content_type, "text/vcard")) ) { strcpy(vcard_partnum, mime_partnum); } @@ -1353,18 +1669,18 @@ void display_addressbook(long msgnum, char alpha) { vcard_source = load_mimepart(msgnum, vcard_partnum); if (vcard_source != NULL) { - /* Display the summary line */ + /** Display the summary line */ display_vcard(vcard_source, alpha, 0, NULL); - /* If it's my vCard I can edit it */ + /** If it's my vCard I can edit it */ if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM)) || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM)) || (WC->wc_view == VIEW_ADDRESSBOOK) ) { - wprintf("", msgnum, vcard_partnum); - wprintf("[%s]", _("edit")); + wprintf("[%s]", _("edit")); } free(vcard_source); @@ -1375,8 +1691,9 @@ void display_addressbook(long msgnum, char alpha) { -/* If it's an old "Firstname Lastname" style record, try to - * convert it. +/** + * \brief If it's an old "Firstname Lastname" style record, try to convert it. + * \param namebuf name to analyze, reverse if nescessary */ void lastfirst_firstlast(char *namebuf) { char firstname[SIZ]; @@ -1395,7 +1712,11 @@ void lastfirst_firstlast(char *namebuf) { sprintf(namebuf, "%s; %s", lastname, firstname); } - +/** + * \brief fetch what??? name + * \param msgnum the citadel message number + * \param namebuf where to put the name in??? + */ void fetch_ab_name(long msgnum, char *namebuf) { char buf[SIZ]; char mime_partnum[SIZ]; @@ -1414,7 +1735,7 @@ void fetch_ab_name(long msgnum, char *namebuf) { memset(&summ, 0, sizeof(summ)); safestrncpy(summ.subj, "(no subject)", sizeof summ.subj); - sprintf(buf, "MSG0 %ld|1", msgnum); /* ask for headers only */ + sprintf(buf, "MSG0 %ld|0", msgnum); /** unfortunately we need the mime info now */ serv_puts(buf); serv_getln(buf, sizeof buf); if (buf[0] != '1') return; @@ -1427,7 +1748,8 @@ void fetch_ab_name(long msgnum, char *namebuf) { 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")) { + if ( (!strcasecmp(mime_content_type, "text/x-vcard")) + || (!strcasecmp(mime_content_type, "text/vcard")) ) { strcpy(vcard_partnum, mime_partnum); } @@ -1455,8 +1777,10 @@ void fetch_ab_name(long msgnum, char *namebuf) { -/* - * Record compare function for sorting address book indices +/** + * \brief Record compare function for sorting address book indices + * \param ab1 adressbook one + * \param ab2 adressbook two */ int abcmp(const void *ab1, const void *ab2) { return(strcasecmp( @@ -1466,9 +1790,11 @@ int abcmp(const void *ab1, const void *ab2) { } -/* - * Helper function for do_addrbook_view() +/** + * \brief Helper function for do_addrbook_view() * Converts a name into a three-letter tab label + * \param tabbuf the tabbuffer to add name to + * \param name the name to add to the tabbuffer */ void nametab(char *tabbuf, char *name) { stresc(tabbuf, name, 0, 0); @@ -1479,8 +1805,10 @@ void nametab(char *tabbuf, char *name) { } -/* - * Render the address book using info we gathered during the scan +/** + * \brief Render the address book using info we gathered during the scan + * \param addrbook the addressbook to render + * \param num_ab the number of the addressbook */ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) { int i = 0; @@ -1512,7 +1840,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(""); @@ -1534,7 +1862,7 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) { } wprintf("
\n"); - wprintf("\n" ); @@ -1544,39 +1872,41 @@ void do_addrbook_view(struct addrbookent *addrbook, int num_ab) { if ((displayed % 4) == 0) { if (displayed > 0) { - wprintf("\n"); + wprintf("\n"); } bg = 1 - bg; - wprintf("", + wprintf("", (bg ? "DDDDDD" : "FFFFFF") ); } - wprintf("\n"); + wprintf("\n"); ++displayed; } } - wprintf("
"); + wprintf(""); - wprintf("", bstr("alpha")); vcard_n_prettyize(addrbook[i].ab_name); escputs(addrbook[i].ab_name); - wprintf("
\n"); + wprintf("\n"); } -/* - * load message pointers from the server +/** + * \brief load message pointers from the server + * \param servcmd the citadel command to send to the citserver + * \param with_headers what headers??? */ int load_msg_ptrs(char *servcmd, int with_headers) { char buf[1024]; time_t datestamp; - char displayname[128]; + char fullname[128]; char nodename[128]; char inetaddr[128]; char subject[256]; @@ -1585,11 +1915,10 @@ int load_msg_ptrs(char *servcmd, int with_headers) int num_summ_alloc = 0; - if (with_headers) { - if (WC->num_summ != 0) { - free(WC->summ); - WC->num_summ = 0; - } + if (WC->summ != NULL) { + free(WC->summ); + WC->num_summ = 0; + WC->summ = NULL; } num_summ_alloc = 100; WC->num_summ = 0; @@ -1600,14 +1929,13 @@ int load_msg_ptrs(char *servcmd, int with_headers) serv_puts(servcmd); serv_getln(buf, sizeof buf); if (buf[0] != '1') { - wprintf("%s
\n", &buf[4]); return (nummsgs); } while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { if (nummsgs < maxload) { WC->msgarr[nummsgs] = extract_long(buf, 0); datestamp = extract_long(buf, 1); - extract_token(displayname, buf, 2, '|', sizeof displayname); + 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); @@ -1616,22 +1944,25 @@ int load_msg_ptrs(char *servcmd, int with_headers) 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->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(displayname) > 0) { - safestrncpy(WC->summ[nummsgs-1].from, displayname, sizeof WC->summ[nummsgs-1].from); + 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 */ + /** Handle subjects with RFC2047 encoding */ utf8ify_rfc822_string(WC->summ[nummsgs-1].subj); #endif if (strlen(WC->summ[nummsgs-1].subj) > 75) { @@ -1651,7 +1982,7 @@ int load_msg_ptrs(char *servcmd, int with_headers) WC->summ[nummsgs-1].date = datestamp; #ifdef HAVE_ICONV - /* Handle senders with RFC2047 encoding */ + /** Handle senders with RFC2047 encoding */ utf8ify_rfc822_string(WC->summ[nummsgs-1].from); #endif if (strlen(WC->summ[nummsgs-1].from) > 25) { @@ -1663,8 +1994,32 @@ int load_msg_ptrs(char *servcmd, int with_headers) return (nummsgs); } - -int summcmp_subj(const void *s1, const void *s2) { +/** + * \brief qsort() compatible function to compare two longs in descending order. + * + * \param s1 first number to compare + * \param s2 second number to compare + */ +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); +} + + +/** + * \brief qsort() compatible function to compare two message summary structs by ascending subject. + * + * \param s1 first item to compare + * \param s2 second item to compare + */ +int summcmp_subj(const void *s1, const void *s2) { struct message_summary *summ1; struct message_summary *summ2; @@ -1673,6 +2028,12 @@ int summcmp_subj(const void *s1, const void *s2) { return strcasecmp(summ1->subj, summ2->subj); } +/** + * \brief qsort() compatible function to compare two message summary structs by descending subject. + * + * \param s1 first item to compare + * \param s2 second item to compare + */ int summcmp_rsubj(const void *s1, const void *s2) { struct message_summary *summ1; struct message_summary *summ2; @@ -1682,6 +2043,12 @@ int summcmp_rsubj(const void *s1, const void *s2) { return strcasecmp(summ2->subj, summ1->subj); } +/** + * \brief qsort() compatible function to compare two message summary structs by ascending sender. + * + * \param s1 first item to compare + * \param s2 second item to compare + */ int summcmp_sender(const void *s1, const void *s2) { struct message_summary *summ1; struct message_summary *summ2; @@ -1691,6 +2058,12 @@ int summcmp_sender(const void *s1, const void *s2) { return strcasecmp(summ1->from, summ2->from); } +/** + * \brief qsort() compatible function to compare two message summary structs by descending sender. + * + * \param s1 first item to compare + * \param s2 second item to compare + */ int summcmp_rsender(const void *s1, const void *s2) { struct message_summary *summ1; struct message_summary *summ2; @@ -1700,6 +2073,12 @@ int summcmp_rsender(const void *s1, const void *s2) { return strcasecmp(summ2->from, summ1->from); } +/** + * \brief qsort() compatible function to compare two message summary structs by ascending date. + * + * \param s1 first item to compare + * \param s2 second item to compare + */ int summcmp_date(const void *s1, const void *s2) { struct message_summary *summ1; struct message_summary *summ2; @@ -1712,6 +2091,12 @@ int summcmp_date(const void *s1, const void *s2) { else return 0; } +/** + * \brief qsort() compatible function to compare two message summary structs by descending date. + * + * \param s1 first item to compare + * \param s2 second item to compare + */ int summcmp_rdate(const void *s1, const void *s2) { struct message_summary *summ1; struct message_summary *summ2; @@ -1724,18 +2109,23 @@ int summcmp_rdate(const void *s1, const void *s2) { else return 0; } -/* - * command loop for reading messages + + +/** + * \brief command loop for reading messages + * + * \param oper Set to "readnew" or "readold" or "readfwd" or "headers" */ void readloop(char *oper) { - char cmd[SIZ]; + char cmd[256]; char buf[SIZ]; char old_msgs[SIZ]; 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; @@ -1743,14 +2133,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; @@ -1759,6 +2145,13 @@ void readloop(char *oper) char *subjsort_button; char *sendsort_button; char *datesort_button; + int bbs_reverse = 0; + + if (WC->wc_view == VIEW_WIKI) { + sprintf(buf, "wiki?room=%s?page=home", WC->wc_roomname); + http_redirect(buf); + return; + } startmsg = atol(bstr("startmsg")); maxmsgs = atoi(bstr("maxmsgs")); @@ -1773,11 +2166,22 @@ void readloop(char *oper) set_preference(sortpref_name, sortby, 1); } if (strlen(sortby) == 0) sortby = sortpref_value; - if (strlen(sortby) == 0) sortby = "msgid"; + + /** 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); - /* When in summary mode, always show ALL messages instead of just + /** + * When in summary mode, always show ALL messages instead of just * new or old. Otherwise, show what the user asked for. */ if (!strcmp(oper, "readnew")) { @@ -1786,28 +2190,45 @@ void readloop(char *oper) else if (!strcmp(oper, "readold")) { strcpy(cmd, "MSGS OLD"); } + else if (!strcmp(oper, "do_search")) { + sprintf(cmd, "MSGS SEARCH|%s", bstr("query")); + } else { strcpy(cmd, "MSGS ALL"); } if ((WC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) { is_summary = 1; - strcpy(cmd, "MSGS ALL"); + if (!strcmp(oper, "do_search")) { + sprintf(cmd, "MSGS SEARCH|%s", bstr("query")); + } + else { + strcpy(cmd, "MSGS ALL"); + } } if ((WC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) { is_addressbook = 1; - strcpy(cmd, "MSGS ALL"); + if (!strcmp(oper, "do_search")) { + sprintf(cmd, "MSGS SEARCH|%s", bstr("query")); + } + else { + strcpy(cmd, "MSGS ALL"); + } maxmsgs = 9999999; } - if (is_summary) { - strcpy(cmd, "MSGS ALL|||1"); /* fetch header summary */ + if (is_summary) { /**< fetch header summary */ + snprintf(cmd, sizeof cmd, "MSGS %s|%s||1", + (!strcmp(oper, "do_search") ? "SEARCH" : "ALL"), + (!strcmp(oper, "do_search") ? bstr("query") : "") + ); startmsg = 1; maxmsgs = 9999999; } - /* Are we doing a summary view? If so, we need to know old messages + /** + * Are we doing a summary view? If so, we need to know old messages * and new messages, so we can do that pretty boldface thing for the * new messages. */ @@ -1822,27 +2243,32 @@ void readloop(char *oper) is_singlecard = atoi(bstr("is_singlecard")); - if (WC->wc_view == VIEW_CALENDAR) { /* calendar */ + if (WC->wc_default_view == VIEW_CALENDAR) { /**< calendar */ is_calendar = 1; strcpy(cmd, "MSGS ALL"); maxmsgs = 32767; } - if (WC->wc_view == VIEW_TASKS) { /* tasks */ + if (WC->wc_default_view == VIEW_TASKS) { /**< tasks */ is_tasks = 1; strcpy(cmd, "MSGS ALL"); maxmsgs = 32767; } - if (WC->wc_view == VIEW_NOTES) { /* notes */ + if (WC->wc_default_view == VIEW_NOTES) { /**< notes */ is_notes = 1; strcpy(cmd, "MSGS ALL"); maxmsgs = 32767; } + if (is_notes) { + wprintf("
%s
\n", _("Click on any note to edit it.")); + wprintf("
\n"); + } + nummsgs = load_msg_ptrs(cmd, is_summary); if (nummsgs == 0) { if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) { - wprintf(""); + wprintf("

"); if (!strcmp(oper, "readnew")) { wprintf(_("No new messages.")); } else if (!strcmp(oper, "readold")) { @@ -1850,7 +2276,7 @@ void readloop(char *oper) } else { wprintf(_("No messages here.")); } - wprintf("\n"); + wprintf("
\n"); } goto DONE; @@ -1858,7 +2284,7 @@ void readloop(char *oper) if (is_summary) { for (a = 0; a < nummsgs; ++a) { - /* Are you a new message, or an old message? */ + /** Are you a new message, or an old message? */ if (is_summary) { if (is_msg_in_mset(old_msgs, WC->msgarr[a])) { WC->summ[a].is_new = 0; @@ -1870,12 +2296,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]; } } @@ -1907,85 +2333,85 @@ void readloop(char *oper) } 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("
"); /* end of 'content' div */ - - wprintf("
" + wprintf("
\n"); /** end of 'content' div */ + + wprintf("\n" + ); - "
\n" - - "
\n" - - "\n" - "" - "" - "" - "" - "" - "\n" + /** note that Date and Delete are now in the same column */ + wprintf("
" + "
" + "
%s %s%s %s%s %s
" + "" + ); + wprintf("" + "" + "" + "\n" , + 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"); - 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]; + wprintf("
" - /* If a tabular view, set up the line */ - if (is_summary) { - bg = 1 - bg; - wprintf("\n" - wprintf("onClick=\" new Ajax.Updater('preview_pane', '/msg', { method: 'get', parameters: 'msgnum=%ld' } ); \" ", WC->summ[a].msgnum); + "" + ); + } - wprintf(">"); - } + for (a = 0; a < nummsgs; ++a) { + if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) { - /* Display the message */ + /** Display the message */ if (is_summary) { display_summarized(a); } @@ -2008,118 +2434,125 @@ void readloop(char *oper) display_note(WC->msgarr[a]); } else { - read_message(WC->msgarr[a], 0); - } - - /* 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"); /* end of 'fix_scrollbar_bug' div */ - wprintf(""); /* end of 'message_list' div */ - - wprintf("
"); /* slider */ - - 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. + /** + * 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)) { - - wprintf("
" - "
"); - wprintf(_("Reading #%d of %d messages."), lowest_displayed, nummsgs); - wprintf(""); - - if (pn_previous > 0L) { - wprintf("" - "%s \n", - oper, - pn_previous, - _("Previous")); + /** Output loop */ + if (displayed_msgs != NULL) { + if (bbs_reverse) { + qsort(displayed_msgs, num_displayed, sizeof(long), longcmp_r); } - if (pn_next > 0L) { - wprintf("" - "%s \n", - oper, - pn_next, - _("Next")); + /** if we do a split bbview in the future, begin messages div here */ + + for (a=0; a" - "%s" - "", - oper, - WC->msgarr[0], - DEFAULT_MAXMSGS, - _("Summary") + /** if we do a split bbview in the future, end messages div here */ + + free(displayed_msgs); + displayed_msgs = NULL; + } + + 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) && (!is_summary)) { - - wprintf("
\n"); - + if (is_bbview) { + /** begin bbview scroller */ + wprintf(""); wprintf(_("Reading #"), lowest_displayed, highest_displayed); wprintf(" "); wprintf(_("of %d messages."), nummsgs); - wprintf("
\n"); - } + + /** forward/reverse */ + wprintf(" \n"); + /** end bbview scroller */ } DONE: if (is_tasks) { - do_tasks_view(); /* Render the task list */ + do_tasks_view(); /** Render the task list */ } if (is_calendar) { - do_calendar_view(); /* Render the calendar */ + do_calendar_view(); /** Render the calendar */ } if (is_addressbook) { - do_addrbook_view(addrbook, num_ab); /* Render the address book */ + do_addrbook_view(addrbook, num_ab); /** Render the address book */ } - /* Put the data transfer hidden iframe in a hidden div, to make it *really* hidden */ - wprintf("
" - "
\n" - "\n" - ); - - /* Note: wDumpContent() will output one additional
tag. */ + /** Note: wDumpContent() will output one additional tag. */ wDumpContent(1); if (addrbook != NULL) free(addrbook); - /* free the summary */ - if (WC->num_summ != 0) { - WC->num_summ = 0; + /** free the summary */ + if (WC->summ != NULL) { 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); + WC->num_summ = 0; + WC->summ = NULL; } } -/* - * Back end for post_message() ... this is where the actual message - * gets transmitted to the server. +/** + * \brief Back end for post_message() + * ... this is where the actual message gets transmitted to the server. */ void post_mime_to_server(void) { char boundary[SIZ]; @@ -2184,22 +2620,23 @@ void post_mime_to_server(void) { char *encoded; size_t encoded_length; - /* RFC2045 requires this, and some clients look for it... */ + /** RFC2045 requires this, and some clients look for it... */ serv_puts("MIME-Version: 1.0"); + serv_puts("X-Mailer: " SERVER); - /* If there are attachments, we have to do multipart/mixed */ + /** If there are attachments, we have to do multipart/mixed */ if (WC->first_attachment != NULL) { is_multipart = 1; } if (is_multipart) { - sprintf(boundary, "---Citadel-Multipart-%s-%04x%04x---", + sprintf(boundary, "Citadel--Multipart--%s--%04x--%04x", serv_info.serv_fqdn, getpid(), ++seq ); - /* Remember, serv_printf() appends an extra newline */ + /** Remember, serv_printf() appends an extra newline */ serv_printf("Content-type: multipart/mixed; " "boundary=\"%s\"\n", boundary); serv_printf("This is a multipart message in MIME format.\n"); @@ -2207,21 +2644,21 @@ void post_mime_to_server(void) { } serv_puts("Content-type: text/html; charset=utf-8"); + serv_puts("Content-Transfer-Encoding: quoted-printable"); serv_puts(""); - serv_puts("\n"); - text_to_server(bstr("msgtext"), 0); - serv_puts("\n"); + serv_puts("\r\n"); + text_to_server_qp(bstr("msgtext")); /** Transmit message in quoted-printable encoding */ + serv_puts("\r\n"); - if (is_multipart) { - /* Add in the attachments */ + /** Add in the attachments */ for (att = WC->first_attachment; att!=NULL; att=att->next) { encoded_length = ((att->length * 150) / 100); encoded = malloc(encoded_length); if (encoded == NULL) break; - CtdlEncodeBase64(encoded, att->data, att->length); + CtdlEncodeBase64(encoded, att->data, att->length, 1); serv_printf("--%s", boundary); serv_printf("Content-type: %s", att->content_type); @@ -2241,8 +2678,8 @@ void post_mime_to_server(void) { } -/* - * Post message (or don't post message) +/** + * \brief Post message (or don't post message) * * Note regarding the "dont_post" variable: * A random value (actually, it's just a timestamp) is inserted as a hidden @@ -2254,13 +2691,23 @@ void post_mime_to_server(void) { */ void post_message(void) { - char buf[SIZ]; + char buf[1024]; + char encoded_subject[1024]; static long dont_post = (-1L); struct wc_attachment *att, *aptr; + int is_anonymous = 0; + char *display_name; + + display_name = bstr("display_name"); + if (!strcmp(display_name, "__ANONYMOUS__")) { + display_name = ""; + is_anonymous = 1; + } if (WC->upload_length > 0) { - /* There's an attachment. Save it to this struct... */ + lprintf(9, "%s:%d: we are uploading %d bytes\n", __FILE__, __LINE__, WC->upload_length); + /** There's an attachment. Save it to this struct... */ att = malloc(sizeof(struct wc_attachment)); memset(att, 0, sizeof(struct wc_attachment)); att->length = WC->upload_length; @@ -2268,7 +2715,7 @@ void post_message(void) strcpy(att->filename, WC->upload_filename); att->next = NULL; - /* And add it to the list. */ + /** And add it to the list. */ if (WC->first_attachment == NULL) { WC->first_attachment = att; } @@ -2278,7 +2725,8 @@ void post_message(void) aptr->next = att; } - /* Mozilla sends a simple filename, which is what we want, + /** + * 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. */ @@ -2289,7 +2737,8 @@ void post_message(void) remove_token(att->filename, 0, '\\'); } - /* Transfer control of this memory from the upload struct + /** + * Transfer control of this memory from the upload struct * to the attachment struct. */ att->data = WC->upload; @@ -2310,11 +2759,16 @@ void post_message(void) _("Automatically cancelled because you have already " "saved this message.")); } else { - sprintf(buf, "ENT0 1|%s|0|4|%s|||%s|%s", + rfc2047encode(encoded_subject, sizeof encoded_subject, bstr("subject")); + sprintf(buf, "ENT0 1|%s|%d|4|%s|%s||%s|%s|%s|%s", bstr("recp"), - bstr("subject"), + is_anonymous, + encoded_subject, + display_name, bstr("cc"), - bstr("bcc") + bstr("bcc"), + bstr("wikipage"), + bstr("my_email_addr") ); serv_puts(buf); serv_getln(buf, sizeof buf); @@ -2331,6 +2785,7 @@ void post_message(void) } dont_post = atol(bstr("postseq")); } else { + lprintf(9, "%s:%d: server post error: %s\n", __FILE__, __LINE__, buf); sprintf(WC->ImportantMessage, "%s", &buf[4]); display_enter(); return; @@ -2338,56 +2793,102 @@ void post_message(void) } free_attachments(WC); - readloop("readnew"); + + /** + * We may have been supplied with instructions regarding the location + * to which we must return after posting. If found, go there. + */ + if (strlen(bstr("return_to")) > 0) { + http_redirect(bstr("return_to")); + } + /** + * If we were editing a page in a wiki room, go to that page now. + */ + else if (strlen(bstr("wikipage")) > 0) { + snprintf(buf, sizeof buf, "wiki?page=%s", bstr("wikipage")); + http_redirect(buf); + } + /** + * Otherwise, just go to the "read messages" loop. + */ + else { + readloop("readnew"); + } } -/* - * display the message entry screen +/** + * \brief display the message entry screen */ void display_enter(void) { char buf[SIZ]; char ebuf[SIZ]; long now; + char *display_name; struct wc_attachment *att; int recipient_required = 0; int recipient_bad = 0; int i; + int is_anonymous = 0; + long existing_page = (-1L); + + now = time(NULL); if (strlen(bstr("force_room")) > 0) { gotoroom(bstr("force_room")); } - /* Are we perhaps in an address book view? If so, then an "enter + display_name = bstr("display_name"); + if (!strcmp(display_name, "__ANONYMOUS__")) { + display_name = ""; + is_anonymous = 1; + } + + /** 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)) { /** 570 means that we need a recipient here */ + recipient_required = 1; + } + else if (buf[0] != '2') { /** Any other error means that we cannot continue */ + sprintf(WC->ImportantMessage, "%s", &buf[4]); + readloop("readnew"); + return; + } + + /** + * Are we perhaps in an address book view? If so, then an "enter * message" command really means "add new entry." */ - if (WC->wc_view == VIEW_ADDRESSBOOK) { + if (WC->wc_default_view == VIEW_ADDRESSBOOK) { do_edit_vcard(-1, "", ""); return; } #ifdef WEBCIT_WITH_CALENDAR_SERVICE - /* Are we perhaps in a calendar view? If so, then an "enter + /** + * Are we perhaps in a calendar room? If so, then an "enter * message" command really means "add new calendar item." */ - if (WC->wc_view == VIEW_CALENDAR) { + if (WC->wc_default_view == VIEW_CALENDAR) { display_edit_event(); return; } - /* Are we perhaps in a tasks view? If so, then an "enter + /** + * Are we perhaps in a tasks view? If so, then an "enter * message" command really means "add new task." */ - if (WC->wc_view == VIEW_TASKS) { + if (WC->wc_default_view == VIEW_TASKS) { display_edit_task(); return; } #endif - /* + /** * Otherwise proceed normally. * Do a custom room banner with no navbar... */ @@ -2396,63 +2897,103 @@ void display_enter(void) embed_room_banner(NULL, navbar_none); wprintf("\n"); wprintf("
\n" - "
" - "
"); - - /* 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)) { /* 570 means that we need a recipient here */ - recipient_required = 1; - } - 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 */ + /** Now check our actual recipients if there are any */ if (recipient_required) { - sprintf(buf, "ENT0 0|%s|0|0||||%s|%s", bstr("recp"), bstr("cc"), bstr("bcc")); + sprintf(buf, "ENT0 0|%s|%d|0||%s||%s|%s|%s", + bstr("recp"), + is_anonymous, + display_name, + bstr("cc"), bstr("bcc"), bstr("wikipage")); serv_puts(buf); serv_getln(buf, sizeof buf); - if (!strncmp(buf, "570", 3)) { /* 570 means we have an invalid recipient listed */ + 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]); + 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. */ + /** If we got this far, we can display the message entry screen. */ - now = time(NULL); + /** begin message entry screen */ + wprintf("
\n"); + wprintf("\n", now); + if (WC->wc_view == VIEW_WIKI) { + wprintf("\n", bstr("wikipage")); + } + wprintf("\n", bstr("return_to")); + + /** header bar */ + + wprintf("\""); fmt_date(buf, now, 0); - strcat(&buf[strlen(buf)], _(" from ")); - stresc(&buf[strlen(buf)], WC->wc_username, 1, 1); + wprintf("%s ", buf); + + wprintf(_(" from ")); + + /* Allow the user to select any of his valid screen names */ + + wprintf("\n"); - /* begin message entry screen */ - wprintf("\n"); - wprintf("\n", now); + /* If this is an email (not a post), allow the user to select any of his + * valid email addresses. + */ + if (recipient_required) { + serv_puts("GVEA"); + serv_getln(buf, sizeof buf); + if (buf[0] == '1') { + wprintf("\n"); + } + } - wprintf("\""); - wprintf("%s
\n", buf); /* header bar */ + wprintf(_(" in ")); + escputs(WC->wc_roomname); + wprintf("
\n"); /** header bar */ wprintf("\n"); if (recipient_required) { @@ -2466,6 +3007,17 @@ void display_enter(void) escputs(bstr("recp")); wprintf("\" size=50 maxlength=1000 />"); wprintf("
"); + + /** Pop open an address book -- begin **/ + + wprintf( + "" + "" + "" + ); + + /** Pop open an address book -- end **/ + wprintf("\n"); wprintf("\n"); - /* Initialize the autocomplete ajax helpers (found in wclib.js) */ + /** Initialize the autocomplete ajax helpers (found in wclib.js) */ wprintf(" \n" @@ -2520,7 +3072,7 @@ void display_enter(void) wprintf(""); wprintf("
\n"); - /* + /** * The following script embeds the TinyMCE richedit control, and automatically * transforms the textarea into a richedit textarea. */ @@ -2561,14 +3145,22 @@ void display_enter(void) "\n" "\n" ); - /* Enumerate any attachments which are already in place... */ - wprintf(" Attachments: "); + + /** Enumerate any attachments which are already in place... */ + wprintf(" "); + wprintf(_("Attachments:")); + wprintf(" "); wprintf("\n  " "\n", _("Add")); - /* Seth asked for these to be at the top *and* bottom... */ + /** Seth asked for these to be at the top *and* bottom... */ wprintf(" " "\n", _("Cancel")); - /* Make sure we only insert our signature once */ + /** Make sure we only insert our signature once */ if (strcmp(bstr("sig_inserted"), "yes")) { wprintf("\n"); } @@ -2604,38 +3197,80 @@ void display_enter(void) wprintf("\n"); wprintf("
"); @@ -2490,7 +3042,7 @@ void display_enter(void) wprintf("
"); wprintf("
\n"); + + /* Close the main div, now open a new one, hidden initially, for address book popups. + * Remember: the popup div will be closed by wDumpContent, which will think it's merely + * closing the main div. FIXME put this in its own function so we can use it from the + * calendar too. + */ + wprintf("
"); + svprintf("BOXTITLE", WCS_STRING, _("Contacts") ); + do_template("beginbox"); + wprintf("
"); + wprintf("

"); + wprintf(_("Close window")); + wprintf("

"); + do_template("endbox"); + DONE: wDumpContent(1); } +/** + * \brief delete a message + */ +void delete_msg(void) +{ + long msgid; + char buf[SIZ]; + msgid = atol(bstr("msgid")); + 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); + } + + serv_getln(buf, sizeof buf); + sprintf(WC->ImportantMessage, "%s", &buf[4]); + readloop("readnew"); +} -void delete_msg(void) +/** + * \brief move a message to another folder + */ +void move_msg(void) { long msgid; char buf[SIZ]; msgid = atol(bstr("msgid")); - output_headers(1, 1, 1, 0, 0, 0); - - sprintf(buf, "DELE %ld", msgid); - serv_puts(buf); - serv_getln(buf, sizeof buf); - wprintf("%s
\n", &buf[4]); + if (strlen(bstr("move_button")) > 0) { + sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room")); + serv_puts(buf); + serv_getln(buf, sizeof buf); + sprintf(WC->ImportantMessage, "%s", &buf[4]); + } else { + sprintf(WC->ImportantMessage, (_("The message was not moved."))); + } - wDumpContent(1); + readloop("readnew"); } -/* - * Confirm move of a message + +/** + * \brief Confirm move of a message */ void confirm_move_msg(void) { @@ -2660,7 +3295,7 @@ void confirm_move_msg(void) wprintf(_("Move this message to:")); wprintf("
\n"); - wprintf("
\n"); + wprintf("\n"); wprintf("\n", bstr("msgid")); wprintf("