HashList *MsgHeaderHandler = NULL;
HashList *MsgEvaluators = NULL;
HashList *MimeRenderHandler = NULL;
-int analyze_msg = 0;
+int dbg_analyze_msg = 0;
#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 */
-
+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);
/*----------------------------------------------------------------------------*/
* printable_view Nonzero to display a printable view
* section Optional for encapsulated message/rfc822 submessage
*/
-int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, int printable_view, const StrBuf *PartNum) {
+int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, int printable_view, const StrBuf *PartNum)
+{
+ wcsession *WCC = WC;
StrBuf *Buf;
StrBuf *HdrToken;
StrBuf *FoundCharset;
StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
#ifdef TECH_PREVIEW
- if (analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+ if (dbg_analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
#endif
/* look up one of the examine_* functions to parse the content */
if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
state++;
}
}
- else lprintf(1, "don't know how to handle message header[%s]\n", ChrPtr(HdrToken));
+ else LogError(Target,
+ __FUNCTION__,
+ "don't know how to handle message header[%s]\n",
+ ChrPtr(HdrToken));
break;
case 1:/* Message Mime Header */
if (StrLength(Buf) == 0) {
if (StrLength(HdrToken) > 0) {
StrBufCutLeft(Buf, StrLength(HdrToken) + 1);
#ifdef TECH_PREVIEW
- if (analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
+ if (dbg_analyze_msg) lprintf(1, ":: [%s] = [%s]\n", ChrPtr(HdrToken), ChrPtr(Buf));
#endif
/* the examine*'s know how to do with mime headers too... */
if (GetHash(MsgHeaderHandler, SKEY(HdrToken), &vHdr) &&
else
{
if ((StrLength(Msg->OtherNode)>0) &&
- (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(serv_info.serv_nodename))) &&
- (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(serv_info.serv_humannode)) ))
+ (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(WCC->serv_info->serv_nodename))) &&
+ (strcasecmp(ChrPtr(Msg->OtherNode), ChrPtr(WCC->serv_info->serv_humannode)) ))
{
if (Msg->reply_to == NULL)
Msg->reply_to = NewStrBuf();
}
DeleteHashPos(&it);
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_MAILSUM;
+ SubTP.Filter.ContextType = CTX_MAILSUM;
SubTP.Context = Msg;
DoTemplate(tmpl, tmpllen, Target, &SubTP);
*/
void embed_message(void) {
long msgnum = 0L;
+ wcsession *WCC = WC;
const StrBuf *Tmpl = sbstr("template");
- msgnum = StrTol(WC->UrlFragment2);
+ msgnum = StrTol(WCC->UrlFragment2);
if (StrLength(Tmpl) > 0)
- read_message(WC->WBuf, SKEY(Tmpl), msgnum, 0, NULL);
+ read_message(WCC->WBuf, SKEY(Tmpl), msgnum, 0, NULL);
else
- read_message(WC->WBuf, HKEY("view_message"), msgnum, 0, NULL);
+ read_message(WCC->WBuf, HKEY("view_message"), msgnum, 0, NULL);
}
StrBufExtract_token(Buf2, Buf, 3, '|');
if ((StrLength(Buf2) !=0 ) &&
( ((WCC->room_flags & QR_NETWORK)
- || ((strcasecmp(ChrPtr(Buf2), ChrPtr(serv_info.serv_nodename))
- && (strcasecmp(ChrPtr(Buf2), ChrPtr(serv_info.serv_fqdn))))))))
+ || ((strcasecmp(ChrPtr(Buf2), ChrPtr(WCC->serv_info->serv_nodename))
+ && (strcasecmp(ChrPtr(Buf2), ChrPtr(WCC->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) &&
WCTemplputParams SubTP;
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_LONGVECTOR;
+ SubTP.Filter.ContextType = CTX_LONGVECTOR;
SubTP.Context = &vector;
TmpBuf = NewStrBuf();
At = GetNewHashPos(WCC->summ, nMessages);
}
vector[6] = 0;
FlushStrBuf(TmpBuf);
- vector[1] = lbstr("maxmsgs") == 9999999;
+ if (maxmsgs == 9999999) {
+ vector[1] = 1;
+ ret = maxmsgs;
+ }
+ else
+ vector[1] = 0;
vector[2] = 0;
dbg_print_longvector(vector);
DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &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", ChrPtr(WCC->wc_roomname));
}
}
- if (!WCC->is_ajax) {
- output_headers(1, 1, 1, 0, 0, 0);
- } else if (WCC->wc_view == VIEW_MAILBOX) {
- jsonMessageListHdr();
- }
+
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;
}
if (sortit) {
CompareFunc SortIt;
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_NONE;
+ SubTP.Filter.ContextType = CTX_NONE;
SubTP.Context = NULL;
SortIt = RetrieveSort(&SubTP, NULL, 0,
HKEY("date"), defaultsortorder);
}
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_STRBUF;
+ SubTP.Filter.ContextType = CTX_STRBUF;
SubTP.Context = MessageDropdown;
DoTemplate(HKEY("msg_listselector_top"), BBViewToolBar, &SubTP);
StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
displayed_msgs = NULL;
}
memset(&SubTP, 0, sizeof(WCTemplputParams));
- SubTP.ContextType = CTX_STRBUF;
+ SubTP.Filter.ContextType = CTX_STRBUF;
SubTP.Context = MessageDropdown;
DoTemplate(HKEY("msg_listselector_bottom"), BBViewToolBar, &SubTP);
StrBufAppendBuf(WCC->WBuf, BBViewToolBar, 0);
case VIEW_NOTES:
break;
case VIEW_ADDRESSBOOK:
- do_addrbook_view(addrbook, num_ab); /** Render the address book */
+ if (is_singlecard)
+ read_message(WC->WBuf, HKEY("view_message"), lbstr("startmsg"), 0, NULL);
+ else
+ do_addrbook_view(addrbook, num_ab); /** Render the address book */
break;
case VIEW_MAILBOX:
case VIEW_BBS:
}
/** Note: wDumpContent() will output one additional </div> tag. */
if (WCC->wc_view != VIEW_MAILBOX) {
- // We ought to move this out into template
- wprintf("</div>\n"); /** end of 'content' div */
- wDumpContent(1);
+ /* We ought to move this out into template */
+ wDumpContent(1);
} else {
- end_burst();
+ end_burst();
}
WCC->startmsg = 0;
WCC->maxmsgs = 0;
char *txtmail = NULL;
sprintf(top_boundary, "Citadel--Multipart--%s--%04x--%04x",
- ChrPtr(serv_info.serv_fqdn),
+ ChrPtr(WCC->serv_info->serv_fqdn),
getpid(),
++seq
);
sprintf(alt_boundary, "Citadel--Multipart--%s--%04x--%04x",
- ChrPtr(serv_info.serv_fqdn),
+ ChrPtr(WCC->serv_info->serv_fqdn),
getpid(),
++seq
);
*/
pch = strrchr(ChrPtr(att->FileName), '/');
if (pch != NULL) {
- StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName));
+ StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
}
pch = strrchr(ChrPtr(att->FileName), '\\');
if (pch != NULL) {
- StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName));
+ StrBufCutLeft(att->FileName, pch - ChrPtr(att->FileName) + 1);
}
/**
* partnum The MIME part to be output
* force_download Nonzero to force set the Content-Type: header to "application/octet-stream"
*/
-void mimepart(const char *msgnum, const char *partnum, int force_download)
+void mimepart(int force_download)
{
+ wcsession *WCC = WC;
+
char buf[256];
off_t bytes;
char content_type[256];
-
- serv_printf("OPNA %s|%s", msgnum, partnum);
+ const char *ContentType = &content_type[0];
+
+ serv_printf("OPNA %s|%s", ChrPtr(WCC->UrlFragment2), ChrPtr(WCC->UrlFragment3));
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
bytes = extract_long(&buf[4], 0);
else {
extract_token(content_type, &buf[4], 3, '|', sizeof content_type);
}
- output_headers(0, 0, 0, 0, 0, 0);
- read_server_binary(WC->WBuf, bytes);
+ read_server_binary(WCC->WBuf, bytes);
serv_puts("CLOS");
serv_getln(buf, sizeof buf);
- http_transmit_thing(content_type, 0);
+
+ if (!force_download) {
+ if (!strcasecmp(ContentType, "application/octet-stream")) {
+ ContentType = GuessMimeByFilename(SKEY(WCC->UrlFragment4));
+ }
+ if (!strcasecmp(ContentType, "application/octet-stream")) {
+ ContentType = GuessMimeType(SKEY(WCC->WBuf));
+ }
+ }
+ output_headers(0, 0, 0, 0, 0, 0);
+ http_transmit_thing(ContentType, 0);
} else {
hprintf("HTTP/1.1 404 %s\n", &buf[4]);
output_headers(0, 0, 0, 0, 0, 0);
void view_mimepart(void) {
- mimepart(ChrPtr(WC->UrlFragment2),
- ChrPtr(WC->UrlFragment3),
- 0);
+ mimepart(0);
}
void download_mimepart(void) {
- mimepart(ChrPtr(WC->UrlFragment2),
- ChrPtr(WC->UrlFragment3),
- 1);
+ mimepart(1);
}
void view_postpart(void) {
void h_headers(void) { readloop(headers);}
void h_do_search(void) { readloop(do_search);}
-void jsonMessageListHdr(void) {
- // TODO: make a generic function
+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("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->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 :)
+/* 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) {
- output_headers(1,1,1,0,0,1);
begin_burst();
DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
DoTemplate(HKEY("trailing"),NULL,&NoCtx);
}
/** Output message list in JSON-format */
void jsonMessageList(void) {
- StrBuf *room = sbstr("room");
+ const StrBuf *room = sbstr("room");
+ long oper = (havebstr("query")) ? do_search : readnew;
WC->is_ajax = 1;
- smart_goto(room);
+ gotoroom(room);
+ readloop(oper);
WC->is_ajax = 0;
}
InitModule_MSG
(void)
{
- RegisterPreference(HKEY("use_sig"),
+ RegisterPreference("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"),
+ RegisterPreference("signature", _("Use this signature:"), PRF_QP_STRING, NULL);
+ RegisterPreference("default_header_charset",
_("Default character set for email headers:"),
PRF_STRING,
NULL);
- RegisterPreference(HKEY("defaultfrom"), _("Preferred email address"), PRF_STRING, NULL);
- RegisterPreference(HKEY("defaultname"),
+ RegisterPreference("defaultfrom", _("Preferred email address"), PRF_STRING, NULL);
+ RegisterPreference("defaultname",
_("Preferred display name for email messages"),
PRF_STRING,
NULL);
- RegisterPreference(HKEY("defaulthandle"),
+ RegisterPreference("defaulthandle",
_("Preferred display name for bulletin board posts"),
PRF_STRING,
NULL);
- RegisterPreference(HKEY("mailbox"),_("Mailbox view mode"), PRF_STRING, NULL);
+ RegisterPreference("mailbox",_("Mailbox view mode"), PRF_STRING, NULL);
WebcitAddUrlHandler(HKEY("readnew"), h_readnew, NEED_URL);
WebcitAddUrlHandler(HKEY("readold"), h_readold, NEED_URL);
WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL);
WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL);
- // json
+ /* 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