#define SENDER_COL_WIDTH_PCT 30 /**< Mailbox view column width */
#define DATE_PLUS_BUTTONS_WIDTH_PCT 20 /**< Mailbox view column width */
-
+void jsonMessageListHdr(void);
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);
/*----------------------------------------------------------------------------*/
int state=0;
long len;
const char *Key;
+ WCTemplputParams SubTP;
Buf = NewStrBuf();
lprintf(1, "----------%s---------MSG4 %ld|%s--------------\n", tmpl, msgnum, ChrPtr(PartNum));
Msg->PartNum = PartNum;
Msg->MsgBody = (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
+ Msg->MsgBody->msgnum = msgnum;
FoundCharset = NewStrBuf();
while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
if ( (StrLength(Buf)==3) &&
else
{
if ((StrLength(Msg->OtherNode)>0) &&
- (strcasecmp(ChrPtr(Msg->OtherNode), serv_info.serv_nodename)) &&
- (strcasecmp(ChrPtr(Msg->OtherNode), serv_info.serv_humannode)) )
+ (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(serv_info.serv_nodename))) &&
+ (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(serv_info.serv_humannode)) ))
{
if (Msg->reply_to == NULL)
Msg->reply_to = NewStrBuf();
evaluate_mime_part(Msg, Mime);
}
DeleteHashPos(&it);
-
- DoTemplate(tmpl, tmpllen, Target, Msg, CTX_MAILSUM);
+ memset(&SubTP, 0, sizeof(WCTemplputParams));
+ SubTP.ContextType = CTX_MAILSUM;
+ SubTP.Context = Msg;
+ DoTemplate(tmpl, tmpllen, Target, &SubTP);
DestroyMessageSummary(Msg);
FreeStrBuf(&FoundCharset);
int skipit;
if (WCC->summ != NULL) {
- if (WCC->summ != NULL)
- DeleteHash(&WCC->summ);
+ DeleteHash(&WCC->summ);
}
WCC->summ = NewHash(1, Flathash);
maxload = 10000;
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)))))))
+ || ((strcasecmp(ChrPtr(Buf2), ChrPtr(serv_info.serv_nodename))
+ && (strcasecmp(ChrPtr(Buf2), ChrPtr(serv_info.serv_fqdn))))))))
{
StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
StrBufAppendBuf(Msg->from, Buf2, 0);
Msg->subj = NewStrBufPlain(NULL, StrLength(Buf));
StrBufExtract_token(Buf2, Buf, 5, '|');
if (StrLength(Buf2) == 0)
- StrBufAppendBufPlain(Msg->subj, _("(no subj)"), -1,0);
+ StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
else {
StrBuf_RFC822_to_Utf8(Msg->subj, Buf2, WCC->DefaultCharset, FoundCharset);
if ((StrLength(Msg->subj) > 75) &&
int nItems;
HashPos *At;
long vector[16];
+ WCTemplputParams SubTP;
+ memset(&SubTP, 0, sizeof(WCTemplputParams));
+ SubTP.ContextType = CTX_LONGVECTOR;
+ SubTP.Context = &vector;
TmpBuf = NewStrBuf();
At = GetNewHashPos(WCC->summ, nMessages);
nItems = GetCount(WCC->summ);
vector[6] = lo;
FlushStrBuf(TmpBuf);
dbg_print_longvector(vector);
- DoTemplate(HKEY("select_messageindex"), TmpBuf, &vector, CTX_LONGVECTOR);
+ DoTemplate(HKEY("select_messageindex"), TmpBuf, &SubTP);
StrBufAppendBuf(Selector, TmpBuf, 0);
}
vector[6] = 0;
vector[1] = lbstr("maxmsgs") == 9999999;
vector[2] = 0;
dbg_print_longvector(vector);
- DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &vector, CTX_LONGVECTOR);
+ DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &SubTP);
StrBufAppendBuf(Selector, TmpBuf, 0);
FreeStrBuf(&TmpBuf);
DeleteHashPos(&At);
OldMsg = NewStrBuf();
serv_puts("GTSN");
StrBuf_ServGetln(OldMsg);
- if (ChrPtr(OldMsg)[0] == '2') {
+ if (GetServerStatus(OldMsg, NULL) == 2) {
StrBufCutLeft(OldMsg, 4);
}
else {
int load_seen = 0;
int sortit = 0;
int defaultsortorder = 0;
+ WCTemplputParams SubTP;
if (havebstr("is_summary") && (1 == (ibstr("is_summary"))))
WCC->wc_view = VIEW_MAILBOX;
+ if (!WCC->is_ajax) {
+ output_headers(1, 1, 1, 0, 0, 0);
+ } else if (WCC->wc_view == VIEW_MAILBOX) {
+ jsonMessageListHdr();
+ }
+
switch (WCC->wc_view) {
case VIEW_WIKI:
- sprintf(buf, "wiki?room=%s&page=home", WCC->wc_roomname);
+ sprintf(buf, "wiki?room=%s&page=home", ChrPtr(WCC->wc_roomname));
http_redirect(buf);
return;
case VIEW_CALBRIEF:
}
break;
case VIEW_MAILBOX:
+ if (!WCC->is_ajax) {
+ new_summary_view();
+ return;
+ } else {
defaultsortorder = 2;
sortit = 1;
load_seen = 1;
- care_for_empty_list = 1;
+ care_for_empty_list = 0;
with_headers = 1;
- if (WCC->is_mobile) maxmsgs = 20;
+ /* Generally using maxmsgs|startmsg is not required
+ in mailbox view, but we have a 'safemode' for clients
+ (*cough* Exploder) that simply can't handle too many */
+ if (havebstr("maxmsgs")) maxmsgs = ibstr("maxmsgs");
else maxmsgs = 9999999;
+ if (havebstr("startmsg")) startmsg = lbstr("startmsg");
snprintf(cmd, sizeof(cmd), "MSGS %s|%s||1",
(oper == do_search) ? "SEARCH" : "ALL",
(oper == do_search) ? bstr("query") : ""
);
+ }
break;
case VIEW_BBS:
default:
}
}
- output_headers(1, 1, 1, 0, 0, 0);
nummsgs = load_msg_ptrs(cmd, with_headers);
if (nummsgs == 0) {
if (care_for_empty_list) {
- wprintf("<div align=\"center\"><br /><em>");
+ wprintf("<div class=\"nomsgs\"><br><em>");
switch (oper) {
case readnew:
wprintf(_("No new messages."));
default:
wprintf(_("No messages here."));
}
- wprintf("</em><br /></div>\n");
+ wprintf("</em><br></div>\n");
+ goto DONE;
}
- goto DONE;
}
if (sortit) {
CompareFunc SortIt;
- SortIt = RetrieveSort(CTX_MAILSUM, NULL,
+ memset(&SubTP, 0, sizeof(WCTemplputParams));
+ SubTP.ContextType = CTX_NONE;
+ SubTP.Context = NULL;
+ SortIt = RetrieveSort(&SubTP, NULL, 0,
HKEY("date"), defaultsortorder);
if (SortIt != NULL)
SortByPayload(WCC->summ, SortIt);
* If we're to print s.th. above the message list...
*/
switch (WCC->wc_view) {
- case VIEW_MAILBOX:
- do_template("summary_header", NULL);
- break;
case VIEW_BBS:
BBViewToolBar = NewStrBuf();
MessageDropdown = NewStrBuf();
maxmsgs = abs(maxmsgs);
}
- DoTemplate(HKEY("msg_listselector_top"), BBViewToolBar, MessageDropdown, CTX_STRBUF);
+ memset(&SubTP, 0, sizeof(WCTemplputParams));
+ SubTP.ContextType = CTX_STRBUF;
+ SubTP.Context = MessageDropdown;
+ DoTemplate(HKEY("msg_listselector_top"), BBViewToolBar, &SubTP);
StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
FlushStrBuf(BBViewToolBar);
break;
}
-
+ WCC->startmsg = startmsg;
+ WCC->maxmsgs = maxmsgs;
+ WCC->num_displayed = 0;
+
+ /* Put some helpful data in vars for mailsummary_json */
+ svputlong("READLOOP:TOTALMSGS", nummsgs);
+ svputlong("READLOOP:STARTMSG", startmsg);
+ svputlong("WCVIEW", WCC->wc_view);
+ /*
+ * iterate over each message. if we need to load an attachment, do it here.
+ */
+ if (WCC->wc_view == VIEW_MAILBOX) goto NO_MSG_LOOP;
/*
* iterate over each message. if we need to load an attachment, do it here.
*/
sizeof(addrbook[num_ab-1].ab_name));
addrbook[num_ab-1].ab_msgnum = Msg->msgnum;
break;
- case VIEW_MAILBOX: /* here we just need the abstract, so render it now. */
- DoTemplate(HKEY("section_mailsummary"), NULL, Msg, CTX_MAILSUM);
-
- num_displayed++;
- break;
case VIEW_BBS: /* Tag the mails we want to show in bbview... */
default:
if (displayed_msgs == NULL) {
num_displayed++;
}
}
- }
+ }
i++;
}
DeleteHashPos(&at);
-
+ NO_MSG_LOOP:
/*
* Done iterating the message list. now tasks we want to do after.
*/
switch (WCC->wc_view) {
- case VIEW_MAILBOX:
- do_template("summary_trailer", NULL);
- break;
+ case VIEW_MAILBOX:
+ DoTemplate(HKEY("mailsummary_json"),NULL, &SubTP);
+ break;
case VIEW_BBS:
if (displayed_msgs != NULL) {
/** if we do a split bbview in the future, begin messages div here */
free(displayed_msgs);
displayed_msgs = NULL;
}
- DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, MessageDropdown, CTX_STRBUF);
+ memset(&SubTP, 0, sizeof(WCTemplputParams));
+ SubTP.ContextType = CTX_STRBUF;
+ SubTP.Context = MessageDropdown;
+ DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, &SubTP);
StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
FreeStrBuf(&BBViewToolBar);
break;
}
/** Note: wDumpContent() will output one additional </div> tag. */
- wprintf("</div>\n"); /** end of 'content' div */
- wDumpContent(1);
-
- /** free the summary */
+ if (WCC->wc_view != VIEW_MAILBOX) {
+ /* We ought to move this out into template */
+ wDumpContent(1);
+ } else {
+ end_burst();
+ }
+ WCC->startmsg = 0;
+ WCC->maxmsgs = 0;
if (WCC->summ != NULL) {
DeleteHash(&WCC->summ);
}
char *txtmail = NULL;
sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x",
- serv_info.serv_fqdn,
+ ChrPtr(serv_info.serv_fqdn),
getpid(),
++seq
);
sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
- serv_info.serv_fqdn,
+ ChrPtr(serv_info.serv_fqdn),
getpid(),
++seq
);
wcsession *WCC = WC;
if (havebstr("force_room")) {
- gotoroom(bstr("force_room"));
+ gotoroom(sbstr("force_room"));
}
if (havebstr("display_name")) {
now = time(NULL);
if (havebstr("force_room")) {
- gotoroom(bstr("force_room"));
+ gotoroom(sbstr("force_room"));
}
display_name = sbstr("display_name");
* message" command really means "add new entry."
*/
if (WCC->wc_default_view == VIEW_ADDRESSBOOK) {
- do_edit_vcard(-1, "", "", WCC->wc_roomname);
+ do_edit_vcard(-1, "", "", ChrPtr(WCC->wc_roomname));
return;
}
begin_burst();
output_headers(1, 0, 0, 0, 1, 0);
- DoTemplate(HKEY("edit_message"), NULL, NULL, CTX_NONE);
+ DoTemplate(HKEY("edit_message"), NULL, &NoCtx);
end_burst();
return;
void h_headers(void) { readloop(headers);}
void h_do_search(void) { readloop(do_search);}
+void jsonMessageListHdr(void)
+{
+ /* TODO: make a generic function */
+ hprintf("HTTP/1.1 200 OK\r\n");
+ hprintf("Content-type: application/json; charset=utf-8\r\n");
+ hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(serv_info.serv_software));
+ hprintf("Connection: close\r\n");
+ hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
+ begin_burst();
+}
+/* Spit out the new summary view. This is basically a static page, so clients can cache the layout, all the dirty work is javascript :) */
+void new_summary_view(void) {
+ begin_burst();
+ DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
+ DoTemplate(HKEY("trailing"),NULL,&NoCtx);
+ end_burst();
+}
+/** Output message list in JSON-format */
+void jsonMessageList(void) {
+ const StrBuf *room = sbstr("room");
+ WC->is_ajax = 1;
+ smart_goto(room);
+ WC->is_ajax = 0;
+}
+
void
InitModule_MSG
(void)
{
+ RegisterPreference(HKEY("use_sig"),
+ _("Attach signature to email messages?"),
+ PRF_YESNO,
+ NULL);
+ RegisterPreference(HKEY("signature"), _("Use this signature:"), PRF_QP_STRING, NULL);
+ RegisterPreference(HKEY("default_header_charset"),
+ _("Default character set for email headers:"),
+ PRF_STRING,
+ NULL);
+ RegisterPreference(HKEY("defaultfrom"), _("Preferred email address"), PRF_STRING, NULL);
+ RegisterPreference(HKEY("defaultname"),
+ _("Preferred display name for email messages"),
+ PRF_STRING,
+ NULL);
+ RegisterPreference(HKEY("defaulthandle"),
+ _("Preferred display name for bulletin board posts"),
+ PRF_STRING,
+ NULL);
+ RegisterPreference(HKEY("mailbox"),_("Mailbox view mode"), PRF_STRING, NULL);
+
WebcitAddUrlHandler(HKEY("readnew"), h_readnew, NEED_URL);
WebcitAddUrlHandler(HKEY("readold"), h_readold, NEED_URL);
WebcitAddUrlHandler(HKEY("readfwd"), h_readfwd, NEED_URL);
WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL);
WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL);
+ /* json */
+ WebcitAddUrlHandler(HKEY("roommsgs"), jsonMessageList,0);
+
+ WebcitAddUrlHandler(HKEY("mimepart"), view_mimepart, NEED_URL);
+ WebcitAddUrlHandler(HKEY("mimepart_download"), download_mimepart, NEED_URL);
+ WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL);
+ WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL);
+
return ;
}
projects / citadel.git / blobdiff