#include "webcit.h"
#include "vcard.h"
#include "webserver.h"
+#include "groupdav.h"
/* Address book entry (keep it short and sweet, it's just a quickie lookup
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;
}
}
strcat(mailto,
"<A HREF=\"/display_enter"
"?force_room=_MAIL_?recp=");
+
+ urlesc(&mailto[strlen(mailto)], displayname);
+ 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")) {
}
wprintf("</TD></TR>\n");
- if (strlen(phone) > 0)
- wprintf("<TR><TD>");
+ if (strlen(phone) > 0) {
+ wprintf("<tr><td>");
wprintf(_("Telephone:"));
- wprintf("</TD><TD>%s</TD></TR>\n", phone);
- if (strlen(mailto) > 0)
- wprintf("<TR><TD>");
+ wprintf("</td><td>%s</td></tr>\n", phone);
+ }
+ if (strlen(mailto) > 0) {
+ wprintf("<tr><td>");
wprintf(_("E-mail:"));
- wprintf("</TD><TD>%s</TD></TR>\n", mailto);
+ wprintf("</td><td>%s</td></tr>\n", mailto);
+ }
}
}
/*
- * I wanna SEE that message!
+ * I wanna SEE that message! (Optional 'section' for encapsulated message/rfc822 submessage)
*/
-void read_message(long msgnum, int suppress_buttons) {
+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 node[256];
char rfca[256];
char reply_to[512];
- char now[256];
+ char reply_all[4096];
+ char now[64];
int format_type = 0;
int nhdr = 0;
int bq = 0;
char *part_source = NULL;
#ifdef HAVE_ICONV
iconv_t ic = (iconv_t)(-1) ;
- char *ibuf; /* Buffer of characters to be converted */
- char *obuf; /* Buffer for converted characters */
- size_t ibuflen; /* Length of input buffer */
- size_t obuflen; /* Length of output buffer */
- char *osav; /* Saved pointer to output buffer */
+ char *ibuf; /* Buffer of characters to be converted */
+ char *obuf; /* Buffer for converted characters */
+ size_t ibuflen; /* Length of input buffer */
+ size_t obuflen; /* Length of output buffer */
+ char *osav; /* Saved pointer to output buffer */
#endif
strcpy(from, "");
strcpy(node, "");
strcpy(rfca, "");
strcpy(reply_to, "");
+ strcpy(reply_all, "");
strcpy(vcard_partnum, "");
strcpy(cal_partnum, "");
strcpy(mime_http, "");
strcpy(mime_content_type, "text/plain");
strcpy(mime_charset, "us-ascii");
+ strcpy(mime_submessages, "");
- serv_printf("MSG4 %ld", msgnum);
+ serv_printf("MSG4 %ld|%s", msgnum, section);
serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
wprintf("<STRONG>");
}
/* begin everythingamundo table */
- wprintf("<div id=\"fix_scrollbar_bug\">\n");
- wprintf("<table width=100%% border=1 cellspacing=0 "
- "cellpadding=0><TR><TD>\n");
+ if (!printable_view) {
+ wprintf("<div id=\"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 "
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("</A> ");
}
if (!strncasecmp(buf, "subj=", 5)) {
- strcpy(m_subject, &buf[5]);
+ safestrncpy(m_subject, &buf[5], sizeof m_subject);
+ }
+ if (!strncasecmp(buf, "cccc=", 5)) {
+ safestrncpy(m_cc, &buf[5], sizeof m_cc);
+ if (strlen(reply_all) > 0) {
+ strcat(reply_all, ", ");
+ }
+ safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
+ (sizeof reply_all - strlen(reply_all)) );
}
if ((!strncasecmp(buf, "hnod=", 5))
&& (strcasecmp(&buf[5], serv_info.serv_humannode))) {
&& (strcasecmp(&buf[5], WC->wc_roomname))
&& (strlen(&buf[5])>0) ) {
wprintf(_("in "));
- wprintf("%s> ", &buf[5]);
+ wprintf("%s> ", &buf[5]);
}
if (!strncasecmp(buf, "rfca=", 5)) {
strcpy(rfca, &buf[5]);
}
if (!strncasecmp(buf, "rcpt=", 5)) {
wprintf(_("to "));
- wprintf("%s ", &buf[5]);
+ escputs(&buf[5]);
+ wprintf(" ");
+ if (strlen(reply_all) > 0) {
+ strcat(reply_all, ", ");
+ }
+ safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
+ (sizeof reply_all - strlen(reply_all)) );
}
if (!strncasecmp(buf, "time=", 5)) {
fmt_date(now, atol(&buf[5]), 0);
extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
mime_length = extract_int(&buf[5], 5);
- if (!strcasecmp(mime_disposition, "attachment")) {
+ if (!strcasecmp(mime_content_type, "message/rfc822")) {
+ if (strlen(mime_submessages) > 0) {
+ strcat(mime_submessages, "|");
+ }
+ strcat(mime_submessages, mime_partnum);
+ }
+ else if ((!strcasecmp(mime_disposition, "inline"))
+ && (!strncasecmp(mime_content_type, "image/", 6)) ){
+ snprintf(&mime_http[strlen(mime_http)],
+ (sizeof(mime_http) - strlen(mime_http) - 1),
+ "<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=\"/output_mimepart?"
- "msgnum=%ld?partnum=%s\" "
+ "<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",
- msgnum, mime_partnum,
+ "%s (%s, %d bytes)</A><br />\n",
+ msgnum, mime_partnum, mime_filename,
msgnum, mime_partnum,
- mime_partnum, mime_filename,
- mime_content_type, mime_length);
- }
-
- 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=\"/output_mimepart?"
- "msgnum=%ld?partnum=%s\">",
- msgnum, mime_partnum);
+ mime_filename,
+ mime_content_type, mime_length
+ );
}
/*** begin handler prep ***/
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\">");
+ wprintf(_("CC:"));
+ wprintf(" ");
+ escputs(m_cc);
+ wprintf("</SPAN>");
+ }
if (strlen(m_subject) > 0) {
wprintf("<br />"
"<SPAN CLASS=\"message_subject\">");
wprintf(_("Subject:"));
- wprintf(" %s</SPAN>", m_subject
- );
+ wprintf(" ");
+ escputs(m_subject);
+ wprintf("</SPAN>");
}
wprintf("</TD>\n");
/* start msg buttons */
- if (!suppress_buttons) {
+ if (!printable_view) {
wprintf("<td align=right>\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"));
-
- /* Forward (FIXME do this)
+ 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);
+ 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);
+ 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");
+ wprintf("?replyquote=%ld", msgnum);
+ wprintf("?recp=");
+ urlescputs(reply_to);
+ wprintf("?cc=");
+ urlescputs(reply_all);
+ 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> ",
msgnum, _("Move"));
);
}
- wprintf("<a href=\"/msg?msgnum=%ld?sourceiframe=msgloader1?print_it=yes\" target=\"msgloader1\">"
- "[%s]</a>", msgnum, _("Print"));
+ 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'); \" >"
+ "[%s]</a>", msgnum, msgnum, _("Print"));
wprintf("</td>");
}
/* Set up a character set conversion if we need to (and if we can) */
#ifdef HAVE_ICONV
+ if (strchr(mime_charset, ';')) strcpy(strchr(mime_charset, ';'), "");
if ( (strcasecmp(mime_charset, "us-ascii"))
- && (strcasecmp(mime_charset, "UTF-8")) ) {
+ && (strcasecmp(mime_charset, "UTF-8"))
+ && (strcasecmp(mime_charset, ""))
+ ) {
ic = iconv_open("UTF-8", mime_charset);
if (ic == (iconv_t)(-1) ) {
- lprintf(5, "iconv_open() failed: %s\n", strerror(errno));
+ lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
+ __FILE__, __LINE__, mime_charset, strerror(errno));
}
}
#endif
/* Messages in legacy Citadel variformat get handled thusly... */
if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
- fmout(NULL, "JUSTIFY");
+ fmout("JUSTIFY");
}
/* Boring old 80-column fixed format text gets handled this way... */
- else if (!strcasecmp(mime_content_type, "text/plain")) {
+ else if ( (!strcasecmp(mime_content_type, "text/plain"))
+ || (!strcasecmp(mime_content_type, "text")) ) {
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0;
if (buf[strlen(buf)-1] == '\r') buf[strlen(buf)-1] = 0;
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);
}
wprintf("</TD></TR></TABLE>\n");
/* end everythingamundo table */
- wprintf("</TD></TR></TABLE>\n");
- wprintf("</div><br />\n");
+ if (!printable_view) {
+ wprintf("</TD></TR></TABLE>\n");
+ wprintf("</div><br />\n");
+ }
#ifdef HAVE_ICONV
if (ic != (iconv_t)(-1) ) {
*/
void embed_message(void) {
long msgnum = 0L;
- char *sourceiframe;
- char *targetdiv;
- char *print_it;
msgnum = atol(bstr("msgnum"));
- sourceiframe = bstr("sourceiframe");
- targetdiv = bstr("targetdiv");
- print_it = bstr("print_it");
+ begin_ajax_response();
+ read_message(msgnum, 0, "");
+ end_ajax_response();
+}
- output_headers(1, 0, 0, 0, 0, 1, 0);
+
+/*
+ * Printable view of a message
+ */
+void print_message(void) {
+ long msgnum = 0L;
+
+ msgnum = atol(bstr("msgnum"));
+ 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("<html><head>");
+ 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, "");
+
+ wprintf("\n</body></html>\n\n");
+ wDumpContent(0);
+}
+
+
- /* If we're loading into a hidden iframe, chances are the caller told us
- * about a target div somewhere that we need to copy into when we're done.
+/*
+ * Read message in simple, JavaScript-embeddable form for 'forward'
+ * or 'reply quoted' operations.
+ *
+ * NOTE: it is VITALLY IMPORTANT that we output no single-quotes or linebreaks
+ * in this function. Doing so would throw a JavaScript error in the
+ * 'supplied text' argument to the editor.
+ */
+void pullquote_message(long msgnum, int forward_attachments) {
+ char buf[SIZ];
+ char mime_partnum[256];
+ char mime_filename[256];
+ char mime_content_type[256];
+ char mime_charset[256];
+ char mime_disposition[256];
+ int mime_length;
+ char mime_http[SIZ];
+ char *attachments = NULL;
+ int num_attachments = 0;
+ struct wc_attachment *att, *aptr;
+ char m_subject[256];
+ char from[256];
+ char node[256];
+ char rfca[256];
+ char reply_to[512];
+ char now[256];
+ int format_type = 0;
+ int nhdr = 0;
+ int bq = 0;
+ int i = 0;
+#ifdef HAVE_ICONV
+ iconv_t ic = (iconv_t)(-1) ;
+ char *ibuf; /* Buffer of characters to be converted */
+ char *obuf; /* Buffer for converted characters */
+ size_t ibuflen; /* Length of input buffer */
+ size_t obuflen; /* Length of output buffer */
+ char *osav; /* Saved pointer to output buffer */
+#endif
+
+ strcpy(from, "");
+ strcpy(node, "");
+ strcpy(rfca, "");
+ strcpy(reply_to, "");
+ strcpy(mime_http, "");
+ strcpy(mime_content_type, "text/plain");
+ strcpy(mime_charset, "us-ascii");
+
+ serv_printf("MSG4 %ld", msgnum);
+ serv_getln(buf, sizeof buf);
+ if (buf[0] != '1') {
+ wprintf(_("ERROR:"));
+ wprintf("%s<br />", &buf[4]);
+ return;
+ }
+
+ strcpy(m_subject, "");
+
+ while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
+ if (!strcmp(buf, "000")) {
+ wprintf(_("unexpected end of message"));
+ return;
+ }
+ if (!strncasecmp(buf, "nhdr=yes", 8))
+ nhdr = 1;
+ if (nhdr == 1)
+ buf[0] = '_';
+ if (!strncasecmp(buf, "type=", 5))
+ format_type = atoi(&buf[5]);
+ if (!strncasecmp(buf, "from=", 5)) {
+ strcpy(from, &buf[5]);
+ wprintf(_("from "));
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(from);
+#endif
+ msgescputs(from);
+ }
+ if (!strncasecmp(buf, "subj=", 5)) {
+ strcpy(m_subject, &buf[5]);
+ }
+ if ((!strncasecmp(buf, "hnod=", 5))
+ && (strcasecmp(&buf[5], serv_info.serv_humannode))) {
+ wprintf("(%s) ", &buf[5]);
+ }
+ if ((!strncasecmp(buf, "room=", 5))
+ && (strcasecmp(&buf[5], WC->wc_roomname))
+ && (strlen(&buf[5])>0) ) {
+ wprintf(_("in "));
+ wprintf("%s> ", &buf[5]);
+ }
+ if (!strncasecmp(buf, "rfca=", 5)) {
+ strcpy(rfca, &buf[5]);
+ wprintf("<");
+ msgescputs(rfca);
+ wprintf("> ");
+ }
+
+ if (!strncasecmp(buf, "node=", 5)) {
+ strcpy(node, &buf[5]);
+ if ( ((WC->room_flags & QR_NETWORK)
+ || ((strcasecmp(&buf[5], serv_info.serv_nodename)
+ && (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
+ && (strlen(rfca)==0)
+ ) {
+ wprintf("@%s ", &buf[5]);
+ }
+ }
+ if (!strncasecmp(buf, "rcpt=", 5)) {
+ wprintf(_("to "));
+ wprintf("%s ", &buf[5]);
+ }
+ if (!strncasecmp(buf, "time=", 5)) {
+ fmt_date(now, atol(&buf[5]), 0);
+ wprintf("%s ", now);
+ }
+
+ /*
+ * Save attachment info for later. We can't start downloading them
+ * yet because we're in the middle of a server transaction.
+ */
+ if (!strncasecmp(buf, "part=", 5)) {
+ ++num_attachments;
+ attachments = realloc(attachments, (num_attachments * 1024));
+ strcat(attachments, &buf[5]);
+ strcat(attachments, "\n");
+ }
+
+ }
+
+ wprintf("<br>");
+
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(m_subject);
+#endif
+ if (strlen(m_subject) > 0) {
+ wprintf(_("Subject:"));
+ wprintf(" ");
+ msgescputs(m_subject);
+ wprintf("<br />");
+ }
+
+ /*
+ * Begin body
*/
- if (strlen(targetdiv) > 0) wprintf(
-" \n"
-" <script type=\"text/javascript\"> \n"
-" function loaded_now_copy_it() { \n"
-" parent.document.getElementById(\"%s\").innerHTML = parent.frames['%s'].document.body.innerHTML; \n"
-" } \n"
-"</script>\n",
- targetdiv,
- sourceiframe
- );
+ wprintf("<br>");
- if (!strcasecmp(print_it, "yes")) wprintf(
-" \n"
-" <script type=\"text/javascript\"> \n"
-" function loaded_now_print_it() { \n"
-" parent.frames['%s'].focus(); \n"
-" parent.frames['%s'].print(); \n"
-" } \n"
-"</script>\n",
- sourceiframe,
- sourceiframe
- );
+ /*
+ * Learn the content type
+ */
+ strcpy(mime_content_type, "text/plain");
+ while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) {
+ if (!strcmp(buf, "000")) {
+ wprintf(_("unexpected end of message"));
+ goto ENDBODY;
+ }
+ if (!strncasecmp(buf, "Content-type: ", 14)) {
+ safestrncpy(mime_content_type, &buf[14],
+ sizeof(mime_content_type));
+ for (i=0; i<strlen(mime_content_type); ++i) {
+ if (!strncasecmp(&mime_content_type[i], "charset=", 8)) {
+ safestrncpy(mime_charset, &mime_content_type[i+8],
+ sizeof mime_charset);
+ }
+ }
+ for (i=0; i<strlen(mime_content_type); ++i) {
+ if (mime_content_type[i] == ';') {
+ mime_content_type[i] = 0;
+ }
+ }
+ }
+ }
- wprintf("</head>");
- wprintf("<body");
- if (strlen(targetdiv) > 0) {
- wprintf(" onLoad='loaded_now_copy_it();'");
+ /* 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);
+ if (ic == (iconv_t)(-1) ) {
+ lprintf(5, "%s:%d iconv_open() failed: %s\n",
+ __FILE__, __LINE__, strerror(errno));
+ }
}
- if (!strcasecmp(print_it, "yes")) {
- wprintf(" onLoad='loaded_now_print_it();'");
+#endif
+
+ /* Messages in legacy Citadel variformat get handled thusly... */
+ if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
+ pullquote_fmout();
}
- wprintf(">\n");
- read_message(msgnum, (!strcasecmp(print_it, "yes") ? 1 : 0) );
- wprintf("</body></html>\n");
- wDumpContent(0);
+
+ /* Boring old 80-column fixed format text gets handled this way... */
+ else if (!strcasecmp(mime_content_type, "text/plain")) {
+ 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;
+
+#ifdef HAVE_ICONV
+ if (ic != (iconv_t)(-1) ) {
+ ibuf = buf;
+ ibuflen = strlen(ibuf);
+ obuflen = SIZ;
+ obuf = (char *) malloc(obuflen);
+ osav = obuf;
+ iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
+ osav[SIZ-obuflen] = 0;
+ safestrncpy(buf, osav, sizeof buf);
+ free(osav);
+ }
+#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>");
+ bq = 1;
+ } else if ((bq == 1) &&
+ (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
+ wprintf("</BLOCKQUOTE>");
+ bq = 0;
+ }
+ wprintf("<TT>");
+ url(buf);
+ msgescputs(buf);
+ wprintf("</TT><br />");
+ }
+ wprintf("</I><br />");
+ }
+
+ /* HTML just gets escaped and stuffed back into the editor */
+ else if (!strcasecmp(mime_content_type, "text/html")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ msgescputs(buf);
+ }
+ }
+
+ /* Unknown weirdness ... don't know how to handle this content type */
+ else {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
+ }
+
+ENDBODY:
+ /* end of body handler */
+
+ /*
+ * If there were attachments, we have to download them and insert them
+ * into the attachment chain for the forwarded message we are composing.
+ */
+ if ( (forward_attachments) && (num_attachments) ) {
+ for (i=0; 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);
+
+ /*
+ * 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")) ) {
+
+ /* Create an attachment struct from this mime part... */
+ att = malloc(sizeof(struct wc_attachment));
+ memset(att, 0, sizeof(struct wc_attachment));
+ att->length = mime_length;
+ strcpy(att->content_type, mime_content_type);
+ strcpy(att->filename, mime_filename);
+ att->next = NULL;
+ att->data = load_mimepart(msgnum, mime_partnum);
+
+ /* And add it to the list. */
+ if (WC->first_attachment == NULL) {
+ WC->first_attachment = att;
+ }
+ else {
+ aptr = WC->first_attachment;
+ while (aptr->next != NULL) aptr = aptr->next;
+ aptr->next = att;
+ }
+ }
+
+ }
+ free(attachments);
+ }
+
+#ifdef HAVE_ICONV
+ if (ic != (iconv_t)(-1) ) {
+ iconv_close(ic);
+ }
+#endif
}
+
+
void display_summarized(int num) {
char datebuf[64];
+ wprintf("<tr bgcolor=\"#%s\" ",
+ ((num % 2) ? "DDDDDD" : "FFFFFF")
+ );
+
+ wprintf("onClick=\" new Ajax.Updater('preview_pane', '/msg', { method: 'get', parameters: 'msgnum=%ld' } ); \" ", WC->summ[num].msgnum);
+ wprintf(">");
+
wprintf("<TD>");
if (WC->summ[num].is_new) wprintf("<B>");
- wprintf("<A HREF=\"/msg?msgnum=%ld?sourceiframe=msgloader1?targetdiv=preview_pane\" target=\"msgloader1\">",
- WC->summ[num].msgnum);
escputs(WC->summ[num].subj);
- wprintf("</A>");
if (WC->summ[num].is_new) wprintf("</B>");
wprintf("</TD><TD>");
if (WC->summ[num].is_new) wprintf("<B>");
wprintf(" </TD>");
wprintf("<TD>"
"<INPUT TYPE=\"checkbox\" NAME=\"msg_%ld\" VALUE=\"yes\">"
- "</TD>\n",
+ "</TD>",
WC->summ[num].msgnum
);
+
+ wprintf("</tr>\n");
}
char tablast_label[SIZ];
if (num_ab == 0) {
- wprintf("<I>");
+ wprintf("<br /><br /><br /><div align=\"center\"><i>");
wprintf(_("This address book is empty."));
- wprintf("</I>\n");
+ wprintf("</i></div>\n");
return;
}
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;
set_preference(sortpref_name, sortby, 1);
}
if (strlen(sortby) == 0) sortby = sortpref_value;
- if (strlen(sortby) == 0) sortby = "msgid";
+ if (strlen(sortby) == 0) sortby = "rdate";
- output_headers(1, 1, 1, 0, 0, 0, 0);
+ output_headers(1, 1, 1, 0, 0, 0);
/* When in summary mode, always show ALL messages instead of just
* new or old. Otherwise, show what the user asked for.
nummsgs = load_msg_ptrs(cmd, is_summary);
if (nummsgs == 0) {
- if ((!is_tasks) && (!is_calendar) && (!is_notes)) {
+ if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
wprintf("<em>");
if (!strcmp(oper, "readnew")) {
wprintf(_("No new messages."));
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) {
"<form name=\"msgomatic\" "
"method=\"POST\" action=\"/do_stuff_to_msgs\">\n"
+ "<span class=\"mailbox_summary\">"
"<table border=0 cellspacing=0 "
"cellpadding=0 width=100%%>\n"
"<TR>"
if (a > 0) pn_previous = WC->msgarr[a-1];
if (a < (nummsgs-1)) pn_next = WC->msgarr[a+1];
- /* If a tabular view, set up the line */
- if (is_summary) {
- bg = 1 - bg;
- wprintf("<TR BGCOLOR=\"#%s\">",
- (bg ? "DDDDDD" : "FFFFFF")
- );
- }
-
/* Display the message */
if (is_summary) {
display_summarized(a);
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");
+ read_message(WC->msgarr[a], 0, "");
}
if (lowest_displayed < 0) lowest_displayed = a;
}
if (is_summary) {
- wprintf("</table></form>"
+ wprintf("</table></span></form>"
"</div>\n"); /* end of 'fix_scrollbar_bug' div */
wprintf("</div>"); /* end of 'message_list' div */
+ wprintf("<div id=\"ml_slider\"></div>"); /* slider */
+
wprintf("<div id=\"preview_pane\">"); /* The preview pane will initially be empty */
+
+ /* Now register each message (whose element ID is "m9999",
+ * where "9999" is the message number) as draggable.
+ wprintf("<script type=\"text/javascript\">\n");
+ for (a = 0; a < nummsgs; ++a) {
+ wprintf("new Draggable('m%ld',{revert:true});\n",
+ WC->summ[a].msgnum);
+ }
+ wprintf("</script>\n");
+ */
}
/* Bump these because although we're thinking in zero base, the user
aptr->next = att;
}
- /* Netscape sends a simple filename, which is what we want,
- * but Satan's browser sends an entire pathname. Reduce
+ /* Mozilla sends a simple filename, which is what we want,
+ * but Satan's Browser sends an entire pathname. Reduce
* the path to just a filename if we need to.
*/
while (num_tokens(att->filename, '/') > 1) {
_("Automatically cancelled because you have already "
"saved this message."));
} else {
- sprintf(buf, "ENT0 1|%s|0|4|%s",
+ sprintf(buf, "ENT0 1|%s|0|4|%s|||%s|%s",
bstr("recp"),
- bstr("subject") );
+ bstr("subject"),
+ bstr("cc"),
+ bstr("bcc")
+ );
serv_puts(buf);
serv_getln(buf, sizeof buf);
if (buf[0] == '4') {
post_mime_to_server();
- if (strlen(bstr("recp")) > 0) {
+ if ( (strlen(bstr("recp")) > 0)
+ || (strlen(bstr("cc")) > 0)
+ || (strlen(bstr("bcc")) > 0)
+ ) {
sprintf(WC->ImportantMessage, _("Message has been sent.\n"));
}
else {
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;
if (strlen(bstr("force_room")) > 0) {
gotoroom(bstr("force_room"));
/*
* Otherwise proceed normally.
-` * Do a custom room banner with no navbar...
+ * Do a custom room banner with no navbar...
*/
- output_headers(1, 1, 2, 0, 0, 0, 0);
+ output_headers(1, 1, 2, 0, 0, 0);
wprintf("<div id=\"banner\">\n");
embed_room_banner(NULL, navbar_none);
wprintf("</div>\n");
"<div id=\"fix_scrollbar_bug\">"
"<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
- sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
- serv_puts(buf);
+ /* First test to see whether this is a room that requires recipients to be entered */
+ serv_puts("ENT0 0");
serv_getln(buf, sizeof buf);
-
- if (!strncmp(buf, "570", 3)) {
+ if (!strncmp(buf, "570", 3)) { /* 570 means that we need a recipient here */
recipient_required = 1;
- if (strlen(bstr("recp")) > 0) {
- recipient_bad = 1;
- }
}
- else if (buf[0] != '2') {
+ else if (buf[0] != '2') { /* Any other error means that we cannot continue */
wprintf("<EM>%s</EM><br />\n", &buf[4]);
goto DONE;
}
+ /* 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"));
+ serv_puts(buf);
+ serv_getln(buf, sizeof buf);
+
+ if (!strncmp(buf, "570", 3)) { /* 570 means we have an invalid recipient listed */
+ if (strlen(bstr("recp")) + strlen(bstr("cc")) + strlen(bstr("bcc")) > 0) {
+ recipient_bad = 1;
+ }
+ }
+ else if (buf[0] != '2') { /* Any other error means that we cannot continue */
+ wprintf("<EM>%s</EM><br />\n", &buf[4]);
+ goto DONE;
+ }
+ }
+
+ /* If we got this far, we can display the message entry screen. */
+
now = time(NULL);
fmt_date(buf, now, 0);
strcat(&buf[strlen(buf)], _(" <I>from</I> "));
stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
+
+ /* Don't need this anymore, it's in the input box below
if (strlen(bstr("recp")) > 0) {
strcat(&buf[strlen(buf)], _(" <I>to</I> "));
stresc(&buf[strlen(buf)], bstr("recp"), 1, 1);
}
+ */
+
strcat(&buf[strlen(buf)], _(" <I>in</I> "));
stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
/* begin message entry screen */
-
-
- wprintf(
- "<style> div.auto_complete { width: 350px; background: #fff; } div.auto_complete ul { border:1px solid #888; margin:0; padding:0; width:100%; list-style-type:none; } div.auto_complete ul li { margin:0; padding:3px; } div.auto_complete ul li.selected { background-color: #ffc; } div.auto_complete ul strong.highlight { color: #800; margin:0; padding:0; } </style> \n "
- );
-
wprintf("<form enctype=\"multipart/form-data\" "
"method=\"POST\" action=\"/post\" "
"name=\"enterform\""
- "onSubmit=\"return submitForm();\""
">\n");
- wprintf("<input type=\"hidden\" name=\"recp\" value=\"%s\">\n",
- bstr("recp"));
- wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n",
- now);
+ 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("<table border=\"0\" width=\"100%%\">\n");
if (recipient_required) {
+
wprintf("<tr><td>");
wprintf("<font size=-1>");
wprintf(_("To:"));
wprintf("</font>");
wprintf("</td><td>"
- "<input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_name\" value=\"");
+ "<input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
escputs(bstr("recp"));
- wprintf("\" size=50 maxlength=70>");
-
+ wprintf("\" size=50 maxlength=1000 />");
wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
-
- wprintf("<script type=\"text/javascript\"> "
- " new Ajax.Autocompleter('recp_name', 'recp_name_choices', "
- " '/recp_autocomplete', {} ); "
- "</script>\n "
- );
+ wprintf("</td><td></td></tr>\n");
+ wprintf("<tr><td>");
+ wprintf("<font size=-1>");
+ wprintf(_("CC:"));
+ wprintf("</font>");
+ wprintf("</td><td>"
+ "<input autocomplete=\"off\" type=\"text\" name=\"cc\" id=\"cc_id\" value=\"");
+ escputs(bstr("cc"));
+ wprintf("\" size=50 maxlength=1000 />");
+ wprintf("<div class=\"auto_complete\" id=\"cc_name_choices\"></div>");
+ wprintf("</td><td></td></tr>\n");
+
+ wprintf("<tr><td>");
+ wprintf("<font size=-1>");
+ wprintf(_("BCC:"));
+ wprintf("</font>");
+ wprintf("</td><td>"
+ "<input autocomplete=\"off\" type=\"text\" name=\"bcc\" id=\"bcc_id\" value=\"");
+ escputs(bstr("bcc"));
+ wprintf("\" size=50 maxlength=1000 />");
+ 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) */
+ wprintf("<script type=\"text/javascript\"> \n"
+ " activate_entmsg_autocompleters(); \n"
+ "</script> \n"
+ );
}
wprintf("<tr><td>");
"<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) {
- wprintf("FIXME pullquote=%s", bstr("pullquote"));
+
+ /* 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("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>");
+ }
+
+ /* 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\" "
+ "});"
+ "</script>\n"
+ );
/* Enumerate any attachments which are already in place... */
wprintf("<img src=\"/static/diskette_24x.gif\" border=0 "
"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... */
+ wprintf("<input type=\"submit\" name=\"send_button\" value=\"");
+ if (recipient_required) {
+ wprintf(_("Send message"));
+ } else {
+ wprintf(_("Post message"));
+ }
+ 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");
msgid = atol(bstr("msgid"));
- output_headers(1, 1, 1, 0, 0, 0, 0);
+ output_headers(1, 1, 1, 0, 0, 0);
- sprintf(buf, "DELE %ld", msgid);
- serv_puts(buf);
+ 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, 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("<br />\n");
wprintf("<form METHOD=\"POST\" ACTION=\"/move_msg\">\n");
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
- bstr("msgid"));
-
+ 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, 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);
+ readloop("readnew");
+
}
/*
if (!strcasecmp(bstr(buf), "yes")) {
if (delete_button_pressed) {
- serv_printf("DELE %ld", stuff->msgnum);
+ serv_printf("MOVE %ld|_TRASH_|0", stuff->msgnum);
serv_getln(buf, sizeof buf);
}