/**
* \brief Wrapper around iconv_open()
* Our version adds aliases for non-standard Microsoft charsets
- * such as 'MS950', aliasing them to names like 'CP950'
+ * such as 'MS950', aliasing them to names like 'CP950'
*
* \param tocode Target encoding
* \param fromcode Source encoding
ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr));
}
else if (!strcasecmp(encoding, "Q")) { /**< quoted-printable */
- ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, strlen(istr));
+ size_t len;
+ long pos;
+
+ len = strlen(istr);
+ pos = 0;
+ while (pos < len)
+ {
+ if (istr[pos] == '_') istr[pos] = ' ';
+ pos++;
+ }
+
+ ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len);
}
else {
strcpy(ibuf, istr); /**< unknown encoding */
int pos;
int start, end;
- char ench;
char urlbuf[SIZ];
char outbuf[1024];
-
start = (-1);
end = strlen(buf);
- ench = 0;
for (pos = 0; pos < strlen(buf); ++pos) {
if (!strncasecmp(&buf[pos], "http://", 7))
if (start < 0)
return;
- if ((start > 0) && (buf[start - 1] == '<'))
- ench = '>';
- if ((start > 0) && (buf[start - 1] == '['))
- ench = ']';
- if ((start > 0) && (buf[start - 1] == '('))
- ench = ')';
- if ((start > 0) && (buf[start - 1] == '{'))
- ench = '}';
-
for (pos = strlen(buf); pos > start; --pos) {
- if ((buf[pos] == ' ') || (buf[pos] == ench))
+ if ( (!isprint(buf[pos]))
+ || (isspace(buf[pos]))
+ || (buf[pos] == '{')
+ || (buf[pos] == '}')
+ || (buf[pos] == '|')
+ || (buf[pos] == '\\')
+ || (buf[pos] == '^')
+ || (buf[pos] == '[')
+ || (buf[pos] == ']')
+ || (buf[pos] == '`')
+ || (buf[pos] == '<')
+ || (buf[pos] == '>')
+ || (buf[pos] == '(')
+ || (buf[pos] == ')')
+ ) {
end = pos;
+ }
}
strncpy(urlbuf, &buf[start], end - start);
return;
}
- wprintf("<div align=center><table bgcolor=#aaaaaa width=50%%>");
+ 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) {
}
+struct attach_link {
+ char partnum[32];
+ char html[1024];
+};
+
+
/**
* \brief I wanna SEE that message!
* \param msgnum the citadel number of the message to display
void read_message(long msgnum, int printable_view, char *section) {
char buf[SIZ];
char mime_partnum[256];
+ char mime_name[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];
+ struct attach_link *attach_links = NULL;
+ int num_attach_links = 0;
char mime_submessages[256];
char m_subject[256];
char m_cc[1024];
char vcard_partnum[256];
char cal_partnum[256];
char *part_source = NULL;
+ char msg4_partnum[32];
#ifdef HAVE_ICONV
iconv_t ic = (iconv_t)(-1) ;
char *ibuf; /**< Buffer of characters to be converted */
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|%s", msgnum, section);
serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
- wprintf("<STRONG>");
+ wprintf("<strong>");
wprintf(_("ERROR:"));
- wprintf("</STRONG> %s<br />\n", &buf[4]);
+ wprintf("</strong> %s<br />\n", &buf[4]);
return;
}
/** begin everythingamundo table */
- if (!printable_view) {
- wprintf("<div class=\"fix_scrollbar_bug\">\n");
- wprintf("<table width=100%% border=1 cellspacing=0 "
- "cellpadding=0><TR><TD>\n");
- }
+ if (!printable_view) {
+ wprintf("<div class=\"fix_scrollbar_bug message\" ");
+ wprintf("onMouseOver=document.getElementById(\"msg%ld\").style.visibility=\"visible\" ", msgnum);
+ wprintf("onMouseOut=document.getElementById(\"msg%ld\").style.visibility=\"hidden\" >", msgnum);
+ }
/** begin message header table */
- wprintf("<table width=100%% border=0 cellspacing=0 "
- "cellpadding=1 bgcolor=\"#CCCCCC\"><tr><td>\n");
-
- wprintf("<span class=\"message_header\">");
+ wprintf("<div class=\"message_header\">");
strcpy(m_subject, "");
strcpy(m_cc, "");
if (!strcmp(buf, "000")) {
wprintf("<i>");
wprintf(_("unexpected end of message"));
- wprintf("</i><br /><br />\n");
- wprintf("</span>\n");
+ wprintf(" (1)</i><br /><br />\n");
+ wprintf("</div>\n");
return;
}
if (!strncasecmp(buf, "nhdr=yes", 8))
}
if (!strncasecmp(buf, "part=", 5)) {
+ extract_token(mime_name, &buf[5], 0, '|', sizeof mime_filename);
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);
+ striplt(mime_name);
+ striplt(mime_filename);
+ if ( (strlen(mime_filename) == 0) && (strlen(mime_name) > 0) ) {
+ strcpy(mime_filename, mime_name);
+ }
+
if (!strcasecmp(mime_content_type, "message/rfc822")) {
if (strlen(mime_submessages) > 0) {
strcat(mime_submessages, "|");
}
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),
+ ++num_attach_links;
+ attach_links = realloc(attach_links,
+ (num_attach_links*sizeof(struct attach_link)));
+ safestrncpy(attach_links[num_attach_links-1].partnum, mime_partnum, 32);
+ snprintf(attach_links[num_attach_links-1].html, 1024,
"<img src=\"mimepart/%ld/%s/%s\">",
msgnum, mime_partnum, mime_filename);
}
- else if ( (!strcasecmp(mime_disposition, "attachment"))
- || (!strcasecmp(mime_disposition, "inline")) ) {
- snprintf(&mime_http[strlen(mime_http)],
- (sizeof(mime_http) - strlen(mime_http) - 1),
+ else if ( ( (!strcasecmp(mime_disposition, "attachment"))
+ || (!strcasecmp(mime_disposition, "inline"))
+ || (!strcasecmp(mime_disposition, ""))
+ ) && (strlen(mime_content_type) > 0)
+ ) {
+ ++num_attach_links;
+ attach_links = realloc(attach_links,
+ (num_attach_links*sizeof(struct attach_link)));
+ safestrncpy(attach_links[num_attach_links-1].partnum, mime_partnum, 32);
+ snprintf(attach_links[num_attach_links-1].html, 1024,
"<img src=\"static/diskette_24x.gif\" "
"border=0 align=middle>\n"
"%s (%s, %d bytes) [ "
}
/** begin handler prep ***/
- if (!strcasecmp(mime_content_type, "text/x-vcard")) {
+ if ( (!strcasecmp(mime_content_type, "text/x-vcard"))
+ || (!strcasecmp(mime_content_type, "text/vcard")) ) {
strcpy(vcard_partnum, mime_partnum);
}
/** Generate a reply-to address */
if (strlen(rfca) > 0) {
- strcpy(reply_to, rfca);
+ if (strlen(from) > 0) {
+ snprintf(reply_to, sizeof(reply_to), "%s <%s>", from, rfca);
+ }
+ else {
+ strcpy(reply_to, rfca);
+ }
}
else {
if ( (strlen(node) > 0)
wprintf("****");
}
- wprintf("</span>");
+ wprintf("</div>");
+
#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("<div class=\"message_subject\">");
wprintf(_("CC:"));
wprintf(" ");
escputs(m_cc);
- wprintf("</span>");
+ wprintf("</div>");
}
if (strlen(m_subject) > 0) {
- wprintf("<br />"
- "<span class=\"message_subject\">");
+ wprintf("<div class=\"message_subject\">");
wprintf(_("Subject:"));
wprintf(" ");
escputs(m_subject);
- wprintf("</span>");
+ wprintf("</div>");
}
- wprintf("</td>\n");
- /** start msg buttons */
- if (!printable_view) {
- wprintf("<td align=right><span class=\"msgbuttons\">\n");
+
+ /** start msg buttons */
+ if (!printable_view) {
+ wprintf("<div id=\"msg%ld\" class=\"msgbuttons\" >\n",msgnum);
/** Reply */
if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
urlescputs(m_subject);
}
- wprintf("\">[%s]</a> ", _("Reply"));
+ wprintf("\"><span>[</span>%s<span>]</span></a> ", _("Reply"));
}
/** ReplyQuoted */
if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
urlescputs(m_subject);
}
- wprintf("\">[%s]</a> ", _("ReplyQuoted"));
+ wprintf("\"><span>[</span>%s<span>]</span></a> ", _("ReplyQuoted"));
}
}
if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
urlescputs(m_subject);
}
- wprintf("\">[%s]</a> ", _("ReplyAll"));
+ wprintf("\"><span>[</span>%s<span>]</span></a> ", _("ReplyAll"));
}
/** Forward */
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"));
+ wprintf("\"><span>[</span>%s<span>]</span></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) ) {
+ if ( (WC->is_room_aide) || (WC->is_mailbox) || (WC->room_flags2 & QR2_COLLABDEL) ) {
/** Move */
- wprintf("<a href=\"confirm_move_msg?msgid=%ld\">[%s]</a> ",
+ wprintf("<a href=\"confirm_move_msg?msgid=%ld\"><span>[</span>%s<span>]</span></a> ",
msgnum, _("Move"));
/** Delete */
wprintf("<a href=\"delete_msg?msgid=%ld\" "
"onClick=\"return confirm('%s');\">"
- "[%s]</a> ", msgnum, _("Delete this message?"), _("Delete")
+ "<span>[</span>%s<span>]</span> "
+ "</a> ", msgnum, _("Delete this message?"), _("Delete")
);
}
/** Headers */
wprintf("<a href=\"#\" onClick=\"window.open('msgheaders/%ld', 'headers%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
- "[%s]</a>", msgnum, msgnum, _("Headers"));
+ "<span>[</span>%s<span>]</span></a>", msgnum, msgnum, _("Headers"));
/** Print */
wprintf("<a href=\"#\" onClick=\"window.open('printmsg/%ld', 'print%ld', 'toolbar=no,location=no,directories=no,copyhistory=no,status=yes,scrollbars=yes,resizable=yes,width=600,height=400'); \" >"
- "[%s]</a>", msgnum, msgnum, _("Print"));
+ "<span>[</span>%s<span>]</span></a>", msgnum, msgnum, _("Print"));
+
+ wprintf("</div>");
- wprintf("</span></td>");
}
- wprintf("</tr></table>\n");
+
/** Begin body */
- wprintf("<table border=0 width=100%% bgcolor=\"#FFFFFF\" "
- "cellpadding=1 cellspacing=0><tr><td>");
+ wprintf("<div class=\"message_content\">");
/**
* Learn the content type
if (!strcmp(buf, "000")) {
wprintf("<i>");
wprintf(_("unexpected end of message"));
- wprintf("</i><br /><br />\n");
+ wprintf(" (2)</i><br /><br />\n");
goto ENDBODY;
}
- if (!strncasecmp(buf, "Content-type: ", 14)) {
- safestrncpy(mime_content_type, &buf[14],
- sizeof(mime_content_type));
+ if (!strncasecmp(buf, "X-Citadel-MSG4-Partnum:", 23)) {
+ safestrncpy(msg4_partnum, &buf[23], sizeof(msg4_partnum));
+ striplt(msg4_partnum);
+ }
+ if (!strncasecmp(buf, "Content-type:", 13)) {
+ safestrncpy(mime_content_type, &buf[13], sizeof(mime_content_type));
+ striplt(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],
/** Afterwards, offer links to download attachments 'n' such */
- if ( (strlen(mime_http) > 0) && (!section[0]) ) {
- wprintf("%s", mime_http);
+ if ( (num_attach_links > 0) && (!section[0]) ) {
+ for (i=0; i<num_attach_links; ++i) {
+ if (strcasecmp(attach_links[i].partnum, msg4_partnum)) {
+ wprintf("%s", attach_links[i].html);
+ }
+ }
}
/** Handler for vCard parts */
}
ENDBODY:
- wprintf("</td></tr></table>\n");
+ wprintf("</div>\n");
/** end everythingamundo table */
if (!printable_view) {
- wprintf("</td></tr></table>\n");
- wprintf("</div><br />\n");
+ wprintf("</div>\n");
+ }
+
+ if (num_attach_links > 0) {
+ free(attach_links);
}
#ifdef HAVE_ICONV
/**
* \brief Read message in simple, JavaScript-embeddable form for 'forward'
- * or 'reply quoted' operations.
+ * 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
while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
if (!strcmp(buf, "000")) {
- wprintf(_("unexpected end of message"));
+ wprintf("%s (3)", _("unexpected end of message"));
return;
}
if (include_headers) {
strcpy(mime_content_type, "text/plain");
while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) {
if (!strcmp(buf, "000")) {
- wprintf(_("unexpected end of message"));
+ wprintf("%s (4)", _("unexpected end of message"));
goto ENDBODY;
}
if (!strncasecmp(buf, "Content-type: ", 14)) {
void display_summarized(int num) {
char datebuf[64];
- wprintf("<tr id=\"m%ld\" style=\"width:100%%;font-weight:%s;background-color:#ffffff\" "
+ wprintf("<tr id=\"m%ld\" style=\"font-weight:%s;\" "
"onMouseDown=\"CtdlMoveMsgMouseDown(event,%ld)\">",
WC->summ[num].msgnum,
(WC->summ[num].is_new ? "bold" : "normal"),
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")) {
+ if ( (!strcasecmp(mime_content_type, "text/x-vcard"))
+ || (!strcasecmp(mime_content_type, "text/vcard")) ) {
strcpy(vcard_partnum, mime_partnum);
}
memset(&summ, 0, sizeof(summ));
safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
- sprintf(buf, "MSG0 %ld|1", msgnum); /** ask for headers only */
+ sprintf(buf, "MSG0 %ld|0", msgnum); /** unfortunately we need the mime info now */
serv_puts(buf);
serv_getln(buf, sizeof buf);
if (buf[0] != '1') return;
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")) {
+ if ( (!strcasecmp(mime_content_type, "text/x-vcard"))
+ || (!strcasecmp(mime_content_type, "text/vcard")) ) {
strcpy(vcard_partnum, mime_partnum);
}
int bg = 0;
static int NAMESPERPAGE = 60;
int num_pages = 0;
- int page = 0;
int tabfirst = 0;
- char tabfirst_label[SIZ];
+ char tabfirst_label[64];
int tablast = 0;
- char tablast_label[SIZ];
+ char tablast_label[64];
+ char this_tablabel[64];
+ int page = 0;
+ char **tablabels;
if (num_ab == 0) {
wprintf("<br /><br /><br /><div align=\"center\"><i>");
qsort(addrbook, num_ab, sizeof(struct addrbookent), abcmp);
}
- num_pages = num_ab / NAMESPERPAGE;
+ num_pages = (num_ab / NAMESPERPAGE) + 1;
- page = atoi(bstr("page"));
+ tablabels = malloc(num_pages * sizeof (char *));
+ if (tablabels == NULL) {
+ wprintf("<br /><br /><br /><div align=\"center\"><i>");
+ wprintf(_("An internal error has occurred."));
+ wprintf("</i></div>\n");
+ return;
+ }
- wprintf("Page: ");
- for (i=0; i<=num_pages; ++i) {
- if (i != page) {
- wprintf("<a href=\"readfwd?page=%d\">", i);
- }
- else {
- wprintf("<B>");
- }
+ for (i=0; i<num_pages; ++i) {
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");
- }
+ sprintf(this_tablabel, "%s - %s", tabfirst_label, tablast_label);
+ tablabels[i] = strdup(this_tablabel);
}
- wprintf("<br />\n");
- wprintf("<table border=0 cellspacing=0 "
- "cellpadding=3 width=100%%>\n"
- );
+ tabbed_dialog(num_pages, tablabels);
+ page = (-1);
for (i=0; i<num_ab; ++i) {
- if ((i / NAMESPERPAGE) == page) {
+ if ((i / NAMESPERPAGE) != page) { /* New tab */
+ page = (i / NAMESPERPAGE);
+ if (page > 0) {
+ wprintf("</tr></table>\n");
+ end_tab(page-1, num_pages);
+ }
+ begin_tab(page, num_pages);
+ wprintf("<table border=0 cellspacing=0 cellpadding=3 width=100%%>\n");
+ displayed = 0;
+ }
- if ((displayed % 4) == 0) {
- if (displayed > 0) {
- wprintf("</tr>\n");
- }
- bg = 1 - bg;
- wprintf("<tr bgcolor=\"#%s\">",
- (bg ? "DDDDDD" : "FFFFFF")
- );
+ if ((displayed % 4) == 0) {
+ if (displayed > 0) {
+ wprintf("</tr>\n");
}
-
- 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;
+ 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("</tr></table>\n");
+ end_tab((num_pages-1), num_pages);
+
+ for (i=0; i<num_pages; ++i) {
+ free(tablabels[i]);
+ }
+ free(tablabels);
}
}
if (is_summary) {
- wprintf("</div>\n"); /** end of 'content' div */
wprintf("<script language=\"javascript\" type=\"text/javascript\">"
" document.onkeydown = CtdlMsgListKeyPress; "
"<table cellspacing=0 style=\"width:100%%\">"
"<tr>"
);
- wprintf("<td width=%d%%><b><i>%s</i></b> %s</td>"
- "<td width=%d%%><b><i>%s</i></b> %s</td>"
- "<td width=%d%%><b><i>%s</i></b> %s"
+ wprintf("<th width=%d%%>%s %s</th>"
+ "<th width=%d%%>%s %s</th>"
+ "<th width=%d%%>%s %s"
" "
- "<input type=\"submit\" name=\"delete_button\" style=\"font-size:6pt\" "
+ "<input type=\"submit\" name=\"delete_button\" id=\"delbutton\" "
" onClick=\"CtdlDeleteSelectedMessages(event)\" "
" value=\"%s\">"
- "</td>"
+ "</th>"
"</tr>\n"
,
SUBJ_COL_WIDTH_PCT,
"<div class=\"fix_scrollbar_bug\">\n"
- "<table class=\"mailbox_summary\" id=\"summary_headers\" rules=rows "
+ "<table class=\"mailbox_summary\" id=\"summary_headers\" "
"cellspacing=0 style=\"width:100%%;-moz-user-select:none;\">"
);
}
/** Here's the grab-it-to-resize-the-message-list widget */
wprintf("<div id=\"resize_msglist\" "
"onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
- "<div class=\"fix_scrollbar_bug\">"
- "<table width=100%% border=3 cellspacing=0 "
- "bgcolor=\"#cccccc\" "
- "cellpadding=0><TR><TD> </td></tr></table>"
+ "<div class=\"fix_scrollbar_bug\"> <hr>"
"</div></div>\n"
);
}
/** Note: wDumpContent() will output one additional </div> tag. */
+ wprintf("</div>\n"); /** end of 'content' div */
wDumpContent(1);
- if (addrbook != NULL) free(addrbook);
/** free the summary */
if (WC->summ != NULL) {
WC->num_summ = 0;
WC->summ = NULL;
}
+ if (addrbook != NULL) free(addrbook);
}
}
if (is_multipart) {
- sprintf(boundary, "=_Citadel_Multipart_%s_%04x%04x",
+ sprintf(boundary, "Citadel--Multipart--%s--%04x--%04x",
serv_info.serv_fqdn,
getpid(),
++seq
static long dont_post = (-1L);
struct wc_attachment *att, *aptr;
int is_anonymous = 0;
+ char *display_name;
- if (!strcasecmp(bstr("is_anonymous"), "yes")) {
+ display_name = bstr("display_name");
+ if (!strcmp(display_name, "__ANONYMOUS__")) {
+ display_name = "";
is_anonymous = 1;
}
if (WC->upload_length > 0) {
+ lprintf(9, "%s:%d: we are uploading %d bytes\n", __FILE__, __LINE__, WC->upload_length);
/** There's an attachment. Save it to this struct... */
att = malloc(sizeof(struct wc_attachment));
memset(att, 0, sizeof(struct wc_attachment));
"saved this message."));
} else {
rfc2047encode(encoded_subject, sizeof encoded_subject, bstr("subject"));
- sprintf(buf, "ENT0 1|%s|%d|4|%s|||%s|%s|%s",
+ sprintf(buf, "ENT0 1|%s|%d|4|%s|%s||%s|%s|%s|%s",
bstr("recp"),
is_anonymous,
encoded_subject,
+ display_name,
bstr("cc"),
bstr("bcc"),
- bstr("wikipage")
+ bstr("wikipage"),
+ bstr("my_email_addr")
);
serv_puts(buf);
serv_getln(buf, sizeof buf);
}
dont_post = atol(bstr("postseq"));
} else {
+ lprintf(9, "%s:%d: server post error: %s\n", __FILE__, __LINE__, buf);
sprintf(WC->ImportantMessage, "%s", &buf[4]);
display_enter();
return;
char buf[SIZ];
char ebuf[SIZ];
long now;
+ char *display_name;
struct wc_attachment *att;
int recipient_required = 0;
+ int subject_required = 0;
int recipient_bad = 0;
int i;
int is_anonymous = 0;
long existing_page = (-1L);
+ now = time(NULL);
+
if (strlen(bstr("force_room")) > 0) {
gotoroom(bstr("force_room"));
}
- if (!strcasecmp(bstr("is_anonymous"), "yes")) {
+ display_name = bstr("display_name");
+ if (!strcmp(display_name, "__ANONYMOUS__")) {
+ display_name = "";
is_anonymous = 1;
}
/** 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;
}
return;
}
+ /* Is the server strongly recommending that the user enter a message subject? */
+ if ((buf[3] != '\0') && (buf[4] != '\0')) {
+ subject_required = extract_int(&buf[4], 1);
+ }
+
/**
* Are we perhaps in an address book view? If so, then an "enter
* message" command really means "add new entry."
embed_room_banner(NULL, navbar_none);
wprintf("</div>\n");
wprintf("<div id=\"content\">\n"
- "<div class=\"fix_scrollbar_bug\">"
- "<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
+ "<div class=\"fix_scrollbar_bug message \">");
/** Now check our actual recipients if there are any */
if (recipient_required) {
- sprintf(buf, "ENT0 0|%s|%d|0||||%s|%s|%s", bstr("recp"), is_anonymous,
+ sprintf(buf, "ENT0 0|%s|%d|0||%s||%s|%s|%s",
+ bstr("recp"),
+ is_anonymous,
+ display_name,
bstr("cc"), bstr("bcc"), bstr("wikipage"));
serv_puts(buf);
serv_getln(buf, sizeof buf);
/** If we got this far, we can display the message entry screen. */
- now = time(NULL);
- fmt_date(buf, now, 0);
- strcat(&buf[strlen(buf)], _(" <I>from</I> "));
- stresc(&buf[strlen(buf)], WC->wc_fullname, 1, 1);
-
- /* Don't need this anymore, it's in the input box below
- if (strlen(bstr("recp")) > 0) {
- strcat(&buf[strlen(buf)], _(" <I>to</I> "));
- stresc(&buf[strlen(buf)], bstr("recp"), 1, 1);
- }
- */
-
- strcat(&buf[strlen(buf)], _(" <I>in</I> "));
- stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
-
/** begin message entry screen */
wprintf("<form "
"enctype=\"multipart/form-data\" "
wprintf("<input type=\"hidden\" name=\"wikipage\" value=\"%s\">\n", bstr("wikipage"));
}
wprintf("<input type=\"hidden\" name=\"return_to\" value=\"%s\">\n", bstr("return_to"));
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+
+ /** header bar */
+
+ wprintf("<img src=\"static/newmess3_24x.gif\" class=\"imgedit\">");
+ wprintf(" "); /** header bar */
+ fmt_date(buf, now, 0);
+ wprintf("%s", buf);
+ wprintf("\n"); /** header bar */
+
+ wprintf("<div>");
+ wprintf("<label for=\"from_id\" > ");
+ wprintf(_(" <I>from</I> "));
+ wprintf("</label>");
+
+ /* Allow the user to select any of his valid screen names */
+
+ wprintf("<select name=\"display_name\" size=1 id=\"from_id\">\n");
+
+ serv_puts("GVSN");
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '1') {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ wprintf("<option %s value=\"",
+ ((!strcasecmp(bstr("display_name"), buf)) ? "selected" : "")
+ );
+ escputs(buf);
+ wprintf("\">");
+ escputs(buf);
+ wprintf("</option>\n");
+ }
+ }
- wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
- wprintf("%s\n", buf); /** header bar */
if (WC->room_flags & QR_ANONOPT) {
- wprintf(" "
- "<input type=\"checkbox\" name=\"is_anonymous\" value=\"yes\" %s>",
- (is_anonymous ? "checked" : "")
+ wprintf("<option %s value=\"__ANONYMOUS__\">%s</option>\n",
+ ((!strcasecmp(bstr("__ANONYMOUS__"), WC->wc_fullname)) ? "selected" : ""),
+ _("Anonymous")
);
- wprintf("Anonymous");
}
- wprintf("<br>\n"); /** header bar */
- wprintf("<table border=\"0\" width=\"100%%\">\n");
+ wprintf("</select>\n");
+
+ /* If this is an email (not a post), allow the user to select any of his
+ * valid email addresses.
+ */
+ if (recipient_required) {
+ serv_puts("GVEA");
+ serv_getln(buf, sizeof buf);
+ if (buf[0] == '1') {
+ wprintf("<select name=\"my_email_addr\" size=1>\n");
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ wprintf("<option value=\"");
+ escputs(buf);
+ wprintf("\"><");
+ escputs(buf);
+ wprintf("></option>\n");
+ }
+ wprintf("</select>\n");
+ }
+ }
+
+ wprintf(_(" <I>in</I> "));
+ escputs(WC->wc_roomname);
+ wprintf("</div>");
+
if (recipient_required) {
- wprintf("<tr><td>");
- wprintf("<font size=-1>");
+ wprintf("<div style=\"float: left;\"><label for=\"recp_id\"> ");
wprintf(_("To:"));
- wprintf("</font>");
- wprintf("</td><td>"
+ wprintf("</label>"
"<input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
escputs(bstr("recp"));
- wprintf("\" size=50 maxlength=1000 />");
+ wprintf("\" size=45 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("<br/><label for=\"cc_id\"> ");
wprintf(_("CC:"));
- wprintf("</font>");
- wprintf("</td><td>"
+ wprintf("</label>"
"<input autocomplete=\"off\" type=\"text\" name=\"cc\" id=\"cc_id\" value=\"");
escputs(bstr("cc"));
- wprintf("\" size=50 maxlength=1000 />");
+ wprintf("\" size=45 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("<br/><label for=\"bcc_id\"> ");
wprintf(_("BCC:"));
- wprintf("</font>");
- wprintf("</td><td>"
+ wprintf("</label>"
"<input autocomplete=\"off\" type=\"text\" name=\"bcc\" id=\"bcc_id\" value=\"");
escputs(bstr("bcc"));
- wprintf("\" size=50 maxlength=1000 />");
+ wprintf("\" size=45 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("</div>");
+
+ /** Pop open an address book -- begin **/
+ wprintf(
+ "<a href=\"javascript:PopOpenAddressBook('recp_id|%s|cc_id|%s|bcc_id|%s');\" "
+ "title=\"%s\">"
+ "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+ " %s</a>",
+ _("To:"), _("CC:"), _("BCC:"),
+ _("Contacts"), _("Contacts")
+ );
+ /** Pop open an address book -- end **/
}
- 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=50 maxlength=70></td><td>\n");
-
- wprintf("<input type=\"submit\" name=\"send_button\" value=\"");
- if (recipient_required) {
- wprintf(_("Send message"));
- } else {
- wprintf(_("Post message"));
+ wprintf("<div style=\"clear: both;\"><label for=\"subject_id\" > ");
+ if (recipient_required || subject_required) {
+ wprintf(_("Subject:"));
}
- wprintf("\"> "
- "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
- wprintf("</td></tr></table>\n");
+ else {
+ wprintf(_("Subject (optional):"));
+ }
+ wprintf("</label>"
+ "<input type=\"text\" name=\"subject\" id=\"subject_id\" value=\" ");
+ escputs(bstr("subject"));
+ wprintf("\" size=45 maxlength=70>\n");
- wprintf("<center>");
+ wprintf("</div>\n");
wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
}
wprintf("</textarea>");
- wprintf("</center><br />\n");
/**
- * The following script embeds the TinyMCE richedit control, and automatically
+ * The following template embeds the TinyMCE richedit control, and automatically
* transforms the textarea into a richedit textarea.
*/
- wprintf(
- "<script language=\"javascript\" type=\"text/javascript\" src=\"tiny_mce/tiny_mce.js\"></script>\n"
- "<script language=\"javascript\" type=\"text/javascript\">"
- "tinyMCE.init({"
- " mode : \"textareas\", width : \"100%%\", browsers : \"msie,gecko\", "
- " theme : \"advanced\", plugins : \"iespell\", "
- " theme_advanced_buttons1 : \"bold, italic, underline, strikethrough, justifyleft, justifycenter, justifyright, justifyfull, bullist, numlist, cut, copy, paste, link, image, help, forecolor, iespell, code\", "
- " theme_advanced_buttons2 : \"\", "
- " theme_advanced_buttons3 : \"\", "
- " content_css : \"static/webcit-tinymce.css\" "
- "});"
- "</script>\n"
- );
-
+ do_template("richedit");
/** Enumerate any attachments which are already in place... */
- wprintf("<img src=\"static/diskette_24x.gif\" border=0 "
- "align=middle height=16 width=16> ");
+ wprintf("<div><img src=\"static/diskette_24x.gif\" border=0 ");
wprintf(_("Attachments:"));
wprintf(" ");
wprintf("<select name=\"which_attachment\" size=1>");
/** Now offer the ability to attach additional files... */
wprintf(" ");
wprintf(_("Attach file:"));
- wprintf(" <input NAME=\"attachfile\" "
- "SIZE=16 TYPE=\"file\">\n "
+ wprintf(" <input name=\"attachfile\" "
+ "size=16 type=\"file\">\n "
"<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
+ wprintf("</div>");
- /** Seth asked for these to be at the top *and* bottom... */
+ wprintf("<div class=\"send_edit_msg\">");
wprintf("<input type=\"submit\" name=\"send_button\" value=\"");
if (recipient_required) {
wprintf(_("Send message"));
}
wprintf("\"> "
"<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n", _("Cancel"));
+ wprintf("</div>");
+
/** 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("<input type=\"hidden\" name=\"sig_inserted\" value=\"yes\">\n");
}
wprintf("</form>\n");
+ wprintf("</div></div>\n");
- wprintf("</td></tr></table></div>\n");
-DONE: wDumpContent(1);
+DONE: address_book_popup();
+ wDumpContent(1);
}
-
/**
* \brief delete a message
*/
wprintf("<br />\n");
wprintf("<form METHOD=\"POST\" action=\"move_msg\">\n");
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
projects / citadel.git / blobdiff