/*
* $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
-#define SENDER_COL_WIDTH_PCT 30
-#define DATE_PLUS_BUTTONS_WIDTH_PCT 20
+#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;
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<strlen(buf); ++i) {
+ if ((buf[i] < 32) || (buf[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)) )
{
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 */
+ else if (!strcasecmp(encoding, "Q")) { /**< quoted-printable */
ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, strlen(istr));
}
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;
free(isav);
- /* Since spammers will go to all sorts of absurd lengths to get their
+ /**
+ * 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.
#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<strlen(source); ++i) {
+ if ((source[i] < 32) || (source[i] > 126)) {
+ need_to_encode = 1;
+ }
+ }
+
+ if (!need_to_encode) {
+ safestrncpy(target, source, maxlen);
+ return;
+ }
+
+ strcpy(target, "=?UTF-8?Q?");
+ for (i=0; i<strlen(source); ++i) {
+ ch = (unsigned char) source[i];
+ if ((ch < 32) || (ch > 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;
}
-/*
- * 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)
{
-/* 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;
-/* 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
* 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;
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(fullname) == 0) {
strcpy(fullname, thisvalue);
}
}
- /* FN (full name) is a true 'display name' field */
+ /** FN (full name) is a true 'display name' field */
else if (!strcasecmp(firsttoken, "fn")) {
strcpy(fullname, thisvalue);
}
- /* title */
+ /** title */
else if (!strcasecmp(firsttoken, "title")) {
strcpy(title, thisvalue);
}
- /* organization */
+ /** organization */
else if (!strcasecmp(firsttoken, "org")) {
strcpy(org, thisvalue);
}
-/*
- * 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;
}
-/*
- * I wanna SEE that message! (Optional 'section' for encapsulated message/rfc822 submessage)
+/**
+ * \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, char *section) {
char buf[SIZ];
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, "");
return;
}
- /* begin everythingamundo table */
+ /** begin everythingamundo table */
if (!printable_view) {
wprintf("<div class=\"fix_scrollbar_bug\">\n");
wprintf("<table width=100%% border=1 cellspacing=0 "
"cellpadding=0><TR><TD>\n");
}
- /* begin message header table */
+ /** begin message header table */
wprintf("<table width=100%% border=0 cellspacing=0 "
"cellpadding=1 bgcolor=\"#CCCCCC\"><tr><td>\n");
}
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);
|| (!strcasecmp(mime_disposition, "inline")) ) {
snprintf(&mime_http[strlen(mime_http)],
(sizeof(mime_http) - strlen(mime_http) - 1),
- "<a href=\"mimepart/%ld/%s/%s\" "
- "target=\"wc.%ld.%s\">"
"<img src=\"static/diskette_24x.gif\" "
"border=0 align=middle>\n"
- "%s (%s, %d bytes)</a><br />\n",
+ "%s (%s, %d bytes) [ "
+ "<a href=\"mimepart/%ld/%s/%s\""
+ "target=\"wc.%ld.%s\">%s</a>"
+ " | "
+ "<a href=\"mimepart_download/%ld/%s/%s\">%s</a>"
+ " ]<br />\n",
+ mime_filename,
+ mime_content_type, mime_length,
msgnum, mime_partnum, mime_filename,
msgnum, mime_partnum,
- mime_filename,
- mime_content_type, mime_length
+ _("View"),
+ msgnum, mime_partnum, mime_filename,
+ _("Download")
);
}
- /*** begin handler prep ***/
+ /** begin handler prep ***/
if (!strcasecmp(mime_content_type, "text/x-vcard")) {
strcpy(vcard_partnum, mime_partnum);
}
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);
}
}
wprintf("</td>\n");
- /* start msg buttons */
+ /** start msg buttons */
if (!printable_view) {
wprintf("<td align=right><span class=\"msgbuttons\">\n");
- /* Reply */
+ /** Reply */
if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
wprintf("<a href=\"display_enter");
if (WC->is_mailbox) {
wprintf("\">[%s]</a> ", _("Reply"));
}
- /* ReplyQuoted */
+ /** ReplyQuoted */
if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
if (!WC->is_mailbox) {
wprintf("<a href=\"display_enter");
}
}
- /* ReplyAll */
+ /** ReplyAll */
if (WC->wc_view == VIEW_MAILBOX) {
wprintf("<a href=\"display_enter");
wprintf("?replyquote=%ld", msgnum);
wprintf("\">[%s]</a> ", _("ReplyAll"));
}
- /* Forward */
+ /** Forward */
if (WC->wc_view == VIEW_MAILBOX) {
wprintf("<a href=\"display_enter?fwdquote=%ld?subject=", msgnum);
if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%20");
wprintf("\">[%s]</a> ", _("Forward"));
}
- /* If this is one of my own rooms, or if I'm an Aide or Room Aide, I can move/delete */
+ /** 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 */
+ /** Move */
wprintf("<a href=\"confirm_move_msg?msgid=%ld\">[%s]</a> ",
msgnum, _("Move"));
- /* Delete */
+ /** Delete */
wprintf("<a href=\"delete_msg?msgid=%ld\" "
"onClick=\"return confirm('%s');\">"
"[%s]</a> ", msgnum, _("Delete this message?"), _("Delete")
);
}
- /* Headers */
+ /** Headers */
wprintf("<a href=\"#\" onClick=\"window.open('msgheaders/%ld', 'headers%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
"[%s]</a>", msgnum, msgnum, _("Headers"));
- /* Print */
+ /** Print */
wprintf("<a href=\"#\" onClick=\"window.open('printmsg/%ld', 'print%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
"[%s]</a>", msgnum, msgnum, _("Print"));
wprintf("</tr></table>\n");
- /* Begin body */
- wprintf("<table border=0 width=100%% bgcolor=\"#FFFFFF\" "
+ /** Begin body */
+ wprintf("<table class=\"messages_background\" "
"cellpadding=1 cellspacing=0><tr><td>");
- /*
+ /**
* Learn the content type
*/
strcpy(mime_content_type, "text/plain");
mime_content_type[i] = 0;
}
}
+ for (i=0; i<strlen(mime_charset); ++i) {
+ if (mime_charset[i] == ';') {
+ mime_charset[i] = 0;
+ }
+ }
}
}
- /* Set up a character set conversion if we need to (and if we can) */
+ /** 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, ""))
) {
- ic = iconv_open("UTF-8", mime_charset);
+ ic = ctdl_iconv_open("UTF-8", mime_charset);
if (ic == (iconv_t)(-1) ) {
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... */
+ /** Messages in legacy Citadel variformat get handled thusly... */
if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
fmout("JUSTIFY");
}
- /* Boring old 80-column fixed format text gets handled this way... */
+ /** Boring old 80-column fixed format text gets handled this way... */
else if ( (!strcasecmp(mime_content_type, "text/plain"))
|| (!strcasecmp(mime_content_type, "text")) ) {
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
wprintf("</i><br />");
}
- 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("<br />\n", mime_content_type);
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
}
- /* If there are attached submessages, display them now... */
+ /** If there are attached submessages, display them now... */
if ( (strlen(mime_submessages) > 0) && (!section[0]) ) {
for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
extract_token(buf, mime_submessages, i, '|', sizeof buf);
- /* use printable_view to suppress buttons */
+ /** use printable_view to suppress buttons */
wprintf("<blockquote>");
read_message(msgnum, 1, buf);
wprintf("</blockquote>");
}
- /* Afterwards, offer links to download attachments 'n' such */
+ /** Afterwards, offer links to download attachments 'n' such */
if ( (strlen(mime_http) > 0) && (!section[0]) ) {
wprintf("%s", mime_http);
}
- /* Handler for vCard parts */
+ /** Handler for vCard parts */
if (strlen(vcard_partnum) > 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("[%s]</a>", _("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) {
ENDBODY:
wprintf("</td></tr></table>\n");
- /* end everythingamundo table */
+ /** end everythingamundo table */
if (!printable_view) {
wprintf("</td></tr></table>\n");
wprintf("</div><br />\n");
-/*
- * 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(char *msgnum_as_string) {
long msgnum = 0L;
}
-/*
- * 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(char *msgnum_as_string) {
long msgnum = 0L;
-/*
- * Display a message's headers
+/**
+ * \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;
-/*
- * Read message in simple, JavaScript-embeddable form for 'forward'
- * or 'reply quoted' operations.
+/**
+ * \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];
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];
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");
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("<br>");
+ if (include_headers) {
+ wprintf("<br>");
#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("<br />");
+ }
+
+ /**
+ * Begin body
+ */
wprintf("<br />");
}
- /*
- * Begin body
- */
- wprintf("<br>");
-
- /*
+ /**
* Learn the content type
*/
strcpy(mime_content_type, "text/plain");
mime_content_type[i] = 0;
}
}
+ for (i=0; i<strlen(mime_charset); ++i) {
+ if (mime_charset[i] == ';') {
+ mime_charset[i] = 0;
+ }
+ }
}
}
- /* Set up a character set conversion if we need to (and if we can) */
+ /** Set up a character set conversion if we need to (and if we can) */
#ifdef HAVE_ICONV
if ( (strcasecmp(mime_charset, "us-ascii"))
&& (strcasecmp(mime_charset, "UTF-8"))
&& (strcasecmp(mime_charset, ""))
) {
- ic = iconv_open("UTF-8", mime_charset);
+ ic = ctdl_iconv_open("UTF-8", mime_charset);
if (ic == (iconv_t)(-1) ) {
- lprintf(5, "%s:%d iconv_open() failed: %s\n",
- __FILE__, __LINE__, strerror(errno));
+ lprintf(5, "%s:%d iconv_open(%s, %s) failed: %s\n",
+ __FILE__, __LINE__, "UTF-8", mime_charset, strerror(errno));
}
}
#endif
- /* Messages in legacy Citadel variformat get handled thusly... */
+ /** Messages in legacy Citadel variformat get handled thusly... */
if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
pullquote_fmout();
}
wprintf("</i><br />");
}
- /* 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
/*
* 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")) ) {
}
}
- free(attachments);
}
#ifdef HAVE_ICONV
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];
-
-
+/**
+ * \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];
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)
-/* 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];
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];
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|1", msgnum); /** ask for headers only */
serv_puts(buf);
serv_getln(buf, sizeof buf);
if (buf[0] != '1') return;
-/*
- * 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(
}
-/*
- * 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);
}
-/*
- * 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;
-/*
- * 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)
{
serv_puts(servcmd);
serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
- wprintf("<EM>%s</EM><br />\n", &buf[4]);
return (nummsgs);
}
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
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) {
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) {
return (nummsgs);
}
+/**
+ * \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;
}
+/**
+ * \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;
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;
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;
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;
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;
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;
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 bbs_reverse = 0;
if (WC->wc_view == VIEW_WIKI) {
- sprintf(buf, "wiki/%s/home", WC->wc_roomname);
+ sprintf(buf, "wiki?room=%s?page=home", WC->wc_roomname);
http_redirect(buf);
return;
}
}
if (strlen(sortby) == 0) sortby = sortpref_value;
- /* mailbox sort */
+ /** mailbox sort */
if (strlen(sortby) == 0) sortby = "rdate";
- /* message board sort */
+ /** message board sort */
if (!strcasecmp(sortby, "reverse")) {
bbs_reverse = 1;
}
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")) {
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.
*/
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("<div align=center>%s</div>\n", _("Click on any note to edit it."));
+ wprintf("<div id=\"new_notes_here\"></div>\n");
+ }
+
nummsgs = load_msg_ptrs(cmd, is_summary);
if (nummsgs == 0) {
if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
- wprintf("<em>");
+ wprintf("<div align=\"center\"><br /><em>");
if (!strcmp(oper, "readnew")) {
wprintf(_("No new messages."));
} else if (!strcmp(oper, "readold")) {
} else {
wprintf(_("No messages here."));
}
- wprintf("</em>\n");
+ wprintf("</em><br /></div>\n");
}
goto DONE;
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;
}
if (is_summary) {
- wprintf("</div>\n"); /* end of 'content' div */
+ wprintf("</div>\n"); /** end of 'content' div */
wprintf("<script language=\"javascript\" type=\"text/javascript\">"
" document.onkeydown = CtdlMsgListKeyPress; "
"</script>\n"
);
- /* note that Date and Delete are now in the same column */
+ /** note that Date and Delete are now in the same column */
wprintf("<div id=\"message_list_hdr\">"
"<div class=\"fix_scrollbar_bug\">"
"<table cellspacing=0 style=\"width:100%%\">"
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);
}
}
}
- /* Set the "is_bbview" variable if it appears that we are looking at
+ /**
+ * Set the "is_bbview" variable if it appears that we are looking at
* a classic bulletin board view.
*/
if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
is_bbview = 1;
}
- /* Output loop */
+ /** Output loop */
if (displayed_msgs != NULL) {
if (bbs_reverse) {
qsort(displayed_msgs, num_displayed, sizeof(long), longcmp_r);
}
- /* if we do a split bbview in the future, begin messages div here */
+ /** if we do a split bbview in the future, begin messages div here */
for (a=0; a<num_displayed; ++a) {
read_message(displayed_msgs[a], 0, "");
}
- /* if we do a split bbview in the future, end messages div here */
+ /** if we do a split bbview in the future, end messages div here */
free(displayed_msgs);
displayed_msgs = NULL;
if (is_summary) {
wprintf("</table>"
- "</div>\n"); /* end of 'fix_scrollbar_bug' div */
- wprintf("</div>"); /* end of 'message_list' div */
+ "</div>\n"); /**< end of 'fix_scrollbar_bug' div */
+ wprintf("</div>"); /**< end of 'message_list' div */
- /* Here's the grab-it-to-resize-the-message-list widget */
+ /** Here's the grab-it-to-resize-the-message-list widget */
wprintf("<div id=\"resize_msglist\" "
"onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
"<div class=\"fix_scrollbar_bug\">"
"</div></div>\n"
);
- wprintf("<div id=\"preview_pane\">"); /* The preview pane will initially be empty */
+ wprintf("<div id=\"preview_pane\">"); /**< The preview pane will initially be empty */
}
- /* Bump these because although we're thinking in zero base, the user
+ /**
+ * 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 (is_bbview) {
- /* begin bbview scroller */
+ /** begin bbview scroller */
wprintf("<form name=\"msgomatic\">");
wprintf(_("Reading #"), lowest_displayed, highest_displayed);
wprintf("</select> ");
wprintf(_("of %d messages."), nummsgs);
- /* forward/reverse */
+ /** forward/reverse */
wprintf(" <select name=\"direction\" size=\"1\" "
"OnChange=\"location.href=msgomatic.direction.options"
"[selectedIndex].value\">\n"
);
wprintf("</select></form>\n");
- /* end bbview scroller */
+ /** 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 */
}
- /* Note: wDumpContent() will output one additional </div> tag. */
+ /** Note: wDumpContent() will output one additional </div> tag. */
wDumpContent(1);
if (addrbook != NULL) free(addrbook);
- /* free the summary */
+ /** free the summary */
if (WC->summ != NULL) {
free(WC->summ);
WC->num_summ = 0;
}
-/*
- * 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];
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");
}
serv_puts("Content-type: text/html; charset=utf-8");
+ serv_puts("Content-Transfer-Encoding: quoted-printable");
serv_puts("");
- serv_puts("<html><body>\n"); /* Future templates go here */
- text_to_server(bstr("msgtext"), 0);
- serv_puts("</body></html>\n");
+ serv_puts("<html><body>\r\n");
+ text_to_server_qp(bstr("msgtext")); /** Transmit message in quoted-printable encoding */
+ serv_puts("</body></html>\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);
}
-/*
- * 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
*/
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;
if (WC->upload_length > 0) {
- /* There's an attachment. Save it to this struct... */
+ /** 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;
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;
}
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.
*/
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;
_("Automatically cancelled because you have already "
"saved this message."));
} else {
- sprintf(buf, "ENT0 1|%s|%d|4|%s|||%s|%s",
+ rfc2047encode(encoded_subject, sizeof encoded_subject, bstr("subject"));
+ sprintf(buf, "ENT0 1|%s|%d|4|%s|||%s|%s|%s",
bstr("recp"),
is_anonymous,
- bstr("subject"),
+ encoded_subject,
bstr("cc"),
- bstr("bcc")
+ bstr("bcc"),
+ bstr("wikipage")
);
serv_puts(buf);
serv_getln(buf, sizeof buf);
}
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)
{
int recipient_bad = 0;
int i;
int is_anonymous = 0;
+ long existing_page = (-1L);
if (strlen(bstr("force_room")) > 0) {
gotoroom(bstr("force_room"));
is_anonymous = 1;
}
- /* Are we perhaps in an address book view? If so, then an "enter
+ /** 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...
*/
wprintf("</div>\n");
wprintf("<div id=\"content\">\n"
"<div class=\"fix_scrollbar_bug\">"
- "<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
-
- /* 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("<EM>%s</EM><br />\n", &buf[4]);
- goto DONE;
- }
+ "<table class=\"messages_background\"><tr><td>");
- /* 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|%d|0||||%s|%s", bstr("recp"), is_anonymous, bstr("cc"), bstr("bcc"));
+ sprintf(buf, "ENT0 0|%s|%d|0||||%s|%s|%s", bstr("recp"), is_anonymous,
+ 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("<EM>%s</EM><br />\n", &buf[4]);
+ else if (buf[0] != '2') { /** Any other error means that we cannot continue */
+ wprintf("<em>%s</em><br />\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);
fmt_date(buf, now, 0);
strcat(&buf[strlen(buf)], _(" <I>in</I> "));
stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
- /* begin message entry screen */
- wprintf("<form enctype=\"multipart/form-data\" "
- "method=\"POST\" action=\"post\" "
+ /** begin message entry screen */
+ wprintf("<form "
+ "enctype=\"multipart/form-data\" "
+ "method=\"POST\" "
+ "accept-charset=\"UTF-8\" "
+ "action=\"post\" "
"name=\"enterform\""
">\n");
wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n", now);
+ if (WC->wc_view == VIEW_WIKI) {
+ wprintf("<input type=\"hidden\" name=\"wikipage\" value=\"%s\">\n", bstr("wikipage"));
+ }
+ wprintf("<input type=\"hidden\" name=\"return_to\" value=\"%s\">\n", bstr("return_to"));
wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
- wprintf("%s\n", buf); /* header bar */
+ wprintf("%s\n", buf); /** header bar */
if (WC->room_flags & QR_ANONOPT) {
wprintf(" "
"<input type=\"checkbox\" name=\"is_anonymous\" value=\"yes\" %s>",
);
wprintf("Anonymous");
}
- wprintf("<br>\n"); /* header bar */
+ wprintf("<br>\n"); /** header bar */
wprintf("<table border=\"0\" width=\"100%%\">\n");
if (recipient_required) {
wprintf("<div class=\"auto_complete\" id=\"bcc_name_choices\"></div>");
wprintf("</td><td></td></tr>\n");
- /* Initialize the autocomplete ajax helpers (found in wclib.js) */
+ /** Initialize the autocomplete ajax helpers (found in wclib.js) */
wprintf("<script type=\"text/javascript\"> \n"
" activate_entmsg_autocompleters(); \n"
"</script> \n"
wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
- /* If we're continuing from a previous edit, put our partially-composed message back... */
+ /** If we're continuing from a previous edit, put our partially-composed message back... */
msgescputs(bstr("msgtext"));
/* If we're forwarding a message, insert it here... */
wprintf("<br><div align=center><i>");
wprintf(_("--- forwarded message ---"));
wprintf("</i></div><br>");
- pullquote_message(atol(bstr("fwdquote")), 1);
+ pullquote_message(atol(bstr("fwdquote")), 1, 1);
}
- /* If we're replying quoted, insert the quote here... */
+ /** If we're replying quoted, insert the quote here... */
else if (atol(bstr("replyquote")) > 0L) {
wprintf("<br>"
"<blockquote>");
- pullquote_message(atol(bstr("replyquote")), 0);
- wprintf("</blockquote>\n\n");
+ pullquote_message(atol(bstr("replyquote")), 0, 1);
+ wprintf("</blockquote><br>");
}
- /* Insert our signature if appropriate... */
+ /** If we're editing a wiki page, insert the existing page here... */
+ else if (WC->wc_view == VIEW_WIKI) {
+ safestrncpy(buf, bstr("wikipage"), sizeof buf);
+ str_wiki_index(buf);
+ existing_page = locate_message_by_uid(buf);
+ if (existing_page >= 0L) {
+ pullquote_message(existing_page, 1, 0);
+ }
+ }
+
+ /** 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")) {
wprintf("</textarea>");
wprintf("</center><br />\n");
- /*
+ /**
* The following script embeds the TinyMCE richedit control, and automatically
* transforms the textarea into a richedit textarea.
*/
" theme : \"advanced\", plugins : \"iespell\", "
" theme_advanced_buttons1 : \"bold, italic, underline, strikethrough, justifyleft, justifycenter, justifyright, justifyfull, bullist, numlist, cut, copy, paste, link, image, help, forecolor, iespell, code\", "
" theme_advanced_buttons2 : \"\", "
- " theme_advanced_buttons3 : \"\" "
+ " theme_advanced_buttons3 : \"\", "
+ " content_css : \"static/webcit-tinymce.css\" "
"});"
"</script>\n"
);
- /* Enumerate any attachments which are already in place... */
+ /** Enumerate any attachments which are already in place... */
wprintf("<img src=\"static/diskette_24x.gif\" border=0 "
"align=middle height=16 width=16> ");
wprintf(_("Attachments:"));
}
wprintf("</select>");
- /* Now offer the ability to attach additional files... */
+ /** Now offer the ability to attach additional files... */
wprintf(" ");
wprintf(_("Attach file:"));
wprintf(" <input NAME=\"attachfile\" "
"SIZE=16 TYPE=\"file\">\n "
"<input type=\"submit\" name=\"attach_button\" value=\"%s\">\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("<input type=\"submit\" name=\"send_button\" value=\"");
if (recipient_required) {
wprintf(_("Send message"));
wprintf("\"> "
"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\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("<INPUT TYPE=\"hidden\" NAME=\"sig_inserted\" VALUE=\"yes\">\n");
}
-
+/**
+ * \brief delete a message
+ */
void delete_msg(void)
{
long msgid;
msgid = atol(bstr("msgid"));
- output_headers(1, 1, 1, 0, 0, 0);
-
- if (WC->wc_is_trash) { /* Delete from Trash is a real delete */
+ if (WC->wc_is_trash) { /** Delete from Trash is a real delete */
serv_printf("DELE %ld", msgid);
}
- else { /* Otherwise move it to Trash */
+ else { /** Otherwise move it to Trash */
serv_printf("MOVE %ld|_TRASH_|0", msgid);
}
serv_getln(buf, sizeof buf);
- wprintf("<EM>%s</EM><br />\n", &buf[4]);
+ sprintf(WC->ImportantMessage, "%s", &buf[4]);
- wDumpContent(1);
+ readloop("readnew");
}
+/**
+ * \brief move a message to another folder
+ */
+void move_msg(void)
+{
+ long msgid;
+ char buf[SIZ];
+ msgid = atol(bstr("msgid"));
-/*
- * Confirm move of a message
+ 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.")));
+ }
+
+ readloop("readnew");
+}
+
+
+
+
+
+/**
+ * \brief Confirm move of a message
*/
void confirm_move_msg(void)
{
}
-
-void move_msg(void)
-{
- long msgid;
- char buf[SIZ];
-
- msgid = atol(bstr("msgid"));
-
- 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.")));
- }
-
- readloop("readnew");
-
-}
+/*@}*/
projects / citadel.git / blobdiff