/*
* represent messages to the citadel clients
*
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2020 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
void headers_listing(long msgnum, void *userdata)
{
struct CtdlMessage *msg;
+ int output_mode = *(int *)userdata;
- msg = CtdlFetchMessage(msgnum, 0, 1);
+ msg = CtdlFetchMessage(msgnum, 0);
if (msg == NULL) {
cprintf("%ld|0|||||||\n", msgnum);
return;
}
+ // change all vertical bars in the subject to hyphens so it doesn't screw up the protocol
+ if (!CM_IsEmpty(msg, eMsgSubject)) {
+ char *p;
+ for (p=msg->cm_fields[eMsgSubject]; *p; p++) {
+ if (*p == '|') {
+ *p = '-';
+ }
+ }
+ }
+
// output all fields except the references hash
- cprintf("%ld|%s|%s|%s|%s|%s|%d|",
+ cprintf("%ld|%s|%s|%s|%s|%s",
msgnum,
(!CM_IsEmpty(msg, eTimestamp) ? msg->cm_fields[eTimestamp] : "0"),
(!CM_IsEmpty(msg, eAuthor) ? msg->cm_fields[eAuthor] : ""),
- (!CM_IsEmpty(msg, eNodeName) ? msg->cm_fields[eNodeName] : ""),
+ CtdlGetConfigStr("c_nodename"), // no more nodenames anymore
(!CM_IsEmpty(msg, erFc822Addr) ? msg->cm_fields[erFc822Addr] : ""),
- (!CM_IsEmpty(msg, eMsgSubject) ? msg->cm_fields[eMsgSubject] : ""),
- (!CM_IsEmpty(msg, emessageId) ? HashLittle(msg->cm_fields[emessageId],strlen(msg->cm_fields[emessageId])) : 0)
+ (!CM_IsEmpty(msg, eMsgSubject) ? msg->cm_fields[eMsgSubject] : "")
);
- // output the references hash (yes it's ok that we're trashing the source buffer by doing this)
- if (!CM_IsEmpty(msg, eWeferences)) {
- char *token;
- char *rest = msg->cm_fields[eWeferences];
- char *prev = rest;
- while((token = strtok_r(rest, "|", &rest))) {
- cprintf("%d%s", HashLittle(token,rest-prev-(*rest==0?0:1)), (*rest==0?"":","));
- prev = rest;
+ if (output_mode == MSG_HDRS_THREADS) { // field view with thread hashes
+
+ // output the references hash
+ cprintf ("|%d|",
+ (!CM_IsEmpty(msg, emessageId) ? HashLittle(msg->cm_fields[emessageId],strlen(msg->cm_fields[emessageId])) : 0)
+ );
+
+ // output the references hash (yes it's ok that we're trashing the source buffer by doing this)
+ if (!CM_IsEmpty(msg, eWeferences)) {
+ char *token;
+ char *rest = msg->cm_fields[eWeferences];
+ char *prev = rest;
+ while((token = strtok_r(rest, "|", &rest))) {
+ cprintf("%d%s", HashLittle(token,rest-prev-(*rest==0?0:1)), (*rest==0?"":","));
+ prev = rest;
+ }
}
+
+ cprintf("|\n");
+ }
+
+ else { // field view with no threads, subject extends out forever
+ cprintf("\n");
}
- cprintf("|\n");
CM_Free(msg);
}
msg_filter *flt = (msg_filter*) userdata;
l = GetCount(flt->Filter);
- msg = CtdlFetchMessage(msgnum, 0, 1);
+ msg = CtdlFetchMessage(msgnum, 0);
StrBufPrintf(flt->buffer, "%ld", msgnum);
if (msg == NULL) {
for (i = 0; i < l; i++) {
{
struct CtdlMessage *msg;
- msg = CtdlFetchMessage(msgnum, 0, 1);
+ msg = CtdlFetchMessage(msgnum, 0);
if (msg == NULL) {
cprintf("%ld||\n", msgnum);
return;
cm_ref = extract_int(cmdbuf, 1);
extract_token(search_string, cmdbuf, 1, '|', sizeof search_string);
with_template = extract_int(cmdbuf, 2);
- switch (extract_int(cmdbuf, 3))
- {
- default:
- case MSG_HDRS_BRIEF:
- CallBack = simple_listing;
- break;
- case MSG_HDRS_ALL:
- CallBack = headers_listing;
- break;
- case MSG_HDRS_EUID:
- CallBack = headers_euid;
- break;
- case MSG_HDRS_BRIEFFILTER:
- with_template = 2;
- CallBack = headers_brief_filter;
- break;
+ int output_mode = extract_int(cmdbuf, 3);
+ switch (output_mode) {
+ default:
+ case MSG_HDRS_BRIEF:
+ CallBack = simple_listing;
+ break;
+ case MSG_HDRS_ALL:
+ case MSG_HDRS_THREADS:
+ CallBack = headers_listing;
+ break;
+ case MSG_HDRS_EUID:
+ CallBack = headers_euid;
+ break;
+ case MSG_HDRS_BRIEFFILTER:
+ with_template = 2;
+ CallBack = headers_brief_filter;
+ break;
}
strcat(which, " ");
NULL,
template,
CallBack,
- NULL);
+ &output_mode);
if (template != NULL) CM_Free(template);
}
else {
}
-
-/*
- * display a message (mode 3 - IGnet raw format - internal programs only)
- */
-void cmd_msg3(char *cmdbuf)
-{
- long msgnum;
- struct CtdlMessage *msg = NULL;
- struct ser_ret smr;
-
- if (CC->internal_pgm == 0) {
- cprintf("%d This command is for internal programs only.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
-
- msgnum = extract_long(cmdbuf, 0);
- msg = CtdlFetchMessage(msgnum, 1, 1);
- if (msg == NULL) {
- cprintf("%d Message %ld not found.\n",
- ERROR + MESSAGE_NOT_FOUND, msgnum);
- return;
- }
-
- CtdlSerializeMessage(&smr, msg);
- CM_Free(msg);
-
- if (smr.len == 0) {
- cprintf("%d Unable to serialize message\n",
- ERROR + INTERNAL_ERROR);
- return;
- }
-
- cprintf("%d %ld\n", BINARY_FOLLOWS, (long)smr.len);
- client_write((char *)smr.ser, (int)smr.len);
- free(smr.ser);
-}
-
-
-
/*
* Display a message using MIME content types
*/
}
-
/*
* Client tells us its preferred message format(s)
*/
}
if (msg != NULL) {
- msgnum = CtdlSubmitMsg(msg, valid, "", QP_EADDR);
+ msgnum = CtdlSubmitMsg(msg, valid, "");
if (do_confirm) {
cprintf("%ld\n", msgnum);
CtdlRegisterProtoHook(cmd_msgs, "MSGS", "Output a list of messages in the current room");
CtdlRegisterProtoHook(cmd_msg0, "MSG0", "Output a message in plain text format");
CtdlRegisterProtoHook(cmd_msg2, "MSG2", "Output a message in RFC822 format");
- CtdlRegisterProtoHook(cmd_msg3, "MSG3", "Output a message in raw format (deprecated)");
CtdlRegisterProtoHook(cmd_msg4, "MSG4", "Output a message in the client's preferred format");
CtdlRegisterProtoHook(cmd_msgp, "MSGP", "Select preferred format for MSG4 output");
CtdlRegisterProtoHook(cmd_opna, "OPNA", "Open an attachment for download");
projects / citadel.git / blobdiff