/*
* $Id$
- */
-/**
- * \defgroup MsgDisp Functions which deal with the fetching and displaying of messages.
- * \ingroup WebcitDisplayItems
+ *
+ * Functions which deal with the fetching and displaying of messages.
*
*/
-/*@{*/
+
#include "webcit.h"
-#include "vcard.h"
#include "webserver.h"
#include "groupdav.h"
/**
* \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
* \param buf the stringbuffer to process
*/
void utf8ify_rfc822_string(char *buf) {
- char *start, *end;
+ char *start, *end, *next, *nextend, *ptr;
char newbuf[1024];
char charset[128];
char encoding[16];
char *isav; /**< Saved pointer to input buffer */
char *osav; /**< Saved pointer to output buffer */
int passes = 0;
- int i;
+ int i, len, delta;
int illegal_non_rfc2047_encoding = 0;
/** Sometimes, badly formed messages contain strings which were simply
* handle it anyway by converting from a user-specified default
* charset to UTF-8 if we see any nonprintable characters.
*/
- for (i=0; i<strlen(buf); ++i) {
+ len = strlen(buf);
+ for (i=0; i<len; ++i) {
if ((buf[i] < 32) || (buf[i] > 126)) {
illegal_non_rfc2047_encoding = 1;
+ i = len; ///< take a shortcut, it won't be more than one.
}
}
if (illegal_non_rfc2047_encoding) {
}
}
+ /* pre evaluate the first pair */
+ nextend = end = NULL;
+ len = strlen(buf);
+ start = strstr(buf, "=?");
+ if (start != NULL)
+ end = strstr(start, "?=");
+
+ while ((start != NULL) && (end != NULL))
+ {
+ next = strstr(end, "=?");
+ if (next != NULL)
+ nextend = strstr(next, "?=");
+ if (nextend == NULL)
+ next = NULL;
+
+ /* did we find two partitions */
+ if ((next != NULL) &&
+ ((next - end) > 2))
+ {
+ ptr = end + 2;
+ while ((ptr < next) &&
+ (isspace(*ptr) ||
+ (*ptr == '\r') ||
+ (*ptr == '\n') ||
+ (*ptr == '\t')))
+ ptr ++;
+ /* did we find a gab just filled with blanks? */
+ if (ptr == next)
+ {
+ memmove (end + 2,
+ next,
+ len - (next - start));
+
+ /* now terminate the gab at the end */
+ delta = (next - end) - 2;
+ len -= delta;
+ buf[len] = '\0';
+
+ /* move next to its new location. */
+ next -= delta;
+ nextend -= delta;
+ }
+ }
+ /* our next-pair is our new first pair now. */
+ start = next;
+ end = nextend;
+ }
+
/** Now we handle foreign character sets properly encoded
* in RFC2047 format.
*/
}
}
+#else
+inline void utf8ify_rfc822_string(char *a){};
+
#endif
* \param maxlen Maximum size of target buffer.
* \param source Source string to be encoded.
*/
-void rfc2047encode(char *target, int maxlen, char *source)
+void webcit_rfc2047encode(char *target, int maxlen, char *source)
{
int need_to_encode = 0;
- int i;
+ int i, len;
unsigned char ch;
if (target == NULL) return;
-
- for (i=0; i<strlen(source); ++i) {
+ len = strlen(source);
+ for (i=0; i<len; ++i) {
if ((source[i] < 32) || (source[i] > 126)) {
need_to_encode = 1;
+ i = len; ///< shortcut. won't become more than 1
}
}
}
strcpy(target, "=?UTF-8?Q?");
- for (i=0; i<strlen(source); ++i) {
+ for (i=0; i<len; ++i) {
ch = (unsigned char) source[i];
if ((ch < 32) || (ch > 126) || (ch == 61)) {
sprintf(&target[strlen(target)], "=%02X", ch);
*/
void url(char *buf)
{
-
- int pos;
- int start, end;
- char ench;
+ int len;
+ char *start, *end, *pos;
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))
+ start = NULL;
+ len = strlen(buf);
+ end = buf + len;
+ for (pos = buf; (pos < end) && (start == NULL); ++pos) {
+ if (!strncasecmp(pos, "http://", 7))
start = pos;
- if (!strncasecmp(&buf[pos], "ftp://", 6))
+ if (!strncasecmp(pos, "ftp://", 6))
start = pos;
}
- if (start < 0)
+ if (start == NULL)
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))
+ for (pos = buf+len; pos > start; --pos) {
+ if ( (!isprint(*pos))
+ || (isspace(*pos))
+ || (*pos == '{')
+ || (*pos == '}')
+ || (*pos == '|')
+ || (*pos == '\\')
+ || (*pos == '^')
+ || (*pos == '[')
+ || (*pos == ']')
+ || (*pos == '`')
+ || (*pos == '<')
+ || (*pos == '>')
+ || (*pos == '(')
+ || (*pos == ')')
+ ) {
end = pos;
+ }
}
- strncpy(urlbuf, &buf[start], end - start);
- urlbuf[end - start] = 0;
+ strncpy(urlbuf, start, end - start);
+ urlbuf[end - start] = '\0';
- strncpy(outbuf, buf, start);
- sprintf(&outbuf[start], "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
+ if (start != buf)
+ strncpy(outbuf, buf, start - buf );
+ sprintf(&outbuf[start-buf], "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
LB, QU, urlbuf, QU, QU, TARGET, QU, RB, urlbuf, LB, RB);
- strcat(outbuf, &buf[end]);
+ strcat(outbuf, end);
if ( strlen(outbuf) < 250 )
strcpy(buf, outbuf);
}
void vcard_n_prettyize(char *name)
{
char *original_name;
- int i;
+ int i, j, len;
original_name = strdup(name);
+ len = strlen(original_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 (len > 0) {
+ if (original_name[len-1] == ' ') {
+ original_name[--len] = 0;
}
- if (original_name[strlen(original_name)-1] == ';') {
- original_name[strlen(original_name)-1] = 0;
+ if (original_name[len-1] == ';') {
+ original_name[--len] = 0;
}
}
}
strcpy(name, "");
- for (i=0; i<strlen(original_name); ++i) {
+ j=0;
+ for (i=0; i<len; ++i) {
if (original_name[i] == ';') {
- strcat(name, ", ");
+ name[j++] = ',';
+ name[j++] = ' ';
}
else {
- name[strlen(name)+1] = 0;
- name[strlen(name)] = original_name[i];
+ name[j++] = original_name[i];
}
}
+ name[j] = '\0';
free(original_name);
}
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) {
-
+ int len;
thisname = strdup(v->prop[i].name);
extract_token(firsttoken, thisname, 0, ';', sizeof firsttoken);
remove_token(thisname, j, ';');
}
}
-
+
+ len = strlen(v->prop[i].value);
+ /* if we have some untagged QP, detect it here. */
+ if (!is_qp && (strstr(v->prop[i].value, "=?")!=NULL))
+ utf8ify_rfc822_string(v->prop[i].value);
+
if (is_qp) {
- thisvalue = malloc(strlen(v->prop[i].value) + 50);
+ // %ff can become 6 bytes in utf8
+ thisvalue = malloc(len * 2 + 3);
j = CtdlDecodeQuotedPrintable(
thisvalue, v->prop[i].value,
- strlen(v->prop[i].value) );
+ len);
thisvalue[j] = 0;
}
else if (is_b64) {
- thisvalue = malloc(strlen(v->prop[i].value) + 50);
+ // ff will become one byte..
+ thisvalue = malloc(len + 50);
CtdlDecodeBase64(
thisvalue, v->prop[i].value,
strlen(v->prop[i].value) );
/** N is name, but only if there's no FN already there */
if (!strcasecmp(firsttoken, "n")) {
- if (strlen(fullname) == 0) {
+ if (IsEmptyStr(fullname)) {
strcpy(fullname, thisvalue);
vcard_n_prettyize(fullname);
}
}
else if (!strcasecmp(firsttoken, "email")) {
- if (strlen(mailto) > 0) strcat(mailto, "<br />");
+ size_t len;
+ if (!IsEmptyStr(mailto)) strcat(mailto, "<br />");
strcat(mailto,
"<a href=\"display_enter"
"?force_room=_MAIL_?recp=");
- urlesc(&mailto[strlen(mailto)], fullname);
- urlesc(&mailto[strlen(mailto)], " <");
- urlesc(&mailto[strlen(mailto)], thisvalue);
- urlesc(&mailto[strlen(mailto)], ">");
+ len = strlen(mailto);
+ urlesc(&mailto[len], SIZ - len, "\"");
+ len = strlen(mailto);
+ urlesc(&mailto[len], SIZ - len, fullname);
+ len = strlen(mailto);
+ urlesc(&mailto[len], SIZ - len, "\" <");
+ len = strlen(mailto);
+ urlesc(&mailto[len], SIZ - len, thisvalue);
+ len = strlen(mailto);
+ urlesc(&mailto[len], SIZ - len, ">");
strcat(mailto, "\">");
- stresc(&mailto[strlen(mailto)], thisvalue, 1, 1);
+ len = strlen(mailto);
+ stresc(mailto+len, SIZ - len, thisvalue, 1, 1);
strcat(mailto, "</A>");
}
else if (!strcasecmp(firsttoken, "tel")) {
- if (strlen(phone) > 0) strcat(phone, "<br />");
+ if (!IsEmptyStr(phone)) strcat(phone, "<br />");
strcat(phone, thisvalue);
for (j=0; j<num_tokens(thisname, ';'); ++j) {
extract_token(buf, thisname, j, ';', sizeof buf);
wprintf("</TD><TD>");
for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
extract_token(buf, thisvalue, j, ';', sizeof buf);
- if (strlen(buf) > 0) {
+ if (!IsEmptyStr(buf)) {
escputs(buf);
if (j<3) wprintf("<br />");
else wprintf(" ");
"<FONT SIZE=+1><B>");
escputs(fullname);
wprintf("</B></FONT>");
- if (strlen(title) > 0) {
+ if (!IsEmptyStr(title)) {
wprintf("<div align=right>");
escputs(title);
wprintf("</div>");
}
- if (strlen(org) > 0) {
+ if (!IsEmptyStr(org)) {
wprintf("<div align=right>");
escputs(org);
wprintf("</div>");
}
wprintf("</TD></TR>\n");
- if (strlen(phone) > 0) {
+ if (!IsEmptyStr(phone)) {
wprintf("<tr><td>");
wprintf(_("Telephone:"));
wprintf("</td><td>%s</td></tr>\n", phone);
}
- if (strlen(mailto) > 0) {
+ if (!IsEmptyStr(mailto)) {
wprintf("<tr><td>");
wprintf(_("E-mail:"));
wprintf("</td><td>%s</td></tr>\n", mailto);
name = vcard_get_prop(v, "n", 1, 0, 0);
if (name != NULL) {
+ utf8ify_rfc822_string(name);
strcpy(buf, name);
this_alpha = buf[0];
}
};
-/**
- * \brief I wanna SEE that message!
- * \param msgnum the citadel number of the message to display
- * \param printable_view are we doing a print view?
- * \param section Optional for encapsulated message/rfc822 submessage)
+/*
+ * I wanna SEE that message!
+ *
+ * msgnum Message number to display
+ * printable_view Nonzero to display a printable view
+ * section Optional for encapsulated message/rfc822 submessage
*/
void read_message(long msgnum, int printable_view, char *section) {
char buf[SIZ];
- char mime_partnum[256];
- char mime_filename[256];
- char mime_content_type[256];
- char mime_charset[256];
- char mime_disposition[256];
+ char mime_partnum[256] = "";
+ char mime_name[256] = "";
+ char mime_filename[256] = "";
+ char escaped_mime_filename[256] = "";
+ char mime_content_type[256] = "";
+ const char *mime_content_type_ptr;
+ char mime_charset[256] = "";
+ char mime_disposition[256] = "";
int mime_length;
struct attach_link *attach_links = NULL;
int num_attach_links = 0;
- char mime_submessages[256];
- char m_subject[256];
- char m_cc[1024];
- char from[256];
- char node[256];
- char rfca[256];
- char reply_to[512];
- char reply_all[4096];
- char now[64];
+ char mime_submessages[256] = "";
+ char m_subject[1024] = "";
+ char m_cc[1024] = "";
+ char from[256] = "";
+ char node[256] = "";
+ char rfca[256] = "";
+ char reply_to[512] = "";
+ char reply_all[4096] = "";
+ char now[64] = "";
int format_type = 0;
int nhdr = 0;
int bq = 0;
int i = 0;
- char vcard_partnum[256];
- char cal_partnum[256];
+ char vcard_partnum[256] = "";
+ char cal_partnum[256] = "";
char *part_source = NULL;
- char msg4_partnum[32];
+ char msg4_partnum[32] = "";
#ifdef HAVE_ICONV
iconv_t ic = (iconv_t)(-1) ;
char *ibuf; /**< Buffer of characters to be converted */
char *osav; /**< Saved pointer to output buffer */
#endif
- strcpy(from, "");
- strcpy(node, "");
- strcpy(rfca, "");
- strcpy(reply_to, "");
- strcpy(reply_all, "");
- strcpy(vcard_partnum, "");
- strcpy(cal_partnum, "");
strcpy(mime_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("<div class=\"message_header\">");
- wprintf("<span 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))
strcpy(from, &buf[5]);
wprintf(_("from "));
wprintf("<a href=\"showuser?who=");
-#ifdef HAVE_ICONV
utf8ify_rfc822_string(from);
-#endif
urlescputs(from);
wprintf("\">");
escputs(from);
safestrncpy(m_subject, &buf[5], sizeof m_subject);
}
if (!strncasecmp(buf, "cccc=", 5)) {
+ int len;
safestrncpy(m_cc, &buf[5], sizeof m_cc);
- if (strlen(reply_all) > 0) {
+ if (!IsEmptyStr(reply_all)) {
strcat(reply_all, ", ");
}
- safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
- (sizeof reply_all - strlen(reply_all)) );
+ len = strlen(reply_all);
+ safestrncpy(&reply_all[len], &buf[5],
+ (sizeof reply_all - len) );
}
if ((!strncasecmp(buf, "hnod=", 5))
&& (strcasecmp(&buf[5], serv_info.serv_humannode))) {
}
if ((!strncasecmp(buf, "room=", 5))
&& (strcasecmp(&buf[5], WC->wc_roomname))
- && (strlen(&buf[5])>0) ) {
+ && (!IsEmptyStr(&buf[5])) ) {
wprintf(_("in "));
wprintf("%s> ", &buf[5]);
}
if ( ((WC->room_flags & QR_NETWORK)
|| ((strcasecmp(&buf[5], serv_info.serv_nodename)
&& (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
- && (strlen(rfca)==0)
+ && (IsEmptyStr(rfca))
) {
wprintf("@%s ", &buf[5]);
}
}
if (!strncasecmp(buf, "rcpt=", 5)) {
+ int len;
wprintf(_("to "));
- if (strlen(reply_all) > 0) {
+ if (!IsEmptyStr(reply_all)) {
strcat(reply_all, ", ");
}
- safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
- (sizeof reply_all - strlen(reply_all)) );
-#ifdef HAVE_ICONV
+ len = strlen(reply_all);
+ safestrncpy(&reply_all[len], &buf[5],
+ (sizeof reply_all - len) );
utf8ify_rfc822_string(&buf[5]);
-#endif
escputs(&buf[5]);
wprintf(" ");
}
if (!strncasecmp(buf, "time=", 5)) {
- fmt_date(now, atol(&buf[5]), 0);
+ webcit_fmt_date(now, atol(&buf[5]), 0);
+ wprintf("<span>");
wprintf("%s ", now);
+ wprintf("</span>");
}
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 ( (IsEmptyStr(mime_filename)) && (!IsEmptyStr(mime_name)) ) {
+ strcpy(mime_filename, mime_name);
+ }
+
if (!strcasecmp(mime_content_type, "message/rfc822")) {
- if (strlen(mime_submessages) > 0) {
+ if (!IsEmptyStr(mime_submessages)) {
strcat(mime_submessages, "|");
}
strcat(mime_submessages, mime_partnum);
else if ( ( (!strcasecmp(mime_disposition, "attachment"))
|| (!strcasecmp(mime_disposition, "inline"))
|| (!strcasecmp(mime_disposition, ""))
- ) && (strlen(mime_content_type) > 0)
+ ) && (!IsEmptyStr(mime_content_type))
) {
++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);
+ utf8ify_rfc822_string(mime_filename);
+
+ mime_content_type_ptr = mime_content_type;
+ if (strcasecmp(mime_content_type, "application/octet-stream") == 0) {
+ mime_content_type_ptr = GuessMimeByFilename(mime_filename,
+ strlen(mime_filename));
+ }
+ urlesc(escaped_mime_filename, 265, mime_filename);
snprintf(attach_links[num_attach_links-1].html, 1024,
- "<img src=\"static/diskette_24x.gif\" "
+ "<img src=\"display_mime_icon?type=%s\" "
"border=0 align=middle>\n"
"%s (%s, %d bytes) [ "
"<a href=\"mimepart/%ld/%s/%s\""
" | "
"<a href=\"mimepart_download/%ld/%s/%s\">%s</a>"
" ]<br />\n",
+ mime_content_type_ptr,
mime_filename,
mime_content_type, mime_length,
- msgnum, mime_partnum, mime_filename,
+ msgnum, mime_partnum, escaped_mime_filename,
msgnum, mime_partnum,
_("View"),
- msgnum, mime_partnum, mime_filename,
+ msgnum, mime_partnum, escaped_mime_filename,
_("Download")
);
}
strcpy(vcard_partnum, mime_partnum);
}
- if (!strcasecmp(mime_content_type, "text/calendar")) {
+ if ( (!strcasecmp(mime_content_type, "text/calendar"))
+ || (!strcasecmp(mime_content_type, "application/ics")) ) {
strcpy(cal_partnum, mime_partnum);
}
}
/** Generate a reply-to address */
- if (strlen(rfca) > 0) {
- if (strlen(from) > 0) {
+ if (!IsEmptyStr(rfca)) {
+ if (!IsEmptyStr(from)) {
snprintf(reply_to, sizeof(reply_to), "%s <%s>", from, rfca);
}
else {
}
}
else {
- if ( (strlen(node) > 0)
+ if ((!IsEmptyStr(node))
&& (strcasecmp(node, serv_info.serv_nodename))
&& (strcasecmp(node, serv_info.serv_humannode)) ) {
snprintf(reply_to, sizeof(reply_to), "%s @ %s",
wprintf("****");
}
- 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(" ");
- escputs(m_subject);
- wprintf("</span>");
- }
- wprintf("</td>\n");
- /** start msg buttons */
- if (!printable_view) {
- wprintf("<td align=right><span class=\"msgbuttons\">\n");
+ /** start msg buttons */
+
+ if (!printable_view) {
+ wprintf("<p id=\"msg%ld\" class=\"msgbuttons\" >\n",msgnum);
/** Reply */
if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
}
wprintf("?recp=");
urlescputs(reply_to);
- if (strlen(m_subject) > 0) {
+ if (!IsEmptyStr(m_subject)) {
wprintf("?subject=");
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 */
wprintf("?replyquote=%ld", msgnum);
wprintf("?recp=");
urlescputs(reply_to);
- if (strlen(m_subject) > 0) {
+ if (!IsEmptyStr(m_subject)) {
wprintf("?subject=");
if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
urlescputs(m_subject);
}
- wprintf("\">[%s]</a> ", _("ReplyQuoted"));
+ wprintf("\"><span>[</span>%s<span>]</span></a> ", _("ReplyQuoted"));
}
}
urlescputs(reply_to);
wprintf("?cc=");
urlescputs(reply_all);
- if (strlen(m_subject) > 0) {
+ if (!IsEmptyStr(m_subject)) {
wprintf("?subject=");
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("</p>");
- wprintf("</span></td>");
}
- wprintf("</tr></table>\n");
+ if (!IsEmptyStr(m_cc)) {
+ wprintf("<p>");
+ wprintf(_("CC:"));
+ wprintf(" ");
+ escputs(m_cc);
+ wprintf("</p>");
+ }
+ if (!IsEmptyStr(m_subject)) {
+ wprintf("<p class=\"message_subject\">");
+ wprintf(_("Subject:"));
+ wprintf(" ");
+ escputs(m_subject);
+ wprintf("</p>");
+ }
+
+ wprintf("</div>");
/** Begin body */
- wprintf("<table class=\"messages_background\" "
- "cellpadding=1 cellspacing=0><tr><td>");
+ wprintf("<div class=\"message_content\">");
/**
* Learn the content type
*/
strcpy(mime_content_type, "text/plain");
- while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) {
+ while (serv_getln(buf, sizeof buf), (!IsEmptyStr(buf))) {
if (!strcmp(buf, "000")) {
- wprintf("<i>");
- wprintf(_("unexpected end of message"));
- wprintf("</i><br /><br />\n");
+ /* This is not necessarily an error condition. See bug #226. */
goto ENDBODY;
}
if (!strncasecmp(buf, "X-Citadel-MSG4-Partnum:", 23)) {
striplt(msg4_partnum);
}
if (!strncasecmp(buf, "Content-type:", 13)) {
+ int len;
safestrncpy(mime_content_type, &buf[13], sizeof(mime_content_type));
striplt(mime_content_type);
- for (i=0; i<strlen(mime_content_type); ++i) {
+ len = strlen(mime_content_type);
+ for (i=0; i<len; ++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) {
+ for (i=0; i<len; ++i) {
if (mime_content_type[i] == ';') {
mime_content_type[i] = 0;
+ len = i - 1;
}
}
- for (i=0; i<strlen(mime_charset); ++i) {
+ len = strlen(mime_charset);
+ for (i=0; i<len; ++i) {
if (mime_charset[i] == ';') {
mime_charset[i] = 0;
+ len = i - 1;
}
}
}
/** Boring old 80-column fixed format text gets handled this way... */
else if ( (!strcasecmp(mime_content_type, "text/plain"))
|| (!strcasecmp(mime_content_type, "text")) ) {
+ buf [0] = '\0';
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;
+ int len;
+ len = strlen(buf);
+ if ((len > 0) && buf[len-1] == '\n') buf[--len] = 0;
+ if ((len > 0) && buf[len-1] == '\r') buf[--len] = 0;
#ifdef HAVE_ICONV
if (ic != (iconv_t)(-1) ) {
}
#endif
- while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
- buf[strlen(buf) - 1] = 0;
+ len = strlen(buf);
+ while ((!IsEmptyStr(buf)) && (isspace(buf[len-1])))
+ buf[--len] = 0;
if ((bq == 0) &&
((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
wprintf("<blockquote>");
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
}
- /** If there are attached submessages, display them now... */
- if ( (strlen(mime_submessages) > 0) && (!section[0]) ) {
+ENDBODY: /* If there are attached submessages, display them now... */
+
+ if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) {
for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
extract_token(buf, mime_submessages, i, '|', sizeof buf);
/** use printable_view to suppress buttons */
}
/** Handler for vCard parts */
- if (strlen(vcard_partnum) > 0) {
+ if (!IsEmptyStr(vcard_partnum)) {
part_source = load_mimepart(msgnum, vcard_partnum);
if (part_source != NULL) {
}
/** Handler for calendar parts */
- if (strlen(cal_partnum) > 0) {
+ if (!IsEmptyStr(cal_partnum)) {
part_source = load_mimepart(msgnum, cal_partnum);
if (part_source != NULL) {
cal_process_attachment(part_source,
part_source = NULL;
}
-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) {
wprintf("Content-type: text/html\r\n"
"Server: %s\r\n"
"Connection: close\r\n",
- SERVER);
+ PACKAGE_STRING);
begin_burst();
wprintf("\r\n\r\n<html>\n"
wprintf("Content-type: text/plain\r\n"
"Server: %s\r\n"
"Connection: close\r\n",
- SERVER);
+ PACKAGE_STRING);
begin_burst();
serv_printf("MSG2 %ld|3", msgnum);
/**
* \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 from[256];
char node[256];
char rfca[256];
+ char to[256];
char reply_to[512];
char now[256];
int format_type = 0;
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) {
if (!strncasecmp(buf, "from=", 5)) {
strcpy(from, &buf[5]);
wprintf(_("from "));
-#ifdef HAVE_ICONV
utf8ify_rfc822_string(from);
-#endif
msgescputs(from);
}
if (!strncasecmp(buf, "subj=", 5)) {
}
if ((!strncasecmp(buf, "room=", 5))
&& (strcasecmp(&buf[5], WC->wc_roomname))
- && (strlen(&buf[5])>0) ) {
+ && (!IsEmptyStr(&buf[5])) ) {
wprintf(_("in "));
wprintf("%s> ", &buf[5]);
}
if ( ((WC->room_flags & QR_NETWORK)
|| ((strcasecmp(&buf[5], serv_info.serv_nodename)
&& (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
- && (strlen(rfca)==0)
+ && (IsEmptyStr(rfca))
) {
wprintf("@%s ", &buf[5]);
}
}
if (!strncasecmp(buf, "rcpt=", 5)) {
wprintf(_("to "));
- wprintf("%s ", &buf[5]);
+ strcpy(to, &buf[5]);
+ utf8ify_rfc822_string(to);
+ wprintf("%s ", to);
}
if (!strncasecmp(buf, "time=", 5)) {
- fmt_date(now, atol(&buf[5]), 0);
+ webcit_fmt_date(now, atol(&buf[5]), 0);
wprintf("%s ", now);
}
}
if (include_headers) {
wprintf("<br>");
-#ifdef HAVE_ICONV
utf8ify_rfc822_string(m_subject);
-#endif
- if (strlen(m_subject) > 0) {
+ if (!IsEmptyStr(m_subject)) {
wprintf(_("Subject:"));
wprintf(" ");
msgescputs(m_subject);
* Learn the content type
*/
strcpy(mime_content_type, "text/plain");
- while (serv_getln(buf, sizeof buf), (strlen(buf) > 0)) {
+ while (serv_getln(buf, sizeof buf), (!IsEmptyStr(buf))) {
if (!strcmp(buf, "000")) {
- wprintf(_("unexpected end of message"));
+ wprintf("%s (4)", _("unexpected end of message"));
goto ENDBODY;
}
if (!strncasecmp(buf, "Content-type: ", 14)) {
+ int len;
safestrncpy(mime_content_type, &buf[14],
sizeof(mime_content_type));
for (i=0; i<strlen(mime_content_type); ++i) {
sizeof mime_charset);
}
}
- for (i=0; i<strlen(mime_content_type); ++i) {
+ len = strlen(mime_content_type);
+ for (i=0; i<len; ++i) {
if (mime_content_type[i] == ';') {
mime_content_type[i] = 0;
+ len = i - 1;
}
}
- for (i=0; i<strlen(mime_charset); ++i) {
+ len = strlen(mime_charset);
+ for (i=0; i<len; ++i) {
if (mime_charset[i] == ';') {
mime_charset[i] = 0;
+ len = i - 1;
}
}
}
/* Boring old 80-column fixed format text gets handled this way... */
else if (!strcasecmp(mime_content_type, "text/plain")) {
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- if (buf[strlen(buf)-1] == '\n') buf[strlen(buf)-1] = 0;
- if (buf[strlen(buf)-1] == '\r') buf[strlen(buf)-1] = 0;
+ int len;
+ len = strlen(buf);
+ if (buf[len-1] == '\n') buf[--len] = 0;
+ if (buf[len-1] == '\r') buf[--len] = 0;
#ifdef HAVE_ICONV
if (ic != (iconv_t)(-1) ) {
ibuf = buf;
- ibuflen = strlen(ibuf);
+ ibuflen = len;
obuflen = SIZ;
obuf = (char *) malloc(obuflen);
osav = obuf;
}
#endif
- while ((strlen(buf) > 0) && (isspace(buf[strlen(buf) - 1])))
- buf[strlen(buf) - 1] = 0;
+ len = strlen(buf);
+ while ((!IsEmptyStr(buf)) && (isspace(buf[len - 1])))
+ buf[--len] = 0;
if ((bq == 0) &&
((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
wprintf("<blockquote>");
}
wprintf("<tt>");
url(buf);
- msgescputs(buf);
+ msgescputs1(buf);
wprintf("</tt><br />");
}
wprintf("</i><br />");
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"),
);
wprintf("<td width=%d%%>", SUBJ_COL_WIDTH_PCT);
- escputs(WC->summ[num].subj);
+
+ escputs(WC->summ[num].subj);//////////////////////////////////TODO: QP DECODE
wprintf("</td>");
wprintf("<td width=%d%%>", SENDER_COL_WIDTH_PCT);
wprintf("</td>");
wprintf("<td width=%d%%>", DATE_PLUS_BUTTONS_WIDTH_PCT);
- fmt_date(datebuf, WC->summ[num].date, 1); /* brief */
+ webcit_fmt_date(datebuf, WC->summ[num].date, 1); /* brief */
escputs(datebuf);
wprintf("</td>");
}
}
- if (strlen(vcard_partnum) > 0) {
+ if (!IsEmptyStr(vcard_partnum)) {
vcard_source = load_mimepart(msgnum, vcard_partnum);
if (vcard_source != NULL) {
int mime_length;
char vcard_partnum[SIZ];
char *vcard_source = NULL;
- int i;
+ int i, len;
struct message_summary summ;
if (namebuf == NULL) return;
}
}
- if (strlen(vcard_partnum) > 0) {
+ if (!IsEmptyStr(vcard_partnum)) {
vcard_source = load_mimepart(msgnum, vcard_partnum);
if (vcard_source != NULL) {
lastfirst_firstlast(namebuf);
striplt(namebuf);
- for (i=0; i<strlen(namebuf); ++i) {
+ len = strlen(namebuf);
+ for (i=0; i<len; ++i) {
if (namebuf[i] != ';') return;
}
strcpy(namebuf, _("(no name)"));
* \param tabbuf the tabbuffer to add name to
* \param name the name to add to the tabbuffer
*/
-void nametab(char *tabbuf, char *name) {
- stresc(tabbuf, name, 0, 0);
+void nametab(char *tabbuf, long len, char *name) {
+ stresc(tabbuf, len, name, 0, 0);
tabbuf[0] = toupper(tabbuf[0]);
tabbuf[1] = tolower(tabbuf[1]);
tabbuf[2] = tolower(tabbuf[2]);
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");
- }
+ nametab(tabfirst_label, 64, addrbook[tabfirst].ab_name);
+ nametab(tablast_label, 64, addrbook[tablast].ab_name);
+ 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?is_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);
}
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(fullname) > 0) {
+ if (!IsEmptyStr(fullname)) {
+ /** Handle senders with RFC2047 encoding */
+ utf8ify_rfc822_string(fullname);
safestrncpy(WC->summ[nummsgs-1].from,
fullname, 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
+ if (!IsEmptyStr(subject)) {
/** Handle subjects with RFC2047 encoding */
- utf8ify_rfc822_string(WC->summ[nummsgs-1].subj);
-#endif
+ utf8ify_rfc822_string(subject);
+ safestrncpy(WC->summ[nummsgs-1].subj, subject,
+ sizeof WC->summ[nummsgs-1].subj);
+ }
if (strlen(WC->summ[nummsgs-1].subj) > 75) {
strcpy(&WC->summ[nummsgs-1].subj[72], "...");
}
- if (strlen(nodename) > 0) {
+ if (!IsEmptyStr(nodename)) {
if ( ((WC->room_flags & QR_NETWORK)
|| ((strcasecmp(nodename, serv_info.serv_nodename)
&& (strcasecmp(nodename, serv_info.serv_fqdn)))))
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], "...");
}
char *sendsort_button;
char *datesort_button;
int bbs_reverse = 0;
+ struct wcsession *WCC = WC; /* This is done to make it run faster; WC is a function */
- if (WC->wc_view == VIEW_WIKI) {
- sprintf(buf, "wiki?room=%s?page=home", WC->wc_roomname);
+ if (WCC->wc_view == VIEW_WIKI) {
+ sprintf(buf, "wiki?room=%s?page=home", WCC->wc_roomname);
http_redirect(buf);
return;
}
startmsg = atol(bstr("startmsg"));
maxmsgs = atoi(bstr("maxmsgs"));
- is_summary = atoi(bstr("summary"));
+ is_summary = atoi(bstr("is_summary"));
if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
- snprintf(sortpref_name, sizeof sortpref_name, "sort %s", WC->wc_roomname);
+ snprintf(sortpref_name, sizeof sortpref_name, "sort %s", WCC->wc_roomname);
get_preference(sortpref_name, sortpref_value, sizeof sortpref_value);
sortby = bstr("sortby");
- if ( (strlen(sortby) > 0) && (strcasecmp(sortby, sortpref_value)) ) {
+ if ( (!IsEmptyStr(sortby)) && (strcasecmp(sortby, sortpref_value)) ) {
set_preference(sortpref_name, sortby, 1);
}
- if (strlen(sortby) == 0) sortby = sortpref_value;
+ if (IsEmptyStr(sortby)) sortby = sortpref_value;
/** mailbox sort */
- if (strlen(sortby) == 0) sortby = "rdate";
+ if (IsEmptyStr(sortby)) sortby = "rdate";
/** message board sort */
if (!strcasecmp(sortby, "reverse")) {
strcpy(cmd, "MSGS ALL");
}
- if ((WC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
+ if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
is_summary = 1;
if (!strcmp(oper, "do_search")) {
sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
}
}
- if ((WC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
+ if ((WCC->wc_view == VIEW_ADDRESSBOOK) && (maxmsgs > 1)) {
is_addressbook = 1;
if (!strcmp(oper, "do_search")) {
sprintf(cmd, "MSGS SEARCH|%s", bstr("query"));
* new messages.
*/
strcpy(old_msgs, "");
- if (is_summary) {
+ if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
serv_puts("GTSN");
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
is_singlecard = atoi(bstr("is_singlecard"));
- if (WC->wc_default_view == VIEW_CALENDAR) { /**< calendar */
+ if (WCC->wc_default_view == VIEW_CALENDAR) { /**< calendar */
is_calendar = 1;
- strcpy(cmd, "MSGS ALL");
+ strcpy(cmd, "MSGS ALL|||1");
maxmsgs = 32767;
}
- if (WC->wc_default_view == VIEW_TASKS) { /**< tasks */
+ if (WCC->wc_default_view == VIEW_TASKS) { /**< tasks */
is_tasks = 1;
strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
}
- if (WC->wc_default_view == VIEW_NOTES) { /**< notes */
+ if (WCC->wc_default_view == VIEW_NOTES) { /**< notes */
is_notes = 1;
strcpy(cmd, "MSGS ALL");
maxmsgs = 32767;
goto DONE;
}
- if (is_summary) {
+ if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
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;
+ if (is_msg_in_mset(old_msgs, WCC->msgarr[a])) {
+ WCC->summ[a].is_new = 0;
}
else {
- WC->summ[a].is_new = 1;
+ WCC->summ[a].is_new = 1;
}
}
}
if (startmsg == 0L) {
if (bbs_reverse) {
- startmsg = WC->msgarr[(nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0];
+ startmsg = WCC->msgarr[(nummsgs >= maxmsgs) ? (nummsgs - maxmsgs) : 0];
}
else {
- startmsg = WC->msgarr[0];
+ startmsg = WCC->msgarr[0];
}
}
if (is_summary) {
if (!strcasecmp(sortby, "subject")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_subj);
}
else if (!strcasecmp(sortby, "rsubject")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_rsubj);
}
else if (!strcasecmp(sortby, "sender")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_sender);
}
else if (!strcasecmp(sortby, "rsender")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_rsender);
}
else if (!strcasecmp(sortby, "date")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->num_summ,
sizeof(struct message_summary), summcmp_date);
}
else if (!strcasecmp(sortby, "rdate")) {
- qsort(WC->summ, WC->num_summ,
+ qsort(WCC->summ, WCC->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>" ;
+ subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?
is_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>" ;
+ subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?
is_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>" ;
+ subjsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?
is_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>" ;
+ sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?
is_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>" ;
+ sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?
is_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>" ;
+ sendsort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?
is_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>" ;
+ datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?
is_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>" ;
+ datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?
is_summary=1?sortby=date\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
}
else {
- datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?summary=1?sortby=rdate\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
+ datesort_button = "<a href=\"readfwd?startmsg=1?maxmsgs=9999999?
is_summary=1?sortby=rdate\"><img border=\"0\" src=\"static/sort_none.gif\" /></a>" ;
}
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;\">"
);
}
+
+ /**
+ * Set the "is_bbview" variable if it appears that we are looking at
+ * a classic bulletin board view.
+ */
+ if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
+ && (!is_notes) && (!is_singlecard) && (!is_summary)) {
+ is_bbview = 1;
+ }
+
+ /**
+ * If we're not currently looking at ALL requested
+ * messages, then display the selector bar
+ */
+ if (is_bbview) {
+ /** begin bbview scroller */
+ wprintf("<form name=\"msgomatictop\" class=\"selector_top\" > \n <p>");
+ wprintf(_("Reading #"), lowest_displayed, highest_displayed);
+
+ wprintf("<select name=\"whichones\" size=\"1\" "
+ "OnChange=\"location.href=msgomatictop.whichones.options"
+ "[selectedIndex].value\">\n");
+
+ if (bbs_reverse) {
+ for (b=nummsgs-1; b>=0; b = b - maxmsgs) {
+ hi = b + 1;
+ lo = b - maxmsgs + 2;
+ if (lo < 1) lo = 1;
+ wprintf("<option %s value="
+ "\"%s"
+ "?startmsg=%ld"
+ "?maxmsgs=%d"
+ "?is_summary=%d\">"
+ "%d-%d</option> \n",
+ ((WCC->msgarr[lo-1] == startmsg) ? "selected" : ""),
+ oper,
+ WCC->msgarr[lo-1],
+ maxmsgs,
+ is_summary,
+ hi, lo);
+ }
+ }
+ else {
+ for (b=0; b<nummsgs; b = b + maxmsgs) {
+ lo = b + 1;
+ hi = b + maxmsgs + 1;
+ if (hi > nummsgs) hi = nummsgs;
+ wprintf("<option %s value="
+ "\"%s"
+ "?startmsg=%ld"
+ "?maxmsgs=%d"
+ "?is_summary=%d\">"
+ "%d-%d</option> \n",
+ ((WCC->msgarr[b] == startmsg) ? "selected" : ""),
+ oper,
+ WCC->msgarr[lo-1],
+ maxmsgs,
+ is_summary,
+ lo, hi);
+ }
+ }
+
+ wprintf("<option value=\"%s?startmsg=%ld"
+ "?maxmsgs=9999999?is_summary=%d\">",
+ oper,
+ WCC->msgarr[0], is_summary);
+ wprintf(_("All"));
+ wprintf("</option>");
+ wprintf("</select> ");
+ wprintf(_("of %d messages."), nummsgs);
+
+ /** forward/reverse */
+ wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
+ "OnChange=\"location.href='%s?sortby=forward'\"",
+ (bbs_reverse ? "" : "checked"),
+ oper
+ );
+ wprintf(">");
+ wprintf(_("oldest to newest"));
+ wprintf(" ");
+
+ wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
+ "OnChange=\"location.href='%s?sortby=reverse'\"",
+ (bbs_reverse ? "checked" : ""),
+ oper
+ );
+ wprintf(">");
+ wprintf(_("newest to oldest"));
+ wprintf("\n");
+
+ wprintf("</p></form>\n");
+ /** end bbview scroller */
+ }
+
+ if (is_notes)
+ {
+ wprintf ("<script src=\"/static/dragdrop.js\" type=\"text/javascript\"></script>\n");
+ }
+
+
+
for (a = 0; a < nummsgs; ++a) {
- if ((WC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
+ if ((WCC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
/** Display the message */
if (is_summary) {
display_summarized(a);
}
else if (is_addressbook) {
- fetch_ab_name(WC->msgarr[a], buf);
+ fetch_ab_name(WCC->msgarr[a], buf);
++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];
+ addrbook[num_ab-1].ab_msgnum = WCC->msgarr[a];
}
else if (is_calendar) {
- display_calendar(WC->msgarr[a]);
+ display_calendar(WCC->msgarr[a], WCC->summ[a].is_new);
}
else if (is_tasks) {
- display_task(WC->msgarr[a]);
+ display_task(WCC->msgarr[a], WCC->summ[a].is_new);
}
else if (is_notes) {
- display_note(WC->msgarr[a]);
+ display_note(WCC->msgarr[a], WCC->summ[a].is_new);
}
else {
if (displayed_msgs == NULL) {
displayed_msgs = malloc(sizeof(long) *
(maxmsgs<nummsgs ? maxmsgs : nummsgs));
}
- displayed_msgs[num_displayed] = WC->msgarr[a];
+ displayed_msgs[num_displayed] = WCC->msgarr[a];
}
if (lowest_displayed < 0) lowest_displayed = a;
}
}
- /**
- * Set the "is_bbview" variable if it appears that we are looking at
- * a classic bulletin board view.
- */
- if ((!is_tasks) && (!is_calendar) && (!is_addressbook)
- && (!is_notes) && (!is_singlecard) && (!is_summary)) {
- is_bbview = 1;
- }
-
/** Output loop */
if (displayed_msgs != NULL) {
if (bbs_reverse) {
/** 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"
);
*/
if (is_bbview) {
/** begin bbview scroller */
- wprintf("<form name=\"msgomatic\">");
+ wprintf("<form name=\"msgomatic\" class=\"selector_bottom\" > \n <p>");
wprintf(_("Reading #"), lowest_displayed, highest_displayed);
wprintf("<select name=\"whichones\" size=\"1\" "
"\"%s"
"?startmsg=%ld"
"?maxmsgs=%d"
- "?summary=%d\">"
+ "?is_summary=%d\">"
"%d-%d</option> \n",
- ((WC->msgarr[lo-1] == startmsg) ? "selected" : ""),
+ ((WCC->msgarr[lo-1] == startmsg) ? "selected" : ""),
oper,
- WC->msgarr[lo-1],
+ WCC->msgarr[lo-1],
maxmsgs,
is_summary,
hi, lo);
"\"%s"
"?startmsg=%ld"
"?maxmsgs=%d"
- "?summary=%d\">"
+ "?is_summary=%d\">"
"%d-%d</option> \n",
- ((WC->msgarr[b] == startmsg) ? "selected" : ""),
+ ((WCC->msgarr[b] == startmsg) ? "selected" : ""),
oper,
- WC->msgarr[lo-1],
+ WCC->msgarr[lo-1],
maxmsgs,
is_summary,
lo, hi);
}
wprintf("<option value=\"%s?startmsg=%ld"
- "?maxmsgs=9999999?summary=%d\">"
- "ALL"
- "</option> ",
+ "?maxmsgs=9999999?is_summary=%d\">",
oper,
- WC->msgarr[0], is_summary);
-
+ WCC->msgarr[0], is_summary);
+ wprintf(_("All"));
+ wprintf("</option>");
wprintf("</select> ");
wprintf(_("of %d messages."), nummsgs);
/** forward/reverse */
- wprintf(" <select name=\"direction\" size=\"1\" "
- "OnChange=\"location.href=msgomatic.direction.options"
- "[selectedIndex].value\">\n"
- );
-
- wprintf("<option %s value=\"%s?sortby=forward\">oldest to newest</option>\n",
- (bbs_reverse ? "" : "selected"),
+ wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
+ "OnChange=\"location.href='%s?sortby=forward'\"",
+ (bbs_reverse ? "" : "checked"),
oper
);
-
- wprintf("<option %s value=\"%s?sortby=reverse\">newest to oldest</option>\n",
- (bbs_reverse ? "selected" : ""),
+ wprintf(">");
+ wprintf(_("oldest to newest"));
+ wprintf(" ");
+ wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
+ "OnChange=\"location.href='%s?sortby=reverse'\"",
+ (bbs_reverse ? "checked" : ""),
oper
);
-
- wprintf("</select></form>\n");
+ wprintf(">");
+ wprintf(_("newest to oldest"));
+ wprintf("\n");
+
+ wprintf("</p></form>\n");
/** end bbview scroller */
}
+
+ if (is_notes)
+ {
+// wprintf ("</div>\n");
+ wprintf ("<div id=\"wastebin\" align=middle>Drop notes here to remove them.</div>\n");
+ wprintf ("<script type=\"text/javascript\">\n");
+// wprintf ("//<![CDATA[\n");
+ wprintf ("Droppables.add(\"wastebin\",\n");
+ wprintf ("\t{\n");
+ wprintf ("\t\taccept:'notes',\n");
+ wprintf ("\t\tonDrop:function(element)\n");
+ wprintf ("\t\t{\n");
+ wprintf ("\t\t\tElement.hide(element);\n");
+ wprintf ("\t\t\tnew Ajax.Updater('notes', 'delnote',\n");
+ wprintf ("\t\t\t{\n");
+ wprintf ("\t\t\t\tasynchronous:true,\n");
+ wprintf ("\t\t\t\tevalScripts:true,\n");
+ wprintf ("\t\t\t\tonComplete:function(request)\n");
+ wprintf ("\t\t\t\t{\n");
+ wprintf ("\t\t\t\t\tElement.hide('indicator')\n");
+ wprintf ("\t\t\t\t},\n");
+ wprintf ("\t\t\t\tonLoading:function(request)\n");
+ wprintf ("\t\t\t\t{\n");
+ wprintf ("\t\t\t\t\tElement.show('indicator')\n");
+ wprintf ("\t\t\t\t},\n");
+ wprintf ("\t\t\t\tparameters:'id=' + encodeURIComponent(element.id)\n");
+ wprintf ("\t\t\t})\n");
+ wprintf ("\t\t}\n");
+ wprintf ("\t})\n");
+// wprintf ("//]]>\n");
+ wprintf ("</script>\n");
+ }
+
+
DONE:
if (is_tasks) {
}
/** 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) {
- free(WC->summ);
- WC->num_summ = 0;
- WC->summ = NULL;
+ if (WCC->summ != NULL) {
+ free(WCC->summ);
+ WCC->num_summ = 0;
+ WCC->summ = NULL;
}
+ if (addrbook != NULL) free(addrbook);
}
* ... this is where the actual message gets transmitted to the server.
*/
void post_mime_to_server(void) {
- char boundary[SIZ];
+ char top_boundary[SIZ];
+ char alt_boundary[SIZ];
int is_multipart = 0;
static int seq = 0;
struct wc_attachment *att;
char *encoded;
size_t encoded_length;
+ size_t encoded_strlen;
+ char *txtmail = NULL;
+
+ sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x",
+ serv_info.serv_fqdn,
+ getpid(),
+ ++seq
+ );
+ sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
+ serv_info.serv_fqdn,
+ getpid(),
+ ++seq
+ );
/** RFC2045 requires this, and some clients look for it... */
serv_puts("MIME-Version: 1.0");
- serv_puts("X-Mailer: " SERVER);
+ serv_puts("X-Mailer: " PACKAGE_STRING);
/** 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",
- serv_info.serv_fqdn,
- getpid(),
- ++seq
- );
-
/** Remember, serv_printf() appends an extra newline */
serv_printf("Content-type: multipart/mixed; "
- "boundary=\"%s\"\n", boundary);
+ "boundary=\"%s\"\n", top_boundary);
serv_printf("This is a multipart message in MIME format.\n");
- serv_printf("--%s", boundary);
+ serv_printf("--%s", top_boundary);
}
+
+
+ /* Remember, serv_printf() appends an extra newline */
+ serv_printf("Content-type: multipart/alternative; "
+ "boundary=\"%s\"\n", alt_boundary);
+ serv_printf("This is a multipart message in MIME format.\n");
+ serv_printf("--%s", alt_boundary);
+
+ serv_puts("Content-type: text/plain; charset=utf-8");
+ serv_puts("Content-Transfer-Encoding: quoted-printable");
+ serv_puts("");
+ txtmail = html_to_ascii(bstr("msgtext"), 0, 80, 0);
+ text_to_server_qp(txtmail); /** Transmit message in quoted-printable encoding */
+ free(txtmail);
+
+ serv_printf("--%s", alt_boundary);
+
serv_puts("Content-type: text/html; charset=utf-8");
serv_puts("Content-Transfer-Encoding: quoted-printable");
serv_puts("");
serv_puts("<html><body>\r\n");
text_to_server_qp(bstr("msgtext")); /** Transmit message in quoted-printable encoding */
serv_puts("</body></html>\r\n");
+
+
+ serv_printf("--%s--", alt_boundary);
+
+
+
+
if (is_multipart) {
encoded_length = ((att->length * 150) / 100);
encoded = malloc(encoded_length);
if (encoded == NULL) break;
- CtdlEncodeBase64(encoded, att->data, att->length, 1);
+ encoded_strlen = CtdlEncodeBase64(encoded, att->data, att->length, 1);
- serv_printf("--%s", boundary);
+ serv_printf("--%s", top_boundary);
serv_printf("Content-type: %s", att->content_type);
serv_printf("Content-disposition: attachment; "
"filename=\"%s\"", att->filename);
serv_puts("Content-transfer-encoding: base64");
serv_puts("");
- serv_write(encoded, strlen(encoded));
+ serv_write(encoded, encoded_strlen);
serv_puts("");
serv_puts("");
free(encoded);
}
- serv_printf("--%s--", boundary);
+ serv_printf("--%s--", top_boundary);
}
serv_puts("000");
int is_anonymous = 0;
char *display_name;
+ if (!IsEmptyStr(bstr("force_room"))) {
+ gotoroom(bstr("force_room"));
+ }
+
display_name = bstr("display_name");
if (!strcmp(display_name, "__ANONYMOUS__")) {
display_name = "";
return;
}
- if (strlen(bstr("cancel_button")) > 0) {
+ if (!IsEmptyStr(bstr("cancel_button"))) {
sprintf(WC->ImportantMessage,
_("Cancelled. Message was not posted."));
- } else if (strlen(bstr("attach_button")) > 0) {
+ } else if (!IsEmptyStr(bstr("attach_button"))) {
display_enter();
return;
} else if (atol(bstr("postseq")) == dont_post) {
_("Automatically cancelled because you have already "
"saved this message."));
} else {
- rfc2047encode(encoded_subject, sizeof encoded_subject, bstr("subject"));
+ webcit_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,
serv_getln(buf, sizeof buf);
if (buf[0] == '4') {
post_mime_to_server();
- if ( (strlen(bstr("recp")) > 0)
- || (strlen(bstr("cc")) > 0)
- || (strlen(bstr("bcc")) > 0)
+ if ( (!IsEmptyStr(bstr("recp")))
+ || (!IsEmptyStr(bstr("cc" )))
+ || (!IsEmptyStr(bstr("bcc" )))
) {
sprintf(WC->ImportantMessage, _("Message has been sent.\n"));
}
* We may have been supplied with instructions regarding the location
* to which we must return after posting. If found, go there.
*/
- if (strlen(bstr("return_to")) > 0) {
+ if (!IsEmptyStr(bstr("return_to"))) {
http_redirect(bstr("return_to"));
}
/**
* If we were editing a page in a wiki room, go to that page now.
*/
- else if (strlen(bstr("wikipage")) > 0) {
+ else if (!IsEmptyStr(bstr("wikipage"))) {
snprintf(buf, sizeof buf, "wiki?page=%s", bstr("wikipage"));
http_redirect(buf);
}
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;
now = time(NULL);
- if (strlen(bstr("force_room")) > 0) {
+ if (!IsEmptyStr(bstr("force_room"))) {
gotoroom(bstr("force_room"));
}
/** 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."
*/
if (WC->wc_default_view == VIEW_ADDRESSBOOK) {
- do_edit_vcard(-1, "", "");
+ do_edit_vcard(-1, "", "", WC->wc_roomname);
return;
}
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
- /**
+ /*
* Are we perhaps in a calendar room? If so, then an "enter
* message" command really means "add new calendar item."
*/
return;
}
- /**
+ /*
* Are we perhaps in a tasks view? If so, then an "enter
* message" command really means "add new task."
*/
display_edit_task();
return;
}
-#endif
- /**
+ /*
* Otherwise proceed normally.
* Do a custom room banner with no navbar...
*/
embed_room_banner(NULL, navbar_none);
wprintf("</div>\n");
wprintf("<div id=\"content\">\n"
- "<div class=\"fix_scrollbar_bug\">"
- "<table class=\"messages_background\"><tr><td>");
+ "<div class=\"fix_scrollbar_bug message \">");
/** Now check our actual recipients if there are any */
if (recipient_required) {
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) {
+ if (!IsEmptyStr(bstr("recp")) &&
+ !IsEmptyStr(bstr("cc" )) &&
+ !IsEmptyStr(bstr("bcc" ))) {
recipient_bad = 1;
}
}
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);
+ wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
+ escputs(WC->wc_roomname);
+ wprintf("\">\n");
+
+ /** submit or cancel buttons */
+ wprintf("<p class=\"send_edit_msg\">");
+ 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("</p>");
/** header bar */
- wprintf("<img src=\"static/newmess3_24x.gif\" align=middle alt=\" \">");
- fmt_date(buf, now, 0);
- wprintf("%s ", buf);
+ wprintf("<img src=\"static/newmess3_24x.gif\" class=\"imgedit\">");
+ wprintf(" "); /** header bar */
+ webcit_fmt_date(buf, now, 0);
+ wprintf("%s", buf);
+ wprintf("\n"); /** header bar */
+ wprintf("<table width=\"100%%\" class=\"edit_msg_table\">");
+ wprintf("<tr>");
+ wprintf("<th><label for=\"from_id\" > ");
wprintf(_(" <I>from</I> "));
+ wprintf("</label></th>");
+
+ wprintf("<td colspan=\"2\">");
/* Allow the user to select any of his valid screen names */
- wprintf("<select name=\"display_name\" size=1>\n");
+ wprintf("<select name=\"display_name\" size=1 id=\"from_id\">\n");
serv_puts("GVSN");
serv_getln(buf, sizeof buf);
wprintf(_(" <I>in</I> "));
escputs(WC->wc_roomname);
- wprintf("<br>\n"); /** header bar */
- wprintf("<table border=\"0\" width=\"100%%\">\n");
- if (recipient_required) {
+ wprintf("</td></tr>");
- wprintf("<tr><td>");
- wprintf("<font size=-1>");
+ if (recipient_required) {
+ char *ccraw;
+ char *copy;
+ size_t len;
+ wprintf("<tr><th><label for=\"recp_id\"> ");
wprintf(_("To:"));
- wprintf("</font>");
- wprintf("</td><td>"
- "<input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
- escputs(bstr("recp"));
- wprintf("\" size=50 maxlength=1000 />");
+ wprintf("</label></th>"
+ "<td><input autocomplete=\"off\" type=\"text\" name=\"recp\" id=\"recp_id\" value=\"");
+ ccraw = bstr("recp");
+ len = strlen(ccraw);
+ copy = (char*) malloc(len * 2 + 1);
+ memcpy(copy, ccraw, len + 1);
+ utf8ify_rfc822_string(copy);
+ escputs(copy);
+ free(copy);
+ wprintf("\" size=45 maxlength=1000 />");
wprintf("<div class=\"auto_complete\" id=\"recp_name_choices\"></div>");
- wprintf("</td><td></td></tr>\n");
+ wprintf("</td><td rowspan=\"3\" align=\"left\" valign=\"top\">");
+
+ /** 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("</td></tr>");
- wprintf("<tr><td>");
- wprintf("<font size=-1>");
+ wprintf("<tr><th><label for=\"cc_id\"> ");
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("</label></th>"
+ "<td><input autocomplete=\"off\" type=\"text\" name=\"cc\" id=\"cc_id\" value=\"");
+ ccraw = bstr("cc");
+ len = strlen(ccraw);
+ copy = (char*) malloc(len * 2 + 1);
+ memcpy(copy, ccraw, len + 1);
+ utf8ify_rfc822_string(copy);
+ escputs(copy);
+ free(copy);
+ wprintf("\" size=45 maxlength=1000 />");
wprintf("<div class=\"auto_complete\" id=\"cc_name_choices\"></div>");
- wprintf("</td><td></td></tr>\n");
+ wprintf("</td></tr>");
- wprintf("<tr><td>");
- wprintf("<font size=-1>");
+ wprintf("<tr><th><label for=\"bcc_id\"> ");
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("</label></th>"
+ "<td><input autocomplete=\"off\" type=\"text\" name=\"bcc\" id=\"bcc_id\" value=\"");
+ ccraw = bstr("bcc");
+ len = strlen(ccraw);
+ copy = (char*) malloc(len * 2 + 1);
+ memcpy(copy, ccraw, len + 1);
+ utf8ify_rfc822_string(copy);
+ escputs(copy);
+ free(copy);
+ wprintf("\" size=45 maxlength=1000 />");
wprintf("<div class=\"auto_complete\" id=\"bcc_name_choices\"></div>");
- wprintf("</td><td></td></tr>\n");
+ wprintf("</td></tr>");
/** Initialize the autocomplete ajax helpers (found in wclib.js) */
wprintf("<script type=\"text/javascript\"> \n"
" activate_entmsg_autocompleters(); \n"
"</script> \n"
);
- }
- wprintf("<tr><td>");
- wprintf("<font size=-1>");
- wprintf(_("Subject (optional):"));
- wprintf("</font>");
- wprintf("</td><td>"
- "<input type=\"text\" name=\"subject\" value=\"");
- escputs(bstr("subject"));
- wprintf("\" size=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("<tr><th><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></th>"
+ "<td colspan=\"2\">"
+ "<input type=\"text\" name=\"subject\" id=\"subject_id\" value=\"");
+ escputs(bstr("subject"));
+ wprintf("\" size=45 maxlength=70>\n");
+ wprintf("</td></tr>");
- wprintf("<center>");
+ wprintf("<tr><td colspan=\"3\">\n");
wprintf("<textarea name=\"msgtext\" cols=\"80\" rows=\"15\">");
if ( (WC->is_mailbox) && (strcmp(bstr("sig_inserted"), "yes")) ) {
get_preference("use_sig", buf, sizeof buf);
if (!strcasecmp(buf, "yes")) {
+ int len;
get_preference("signature", ebuf, sizeof ebuf);
euid_unescapize(buf, ebuf);
wprintf("<br>--<br>");
- for (i=0; i<strlen(buf); ++i) {
+ len = strlen(buf);
+ for (i=0; i<len; ++i) {
if (buf[i] == '\n') {
wprintf("<br>");
}
}
}
- wprintf("</textarea>");
- wprintf("</center><br />\n");
+ wprintf("</textarea>\n");
+ /** Make sure we only insert our signature once */
+ /** We don't care if it was there or not before, it needs to be there now. */
+ wprintf("<input type=\"hidden\" name=\"sig_inserted\" value=\"yes\">\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 class=\"attachment buttons\"><img src=\"static/diskette_24x.gif\" class=\"imgedit\" > ");
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\" class=\"attachfile\" "
+ "size=16 type=\"file\">\n "
"<input type=\"submit\" name=\"attach_button\" value=\"%s\">\n", _("Add"));
+ wprintf("</div>"); /* End of "attachment buttons" div */
- /** 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"));
-
- /** 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("</td></tr></table>");
+
wprintf("</form>\n");
+ wprintf("</div>\n"); /* end of "fix_scrollbar_bug" div */
- wprintf("</td></tr></table></div>\n");
-DONE: wDumpContent(1);
+ /* NOTE: address_book_popup() will close the "content" div. Don't close it here. */
+DONE: address_book_popup();
+ wDumpContent(1);
}
-
/**
* \brief delete a message
*/
msgid = atol(bstr("msgid"));
- if (strlen(bstr("move_button")) > 0) {
+ if (!IsEmptyStr(bstr("move_button"))) {
sprintf(buf, "MOVE %ld|%s", msgid, bstr("target_room"));
serv_puts(buf);
serv_getln(buf, sizeof buf);
output_headers(1, 1, 2, 0, 0, 0);
wprintf("<div id=\"banner\">\n");
- wprintf("<TABLE WIDTH=100%% BORDER=0><TR><TD>");
- wprintf("<SPAN CLASS=\"titlebar\">");
+ wprintf("<h1>");
wprintf(_("Confirm move of message"));
- wprintf("</SPAN>\n");
- wprintf("</TD></TR></TABLE>\n");
- wprintf("</div>\n<div id=\"content\">\n");
+ wprintf("</h1>");
+ wprintf("</div>\n");
+
+ wprintf("<div id=\"content\" class=\"service\">\n");
wprintf("<CENTER>");
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