}
}
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);
+ StrBuf *default_header_charset;
+ get_preference("default_header_charset", &default_header_charset);
+ if ( (strcasecmp(ChrPtr(default_header_charset), "UTF-8")) &&
+ (strcasecmp(ChrPtr(default_header_charset), "us-ascii")) ) {
+ ic = ctdl_iconv_open("UTF-8", ChrPtr(default_header_charset));
if (ic != (iconv_t)(-1) ) {
ibuf = malloc(1024);
isav = ibuf;
wprintf("</TD></TR>\n");
}
}
- else if (!strcasecmp(firsttoken, "photo") && full && pass == 2) {
+ /* else if (!strcasecmp(firsttoken, "photo") && full && pass == 2) {
// Only output on second pass
wprintf("<tr><td>");
wprintf(_("Photo:"));
wprintf("</td><td>");
- wprintf("<img src=\"/vcardphoto/%d/\" alt=\"Contact photo\"/>",msgnum);
+ wprintf("<img src=\"/vcardphoto/%ld/\" alt=\"Contact photo\"/>",msgnum);
wprintf("</td></tr>\n");
- }
+ } */
else if (!strcasecmp(firsttoken, "version")) {
/* ignore */
}
urlescputs(reply_to);
if (!IsEmptyStr(m_subject)) {
wprintf("?subject=");
- if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+ if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
urlescputs(m_subject);
}
wprintf("?references=");
urlescputs(reply_to);
if (!IsEmptyStr(m_subject)) {
wprintf("?subject=");
- if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+ if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
urlescputs(m_subject);
}
wprintf("?references=");
urlescputs(reply_all);
if (!IsEmptyStr(m_subject)) {
wprintf("?subject=");
- if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%20");
+ if (strncasecmp(m_subject, "Re:", 3)) wprintf("Re:%%20");
urlescputs(m_subject);
}
wprintf("?references=");
/* 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");
+ if (strncasecmp(m_subject, "Fwd:", 4)) wprintf("Fwd:%%20");
urlescputs(m_subject);
wprintf("\"><span>[</span>%s<span>]</span></a> ", _("Forward"));
}
/* Unknown weirdness */
else {
wprintf(_("I don't know how to display %s"), mime_content_type);
- wprintf("<br />\n", mime_content_type);
+ wprintf("<br />\n");
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { }
}
*
* 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();
}
*
* 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"
*
* \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"
return (nummsgs);
}
+
+typedef int (*QSortFunction) (const void*, const void*);
/**
* \brief qsort() compatible function to compare two longs in descending order.
*
}
+enum {
+ eUp,
+ eDown,
+ eNone
+};
+
+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 QSortFunction SortFuncs[eUnSet] = {
+ summcmp_date,
+ summcmp_rdate,
+ summcmp_subj,
+ summcmp_rsubj,
+ summcmp_sender,
+ summcmp_rsender,
+ summcmp_rdate
+};
+
+/** 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};
+
+
+/**
+ * \Brief Translates sortoption String to its SortEnum representation
+ * \param SortBy string to translate
+ * \return the enum matching the string; defaults to RDate
+ */
+//SortByEnum
+int StrToESort (StrBuf *sortby)
+{
+ int result = eDate;
+
+ if (!IsEmptyStr(ChrPtr(sortby))) while (result < eUnSet){
+ if (!strcasecmp(ChrPtr(sortby),
+ SortByStrings[result]))
+ return result;
+ result ++;
+ }
+ return eRDate;
+}
+
+
+
/**
* \brief command loop for reading messages
int highest_displayed = 0;
struct 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;
+ StrBuf *sortby = NULL;
+ //SortByEnum
+ int SortBy = eRDate;
+ StrBuf *sortpref_name;
+ StrBuf *sortpref_value;
int bbs_reverse = 0;
struct wcsession *WCC = WC; /* This is done to make it run faster; WC is a function */
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_name = NewStrBuf ();
+ StrBufPrintf(sortpref_name, "sort %s", WCC->wc_roomname);
+ get_pref(sortpref_name, &sortpref_value);
- sortby = bstr("sortby");
- if ( (!IsEmptyStr(sortby)) && (strcasecmp(sortby, sortpref_value)) ) {
- set_preference(sortpref_name, sortby, 1);
+ sortby = NewStrBufPlain(bstr("sortby"), -1);
+ if ( (!IsEmptyStr(ChrPtr(sortby))) &&
+ (strcasecmp(ChrPtr(sortby), ChrPtr(sortpref_value)) != 0)) {
+ set_pref(sortpref_name, sortby, 1);
+ sortpref_value = NULL;
+ sortpref_value = sortby;
}
- if (IsEmptyStr(sortby)) sortby = sortpref_value;
-
- /** mailbox sort */
- if (IsEmptyStr(sortby)) sortby = "rdate";
-
+
+ FreeStrBuf(&sortpref_name);
+ SortBy = StrToESort(sortpref_value);
/** message board sort */
- if (!strcasecmp(sortby, "reverse")) {
+ if (SortBy == eReverse) {
bbs_reverse = 1;
}
else {
}
if (WCC->is_mobile) {
maxmsgs = 20;
- sortby = "rdate";
+ SortBy = eRDate;
}
/**
}
if (is_summary || WCC->is_mobile) {
- 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>" ;
+ qsort(WCC->summ, WCC->num_summ,
+ sizeof(struct message_summary), SortFuncs[SortBy]);
}
- 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) {
"<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");
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 (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"
void display_enter(void)
{
char buf[SIZ];
- char ebuf[SIZ];
+ StrBuf *ebuf;
long now;
char *display_name;
struct wc_attachment *att;
int recipient_required = 0;
int subject_required = 0;
int recipient_bad = 0;
- int i;
int is_anonymous = 0;
long existing_page = (-1L);
size_t dplen;
+ struct wcsession *WCC = WC;
now = time(NULL);
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;
}
"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 ++;
}
}
}
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("\">");
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");
wprintf("</CENTER>\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("msgheaders"), display_headers, NEED_URL);
+ return ;
+}
projects / citadel.git / blobdiff