*
*/
-#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"
};
+
+#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 */
+
+ 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 {
+ snprintf(newbuf, sizeof newbuf, "%s(unreadable)%s", buf, end);
+ strcpy(buf, newbuf);
+ }
+
+ free(isav);
+ }
+
+}
+#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);
- }
+
+ 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>");
name = vcard_get_prop(v, "fn", 1, 0, 0);
- if (name == NULL) name = vcard_get_prop(v, "n", 1, 0, 0);
if (name != NULL) {
- strcpy(buf, name);
- escputs(buf);
+ escputs(name);
+ }
+ else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
+ 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>");
+ 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)], thisvalue);
strcat(mailto, "\">");
urlesc(&mailto[strlen(mailto)], thisvalue);
strcat(mailto, "</A>");
}
else if (!strcasecmp(firsttoken, "tel")) {
- if (strlen(phone) > 0) strcat(phone, "<BR>");
+ 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"))
if (pass == 2) {
wprintf("<TR><TD>Address:</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);
}
- 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!
*/
-void read_message(long msgnum) {
+void read_message(long msgnum, int suppress_buttons) {
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 m_subject[256];
+ char from[256];
+ char node[256];
+ char rfca[256];
char reply_to[512];
- char now[SIZ];
+ char now[256];
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(vcard_partnum, "");
strcpy(cal_partnum, "");
strcpy(mime_http, "");
+ strcpy(mime_content_type, "text/plain");
+ strcpy(mime_charset, "us-ascii");
serv_printf("MSG4 %ld", msgnum);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
- wprintf("<STRONG>ERROR:</STRONG> %s<BR>\n", &buf[4]);
+ wprintf("<STRONG>ERROR:</STRONG> %s<br />\n", &buf[4]);
return;
}
/* begin everythingamundo table */
- wprintf("<table width=100% border=1 cellspacing=0 "
+ 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("<SPAN CLASS=\"message_header\">");
strcpy(m_subject, "");
- 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>unexpected end of message</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 <A HREF=\"/showuser?who=");
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(from);
+#endif
urlescputs(from);
wprintf("\">");
escputs(from);
if (!strncasecmp(buf, "rcpt=", 5))
wprintf("to %s ", &buf[5]);
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")) {
snprintf(&mime_http[strlen(mime_http)],
(sizeof(mime_http) - strlen(mime_http) - 1),
"<A HREF=\"/output_mimepart?"
- "msgnum=%ld&partnum=%s\" "
+ "msgnum=%ld?partnum=%s\" "
"TARGET=\"wc.%ld.%s\">"
- "<IMG SRC=\"/static/attachment.gif\" "
+ "<IMG SRC=\"/static/diskette_24x.gif\" "
"BORDER=0 ALIGN=MIDDLE>\n"
- "Part %s: %s (%s, %d bytes)</A><BR>\n",
+ "Part %s: %s (%s, %d bytes)</A><br />\n",
msgnum, mime_partnum,
msgnum, mime_partnum,
mime_partnum, mime_filename,
snprintf(&mime_http[strlen(mime_http)],
(sizeof(mime_http) - strlen(mime_http) - 1),
"<IMG SRC=\"/output_mimepart?"
- "msgnum=%ld&partnum=%s\">",
+ "msgnum=%ld?partnum=%s\">",
msgnum, mime_partnum);
}
wprintf("****");
}
- wprintf("</SPAN></TD>");
-
- wprintf("<TD ALIGN=RIGHT>\n"
- "<TABLE BORDER=0><TR>\n");
-
- wprintf("<TD BGCOLOR=\"#AAAADD\">"
- "<A HREF=\"/display_enter?recp=");
- urlescputs(reply_to);
- if (!strncasecmp(m_subject, "Re:", 2)) {
- wprintf("&subject=");
- escputs(m_subject);
- }
- else if (strlen(m_subject) > 0) {
- wprintf("&subject=Re:%%20");
- escputs(m_subject);
+ wprintf("</SPAN>");
+#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(m_subject);
+#endif
+ if (strlen(m_subject) > 0) {
+ wprintf("<br />"
+ "<SPAN CLASS=\"message_subject\">"
+ "Subject: %s"
+ "</SPAN>", m_subject
+ );
}
- wprintf("\"><FONT SIZE=-1>Reply</FONT></A></TD>\n", msgnum);
+ wprintf("</TD>\n");
- if (WC->is_room_aide) {
- wprintf("<TD BGCOLOR=\"#AAAADD\">"
- "<A HREF=\"/confirm_move_msg"
- "&msgid=%ld"
- "\"><FONT SIZE=-1>Move</FONT></A>"
- "</TD>\n", msgnum);
+ /* start msg buttons */
+ if (!suppress_buttons) {
+ wprintf("<td align=right>\n");
- wprintf("<TD BGCOLOR=\"#AAAADD\">"
- "<A HREF=\"/delete_msg"
- "&msgid=%ld\""
- "onClick=\"return confirm('Delete this message?');\""
- "><FONT SIZE=-1>Del</FONT></A>"
- "</TD>\n", msgnum);
- }
+ /* 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("\">[Reply]</a> ");
- wprintf("</TR></TABLE>\n"
- "</TD>\n");
+ if (WC->is_room_aide) {
+
+ /* Move */
+ wprintf("<a href=\"/confirm_move_msg?msgid=%ld\">[Move]</a> ",
+ msgnum);
+
+ /* Delete */
+ wprintf("<a href=\"/delete_msg?msgid=%ld\" "
+ "onClick=\"return confirm('Delete this message?');\">"
+ "[Delete]</a> ", msgnum);
+
+ }
- if (strlen(m_subject) > 0) {
- wprintf("<TR><TD>"
- "<SPAN CLASS=\"message_subject\">"
- "Subject: %s"
- "</SPAN>"
- "</TD><TD> </TD></TR>\n", m_subject);
+ wprintf("<a href=\"/msg?msgnum=%ld?print_it=yes\" target=\"msgloader1\">"
+ "[Print]</a>", msgnum);
+
+ wprintf("</td>");
}
wprintf("</TR></TABLE>\n");
* 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>unexpected end of message</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 ( (strcasecmp(mime_charset, "us-ascii"))
+ && (strcasecmp(mime_charset, "UTF-8")) ) {
+ ic = iconv_open("UTF-8", mime_charset);
+ if (ic == (iconv_t)(-1) ) {
+ lprintf(5, "iconv_open() failed: %s\n", strerror(errno));
}
}
+#endif
/* Messages in legacy Citadel variformat get handled thusly... */
if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
/* 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")) {
+ 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("<SPAN CLASS=\"pull_quote\">");
+ wprintf("<BLOCKQUOTE>");
bq = 1;
} else if ((bq == 1) &&
(strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) && (strncmp(buf, " :-)", 4))) {
- wprintf("</SPAN>");
+ wprintf("</BLOCKQUOTE>");
bq = 0;
}
wprintf("<TT>");
url(buf);
escputs(buf);
- wprintf("</TT><BR>\n");
+ wprintf("</TT><br />\n");
}
- wprintf("</I><BR>");
+ wprintf("</I><br />");
}
else /* HTML is fun, but we've got to strip it first */
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",
+ wprintf("I don't know how to display %s<br />\n",
mime_content_type);
- while (serv_gets(buf), strcmp(buf, "000")) { }
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
}
-
/* Afterwards, offer links to download attachments 'n' such */
if (strlen(mime_http) > 0) {
wprintf("%s", mime_http);
if (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("[edit]</A>");
}
/* In all cases, display the full card */
wprintf("</TD></TR></TABLE>\n");
/* end everythingamundo table */
- wprintf("</TD></TR></TABLE><BR>\n");
-}
+ wprintf("</TD></TR></TABLE>\n");
+ wprintf("</div><br />\n");
+#ifdef HAVE_ICONV
+ if (ic != (iconv_t)(-1) ) {
+ iconv_close(ic);
+ }
+#endif
+}
-void summarize_message(long msgnum, int is_new) {
- char buf[SIZ];
- 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)");
+/*
+ * 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;
+ char *sourceiframe;
+ char *targetdiv;
+ char *print_it;
- sprintf(buf, "MSG0 %ld|3", msgnum); /* ask for headers only with no MIME */
- serv_puts(buf);
- serv_gets(buf);
- if (buf[0] != '1') return;
+ msgnum = atol(bstr("msgnum"));
+ sourceiframe = bstr("sourceiframe");
+ targetdiv = bstr("targetdiv");
+ print_it = bstr("print_it");
- 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, ">");
- }
+ output_headers(1, 0, 0, 0, 0, 1, 0);
+ begin_burst();
- 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]);
- }
- }
+ wprintf("<html><head>");
- if (!strncasecmp(buf, "rcpt=", 5)) {
- strcpy(summ.to, &buf[5]);
- }
+ /* 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.
+ */
+ 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
+ );
- if (!strncasecmp(buf, "time=", 5)) {
- fmt_date(summ.date, atol(&buf[5]));
- }
+ wprintf("</head>");
+ wprintf("<body");
+ if (strlen(targetdiv) > 0) {
+ wprintf(" onLoad='loaded_now_copy_it();'");
}
+ if (!strcasecmp(print_it, "yes")) {
+ wprintf(" onLoad='window.print();'");
+ }
+ wprintf(">\n");
+ read_message(msgnum, (!strcasecmp(print_it, "yes") ? 1 : 0) );
+ wprintf("</body></html>\n");
+ wDumpContent(0);
+}
+
+
+
+
+void display_summarized(int num) {
+ char datebuf[64];
wprintf("<TD>");
- if (is_new) wprintf("<B>");
- wprintf("<A HREF=\"/readfwd?startmsg=%ld"
- "&maxmsgs=1&summary=0\">",
- msgnum);
- escputs(summ.subj);
+ 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 (is_new) wprintf("</B>");
+ 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");
-
- return;
+ "</TD>\n",
+ WC->summ[num].msgnum
+ );
}
+
+
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("[edit]</A>");
}
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);
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;
+ int i;
+ 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")) {
}
lastfirst_firstlast(namebuf);
+ striplt(namebuf);
+ for (i=0; i<strlen(namebuf); ++i) {
+ if (namebuf[i] != ';') return;
+ }
+ strcpy(namebuf, "(no name)");
}
*/
int abcmp(const void *ab1, const void *ab2) {
return(strcasecmp(
- (((const struct addrbookent *)ab1)->ab_name),
- (((const struct addrbookent *)ab2)->ab_name)
+ (((const struct addrbookent *)ab1)->ab_name),
+ (((const struct addrbookent *)ab2)->ab_name)
));
}
+/*
+ * Helper function for do_addrbook_view()
+ * Converts a name into a three-letter tab label
+ */
+void nametab(char *tabbuf, char *name) {
+ stresc(tabbuf, name, 0, 0);
+ tabbuf[0] = toupper(tabbuf[0]);
+ tabbuf[1] = tolower(tabbuf[1]);
+ tabbuf[2] = tolower(tabbuf[2]);
+ tabbuf[3] = 0;
+}
+
+
/*
* Render the address book using info we gathered during the scan
*/
void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
int i = 0;
+ int displayed = 0;
int bg = 0;
+ static int NAMESPERPAGE = 60;
+ int num_pages = 0;
+ int page = 0;
+ int tabfirst = 0;
+ char tabfirst_label[SIZ];
+ int tablast = 0;
+ char tablast_label[SIZ];
+
+ if (num_ab == 0) {
+ wprintf("<I>This address book is empty.</I>\n");
+ return;
+ }
if (num_ab > 1) {
qsort(addrbook, num_ab, sizeof(struct addrbookent), abcmp);
}
+ num_pages = num_ab / NAMESPERPAGE;
+
+ page = atoi(bstr("page"));
+
+ wprintf("Page: ");
+ for (i=0; i<=num_pages; ++i) {
+ if (i != page) {
+ wprintf("<A HREF=\"/readfwd?page=%d\">", i);
+ }
+ else {
+ wprintf("<B>");
+ }
+ tabfirst = i * NAMESPERPAGE;
+ tablast = tabfirst + NAMESPERPAGE - 1;
+ if (tablast > (num_ab - 1)) tablast = (num_ab - 1);
+ nametab(tabfirst_label, addrbook[tabfirst].ab_name);
+ nametab(tablast_label, addrbook[tablast].ab_name);
+ wprintf("[%s - %s]",
+ tabfirst_label, tablast_label
+ );
+ if (i != page) {
+ wprintf("</A>\n");
+ }
+ else {
+ wprintf("</B>\n");
+ }
+ }
+ wprintf("<br />\n");
+
wprintf("<TABLE border=0 cellspacing=0 "
"cellpadding=3 width=100%%>\n"
);
for (i=0; i<num_ab; ++i) {
- if ((i % 4) == 0) {
- if (i > 0) {
- wprintf("</TR>\n");
+ if ((i / NAMESPERPAGE) == page) {
+
+ if ((displayed % 4) == 0) {
+ if (displayed > 0) {
+ wprintf("</TR>\n");
+ }
+ bg = 1 - bg;
+ wprintf("<TR BGCOLOR=\"#%s\">",
+ (bg ? "DDDDDD" : "FFFFFF")
+ );
}
- bg = 1 - bg;
- wprintf("<TR BGCOLOR=\"#%s\">",
- (bg ? "DDDDDD" : "FFFFFF")
- );
+
+ wprintf("<TD>");
+
+ wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
+ addrbook[i].ab_msgnum);
+ wprintf("?maxmsgs=1?summary=0?alpha=%s\">", bstr("alpha"));
+ vcard_n_prettyize(addrbook[i].ab_name);
+ escputs(addrbook[i].ab_name);
+ wprintf("</A></TD>\n");
+ ++displayed;
}
-
- wprintf("<TD>");
- wprintf("<A HREF=\"/readfwd?startmsg=%ld&is_singlecard=1",
- addrbook[i].ab_msgnum);
- wprintf("&maxmsgs=1&summary=0&alpha=%s\">", bstr("alpha"));
- escputs(addrbook[i].ab_name);
- wprintf("</A></TD>\n");
}
wprintf("</TR></TABLE>\n");
/*
* 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]);
+ 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, i;
+ int a, b;
int nummsgs;
long startmsg;
int maxmsgs;
int is_singlecard = 0;
int is_calendar = 0;
int is_tasks = 0;
+ int is_notes = 0;
int remaining_messages;
int lo, hi;
int lowest_displayed = (-1);
long pn_current = 0L;
long pn_next = 0L;
int bg = 0;
- char alpha = 0;
- char ab_alpha = 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);
+ 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 = "msgid";
+
+ output_headers(1, 1, 1, 0, 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]);
}
is_singlecard = atoi(bstr("is_singlecard"));
- /* Display the letter indices across the top */
- if ((is_addressbook) || (is_singlecard)) {
- if (strlen(bstr("alpha")) == 0) {
- alpha = 'a';
- }
- else {
- strcpy(buf, bstr("alpha"));
- alpha = buf[0];
- }
-
- for (i='1'; i<='z'; ++i) if ((i=='1')||(islower(i))) {
- if ((i != alpha) || (is_singlecard)) {
- wprintf("<A HREF=\"/readfwd?alpha=%c\">", i);
- }
- if (i == alpha) wprintf("<FONT SIZE=+2>");
- if (isalpha(i)) {
- wprintf("%c", toupper(i));
- }
- else {
- wprintf("(other)");
- }
- if (i == alpha) wprintf("</FONT>");
- if ((i != alpha) || (is_singlecard)) {
- wprintf("</A>\n");
- }
- wprintf(" ");
- }
-
- wprintf("<HR width=100%%>\n");
- }
-
if (WC->wc_view == VIEW_CALENDAR) { /* calendar */
is_calendar = 1;
strcpy(cmd, "MSGS ALL");
is_tasks = 1;
strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
- wprintf("<UL>");
+ }
+ if (WC->wc_view == VIEW_NOTES) { /* notes */
+ is_notes = 1;
+ strcpy(cmd, "MSGS ALL");
+ maxmsgs = 32767;
}
- nummsgs = load_msg_ptrs(cmd);
+ nummsgs = load_msg_ptrs(cmd, is_summary);
if (nummsgs == 0) {
- if ((!is_tasks) && (!is_calendar)) {
+ if ((!is_tasks) && (!is_calendar) && (!is_notes)) {
if (!strcmp(oper, "readnew")) {
wprintf("<EM>No new messages.</EM>\n");
} else if (!strcmp(oper, "readold")) {
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;
}
if (is_summary) {
- wprintf("<FORM METHOD=\"POST\" ACTION=\"/do_stuff_to_msgs\">\n"
- "<TABLE border=0 cellspacing=0 "
+ 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=date\"><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"
+
+ "<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>Subject</i></b> %s</TD>"
+ "<TD align=center><b><i>Sender</i></b> %s</TD>"
+ "<TD align=center><b><i>Date</i></b> %s</TD>"
+ "<TD><INPUT TYPE=\"submit\" NAME=\"sc\" "
+ "STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;"
+ " font-size: 6pt;\" "
+ "VALUE=\"Delete\"></TD>"
"</TR>\n"
+ ,
+ subjsort_button,
+ sendsort_button,
+ datesort_button
);
}
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];
/* 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);
- if ((strlen(buf) > 0) && (isalpha(buf[0]))) {
- ab_alpha = tolower(buf[0]);
- }
- else {
- ab_alpha = '1';
- }
- if (alpha == ab_alpha) {
- ++num_ab;
- addrbook = realloc(addrbook,
- (sizeof(struct addrbookent) * num_ab) );
- safestrncpy(addrbook[num_ab-1].ab_name, buf,
- sizeof(addrbook[num_ab-1].ab_name));
- addrbook[num_ab-1].ab_msgnum = WC->msgarr[a];
- }
+ ++num_ab;
+ addrbook = realloc(addrbook,
+ (sizeof(struct addrbookent) * num_ab) );
+ safestrncpy(addrbook[num_ab-1].ab_name, buf,
+ sizeof(addrbook[num_ab-1].ab_name));
+ addrbook[num_ab-1].ab_msgnum = WC->msgarr[a];
}
else if (is_calendar) {
display_calendar(WC->msgarr[a]);
else if (is_tasks) {
display_task(WC->msgarr[a]);
}
+ else if (is_notes) {
+ display_note(WC->msgarr[a]);
+ }
else {
- read_message(WC->msgarr[a]);
+ read_message(WC->msgarr[a], 0);
}
/* If a tabular view, finish the line */
}
if (is_summary) {
- wprintf("</TABLE>\n");
- }
+ wprintf("</table></form>"
+ "</div>\n"); /* end of 'fix_scrollbar_bug' div */
+ wprintf("</div>"); /* end of 'message_list' div */
- if (is_tasks) {
- wprintf("</UL>\n");
+ wprintf("<div id=\"preview_pane\">"); /* The preview pane will initially be empty */
}
/* Bump these because although we're thinking in zero base, the user
/* If we're only looking at one message, do a prev/next thing */
if (num_displayed == 1) {
- if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_singlecard)) {
+ if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_notes) && (!is_singlecard)) {
- wprintf("<CENTER>"
- "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
+ wprintf("<div id=\"fix_scrollbar_bug\">"
+ "<table border=0 width=100%% 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");
- }
-
if (pn_previous > 0L) {
wprintf("<A HREF=\"/%s"
"?startmsg=%ld"
- "&maxmsgs=1"
- "&summary=0\">"
+ "?maxmsgs=1"
+ "?summary=0\">"
"Previous</A> \n",
oper,
pn_previous );
if (pn_next > 0L) {
wprintf("<A HREF=\"/%s"
"?startmsg=%ld"
- "&maxmsgs=1"
- "&summary=0\">"
+ "?maxmsgs=1"
+ "?summary=0\">"
"Next</A> \n",
oper,
pn_next );
}
wprintf("<A HREF=\"/%s?startmsg=%ld"
- "&maxmsgs=999999&summary=1\">"
+ "?maxmsgs=%d?summary=1\">"
"Summary"
"</A>",
oper,
- WC->msgarr[0]);
+ WC->msgarr[0],
+ DEFAULT_MAXMSGS
+ );
- wprintf("</TD></TR></TABLE></CENTER>\n");
+ wprintf("</td></tr></table></div>\n");
}
}
* messages, then display the selector bar
*/
if (num_displayed > 1) {
- if ((!is_tasks) && (!is_calendar) && (!is_addressbook) && (!is_singlecard)) {
- wprintf("<CENTER>"
- "<TABLE BORDER=0 WIDTH=100%% BGCOLOR=\"#DDDDDD\"><TR><TD>"
- "Reading #%d-%d of %d messages.</TD>\n"
- "<TD ALIGN=RIGHT><FONT SIZE=+1>",
- lowest_displayed, highest_displayed, nummsgs);
+ if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
+ && (!is_notes) && (!is_singlecard) && (!is_summary)) {
- if (is_summary) {
- wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" "
- "VALUE=\"Delete selected\">\n");
- }
+ wprintf("<form name=\"msgomatic\" "
+ "method=\"POST\" action=\"/do_stuff_to_msgs\">\n");
+
+ wprintf("Reading #", lowest_displayed, highest_displayed);
+ wprintf("<select name=\"whichones\" size=\"1\" "
+ "OnChange=\"location.href=msgomatic.whichones.options"
+ "[selectedIndex].value\">\n");
for (b=0; b<nummsgs; b = b + maxmsgs) {
lo = b+1;
hi = b+maxmsgs;
if (hi > nummsgs) hi = nummsgs;
- if (WC->msgarr[b] != startmsg) {
- wprintf("<A HREF=\"/%s"
- "?startmsg=%ld"
- "&maxmsgs=%d"
- "&summary=%d\">"
- "%d-%d</A> \n",
- oper,
- WC->msgarr[b],
- maxmsgs,
- is_summary,
- lo, hi);
- }
- else {
- wprintf("%d-%d \n", lo, hi);
- }
-
+ wprintf("<option %s value="
+ "\"/%s"
+ "?startmsg=%ld"
+ "?maxmsgs=%d"
+ "?summary=%d\">"
+ "%d-%d</option> \n",
+ ((WC->msgarr[b] == startmsg) ? "selected" : ""),
+ oper,
+ WC->msgarr[b],
+ maxmsgs,
+ is_summary,
+ lo, hi);
}
- wprintf("<A HREF=\"/%s?startmsg=%ld"
- "&maxmsgs=999999&summary=%d\">"
+ wprintf("<option value=\"/%s?startmsg=%ld"
+ "?maxmsgs=9999999?summary=%d\">"
"ALL"
- "</A> ",
+ "</option> ",
oper,
WC->msgarr[0], is_summary);
- wprintf("<A HREF=\"/%s?startmsg=%ld"
- "&maxmsgs=999999&summary=1\">"
- "Summary"
- "</A>",
- oper,
- WC->msgarr[0]);
-
- wprintf("</TD></TR></TABLE></CENTER>\n");
+ wprintf("</select> of %d messages.", nummsgs);
+ wprintf("</form>\n");
}
}
- if (is_summary) wprintf("</FORM>\n");
DONE:
if (is_tasks) {
- wprintf("<A HREF=\"/display_edit_task?msgnum=0\">"
- "Add new task</A>\n"
- );
+ do_tasks_view(); /* Render the task list */
}
if (is_calendar) {
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);
+ }
}
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);
bstr("recp"),
bstr("subject") );
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (buf[0] == '4') {
post_mime_to_server();
- sprintf(WC->ImportantMessage,
- "Message has been posted.\n");
+ if (strlen(bstr("recp")) > 0) {
+ sprintf(WC->ImportantMessage, "Message has been sent.\n");
+ }
+ else {
+ sprintf(WC->ImportantMessage, "Message has been posted.\n");
+ }
dont_post = atol(bstr("postseq"));
} else {
sprintf(WC->ImportantMessage,
struct wc_attachment *att;
if (strlen(bstr("force_room")) > 0) {
- gotoroom(bstr("force_room"), 0);
+ gotoroom(bstr("force_room"));
}
/* Are we perhaps in an address book view? If so, then an "enter
return;
}
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE
/* Are we perhaps in a calendar view? If so, then an "enter
* message" command really means "add new calendar item."
*/
display_edit_task();
return;
}
+#endif
+
+ /*
+ * Otherwise proceed normally.
+` * Do a custom room banner with no navbar...
+ */
+ output_headers(1, 1, 2, 0, 0, 0, 0);
+ wprintf("<div id=\"banner\">\n");
+ embed_room_banner(NULL, navbar_none);
+ wprintf("</div>\n");
+ wprintf("<div id=\"content\">\n"
+ "<div id=\"fix_scrollbar_bug\">"
+ "<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
- /* Otherwise proceed normally */
- output_headers(1);
sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
serv_puts(buf);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
if (!strncmp(buf, "570", 3)) {
if (strlen(bstr("recp")) > 0) {
svprintf("RECPERROR", WCS_STRING,
- "<SPAN CLASS=\"errormsg\">%s</SPAN><BR>\n",
+ "<SPAN CLASS=\"errormsg\">%s</SPAN><br />\n",
&buf[4]
);
}
goto DONE;
}
if (buf[0] != '2') {
- wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+ wprintf("<EM>%s</EM><br />\n", &buf[4]);
goto DONE;
}
now = time(NULL);
- fmt_date(buf, now);
+ fmt_date(buf, now, 0);
strcat(&buf[strlen(buf)], " <I>from</I> ");
stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
if (strlen(bstr("recp")) > 0) {
}
strcat(&buf[strlen(buf)], " <I>in</I> ");
stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
- svprintf("BOXTITLE", WCS_STRING, buf);
- do_template("beginbox");
- wprintf("<CENTER>\n");
+ /* 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\""
+ 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",
+ wprintf("<input type=\"hidden\" name=\"recp\" value=\"%s\">\n",
bstr("recp"));
- wprintf("<INPUT TYPE=\"hidden\" NAME=\"postseq\" VALUE=\"%ld\">\n",
+ wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n",
now);
- wprintf("<IMG SRC=\"static/enter.gif\" ALIGN=MIDDLE ALT=\" \">");
+
+ wprintf("%s<br>\n", buf); /* header bar */
+ wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
/* "onLoad=\"document.enterform.msgtext.focus();\" " */
- wprintf("<FONT SIZE=-1>Subject (optional):</FONT>"
- "<INPUT TYPE=\"text\" NAME=\"subject\" VALUE=\"");
+ wprintf("<font size=-1>Subject (optional):</font>"
+ "<input type=\"text\" name=\"subject\" value=\"");
escputs(bstr("subject"));
- wprintf("\" MAXLENGTH=70>"
+ wprintf("\" size=40 maxlength=70>"
" "
);
- wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Save message\">"
- "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\"><BR>\n");
+ wprintf("<input type=\"submit\" name=\"sc\" value=\"");
+ if (strlen(bstr("recp")) > 0) {
+ wprintf("Send message");
+ } else {
+ wprintf("Post message");
+ }
+ wprintf("\"> "
+ "<input type=\"submit\" name=\"sc\" value=\"Cancel\">\n");
- wprintf("<SCRIPT language=\"JavaScript\" type=\"text/javascript\" "
- "src=\"static/richtext_compressed.js\"></SCRIPT>\n"
- "<SCRIPT language=\"JavaScript\" type=\"text/javascript\">\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"
"initRTE(\"static/\", \"static/\", \"\"); \n"
"</script> \n"
- "<noscript>JAVASCRIPT MUST BE ENABLED.</noscript> \n"
- "<SCRIPT language=\"javascript\" type=\"text/javascript\"> \n"
+ "<noscript>JavaScript must be enabled.</noscript> \n"
+ "<script type=\"text/javascript\"> \n"
"writeRichText('msgtext', '");
msgescputs(bstr("msgtext"));
- wprintf("', '100%%', 200, true, false); \n"
- "</script> \n");
-
-/*
- * Before we had the richedit widget, we did it this way...
- *
- wprintf("<TEXTAREA NAME=\"msgtext\" wrap=soft ROWS=25 COLS=80 "
- "WIDTH=80>");
- escputs(bstr("msgtext"));
- wprintf("</TEXTAREA><BR>\n");
- */
+ wprintf("', '96%%', '200', true, false); \n"
+ "</script></center><br />\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 "
+ "SIZE=16 TYPE=\"file\">\n "
"<input type=\"submit\" name=\"attach\" value=\"Add\">\n");
- wprintf("</FORM></CENTER>\n");
- do_template("endbox");
+ wprintf("</form>\n");
+
+ wprintf("</td></tr></table></div>\n");
DONE: wDumpContent(1);
}
msgid = atol(bstr("msgid"));
- output_headers(1);
+ output_headers(1, 1, 1, 0, 0, 0, 0);
sprintf(buf, "DELE %ld", msgid);
serv_puts(buf);
- serv_gets(buf);
- wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+ serv_getln(buf, sizeof buf);
+ wprintf("<EM>%s</EM><br />\n", &buf[4]);
wDumpContent(1);
}
msgid = atol(bstr("msgid"));
- output_headers(1);
+ output_headers(1, 1, 1, 0, 0, 0, 0);
- wprintf("<TABLE WIDTH=100%% 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>\n");
+ wprintf("<div id=\"fix_scrollbar_bug\">"
+ "<table width=100%% 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></div>\n");
wprintf("<CENTER>");
- wprintf("Move this message to:<BR>\n");
+ wprintf("Move this message to:<br />\n");
- wprintf("<FORM METHOD=\"POST\" ACTION=\"/move_msg\">\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("<br />\n");
wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Move\">");
+ wprintf(" ");
wprintf("<INPUT TYPE=\"submit\" NAME=\"yesno\" VALUE=\"Cancel\">");
- wprintf("</FORM></CENTER>\n");
+ wprintf("</form></CENTER>\n");
wprintf("</CENTER>\n");
wDumpContent(1);
msgid = atol(bstr("msgid"));
- output_headers(1);
+ output_headers(1, 1, 1, 0, 0, 0, 0);
if (!strcasecmp(bstr("yesno"), "Move")) {
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);
+ wprintf("<EM>%s</EM><br />\n", &buf[4]);
} else {
- wprintf("<EM>Message not moved.</EM><BR>\n");
+ wprintf("<EM>Message not moved.</EM><br />\n");
}
wDumpContent(1);
}
-
-
+/*
+ * This gets called when a user selects multiple messages in a summary
+ * list and then clicks to perform a transformation of some sort on them
+ * (such as deleting them).
+ */
void do_stuff_to_msgs(void) {
char buf[SIZ];
char sc[SIZ];
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;
sprintf(buf, "msg_%ld", stuff->msgnum);
if (!strcasecmp(bstr(buf), "yes")) {
- if (!strcasecmp(sc, "Delete selected")) {
+ if (!strcasecmp(sc, "Delete")) {
serv_printf("DELE %ld", stuff->msgnum);
- serv_gets(buf);
+ serv_getln(buf, sizeof buf);
}
}
projects / citadel.git / blobdiff