/**
* \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 */
#endif
+
+
+/**
+ * \brief RFC2047-encode a header field if necessary.
+ * If no non-ASCII characters are found, the string
+ * will be copied verbatim without encoding.
+ *
+ * \param target Target buffer.
+ * \param maxlen Maximum size of target buffer.
+ * \param source Source string to be encoded.
+ */
+void rfc2047encode(char *target, int maxlen, char *source)
+{
+ int need_to_encode = 0;
+ int i;
+ unsigned char ch;
+
+ if (target == NULL) return;
+
+ for (i=0; i<strlen(source); ++i) {
+ if ((source[i] < 32) || (source[i] > 126)) {
+ need_to_encode = 1;
+ }
+ }
+
+ if (!need_to_encode) {
+ safestrncpy(target, source, maxlen);
+ return;
+ }
+
+ strcpy(target, "=?UTF-8?Q?");
+ for (i=0; i<strlen(source); ++i) {
+ ch = (unsigned char) source[i];
+ if ((ch < 32) || (ch > 126) || (ch == 61)) {
+ sprintf(&target[strlen(target)], "=%02X", ch);
+ }
+ else {
+ sprintf(&target[strlen(target)], "%c", ch);
+ }
+ }
+
+ strcat(target, "?=");
+}
+
+
+
+
/**
* \brief 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.
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);
}
+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, "");
}
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)
}
/** 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> ",
msgnum, _("Move"));
wprintf("</tr></table>\n");
/** Begin body */
- wprintf("<table border=0 width=100%% bgcolor=\"#FFFFFF\" "
+ wprintf("<table class=\"messages_background\" "
"cellpadding=1 cellspacing=0><tr><td>");
/**
wprintf("</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],
mime_content_type[i] = 0;
}
}
+ for (i=0; i<strlen(mime_charset); ++i) {
+ if (mime_charset[i] == ';') {
+ mime_charset[i] = 0;
+ }
+ }
}
}
/** 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 */
wprintf("</div><br />\n");
}
+ if (num_attach_links > 0) {
+ free(attach_links);
+ }
+
#ifdef HAVE_ICONV
if (ic != (iconv_t)(-1) ) {
iconv_close(ic);
/**
* \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
char mime_charset[256];
char mime_disposition[256];
int mime_length;
- char mime_http[SIZ];
char *attachments = NULL;
char *ptr = NULL;
int num_attachments = 0;
strcpy(node, "");
strcpy(rfca, "");
strcpy(reply_to, "");
- strcpy(mime_http, "");
strcpy(mime_content_type, "text/plain");
strcpy(mime_charset, "us-ascii");
* yet because we're in the middle of a server transaction.
*/
if (!strncasecmp(buf, "part=", 5)) {
- ptr = realloc(attachments, ((num_attachments+1) * 1024));
+ ptr = malloc( (strlen(buf) + ((attachments != NULL) ? strlen(attachments) : 0)) ) ;
if (ptr != NULL) {
++num_attachments;
+ sprintf(ptr, "%s%s\n",
+ ((attachments != NULL) ? attachments : ""),
+ &buf[5]
+ );
+ free(attachments);
attachments = ptr;
- strcat(attachments, &buf[5]);
- strcat(attachments, "\n");
+ lprintf(9, "attachments=<%s>\n", attachments);
}
}
/*
* tracing ... uncomment if necessary
*
+ */
lprintf(9, "fwd filename: %s\n", mime_filename);
lprintf(9, "fwd partnum : %s\n", mime_partnum);
lprintf(9, "fwd conttype: %s\n", mime_content_type);
lprintf(9, "fwd dispose : %s\n", mime_disposition);
lprintf(9, "fwd length : %d\n", mime_length);
- */
if ( (!strcasecmp(mime_disposition, "inline"))
|| (!strcasecmp(mime_disposition, "attachment")) ) {
}
}
- if (attachments != NULL) {
- free(attachments);
- }
}
#ifdef HAVE_ICONV
iconv_close(ic);
}
#endif
+
+ if (attachments != NULL) {
+ free(attachments);
+ }
}
/**
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);
}
serv_puts(servcmd);
serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
- wprintf("<EM>%s</EM><br />\n", &buf[4]);
return (nummsgs);
}
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
*/
void readloop(char *oper)
{
- char cmd[SIZ];
+ char cmd[256];
char buf[SIZ];
char old_msgs[SIZ];
int a, b;
else if (!strcmp(oper, "readold")) {
strcpy(cmd, "MSGS OLD");
}
+ else if (!strcmp(oper, "do_search")) {
+ sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
+ }
else {
strcpy(cmd, "MSGS ALL");
}
if ((WC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
is_summary = 1;
- strcpy(cmd, "MSGS ALL");
+ if (!strcmp(oper, "do_search")) {
+ sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
+ }
+ else {
+ strcpy(cmd, "MSGS ALL");
+ }
}
if ((WC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
is_addressbook = 1;
- strcpy(cmd, "MSGS ALL");
+ if (!strcmp(oper, "do_search")) {
+ sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
+ }
+ else {
+ strcpy(cmd, "MSGS ALL");
+ }
maxmsgs = 9999999;
}
- if (is_summary) {
- strcpy(cmd, "MSGS ALL|||1"); /**< fetch header summary */
+ if (is_summary) { /**< fetch header summary */
+ snprintf(cmd, sizeof cmd, "MSGS %s|%s||1",
+ (!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
+ (!strcmp(oper, "do_search") ? bstr("query") : "")
+ );
startmsg = 1;
maxmsgs = 9999999;
}
maxmsgs = 32767;
}
+ if (is_notes) {
+ wprintf("<div align=center>%s</div>\n", _("Click on any note to edit it."));
+ wprintf("<div id=\"new_notes_here\"></div>\n");
+ }
+
nummsgs = load_msg_ptrs(cmd, is_summary);
if (nummsgs == 0) {
if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
- wprintf("<em>");
+ wprintf("<div align=\"center\"><br /><em>");
if (!strcmp(oper, "readnew")) {
wprintf(_("No new messages."));
} else if (!strcmp(oper, "readold")) {
} else {
wprintf(_("No messages here."));
}
- wprintf("</em>\n");
+ wprintf("</em><br /></div>\n");
}
goto DONE;
);
}
- if (is_notes) {
- wprintf("<div align=center>%s</div>\n", _("Click on any note to edit it."));
- wprintf("<div id=\"new_notes_here\"></div>\n");
- }
-
for (a = 0; a < nummsgs; ++a) {
if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
/** RFC2045 requires this, and some clients look for it... */
serv_puts("MIME-Version: 1.0");
+ serv_puts("X-Mailer: " SERVER);
/** If there are attachments, we have to do multipart/mixed */
if (WC->first_attachment != NULL) {
}
if (is_multipart) {
- sprintf(boundary, "=_Citadel_Multipart_%s_%04x%04x",
+ sprintf(boundary, "Citadel--Multipart--%s--%04x--%04x",
serv_info.serv_fqdn,
getpid(),
++seq
encoded_length = ((att->length * 150) / 100);
encoded = malloc(encoded_length);
if (encoded == NULL) break;
- CtdlEncodeBase64(encoded, att->data, att->length);
+ CtdlEncodeBase64(encoded, att->data, att->length, 1);
serv_printf("--%s", boundary);
serv_printf("Content-type: %s", att->content_type);
*/
void post_message(void)
{
- char buf[SIZ];
+ char buf[1024];
+ char encoded_subject[1024];
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));
_("Automatically cancelled because you have already "
"saved this message."));
} else {
- sprintf(buf, "ENT0 1|%s|%d|4|%s|||%s|%s|%s",
+ rfc2047encode(encoded_subject, sizeof encoded_subject, bstr("subject"));
+ sprintf(buf, "ENT0 1|%s|%d|4|%s|%s||%s|%s|%s|%s",
bstr("recp"),
is_anonymous,
- bstr("subject"),
+ 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 recipient_bad = 0;
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;
+ }
+ else if (buf[0] != '2') { /** Any other error means that we cannot continue */
+ sprintf(WC->ImportantMessage, "%s", &buf[4]);
+ readloop("readnew");
+ return;
+ }
+
/**
* Are we perhaps in an address book view? If so, then an "enter
* message" command really means "add new entry."
wprintf("</div>\n");
wprintf("<div id=\"content\">\n"
"<div class=\"fix_scrollbar_bug\">"
- "<table width=100%% border=0 bgcolor=\"#ffffff\"><tr><td>");
-
- /** 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;
- }
- else if (buf[0] != '2') { /** Any other error means that we cannot continue */
- wprintf("<EM>%s</EM><br />\n", &buf[4]);
- goto DONE;
- }
+ "<table class=\"messages_background\"><tr><td>");
/** 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);
}
}
else if (buf[0] != '2') { /** Any other error means that we cannot continue */
- wprintf("<EM>%s</EM><br />\n", &buf[4]);
+ 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_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=\"return_to\" value=\"%s\">\n", bstr("return_to"));
+ /** header bar */
+
wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
- wprintf("%s\n", buf); /** header bar */
+ fmt_date(buf, now, 0);
+ wprintf("%s ", buf);
+
+ wprintf(_(" <I>from</I> "));
+
+ /* Allow the user to select any of his valid screen names */
+
+ wprintf("<select name=\"display_name\" size=1>\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");
+ }
+ }
+
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("</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("<br>\n"); /** header bar */
wprintf("<table border=\"0\" width=\"100%%\">\n");
escputs(bstr("recp"));
wprintf("\" size=50 maxlength=1000 />");
wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
+
+ /** Pop open an address book -- begin **/
+
+ wprintf(
+ "<a href=\"javascript:PopOpenAddressBook();\" title=\"%s\">"
+ "<img border=0 width=16 height=16 src=\"static/viewcontacts_16x.gif\">"
+ "</a>", _("Contacts")
+ );
+
+ /** Pop open an address book -- end **/
+
wprintf("</td><td></td></tr>\n");
wprintf("<tr><td>");
wprintf("<br>"
"<blockquote>");
pullquote_message(atol(bstr("replyquote")), 0, 1);
- wprintf("</blockquote>\n\n");
+ wprintf("</blockquote><br>");
}
/** If we're editing a wiki page, insert the existing page here... */
" 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 : \"\" "
+ " theme_advanced_buttons3 : \"\", "
+ " content_css : \"static/webcit-tinymce.css\" "
"});"
"</script>\n"
);
}
wprintf("</form>\n");
-
wprintf("</td></tr></table></div>\n");
+
+ wprintf("</div>\n"); /* End of 'content' div */
+
+ /* Open a new div, hidden initially, for address book popups.
+ * FIXME put this in its own function so we can use it from the
+ * calendar too.
+ */
+ wprintf("<div id=\"address_book_popup\" style=\"display:none;\">");
+ wprintf("<div id=\"address_book_popup_container_div\">");
+ wprintf("<div id=\"address_book_popup_middle_div\"></div>");
+ wprintf("<div id=\"address_book_inner_div\"></div>");
+ wprintf("</div>");
+ /* The 'address_book_popup' div will be closed by wDumpContent() */
DONE: wDumpContent(1);
}
-
/**
* \brief delete a message
*/
msgid = atol(bstr("msgid"));
- output_headers(1, 1, 1, 0, 0, 0);
-
if (WC->wc_is_trash) { /** Delete from Trash is a real delete */
serv_printf("DELE %ld", msgid);
}
}
serv_getln(buf, sizeof buf);
- wprintf("<EM>%s</EM><br />\n", &buf[4]);
+ sprintf(WC->ImportantMessage, "%s", &buf[4]);
- wDumpContent(1);
+ readloop("readnew");
+}
+
+
+/**
+ * \brief move a message to another folder
+ */
+void move_msg(void)
+{
+ long msgid;
+ char buf[SIZ];
+
+ msgid = atol(bstr("msgid"));
+
+ if (strlen(bstr("move_button")) > 0) {
+ sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
+ serv_puts(buf);
+ serv_getln(buf, sizeof buf);
+ sprintf(WC->ImportantMessage, "%s", &buf[4]);
+ } else {
+ sprintf(WC->ImportantMessage, (_("The message was not moved.")));
+ }
+
+ readloop("readnew");
}
+
/**
* \brief Confirm move of a message
*/
}
-/**
- * \brief move a message to another folder
- */
-void move_msg(void)
-{
- long msgid;
- char buf[SIZ];
-
- msgid = atol(bstr("msgid"));
-
- if (strlen(bstr("move_button")) > 0) {
- sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
- serv_puts(buf);
- serv_getln(buf, sizeof buf);
- sprintf(WC->ImportantMessage, "%s", &buf[4]);
- } else {
- sprintf(WC->ImportantMessage, (_("The message was not moved.")));
- }
-
- readloop("readnew");
-
-}
-
-
/*@}*/
projects / citadel.git / blobdiff