-/*
- * represent messages to the citadel clients
- *
- * Copyright (c) 1987-2012 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
+// Message-related protocol commands for Citadel clients
+//
+// Copyright (c) 1987-2022 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.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
#include <stdio.h>
#include <libcitadel.h>
-
#include "citserver.h"
#include "ctdl_module.h"
#include "internet_addressing.h"
#include "user_ops.h"
#include "room_ops.h"
+#include "config.h"
extern char *msgkeys[];
-
-/*
- * Back end for the MSGS command: output message number only.
- */
-void simple_listing(long msgnum, void *userdata)
-{
+// Back end for the MSGS command: output message number only.
+void simple_listing(long msgnum, void *userdata) {
cprintf("%ld\n", msgnum);
}
-
-/*
- * Back end for the MSGS command: output header summary.
- */
-void headers_listing(long msgnum, void *userdata)
-{
+// Back end for the MSGS command: output header summary.
+void headers_listing(long msgnum, void *userdata) {
struct CtdlMessage *msg;
+ int output_mode = *(int *)userdata;
msg = CtdlFetchMessage(msgnum, 0);
if (msg == NULL) {
- cprintf("%ld|0|||||\n", msgnum);
+ cprintf("%ld|0|||||||\n", msgnum);
return;
}
- cprintf("%ld|%s|%s|%s|%s|%s|\n",
+ // 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",
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] : "")
);
+
+ 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");
+ }
+
CM_Free(msg);
}
-/*
- * Back end for the MSGS command: output EUID header.
- */
-void headers_euid(long msgnum, void *userdata)
-{
+typedef struct _msg_filter {
+ HashList *Filter;
+ HashPos *p;
+ StrBuf *buffer;
+} msg_filter;
+
+
+void headers_brief_filter(long msgnum, void *userdata) {
+ long i, l;
+ struct CtdlMessage *msg;
+ msg_filter *flt = (msg_filter*) userdata;
+
+ l = GetCount(flt->Filter);
+ msg = CtdlFetchMessage(msgnum, 0);
+ StrBufPrintf(flt->buffer, "%ld", msgnum);
+ if (msg == NULL) {
+ for (i = 0; i < l; i++) {
+ StrBufAppendBufPlain(flt->buffer, HKEY("|"), 0);
+ }
+ }
+ else {
+ const char *k;
+ long len;
+ void *v;
+ RewindHashPos(flt->Filter, flt->p, 0);
+ while (GetNextHashPos(flt->Filter, flt->p, &len, &k, &v)) {
+ eMsgField f = (eMsgField) v;
+
+ StrBufAppendBufPlain(flt->buffer, HKEY("|"), 0);
+ if (!CM_IsEmpty(msg, f)) {
+ StrBufAppendBufPlain(flt->buffer, CM_KEY(msg, f), 0);
+ }
+ }
+ }
+ StrBufAppendBufPlain(flt->buffer, HKEY("\n"), 0);
+ cputbuf(flt->buffer);
+}
+
+// Back end for the MSGS command: output EUID header.
+void headers_euid(long msgnum, void *userdata) {
struct CtdlMessage *msg;
msg = CtdlFetchMessage(msgnum, 0);
}
-
-/*
- * cmd_msgs() - get list of message #'s in this room
- * implements the MSGS server command using CtdlForEachMessage()
- */
-void cmd_msgs(char *cmdbuf)
-{
+// cmd_msgs() - get list of message #'s in this room
+// implements the MSGS server command using CtdlForEachMessage()
+void cmd_msgs(char *cmdbuf) {
int mode = 0;
char which[16];
char buf[256];
char tfield[256];
char tvalue[256];
int cm_ref = 0;
- int i;
int with_template = 0;
struct CtdlMessage *template = NULL;
+ msg_filter filt;
char search_string[1024];
ForEachMsgCallback CallBack;
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;
+ 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, " ");
else
mode = MSGS_ALL;
- if ( (mode == MSGS_SEARCH) && (!config.c_enable_fulltext) ) {
+ if ( (mode == MSGS_SEARCH) && (!CtdlGetConfigInt("c_enable_fulltext")) ) {
cprintf("%d Full text index is not enabled on this server.\n",
ERROR + CMD_NOT_SUPPORTED);
return;
}
- if (with_template) {
+ if (with_template == 1) {
+ memset(buf, 0, 5);
unbuffer_output();
cprintf("%d Send template then receive message list\n",
START_CHAT_MODE);
template->cm_anon_type = MES_NORMAL;
while(client_getln(buf, sizeof buf) >= 0 && strcmp(buf,"000")) {
+ eMsgField f;
long tValueLen;
- extract_token(tfield, buf, 0, '|', sizeof tfield);
- tValueLen = extract_token(tvalue, buf, 1, '|', sizeof tvalue);
- for (i='A'; i<='Z'; ++i) if (msgkeys[i]!=NULL) {
- if (!strcasecmp(tfield, msgkeys[i])) {
- CM_SetField(template, i, tvalue, tValueLen);
+
+ tValueLen = extract_token(tfield, buf, 0, '|', sizeof tfield);
+ if ((tValueLen == 4) && GetFieldFromMnemonic(&f, tfield))
+ {
+ tValueLen = extract_token(tvalue, buf, 1, '|', sizeof tvalue);
+ if (tValueLen >= 0) {
+ CM_SetField(template, f, tvalue, tValueLen);
}
}
}
buffer_output();
}
+ else if (with_template == 2) {
+ long i = 0;
+ memset(buf, 0, 5);
+ cprintf("%d Send list of headers\n",
+ START_CHAT_MODE);
+ filt.Filter = NewHash(1, lFlathash);
+ filt.buffer = NewStrBufPlain(NULL, 1024);
+ while(client_getln(buf, sizeof buf) >= 0 && strcmp(buf,"000")) {
+ eMsgField f;
+
+ if (GetFieldFromMnemonic(&f, buf))
+ {
+ Put(filt.Filter, LKEY(i), (void*)f, reference_free_handler);
+ i++;
+ }
+ }
+ filt.p = GetNewHashPos(filt.Filter, 0);
+ buffer_output();
+ }
else {
cprintf("%d \n", LISTING_FOLLOWS);
}
- CtdlForEachMessage(mode,
- ( (mode == MSGS_SEARCH) ? 0 : cm_ref ),
- ( (mode == MSGS_SEARCH) ? search_string : NULL ),
- NULL,
- template,
- CallBack,
- NULL);
- if (template != NULL) CM_Free(template);
+ if (with_template < 2) {
+ CtdlForEachMessage(mode,
+ ( (mode == MSGS_SEARCH) ? 0 : cm_ref ),
+ ( (mode == MSGS_SEARCH) ? search_string : NULL ),
+ NULL,
+ template,
+ CallBack,
+ &output_mode);
+ if (template != NULL) CM_Free(template);
+ }
+ else {
+ CtdlForEachMessage(mode,
+ ( (mode == MSGS_SEARCH) ? 0 : cm_ref ),
+ ( (mode == MSGS_SEARCH) ? search_string : NULL ),
+ NULL,
+ NULL,
+ CallBack,
+ &filt);
+ DeleteHashPos(&filt.p);
+ DeleteHash(&filt.Filter);
+ FreeStrBuf(&filt.buffer);
+
+ }
cprintf("000\n");
}
+
/*
* display a message (mode 0 - Citadel proprietary)
*/
}
-/*
- * display a message (mode 2 - RFC822)
- */
-void cmd_msg2(char *cmdbuf)
-{
+// display a message (mode 2 - RFC822)
+void cmd_msg2(char *cmdbuf) {
long msgid;
int headers_only = HEADERS_ALL;
}
-
-/*
- * 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);
- 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
- */
-void cmd_msg4(char *cmdbuf)
-{
+// Display a message using MIME content types
+void cmd_msg4(char *cmdbuf) {
long msgid;
char section[64];
}
-
-/*
- * Client tells us its preferred message format(s)
- */
-void cmd_msgp(char *cmdbuf)
-{
+// Client tells us its preferred message format(s)
+void cmd_msgp(char *cmdbuf) {
if (!strcasecmp(cmdbuf, "dont_decode")) {
CC->msg4_dont_decode = 1;
cprintf("%d MSG4 will not pre-decode messages.\n", CIT_OK);
}
-/*
- * Open a component of a MIME message as a download file
- */
-void cmd_opna(char *cmdbuf)
-{
+// Open a component of a MIME message as a download file
+void cmd_opna(char *cmdbuf) {
long msgid;
char desired_section[128];
}
-/*
- * Open a component of a MIME message and transmit it all at once
- */
-void cmd_dlat(char *cmdbuf)
-{
+// Open a component of a MIME message and transmit it all at once
+void cmd_dlat(char *cmdbuf) {
long msgid;
char desired_section[128];
CtdlOutputMsg(msgid, MT_SPEW_SECTION, 0, 1, 1, NULL, 0, NULL, NULL, NULL);
}
-/*
- * message entry - mode 0 (normal)
- */
-void cmd_ent0(char *entargs)
-{
- struct CitContext *CCC = CC;
+
+// message entry - mode 0 (normal)
+void cmd_ent0(char *entargs) {
int post = 0;
char recp[SIZ];
char cc[SIZ];
int anonymous = 0;
char errmsg[SIZ];
int err = 0;
- recptypes *valid = NULL;
- recptypes *valid_to = NULL;
- recptypes *valid_cc = NULL;
- recptypes *valid_bcc = NULL;
+ struct recptypes *valid = NULL;
+ struct recptypes *valid_to = NULL;
+ struct recptypes *valid_cc = NULL;
+ struct recptypes *valid_bcc = NULL;
char subject[SIZ];
int subject_required = 0;
int do_confirm = 0;
switch(CC->room.QRdefaultview) {
case VIEW_NOTES:
case VIEW_WIKI:
- case VIEW_WIKIMD:
extract_token(supplied_euid, entargs, 9, '|', sizeof supplied_euid);
break;
default:
NULL,
POST_LOGGED_IN,
(!IsEmptyStr(references)) /* is this a reply? or a top-level post? */
- );
- if (err)
- {
+ );
+ if (err) {
cprintf("%d %s\n", err, errmsg);
return;
}
/* Check some other permission type things. */
if (IsEmptyStr(newusername)) {
- strcpy(newusername, CCC->user.fullname);
+ strcpy(newusername, CC->user.fullname);
}
- if ( (CCC->user.axlevel < AxAideU)
- && (strcasecmp(newusername, CCC->user.fullname))
- && (strcasecmp(newusername, CCC->cs_inet_fn))
- ) {
+ if ( (CC->user.axlevel < AxAideU)
+ && (strcasecmp(newusername, CC->user.fullname))
+ && (strcasecmp(newusername, CC->cs_inet_fn))
+ ) {
cprintf("%d You don't have permission to author messages as '%s'.\n",
ERROR + HIGHER_ACCESS_REQUIRED,
newusername
- );
+ );
return;
}
-
if (IsEmptyStr(newuseremail)) {
newuseremail_ok = 1;
}
if (!IsEmptyStr(newuseremail)) {
- if (!strcasecmp(newuseremail, CCC->cs_inet_email)) {
+ if (!strcasecmp(newuseremail, CC->cs_inet_email)) {
newuseremail_ok = 1;
}
- else if (!IsEmptyStr(CCC->cs_inet_other_emails)) {
- j = num_tokens(CCC->cs_inet_other_emails, '|');
+ else if (!IsEmptyStr(CC->cs_inet_other_emails)) {
+ j = num_tokens(CC->cs_inet_other_emails, '|');
for (i=0; i<j; ++i) {
- extract_token(buf, CCC->cs_inet_other_emails, i, '|', sizeof buf);
+ extract_token(buf, CC->cs_inet_other_emails, i, '|', sizeof buf);
if (!strcasecmp(newuseremail, buf)) {
newuseremail_ok = 1;
}
return;
}
- CCC->cs_flags |= CS_POSTING;
+ CC->cs_flags |= CS_POSTING;
- /* In mailbox rooms we have to behave a little differently --
- * make sure the user has specified at least one recipient. Then
- * validate the recipient(s). We do this for the Mail> room, as
- * well as any room which has the "Mailbox" view set - unless it
- * is the DRAFTS room which does not require recipients
- */
+ // In mailbox rooms we have to behave a little differently --
+ // make sure the user has specified at least one recipient. Then
+ // validate the recipient(s). We do this for the Mail> room, as
+ // well as any room which has the "Mailbox" view set - unless it
+ // is the DRAFTS room which does not require recipients.
- if ( ( ( (CCC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CCC->room.QRname[11], MAILROOM)) )
- || ( (CCC->room.QRflags & QR_MAILBOX) && (CCC->curr_view == VIEW_MAILBOX) )
- ) && (strcasecmp(&CCC->room.QRname[11], USERDRAFTROOM)) !=0 ) {
- if (CCC->user.axlevel < AxProbU) {
+ if ( ( ( (CC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CC->room.QRname[11], MAILROOM)) )
+ || ( (CC->room.QRflags & QR_MAILBOX) && (CC->curr_view == VIEW_MAILBOX) )
+ ) && (strcasecmp(&CC->room.QRname[11], USERDRAFTROOM)) !=0 ) {
+ if (CC->user.axlevel < AxProbU) {
strcpy(recp, "sysop");
strcpy(cc, "");
strcpy(bcc, "");
}
if (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0) {
- if (CtdlCheckInternetMailPermission(&CCC->user)==0) {
+ if (CtdlCheckInternetMailPermission(&CC->user)==0) {
cprintf("%d You do not have permission "
"to send Internet mail.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
}
}
- if ( ( (valid_to->num_internet + valid_to->num_ignet + valid_cc->num_internet + valid_cc->num_ignet + valid_bcc->num_internet + valid_bcc->num_ignet) > 0)
- && (CCC->user.axlevel < AxNetU) ) {
- cprintf("%d Higher access required for network mail.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
+ if ( ( (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet) > 0) && (CC->user.axlevel < AxNetU) ) {
+ cprintf("%d Higher access required for network mail.\n", ERROR + HIGHER_ACCESS_REQUIRED);
free_recipients(valid_to);
free_recipients(valid_cc);
free_recipients(valid_bcc);
if ((RESTRICT_INTERNET == 1)
&& (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0)
- && ((CCC->user.flags & US_INTERNET) == 0)
- && (!CCC->internal_pgm)) {
+ && ((CC->user.flags & US_INTERNET) == 0)
+ && (!CC->internal_pgm)) {
cprintf("%d You don't have access to Internet mail.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
free_recipients(valid_to);
/* Is this a room which has anonymous-only or anonymous-option? */
anonymous = MES_NORMAL;
- if (CCC->room.QRflags & QR_ANONONLY) {
+ if (CC->room.QRflags & QR_ANONONLY) {
anonymous = MES_ANONONLY;
}
- if (CCC->room.QRflags & QR_ANONOPT) {
+ if (CC->room.QRflags & QR_ANONOPT) {
if (anon_flag == 1) { /* only if the user requested it */
anonymous = MES_ANONOPT;
}
}
- if ((CCC->room.QRflags & QR_MAILBOX) == 0) {
+ if ((CC->room.QRflags & QR_MAILBOX) == 0) {
recp[0] = 0;
}
* strongly recommended in this room, if either the SUBJECTREQ flag
* is set, or if there is one or more Internet email recipients.
*/
- if (CCC->room.QRflags2 & QR2_SUBJECTREQ) subject_required = 1;
+ if (CC->room.QRflags2 & QR2_SUBJECTREQ) subject_required = 1;
if ((valid_to) && (valid_to->num_internet > 0)) subject_required = 1;
if ((valid_cc) && (valid_cc->num_internet > 0)) subject_required = 1;
if ((valid_bcc) && (valid_bcc->num_internet > 0)) subject_required = 1;
cprintf("%d send message\n", SEND_LISTING);
}
- msg = CtdlMakeMessage(&CCC->user, recp, cc,
- CCC->room.QRname, anonymous, format_type,
+ msg = CtdlMakeMessage(&CC->user, recp, cc,
+ CC->room.QRname, anonymous, format_type,
newusername, newuseremail, subject,
((!IsEmptyStr(supplied_euid)) ? supplied_euid : NULL),
NULL, references);
}
free(all_recps);
- if ((valid != NULL) && (valid->num_room == 1))
- {
- /* posting into an ML room? set the envelope from
- * to the actual mail address so others get a valid
- * reply-to-header.
- */
+ // posting into a mailing list room? set the envelope from
+ // to the actual mail address so others get a valid reply-to-header.
+ if ((valid != NULL) && (valid->num_room == 1) && !IsEmptyStr(valid->recp_orgroom)) {
CM_SetField(msg, eenVelopeTo, valid->recp_orgroom, strlen(valid->recp_orgroom));
}
if (msg != NULL) {
- msgnum = CtdlSubmitMsg(msg, valid, "", QP_EADDR);
+ msgnum = CtdlSubmitMsg(msg, valid, "");
if (do_confirm) {
cprintf("%ld\n", msgnum);
- if (StrLength(CCC->StatusMessage) > 0) {
- cprintf("%s\n", ChrPtr(CCC->StatusMessage));
+ if (StrLength(CC->StatusMessage) > 0) {
+ cprintf("%s\n", ChrPtr(CC->StatusMessage));
}
else if (msgnum >= 0L) {
client_write(HKEY("Message accepted.\n"));
return;
}
-/*
- * Delete message from current room
- */
-void cmd_dele(char *args)
-{
+
+// Delete message from current room
+void cmd_dele(char *args) {
int num_deleted;
int i;
char msgset[SIZ];
}
-
-/*
- * move or copy a message to another room
- */
-void cmd_move(char *args)
-{
+// move or copy a message to another room
+void cmd_move(char *args) {
char msgset[SIZ];
char msgtok[32];
long *msgs;
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