*
*/
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
#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
};
+
+#ifdef HAVE_ICONV
+/* Handle subjects with RFC2047 encoding, such as:
+ * =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?=
+ */
+void utf8ify_rfc822_string(char *buf) {
+ char *start, *end;
+ char newbuf[1024];
+ char charset[128];
+ 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 */
+ int passes = 0;
+
+ while (start=strstr(buf, "=?"), end=strstr(buf, "?="),
+ ((start != NULL) && (end != NULL) && (end > start)) )
+ {
+ extract_token(charset, start, 1, '?', sizeof charset);
+ 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 */
+ ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr));
+ }
+ else if (!strcasecmp(encoding, "Q")) { /* quoted-printable */
+ ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, strlen(istr));
+ }
+ else {
+ strcpy(ibuf, istr); /* huh? */
+ ibuflen = strlen(istr);
+ }
+
+ ic = iconv_open("UTF-8", charset);
+ if (ic != (iconv_t)(-1) ) {
+ obuf = malloc(1024);
+ obuflen = 1024;
+ obuf = (char *) malloc(obuflen);
+ osav = obuf;
+ iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
+ osav[1024-obuflen] = 0;
+
+ end = start;
+ end++;
+ strcpy(start, "");
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ strcpy(end, &end[1]);
+
+ snprintf(newbuf, sizeof newbuf, "%s%s%s", buf, osav, end);
+ strcpy(buf, newbuf);
+ free(osav);
+ iconv_close(ic);
+ }
+ else {
+ end = start;
+ end++;
+ strcpy(start, "");
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ remove_token(end, 0, '?');
+ strcpy(end, &end[1]);
+
+ snprintf(newbuf, sizeof newbuf, "%s(unreadable)%s", buf, end);
+ strcpy(buf, newbuf);
+ }
+
+ free(isav);
+
+ /* Since spammers will go to all sorts of absurd lengths to get their
+ * messages through, there are LOTS of corrupt headers out there.
+ * So, prevent a really badly formed RFC2047 header from throwing
+ * this function into an infinite loop.
+ */
+ ++passes;
+ if (passes > 20) return;
+ }
+
+}
+#endif
+
+
/*
* 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.
}
+/*
+ * Turn a vCard "n" (name) field into something displayable.
+ */
+void vcard_n_prettyize(char *name)
+{
+ char *original_name;
+ int i;
+
+ original_name = strdup(name);
+ for (i=0; i<5; ++i) {
+ if (strlen(original_name) > 0) {
+ if (original_name[strlen(original_name)-1] == ' ') {
+ original_name[strlen(original_name)-1] = 0;
+ }
+ if (original_name[strlen(original_name)-1] == ';') {
+ original_name[strlen(original_name)-1] = 0;
+ }
+ }
+ }
+ strcpy(name, "");
+ for (i=0; i<strlen(original_name); ++i) {
+ if (original_name[i] == ';') {
+ strcat(name, ", ");
+ }
+ else {
+ name[strlen(name)+1] = 0;
+ name[strlen(name)] = original_name[i];
+ }
+ }
+ free(original_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.
*/
void fetchname_parsed_vcard(struct vCard *v, char *storename) {
- int i;
+ char *name;
strcpy(storename, "");
- if (v->numprops) for (i=0; i<(v->numprops); ++i) {
- if (!strcasecmp(v->prop[i].name, "n")) {
- strcpy(storename, v->prop[i].value);
- if ((strlen(storename)>0) && (storename[0] != ';')) {
- while(storename[strlen(storename)-1] == ';') {
- storename[strlen(storename)-1] = 0;
- }
- }
- }
+
+ name = vcard_get_prop(v, "n", 1, 0, 0);
+ if (name != NULL) {
+ strcpy(storename, name);
+ /* vcard_n_prettyize(storename); */
}
+
}
int pass;
char displayname[SIZ];
+ char title[SIZ];
+ char org[SIZ];
char phone[SIZ];
char mailto[SIZ];
strcpy(displayname, "");
strcpy(phone, "");
strcpy(mailto, "");
+ strcpy(title, "");
+ strcpy(org, "");
if (!full) {
wprintf("<TD>");
escputs(name);
}
else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
- escputs(name);
+ strcpy(displayname, name);
+ vcard_n_prettyize(displayname);
+ escputs(displayname);
}
else {
wprintf(" ");
return;
}
- wprintf("<TABLE bgcolor=#888888>");
+ wprintf("<div align=center><table bgcolor=#aaaaaa width=50%%>");
for (pass=1; pass<=2; ++pass) {
if (v->numprops) for (i=0; i<(v->numprops); ++i) {
thisname = strdup(v->prop[i].name);
- extract_token(firsttoken, thisname, 0, ';');
+ extract_token(firsttoken, thisname, 0, ';', sizeof firsttoken);
for (j=0; j<num_tokens(thisname, ';'); ++j) {
- extract_token(buf, thisname, j, ';');
+ extract_token(buf, thisname, j, ';', sizeof buf);
if (!strcasecmp(buf, "encoding=quoted-printable")) {
is_qp = 1;
remove_token(thisname, j, ';');
if (!strcasecmp(firsttoken, "n")) {
if (strlen(displayname) == 0) {
strcpy(displayname, thisvalue);
+ vcard_n_prettyize(displayname);
}
}
else if (!strcasecmp(firsttoken, "fn")) {
strcpy(displayname, thisvalue);
}
+
+ /* title */
+ else if (!strcasecmp(firsttoken, "title")) {
+ strcpy(title, thisvalue);
+ }
+
+ /* organization */
+ else if (!strcasecmp(firsttoken, "org")) {
+ strcpy(org, thisvalue);
+ }
else if (!strcasecmp(firsttoken, "email")) {
if (strlen(mailto) > 0) strcat(mailto, "<br />");
strcat(mailto,
"<A HREF=\"/display_enter"
- "?force_room=_MAIL_&recp=");
+ "?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")) {
if (strlen(phone) > 0) strcat(phone, "<br />");
strcat(phone, thisvalue);
for (j=0; j<num_tokens(thisname, ';'); ++j) {
- extract_token(buf, thisname, j, ';');
+ extract_token(buf, thisname, j, ';', sizeof buf);
if (!strcasecmp(buf, "tel"))
strcat(phone, "");
else if (!strcasecmp(buf, "work"))
- strcat(phone, " (work)");
+ strcat(phone, _(" (work)"));
else if (!strcasecmp(buf, "home"))
- strcat(phone, " (home)");
+ strcat(phone, _(" (home)"));
else if (!strcasecmp(buf, "cell"))
- strcat(phone, " (cell)");
+ strcat(phone, _(" (cell)"));
else {
strcat(phone, " (");
strcat(phone, buf);
}
else if (!strcasecmp(firsttoken, "adr")) {
if (pass == 2) {
- wprintf("<TR><TD>Address:</TD><TD>");
+ wprintf("<TR><TD>");
+ wprintf(_("Address:"));
+ wprintf("</TD><TD>");
for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
- extract_token(buf, thisvalue, j, ';');
+ extract_token(buf, thisvalue, j, ';', sizeof buf);
if (strlen(buf) > 0) {
escputs(buf);
- wprintf("<br />");
+ if (j<3) wprintf("<br />");
+ else wprintf(" ");
}
}
wprintf("</TD></TR>\n");
/* ignore */
}
else {
+
+ /*** Don't show extra fields. They're ugly.
if (pass == 2) {
wprintf("<TR><TD>");
escputs(thisname);
escputs(thisvalue);
wprintf("</TD></TR>\n");
}
+ ***/
}
free(thisname);
if (pass == 1) {
wprintf("<TR BGCOLOR=\"#AAAAAA\">"
"<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
- "<IMG ALIGN=CENTER SRC=\"/static/vcard.gif\">"
+ "<IMG ALIGN=CENTER SRC=\"/static/viewcontacts_48x.gif\">"
"<FONT SIZE=+1><B>");
escputs(displayname);
- wprintf("</B></FONT></TD></TR>\n");
+ wprintf("</B></FONT>");
+ if (strlen(title) > 0) {
+ wprintf("<div align=right>");
+ escputs(title);
+ wprintf("</div>");
+ }
+ if (strlen(org) > 0) {
+ wprintf("<div align=right>");
+ escputs(org);
+ wprintf("</div>");
+ }
+ wprintf("</TD></TR>\n");
- if (strlen(phone) > 0)
- wprintf("<TR><TD>Telephone:</TD><TD>%s</TD></TR>\n", phone);
- if (strlen(mailto) > 0)
- wprintf("<TR><TD>E-mail:</TD><TD>%s</TD></TR>\n", mailto);
+ 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(_("E-mail:"));
+ wprintf("</td><td>%s</td></tr>\n", mailto);
+ }
}
}
- wprintf("</TABLE>\n");
+ wprintf("</table></div>\n");
}
if (storename != NULL) {
fetchname_parsed_vcard(v, storename);
}
- else if ( (alpha == 0)
- || ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)) )
- || ((!isalpha(alpha)) && (!isalpha(this_alpha))) ) {
+ else if ( (alpha == 0)
+ || ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)) )
+ || ((!isalpha(alpha)) && (!isalpha(this_alpha)))
+ ) {
display_parsed_vcard(v, full);
}
}
-
-
/*
- * I wanna SEE that message!
+ * I wanna SEE that message! (Optional 'section' for encapsulated message/rfc822 submessage)
*/
-void read_message(long msgnum) {
+void read_message(long msgnum, int printable_view, char *section) {
char buf[SIZ];
- char mime_partnum[SIZ];
- char mime_filename[SIZ];
- char mime_content_type[SIZ];
- char mime_disposition[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 m_subject[SIZ];
- char from[SIZ];
- char node[SIZ];
- char rfca[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[SIZ];
+ char reply_all[4096];
+ char now[64];
int format_type = 0;
int nhdr = 0;
int bq = 0;
- char vcard_partnum[SIZ];
- char cal_partnum[SIZ];
+ int i = 0;
+ char vcard_partnum[256];
+ char cal_partnum[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 */
+#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_gets(buf);
+ serv_printf("MSG4 %ld|%s", msgnum, section);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
- wprintf("<STRONG>ERROR:</STRONG> %s<br />\n", &buf[4]);
+ wprintf("<STRONG>");
+ wprintf(_("ERROR:"));
+ wprintf("</STRONG> %s<br />\n", &buf[4]);
return;
}
/* begin everythingamundo table */
- wprintf("<center><table width=99%% 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_gets(buf), strcasecmp(buf, "text")) {
+ while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
if (!strcmp(buf, "000")) {
- wprintf("<I>unexpected end of message</I><br /><br />\n");
+ wprintf("<I>");
+ wprintf(_("unexpected end of message"));
+ wprintf("</I><br /><br />\n");
wprintf("</SPAN>\n");
return;
}
format_type = atoi(&buf[5]);
if (!strncasecmp(buf, "from=", 5)) {
strcpy(from, &buf[5]);
- wprintf("from <A HREF=\"/showuser&who=");
+ wprintf(_("from "));
+ wprintf("<A HREF=\"/showuser?who=");
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(from);
+#endif
urlescputs(from);
wprintf("\">");
escputs(from);
wprintf("</A> ");
}
- if (!strncasecmp(buf, "subj=", 5))
- strcpy(m_subject, &buf[5]);
+ if (!strncasecmp(buf, "subj=", 5)) {
+ safestrncpy(m_subject, &buf[5], sizeof m_subject);
+ }
+ if (!strncasecmp(buf, "cccc=", 5)) {
+ safestrncpy(m_cc, &buf[5], sizeof m_cc);
+ if (strlen(reply_all) > 0) {
+ strcat(reply_all, ", ");
+ }
+ safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
+ (sizeof reply_all - strlen(reply_all)) );
+ lprintf(9, "REPLY_ALL: %s\n", reply_all); // FIXME
+ }
if ((!strncasecmp(buf, "hnod=", 5))
- && (strcasecmp(&buf[5], serv_info.serv_humannode)))
+ && (strcasecmp(&buf[5], serv_info.serv_humannode))) {
wprintf("(%s) ", &buf[5]);
+ }
if ((!strncasecmp(buf, "room=", 5))
&& (strcasecmp(&buf[5], WC->wc_roomname))
- && (strlen(&buf[5])>0) )
- wprintf("in %s> ", &buf[5]);
+ && (strlen(&buf[5])>0) ) {
+ wprintf(_("in "));
+ wprintf("%s> ", &buf[5]);
+ }
if (!strncasecmp(buf, "rfca=", 5)) {
strcpy(rfca, &buf[5]);
wprintf("<");
wprintf("@%s ", &buf[5]);
}
}
- if (!strncasecmp(buf, "rcpt=", 5))
- wprintf("to %s ", &buf[5]);
+ if (!strncasecmp(buf, "rcpt=", 5)) {
+ wprintf(_("to "));
+ escputs(&buf[5]);
+ wprintf(" ");
+ if (strlen(reply_all) > 0) {
+ strcat(reply_all, ", ");
+ }
+ safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
+ (sizeof reply_all - strlen(reply_all)) );
+ }
if (!strncasecmp(buf, "time=", 5)) {
- fmt_date(now, atol(&buf[5]));
+ fmt_date(now, atol(&buf[5]), 0);
wprintf("%s ", now);
}
if (!strncasecmp(buf, "part=", 5)) {
- extract(mime_filename, &buf[5], 1);
- extract(mime_partnum, &buf[5], 2);
- extract(mime_disposition, &buf[5], 3);
- extract(mime_content_type, &buf[5], 4);
+ extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
+ extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
+ extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
+ 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),
- "<A HREF=\"/output_mimepart?"
- "msgnum=%ld&partnum=%s\" "
- "TARGET=\"wc.%ld.%s\">"
- "<IMG SRC=\"/static/attachment.gif\" "
- "BORDER=0 ALIGN=MIDDLE>\n"
- "Part %s: %s (%s, %d bytes)</A><br />\n",
- msgnum, mime_partnum,
- msgnum, mime_partnum,
- mime_partnum, mime_filename,
- mime_content_type, mime_length);
+ "<IMG SRC=\"/mimepart/%ld/%s/%s\">",
+ msgnum, mime_partnum, mime_filename);
}
-
- if ((!strcasecmp(mime_disposition, "inline"))
- && (!strncasecmp(mime_content_type, "image/", 6)) ){
+ else if ( (!strcasecmp(mime_disposition, "attachment"))
+ || (!strcasecmp(mime_disposition, "inline")) ) {
snprintf(&mime_http[strlen(mime_http)],
(sizeof(mime_http) - strlen(mime_http) - 1),
- "<IMG SRC=\"/output_mimepart?"
- "msgnum=%ld&partnum=%s\">",
- msgnum, mime_partnum);
+ "<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_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\">"
- "Subject: %s"
- "</SPAN>", m_subject
- );
+ "<SPAN CLASS=\"message_subject\">");
+ wprintf(_("Subject:"));
+ wprintf(" ");
+ escputs(m_subject);
+ wprintf("</SPAN>");
}
wprintf("</TD>\n");
/* start msg buttons */
- wprintf("<TD ALIGN=RIGHT>\n");
- wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_stuff_to_one_msg\">\n");
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%ld\">\n",
- msgnum);
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"recp\" VALUE=\"");
- escputs(reply_to);
- wprintf("\">\n");
-
- if (!strncasecmp(m_subject, "Re:", 2)) {
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"subject\" VALUE=\"");
- escputs(m_subject);
- wprintf("\">\n");
- }
- else if (strlen(m_subject) > 0) {
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"subject\" VALUE=\"Re: ");
- escputs(m_subject);
- wprintf("\">\n");
- }
+ if (!printable_view) {
+ wprintf("<td align=right>\n");
+
+ /* 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);
+ 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"));
+ }
- wprintf("<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\" VALUE=\"Reply\">\n");
+ /* 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");
+ urlescputs(m_subject);
+ 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 ( (WC->is_room_aide) || (WC->is_mailbox) ) {
+ /* Move */
+ wprintf("<a href=\"/confirm_move_msg?msgid=%ld\">[%s]</a> ",
+ msgnum, _("Move"));
+
+ /* Delete */
+ wprintf("<a href=\"/delete_msg?msgid=%ld\" "
+ "onClick=\"return confirm('%s');\">"
+ "[%s]</a> ", msgnum, _("Delete this message?"), _("Delete")
+ );
+ }
- if (WC->is_room_aide) {
- wprintf("<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\"VALUE=\"Move\">\n"
- "<INPUT TYPE=\"submit\" NAME=\"msg_oper\" STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif; font-size: 7pt; background: blue; color: #FFFFFF;\" VALUE=\"Delete\""
- "onClick=\"return confirm('Delete this message?');\">\n");
+ 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>");
}
- wprintf("</FORM>\n"
- "</TD></TR></TABLE>\n");
+ wprintf("</TR></TABLE>\n");
/* Begin body */
wprintf("<TABLE BORDER=0 WIDTH=100%% BGCOLOR=#FFFFFF "
* Learn the content type
*/
strcpy(mime_content_type, "text/plain");
- while (serv_gets(buf), (strlen(buf) > 0)) {
+ while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) {
if (!strcmp(buf, "000")) {
- wprintf("<I>unexpected end of message</I><br /><br />\n");
+ wprintf("<I>");
+ wprintf(_("unexpected end of message"));
+ wprintf("</I><br /><br />\n");
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;
+ }
+ }
}
}
+ /* 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);
+ 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... */
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")) {
- while (serv_gets(buf), strcmp(buf, "000")) {
+ 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;
+
+#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) &&
else /* HTML is fun, but we've got to strip it first */
if (!strcasecmp(mime_content_type, "text/html")) {
- output_html();
+ output_html(mime_charset);
}
/* Unknown weirdness */
else {
- wprintf("I don't know how to display %s<br />\n",
- mime_content_type);
- while (serv_gets(buf), strcmp(buf, "000")) { }
+ 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 ( (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);
}
if (part_source != NULL) {
/* If it's my vCard I can edit it */
- if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
- || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))) {
+ if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
+ || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
+ || (WC->wc_view == VIEW_ADDRESSBOOK)
+ ) {
wprintf("<A HREF=\"/edit_vcard?"
- "msgnum=%ld&partnum=%s\">",
+ "msgnum=%ld?partnum=%s\">",
msgnum, vcard_partnum);
- wprintf("(edit)</A>");
+ wprintf("[%s]</A>", _("edit"));
}
/* In all cases, display the full card */
}
}
- /* Handler for calendar parts */
- if (strlen(cal_partnum) > 0) {
- part_source = load_mimepart(msgnum, cal_partnum);
- if (part_source != NULL) {
- cal_process_attachment(part_source,
- msgnum, cal_partnum);
+ /* Handler for calendar parts */
+ if (strlen(cal_partnum) > 0) {
+ part_source = load_mimepart(msgnum, cal_partnum);
+ if (part_source != NULL) {
+ cal_process_attachment(part_source,
+ msgnum, cal_partnum);
+ }
+ }
+
+ if (part_source) {
+ free(part_source);
+ part_source = NULL;
+ }
+
+ENDBODY:
+ wprintf("</TD></TR></TABLE>\n");
+
+ /* end everythingamundo table */
+ if (!printable_view) {
+ wprintf("</TD></TR></TABLE>\n");
+ wprintf("</div><br />\n");
+ }
+
+#ifdef HAVE_ICONV
+ if (ic != (iconv_t)(-1) ) {
+ iconv_close(ic);
+ }
+#endif
+}
+
+
+
+/*
+ * Unadorned HTML output of an individual message, suitable
+ * for placing in a hidden iframe, for printing, or whatever
+ */
+void embed_message(void) {
+ long msgnum = 0L;
+
+ msgnum = atol(bstr("msgnum"));
+ begin_ajax_response();
+ read_message(msgnum, 0, "");
+ end_ajax_response();
+}
+
+
+/*
+ * 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("\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);
+}
+
+
+
+/*
+ * 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
+ */
+ wprintf("<br>");
+
+ /*
+ * 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;
+ }
+ }
+ }
+ }
+
+ /* 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));
+ }
+ }
+#endif
+
+ /* Messages in legacy Citadel variformat get handled thusly... */
+ if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
+ pullquote_fmout();
+ }
+
+ /* 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);
}
}
- if (part_source) {
- free(part_source);
- part_source = NULL;
+ /* Unknown weirdness ... don't know how to handle this content type */
+ else {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
}
ENDBODY:
- wprintf("</TD></TR></TABLE>\n");
+ /* end of body handler */
- /* end everythingamundo table */
- wprintf("</TD></TR></TABLE></center><br />\n");
-}
+ /*
+ * 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);
+ }
-void summarize_message(long msgnum, int is_new) {
- char buf[SIZ];
+#ifdef HAVE_ICONV
+ if (ic != (iconv_t)(-1) ) {
+ iconv_close(ic);
+ }
+#endif
+}
- struct {
- char date[SIZ];
- char from[SIZ];
- char to[SIZ];
- char subj[SIZ];
- int hasattachments;
- } summ;
- memset(&summ, 0, sizeof(summ));
- strcpy(summ.subj, "(no subject)");
- sprintf(buf, "MSG0 %ld|3", msgnum); /* ask for headers only with no MIME */
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] != '1') return;
- while (serv_gets(buf), strcmp(buf, "000")) {
- if (!strncasecmp(buf, "from=", 5)) {
- strcpy(summ.from, &buf[5]);
- }
- if (!strncasecmp(buf, "subj=", 5)) {
- strcpy(summ.subj, &buf[5]);
- }
- if (!strncasecmp(buf, "rfca=", 5)) {
- strcat(summ.from, " <");
- strcat(summ.from, &buf[5]);
- strcat(summ.from, ">");
- }
- if (!strncasecmp(buf, "node=", 5)) {
- if ( ((WC->room_flags & QR_NETWORK)
- || ((strcasecmp(&buf[5], serv_info.serv_nodename)
- && (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
- ) {
- strcat(summ.from, " @ ");
- strcat(summ.from, &buf[5]);
- }
- }
- if (!strncasecmp(buf, "rcpt=", 5)) {
- strcpy(summ.to, &buf[5]);
- }
+void display_summarized(int num) {
+ char datebuf[64];
- if (!strncasecmp(buf, "time=", 5)) {
- fmt_date(summ.date, atol(&buf[5]));
- }
- }
+ 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 (is_new) wprintf("<B>");
- wprintf("<A HREF=\"/readfwd?startmsg=%ld"
- "&maxmsgs=1&summary=0\">",
- msgnum);
- escputs(summ.subj);
- wprintf("</A>");
- if (is_new) wprintf("</B>");
+ if (WC->summ[num].is_new) wprintf("<B>");
+ escputs(WC->summ[num].subj);
+ if (WC->summ[num].is_new) wprintf("</B>");
wprintf("</TD><TD>");
- if (is_new) wprintf("<B>");
- escputs(summ.from);
- if (is_new) wprintf("</B>");
+ if (WC->summ[num].is_new) wprintf("<B>");
+ escputs(WC->summ[num].from);
+ if (WC->summ[num].is_new) wprintf("</B>");
wprintf(" </TD><TD>");
- if (is_new) wprintf("<B>");
- escputs(summ.date);
- if (is_new) wprintf("</B>");
+ if (WC->summ[num].is_new) wprintf("<B>");
+ 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");
+ "</TD>",
+ WC->summ[num].msgnum
+ );
- return;
+ wprintf("</tr>\n");
}
+
+
void display_addressbook(long msgnum, char alpha) {
char buf[SIZ];
char mime_partnum[SIZ];
int mime_length;
char vcard_partnum[SIZ];
char *vcard_source = NULL;
-
- struct {
- char date[SIZ];
- char from[SIZ];
- char to[SIZ];
- char subj[SIZ];
- int hasattachments;
- } summ;
+ struct message_summary summ;
memset(&summ, 0, sizeof(summ));
- strcpy(summ.subj, "(no subject)");
+ safestrncpy(summ.subj, _("(no subject)"), sizeof summ.subj);
sprintf(buf, "MSG0 %ld|1", msgnum); /* ask for headers only */
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') return;
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (!strncasecmp(buf, "part=", 5)) {
- extract(mime_filename, &buf[5], 1);
- extract(mime_partnum, &buf[5], 2);
- extract(mime_disposition, &buf[5], 3);
- extract(mime_content_type, &buf[5], 4);
+ extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
+ extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
+ extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
+ extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
mime_length = extract_int(&buf[5], 5);
if (!strcasecmp(mime_content_type, "text/x-vcard")) {
display_vcard(vcard_source, alpha, 0, NULL);
/* If it's my vCard I can edit it */
- if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
- || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))) {
+ if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
+ || (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
+ || (WC->wc_view == VIEW_ADDRESSBOOK)
+ ) {
wprintf("<A HREF=\"/edit_vcard?"
- "msgnum=%ld&partnum=%s\">",
+ "msgnum=%ld?partnum=%s\">",
msgnum, vcard_partnum);
- wprintf("(edit)</A>");
+ wprintf("[%s]</A>", _("edit"));
}
free(vcard_source);
i = num_tokens(namebuf, ' ');
if (i < 2) return;
- extract_token(lastname, namebuf, i-1, ' ');
+ extract_token(lastname, namebuf, i-1, ' ', sizeof lastname);
remove_token(namebuf, i-1, ' ');
strcpy(firstname, namebuf);
sprintf(namebuf, "%s; %s", lastname, firstname);
char vcard_partnum[SIZ];
char *vcard_source = NULL;
int i;
-
- struct {
- char date[SIZ];
- char from[SIZ];
- char to[SIZ];
- char subj[SIZ];
- int hasattachments;
- } summ;
+ struct message_summary summ;
if (namebuf == NULL) return;
strcpy(namebuf, "");
memset(&summ, 0, sizeof(summ));
- strcpy(summ.subj, "(no subject)");
+ safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
sprintf(buf, "MSG0 %ld|1", msgnum); /* ask for headers only */
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') return;
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (!strncasecmp(buf, "part=", 5)) {
- extract(mime_filename, &buf[5], 1);
- extract(mime_partnum, &buf[5], 2);
- extract(mime_disposition, &buf[5], 3);
- extract(mime_content_type, &buf[5], 4);
+ extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
+ extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
+ extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
+ extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
mime_length = extract_int(&buf[5], 5);
if (!strcasecmp(mime_content_type, "text/x-vcard")) {
for (i=0; i<strlen(namebuf); ++i) {
if (namebuf[i] != ';') return;
}
- strcpy(namebuf, "(no name)");
+ strcpy(namebuf, _("(no name)"));
}
char tablast_label[SIZ];
if (num_ab == 0) {
- wprintf("<I>This address book is empty.</I>\n");
+ wprintf("<br /><br /><br /><div align=\"center\"><i>");
+ wprintf(_("This address book is empty."));
+ wprintf("</i></div>\n");
return;
}
wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
addrbook[i].ab_msgnum);
- wprintf("&maxmsgs=1&summary=0&alpha=%s\">", bstr("alpha"));
+ 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");
++displayed;
/*
* load message pointers from the server
*/
-int load_msg_ptrs(char *servcmd)
+int load_msg_ptrs(char *servcmd, int with_headers)
{
- char buf[SIZ];
+ char buf[1024];
+ time_t datestamp;
+ char displayname[128];
+ char nodename[128];
+ char inetaddr[128];
+ char subject[256];
int nummsgs;
int maxload = 0;
+ int num_summ_alloc = 0;
+
+ if (with_headers) {
+ if (WC->num_summ != 0) {
+ free(WC->summ);
+ WC->num_summ = 0;
+ }
+ }
+ num_summ_alloc = 100;
+ WC->num_summ = 0;
+ WC->summ = malloc(num_summ_alloc * sizeof(struct message_summary));
+
nummsgs = 0;
maxload = sizeof(WC->msgarr) / sizeof(long) ;
serv_puts(servcmd);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
wprintf("<EM>%s</EM><br />\n", &buf[4]);
return (nummsgs);
}
- while (serv_gets(buf), strcmp(buf, "000")) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if (nummsgs < maxload) {
- WC->msgarr[nummsgs] = atol(buf);
+ WC->msgarr[nummsgs] = extract_long(buf, 0);
+ datestamp = extract_long(buf, 1);
+ extract_token(displayname, buf, 2, '|', sizeof displayname);
+ extract_token(nodename, buf, 3, '|', sizeof nodename);
+ extract_token(inetaddr, buf, 4, '|', sizeof inetaddr);
+ extract_token(subject, buf, 5, '|', sizeof subject);
++nummsgs;
+
+ if (with_headers) {
+ if (nummsgs > num_summ_alloc) {
+ num_summ_alloc *= 2;
+ WC->summ = realloc(WC->summ, num_summ_alloc * sizeof(struct message_summary));
+ }
+ ++WC->num_summ;
+
+ memset(&WC->summ[nummsgs-1], 0, sizeof(struct message_summary));
+ WC->summ[nummsgs-1].msgnum = WC->msgarr[nummsgs-1];
+ safestrncpy(WC->summ[nummsgs-1].subj, _("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
+ if (strlen(displayname) > 0) {
+ safestrncpy(WC->summ[nummsgs-1].from, displayname, sizeof WC->summ[nummsgs-1].from);
+ }
+ if (strlen(subject) > 0) {
+ safestrncpy(WC->summ[nummsgs-1].subj, subject,
+ sizeof WC->summ[nummsgs-1].subj);
+ }
+#ifdef HAVE_ICONV
+ /* Handle subjects with RFC2047 encoding */
+ utf8ify_rfc822_string(WC->summ[nummsgs-1].subj);
+#endif
+ if (strlen(WC->summ[nummsgs-1].subj) > 75) {
+ strcpy(&WC->summ[nummsgs-1].subj[72], "...");
+ }
+
+ if (strlen(nodename) > 0) {
+ if ( ((WC->room_flags & QR_NETWORK)
+ || ((strcasecmp(nodename, serv_info.serv_nodename)
+ && (strcasecmp(nodename, serv_info.serv_fqdn)))))
+ ) {
+ strcat(WC->summ[nummsgs-1].from, " @ ");
+ strcat(WC->summ[nummsgs-1].from, nodename);
+ }
+ }
+
+ WC->summ[nummsgs-1].date = datestamp;
+
+#ifdef HAVE_ICONV
+ /* Handle senders with RFC2047 encoding */
+ utf8ify_rfc822_string(WC->summ[nummsgs-1].from);
+#endif
+ if (strlen(WC->summ[nummsgs-1].from) > 25) {
+ strcpy(&WC->summ[nummsgs-1].from[22], "...");
+ }
+ }
}
}
return (nummsgs);
}
+
+int summcmp_subj(const void *s1, const void *s2) {
+ struct message_summary *summ1;
+ struct message_summary *summ2;
+
+ summ1 = (struct message_summary *)s1;
+ summ2 = (struct message_summary *)s2;
+ return strcasecmp(summ1->subj, summ2->subj);
+}
+
+int summcmp_rsubj(const void *s1, const void *s2) {
+ struct message_summary *summ1;
+ struct message_summary *summ2;
+
+ summ1 = (struct message_summary *)s1;
+ summ2 = (struct message_summary *)s2;
+ return strcasecmp(summ2->subj, summ1->subj);
+}
+
+int summcmp_sender(const void *s1, const void *s2) {
+ struct message_summary *summ1;
+ struct message_summary *summ2;
+
+ summ1 = (struct message_summary *)s1;
+ summ2 = (struct message_summary *)s2;
+ return strcasecmp(summ1->from, summ2->from);
+}
+
+int summcmp_rsender(const void *s1, const void *s2) {
+ struct message_summary *summ1;
+ struct message_summary *summ2;
+
+ summ1 = (struct message_summary *)s1;
+ summ2 = (struct message_summary *)s2;
+ return strcasecmp(summ2->from, summ1->from);
+}
+
+int summcmp_date(const void *s1, const void *s2) {
+ struct message_summary *summ1;
+ struct message_summary *summ2;
+
+ summ1 = (struct message_summary *)s1;
+ summ2 = (struct message_summary *)s2;
+
+ if (summ1->date < summ2->date) return -1;
+ else if (summ1->date > summ2->date) return +1;
+ else return 0;
+}
+
+int summcmp_rdate(const void *s1, const void *s2) {
+ struct message_summary *summ1;
+ struct message_summary *summ2;
+
+ summ1 = (struct message_summary *)s1;
+ summ2 = (struct message_summary *)s2;
+
+ if (summ1->date < summ2->date) return +1;
+ else if (summ1->date > summ2->date) return -1;
+ else return 0;
+}
/*
* command loop for reading messages
char cmd[SIZ];
char buf[SIZ];
char old_msgs[SIZ];
- int is_new = 0;
int a, b;
int nummsgs;
long startmsg;
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 sortpref_name[128];
+ char sortpref_value[128];
+ char *subjsort_button;
+ char *sendsort_button;
+ char *datesort_button;
startmsg = atol(bstr("startmsg"));
maxmsgs = atoi(bstr("maxmsgs"));
is_summary = atoi(bstr("summary"));
if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
- output_headers(1, 1, 1, 0, 0, 0, 0);
+ snprintf(sortpref_name, sizeof sortpref_name, "sort %s", WC->wc_roomname);
+ get_preference(sortpref_name, sortpref_value, sizeof sortpref_value);
+
+ sortby = bstr("sortby");
+ if ( (strlen(sortby) > 0) && (strcasecmp(sortby, sortpref_value)) ) {
+ set_preference(sortpref_name, sortby, 1);
+ }
+ if (strlen(sortby) == 0) sortby = sortpref_value;
+ if (strlen(sortby) == 0) sortby = "rdate";
+
+ 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.
if ((WC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
is_addressbook = 1;
strcpy(cmd, "MSGS ALL");
- maxmsgs = 32767;
+ maxmsgs = 9999999;
}
if (is_summary) {
- strcpy(cmd, "MSGS ALL");
+ strcpy(cmd, "MSGS ALL|||1"); /* fetch header summary */
+ startmsg = 1;
+ maxmsgs = 9999999;
}
/* Are we doing a summary view? If so, we need to know old messages
strcpy(old_msgs, "");
if (is_summary) {
serv_puts("GTSN");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
strcpy(old_msgs, &buf[4]);
}
maxmsgs = 32767;
}
- nummsgs = load_msg_ptrs(cmd);
+ nummsgs = load_msg_ptrs(cmd, is_summary);
if (nummsgs == 0) {
- if ((!is_tasks) && (!is_calendar) && (!is_notes)) {
+ if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
+ wprintf("<em>");
if (!strcmp(oper, "readnew")) {
- wprintf("<EM>No new messages.</EM>\n");
+ wprintf(_("No new messages."));
} else if (!strcmp(oper, "readold")) {
- wprintf("<EM>No old messages.</EM>\n");
+ wprintf(_("No old messages."));
} else {
- wprintf("<EM>No messages here.</EM>\n");
+ wprintf(_("No messages here."));
}
+ wprintf("</em>\n");
}
goto DONE;
}
+ if (is_summary) {
+ for (a = 0; a < nummsgs; ++a) {
+ /* 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;
+ }
+ else {
+ WC->summ[a].is_new = 1;
+ }
+ }
+ }
+ }
+
if (startmsg == 0L) startmsg = WC->msgarr[0];
remaining_messages = 0;
}
}
- wprintf("<FORM NAME=\"msgomatic\" "
- "METHOD=\"POST\" ACTION=\"/do_stuff_to_msgs\">\n");
if (is_summary) {
- wprintf(
- "<center><table border=0 cellspacing=0 "
- "cellpadding=0 width=99%%>\n"
+ if (!strcasecmp(sortby, "subject")) {
+ qsort(WC->summ, WC->num_summ,
+ sizeof(struct message_summary), summcmp_subj);
+ }
+ else if (!strcasecmp(sortby, "rsubject")) {
+ qsort(WC->summ, WC->num_summ,
+ sizeof(struct message_summary), summcmp_rsubj);
+ }
+ else if (!strcasecmp(sortby, "sender")) {
+ qsort(WC->summ, WC->num_summ,
+ sizeof(struct message_summary), summcmp_sender);
+ }
+ else if (!strcasecmp(sortby, "rsender")) {
+ qsort(WC->summ, WC->num_summ,
+ sizeof(struct message_summary), summcmp_rsender);
+ }
+ else if (!strcasecmp(sortby, "date")) {
+ qsort(WC->summ, WC->num_summ,
+ sizeof(struct message_summary), summcmp_date);
+ }
+ else if (!strcasecmp(sortby, "rdate")) {
+ qsort(WC->summ, WC->num_summ,
+ sizeof(struct message_summary), summcmp_rdate);
+ }
+ }
+
+ 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>" ;
+ }
+ 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>" ;
+ }
+ else {
+ 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>" ;
+ }
+ 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>" ;
+ }
+ else {
+ 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>" ;
+ }
+ 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>" ;
+ }
+ else {
+ 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\">"
+
+ "<div id=\"fix_scrollbar_bug\">\n"
+
+ "<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>"
- "<TD><I>Subject</I></TD>"
- "<TD><I>Sender</I></TD>"
- "<TD><I>Date</I></TD>"
- "<TD></TD>"
+ "<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"
+ ,
+ _("Subject"), subjsort_button,
+ _("Sender"), sendsort_button,
+ _("Date"), datesort_button,
+ _("Delete")
);
}
for (a = 0; a < nummsgs; ++a) {
if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
- /* Are you a new message, or an old message? */
- is_new = 0;
- if (is_summary) {
- if (is_msg_in_mset(old_msgs, WC->msgarr[a])) {
- is_new = 0;
- }
- else {
- is_new = 1;
- }
- }
-
/* Learn which msgs "Prev" & "Next" buttons go to */
pn_current = WC->msgarr[a];
if (a > 0) pn_previous = WC->msgarr[a-1];
if (a < (nummsgs-1)) pn_next = WC->msgarr[a+1];
- /* If a tabular view, set up the line */
- if (is_summary) {
- bg = 1 - bg;
- wprintf("<TR BGCOLOR=\"#%s\">",
- (bg ? "DDDDDD" : "FFFFFF")
- );
- }
-
/* Display the message */
if (is_summary) {
- summarize_message(WC->msgarr[a], is_new);
+ display_summarized(a);
}
else if (is_addressbook) {
fetch_ab_name(WC->msgarr[a], buf);
display_note(WC->msgarr[a]);
}
else {
- read_message(WC->msgarr[a]);
- }
-
- /* 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></center>\n");
+ 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
if (num_displayed == 1) {
if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) {
- wprintf("<CENTER>"
- "<TABLE BORDER=0 WIDTH=99%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
- "Reading #%d of %d messages.</TD>\n"
- "<TD ALIGN=RIGHT><FONT SIZE=+1>",
- lowest_displayed, nummsgs);
-
- if (is_summary) {
- wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" "
- "VALUE=\"Delete selected\">\n");
- }
+ 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\">"
- "Previous</A> \n",
+ "?maxmsgs=1"
+ "?summary=0\">"
+ "%s</A> \n",
oper,
- pn_previous );
+ pn_previous,
+ _("Previous"));
}
if (pn_next > 0L) {
wprintf("<A HREF=\"/%s"
"?startmsg=%ld"
- "&maxmsgs=1"
- "&summary=0\">"
- "Next</A> \n",
+ "?maxmsgs=1"
+ "?summary=0\">"
+ "%s</A> \n",
oper,
- pn_next );
+ pn_next,
+ _("Next"));
}
wprintf("<A HREF=\"/%s?startmsg=%ld"
- "&maxmsgs=999999&summary=1\">"
- "Summary"
+ "?maxmsgs=%d?summary=1\">"
+ "%s"
"</A>",
oper,
- WC->msgarr[0]);
+ WC->msgarr[0],
+ DEFAULT_MAXMSGS,
+ _("Summary")
+ );
+ wprintf("</td></tr></table></div>\n");
}
}
*/
if (num_displayed > 1) {
if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
- && (!is_notes) && (!is_singlecard)) {
+ && (!is_notes) && (!is_singlecard) && (!is_summary)) {
- wprintf("Reading #", lowest_displayed, highest_displayed);
+ wprintf("<form name=\"msgomatic\" "
+ "method=\"POST\" action=\"/do_stuff_to_msgs\">\n");
- wprintf("<SELECT NAME=\"whichones\" SIZE=\"1\" "
+ wprintf(_("Reading #"), lowest_displayed, highest_displayed);
+
+ wprintf("<select name=\"whichones\" size=\"1\" "
"OnChange=\"location.href=msgomatic.whichones.options"
"[selectedIndex].value\">\n");
lo = b+1;
hi = b+maxmsgs;
if (hi > nummsgs) hi = nummsgs;
- wprintf("<OPTION %s VALUE="
+ wprintf("<option %s value="
"\"/%s"
"?startmsg=%ld"
- "&maxmsgs=%d"
- "&summary=%d\">"
- "%d-%d</OPTION> \n",
- ((WC->msgarr[b] == startmsg) ? "SELECTED" : ""),
+ "?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"
- "&maxmsgs=999999&summary=%d\">"
+ wprintf("<option value=\"/%s?startmsg=%ld"
+ "?maxmsgs=9999999?summary=%d\">"
"ALL"
- "</OPTION> ",
+ "</option> ",
oper,
WC->msgarr[0], is_summary);
- wprintf("<OPTION VALUE=\"/%s?startmsg=%ld"
- "&maxmsgs=999999&summary=1\">"
- "Summary"
- "</OPTION>",
- oper,
- WC->msgarr[0]);
-
- wprintf("</SELECT> of %d messages.", nummsgs);
-
- if (is_summary) {
- wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" "
- "VALUE=\"Delete selected\">\n");
- }
-
+ wprintf("</select> ");
+ wprintf(_("of %d messages."), nummsgs);
+ wprintf("</form>\n");
}
}
- if (is_summary) wprintf("</FORM>\n");
DONE:
if (is_tasks) {
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;
+ 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);
+ }
}
char *encoded;
size_t encoded_length;
+ /* RFC2045 requires this, and some clients look for it... */
+ serv_puts("MIME-Version: 1.0");
+
/* If there are attachments, we have to do multipart/mixed */
if (WC->first_attachment != NULL) {
is_multipart = 1;
serv_printf("--%s", boundary);
}
- serv_puts("Content-type: text/html");
+ serv_puts("Content-type: text/html; charset=utf-8");
serv_puts("");
serv_puts("<HTML><BODY>\n");
text_to_server(bstr("msgtext"), 0);
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) {
return;
}
- if (!strcasecmp(bstr("sc"), "Cancel")) {
+ if (strlen(bstr("cancel_button")) > 0) {
sprintf(WC->ImportantMessage,
- "Cancelled. Message was not posted.");
- } else if (!strcasecmp(bstr("attach"), "Add")) {
+ _("Cancelled. Message was not posted."));
+ } else if (strlen(bstr("attach_button")) > 0) {
display_enter();
return;
} else if (atol(bstr("postseq")) == dont_post) {
sprintf(WC->ImportantMessage,
- "Automatically cancelled because you have already "
- "saved this message.");
+ _("Automatically cancelled because you have already "
+ "saved this message."));
} else {
- sprintf(buf, "ENT0 1|%s|0|4|%s",
+ sprintf(buf, "ENT0 1|%s|0|4|%s|||%s|%s",
bstr("recp"),
- bstr("subject") );
+ bstr("subject"),
+ bstr("cc"),
+ bstr("bcc")
+ );
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '4') {
post_mime_to_server();
- if (strlen(bstr("recp")) > 0) {
- sprintf(WC->ImportantMessage, "Message has been sent.\n");
+ if ( (strlen(bstr("recp")) > 0)
+ || (strlen(bstr("cc")) > 0)
+ || (strlen(bstr("bcc")) > 0)
+ ) {
+ sprintf(WC->ImportantMessage, _("Message has been sent.\n"));
}
else {
- sprintf(WC->ImportantMessage, "Message has been posted.\n");
+ sprintf(WC->ImportantMessage, _("Message has been posted.\n"));
}
dont_post = atol(bstr("postseq"));
} else {
- sprintf(WC->ImportantMessage,
- "%s", &buf[4]);
+ sprintf(WC->ImportantMessage, "%s", &buf[4]);
+ display_enter();
+ return;
}
}
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"));
}
#endif
- /* Otherwise proceed normally. Do a custom room banner with no navbar... */
- output_headers(1, 1, 2, 0, 0, 0, 0);
+ /*
+ * Otherwise proceed normally.
+ * Do a custom room banner with no navbar...
+ */
+ output_headers(1, 1, 2, 0, 0, 0);
wprintf("<div id=\"banner\">\n");
embed_room_banner(NULL, navbar_none);
wprintf("</div>\n");
- wprintf("<div id=\"content\">\n");
-
- sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
- serv_puts(buf);
- serv_gets(buf);
+ wprintf("<div id=\"content\">\n"
+ "<div id=\"fix_scrollbar_bug\">"
+ "<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
- if (!strncmp(buf, "570", 3)) {
- if (strlen(bstr("recp")) > 0) {
- svprintf("RECPERROR", WCS_STRING,
- "<SPAN CLASS=\"errormsg\">%s</SPAN><br />\n",
- &buf[4]
- );
- }
- do_template("prompt_for_recipient");
- goto DONE;
+ /* 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;
}
- 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);
- strcat(&buf[strlen(buf)], " <I>from</I> ");
+ 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> ");
+ strcat(&buf[strlen(buf)], _(" <I>to</I> "));
stresc(&buf[strlen(buf)], bstr("recp"), 1, 1);
}
- strcat(&buf[strlen(buf)], " <I>in</I> ");
+ */
+
+ strcat(&buf[strlen(buf)], _(" <I>in</I> "));
stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
/* begin message entry screen */
- wprintf("<div style=\"position:absolute; left:1%%; width:96%%; height:100%%\">\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("<img src=\"static/enter.gif\" align=middle alt=\" \">");
- /* "onLoad=\"document.enterform.msgtext.focus();\" " */
- wprintf("<font size=-1>Subject (optional):</font>"
+
+ 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_id\" value=\"");
+ escputs(bstr("recp"));
+ wprintf("\" size=50 maxlength=1000 />");
+ wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
+ 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>");
+ wprintf("<font size=-1>");
+ wprintf(_("Subject (optional):"));
+ wprintf("</font>");
+ wprintf("</td><td>"
"<input type=\"text\" name=\"subject\" value=\"");
escputs(bstr("subject"));
- wprintf("\" size=40 maxlength=70>"
- " "
- );
+ wprintf("\" size=50 maxlength=70></td><td>\n");
- wprintf("<input type=\"submit\" name=\"sc\" value=\"");
- if (strlen(bstr("recp")) > 0) {
- wprintf("Send message");
+ wprintf("<input type=\"submit\" name=\"send_button\" value=\"");
+ if (recipient_required) {
+ wprintf(_("Send message"));
} else {
- wprintf("Post message");
+ wprintf(_("Post message"));
}
wprintf("\"> "
- "<input type=\"submit\" name=\"sc\" value=\"Cancel\">\n");
-
- /* begin richedit box */
- wprintf("<div style=\"position:absolute; left:0%%; width:100%%; top:15%; height:80%%\">\n");
-
- wprintf("<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', '");
+ "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
+ wprintf("</td></tr></table>\n");
+
+ 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"));
- wprintf("', '100%%', '80%%', true, false); \n"
- "</script> \n");
- wprintf("</div>\n"); /* end richedit box */
- /* Here comes the "do attachments" section on the bottom */
- wprintf("<div style=\"position:absolute; bottom:0px; left:0px; width:100%%\">\n");
+ /* 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("</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 "
+ "align=middle height=16 width=16> Attachments: ");
+ wprintf("<select name=\"which_attachment\" size=1>");
for (att = WC->first_attachment; att != NULL; att = att->next) {
- wprintf("<IMG SRC=\"/static/attachment.gif\" "
- "BORDER=0 ALIGN=MIDDLE> Attachment: ");
+ wprintf("<option value=\"");
+ urlescputs(att->filename);
+ wprintf("\">");
escputs(att->filename);
- wprintf(" (%s, %d bytes)<br />\n",
- att->content_type, att->length);
+ /* wprintf(" (%s, %d bytes)",att->content_type,att->length); */
+ wprintf("</option>\n");
}
+ wprintf("</select>");
/* Now offer the ability to attach additional files... */
wprintf(" "
"Attach file: <input NAME=\"attachfile\" "
- "SIZE=48 TYPE=\"file\">\n "
- "<input type=\"submit\" name=\"attach\" value=\"Add\">\n");
+ "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"));
- wprintf("</div>\n"); /* end attachments section */
+ /* 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("</form>\n");
- wprintf("</div>\n");
+ wprintf("</td></tr></table></div>\n");
DONE: wDumpContent(1);
}
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_gets(buf);
+ serv_getln(buf, sizeof buf);
wprintf("<EM>%s</EM><br />\n", &buf[4]);
wDumpContent(1);
msgid = atol(bstr("msgid"));
- output_headers(1, 1, 1, 0, 0, 0, 0);
- wprintf("<center><table width=99%% border=0 bgcolor=\"#444455\"><tr><td>");
- wprintf("<font size=+1 color=\"#ffffff\"");
- wprintf("<b>Confirm move of message</b>\n");
- wprintf("</font></td></tr></table></center>\n");
+ 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("</SPAN>\n");
+ wprintf("</TD></TR></TABLE>\n");
+ wprintf("</div>\n<div id=\"content\">\n");
wprintf("<CENTER>");
- wprintf("Move this message to:<br />\n");
-
- wprintf("<FORM METHOD=\"POST\" ACTION=\"/move_msg\">\n");
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n",
- bstr("msgid"));
+ 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("<SELECT NAME=\"target_room\" SIZE=5>\n");
serv_puts("LKRA");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '1') {
- while (serv_gets(buf), strcmp(buf, "000")) {
- extract(targ, buf, 0);
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ extract_token(targ, buf, 0, '|', sizeof targ);
wprintf("<OPTION>");
escputs(targ);
wprintf("\n");
wprintf("</SELECT>\n");
wprintf("<br />\n");
- wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Move\">");
+ wprintf("<INPUT TYPE=\"submit\" NAME=\"move_button\" VALUE=\"%s\">", _("Move"));
wprintf(" ");
- wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Cancel\">");
- wprintf("</FORM></CENTER>\n");
+ wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+ wprintf("</form></CENTER>\n");
wprintf("</CENTER>\n");
wDumpContent(1);
msgid = atol(bstr("msgid"));
- output_headers(1, 1, 1, 0, 0, 0, 0);
-
- if (!strcasecmp(bstr("yesno"), "Move")) {
+ if (strlen(bstr("move_button")) > 0) {
sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
serv_puts(buf);
- serv_gets(buf);
- wprintf("<EM>%s</EM><br />\n", &buf[4]);
+ serv_getln(buf, sizeof buf);
+ sprintf(WC->ImportantMessage, "%s", &buf[4]);
} else {
- wprintf("<EM>Message not moved.</EM><br />\n");
- }
-
- wDumpContent(1);
-}
-
-/*
- * This gets called when a user selects Reply/Move/Del etc. on *one* message.
- */
-void do_stuff_to_one_msg(void) {
- char *msg_oper;
-
- msg_oper = bstr("msg_oper");
-
- if (!strcasecmp(msg_oper, "Delete")) {
- delete_msg(); /* It's already been confirmed using JS */
- return;
- }
- if (!strcasecmp(msg_oper, "Move")) {
- confirm_move_msg();
- return;
- }
- if (!strcasecmp(msg_oper, "Reply")) {
- display_enter(); /* recp and subject already set */
- return;
+ sprintf(WC->ImportantMessage, (_("The message was not moved.")));
}
- /* should never get here. FIXME: display an error */
+ readloop("readnew");
}
-
/*
* This gets called when a user selects multiple messages in a summary
* list and then clicks to perform a transformation of some sort on them
* (such as deleting them).
*/
void do_stuff_to_msgs(void) {
- char buf[SIZ];
- char sc[SIZ];
+ char buf[256];
struct stuff_t {
struct stuff_t *next;
struct stuff_t *stuff = NULL;
struct stuff_t *ptr;
+ int delete_button_pressed = 0;
serv_puts("MSGS ALL");
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
- if (buf[0] == '1') while (serv_gets(buf), strcmp(buf, "000")) {
+ 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;
}
- strcpy(sc, bstr("sc"));
+ 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 (!strcasecmp(sc, "Delete selected")) {
+ if (delete_button_pressed) {
serv_printf("DELE %ld", stuff->msgnum);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
}
}
projects / citadel.git / blobdiff