#include "webserver.h"
#include "groupdav.h"
+HashList *MsgHeaderHandler = NULL;
+HashList *MsgEvaluators = NULL;
+HashList *MimeRenderHandler = NULL;
+
#define SUBJ_COL_WIDTH_PCT 50 /**< Mailbox view column width */
#define SENDER_COL_WIDTH_PCT 30 /**< Mailbox view column width */
#define DATE_PLUS_BUTTONS_WIDTH_PCT 20 /**< Mailbox view column width */
-/*
- * Address book entry (keep it short and sweet, it's just a quickie lookup
- * which we can use to get to the real meat and bones later)
- */
-struct addrbookent {
- char ab_name[64]; /**< name string */
- long ab_msgnum; /**< message number of address book entry */
+
+
+void display_enter(void);
+int longcmp_r(const void *s1, const void *s2);
+int summcmp_subj(const void *s1, const void *s2);
+int summcmp_rsubj(const void *s1, const void *s2);
+int summcmp_sender(const void *s1, const void *s2);
+int summcmp_rsender(const void *s1, const void *s2);
+int summcmp_date(const void *s1, const void *s2);
+int summcmp_rdate(const void *s1, const void *s2);
+
+/*----------------------------------------------------------------------------*/
+
+
+typedef void (*MsgPartEvaluatorFunc)(message_summary *Sum, StrBuf *Buf);
+
+
+
+const char* SortIcons[3] = {
+ "static/up_pointer.gif",
+ "static/down_pointer.gif",
+ "static/sort_none.gif"
};
+enum {/// SortByEnum
+ eDate,
+ eRDate,
+ eSubject,
+ eRSubject,
+ eSender,
+ eRSender,
+ eReverse,
+ eUnSet
+};
+
+/* SortEnum to plain string representation */
+static const char* SortByStrings[] = {
+ "date",
+ "rdate",
+ "subject",
+ "rsubject",
+ "sender",
+ "rsender",
+ "reverse",
+ "unset"
+};
+/* SortEnum to sort-Function Table */
+const CompareFunc SortFuncs[eUnSet] = {
+ summcmp_date,
+ summcmp_rdate,
+ summcmp_subj,
+ summcmp_rsubj,
+ summcmp_sender,
+ summcmp_rsender,
+ summcmp_rdate
+};
-#ifdef HAVE_ICONV
+/* given a SortEnum, which icon should we choose? */
+const int SortDateToIcon[eUnSet] = { eUp, eDown, eNone, eNone, eNone, eNone, eNone};
+const int SortSubjectToIcon[eUnSet] = { eNone, eNone, eUp, eDown, eNone, eNone, eNone};
+const int SortSenderToIcon[eUnSet] = { eNone, eNone, eNone, eNone, eUp, eDown, eNone};
+
+/* given a SortEnum, which would be the "opposite" search option? */
+const int DateInvertSortString[eUnSet] = { eRDate, eDate, eDate, eDate, eDate, eDate, eDate};
+const int SubjectInvertSortString[eUnSet] = { eSubject, eSubject, eRSubject, eUnSet, eSubject, eSubject, eSubject};
+const int SenderInvertSortString[eUnSet] = { eSender, eSender, eSender, eSender, eRSender, eUnSet, eSender};
+
+
+
+/*----------------------------------------------------------------------------*/
/*
- * Wrapper around iconv_open()
- * Our version adds aliases for non-standard Microsoft charsets
- * such as 'MS950', aliasing them to names like 'CP950'
- *
- * tocode Target encoding
- * fromcode Source encoding
+ * Translates sortoption String to its SortEnum representation
+ * returns the enum matching the string; defaults to RDate
*/
-iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode)
-{
- iconv_t ic = (iconv_t)(-1) ;
- ic = iconv_open(tocode, fromcode);
- if (ic == (iconv_t)(-1) ) {
- char alias_fromcode[64];
- if ( (strlen(fromcode) == 5) && (!strncasecmp(fromcode, "MS", 2)) ) {
- safestrncpy(alias_fromcode, fromcode, sizeof alias_fromcode);
- alias_fromcode[0] = 'C';
- alias_fromcode[1] = 'P';
- ic = iconv_open(tocode, alias_fromcode);
- }
- }
- return(ic);
+//SortByEnum
+int StrToESort (const StrBuf *sortby)
+{////todoo: hash
+ int result = eDate;
+
+ if (!IsEmptyStr(ChrPtr(sortby))) while (result < eUnSet){
+ if (!strcasecmp(ChrPtr(sortby),
+ SortByStrings[result]))
+ return result;
+ result ++;
+ }
+ return eRDate;
}
+typedef int (*QSortFunction) (const void*, const void*);
-inline char *FindNextEnd (char *bptr)
-{
- char * end;
- /* Find the next ?Q? */
- end = strchr(bptr + 2, '?');
- if (end == NULL) return NULL;
- if (((*(end + 1) == 'B') || (*(end + 1) == 'Q')) &&
- (*(end + 2) == '?')) {
- /* skip on to the end of the cluster, the next ?= */
- end = strstr(end + 3, "?=");
- }
- else
- /* sort of half valid encoding, try to find an end. */
- end = strstr(bptr, "?=");
- return end;
+/*
+ * qsort() compatible function to compare two longs in descending order.
+ */
+int longcmp_r(const void *s1, const void *s2) {
+ long l1;
+ long l2;
+
+ l1 = *(long *)GetSearchPayload(s1);
+ l2 = *(long *)GetSearchPayload(s2);
+
+ if (l1 > l2) return(-1);
+ if (l1 < l2) return(+1);
+ return(0);
}
+
/*
- * Handle subjects with RFC2047 encoding such as:
- * =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?=
+ * qsort() compatible function to compare two message summary structs by ascending subject.
*/
-void utf8ify_rfc822_string(char *buf) {
- char *start, *end, *next, *nextend, *ptr;
- char newbuf[1024];
- char charset[128];
- char encoding[16];
- char istr[1024];
- iconv_t ic = (iconv_t)(-1) ;
- char *ibuf; /**< Buffer of characters to be converted */
- char *obuf; /**< Buffer for converted characters */
- size_t ibuflen; /**< Length of input buffer */
- size_t obuflen; /**< Length of output buffer */
- char *isav; /**< Saved pointer to input buffer */
- char *osav; /**< Saved pointer to output buffer */
- int passes = 0;
- int i, len, delta;
- int illegal_non_rfc2047_encoding = 0;
-
- /* Sometimes, badly formed messages contain strings which were simply
- * written out directly in some foreign character set instead of
- * using RFC2047 encoding. This is illegal but we will attempt to
- * handle it anyway by converting from a user-specified default
- * charset to UTF-8 if we see any nonprintable characters.
- */
- 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) {
- char default_header_charset[128];
- get_preference("default_header_charset", default_header_charset, sizeof default_header_charset);
- if ( (strcasecmp(default_header_charset, "UTF-8")) && (strcasecmp(default_header_charset, "us-ascii")) ) {
- ic = ctdl_iconv_open("UTF-8", default_header_charset);
- if (ic != (iconv_t)(-1) ) {
- ibuf = malloc(1024);
- isav = ibuf;
- safestrncpy(ibuf, buf, 1024);
- ibuflen = strlen(ibuf);
- obuflen = 1024;
- obuf = (char *) malloc(obuflen);
- osav = obuf;
- iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
- osav[1024-obuflen] = 0;
- strcpy(buf, osav);
- free(osav);
- iconv_close(ic);
- free(isav);
- }
- }
- }
-
- /* pre evaluate the first pair */
- nextend = end = NULL;
- len = strlen(buf);
- start = strstr(buf, "=?");
- if (start != NULL)
- end = FindNextEnd (start);
+int summcmp_subj(const void *s1, const void *s2) {
+ message_summary *summ1;
+ message_summary *summ2;
+
+ summ1 = (message_summary *)GetSearchPayload(s1);
+ summ2 = (message_summary *)GetSearchPayload(s2);
+ return strcasecmp(ChrPtr(summ1->subj), ChrPtr(summ2->subj));
+}
- while ((start != NULL) && (end != NULL))
- {
- next = strstr(end, "=?");
- if (next != NULL)
- nextend = FindNextEnd(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;
- }
+/*
+ * qsort() compatible function to compare two message summary structs by descending subject.
+ */
+int summcmp_rsubj(const void *s1, const void *s2) {
+ message_summary *summ1;
+ message_summary *summ2;
+
+ summ1 = (message_summary *)GetSearchPayload(s1);
+ summ2 = (message_summary *)GetSearchPayload(s2);
+ return strcasecmp(ChrPtr(summ2->subj), ChrPtr(summ1->subj));
+}
- /* Now we handle foreign character sets properly encoded
- * in RFC2047 format.
- */
- while (start=strstr(buf, "=?"), end=FindNextEnd((start != NULL)? start : buf),
- ((start != NULL) && (end != NULL) && (end > start)) )
- {
- extract_token(charset, start, 1, '?', sizeof charset);
- extract_token(encoding, start, 2, '?', sizeof encoding);
- extract_token(istr, start, 3, '?', sizeof istr);
-
- ibuf = malloc(1024);
- isav = ibuf;
- if (!strcasecmp(encoding, "B")) { /**< base64 */
- ibuflen = CtdlDecodeBase64(ibuf, istr, strlen(istr));
- }
- else if (!strcasecmp(encoding, "Q")) { /**< quoted-printable */
- size_t len;
- long pos;
-
- len = strlen(istr);
- pos = 0;
- while (pos < len)
- {
- if (istr[pos] == '_') istr[pos] = ' ';
- pos++;
- }
+/*
+ * qsort() compatible function to compare two message summary structs by ascending sender.
+ */
+int summcmp_sender(const void *s1, const void *s2) {
+ message_summary *summ1;
+ message_summary *summ2;
+
+ summ1 = (message_summary *)GetSearchPayload(s1);
+ summ2 = (message_summary *)GetSearchPayload(s2);
+ return strcasecmp(ChrPtr(summ1->from), ChrPtr(summ2->from));
+}
- ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len);
- }
- else {
- strcpy(ibuf, istr); /**< unknown encoding */
- ibuflen = strlen(istr);
- }
+/*
+ * qsort() compatible function to compare two message summary structs by descending sender.
+ */
+int summcmp_rsender(const void *s1, const void *s2) {
+ message_summary *summ1;
+ message_summary *summ2;
+
+ summ1 = (message_summary *)GetSearchPayload(s1);
+ summ2 = (message_summary *)GetSearchPayload(s2);
+ return strcasecmp(ChrPtr(summ2->from), ChrPtr(summ1->from));
+}
- ic = ctdl_iconv_open("UTF-8", charset);
- if (ic != (iconv_t)(-1) ) {
- obuflen = 1024;
- obuf = (char *) malloc(obuflen);
- osav = obuf;
- iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
- osav[1024-obuflen] = 0;
-
- end = start;
- end++;
- strcpy(start, "");
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- strcpy(end, &end[1]);
-
- snprintf(newbuf, sizeof newbuf, "%s%s%s", buf, osav, end);
- strcpy(buf, newbuf);
- free(osav);
- iconv_close(ic);
- }
- else {
- end = start;
- end++;
- strcpy(start, "");
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- remove_token(end, 0, '?');
- strcpy(end, &end[1]);
-
- snprintf(newbuf, sizeof newbuf, "%s(unreadable)%s", buf, end);
- strcpy(buf, newbuf);
- }
+/*
+ * qsort() compatible function to compare two message summary structs by ascending date.
+ */
+int summcmp_date(const void *s1, const void *s2) {
+ message_summary *summ1;
+ message_summary *summ2;
+
+ summ1 = (message_summary *)GetSearchPayload(s1);
+ summ2 = (message_summary *)GetSearchPayload(s2);
- free(isav);
+ if (summ1->date < summ2->date) return -1;
+ else if (summ1->date > summ2->date) return +1;
+ else return 0;
+}
- /*
- * Since spammers will go to all sorts of absurd lengths to get their
- * messages through, there are LOTS of corrupt headers out there.
- * So, prevent a really badly formed RFC2047 header from throwing
- * this function into an infinite loop.
- */
- ++passes;
- if (passes > 20) return;
- }
+/*
+ * qsort() compatible function to compare two message summary structs by descending date.
+ */
+int summcmp_rdate(const void *s1, const void *s2) {
+ message_summary *summ1;
+ message_summary *summ2;
+
+ summ1 = (message_summary *)GetSearchPayload(s1);
+ summ2 = (message_summary *)GetSearchPayload(s2);
+ if (summ1->date < summ2->date) return +1;
+ else if (summ1->date > summ2->date) return -1;
+ else return 0;
}
-#else
-inline void utf8ify_rfc822_string(char *a){};
-#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.
- * \param SourceLen Length of the source string
- * \returns encoded length; -1 if non success.
+
+
+/*
+ * Look for URL's embedded in a buffer and make them linkable. We use a
+ * target window in order to keep the Citadel session in its own window.
*/
-int webcit_rfc2047encode(char *target, int maxlen, char *source, long SourceLen)
+void UrlizeText(StrBuf* Target, StrBuf *Source, StrBuf *WrkBuf)
{
- const char headerStr[] = "=?UTF-8?Q?";
- int need_to_encode = 0;
- int i = 0;
- int len;
- unsigned char ch;
-
- if ((source == NULL) ||
- (target == NULL) ||
- (SourceLen > maxlen)) return -1;
-
- while ((!IsEmptyStr (&source[i])) &&
- (need_to_encode == 0) &&
- (i < SourceLen) ) {
- if (((unsigned char) source[i] < 32) ||
- ((unsigned char) source[i] > 126)) {
- need_to_encode = 1;
- }
- i++;
+ int len, UrlLen, Offset, TrailerLen;
+ const char *start, *end, *pos;
+
+ FlushStrBuf(Target);
+
+ start = NULL;
+ len = StrLength(Source);
+ end = ChrPtr(Source) + len;
+ for (pos = ChrPtr(Source); (pos < end) && (start == NULL); ++pos) {
+ if (!strncasecmp(pos, "http://", 7))
+ start = pos;
+ if (!strncasecmp(pos, "ftp://", 6))
+ start = pos;
}
- if (!need_to_encode) {
- memcpy (target, source, SourceLen);
- return SourceLen;
+ if (start == NULL) {
+ StrBufAppendBuf(Target, Source, 0);
+ return;
}
-
- if (sizeof (headerStr + SourceLen + 2) > maxlen)
- return -1;
- memcpy (target, headerStr, sizeof (headerStr));
- len = sizeof (headerStr);
- for (i=0; (i < SourceLen) && (len < maxlen) ; ++i) {
- ch = (unsigned char) source[i];
- if ((ch < 32) || (ch > 126) || (ch == 61)) {
- sprintf(&target[len], "=%02X", ch);
- len += 3;
- }
- else {
- sprintf(&target[len], "%c", ch);
- len ++;
+ FlushStrBuf(WrkBuf);
+
+ for (pos = ChrPtr(Source) + len; pos > start; --pos) {
+ if ( (!isprint(*pos))
+ || (isspace(*pos))
+ || (*pos == '{')
+ || (*pos == '}')
+ || (*pos == '|')
+ || (*pos == '\\')
+ || (*pos == '^')
+ || (*pos == '[')
+ || (*pos == ']')
+ || (*pos == '`')
+ || (*pos == '<')
+ || (*pos == '>')
+ || (*pos == '(')
+ || (*pos == ')')
+ ) {
+ end = pos;
}
}
- if (len + 2 < maxlen) {
- strcat(&target[len], "?=");
- len +=2;
- return len;
- }
- else
- return -1;
+ UrlLen = end - start;
+ StrBufAppendBufPlain(WrkBuf, start, UrlLen, 0);
+
+ Offset = start - ChrPtr(Source);
+ if (Offset != 0)
+ StrBufAppendBufPlain(Target, ChrPtr(Source), Offset, 0);
+ StrBufAppendPrintf(Target, "%ca href=%c%s%c TARGET=%c%s%c%c%s%c/A%c",
+ LB, QU, ChrPtr(WrkBuf), QU, QU, TARGET,
+ QU, RB, ChrPtr(WrkBuf), LB, RB);
+
+ TrailerLen = len - (end - start);
+ if (TrailerLen > 0)
+ StrBufAppendBufPlain(Target, end, TrailerLen, 0);
}
-
-
-
-
-/**
- * \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.
- * \param buf the message buffer
- */
-void url(char *buf)
+void url(char *buf, size_t bufsize)
{
- int len;
+ int len, UrlLen, Offset, TrailerLen, outpos;
char *start, *end, *pos;
char urlbuf[SIZ];
- char outbuf[1024];
+ char outbuf[SIZ];
start = NULL;
len = strlen(buf);
+ if (len > bufsize) {
+ lprintf(1, "URL: content longer than buffer!");
+ return;
+ }
end = buf + len;
for (pos = buf; (pos < end) && (start == NULL); ++pos) {
if (!strncasecmp(pos, "http://", 7))
end = pos;
}
}
-
- strncpy(urlbuf, start, end - start);
- urlbuf[end - start] = '\0';
-
- 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, end);
- if ( strlen(outbuf) < 250 )
- strcpy(buf, outbuf);
-}
-
-
-/**
- * \brief Turn a vCard "n" (name) field into something displayable.
- * \param name the name field to convert
- */
-void vcard_n_prettyize(char *name)
-{
- char *original_name;
- int i, j, len;
-
- original_name = strdup(name);
- len = strlen(original_name);
- for (i=0; i<5; ++i) {
- if (len > 0) {
- if (original_name[len-1] == ' ') {
- original_name[--len] = 0;
- }
- if (original_name[len-1] == ';') {
- original_name[--len] = 0;
- }
- }
- }
- strcpy(name, "");
- j=0;
- for (i=0; i<len; ++i) {
- if (original_name[i] == ';') {
- name[j++] = ',';
- name[j++] = ' ';
- }
- else {
- name[j++] = original_name[i];
- }
- }
- name[j] = '\0';
- free(original_name);
-}
-
-
-
-
-/**
- * \brief preparse a vcard name
- * display_vcard() calls this after parsing the textual vCard into
- * our 'struct vCard' data object.
- * This gets called instead of display_parsed_vcard() if we are only looking
- * to extract the person's name instead of displaying the card.
- * \param v the vcard to retrieve the name from
- * \param storename where to put the name at
- */
-void fetchname_parsed_vcard(struct vCard *v, char *storename) {
- char *name;
-
- strcpy(storename, "");
-
- name = vcard_get_prop(v, "n", 1, 0, 0);
- if (name != NULL) {
- strcpy(storename, name);
- /* vcard_n_prettyize(storename); */
+
+ UrlLen = end - start;
+ if (UrlLen > sizeof(urlbuf)){
+ lprintf(1, "URL: content longer than buffer!");
+ return;
}
-
-}
-
-
-
-/**
- * \brief html print a vcard
- * display_vcard() calls this after parsing the textual vCard into
- * our 'struct vCard' data object.
- *
- * Set 'full' to nonzero to display the full card, otherwise it will only
- * show a summary line.
- *
- * This code is a bit ugly, so perhaps an explanation is due: we do this
- * in two passes through the vCard fields. On the first pass, we process
- * fields we understand, and then render them in a pretty fashion at the
- * end. Then we make a second pass, outputting all the fields we don't
- * understand in a simple two-column name/value format.
- * \param v the vCard to display
- * \param full display all items of the vcard?
- */
-void display_parsed_vcard(struct vCard *v, int full) {
- int i, j;
- char buf[SIZ];
- char *name;
- int is_qp = 0;
- int is_b64 = 0;
- char *thisname, *thisvalue;
- char firsttoken[SIZ];
- int pass;
-
- char fullname[SIZ];
- char title[SIZ];
- char org[SIZ];
- char phone[SIZ];
- char mailto[SIZ];
-
- strcpy(fullname, "");
- strcpy(phone, "");
- strcpy(mailto, "");
- strcpy(title, "");
- strcpy(org, "");
-
- if (!full) {
- wprintf("<TD>");
- name = vcard_get_prop(v, "fn", 1, 0, 0);
- if (name != NULL) {
- escputs(name);
- }
- else if (name = vcard_get_prop(v, "n", 1, 0, 0), name != NULL) {
- strcpy(fullname, name);
- vcard_n_prettyize(fullname);
- escputs(fullname);
- }
- else {
- wprintf(" ");
- }
- wprintf("</TD>");
+ memcpy(urlbuf, start, UrlLen);
+ urlbuf[UrlLen] = '\0';
+
+ Offset = start - buf;
+ if ((Offset != 0) && (Offset < sizeof(outbuf)))
+ memcpy(outbuf, buf, Offset);
+ outpos = snprintf(&outbuf[Offset], sizeof(outbuf) - Offset,
+ "%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);
+ if (outpos >= sizeof(outbuf) - Offset) {
+ lprintf(1, "URL: content longer than buffer!");
return;
}
- 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);
-
- for (j=0; j<num_tokens(thisname, ';'); ++j) {
- extract_token(buf, thisname, j, ';', sizeof buf);
- if (!strcasecmp(buf, "encoding=quoted-printable")) {
- is_qp = 1;
- remove_token(thisname, j, ';');
- }
- if (!strcasecmp(buf, "encoding=base64")) {
- is_b64 = 1;
- 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) {
- // %ff can become 6 bytes in utf8
- thisvalue = malloc(len * 2 + 3);
- j = CtdlDecodeQuotedPrintable(
- thisvalue, v->prop[i].value,
- len);
- thisvalue[j] = 0;
- }
- else if (is_b64) {
- // ff will become one byte..
- thisvalue = malloc(len + 50);
- CtdlDecodeBase64(
- thisvalue, v->prop[i].value,
- strlen(v->prop[i].value) );
- }
- else {
- thisvalue = strdup(v->prop[i].value);
- }
-
- /** Various fields we may encounter ***/
-
- /** N is name, but only if there's no FN already there */
- if (!strcasecmp(firsttoken, "n")) {
- if (IsEmptyStr(fullname)) {
- strcpy(fullname, thisvalue);
- vcard_n_prettyize(fullname);
- }
- }
-
- /** FN (full name) is a true 'display name' field */
- else if (!strcasecmp(firsttoken, "fn")) {
- strcpy(fullname, thisvalue);
- }
-
- /** title */
- else if (!strcasecmp(firsttoken, "title")) {
- strcpy(title, thisvalue);
- }
-
- /** organization */
- else if (!strcasecmp(firsttoken, "org")) {
- strcpy(org, thisvalue);
- }
-
- else if (!strcasecmp(firsttoken, "email")) {
- size_t len;
- if (!IsEmptyStr(mailto)) strcat(mailto, "<br />");
- strcat(mailto,
- "<a href=\"display_enter"
- "?force_room=_MAIL_?recp=");
-
- 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, "\">");
- len = strlen(mailto);
- stresc(mailto+len, SIZ - len, thisvalue, 1, 1);
- strcat(mailto, "</A>");
- }
- else if (!strcasecmp(firsttoken, "tel")) {
- if (!IsEmptyStr(phone)) strcat(phone, "<br />");
- strcat(phone, thisvalue);
- for (j=0; j<num_tokens(thisname, ';'); ++j) {
- extract_token(buf, thisname, j, ';', sizeof buf);
- if (!strcasecmp(buf, "tel"))
- strcat(phone, "");
- else if (!strcasecmp(buf, "work"))
- strcat(phone, _(" (work)"));
- else if (!strcasecmp(buf, "home"))
- strcat(phone, _(" (home)"));
- else if (!strcasecmp(buf, "cell"))
- strcat(phone, _(" (cell)"));
- else {
- strcat(phone, " (");
- strcat(phone, buf);
- strcat(phone, ")");
- }
- }
- }
- else if (!strcasecmp(firsttoken, "adr")) {
- if (pass == 2) {
- wprintf("<TR><TD>");
- wprintf(_("Address:"));
- wprintf("</TD><TD>");
- for (j=0; j<num_tokens(thisvalue, ';'); ++j) {
- extract_token(buf, thisvalue, j, ';', sizeof buf);
- if (!IsEmptyStr(buf)) {
- escputs(buf);
- if (j<3) wprintf("<br />");
- else wprintf(" ");
- }
- }
- wprintf("</TD></TR>\n");
- }
- }
- else if (!strcasecmp(firsttoken, "version")) {
- /* ignore */
- }
- else if (!strcasecmp(firsttoken, "rev")) {
- /* ignore */
- }
- else if (!strcasecmp(firsttoken, "label")) {
- /* ignore */
- }
- else {
-
- /*** Don't show extra fields. They're ugly.
- if (pass == 2) {
- wprintf("<TR><TD>");
- escputs(thisname);
- wprintf("</TD><TD>");
- escputs(thisvalue);
- wprintf("</TD></TR>\n");
- }
- ***/
- }
-
- free(thisname);
- free(thisvalue);
- }
-
- if (pass == 1) {
- wprintf("<TR BGCOLOR=\"#AAAAAA\">"
- "<TD COLSPAN=2 BGCOLOR=\"#FFFFFF\">"
- "<IMG ALIGN=CENTER src=\"static/viewcontacts_48x.gif\">"
- "<FONT SIZE=+1><B>");
- escputs(fullname);
- wprintf("</B></FONT>");
- if (!IsEmptyStr(title)) {
- wprintf("<div align=right>");
- escputs(title);
- wprintf("</div>");
- }
- if (!IsEmptyStr(org)) {
- wprintf("<div align=right>");
- escputs(org);
- wprintf("</div>");
- }
- wprintf("</TD></TR>\n");
-
- if (!IsEmptyStr(phone)) {
- wprintf("<tr><td>");
- wprintf(_("Telephone:"));
- wprintf("</td><td>%s</td></tr>\n", phone);
- }
- if (!IsEmptyStr(mailto)) {
- wprintf("<tr><td>");
- wprintf(_("E-mail:"));
- wprintf("</td><td>%s</td></tr>\n", mailto);
- }
- }
-
+ TrailerLen = len - (end - start);
+ if (TrailerLen > 0)
+ memcpy(outbuf + Offset + outpos, end, TrailerLen);
+ if (Offset + outpos + TrailerLen > bufsize) {
+ lprintf(1, "URL: content longer than buffer!");
+ return;
}
-
- wprintf("</table></div>\n");
+ memcpy (buf, outbuf, Offset + outpos + TrailerLen);
+ *(buf + Offset + outpos + TrailerLen) = '\0';
}
-/**
- * \brief Display a textual vCard
- * (Converts to a vCard object and then calls the actual display function)
- * Set 'full' to nonzero to display the whole card instead of a one-liner.
- * Or, if "storename" is non-NULL, just store the person's name in that
- * buffer instead of displaying the card at all.
- * \param vcard_source the buffer containing the vcard text
- * \param alpha what???
- * \param full should we usse all lines?
- * \param storename where to store???
- */
-void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
- struct vCard *v;
- char *name;
- char buf[SIZ];
- char this_alpha = 0;
- v = vcard_load(vcard_source);
- if (v == NULL) return;
- name = vcard_get_prop(v, "n", 1, 0, 0);
- if (name != NULL) {
- utf8ify_rfc822_string(name);
- strcpy(buf, name);
- this_alpha = buf[0];
- }
- if (storename != NULL) {
- fetchname_parsed_vcard(v, storename);
- }
- else if ( (alpha == 0)
- || ((isalpha(alpha)) && (tolower(alpha) == tolower(this_alpha)) )
- || ((!isalpha(alpha)) && (!isalpha(this_alpha)))
- ) {
- display_parsed_vcard(v, full);
- }
- vcard_free(v);
-}
-struct attach_link {
- char partnum[32];
- char html[1024];
-};
/*
* section Optional for encapsulated message/rfc822 submessage
*/
void read_message(long msgnum, int printable_view, char *section) {
+ struct wcsession *WCC = WC;
+ StrBuf *Buf;
+ StrBuf *Token;
+ StrBuf *FoundCharset;
+ message_summary *Msg = NULL;
+ headereval *Hdr;
+ void *vHdr;
char buf[SIZ];
- 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[1024] = "";
- char m_cc[1024] = "";
- char from[256] = "";
- char node[256] = "";
- char rfca[256] = "";
- char reply_to[512] = "";
- char reply_all[4096] = "";
+// char mime_submessages[256] = "";
char reply_references[1024] = "";
- char now[64] = "";
- int format_type = 0;
- int nhdr = 0;
- int bq = 0;
int i = 0;
+ int Done = 0;
+ int state=0;
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 */
- char *obuf; /**< Buffer for converted characters */
- size_t ibuflen; /**< Length of input buffer */
- size_t obuflen; /**< Length of output buffer */
- char *osav; /**< Saved pointer to output buffer */
-#endif
- strcpy(mime_content_type, "text/plain");
- strcpy(mime_charset, "us-ascii");
- strcpy(mime_submessages, "");
+//// strcpy(mime_submessages, "");
+ Buf = NewStrBuf();
serv_printf("MSG4 %ld|%s", msgnum, section);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '1') {
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 1) {
wprintf("<strong>");
wprintf(_("ERROR:"));
wprintf("</strong> %s<br />\n", &buf[4]);
+ FreeStrBuf(&Buf);
return;
}
-
+ svputlong("MsgPrintable", printable_view);
/** begin everythingamundo table */
- 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("<div class=\"message_header\">");
- strcpy(m_subject, "");
- strcpy(m_cc, "");
- while (serv_getln(buf, sizeof buf), strcasecmp(buf, "text")) {
- if (!strcmp(buf, "000")) {
- wprintf("<i>");
- wprintf(_("unexpected end of message"));
- wprintf(" (1)</i><br /><br />\n");
- wprintf("</div>\n");
- return;
- }
- if (!strncasecmp(buf, "nhdr=yes", 8))
- nhdr = 1;
- if (nhdr == 1)
- buf[0] = '_';
- if (!strncasecmp(buf, "type=", 5))
- format_type = atoi(&buf[5]);
- if (!strncasecmp(buf, "from=", 5)) {
- strcpy(from, &buf[5]);
- wprintf(_("from "));
- wprintf("<a href=\"showuser?who=");
- utf8ify_rfc822_string(from);
- urlescputs(from);
- wprintf("\">");
- escputs(from);
- wprintf("</a> ");
- }
- if (!strncasecmp(buf, "subj=", 5)) {
- safestrncpy(m_subject, &buf[5], sizeof m_subject);
- }
- if (!strncasecmp(buf, "msgn=", 5)) {
- safestrncpy(reply_references, &buf[5], sizeof reply_references);
- }
- if (!strncasecmp(buf, "wefw=", 5)) {
- int rrlen = strlen(reply_references);
- if (rrlen > 0) {
- strcpy(&reply_references[rrlen++], "|");
- }
- safestrncpy(&reply_references[rrlen], &buf[5],
- (sizeof(reply_references) - rrlen) );
- }
- if (!strncasecmp(buf, "cccc=", 5)) {
- int len;
- safestrncpy(m_cc, &buf[5], sizeof m_cc);
- if (!IsEmptyStr(reply_all)) {
- strcat(reply_all, ", ");
+ Token = NewStrBuf();
+ Msg = (message_summary *)malloc(sizeof(message_summary));
+ memset(Msg, 0, sizeof(message_summary));
+ Msg->msgnum = msgnum;
+ FoundCharset = NewStrBuf();
+ while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
+ if ( (StrLength(Buf)==3) &&
+ !strcmp(ChrPtr(Buf), "000"))
+ {
+ Done = 1;
+ if (state < 2) {
+ wprintf("<i>");
+ wprintf(_("unexpected end of message"));
+ wprintf(" (1)</i><br /><br />\n");
+ wprintf("</div>\n");
+ FreeStrBuf(&Buf);
+ FreeStrBuf(&Token);
+ DestroyMessageSummary(Msg);
+ FreeStrBuf(&FoundCharset);
+ return;
}
- 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))) {
- wprintf("(%s) ", &buf[5]);
- }
- if ((!strncasecmp(buf, "room=", 5))
- && (strcasecmp(&buf[5], WC->wc_roomname))
- && (!IsEmptyStr(&buf[5])) ) {
- wprintf(_("in "));
- wprintf("%s> ", &buf[5]);
- }
- if (!strncasecmp(buf, "rfca=", 5)) {
- strcpy(rfca, &buf[5]);
- wprintf("<");
- escputs(rfca);
- wprintf("> ");
- }
-
- if (!strncasecmp(buf, "node=", 5)) {
- strcpy(node, &buf[5]);
- if ( ((WC->room_flags & QR_NETWORK)
- || ((strcasecmp(&buf[5], serv_info.serv_nodename)
- && (strcasecmp(&buf[5], serv_info.serv_fqdn)))))
- && (IsEmptyStr(rfca))
- ) {
- wprintf("@%s ", &buf[5]);
+ else {
+ break;
}
}
- if (!strncasecmp(buf, "rcpt=", 5)) {
- int len;
- wprintf(_("to "));
- if (!IsEmptyStr(reply_all)) {
- strcat(reply_all, ", ");
+ switch (state) {
+ case 0:/* Citadel Message Headers */
+ if (StrLength(Buf) == 0) {
+ state ++;
+ break;
}
- len = strlen(reply_all);
- safestrncpy(&reply_all[len], &buf[5],
- (sizeof reply_all - len) );
- utf8ify_rfc822_string(&buf[5]);
- escputs(&buf[5]);
- wprintf(" ");
- }
- if (!strncasecmp(buf, "time=", 5)) {
- 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 (!IsEmptyStr(mime_submessages)) {
- strcat(mime_submessages, "|");
+ StrBufExtract_token(Token, Buf, 0, '=');
+ StrBufCutLeft(Buf, StrLength(Token) + 1);
+
+ lprintf(1, ":: [%s] = [%s]\n", ChrPtr(Token), ChrPtr(Buf));
+ if (GetHash(MsgHeaderHandler, SKEY(Token), &vHdr) &&
+ (vHdr != NULL)) {
+ Hdr = (headereval*)vHdr;
+ Hdr->evaluator(Msg, Buf, FoundCharset);
+ if (Hdr->Type == 1) {
+ state++;
}
- strcat(mime_submessages, mime_partnum);
}
- else if ((!strcasecmp(mime_disposition, "inline"))
- && (!strncasecmp(mime_content_type, "image/", 6)) ){
- ++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"))
- || (!strcasecmp(mime_disposition, ""))
- ) && (!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));
+ else lprintf(1, "don't know how to handle message header[%s]\n", ChrPtr(Token));
+ break;
+ case 1:/* Message Mime Header */
+ if (StrLength(Buf) == 0) {
+ state++;
+ if (Msg->MsgBody.ContentType == NULL)
+ /* end of header or no header? */
+ Msg->MsgBody.ContentType = NewStrBufPlain(HKEY("text/plain"));
+ /* usual end of mime header */
+ }
+ else
+ {
+ StrBufExtract_token(Token, Buf, 0, ':');
+ if (StrLength(Token) > 0) {
+ StrBufCutLeft(Buf, StrLength(Token) + 1);
+ lprintf(1, ":: [%s] = [%s]\n", ChrPtr(Token), ChrPtr(Buf));
+ if (GetHash(MsgHeaderHandler, SKEY(Token), &vHdr) &&
+ (vHdr != NULL)) {
+ Hdr = (headereval*)vHdr;
+ Hdr->evaluator(Msg, Buf, FoundCharset);
+ }
+ break;
}
- urlesc(escaped_mime_filename, 265, mime_filename);
- snprintf(attach_links[num_attach_links-1].html, 1024,
- "<img src=\"display_mime_icon?type=%s\" "
- "border=0 align=middle>\n"
- "%s (%s, %d bytes) [ "
- "<a href=\"mimepart/%ld/%s/%s\""
- "target=\"wc.%ld.%s\">%s</a>"
- " | "
- "<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, escaped_mime_filename,
- msgnum, mime_partnum,
- _("View"),
- msgnum, mime_partnum, escaped_mime_filename,
- _("Download")
- );
}
-
- /** begin handler prep ***/
- if ( (!strcasecmp(mime_content_type, "text/x-vcard"))
- || (!strcasecmp(mime_content_type, "text/vcard")) ) {
- strcpy(vcard_partnum, mime_partnum);
+ case 2: /* Message Body */
+
+ if (Msg->MsgBody.size_known > 0) {
+ StrBuf_ServGetBLOB(Msg->MsgBody.Data, Msg->MsgBody.length);
+ state ++;
+ /// todo: check next line, if not 000, append following lines
}
-
- if ( (!strcasecmp(mime_content_type, "text/calendar"))
- || (!strcasecmp(mime_content_type, "application/ics")) ) {
- strcpy(cal_partnum, mime_partnum);
+ else if (1){
+ if (StrLength(Msg->MsgBody.Data) > 0)
+ StrBufAppendBufPlain(Msg->MsgBody.Data, "\n", 1, 0);
+ StrBufAppendBuf(Msg->MsgBody.Data, Buf, 0);
}
-
- /** end handler prep ***/
-
- }
-
- }
-
- /** Generate a reply-to address */
- if (!IsEmptyStr(rfca)) {
- if (!IsEmptyStr(from)) {
- snprintf(reply_to, sizeof(reply_to), "%s <%s>", from, rfca);
- }
- else {
- strcpy(reply_to, rfca);
- }
- }
- else {
- if ((!IsEmptyStr(node))
- && (strcasecmp(node, serv_info.serv_nodename))
- && (strcasecmp(node, serv_info.serv_humannode)) ) {
- snprintf(reply_to, sizeof(reply_to), "%s @ %s",
- from, node);
- }
- else {
- snprintf(reply_to, sizeof(reply_to), "%s", from);
+ break;
+ case 3:
+ StrBufAppendBuf(Msg->MsgBody.Data, Buf, 0);
+ break;
}
}
-
- if (nhdr == 1) {
- wprintf("****");
+
+ /* strip the bare contenttype, so we ommit charset etc. */
+ StrBufExtract_token(Buf, Msg->MsgBody.ContentType, 0, ';');
+ StrBufTrim(Buf);
+ if (GetHash(MimeRenderHandler, SKEY(Buf), &vHdr) &&
+ (vHdr != NULL)) {
+ RenderMimeFunc Render;
+ Render = (RenderMimeFunc)vHdr;
+ Render(&Msg->MsgBody, NULL, FoundCharset);
}
- utf8ify_rfc822_string(m_cc);
- utf8ify_rfc822_string(m_subject);
-
- /** 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("<a href=\"display_enter");
- if (WC->is_mailbox) {
- wprintf("?replyquote=%ld", msgnum);
- }
- wprintf("?recp=");
- urlescputs(reply_to);
- if (!IsEmptyStr(m_subject)) {
- wprintf("?subject=");
- if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
- urlescputs(m_subject);
- }
- if (!IsEmptyStr(reply_references)) {
- wprintf("?references=");
- urlescputs(reply_references);
- }
- wprintf("\"><span>[</span>%s<span>]</span></a> ", _("Reply"));
- }
-
- /* ReplyQuoted */
- if ( (WC->wc_view == VIEW_MAILBOX) || (WC->wc_view == VIEW_BBS) ) {
- if (!WC->is_mailbox) {
- wprintf("<a href=\"display_enter");
- wprintf("?replyquote=%ld", msgnum);
- wprintf("?recp=");
- urlescputs(reply_to);
- if (!IsEmptyStr(m_subject)) {
- wprintf("?subject=");
- if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
- urlescputs(m_subject);
- }
- if (!IsEmptyStr(reply_references)) {
- wprintf("?references=");
- urlescputs(reply_references);
- }
- wprintf("\"><span>[</span>%s<span>]</span></a> ", _("ReplyQuoted"));
- }
- }
-
- /* ReplyAll */
- if (WC->wc_view == VIEW_MAILBOX) {
- wprintf("<a href=\"display_enter");
- wprintf("?replyquote=%ld", msgnum);
- wprintf("?recp=");
- urlescputs(reply_to);
- wprintf("?cc=");
- urlescputs(reply_all);
- if (!IsEmptyStr(m_subject)) {
- wprintf("?subject=");
- if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
- urlescputs(m_subject);
- }
- if (!IsEmptyStr(reply_references)) {
- wprintf("?references=");
- urlescputs(reply_references);
- }
- wprintf("\"><span>[</span>%s<span>]</span></a> ", _("ReplyAll"));
- }
-
- /* Forward */
- if (WC->wc_view == VIEW_MAILBOX) {
- wprintf("<a href=\"display_enter?fwdquote=%ld?subject=", msgnum);
- if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%20");
- urlescputs(m_subject);
- 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) || (WC->room_flags2 & QR2_COLLABDEL) ) {
- /** Move */
- 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');\">"
- "<span>[</span>%s<span>]</span> "
- "</a> ", msgnum, _("Delete this message?"), _("Delete")
- );
+ if (StrLength(Msg->reply_references)> 0) {
+ /* Trim down excessively long lists of thread references. We eliminate the
+ * second one in the list so that the thread root remains intact.
+ */
+ int rrtok = num_tokens(ChrPtr(Msg->reply_references), '|');
+ int rrlen = StrLength(Msg->reply_references);
+ if ( ((rrtok >= 3) && (rrlen > 900)) || (rrtok > 10) ) {
+ remove_token(reply_references, 1, '|');////todo
}
-
- /* 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'); \" >"
- "<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'); \" >"
- "<span>[</span>%s<span>]</span></a>", msgnum, msgnum, _("Print"));
-
- wprintf("</p>");
-
}
- 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("<div class=\"message_content\">");
-
- /*
- * Learn the content type
- */
- strcpy(mime_content_type, "text/plain");
- while (serv_getln(buf, sizeof buf), (!IsEmptyStr(buf))) {
- if (!strcmp(buf, "000")) {
- /* This is not necessarily an error condition. See bug #226. */
- goto ENDBODY;
- }
- if (!strncasecmp(buf, "X-Citadel-MSG4-Partnum:", 23)) {
- safestrncpy(msg4_partnum, &buf[23], sizeof(msg4_partnum));
- striplt(msg4_partnum);
+ /* Generate a reply-to address */
+ if (StrLength(Msg->Rfca) > 0) {
+ if (Msg->reply_to == NULL)
+ Msg->reply_to = NewStrBuf();
+ if (StrLength(Msg->from) > 0) {
+ StrBufPrintf(Msg->reply_to, "%s <%s>", ChrPtr(Msg->from), ChrPtr(Msg->Rfca));
}
- if (!strncasecmp(buf, "Content-type:", 13)) {
- int len;
- safestrncpy(mime_content_type, &buf[13], sizeof(mime_content_type));
- striplt(mime_content_type);
- 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<len; ++i) {
- if (mime_content_type[i] == ';') {
- mime_content_type[i] = 0;
- len = i - 1;
- }
- }
- len = strlen(mime_charset);
- for (i=0; i<len; ++i) {
- if (mime_charset[i] == ';') {
- mime_charset[i] = 0;
- len = i - 1;
- }
- }
+ else {
+ FlushStrBuf(Msg->reply_to);
+ StrBufAppendBuf(Msg->reply_to, Msg->Rfca, 0);
}
}
-
- /* Set up a character set conversion if we need to (and if we can) */
-#ifdef HAVE_ICONV
- if (strchr(mime_charset, ';')) strcpy(strchr(mime_charset, ';'), "");
- if ( (strcasecmp(mime_charset, "us-ascii"))
- && (strcasecmp(mime_charset, "UTF-8"))
- && (strcasecmp(mime_charset, ""))
- ) {
- ic = ctdl_iconv_open("UTF-8", mime_charset);
- if (ic == (iconv_t)(-1) ) {
- lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
- __FILE__, __LINE__, mime_charset, strerror(errno));
+ else
+ {
+ if ((StrLength(Msg->OtherNode)>0) &&
+ (strcasecmp(ChrPtr(Msg->OtherNode), serv_info.serv_nodename)) &&
+ (strcasecmp(ChrPtr(Msg->OtherNode), serv_info.serv_humannode)) )
+ {
+ if (Msg->reply_to == NULL)
+ Msg->reply_to = NewStrBuf();
+ StrBufPrintf(Msg->reply_to,
+ "%s @ %s",
+ ChrPtr(Msg->from),
+ ChrPtr(Msg->OtherNode));
}
- }
-#endif
-
- /* Messages in legacy Citadel variformat get handled thusly... */
- if (!strcasecmp(mime_content_type, "text/x-citadel-variformat")) {
- fmout("JUSTIFY");
- }
-
- /* 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")) {
- 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) ) {
- ibuf = buf;
- ibuflen = strlen(ibuf);
- obuflen = SIZ;
- obuf = (char *) malloc(obuflen);
- osav = obuf;
- iconv(ic, &ibuf, &ibuflen, &obuf, &obuflen);
- osav[SIZ-obuflen] = 0;
- safestrncpy(buf, osav, sizeof buf);
- free(osav);
- }
-#endif
-
- len = strlen(buf);
- while ((!IsEmptyStr(buf)) && (isspace(buf[len-1])))
- buf[--len] = 0;
- if ((bq == 0) &&
- ((!strncmp(buf, ">", 1)) || (!strncmp(buf, " >", 2)) )) {
- wprintf("<blockquote>");
- bq = 1;
- } else if ((bq == 1) &&
- (strncmp(buf, ">", 1)) && (strncmp(buf, " >", 2)) ) {
- wprintf("</blockquote>");
- bq = 0;
- }
- wprintf("<tt>");
- url(buf);
- escputs(buf);
- wprintf("</tt><br />\n");
+ else {
+ if (Msg->reply_to == NULL)
+ Msg->reply_to = NewStrBuf();
+ FlushStrBuf(Msg->reply_to);
+ StrBufAppendBuf(Msg->reply_to, Msg->from, 0);
}
- wprintf("</i><br />");
}
+ DoTemplate(HKEY("view_message"), NULL, Msg, CTX_MAILSUM);
- else /** HTML is fun, but we've got to strip it first */
- if (!strcasecmp(mime_content_type, "text/html")) {
- output_html(mime_charset, (WC->wc_view == VIEW_WIKI ? 1 : 0));
- }
- /** Unknown weirdness */
- else {
- wprintf(_("I don't know how to display %s"), mime_content_type);
- wprintf("<br />\n", mime_content_type);
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
- }
-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 */
- wprintf("<blockquote>");
- read_message(msgnum, 1, buf);
- wprintf("</blockquote>");
- }
- }
+//// put message renderer lookup here.
+///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 */
+/// wprintf("<blockquote>");
+/// read_message(msgnum, 1, buf);
+/// wprintf("</blockquote>");
+/// }
+/// }
- /** Afterwards, offer links to download attachments 'n' such */
+ /* Afterwards, offer links to download attachments 'n' such */
if ( (num_attach_links > 0) && (!section[0]) ) {
for (i=0; i<num_attach_links; ++i) {
if (strcasecmp(attach_links[i].partnum, msg4_partnum)) {
}
}
- /** Handler for vCard parts */
+ /* Handler for vCard parts */
if (!IsEmptyStr(vcard_partnum)) {
part_source = load_mimepart(msgnum, vcard_partnum);
if (part_source != NULL) {
|| (!strcasecmp(&WC->wc_roomname[11], USERCONFIGROOM))
|| (WC->wc_view == VIEW_ADDRESSBOOK)
) {
- wprintf("<a href=\"edit_vcard?"
- "msgnum=%ld?partnum=%s\">",
+ wprintf("<a href=\"edit_vcard?msgnum=%ld&partnum=%s\">",
msgnum, vcard_partnum);
wprintf("[%s]</a>", _("edit"));
}
- /** In all cases, display the full card */
- display_vcard(part_source, 0, 1, NULL);
+ /* In all cases, display the full card */
+ display_vcard(WC->WBuf, part_source, 0, 1, NULL,msgnum);
}
}
- /** Handler for calendar parts */
+ /* Handler for calendar parts */
if (!IsEmptyStr(cal_partnum)) {
- part_source = load_mimepart(msgnum, cal_partnum);
- if (part_source != NULL) {
- cal_process_attachment(part_source,
- msgnum, cal_partnum);
- }
}
if (part_source) {
wprintf("</div>\n");
- /** end everythingamundo table */
+ /* end everythingamundo table */
if (!printable_view) {
wprintf("</div>\n");
}
if (num_attach_links > 0) {
free(attach_links);
}
-
-#ifdef HAVE_ICONV
- if (ic != (iconv_t)(-1) ) {
- iconv_close(ic);
- }
-#endif
+ DestroyMessageSummary(Msg);
+ FreeStrBuf(&FoundCharset);
+ FreeStrBuf(&Token);
+ FreeStrBuf(&Buf);
}
-/**
- * \brief Unadorned HTML output of an individual message, suitable
+/*
+ * Unadorned HTML output of an individual message, suitable
* for placing in a hidden iframe, for printing, or whatever
*
- * \param msgnum_as_string Message number, as a string instead of as a long int
+ * msgnum_as_string == Message number, as a string instead of as a long int
*/
-void embed_message(char *msgnum_as_string) {
+void embed_message(void) {
long msgnum = 0L;
- msgnum = atol(msgnum_as_string);
- begin_ajax_response();
+ msgnum = StrTol(WC->UrlFragment1);
read_message(msgnum, 0, "");
- end_ajax_response();
}
-/**
- * \brief Printable view of a message
+/*
+ * Printable view of a message
*
- * \param msgnum_as_string Message number, as a string instead of as a long int
+ * msgnum_as_string == Message number, as a string instead of as a long int
*/
-void print_message(char *msgnum_as_string) {
+void print_message(void) {
long msgnum = 0L;
- msgnum = atol(msgnum_as_string);
+ msgnum = StrTol(WC->UrlFragment1);
output_headers(0, 0, 0, 0, 0, 0);
- wprintf("Content-type: text/html\r\n"
+ hprintf("Content-type: text/html\r\n"
"Server: %s\r\n"
"Connection: close\r\n",
PACKAGE_STRING);
begin_burst();
- wprintf("\r\n\r\n<html>\n"
- "<head><title>Printable view</title></head>\n"
+ wprintf("\r\n<html>\n<head><title>");
+ escputs(WC->wc_fullname);
+ wprintf("</title></head>\n"
"<body onLoad=\" window.print(); window.close(); \">\n"
);
wDumpContent(0);
}
-
+/*
+ * Mobile browser view of message
+ *
+ * @param msg_num_as_string Message number as a string instead of as a long int
+ */
+void mobile_message_view(void) {
+ long msgnum = 0L;
+ msgnum = StrTol(WC->UrlFragment1);
+ output_headers(1, 0, 0, 0, 0, 1);
+ begin_burst();
+ do_template("msgcontrols", NULL);
+ read_message(msgnum,1, "");
+ wDumpContent(0);
+}
/**
* \brief Display a message's headers
*
* \param msgnum_as_string Message number, as a string instead of as a long int
*/
-void display_headers(char *msgnum_as_string) {
+void display_headers(void) {
long msgnum = 0L;
char buf[1024];
- msgnum = atol(msgnum_as_string);
+ msgnum = StrTol(WC->UrlFragment1);
output_headers(0, 0, 0, 0, 0, 0);
- wprintf("Content-type: text/plain\r\n"
+ hprintf("Content-type: text/plain\r\n"
"Server: %s\r\n"
"Connection: close\r\n",
PACKAGE_STRING);
&& (strcasecmp(mime_charset, "UTF-8"))
&& (strcasecmp(mime_charset, ""))
) {
- ic = ctdl_iconv_open("UTF-8", mime_charset);
+ ctdl_iconv_open("UTF-8", mime_charset, &ic);
if (ic == (iconv_t)(-1) ) {
lprintf(5, "%s:%d iconv_open(%s, %s) failed: %s\n",
__FILE__, __LINE__, "UTF-8", mime_charset, strerror(errno));
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
int len;
len = strlen(buf);
- if (buf[len-1] == '\n') buf[--len] = 0;
- if (buf[len-1] == '\r') buf[--len] = 0;
+ 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) ) {
bq = 0;
}
wprintf("<tt>");
- url(buf);
+ url(buf, sizeof(buf));
msgescputs1(buf);
wprintf("</tt><br />");
}
strcat(buf, "\n");
msgescputs(buf);
}
- }
+ }//// TODO: charset? utf8?
/** Unknown weirdness ... don't know how to handle this content type */
else {
if (attachments != NULL) {
free(attachments);
}
-}
-
-/**
- * \brief Display one row in the mailbox summary view
- *
- * \param num The row number to be displayed
- */
-void display_summarized(int num) {
- char datebuf[64];
-
- wprintf("<tr id=\"m%ld\" style=\"font-weight:%s;\" "
- "onMouseDown=\"CtdlMoveMsgMouseDown(event,%ld)\">",
- WC->summ[num].msgnum,
- (WC->summ[num].is_new ? "bold" : "normal"),
- WC->summ[num].msgnum
- );
-
- wprintf("<td width=%d%%>", SUBJ_COL_WIDTH_PCT);
+}
- escputs(WC->summ[num].subj);//////////////////////////////////TODO: QP DECODE
- wprintf("</td>");
- wprintf("<td width=%d%%>", SENDER_COL_WIDTH_PCT);
- escputs(WC->summ[num].from);
- wprintf("</td>");
- wprintf("<td width=%d%%>", DATE_PLUS_BUTTONS_WIDTH_PCT);
- webcit_fmt_date(datebuf, WC->summ[num].date, 1); /* brief */
- escputs(datebuf);
- wprintf("</td>");
- wprintf("</tr>\n");
+void EvaluateMimePart(message_summary *Sum, StrBuf *Buf)
+{//// paert=; TODO
+/*
+ extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
+ extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
+ extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
+ extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
+ mime_length = extract_int(&buf[5], 5);
+
+ if ( (!strcasecmp(mime_content_type, "text/x-vcard"))
+ || (!strcasecmp(mime_content_type, "text/vcard")) ) {
+ strcpy(vcard_partnum, mime_partnum);
+ }
+*/
}
+message_summary *ReadOneMessageSummary(StrBuf *RawMessage, const char *DefaultSubject, long MsgNum)
+{
+ void *vEval;
+ MsgPartEvaluatorFunc Eval;
+ message_summary *Msg;
+ StrBuf *Buf;
+ const char *buf;
+ const char *ebuf;
+ int nBuf;
+ long len;
+
+ Buf = NewStrBuf();
+
+ serv_printf("MSG0 %ld|1", MsgNum); /* ask for headers only */
+
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) == 1) {
+ FreeStrBuf(&Buf);
+ return NULL;
+ }
+
+ Msg = (message_summary*)malloc(sizeof(message_summary));
+ memset(Msg, 0, sizeof(message_summary));
+ while (len = StrBuf_ServGetln(Buf),
+ ((len != 3) ||
+ strcmp(ChrPtr(Buf), "000")== 0)){
+ buf = ChrPtr(Buf);
+ ebuf = strchr(ChrPtr(Buf), '=');
+ nBuf = ebuf - buf;
+ if (GetHash(MsgEvaluators, buf, nBuf, &vEval) && vEval != NULL) {
+ Eval = (MsgPartEvaluatorFunc) vEval;
+ StrBufCutLeft(Buf, nBuf + 1);
+ Eval(Msg, Buf);
+ }
+ else lprintf(1, "Don't know how to handle Message Headerline [%s]", ChrPtr(Buf));
+ }
+ return Msg;
+}
/**
* \param alpha what????
*/
void display_addressbook(long msgnum, char alpha) {
- char buf[SIZ];
- char mime_partnum[SIZ];
- char mime_filename[SIZ];
- char mime_content_type[SIZ];
- char mime_disposition[SIZ];
- int mime_length;
+ //char buf[SIZ];
+ /* char mime_partnum[SIZ]; */
+/* char mime_filename[SIZ]; */
+/* char mime_content_type[SIZ]; */
+ ///char mime_disposition[SIZ];
+ //int mime_length;
char vcard_partnum[SIZ];
char *vcard_source = NULL;
- struct message_summary summ;
+ message_summary summ;////TODO: this will leak
memset(&summ, 0, sizeof(summ));
- safestrncpy(summ.subj, _("(no subject)"), sizeof summ.subj);
-
- sprintf(buf, "MSG0 %ld|1", msgnum); /* ask for headers only */
- serv_puts(buf);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '1') return;
-
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- if (!strncasecmp(buf, "part=", 5)) {
- extract_token(mime_filename, &buf[5], 1, '|', sizeof mime_filename);
- extract_token(mime_partnum, &buf[5], 2, '|', sizeof mime_partnum);
- extract_token(mime_disposition, &buf[5], 3, '|', sizeof mime_disposition);
- extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
- mime_length = extract_int(&buf[5], 5);
-
- if ( (!strcasecmp(mime_content_type, "text/x-vcard"))
- || (!strcasecmp(mime_content_type, "text/vcard")) ) {
- strcpy(vcard_partnum, mime_partnum);
- }
-
- }
- }
-
+ ///safestrncpy(summ.subj, _("(no subject)"), sizeof summ.subj);
+///Load Message headers
+// Msg =
if (!IsEmptyStr(vcard_partnum)) {
vcard_source = load_mimepart(msgnum, vcard_partnum);
if (vcard_source != NULL) {
/** Display the summary line */
- display_vcard(vcard_source, alpha, 0, NULL);
+ display_vcard(WC->WBuf, vcard_source, alpha, 0, NULL,msgnum);
/** If it's my vCard I can edit it */
if ( (!strcasecmp(WC->wc_roomname, USERCONFIGROOM))
|| (WC->wc_view == VIEW_ADDRESSBOOK)
) {
wprintf("<a href=\"edit_vcard?"
- "msgnum=%ld?partnum=%s\">",
+ "msgnum=%ld&partnum=%s\">",
msgnum, vcard_partnum);
wprintf("[%s]</a>", _("edit"));
}
* \param msgnum the citadel message number
* \param namebuf where to put the name in???
*/
-void fetch_ab_name(long msgnum, char *namebuf) {
+void fetch_ab_name(message_summary *Msg, char *namebuf) {
char buf[SIZ];
char mime_partnum[SIZ];
char mime_filename[SIZ];
char vcard_partnum[SIZ];
char *vcard_source = NULL;
int i, len;
- struct message_summary summ;
+ message_summary summ;/// TODO this will lak
if (namebuf == NULL) return;
strcpy(namebuf, "");
memset(&summ, 0, sizeof(summ));
- safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
+ //////safestrncpy(summ.subj, "(no subject)", sizeof summ.subj);
- sprintf(buf, "MSG0 %ld|0", msgnum); /** unfortunately we need the mime info now */
+ sprintf(buf, "MSG0 %ld|0", Msg->msgnum); /** unfortunately we need the mime info now */
serv_puts(buf);
serv_getln(buf, sizeof buf);
if (buf[0] != '1') return;
}
if (!IsEmptyStr(vcard_partnum)) {
- vcard_source = load_mimepart(msgnum, vcard_partnum);
+ vcard_source = load_mimepart(Msg->msgnum, vcard_partnum);
if (vcard_source != NULL) {
/* Grab the name off the card */
- display_vcard(vcard_source, 0, 0, namebuf);
+ display_vcard(WC->WBuf, vcard_source, 0, 0, namebuf, Msg->msgnum);
free(vcard_source);
}
-/**
- * \brief Record compare function for sorting address book indices
- * \param ab1 adressbook one
- * \param ab2 adressbook two
- */
-int abcmp(const void *ab1, const void *ab2) {
- return(strcasecmp(
- (((const struct addrbookent *)ab1)->ab_name),
- (((const struct addrbookent *)ab2)->ab_name)
- ));
-}
-
-
-/**
- * \brief Helper function for do_addrbook_view()
- * Converts a name into a three-letter tab label
- * \param tabbuf the tabbuffer to add name to
- * \param name the name to add to the tabbuffer
- */
-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]);
- tabbuf[3] = 0;
-}
-
-
-/**
- * \brief Render the address book using info we gathered during the scan
- * \param addrbook the addressbook to render
- * \param num_ab the number of the addressbook
- */
-void do_addrbook_view(struct addrbookent *addrbook, int num_ab) {
- int i = 0;
- int displayed = 0;
- int bg = 0;
- static int NAMESPERPAGE = 60;
- int num_pages = 0;
- int tabfirst = 0;
- char tabfirst_label[64];
- int tablast = 0;
- 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>");
- wprintf(_("This address book is empty."));
- wprintf("</i></div>\n");
- return;
- }
-
- if (num_ab > 1) {
- qsort(addrbook, num_ab, sizeof(struct addrbookent), abcmp);
- }
-
- num_pages = (num_ab / NAMESPERPAGE) + 1;
-
- 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;
- }
-
- 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, 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);
- }
-
- tabbed_dialog(num_pages, tablabels);
- page = (-1);
-
- for (i=0; i<num_ab; ++i) {
-
- 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")
- );
- }
-
- 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);
-}
-
-/**
- * \brief load message pointers from the server
- * \param servcmd the citadel command to send to the citserver
- * \param with_headers what headers???
+/*
+ * load message pointers from the server for a "read messages" operation
+ *
+ * servcmd: the citadel command to send to the citserver
+ * with_headers: also include some of the headers with the message numbers (more expensive)
*/
int load_msg_ptrs(char *servcmd, int with_headers)
{
- char buf[1024];
- time_t datestamp;
- char fullname[128];
- char nodename[128];
- char inetaddr[128];
- char subject[1024];
+ StrBuf* FoundCharset = NULL;
+ struct wcsession *WCC = WC;
+ message_summary *Msg;
+ StrBuf *Buf, *Buf2;
+ ///char buf[1024];
+ ///time_t datestamp;
+ //char fullname[128];
+ //char nodename[128];
+ //char inetaddr[128];
+ //char subject[1024];
+ ///char *ptr;
int nummsgs;
- int sbjlen;
+ ////int sbjlen;
int maxload = 0;
+ long len;
- int num_summ_alloc = 0;
+ ////int num_summ_alloc = 0;
- if (WC->summ != NULL) {
- free(WC->summ);
- WC->num_summ = 0;
- WC->summ = NULL;
+ if (WCC->summ != NULL) {
+ if (WCC->summ != NULL)
+ DeleteHash(&WCC->summ);
}
- num_summ_alloc = 100;
- WC->num_summ = 0;
- WC->summ = malloc(num_summ_alloc * sizeof(struct message_summary));
-
+ WCC->summ = NewHash(1, Flathash);
nummsgs = 0;
- maxload = sizeof(WC->msgarr) / sizeof(long) ;
+ maxload = 1000;/// TODO
+
+ Buf = NewStrBuf();
serv_puts(servcmd);
- serv_getln(buf, sizeof buf);
- if (buf[0] != '1') {
+ StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 1) {
+ FreeStrBuf(&Buf);
return (nummsgs);
}
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+// TODO if (with_headers) { //// TODO: Have Attachments?
+ Buf2 = NewStrBuf();
+ while (len = StrBuf_ServGetln(Buf),
+ ((len != 3) ||
+ strcmp(ChrPtr(Buf), "000")!= 0))
+ {
if (nummsgs < maxload) {
- WC->msgarr[nummsgs] = extract_long(buf, 0);
- datestamp = extract_long(buf, 1);
- extract_token(fullname, buf, 2, '|', sizeof fullname);
- extract_token(nodename, buf, 3, '|', sizeof nodename);
- extract_token(inetaddr, buf, 4, '|', sizeof inetaddr);
- extract_token(subject, buf, 5, '|', sizeof subject);
- ++nummsgs;
-
- if (with_headers) {
- if (nummsgs > num_summ_alloc) {
- num_summ_alloc *= 2;
- WC->summ = realloc(WC->summ,
- num_summ_alloc * sizeof(struct message_summary));
- }
- ++WC->num_summ;
+ Msg = (message_summary*)malloc(sizeof(message_summary));
+ memset(Msg, 0, sizeof(message_summary));
+
+ Msg->msgnum = StrBufExtract_long(Buf, 0, '|');
+ Msg->date = StrBufExtract_long(Buf, 1, '|');
- memset(&WC->summ[nummsgs-1], 0, sizeof(struct message_summary));
- WC->summ[nummsgs-1].msgnum = WC->msgarr[nummsgs-1];
- safestrncpy(WC->summ[nummsgs-1].subj,
- _("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
- if (!IsEmptyStr(fullname)) {
+ Msg->from = NewStrBufPlain(NULL, StrLength(Buf));
+ StrBufExtract_token(Buf2, Buf, 2, '|');
+ if (StrLength(Buf2) != 0) {
/** Handle senders with RFC2047 encoding */
- utf8ify_rfc822_string(fullname);
- safestrncpy(WC->summ[nummsgs-1].from,
- fullname, sizeof WC->summ[nummsgs-1].from);
- }
- if (!IsEmptyStr(subject)) {
- /** Handle subjects with RFC2047 encoding */
- utf8ify_rfc822_string(subject);
- safestrncpy(WC->summ[nummsgs-1].subj, subject,
- sizeof WC->summ[nummsgs-1].subj);
- }
- sbjlen = Ctdl_Utf8StrLen(WC->summ[nummsgs-1].subj);
- if (sbjlen > 75) {
- char *ptr;
- ptr = Ctdl_Utf8StrCut(WC->summ[nummsgs-1].subj, 72);
+ StrBuf_RFC822_to_Utf8(Msg->from, Buf2, WCC->DefaultCharset, FoundCharset);
+ }
+
+ /** Nodename */
+ StrBufExtract_token(Buf2, Buf, 3, '|');
+ if ((StrLength(Buf2) !=0 ) &&
+ ( ((WCC->room_flags & QR_NETWORK)
+ || ((strcasecmp(ChrPtr(Buf2), serv_info.serv_nodename)
+ && (strcasecmp(ChrPtr(Buf2), serv_info.serv_fqdn)))))))
+ {
+ StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
+ StrBufAppendBuf(Msg->from, Buf2, 0);
+ }
- strcpy(ptr, "...");
- }
+ /** Not used:
+ StrBufExtract_token(Msg->inetaddr, Buf, 4, '|');
+ */
- if (!IsEmptyStr(nodename)) {
- if ( ((WC->room_flags & QR_NETWORK)
- || ((strcasecmp(nodename, serv_info.serv_nodename)
- && (strcasecmp(nodename, serv_info.serv_fqdn)))))
- ) {
- strcat(WC->summ[nummsgs-1].from, " @ ");
- strcat(WC->summ[nummsgs-1].from, nodename);
- }
+ Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
+ StrBufExtract_token(Buf2, Buf, 5, '|');
+ if (StrLength(Buf2) == 0)
+ StrBufAppendBufPlain(Msg->subj, _("(no subj)"), 0, -1);
+ else {
+ StrBuf_RFC822_to_Utf8(Msg->subj, Buf2, WCC->DefaultCharset, FoundCharset);
+ if ((StrLength(Msg->subj) > 75) &&
+ (StrBuf_Utf8StrLen(Msg->subj) > 75)) {
+ StrBuf_Utf8StrCut(Msg->subj, 72);
+ StrBufAppendBufPlain(Msg->subj, HKEY("..."), 0);
}
+ }
- WC->summ[nummsgs-1].date = datestamp;
-
- /** Handle senders with RFC2047 encoding */
- utf8ify_rfc822_string(WC->summ[nummsgs-1].from);
- if (strlen(WC->summ[nummsgs-1].from) > 25) {
- strcpy(&WC->summ[nummsgs-1].from[22], "...");
- }
+
+ if ((StrLength(Msg->from) > 25) &&
+ (StrBuf_Utf8StrLen(Msg->from) > 25)) {
+ StrBuf_Utf8StrCut(Msg->from, 23);
+ StrBufAppendBufPlain(Msg->from, HKEY("..."), 0);
}
+ Put(WCC->summ, (const char*)&Msg->msgnum, sizeof(Msg->msgnum), Msg, DestroyMessageSummary);
}
+ nummsgs++;
}
+ FreeStrBuf(&Buf2);
+ FreeStrBuf(&Buf);
return (nummsgs);
}
-/**
- * \brief qsort() compatible function to compare two longs in descending order.
- *
- * \param s1 first number to compare
- * \param s2 second number to compare
- */
-int longcmp_r(const void *s1, const void *s2) {
- long l1;
- long l2;
-
- l1 = *(long *)s1;
- l2 = *(long *)s2;
-
- if (l1 > l2) return(-1);
- if (l1 < l2) return(+1);
- return(0);
-}
-
-
-/**
- * \brief qsort() compatible function to compare two message summary structs by ascending subject.
- *
- * \param s1 first item to compare
- * \param s2 second item to compare
- */
-int summcmp_subj(const void *s1, const void *s2) {
- struct message_summary *summ1;
- struct message_summary *summ2;
-
- summ1 = (struct message_summary *)s1;
- summ2 = (struct message_summary *)s2;
- return strcasecmp(summ1->subj, summ2->subj);
-}
-
-/**
- * \brief qsort() compatible function to compare two message summary structs by descending subject.
- *
- * \param s1 first item to compare
- * \param s2 second item to compare
- */
-int summcmp_rsubj(const void *s1, const void *s2) {
- struct message_summary *summ1;
- struct message_summary *summ2;
-
- summ1 = (struct message_summary *)s1;
- summ2 = (struct message_summary *)s2;
- return strcasecmp(summ2->subj, summ1->subj);
-}
-
-/**
- * \brief qsort() compatible function to compare two message summary structs by ascending sender.
- *
- * \param s1 first item to compare
- * \param s2 second item to compare
- */
-int summcmp_sender(const void *s1, const void *s2) {
- struct message_summary *summ1;
- struct message_summary *summ2;
-
- summ1 = (struct message_summary *)s1;
- summ2 = (struct message_summary *)s2;
- return strcasecmp(summ1->from, summ2->from);
-}
-
-/**
- * \brief qsort() compatible function to compare two message summary structs by descending sender.
- *
- * \param s1 first item to compare
- * \param s2 second item to compare
- */
-int summcmp_rsender(const void *s1, const void *s2) {
- struct message_summary *summ1;
- struct message_summary *summ2;
-
- summ1 = (struct message_summary *)s1;
- summ2 = (struct message_summary *)s2;
- return strcasecmp(summ2->from, summ1->from);
-}
-
-/**
- * \brief qsort() compatible function to compare two message summary structs by ascending date.
- *
- * \param s1 first item to compare
- * \param s2 second item to compare
- */
-int summcmp_date(const void *s1, const void *s2) {
- struct message_summary *summ1;
- struct message_summary *summ2;
-
- summ1 = (struct message_summary *)s1;
- summ2 = (struct message_summary *)s2;
-
- if (summ1->date < summ2->date) return -1;
- else if (summ1->date > summ2->date) return +1;
- else return 0;
-}
-/**
- * \brief qsort() compatible function to compare two message summary structs by descending date.
- *
- * \param s1 first item to compare
- * \param s2 second item to compare
- */
-int summcmp_rdate(const void *s1, const void *s2) {
- struct message_summary *summ1;
- struct message_summary *summ2;
-
- summ1 = (struct message_summary *)s1;
- summ2 = (struct message_summary *)s2;
- if (summ1->date < summ2->date) return +1;
- else if (summ1->date > summ2->date) return -1;
- else return 0;
-}
-/**
- * \brief command loop for reading messages
+/*
+ * command loop for reading messages
*
- * \param oper Set to "readnew" or "readold" or "readfwd" or "headers"
+ * Set oper to "readnew" or "readold" or "readfwd" or "headers"
*/
void readloop(char *oper)
{
+ void *vMsg;
+ message_summary *Msg;
char cmd[256] = "";
char buf[SIZ];
char old_msgs[SIZ];
- int a, b;
+ int a = 0;
+ int b = 0;
int nummsgs;
long startmsg;
int maxmsgs;
int is_addressbook = 0;
int is_singlecard = 0;
int is_calendar = 0;
+ struct calview calv;
int is_tasks = 0;
int is_notes = 0;
int is_bbview = 0;
int lo, hi;
int lowest_displayed = (-1);
int highest_displayed = 0;
- struct addrbookent *addrbook = NULL;
+ addrbookent *addrbook = NULL;
int num_ab = 0;
- char *sortby = NULL;
- char sortpref_name[128];
- char sortpref_value[128];
- char *subjsort_button;
- char *sendsort_button;
- char *datesort_button;
+ const StrBuf *sortby = NULL;
+ //SortByEnum
+ int SortBy = eRDate;
+ const StrBuf *sortpref_value;
int bbs_reverse = 0;
struct wcsession *WCC = WC; /* This is done to make it run faster; WC is a function */
+ HashPos *at;
+ const char *HashKey;
+ long HKLen;
if (WCC->wc_view == VIEW_WIKI) {
- sprintf(buf, "wiki?room=%s?page=home", WCC->wc_roomname);
+ sprintf(buf, "wiki?room=%s&page=home", WCC->wc_roomname);
http_redirect(buf);
return;
}
startmsg = lbstr("startmsg");
maxmsgs = ibstr("maxmsgs");
- is_summary = ibstr("is_summary");
+ is_summary = (ibstr("is_summary") && !WCC->is_mobile);
if (maxmsgs == 0) maxmsgs = DEFAULT_MAXMSGS;
- snprintf(sortpref_name, sizeof sortpref_name, "sort %s", WCC->wc_roomname);
- get_preference(sortpref_name, sortpref_value, sizeof sortpref_value);
+ sortpref_value = get_room_pref("sort");
- sortby = bstr("sortby");
- if ( (!IsEmptyStr(sortby)) && (strcasecmp(sortby, sortpref_value)) ) {
- set_preference(sortpref_name, sortby, 1);
+ sortby = sbstr("sortby");
+ if ( (!IsEmptyStr(ChrPtr(sortby))) &&
+ (strcasecmp(ChrPtr(sortby), ChrPtr(sortpref_value)) != 0)) {
+ set_room_pref("sort", NewStrBufDup(sortby), 1);
+ sortpref_value = NULL;
+ sortpref_value = sortby;
}
- if (IsEmptyStr(sortby)) sortby = sortpref_value;
-
- /** mailbox sort */
- if (IsEmptyStr(sortby)) sortby = "rdate";
- /** message board sort */
- if (!strcasecmp(sortby, "reverse")) {
+ SortBy = StrToESort(sortpref_value);
+ /* message board sort */
+ if (SortBy == eReverse) {
bbs_reverse = 1;
}
else {
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.
*/
strcpy(cmd, "MSGS ALL");
}
- if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1)) {
+ if ((WCC->wc_view == VIEW_MAILBOX) && (maxmsgs > 1) && !WCC->is_mobile) {
is_summary = 1;
if (!strcmp(oper, "do_search")) {
snprintf(cmd, sizeof(cmd), "MSGS SEARCH|%s", bstr("query"));
);
startmsg = 1;
maxmsgs = 9999999;
+ }
+ if (WCC->is_mobile) {
+ maxmsgs = 20;
+ snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
+ (!strcmp(oper, "do_search") ? "SEARCH" : "ALL"),
+ (!strcmp(oper, "do_search") ? bstr("query") : "")
+ );
+ SortBy = eRDate;
}
- /**
+ /*
* Are we doing a summary view? If so, we need to know old messages
* and new messages, so we can do that pretty boldface thing for the
* new messages.
*/
strcpy(old_msgs, "");
- if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
+ if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR) || WCC->is_mobile){
serv_puts("GTSN");
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
is_calendar = 1;
strcpy(cmd, "MSGS ALL|||1");
maxmsgs = 32767;
+ parse_calendar_view_request(&calv);
}
if (WCC->wc_default_view == VIEW_TASKS) { /**< tasks */
is_tasks = 1;
}
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);
+ nummsgs = load_msg_ptrs(cmd, (is_summary || WCC->is_mobile));
if (nummsgs == 0) {
if ((!is_tasks) && (!is_calendar) && (!is_notes) && (!is_addressbook)) {
goto DONE;
}
- if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR)){
- for (a = 0; a < nummsgs; ++a) {
+ if ((is_summary) || (WCC->wc_default_view == VIEW_CALENDAR) || WCC->is_mobile){
+ void *vMsg;
+ message_summary *Msg;
+
+ at = GetNewHashPos();
+ while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
/** Are you a new message, or an old message? */
+ Msg = (message_summary*) vMsg;
if (is_summary) {
- if (is_msg_in_mset(old_msgs, WCC->msgarr[a])) {
- WCC->summ[a].is_new = 0;
+ if (is_msg_in_mset(old_msgs, Msg->msgnum)) {
+ Msg->is_new = 0;
}
else {
- WCC->summ[a].is_new = 1;
+ Msg->is_new = 1;
}
}
}
+ DeleteHashPos(&at);
}
if (startmsg == 0L) {
}
}
- if (is_summary) {
- if (!strcasecmp(sortby, "subject")) {
- qsort(WCC->summ, WCC->num_summ,
- sizeof(struct message_summary), summcmp_subj);
- }
- else if (!strcasecmp(sortby, "rsubject")) {
- qsort(WCC->summ, WCC->num_summ,
- sizeof(struct message_summary), summcmp_rsubj);
- }
- else if (!strcasecmp(sortby, "sender")) {
- qsort(WCC->summ, WCC->num_summ,
- sizeof(struct message_summary), summcmp_sender);
- }
- else if (!strcasecmp(sortby, "rsender")) {
- qsort(WCC->summ, WCC->num_summ,
- sizeof(struct message_summary), summcmp_rsender);
- }
- else if (!strcasecmp(sortby, "date")) {
- qsort(WCC->summ, WCC->num_summ,
- sizeof(struct message_summary), summcmp_date);
- }
- else if (!strcasecmp(sortby, "rdate")) {
- 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?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?is_summary=1?sortby=subject\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
- }
- else {
- 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?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?is_summary=1?sortby=sender\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
- }
- else {
- 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?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?is_summary=1?sortby=date\"><img border=\"0\" src=\"static/up_pointer.gif\" /></a>" ;
- }
- else {
- 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 || WCC->is_mobile) {
+ SortByPayload(WCC->summ, SortFuncs[SortBy]);
}
if (is_summary) {
"<table cellspacing=0 style=\"width:100%%\">"
"<tr>"
);
- wprintf("<th width=%d%%>%s %s</th>"
- "<th width=%d%%>%s %s</th>"
- "<th width=%d%%>%s %s"
+ wprintf("<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
+ "<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> </th>\n"
+ "<th width=%d%%>%s <a href=\"readfwd?startmsg=1?maxmsgs=9999999?is_summary=1?sortby=%s\"><img border=\"0\" src=\"%s\" /></a> \n"
" "
"<input type=\"submit\" name=\"delete_button\" id=\"delbutton\" "
" onClick=\"CtdlDeleteSelectedMessages(event)\" "
"</tr>\n"
,
SUBJ_COL_WIDTH_PCT,
- _("Subject"), subjsort_button,
+ _("Subject"),
+ SortByStrings[SubjectInvertSortString[SortBy]],
+ SortIcons[SortSubjectToIcon[SortBy]],
SENDER_COL_WIDTH_PCT,
- _("Sender"), sendsort_button,
+ _("Sender"),
+ SortByStrings[SenderInvertSortString[SortBy]],
+ SortIcons[SortSenderToIcon[SortBy]],
DATE_PLUS_BUTTONS_WIDTH_PCT,
- _("Date"), datesort_button,
+ _("Date"),
+ SortByStrings[DateInvertSortString[SortBy]],
+ SortIcons[SortDateToIcon[SortBy]],
_("Delete")
);
wprintf("</table></div></div>\n");
-
wprintf("<div id=\"message_list\">"
"<div class=\"fix_scrollbar_bug\">\n"
-
"<table class=\"mailbox_summary\" id=\"summary_headers\" "
"cellspacing=0 style=\"width:100%%;-moz-user-select:none;\">"
);
+ } else if (WCC->is_mobile) {
+ wprintf("<div id=\"message_list\">");
}
if (is_bbview) {
/** begin bbview scroller */
wprintf("<form name=\"msgomatictop\" class=\"selector_top\" > \n <p>");
- wprintf(_("Reading #"), lowest_displayed, highest_displayed);
+ wprintf(_("Reading #"));//// TODO this isn't used, should it? : , lowest_displayed, highest_displayed);
wprintf("<select name=\"whichones\" size=\"1\" "
"OnChange=\"location.href=msgomatictop.whichones.options"
if (lo < 1) lo = 1;
wprintf("<option %s value="
"\"%s"
- "?startmsg=%ld"
- "?maxmsgs=%d"
- "?is_summary=%d\">"
+ "&startmsg=%ld"
+ "&maxmsgs=%d"
+ "&is_summary=%d\">"
"%d-%d</option> \n",
((WCC->msgarr[lo-1] == startmsg) ? "selected" : ""),
oper,
if (hi > nummsgs) hi = nummsgs;
wprintf("<option %s value="
"\"%s"
- "?startmsg=%ld"
- "?maxmsgs=%d"
- "?is_summary=%d\">"
+ "&startmsg=%ld"
+ "&maxmsgs=%d"
+ "&is_summary=%d\">"
"%d-%d</option> \n",
((WCC->msgarr[b] == startmsg) ? "selected" : ""),
oper,
}
wprintf("<option value=\"%s?startmsg=%ld"
- "?maxmsgs=9999999?is_summary=%d\">",
+ "&maxmsgs=9999999&is_summary=%d\">",
oper,
WCC->msgarr[0], is_summary);
wprintf(_("All"));
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 ((WCC->msgarr[a] >= startmsg) && (num_displayed < maxmsgs)) {
-
+
+ at = GetNewHashPos();
+ while (GetNextHashPos(WCC->summ, at, &HKLen, &HashKey, &vMsg)) {
+ Msg = (message_summary*) vMsg;
+ if ((Msg->msgnum >= startmsg) && (num_displayed < maxmsgs)) {
+
/** Display the message */
if (is_summary) {
- display_summarized(a);
+ DoTemplate(HKEY("section_mailsummary"), NULL, Msg, CTX_MAILSUM);
}
else if (is_addressbook) {
- fetch_ab_name(WCC->msgarr[a], buf);
+ fetch_ab_name(Msg, buf);
++num_ab;
addrbook = realloc(addrbook,
- (sizeof(struct addrbookent) * num_ab) );
+ (sizeof(addrbookent) * num_ab) );
safestrncpy(addrbook[num_ab-1].ab_name, buf,
- sizeof(addrbook[num_ab-1].ab_name));
- addrbook[num_ab-1].ab_msgnum = WCC->msgarr[a];
+ sizeof(addrbook[num_ab-1].ab_name));
+ addrbook[num_ab-1].ab_msgnum = Msg->msgnum;
}
else if (is_calendar) {
- display_calendar(WCC->msgarr[a], WCC->summ[a].is_new);
+ load_calendar_item(Msg, Msg->is_new, &calv);
}
else if (is_tasks) {
- display_task(WCC->msgarr[a], WCC->summ[a].is_new);
+ display_task(Msg, Msg->is_new);
}
else if (is_notes) {
- display_note(WCC->msgarr[a], WCC->summ[a].is_new);
+ display_note(Msg, Msg->is_new);
+ } else if (WCC->is_mobile) {
+ DoTemplate(HKEY("section_mailsummary"), NULL, Msg, CTX_MAILSUM);
}
else {
if (displayed_msgs == NULL) {
displayed_msgs = malloc(sizeof(long) *
(maxmsgs<nummsgs ? maxmsgs : nummsgs));
}
- displayed_msgs[num_displayed] = WCC->msgarr[a];
+ displayed_msgs[num_displayed] = Msg->msgnum;
}
-
+
if (lowest_displayed < 0) lowest_displayed = a;
highest_displayed = a;
-
+
++num_displayed;
}
}
+ DeleteHashPos(&at);
/** Output loop */
if (displayed_msgs != NULL) {
wprintf("</table>"
"</div>\n"); /**< end of 'fix_scrollbar_bug' div */
wprintf("</div>"); /**< end of 'message_list' div */
-
+
/** Here's the grab-it-to-resize-the-message-list widget */
wprintf("<div id=\"resize_msglist\" "
"onMouseDown=\"CtdlResizeMsgListMouseDown(event)\">"
);
wprintf("<div id=\"preview_pane\">"); /**< The preview pane will initially be empty */
+ } else if (WCC->is_mobile) {
+ wprintf("</div>");
}
/**
if (is_bbview) {
/** begin bbview scroller */
wprintf("<form name=\"msgomatic\" class=\"selector_bottom\" > \n <p>");
- wprintf(_("Reading #"), lowest_displayed, highest_displayed);
+ wprintf(_("Reading #")); /// TODO: this isn't used: , lowest_displayed, highest_displayed);
wprintf("<select name=\"whichones\" size=\"1\" "
"OnChange=\"location.href=msgomatic.whichones.options"
if (lo < 1) lo = 1;
wprintf("<option %s value="
"\"%s"
- "?startmsg=%ld"
- "?maxmsgs=%d"
- "?is_summary=%d\">"
+ "&startmsg=%ld"
+ "&maxmsgs=%d"
+ "&is_summary=%d\">"
"%d-%d</option> \n",
((WCC->msgarr[lo-1] == startmsg) ? "selected" : ""),
oper,
if (hi > nummsgs) hi = nummsgs;
wprintf("<option %s value="
"\"%s"
- "?startmsg=%ld"
- "?maxmsgs=%d"
- "?is_summary=%d\">"
+ "&startmsg=%ld"
+ "&maxmsgs=%d"
+ "&is_summary=%d\">"
"%d-%d</option> \n",
((WCC->msgarr[b] == startmsg) ? "selected" : ""),
oper,
}
}
- wprintf("<option value=\"%s?startmsg=%ld"
- "?maxmsgs=9999999?is_summary=%d\">",
+ wprintf("<option value=\"%s&startmsg=%ld"
+ "&maxmsgs=9999999&is_summary=%d\">",
oper,
WCC->msgarr[0], is_summary);
wprintf(_("All"));
/** forward/reverse */
wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
- "OnChange=\"location.href='%s?sortby=forward'\"",
+ "OnChange=\"location.href='%s&sortby=forward'\"",
(bbs_reverse ? "" : "checked"),
oper
);
wprintf(_("oldest to newest"));
wprintf(" ");
wprintf("<input type=\"radio\" %s name=\"direction\" value=\"\""
- "OnChange=\"location.href='%s?sortby=reverse'\"",
+ "OnChange=\"location.href='%s&sortby=reverse'\"",
(bbs_reverse ? "checked" : ""),
oper
);
/** 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) {
do_tasks_view(); /** Render the task list */
}
if (is_calendar) {
- do_calendar_view(); /** Render the calendar */
+ render_calendar_view(&calv);
}
if (is_addressbook) {
/** free the summary */
if (WCC->summ != NULL) {
- free(WCC->summ);
- WCC->num_summ = 0;
- WCC->summ = NULL;
+ DeleteHash(&WCC->summ);
}
if (addrbook != NULL) free(addrbook);
}
*/
void post_message(void)
{
- urlcontent *u;
- void *U;
char buf[1024];
- char *encoded_subject = NULL;
+ StrBuf *encoded_subject = NULL;
static long dont_post = (-1L);
struct wc_attachment *att, *aptr;
int is_anonymous = 0;
- const char *display_name;
- long dpLen = 0;
+ const StrBuf *display_name = NULL;
struct wcsession *WCC = WC;
- char *ptr = NULL;
-
+
if (havebstr("force_room")) {
gotoroom(bstr("force_room"));
}
- if (GetHash(WCC->urlstrings, HKEY("display_name"), &U)) {
- u = (urlcontent*) U;
- display_name = u->url_data;
- dpLen = u->url_data_size;
- }
- else {
- display_name="";
- }
- if (!strcmp(display_name, "__ANONYMOUS__")) {
- display_name = "";
- is_anonymous = 1;
+ if (havebstr("display_name")) {
+ display_name = sbstr("display_name");
+ if (!strcmp(ChrPtr(display_name), "__ANONYMOUS__")) {
+ display_name = NULL;
+ is_anonymous = 1;
+ }
}
if (WCC->upload_length > 0) {
"saved this message."));
} else {
const char CMD[] = "ENT0 1|%s|%d|4|%s|%s||%s|%s|%s|%s|%s";
- const char *Recp = "";
- const char *Cc = "";
- const char *Bcc = "";
- const char *Wikipage = "";
- const char *my_email_addr = "";
- char *CmdBuf = NULL;;
- long len = 0;
- size_t nLen;
- char references[SIZ] = "";
- size_t references_len = 0;
-
- safestrncpy(references, bstr("references"), sizeof references);
- lprintf(9, "Converting: %s\n", references);
- for (ptr=references; *ptr != 0; ++ptr) {
- if (*ptr == '|') *ptr = '!';
- ++references_len;
- }
- lprintf(9, "Converted: %s\n", references);
-
- if (GetHash(WCC->urlstrings, HKEY("subject"), &U)) {
- u = (urlcontent*) U;
+ const StrBuf *Recp = NULL;
+ const StrBuf *Cc = NULL;
+ const StrBuf *Bcc = NULL;
+ const StrBuf *Wikipage = NULL;
+ const StrBuf *my_email_addr = NULL;
+ StrBuf *CmdBuf = NULL;;
+ StrBuf *references = NULL;
+
+ if (havebstr("references"))
+ {
+ const StrBuf *ref = sbstr("references");
+ references = NewStrBufPlain(ChrPtr(ref), StrLength(ref));
+ lprintf(9, "Converting: %s\n", ChrPtr(references));
+ StrBufReplaceChars(references, '|', '!');
+ lprintf(9, "Converted: %s\n", ChrPtr(references));
+ }
+ if (havebstr("subject")) {
+ const StrBuf *Subj;
/*
* make enough room for the encoded string;
* plus the QP header
*/
- len = u->url_data_size * 3 + 32;
- encoded_subject = malloc (len);
- len = webcit_rfc2047encode(encoded_subject, len, u->url_data, u->url_data_size);
- if (len < 0) {
- free (encoded_subject);
- return;
- }
+ Subj = sbstr("subject");
+
+ StrBufRFC2047encode(&encoded_subject, Subj);
}
- len += sizeof (CMD) + dpLen;
- Recp = xbstr("recp", &nLen);
- len += nLen;
- Cc = xbstr("cc", &nLen);
- len += nLen;
- Bcc = xbstr("bcc", &nLen);
- len += nLen;
- Wikipage = xbstr("wikipage", &nLen);
- len += nLen;
- my_email_addr = xbstr("my_email_addr", &nLen);
- len += nLen;
- len += references_len;
-
- CmdBuf = (char*) malloc (len + 11);
-
- snprintf(CmdBuf, len + 1, CMD,
- Recp,
- is_anonymous,
- (encoded_subject ? encoded_subject : ""),
- display_name,
- Cc,
- Bcc,
- Wikipage,
- my_email_addr,
- references);
+ Recp = sbstr("recp");
+ Cc = sbstr("cc");
+ Bcc = sbstr("bcc");
+ Wikipage = sbstr("wikipage");
+ my_email_addr = sbstr("my_email_addr");
+
+ CmdBuf = NewStrBufPlain(NULL,
+ sizeof (CMD) +
+ StrLength(Recp) +
+ StrLength(encoded_subject) +
+ StrLength(Cc) +
+ StrLength(Bcc) +
+ StrLength(Wikipage) +
+ StrLength(my_email_addr) +
+ StrLength(references));
+
+ StrBufPrintf(CmdBuf,
+ CMD,
+ ChrPtr(Recp),
+ is_anonymous,
+ ChrPtr(encoded_subject),
+ ChrPtr(display_name),
+ ChrPtr(Cc),
+ ChrPtr(Bcc),
+ ChrPtr(Wikipage),
+ ChrPtr(my_email_addr),
+ ChrPtr(references));
+ FreeStrBuf(&references);
+
lprintf(9, "%s\n", CmdBuf);
- serv_puts(CmdBuf);
+ serv_puts(ChrPtr(CmdBuf));
serv_getln(buf, sizeof buf);
- free (CmdBuf);
- if (encoded_subject) free(encoded_subject);
+ FreeStrBuf(&CmdBuf);
+ FreeStrBuf(&encoded_subject);
if (buf[0] == '4') {
post_mime_to_server();
if ( (havebstr("recp"))
void display_enter(void)
{
char buf[SIZ];
- char ebuf[SIZ];
+ StrBuf *ebuf;
long now;
- char *display_name;
+ const StrBuf *display_name = NULL;
struct wc_attachment *att;
int recipient_required = 0;
int subject_required = 0;
int recipient_bad = 0;
- int i;
int is_anonymous = 0;
long existing_page = (-1L);
- size_t dplen;
+ struct wcsession *WCC = WC;
now = time(NULL);
gotoroom(bstr("force_room"));
}
- display_name = xbstr("display_name", &dplen);
- if (!strcmp(display_name, "__ANONYMOUS__")) {
- display_name = "";
- dplen = 0;
+ display_name = sbstr("display_name");
+ if (!strcmp(ChrPtr(display_name), "__ANONYMOUS__")) {
+ display_name = NULL;
is_anonymous = 1;
}
recipient_required = 1;
}
else if (buf[0] != '2') { /** Any other error means that we cannot continue */
- sprintf(WC->ImportantMessage, "%s", &buf[4]);
+ sprintf(WCC->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."
*/
- if (WC->wc_default_view == VIEW_ADDRESSBOOK) {
- do_edit_vcard(-1, "", "", WC->wc_roomname);
+ if (WCC->wc_default_view == VIEW_ADDRESSBOOK) {
+ do_edit_vcard(-1, "", "", WCC->wc_roomname);
return;
}
* Are we perhaps in a calendar room? If so, then an "enter
* message" command really means "add new calendar item."
*/
- if (WC->wc_default_view == VIEW_CALENDAR) {
+ if (WCC->wc_default_view == VIEW_CALENDAR) {
display_edit_event();
return;
}
* Are we perhaps in a tasks view? If so, then an "enter
* message" command really means "add new task."
*/
- if (WC->wc_default_view == VIEW_TASKS) {
+ if (WCC->wc_default_view == VIEW_TASKS) {
display_edit_task();
return;
}
/* Now check our actual recipients if there are any */
if (recipient_required) {
- const char *Recp = "";
- const char *Cc = "";
- const char *Bcc = "";
- const char *Wikipage = "";
- char *CmdBuf = NULL;;
- size_t len = 0;
- size_t nLen;
+ const StrBuf *Recp = NULL;
+ const StrBuf *Cc = NULL;
+ const StrBuf *Bcc = NULL;
+ const StrBuf *Wikipage = NULL;
+ StrBuf *CmdBuf = NULL;;
const char CMD[] = "ENT0 0|%s|%d|0||%s||%s|%s|%s";
- len = sizeof(CMD) + dplen;
- Recp = xbstr("recp", &nLen);
- len += nLen;
- Cc = xbstr("cc", &nLen);
- len += nLen;
- Bcc = xbstr("bcc", &nLen);
- len += nLen;
- Wikipage = xbstr("wikipage", &nLen);
- len += nLen;
+ Recp = sbstr("recp");
+ Cc = sbstr("cc");
+ Bcc = sbstr("bcc");
+ Wikipage = sbstr("wikipage");
-
- CmdBuf = (char*) malloc (len + 1);
-
- snprintf(CmdBuf, len, CMD,
- Recp, is_anonymous,
- display_name,
- Cc, Bcc, Wikipage);
- serv_puts(CmdBuf);
+ CmdBuf = NewStrBufPlain(NULL,
+ sizeof (CMD) +
+ StrLength(Recp) +
+ StrLength(display_name) +
+ StrLength(Cc) +
+ StrLength(Bcc) +
+ StrLength(Wikipage));
+
+ StrBufPrintf(CmdBuf,
+ CMD,
+ ChrPtr(Recp),
+ is_anonymous,
+ ChrPtr(display_name),
+ ChrPtr(Cc),
+ ChrPtr(Bcc),
+ ChrPtr(Wikipage));
+ serv_puts(ChrPtr(CmdBuf));
serv_getln(buf, sizeof buf);
+ FreeStrBuf(&CmdBuf);
if (!strncmp(buf, "570", 3)) { /** 570 means we have an invalid recipient listed */
if (havebstr("recp") &&
}
}
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]);/// -> important message
goto DONE;
}
}
"name=\"enterform\""
">\n");
wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n", now);
- if (WC->wc_view == VIEW_WIKI) {
+ if (WCC->wc_view == VIEW_WIKI) {
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=\"nonce\" value=\"%d\">\n", WCC->nonce);
wprintf("<input type=\"hidden\" name=\"force_room\" value=\"");
- escputs(WC->wc_roomname);
+ escputs(WCC->wc_roomname);
wprintf("\">\n");
wprintf("<input type=\"hidden\" name=\"references\" value=\"");
escputs(bstr("references"));
}
}
- if (WC->room_flags & QR_ANONOPT) {
+ if (WCC->room_flags & QR_ANONOPT) {
wprintf("<option %s value=\"__ANONYMOUS__\">%s</option>\n",
- ((!strcasecmp(bstr("__ANONYMOUS__"), WC->wc_fullname)) ? "selected" : ""),
+ ((!strcasecmp(bstr("__ANONYMOUS__"), WCC->wc_fullname)) ? "selected" : ""),
_("Anonymous")
);
}
}
wprintf(_(" <I>in</I> "));
- escputs(WC->wc_roomname);
+ escputs(WCC->wc_roomname);
wprintf("</td></tr>");
}
/** If we're editing a wiki page, insert the existing page here... */
- else if (WC->wc_view == VIEW_WIKI) {
+ else if (WCC->wc_view == VIEW_WIKI) {
safestrncpy(buf, bstr("wikipage"), sizeof buf);
str_wiki_index(buf);
existing_page = locate_message_by_uid(buf);
}
/** Insert our signature if appropriate... */
- if ( (WC->is_mailbox) && yesbstr("sig_inserted") ) {
- get_preference("use_sig", buf, sizeof buf);
- if (!strcasecmp(buf, "yes")) {
- int len;
- get_preference("signature", ebuf, sizeof ebuf);
- euid_unescapize(buf, ebuf);
+ if ( (WCC->is_mailbox) && !yesbstr("sig_inserted") ) {
+ int UseSig;
+ get_pref_yesno("use_sig", &UseSig, 0);
+ if (UseSig) {
+ StrBuf *Sig;
+ const char *sig, *esig;
+
+ get_preference("signature", &ebuf);
+ Sig = NewStrBuf();
+ StrBufEUid_unescapize(Sig, ebuf);
+ sig = ChrPtr(Sig);
+ esig = sig + StrLength(Sig);
wprintf("<br>--<br>");
- len = strlen(buf);
- for (i=0; i<len; ++i) {
- if (buf[i] == '\n') {
+ while (sig <= esig) {
+ if (*sig == '\n') {
wprintf("<br>");
}
- else if (buf[i] == '<') {
+ else if (*sig == '<') {
wprintf("<");
}
- else if (buf[i] == '>') {
+ else if (*sig == '>') {
wprintf(">");
}
- else if (buf[i] == '&') {
+ else if (*sig == '&') {
wprintf("&");
}
- else if (buf[i] == '\"') {
+ else if (*sig == '\"') {
wprintf(""");
}
- else if (buf[i] == '\'') {
+ else if (*sig == '\'') {
wprintf("'");
}
- else if (isprint(buf[i])) {
- wprintf("%c", buf[i]);
- }
+ else /* since we're utf 8, is this a good idea? if (isprint(*sig))*/ {
+ wprintf("%c", *sig);
+ }
+ sig ++;
}
+ FreeStrBuf(&Sig);
}
}
* The following template embeds the TinyMCE richedit control, and automatically
* transforms the textarea into a richedit textarea.
*/
- do_template("richedit");
+ do_template("richedit", NULL);
/** Enumerate any attachments which are already in place... */
wprintf("<div class=\"attachment buttons\"><img src=\"static/diskette_24x.gif\" class=\"imgedit\" > ");
wprintf(_("Attachments:"));
wprintf(" ");
wprintf("<select name=\"which_attachment\" size=1>");
- for (att = WC->first_attachment; att != NULL; att = att->next) {
+ for (att = WCC->first_attachment; att != NULL; att = att->next) {
wprintf("<option value=\"");
urlescputs(att->filename);
wprintf("\">");
-/**
- * \brief Confirm move of a message
+/*
+ * Confirm move of a message
*/
void confirm_move_msg(void)
{
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=\"nonce\" value=\"%d\">\n", WC->nonce);
wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgid\" VALUE=\"%s\">\n", bstr("msgid"));
wprintf("<SELECT NAME=\"target_room\" SIZE=5>\n");
wDumpContent(1);
}
+void readnew(void) { readloop("readnew");}
+void readold(void) { readloop("readold");}
+void readfwd(void) { readloop("readfwd");}
+void headers(void) { readloop("headers");}
+void do_search(void) { readloop("do_search");}
+
+
+
-/*@}*/
+
+
+void
+InitModule_MSG
+(void)
+{
+ WebcitAddUrlHandler(HKEY("readnew"), readnew, 0);
+ WebcitAddUrlHandler(HKEY("readold"), readold, 0);
+ WebcitAddUrlHandler(HKEY("readfwd"), readfwd, 0);
+ WebcitAddUrlHandler(HKEY("headers"), headers, 0);
+ WebcitAddUrlHandler(HKEY("do_search"), do_search, 0);
+ WebcitAddUrlHandler(HKEY("display_enter"), display_enter, 0);
+ WebcitAddUrlHandler(HKEY("post"), post_message, 0);
+ WebcitAddUrlHandler(HKEY("move_msg"), move_msg, 0);
+ WebcitAddUrlHandler(HKEY("delete_msg"), delete_msg, 0);
+ WebcitAddUrlHandler(HKEY("confirm_move_msg"), confirm_move_msg, 0);
+ WebcitAddUrlHandler(HKEY("msg"), embed_message, NEED_URL|AJAX);
+ WebcitAddUrlHandler(HKEY("printmsg"), print_message, NEED_URL);
+ WebcitAddUrlHandler(HKEY("mobilemsg"), mobile_message_view, NEED_URL);
+ WebcitAddUrlHandler(HKEY("msgheaders"), display_headers, NEED_URL);
+
+ return ;
+}
projects / citadel.git / blobdiff