int mime_length;
char mime_http[SIZ];
char m_subject[256];
+ char m_cc[1024];
char from[256];
char node[256];
char rfca[256];
char reply_to[512];
- char now[256];
+ char reply_all[4096];
+ char now[64];
int format_type = 0;
int nhdr = 0;
int bq = 0;
strcpy(node, "");
strcpy(rfca, "");
strcpy(reply_to, "");
+ strcpy(reply_all, "");
strcpy(vcard_partnum, "");
strcpy(cal_partnum, "");
strcpy(mime_http, "");
wprintf("<SPAN CLASS=\"message_header\">");
strcpy(m_subject, "");
+ strcpy(m_cc, "");
while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
if (!strcmp(buf, "000")) {
wprintf("</A> ");
}
if (!strncasecmp(buf, "subj=", 5)) {
- strcpy(m_subject, &buf[5]);
+ safestrncpy(m_subject, &buf[5], sizeof m_subject);
+ }
+ if (!strncasecmp(buf, "cccc=", 5)) {
+ safestrncpy(m_cc, &buf[5], sizeof m_cc);
+ if (strlen(reply_all) > 0) {
+ strcat(reply_all, ", ");
+ }
+ safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
+ (sizeof reply_all - strlen(reply_all)) );
}
if ((!strncasecmp(buf, "hnod=", 5))
&& (strcasecmp(&buf[5], serv_info.serv_humannode))) {
}
if (!strncasecmp(buf, "rcpt=", 5)) {
wprintf(_("to "));
- wprintf("%s ", &buf[5]);
+ escputs(&buf[5]);
+ wprintf(" ");
+ if (strlen(reply_all) > 0) {
+ strcat(reply_all, ", ");
+ }
+ safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
+ (sizeof reply_all - strlen(reply_all)) );
}
if (!strncasecmp(buf, "time=", 5)) {
fmt_date(now, atol(&buf[5]), 0);
wprintf("</SPAN>");
#ifdef HAVE_ICONV
+ utf8ify_rfc822_string(m_cc);
utf8ify_rfc822_string(m_subject);
#endif
+ if (strlen(m_cc) > 0) {
+ wprintf("<br />"
+ "<SPAN CLASS=\"message_subject\">");
+ wprintf(_("CC:"));
+ wprintf(" ");
+ escputs(m_cc);
+ wprintf("</SPAN>");
+ }
if (strlen(m_subject) > 0) {
wprintf("<br />"
"<SPAN CLASS=\"message_subject\">");
wprintf(_("Subject:"));
- wprintf(" %s</SPAN>", m_subject
- );
+ wprintf(" ");
+ escputs(m_subject);
+ wprintf("</SPAN>");
}
wprintf("</TD>\n");
urlescputs(m_subject);
wprintf("\">[%s]</a> ", _("Reply"));
+ /* ReplyAll */
+ if (WC->wc_view == VIEW_MAILBOX) {
+ wprintf("<a href=\"/display_enter?recp=");
+ urlescputs(reply_to);
+ wprintf("?cc=");
+ urlescputs(reply_all);
+ wprintf("?subject=");
+ if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+ urlescputs(m_subject);
+ wprintf("\">[%s]</a> ", _("ReplyAll"));
+ }
+
/* Forward */
if (WC->wc_view == VIEW_MAILBOX) {
wprintf("<a href=\"/display_enter?pullquote=%ld?subject=", msgnum);
targetdiv = bstr("targetdiv");
print_it = bstr("print_it");
- output_headers(1, 0, 0, 0, 0, 1, 0);
+ output_headers(1, 0, 0, 0, 1, 0);
begin_burst();
wprintf("<html><head>");
char tablast_label[SIZ];
if (num_ab == 0) {
- wprintf("<I>");
+ wprintf("<br /><br /><br /><div align=\"center\"><i>");
wprintf(_("This address book is empty."));
- wprintf("</I>\n");
+ wprintf("</i></div>\n");
return;
}
if (strlen(sortby) == 0) sortby = sortpref_value;
if (strlen(sortby) == 0) sortby = "msgid";
- output_headers(1, 1, 1, 0, 0, 0, 0);
+ output_headers(1, 1, 1, 0, 0, 0);
/* When in summary mode, always show ALL messages instead of just
* new or old. Otherwise, show what the user asked for.
nummsgs = load_msg_ptrs(cmd, is_summary);
if (nummsgs == 0) {
- if ((!is_tasks) && (!is_calendar) && (!is_notes)) {
+ if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
wprintf("<em>");
if (!strcmp(oper, "readnew")) {
wprintf(_("No new messages."));
"</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 */
}
_("Automatically cancelled because you have already "
"saved this message."));
} else {
- sprintf(buf, "ENT0 1|%s|0|4|%s",
+ sprintf(buf, "ENT0 1|%s|0|4|%s|||%s|%s",
bstr("recp"),
- bstr("subject") );
+ bstr("subject"),
+ bstr("cc"),
+ bstr("bcc")
+ );
serv_puts(buf);
serv_getln(buf, sizeof buf);
if (buf[0] == '4') {
post_mime_to_server();
- if (strlen(bstr("recp")) > 0) {
+ if ( (strlen(bstr("recp")) > 0)
+ || (strlen(bstr("cc")) > 0)
+ || (strlen(bstr("bcc")) > 0)
+ ) {
sprintf(WC->ImportantMessage, _("Message has been sent.\n"));
}
else {
/*
* Otherwise proceed normally.
-` * Do a custom room banner with no navbar...
+ * Do a custom room banner with no navbar...
*/
- output_headers(1, 1, 2, 0, 0, 0, 0);
+ output_headers(1, 1, 2, 0, 0, 0);
wprintf("<div id=\"banner\">\n");
embed_room_banner(NULL, navbar_none);
wprintf("</div>\n");
"<div id=\"fix_scrollbar_bug\">"
"<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
- sprintf(buf, "ENT0 0|%s|0|0", bstr("recp"));
- serv_puts(buf);
+ /* First test to see whether this is a room that requires recipients to be entered */
+ serv_puts("ENT0 0");
serv_getln(buf, sizeof buf);
-
- if (!strncmp(buf, "570", 3)) {
+ if (!strncmp(buf, "570", 3)) { /* 570 means that we need a recipient here */
recipient_required = 1;
- if (strlen(bstr("recp")) > 0) {
- recipient_bad = 1;
- }
}
- else if (buf[0] != '2') {
+ else if (buf[0] != '2') { /* Any other error means that we cannot continue */
wprintf("<EM>%s</EM><br />\n", &buf[4]);
goto DONE;
}
+ /* Now check our actual recipients if there are any */
+ if (recipient_required) {
+ sprintf(buf, "ENT0 0|%s|0|0||||%s|%s", bstr("recp"), bstr("cc"), bstr("bcc"));
+ serv_puts(buf);
+ serv_getln(buf, sizeof buf);
+
+ if (!strncmp(buf, "570", 3)) { /* 570 means we have an invalid recipient listed */
+ if (strlen(bstr("recp")) + strlen(bstr("cc")) + strlen(bstr("bcc")) > 0) {
+ recipient_bad = 1;
+ }
+ }
+ else if (buf[0] != '2') { /* Any other error means that we cannot continue */
+ wprintf("<EM>%s</EM><br />\n", &buf[4]);
+ goto DONE;
+ }
+ }
+
+ /* If we got this far, we can display the message entry screen. */
+
now = time(NULL);
fmt_date(buf, now, 0);
strcat(&buf[strlen(buf)], _(" <I>from</I> "));
stresc(&buf[strlen(buf)], WC->wc_username, 1, 1);
+
+ /* Don't need this anymore, it's in the input box below
if (strlen(bstr("recp")) > 0) {
strcat(&buf[strlen(buf)], _(" <I>to</I> "));
stresc(&buf[strlen(buf)], bstr("recp"), 1, 1);
}
+ */
+
strcat(&buf[strlen(buf)], _(" <I>in</I> "));
stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
/* begin message entry screen */
-
-
- wprintf(
- "<style> div.auto_complete { width: 350px; background: #fff; } div.auto_complete ul { border:1px solid #888; margin:0; padding:0; width:100%; list-style-type:none; } div.auto_complete ul li { margin:0; padding:3px; } div.auto_complete ul li.selected { background-color: #ffc; } div.auto_complete ul strong.highlight { color: #800; margin:0; padding:0; } </style> \n "
- );
-
wprintf("<form enctype=\"multipart/form-data\" "
"method=\"POST\" action=\"/post\" "
"name=\"enterform\""
"onSubmit=\"return submitForm();\""
">\n");
- wprintf("<input type=\"hidden\" name=\"recp\" value=\"%s\">\n",
- bstr("recp"));
- wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n",
- now);
+ wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n", now);
wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
wprintf("%s<br>\n", buf); /* header bar */
wprintf("<table border=\"0\" width=\"100%%\">\n");
if (recipient_required) {
+
wprintf("<tr><td>");
wprintf("<font size=-1>");
wprintf(_("To:"));
wprintf("</font>");
wprintf("</td><td>"
- "<input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_name\" value=\"");
+ "<input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
escputs(bstr("recp"));
- wprintf("\" size=50 maxlength=70>");
-
+ wprintf("\" size=50 maxlength=1000 />");
wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
-
- wprintf("<script type=\"text/javascript\"> "
- " new Ajax.Autocompleter('recp_name', 'recp_name_choices', "
- " '/recp_autocomplete', {} ); "
- "</script>\n "
- );
+ wprintf("</td><td></td></tr>\n");
+
+ wprintf("<tr><td>");
+ wprintf("<font size=-1>");
+ wprintf(_("CC:"));
+ wprintf("</font>");
+ wprintf("</td><td>"
+ "<input autocomplete=\"off\" type=\"text\" name=\"cc\" id=\"cc_id\" value=\"");
+ escputs(bstr("cc"));
+ wprintf("\" size=50 maxlength=1000 />");
+ wprintf("<div class=\"auto_complete\" id=\"cc_name_choices\"></div>");
+ wprintf("</td><td></td></tr>\n");
+ wprintf("<tr><td>");
+ wprintf("<font size=-1>");
+ wprintf(_("BCC:"));
+ wprintf("</font>");
+ wprintf("</td><td>"
+ "<input autocomplete=\"off\" type=\"text\" name=\"bcc\" id=\"bcc_id\" value=\"");
+ escputs(bstr("bcc"));
+ wprintf("\" size=50 maxlength=1000 />");
+ wprintf("<div class=\"auto_complete\" id=\"bcc_name_choices\"></div>");
wprintf("</td><td></td></tr>\n");
+
+ /* Initialize the autocomplete ajax helpers (found in wclib.js) */
+ wprintf("<script type=\"text/javascript\"> \n"
+ " activate_entmsg_autocompleters(); \n"
+ "</script> \n"
+ );
}
wprintf("<tr><td>");
"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("</form>\n");
wprintf("</td></tr></table></div>\n");
msgid = atol(bstr("msgid"));
- output_headers(1, 1, 1, 0, 0, 0, 0);
+ output_headers(1, 1, 1, 0, 0, 0);
sprintf(buf, "DELE %ld", msgid);
serv_puts(buf);
msgid = atol(bstr("msgid"));
- output_headers(1, 1, 1, 0, 0, 0, 0);
+ output_headers(1, 1, 1, 0, 0, 0);
wprintf("<div id=\"fix_scrollbar_bug\">"
"<table width=100%% border=0 bgcolor=\"#444455\"><tr><td>");
msgid = atol(bstr("msgid"));
- output_headers(1, 1, 1, 0, 0, 0, 0);
+ output_headers(1, 1, 1, 0, 0, 0);
if (strlen(bstr("move_button")) > 0) {
sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
projects / citadel.git / blobdiff