#include "webcit.h"
#include "vcard.h"
#include "webserver.h"
+#include "groupdav.h"
+#define SUBJ_COL_WIDTH_PCT 50
+#define SENDER_COL_WIDTH_PCT 30
+#define DATE_PLUS_BUTTONS_WIDTH_PCT 20
/* Address book entry (keep it short and sweet, it's just a quickie lookup
* which we can use to get to the real meat and bones later)
char encoding[16];
char istr[1024];
iconv_t ic = (iconv_t)(-1) ;
- char *ibuf; /* Buffer of characters to be converted */
- char *obuf; /* Buffer for converted characters */
- size_t ibuflen; /* Length of input buffer */
- size_t obuflen; /* Length of output buffer */
- char *isav; /* Saved pointer to input buffer */
- char *osav; /* Saved pointer to output buffer */
+ char *ibuf; /* Buffer of characters to be converted */
+ char *obuf; /* Buffer for converted characters */
+ size_t ibuflen; /* Length of input buffer */
+ size_t obuflen; /* Length of output buffer */
+ char *isav; /* Saved pointer to input buffer */
+ char *osav; /* Saved pointer to output buffer */
+ int passes = 0;
while (start=strstr(buf, "=?"), end=strstr(buf, "?="),
((start != NULL) && (end != NULL) && (end > start)) )
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;
}
}
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 )
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, "");
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(" ");
/* N is name, but only if there's no FN already there */
if (!strcasecmp(firsttoken, "n")) {
- if (strlen(displayname) == 0) {
- strcpy(displayname, thisvalue);
- vcard_n_prettyize(displayname);
+ if (strlen(fullname) == 0) {
+ strcpy(fullname, thisvalue);
+ vcard_n_prettyize(fullname);
}
}
/* FN (full name) is a true 'display name' field */
else if (!strcasecmp(firsttoken, "fn")) {
- strcpy(displayname, thisvalue);
+ strcpy(fullname, thisvalue);
}
/* title */
else if (!strcasecmp(firsttoken, "email")) {
if (strlen(mailto) > 0) strcat(mailto, "<br />");
strcat(mailto,
- "<A HREF=\"/display_enter"
+ "<a href=\"display_enter"
"?force_room=_MAIL_?recp=");
+
+ urlesc(&mailto[strlen(mailto)], fullname);
+ urlesc(&mailto[strlen(mailto)], " <");
urlesc(&mailto[strlen(mailto)], thisvalue);
+ urlesc(&mailto[strlen(mailto)], ">");
+
strcat(mailto, "\">");
- urlesc(&mailto[strlen(mailto)], thisvalue);
+ stresc(&mailto[strlen(mailto)], thisvalue, 1, 1);
strcat(mailto, "</A>");
}
else if (!strcasecmp(firsttoken, "tel")) {
if (pass == 1) {
wprintf("<TR BGCOLOR=\"#AAAAAA\">"
"<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
- "<IMG ALIGN=CENTER SRC=\"/static/viewcontacts_48x.gif\">"
+ "<IMG ALIGN=CENTER src=\"static/viewcontacts_48x.gif\">"
"<FONT SIZE=+1><B>");
- escputs(displayname);
+ escputs(fullname);
wprintf("</B></FONT>");
if (strlen(title) > 0) {
wprintf("<div align=right>");
/*
- * I wanna SEE that message!
+ * I wanna SEE that message! (Optional 'section' 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];
char mime_disposition[256];
int mime_length;
char mime_http[SIZ];
+ char mime_submessages[256];
char m_subject[256];
char m_cc[1024];
char from[256];
char *part_source = NULL;
#ifdef HAVE_ICONV
iconv_t ic = (iconv_t)(-1) ;
- char *ibuf; /* Buffer of characters to be converted */
- char *obuf; /* Buffer for converted characters */
- size_t ibuflen; /* Length of input buffer */
- size_t obuflen; /* Length of output buffer */
- char *osav; /* Saved pointer to output buffer */
+ char *ibuf; /* Buffer of characters to be converted */
+ char *obuf; /* Buffer for converted characters */
+ size_t ibuflen; /* Length of input buffer */
+ size_t obuflen; /* Length of output buffer */
+ char *osav; /* Saved pointer to output buffer */
#endif
strcpy(from, "");
strcpy(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("<STRONG>");
/* begin everythingamundo table */
if (!printable_view) {
- wprintf("<div id=\"fix_scrollbar_bug\">\n");
+ wprintf("<div class=\"fix_scrollbar_bug\">\n");
wprintf("<table width=100%% border=1 cellspacing=0 "
"cellpadding=0><TR><TD>\n");
}
/* begin message header table */
- wprintf("<TABLE WIDTH=100%% BORDER=0 CELLSPACING=0 "
- "CELLPADDING=1 BGCOLOR=\"#CCCCCC\"><TR><TD>\n");
+ wprintf("<table width=100%% border=0 cellspacing=0 "
+ "cellpadding=1 bgcolor=\"#CCCCCC\"><tr><td>\n");
- wprintf("<SPAN CLASS=\"message_header\">");
+ wprintf("<span class=\"message_header\">");
strcpy(m_subject, "");
strcpy(m_cc, "");
while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
if (!strcmp(buf, "000")) {
- wprintf("<I>");
+ wprintf("<i>");
wprintf(_("unexpected end of message"));
- wprintf("</I><br /><br />\n");
- wprintf("</SPAN>\n");
+ wprintf("</i><br /><br />\n");
+ wprintf("</span>\n");
return;
}
if (!strncasecmp(buf, "nhdr=yes", 8))
if (!strncasecmp(buf, "from=", 5)) {
strcpy(from, &buf[5]);
wprintf(_("from "));
- wprintf("<A HREF=\"/showuser?who=");
+ wprintf("<a href=\"showuser?who=");
#ifdef HAVE_ICONV
utf8ify_rfc822_string(from);
#endif
urlescputs(from);
wprintf("\">");
escputs(from);
- wprintf("</A> ");
+ wprintf("</a> ");
}
if (!strncasecmp(buf, "subj=", 5)) {
safestrncpy(m_subject, &buf[5], sizeof m_subject);
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),
- "<IMG SRC=\"/mimepart/%ld/%s/%s\">",
+ "<img src=\"mimepart/%ld/%s/%s\">",
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),
- "<A HREF=\"/mimepart/%ld/%s/%s\" "
- "TARGET=\"wc.%ld.%s\">"
- "<IMG SRC=\"/static/diskette_24x.gif\" "
- "BORDER=0 ALIGN=MIDDLE>\n"
- "Part %s: %s (%s, %d bytes)</A><br />\n",
+ "<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",
msgnum, mime_partnum, mime_filename,
msgnum, mime_partnum,
- mime_partnum, mime_filename,
- mime_content_type, mime_length);
+ mime_filename,
+ mime_content_type, mime_length
+ );
}
/*** begin handler prep ***/
wprintf("****");
}
- wprintf("</SPAN>");
+ wprintf("</span>");
#ifdef HAVE_ICONV
utf8ify_rfc822_string(m_cc);
utf8ify_rfc822_string(m_subject);
#endif
if (strlen(m_cc) > 0) {
wprintf("<br />"
- "<SPAN CLASS=\"message_subject\">");
+ "<span class=\"message_subject\">");
wprintf(_("CC:"));
wprintf(" ");
escputs(m_cc);
- wprintf("</SPAN>");
+ wprintf("</span>");
}
if (strlen(m_subject) > 0) {
wprintf("<br />"
- "<SPAN CLASS=\"message_subject\">");
+ "<span class=\"message_subject\">");
wprintf(_("Subject:"));
wprintf(" ");
escputs(m_subject);
- wprintf("</SPAN>");
+ wprintf("</span>");
}
- wprintf("</TD>\n");
+ wprintf("</td>\n");
/* start msg buttons */
if (!printable_view) {
- wprintf("<td align=right>\n");
+ wprintf("<td align=right><span class=\"msgbuttons\">\n");
/* Reply */
- wprintf("<a href=\"/display_enter?recp=");
- urlescputs(reply_to);
- wprintf("?subject=");
- if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
- urlescputs(m_subject);
- wprintf("\">[%s]</a> ", _("Reply"));
+ if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
+ wprintf("<a href=\"display_enter");
+ if (WC->is_mailbox) {
+ wprintf("?replyquote=%ld", msgnum);
+ }
+ wprintf("?recp=");
+ urlescputs(reply_to);
+ if (strlen(m_subject) > 0) {
+ wprintf("?subject=");
+ if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+ urlescputs(m_subject);
+ }
+ wprintf("\">[%s]</a> ", _("Reply"));
+ }
+
+ /* ReplyQuoted */
+ if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
+ if (!WC->is_mailbox) {
+ wprintf("<a href=\"display_enter");
+ wprintf("?replyquote=%ld", msgnum);
+ wprintf("?recp=");
+ urlescputs(reply_to);
+ if (strlen(m_subject) > 0) {
+ wprintf("?subject=");
+ if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+ urlescputs(m_subject);
+ }
+ wprintf("\">[%s]</a> ", _("ReplyQuoted"));
+ }
+ }
/* ReplyAll */
if (WC->wc_view == VIEW_MAILBOX) {
- wprintf("<a href=\"/display_enter?recp=");
+ wprintf("<a href=\"display_enter");
+ wprintf("?replyquote=%ld", msgnum);
+ wprintf("?recp=");
urlescputs(reply_to);
wprintf("?cc=");
urlescputs(reply_all);
- 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]</a> ", _("ReplyAll"));
}
/* Forward */
if (WC->wc_view == VIEW_MAILBOX) {
- wprintf("<a href=\"/display_enter?pullquote=%ld?subject=", msgnum);
+ wprintf("<a href=\"display_enter?fwdquote=%ld?subject=", msgnum);
if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%20");
urlescputs(m_subject);
wprintf("\">[%s]</a> ", _("Forward"));
}
- if (WC->is_room_aide) {
+ /* If this is one of my own rooms, or if I'm an Aide or Room Aide, I can move/delete */
+ if ( (WC->is_room_aide) || (WC->is_mailbox) ) {
/* Move */
- wprintf("<a href=\"/confirm_move_msg?msgid=%ld\">[%s]</a> ",
+ wprintf("<a href=\"confirm_move_msg?msgid=%ld\">[%s]</a> ",
msgnum, _("Move"));
/* Delete */
- wprintf("<a href=\"/delete_msg?msgid=%ld\" "
+ wprintf("<a href=\"delete_msg?msgid=%ld\" "
"onClick=\"return confirm('%s');\">"
"[%s]</a> ", msgnum, _("Delete this message?"), _("Delete")
);
}
- wprintf("<a href=\"#\" onClick=\"window.open('/printmsg?msgnum=%ld', 'print%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
+ /* 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 */
+ 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("</td>");
+ wprintf("</span></td>");
}
- wprintf("</TR></TABLE>\n");
+ wprintf("</tr></table>\n");
/* Begin body */
- wprintf("<TABLE BORDER=0 WIDTH=100%% BGCOLOR=#FFFFFF "
- "CELLPADDING=1 CELLSPACING=0><TR><TD>");
+ wprintf("<table border=0 width=100%% bgcolor=\"#FFFFFF\" "
+ "cellpadding=1 cellspacing=0><tr><td>");
/*
* Learn the content type
strcpy(mime_content_type, "text/plain");
while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) {
if (!strcmp(buf, "000")) {
- wprintf("<I>");
+ wprintf("<i>");
wprintf(_("unexpected end of message"));
- wprintf("</I><br /><br />\n");
+ wprintf("</i><br /><br />\n");
goto ENDBODY;
}
if (!strncasecmp(buf, "Content-type: ", 14)) {
/* Set up a character set conversion if we need to (and if we can) */
#ifdef HAVE_ICONV
+ if (strchr(mime_charset, ';')) strcpy(strchr(mime_charset, ';'), "");
if ( (strcasecmp(mime_charset, "us-ascii"))
- && (strcasecmp(mime_charset, "UTF-8")) ) {
+ && (strcasecmp(mime_charset, "UTF-8"))
+ && (strcasecmp(mime_charset, ""))
+ ) {
ic = iconv_open("UTF-8", mime_charset);
if (ic == (iconv_t)(-1) ) {
- lprintf(5, "iconv_open() failed: %s\n", strerror(errno));
+ lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
+ __FILE__, __LINE__, mime_charset, strerror(errno));
}
}
#endif
/* Boring old 80-column fixed format text gets handled this way... */
else if ( (!strcasecmp(mime_content_type, "text/plain"))
- || (!strcasecmp(mime_content_type, "text")) ) {
+ || (!strcasecmp(mime_content_type, "text")) ) {
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0;
if (buf[strlen(buf)-1] == '\r') buf[strlen(buf)-1] = 0;
while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
buf[strlen(buf) - 1] = 0;
if ((bq == 0) &&
- ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
- wprintf("<BLOCKQUOTE>");
+ ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
+ wprintf("<blockquote>");
bq = 1;
} else if ((bq == 1) &&
- (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
- wprintf("</BLOCKQUOTE>");
+ (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) {
+ wprintf("</blockquote>");
bq = 0;
}
- wprintf("<TT>");
+ wprintf("<tt>");
url(buf);
escputs(buf);
- wprintf("</TT><br />\n");
+ wprintf("</tt><br />\n");
}
- wprintf("</I><br />");
+ wprintf("</i><br />");
}
else /* HTML is fun, but we've got to strip it first */
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
}
+ /* If there are attached submessages, display them now... */
+ if ( (strlen(mime_submessages) > 0) && (!section[0]) ) {
+ for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
+ extract_token(buf, mime_submessages, i, '|', sizeof buf);
+ /* use printable_view to suppress buttons */
+ wprintf("<blockquote>");
+ read_message(msgnum, 1, buf);
+ wprintf("</blockquote>");
+ }
+ }
+
+
/* Afterwards, offer links to download attachments 'n' such */
- if (strlen(mime_http) > 0) {
+ if ( (strlen(mime_http) > 0) && (!section[0]) ) {
wprintf("%s", mime_http);
}
|| (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
|| (WC->wc_view == VIEW_ADDRESSBOOK)
) {
- wprintf("<A HREF=\"/edit_vcard?"
+ wprintf("<a href=\"edit_vcard?"
"msgnum=%ld?partnum=%s\">",
msgnum, vcard_partnum);
- wprintf("[%s]</A>", _("edit"));
+ wprintf("[%s]</a>", _("edit"));
}
/* In all cases, display the full card */
}
ENDBODY:
- wprintf("</TD></TR></TABLE>\n");
+ wprintf("</td></tr></table>\n");
/* end everythingamundo table */
if (!printable_view) {
- wprintf("</TD></TR></TABLE>\n");
+ wprintf("</td></tr></table>\n");
wprintf("</div><br />\n");
}
* Unadorned HTML output of an individual message, suitable
* for placing in a hidden iframe, for printing, or whatever
*/
-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
*/
-void print_message(void) {
+void print_message(char *msgnum_as_string) {
long msgnum = 0L;
- msgnum = atol(bstr("msgnum"));
- output_headers(0, 0, 0, 0, 0, 0);
+ msgnum = atol(msgnum_as_string);
+ output_headers(0, 0, 0, 0, 0, 0);
- wprintf("Content-type: text/html\r\n"
- "Server: %s\r\n"
- "Connection: close\r\n",
- SERVER);
- begin_burst();
+ wprintf("Content-type: text/html\r\n"
+ "Server: %s\r\n"
+ "Connection: close\r\n",
+ SERVER);
+ begin_burst();
wprintf("\r\n\r\n<html>\n"
"<head><title>Printable view</title></head>\n"
"<body onLoad=\" window.print(); window.close(); \">\n"
);
- read_message(msgnum, 1);
+ read_message(msgnum, 1, "");
wprintf("\n</body></html>\n\n");
wDumpContent(0);
+/*
+ * Display a message's headers
+ */
+void display_headers(char *msgnum_as_string) {
+ long msgnum = 0L;
+ char buf[1024];
+
+ msgnum = atol(msgnum_as_string);
+ output_headers(0, 0, 0, 0, 0, 0);
+
+ wprintf("Content-type: text/plain\r\n"
+ "Server: %s\r\n"
+ "Connection: close\r\n",
+ SERVER);
+ begin_burst();
+
+ serv_printf("MSG2 %ld|3", msgnum);
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '1') {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ wprintf("%s\n", buf);
+ }
+ }
+
+ wDumpContent(0);
+}
+
+
+
/*
* Read message in simple, JavaScript-embeddable form for 'forward'
* or 'reply quoted' operations.
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, "");
/* 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, "UTF-8"))
+ && (strcasecmp(mime_charset, ""))
+ ) {
ic = iconv_open("UTF-8", mime_charset);
if (ic == (iconv_t)(-1) ) {
- lprintf(5, "iconv_open() failed: %s\n", strerror(errno));
+ lprintf(5, "%s:%d iconv_open() failed: %s\n",
+ __FILE__, __LINE__, strerror(errno));
}
}
#endif
while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
buf[strlen(buf) - 1] = 0;
if ((bq == 0) &&
- ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) || (!strncmp(buf, " :-)", 4)))) {
- wprintf("<BLOCKQUOTE>");
+ ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
+ wprintf("<blockquote>");
bq = 1;
} else if ((bq == 1) &&
- (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
- wprintf("</BLOCKQUOTE>");
+ (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) {
+ wprintf("</blockquote>");
bq = 0;
}
- wprintf("<TT>");
+ wprintf("<tt>");
url(buf);
msgescputs(buf);
- wprintf("</TT><br />");
+ wprintf("</tt><br />");
}
- wprintf("</I><br />");
+ wprintf("</i><br />");
}
/* HTML just gets escaped and stuffed back into the editor */
* If there were attachments, we have to download them and insert them
* into the attachment chain for the forwarded message we are composing.
*/
- if (num_attachments) {
+ if ( (forward_attachments) && (num_attachments) ) {
for (i=0; i<num_attachments; ++i) {
extract_token(buf, attachments, i, '\n', sizeof buf);
- extract_token(mime_filename, buf, 1, '|', sizeof mime_filename);
- extract_token(mime_partnum, buf, 2, '|', sizeof mime_partnum);
- extract_token(mime_disposition, buf, 3, '|', sizeof mime_disposition);
- extract_token(mime_content_type, buf, 4, '|', sizeof mime_content_type);
- mime_length = extract_int(buf, 5);
+ extract_token(mime_filename, buf, 1, '|', sizeof mime_filename);
+ extract_token(mime_partnum, buf, 2, '|', sizeof mime_partnum);
+ extract_token(mime_disposition, buf, 3, '|', sizeof mime_disposition);
+ extract_token(mime_content_type, buf, 4, '|', sizeof mime_content_type);
+ mime_length = extract_int(buf, 5);
/*
* tracing ... uncomment if necessary
}
-
-
-
-
void display_summarized(int num) {
char datebuf[64];
- wprintf("<TD>");
- if (WC->summ[num].is_new) wprintf("<B>");
+ wprintf("<tr id=\"m%ld\" style=\"width:100%%;font-weight:%s;background-color:#ffffff\" "
+ "onMouseDown=\"CtdlMoveMsgMouseDown(event,%ld)\">",
+ WC->summ[num].msgnum,
+ (WC->summ[num].is_new ? "bold" : "normal"),
+ WC->summ[num].msgnum
+ );
+
+ wprintf("<td width=%d%%>", SUBJ_COL_WIDTH_PCT);
escputs(WC->summ[num].subj);
- if (WC->summ[num].is_new) wprintf("</B>");
- wprintf("</TD><TD>");
- if (WC->summ[num].is_new) wprintf("<B>");
+ wprintf("</td>");
+
+ wprintf("<td width=%d%%>", SENDER_COL_WIDTH_PCT);
escputs(WC->summ[num].from);
- if (WC->summ[num].is_new) wprintf("</B>");
- wprintf(" </TD><TD>");
- if (WC->summ[num].is_new) wprintf("<B>");
+ wprintf("</td>");
+
+ wprintf("<td width=%d%%>", DATE_PLUS_BUTTONS_WIDTH_PCT);
fmt_date(datebuf, WC->summ[num].date, 1); /* brief */
escputs(datebuf);
- if (WC->summ[num].is_new) wprintf("</B>");
- wprintf(" </TD>");
- wprintf("<TD>"
- "<INPUT TYPE=\"checkbox\" NAME=\"msg_%ld\" VALUE=\"yes\">"
- "</TD>\n",
- WC->summ[num].msgnum
- );
+ wprintf("</td>");
+
+ wprintf("</tr>\n");
}
|| (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
|| (WC->wc_view == VIEW_ADDRESSBOOK)
) {
- wprintf("<A HREF=\"/edit_vcard?"
+ wprintf("<a href=\"edit_vcard?"
"msgnum=%ld?partnum=%s\">",
msgnum, vcard_partnum);
- wprintf("[%s]</A>", _("edit"));
+ wprintf("[%s]</a>", _("edit"));
}
free(vcard_source);
wprintf("Page: ");
for (i=0; i<=num_pages; ++i) {
if (i != page) {
- wprintf("<A HREF=\"/readfwd?page=%d\">", i);
+ wprintf("<a href=\"readfwd?page=%d\">", i);
}
else {
wprintf("<B>");
}
wprintf("<br />\n");
- wprintf("<TABLE border=0 cellspacing=0 "
+ wprintf("<table border=0 cellspacing=0 "
"cellpadding=3 width=100%%>\n"
);
if ((displayed % 4) == 0) {
if (displayed > 0) {
- wprintf("</TR>\n");
+ wprintf("</tr>\n");
}
bg = 1 - bg;
- wprintf("<TR BGCOLOR=\"#%s\">",
+ wprintf("<tr bgcolor=\"#%s\">",
(bg ? "DDDDDD" : "FFFFFF")
);
}
- wprintf("<TD>");
+ wprintf("<td>");
- wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
+ wprintf("<a href=\"readfwd?startmsg=%ld&is_singlecard=1",
addrbook[i].ab_msgnum);
wprintf("?maxmsgs=1?summary=0?alpha=%s\">", bstr("alpha"));
vcard_n_prettyize(addrbook[i].ab_name);
escputs(addrbook[i].ab_name);
- wprintf("</A></TD>\n");
+ wprintf("</a></td>\n");
++displayed;
}
}
- wprintf("</TR></TABLE>\n");
+ wprintf("</tr></table>\n");
}
{
char buf[1024];
time_t datestamp;
- char displayname[128];
+ char fullname[128];
char nodename[128];
char inetaddr[128];
char subject[256];
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;
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);
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,
return (nummsgs);
}
+int longcmp_r(const void *s1, const void *s2) {
+ long l1;
+ long l2;
+
+ l1 = *(long *)s1;
+ l2 = *(long *)s2;
+
+ if (l1 > l2) return(-1);
+ if (l1 < l2) return(+1);
+ return(0);
+}
+
int summcmp_subj(const void *s1, const void *s2) {
struct message_summary *summ1;
int nummsgs;
long startmsg;
int maxmsgs;
+ long *displayed_msgs = NULL;
int num_displayed = 0;
int is_summary = 0;
int is_addressbook = 0;
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;
char *subjsort_button;
char *sendsort_button;
char *datesort_button;
+ int bbs_reverse = 0;
+
+ if (WC->wc_view == VIEW_WIKI) {
+ sprintf(buf, "wiki/%s/home", WC->wc_roomname);
+ http_redirect(buf);
+ return;
+ }
startmsg = atol(bstr("startmsg"));
maxmsgs = atoi(bstr("maxmsgs"));
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);
}
}
- 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];
}
}
}
if (!strcasecmp(sortby, "subject")) {
- subjsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsubject\"><img border=\"0\" src=\"/static/down_pointer.gif\" /></a>" ;
+ subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsubject\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
}
else if (!strcasecmp(sortby, "rsubject")) {
- subjsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"/static/up_pointer.gif\" /></a>" ;
+ subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
}
else {
- subjsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"/static/sort_none.gif\" /></a>" ;
+ subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=subject\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
}
if (!strcasecmp(sortby, "sender")) {
- sendsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsender\"><img border=\"0\" src=\"/static/down_pointer.gif\" /></a>" ;
+ sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rsender\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
}
else if (!strcasecmp(sortby, "rsender")) {
- sendsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"/static/up_pointer.gif\" /></a>" ;
+ sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
}
else {
- sendsort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"/static/sort_none.gif\" /></a>" ;
+ sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=sender\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
}
if (!strcasecmp(sortby, "date")) {
- datesort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"/static/down_pointer.gif\" /></a>" ;
+ datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"static/down_pointer.gif\" /></a>" ;
}
else if (!strcasecmp(sortby, "rdate")) {
- datesort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=date\"><img border=\"0\" src=\"/static/up_pointer.gif\" /></a>" ;
+ datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=date\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
}
else {
- datesort_button = "<a href=\"/readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=date\"><img border=\"0\" src=\"/static/sort_none.gif\" /></a>" ;
+ datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
}
if (is_summary) {
- wprintf("</div>"); /* end of 'content' div */
-
- wprintf("<div id=\"message_list\">"
+ wprintf("</div>\n"); /* end of 'content' div */
+
+ wprintf("<script language=\"javascript\" type=\"text/javascript\">"
+ " document.onkeydown = CtdlMsgListKeyPress; "
+ " if (document.layers) { "
+ " document.captureEvents(Event.KEYPRESS); "
+ " } "
+ "</script>\n"
+ );
- "<div id=\"fix_scrollbar_bug\">\n"
-
- "<form name=\"msgomatic\" "
- "method=\"POST\" action=\"/do_stuff_to_msgs\">\n"
-
- "<table border=0 cellspacing=0 "
- "cellpadding=0 width=100%%>\n"
- "<TR>"
- "<TD align=center><b><i>%s</i></b> %s</TD>"
- "<TD align=center><b><i>%s</i></b> %s</TD>"
- "<TD align=center><b><i>%s</i></b> %s</TD>"
- "<TD><INPUT TYPE=\"submit\" NAME=\"delete_button\" "
- "STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;"
- " font-size: 6pt;\" "
- "VALUE=\"%s\"></TD>"
- "</TR>\n"
+ /* 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%%\">"
+ "<tr>"
+ );
+ wprintf("<td width=%d%%><b><i>%s</i></b> %s</td>"
+ "<td width=%d%%><b><i>%s</i></b> %s</td>"
+ "<td width=%d%%><b><i>%s</i></b> %s"
+ " "
+ "<input type=\"submit\" name=\"delete_button\" style=\"font-size:6pt\" "
+ " onClick=\"CtdlDeleteSelectedMessages(event)\" "
+ " value=\"%s\">"
+ "</td>"
+ "</tr>\n"
,
+ SUBJ_COL_WIDTH_PCT,
_("Subject"), subjsort_button,
+ SENDER_COL_WIDTH_PCT,
_("Sender"), sendsort_button,
+ DATE_PLUS_BUTTONS_WIDTH_PCT,
_("Date"), datesort_button,
_("Delete")
);
- }
-
- for (a = 0; a < nummsgs; ++a) {
- if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
+ wprintf("</table></div></div>\n");
- /* 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("<div id=\"message_list\">"
- /* If a tabular view, set up the line */
- if (is_summary) {
- bg = 1 - bg;
- wprintf("<tr bgcolor=\"#%s\" ",
- (bg ? "DDDDDD" : "FFFFFF")
- );
+ "<div class=\"fix_scrollbar_bug\">\n"
- wprintf("onClick=\" new Ajax.Updater('preview_pane', '/msg', { method: 'get', parameters: 'msgnum=%ld' } ); \" ", WC->summ[a].msgnum);
+ "<table class=\"mailbox_summary\" id=\"summary_headers\" rules=rows "
+ "cellspacing=0 style=\"width:100%%;-moz-user-select:none;\">"
+ );
+ }
- wprintf(">");
- }
+ for (a = 0; a < nummsgs; ++a) {
+ if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
/* Display the message */
if (is_summary) {
display_note(WC->msgarr[a]);
}
else {
- read_message(WC->msgarr[a], 0);
- }
-
- /* If a tabular view, finish the line */
- if (is_summary) {
- wprintf("</TR>\n");
+ if (displayed_msgs == NULL) {
+ displayed_msgs = malloc(sizeof(long) *
+ (maxmsgs<nummsgs ? maxmsgs : nummsgs));
+ }
+ displayed_msgs[num_displayed] = WC->msgarr[a];
}
if (lowest_displayed < 0) lowest_displayed = a;
highest_displayed = a;
++num_displayed;
- --remaining_messages;
}
}
+ /* 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_notes) && (!is_singlecard) && (!is_summary)) {
+ is_bbview = 1;
+ }
+
+ /* 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 */
+
+ 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 */
+
+ free(displayed_msgs);
+ displayed_msgs = NULL;
+ }
+
if (is_summary) {
- wprintf("</table></form>"
+ wprintf("</table>"
"</div>\n"); /* end of 'fix_scrollbar_bug' div */
wprintf("</div>"); /* end of 'message_list' div */
- wprintf("<div id=\"ml_slider\"></div>"); /* slider */
+ /* Here's the grab-it-to-resize-the-message-list widget */
+ wprintf("<div id=\"resize_msglist\" "
+ "onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
+ "<div class=\"fix_scrollbar_bug\">"
+ "<table width=100%% border=3 cellspacing=0 "
+ "bgcolor=\"#cccccc\" "
+ "cellpadding=0><TR><TD> </td></tr></table>"
+ "</div></div>\n"
+ );
wprintf("<div id=\"preview_pane\">"); /* The preview pane will initially be empty */
}
++lowest_displayed;
++highest_displayed;
- /* 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("<div id=\"fix_scrollbar_bug\">"
- "<table border=0 width=100%% bgcolor=\"#dddddd\"><tr><td>");
- wprintf(_("Reading #%d of %d messages."), lowest_displayed, nummsgs);
- wprintf("</TD><TD ALIGN=RIGHT><FONT SIZE=+1>");
-
- if (pn_previous > 0L) {
- wprintf("<A HREF=\"/%s"
- "?startmsg=%ld"
- "?maxmsgs=1"
- "?summary=0\">"
- "%s</A> \n",
- oper,
- pn_previous,
- _("Previous"));
- }
-
- if (pn_next > 0L) {
- wprintf("<A HREF=\"/%s"
- "?startmsg=%ld"
- "?maxmsgs=1"
- "?summary=0\">"
- "%s</A> \n",
- oper,
- pn_next,
- _("Next"));
- }
-
- wprintf("<A HREF=\"/%s?startmsg=%ld"
- "?maxmsgs=%d?summary=1\">"
- "%s"
- "</A>",
- oper,
- WC->msgarr[0],
- DEFAULT_MAXMSGS,
- _("Summary")
- );
-
- wprintf("</td></tr></table></div>\n");
- }
- }
-
/*
* 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("<form name=\"msgomatic\" "
- "method=\"POST\" action=\"/do_stuff_to_msgs\">\n");
-
+ if (is_bbview) {
+ /* begin bbview scroller */
+ wprintf("<form name=\"msgomatic\">");
wprintf(_("Reading #"), lowest_displayed, highest_displayed);
wprintf("<select name=\"whichones\" size=\"1\" "
"OnChange=\"location.href=msgomatic.whichones.options"
"[selectedIndex].value\">\n");
- for (b=0; b<nummsgs; b = b + maxmsgs) {
- lo = b+1;
- hi = b+maxmsgs;
- if (hi > nummsgs) hi = nummsgs;
- wprintf("<option %s value="
- "\"/%s"
- "?startmsg=%ld"
- "?maxmsgs=%d"
- "?summary=%d\">"
- "%d-%d</option> \n",
- ((WC->msgarr[b] == startmsg) ? "selected" : ""),
- oper,
- WC->msgarr[b],
- maxmsgs,
- is_summary,
- lo, hi);
- }
- wprintf("<option value=\"/%s?startmsg=%ld"
+ if (bbs_reverse) {
+ for (b=nummsgs-1; b>=0; b = b - maxmsgs) {
+ hi = b + 1;
+ lo = b - maxmsgs + 2;
+ if (lo < 1) lo = 1;
+ wprintf("<option %s value="
+ "\"%s"
+ "?startmsg=%ld"
+ "?maxmsgs=%d"
+ "?summary=%d\">"
+ "%d-%d</option> \n",
+ ((WC->msgarr[lo-1] == startmsg) ? "selected" : ""),
+ oper,
+ WC->msgarr[lo-1],
+ maxmsgs,
+ is_summary,
+ hi, lo);
+ }
+ }
+ else {
+ for (b=0; b<nummsgs; b = b + maxmsgs) {
+ lo = b + 1;
+ hi = b + maxmsgs + 1;
+ if (hi > nummsgs) hi = nummsgs;
+ wprintf("<option %s value="
+ "\"%s"
+ "?startmsg=%ld"
+ "?maxmsgs=%d"
+ "?summary=%d\">"
+ "%d-%d</option> \n",
+ ((WC->msgarr[b] == startmsg) ? "selected" : ""),
+ oper,
+ WC->msgarr[lo-1],
+ maxmsgs,
+ is_summary,
+ lo, hi);
+ }
+ }
+
+ wprintf("<option value=\"%s?startmsg=%ld"
"?maxmsgs=9999999?summary=%d\">"
"ALL"
"</option> ",
wprintf("</select> ");
wprintf(_("of %d messages."), nummsgs);
- wprintf("</form>\n");
- }
+
+ /* forward/reverse */
+ wprintf(" <select name=\"direction\" size=\"1\" "
+ "OnChange=\"location.href=msgomatic.direction.options"
+ "[selectedIndex].value\">\n"
+ );
+
+ wprintf("<option %s value=\"%s?sortby=forward\">oldest to newest</option>\n",
+ (bbs_reverse ? "" : "selected"),
+ oper
+ );
+
+ wprintf("<option %s value=\"%s?sortby=reverse\">newest to oldest</option>\n",
+ (bbs_reverse ? "selected" : ""),
+ oper
+ );
+
+ wprintf("</select></form>\n");
+ /* end bbview scroller */
}
DONE:
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("</div>"
- "<div display=\"hidden\">\n"
- "<iframe name=\"msgloader1\" id=\"msgloader1\" width=\"1\"></iframe>\n"
- );
-
/* Note: wDumpContent() will output one additional </div> tag. */
wDumpContent(1);
if (addrbook != NULL) free(addrbook);
/* free the summary */
- if (WC->num_summ != 0) {
- WC->num_summ = 0;
+ 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;
}
}
serv_puts("Content-type: text/html; charset=utf-8");
serv_puts("");
- serv_puts("<HTML><BODY>\n");
+ serv_puts("<html><body>\n"); /* Future templates go here */
text_to_server(bstr("msgtext"), 0);
- serv_puts("</BODY></HTML>\n");
+ serv_puts("</body></html>\n");
if (is_multipart) {
char buf[SIZ];
static long dont_post = (-1L);
struct wc_attachment *att, *aptr;
+ int is_anonymous = 0;
+
+ if (!strcasecmp(bstr("is_anonymous"), "yes")) {
+ is_anonymous = 1;
+ }
if (WC->upload_length > 0) {
_("Automatically cancelled because you have already "
"saved this message."));
} else {
- sprintf(buf, "ENT0 1|%s|0|4|%s|||%s|%s",
+ sprintf(buf, "ENT0 1|%s|%d|4|%s|||%s|%s",
bstr("recp"),
+ is_anonymous,
bstr("subject"),
bstr("cc"),
bstr("bcc")
void display_enter(void)
{
char buf[SIZ];
+ char ebuf[SIZ];
long now;
struct wc_attachment *att;
int recipient_required = 0;
int recipient_bad = 0;
+ int i;
+ int is_anonymous = 0;
if (strlen(bstr("force_room")) > 0) {
gotoroom(bstr("force_room"));
}
+ if (!strcasecmp(bstr("is_anonymous"), "yes")) {
+ is_anonymous = 1;
+ }
+
/* Are we perhaps in an address book view? If so, then an "enter
* message" command really means "add new entry."
*/
embed_room_banner(NULL, navbar_none);
wprintf("</div>\n");
wprintf("<div id=\"content\">\n"
- "<div id=\"fix_scrollbar_bug\">"
+ "<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 */
/* 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", bstr("recp"), is_anonymous, bstr("cc"), bstr("bcc"));
serv_puts(buf);
serv_getln(buf, sizeof buf);
now = time(NULL);
fmt_date(buf, now, 0);
strcat(&buf[strlen(buf)], _(" <I>from</I> "));
- stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
+ stresc(&buf[strlen(buf)], WC->wc_fullname, 1, 1);
/* Don't need this anymore, it's in the input box below
if (strlen(bstr("recp")) > 0) {
/* begin message entry screen */
wprintf("<form enctype=\"multipart/form-data\" "
- "method=\"POST\" action=\"/post\" "
+ "method=\"POST\" action=\"post\" "
"name=\"enterform\""
- "onSubmit=\"return submitForm();\""
">\n");
wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n", now);
wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
- wprintf("%s<br>\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>",
+ (is_anonymous ? "checked" : "")
+ );
+ wprintf("Anonymous");
+ }
+ wprintf("<br>\n"); /* header bar */
wprintf("<table border=\"0\" width=\"100%%\">\n");
if (recipient_required) {
"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
wprintf("</td></tr></table>\n");
- wprintf("<center><script type=\"text/javascript\" "
- "src=\"static/richtext.js\"></script>\n"
- "<script type=\"text/javascript\">\n"
- "function submitForm() { \n"
- " updateRTE('msgtext'); \n"
- " return true; \n"
- "} \n"
- " \n"
- "initRTE(\"static/\", \"static/\", \"\"); \n"
- "</script> \n"
- "<noscript>JavaScript must be enabled.</noscript> \n"
- "<script type=\"text/javascript\"> \n"
- "writeRichText('msgtext', '");
+ wprintf("<center>");
+
+ wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
+
+ /* If we're continuing from a previous edit, put our partially-composed message back... */
msgescputs(bstr("msgtext"));
- if (atol(bstr("pullquote")) > 0L) {
+
+ /* If we're forwarding a message, insert it here... */
+ if (atol(bstr("fwdquote")) > 0L) {
wprintf("<br><div align=center><i>");
wprintf(_("--- forwarded message ---"));
wprintf("</i></div><br>");
- pullquote_message(atol(bstr("pullquote")), 1);
+ pullquote_message(atol(bstr("fwdquote")), 1);
+ }
+
+ /* 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");
+ }
+
+ /* Insert our signature if appropriate... */
+ if ( (WC->is_mailbox) && (strcmp(bstr("sig_inserted"), "yes")) ) {
+ get_preference("use_sig", buf, sizeof buf);
+ if (!strcasecmp(buf, "yes")) {
+ get_preference("signature", ebuf, sizeof ebuf);
+ euid_unescapize(buf, ebuf);
+ wprintf("<br>--<br>");
+ for (i=0; i<strlen(buf); ++i) {
+ if (buf[i] == '\n') {
+ wprintf("<br>");
+ }
+ else if (buf[i] == '<') {
+ wprintf("<");
+ }
+ else if (buf[i] == '>') {
+ wprintf(">");
+ }
+ else if (buf[i] == '&') {
+ wprintf("&");
+ }
+ else if (buf[i] == '\"') {
+ wprintf(""");
+ }
+ else if (buf[i] == '\'') {
+ wprintf("'");
+ }
+ else if (isprint(buf[i])) {
+ wprintf("%c", buf[i]);
+ }
+ }
+ }
}
- wprintf("', '96%%', '200', true, false); \n"
- "</script></center><br />\n");
+
+ wprintf("</textarea>");
+ wprintf("</center><br />\n");
+
+ /*
+ * The following script embeds the TinyMCE richedit control, and automatically
+ * transforms the textarea into a richedit textarea.
+ */
+ wprintf(
+ "<script language=\"javascript\" type=\"text/javascript\" src=\"tiny_mce/tiny_mce.js\"></script>\n"
+ "<script language=\"javascript\" type=\"text/javascript\">"
+ "tinyMCE.init({"
+ " mode : \"textareas\", width : \"100%%\", browsers : \"msie,gecko\", "
+ " 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 : \"\" "
+ "});"
+ "</script>\n"
+ );
+
/* Enumerate any attachments which are already in place... */
- wprintf("<img src=\"/static/diskette_24x.gif\" border=0 "
- "align=middle height=16 width=16> Attachments: ");
+ wprintf("<img src=\"static/diskette_24x.gif\" border=0 "
+ "align=middle height=16 width=16> ");
+ wprintf(_("Attachments:"));
+ wprintf(" ");
wprintf("<select name=\"which_attachment\" size=1>");
for (att = WC->first_attachment; att != NULL; att = att->next) {
wprintf("<option value=\"");
wprintf("</select>");
/* Now offer the ability to attach additional files... */
- wprintf(" "
- "Attach file: <input NAME=\"attachfile\" "
+ wprintf(" ");
+ wprintf(_("Attach file:"));
+ wprintf(" <input NAME=\"attachfile\" "
"SIZE=16 TYPE=\"file\">\n "
"<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
wprintf("\"> "
"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
+ /* Make sure we only insert our signature once */
+ if (strcmp(bstr("sig_inserted"), "yes")) {
+ wprintf("<INPUT TYPE=\"hidden\" NAME=\"sig_inserted\" VALUE=\"yes\">\n");
+ }
+
wprintf("</form>\n");
wprintf("</td></tr></table></div>\n");
-
-
-
-
void delete_msg(void)
{
long msgid;
output_headers(1, 1, 1, 0, 0, 0);
- sprintf(buf, "DELE %ld", msgid);
- serv_puts(buf);
+ 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);
wprintf("<EM>%s</EM><br />\n", &buf[4]);
msgid = atol(bstr("msgid"));
- output_headers(1, 1, 1, 0, 0, 0);
- wprintf("<div id=\"fix_scrollbar_bug\">"
- "<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
- wprintf("<font size=+1 color=\"#ffffff\"");
- wprintf("<b>");
+ output_headers(1, 1, 2, 0, 0, 0);
+ wprintf("<div id=\"banner\">\n");
+ wprintf("<TABLE WIDTH=100%% BORDER=0><TR><TD>");
+ wprintf("<SPAN CLASS=\"titlebar\">");
wprintf(_("Confirm move of message"));
- wprintf("</b>\n");
- wprintf("</font></td></tr></table></div>\n");
+ wprintf("</SPAN>\n");
+ wprintf("</TD></TR></TABLE>\n");
+ wprintf("</div>\n<div id=\"content\">\n");
wprintf("<CENTER>");
wprintf(_("Move this message to:"));
wprintf("<br />\n");
- wprintf("<form METHOD=\"POST\" ACTION=\"/move_msg\">\n");
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
- bstr("msgid"));
-
+ wprintf("<form METHOD=\"POST\" action=\"move_msg\">\n");
+ wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
serv_puts("LKRA");
msgid = atol(bstr("msgid"));
- output_headers(1, 1, 1, 0, 0, 0);
-
if (strlen(bstr("move_button")) > 0) {
sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
serv_puts(buf);
serv_getln(buf, sizeof buf);
- wprintf("<EM>%s</EM><br />\n", &buf[4]);
+ sprintf(WC->ImportantMessage, "%s", &buf[4]);
} else {
- wprintf("<EM>");
- wprintf(_("The message was not moved."));
- wprintf("</EM><br />\n");
+ sprintf(WC->ImportantMessage, (_("The message was not moved.")));
}
- wDumpContent(1);
-}
-
-/*
- * This gets called when a user selects multiple messages in a summary
- * list and then clicks to perform a transformation of some sort on them
- * (such as deleting them).
- */
-void do_stuff_to_msgs(void) {
- char buf[256];
-
- struct stuff_t {
- struct stuff_t *next;
- long msgnum;
- };
-
- struct stuff_t *stuff = NULL;
- struct stuff_t *ptr;
- int delete_button_pressed = 0;
-
-
- serv_puts("MSGS ALL");
- serv_getln(buf, sizeof buf);
-
- if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- ptr = malloc(sizeof(struct stuff_t));
- ptr->msgnum = atol(buf);
- ptr->next = stuff;
- stuff = ptr;
- }
-
- if (strlen(bstr("delete_button")) > 0) {
- delete_button_pressed = 1;
- }
-
- while (stuff != NULL) {
-
- sprintf(buf, "msg_%ld", stuff->msgnum);
- if (!strcasecmp(bstr(buf), "yes")) {
-
- if (delete_button_pressed) {
- serv_printf("DELE %ld", stuff->msgnum);
- serv_getln(buf, sizeof buf);
- }
-
- }
-
- ptr = stuff->next;
- free(stuff);
- stuff = ptr;
- }
+ readloop("readnew");
- readloop("readfwd");
}
projects / citadel.git / blobdiff