#include "genstamp.h"
#include "internet_addressing.h"
#include "serv_fulltext.h"
+#include "vcard.h"
+#include "euidindex.h"
long config_msgnum;
-
+struct addresses_to_be_filed *atbf = NULL;
/*
* This really belongs in serv_network.c, but I don't know how to export
/*
* Manipulate the "seen msgs" string (or other message set strings)
*/
-void CtdlSetSeen(long target_msgnum, int target_setting, int which_set,
+void CtdlSetSeen(long *target_msgnums, int num_target_msgnums,
+ int target_setting, int which_set,
struct ctdluser *which_user, struct ctdlroom *which_room) {
struct cdbdata *cdbfr;
- int i, j;
+ int i, j, k;
int is_seen = 0;
int was_seen = 0;
long lo = (-1L);
char setstr[SIZ], lostr[SIZ], histr[SIZ];
size_t tmp;
- lprintf(CTDL_DEBUG, "CtdlSetSeen(%ld, %d, %d)\n",
- target_msgnum, target_setting, which_set);
+ lprintf(CTDL_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %d, %d)\n",
+ num_target_msgnums, target_msgnums[0],
+ target_setting, which_set);
/* Learn about the user and room in question */
CtdlGetRelationship(&vbuf,
hi = (-1L);
for (i=0; i<num_msgs; ++i) {
- is_seen = 0;
- if (msglist[i] == target_msgnum) {
- is_seen = target_setting;
- }
- else {
- is_seen = is_set[i];
+ is_seen = is_set[i]; /* Default to existing setting */
+
+ for (k=0; k<num_target_msgnums; ++k) {
+ if (msglist[i] == target_msgnums[k]) {
+ is_seen = target_setting;
+ }
}
if (is_seen) {
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
void *cbuserdata)
{
-
- cprintf("part=%s|%s|%s|%s|%s|%ld\n",
- name, filename, partnum, disp, cbtype, (long)length);
+ struct ma_info *ma;
+
+ ma = (struct ma_info *)cbuserdata;
+ if (ma->is_ma == 0) {
+ cprintf("part=%s|%s|%s|%s|%s|%ld\n",
+ name, filename, partnum, disp, cbtype, (long)length);
+ }
}
/*
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
void *cbuserdata)
{
- cprintf("pref=%s|%s\n", partnum, cbtype);
+ struct ma_info *ma;
+
+ ma = (struct ma_info *)cbuserdata;
+ if (!strcasecmp(cbtype, "multipart/alternative")) {
+ ++ma->is_ma;
+ }
+
+ if (ma->is_ma == 0) {
+ cprintf("pref=%s|%s\n", partnum, cbtype);
+ }
}
/*
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
void *cbuserdata)
{
- cprintf("suff=%s|%s\n", partnum, cbtype);
+ struct ma_info *ma;
+
+ ma = (struct ma_info *)cbuserdata;
+ if (ma->is_ma == 0) {
+ cprintf("suff=%s|%s\n", partnum, cbtype);
+ }
+ if (!strcasecmp(cbtype, "multipart/alternative")) {
+ --ma->is_ma;
+ }
}
}
retcode = CtdlOutputPreLoadedMsg(
- TheMessage, msg_num, mode,
+ TheMessage, mode,
headers_only, do_proto, crlf);
CtdlFreeMessage(TheMessage);
*/
int CtdlOutputPreLoadedMsg(
struct CtdlMessage *TheMessage,
- long msg_num,
int mode, /* how would you like that message? */
int headers_only, /* eschew the message body? */
int do_proto, /* do Citadel protocol responses? */
char *nl; /* newline string */
int suppress_f = 0;
int subject_found = 0;
- struct ma_info *ma;
+ struct ma_info ma;
/* Buffers needed for RFC822 translation. These are all filled
* using functions that are bounds-checked, and therefore we can
char mid[100];
char datestamp[100];
- lprintf(CTDL_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %ld, %d, %d, %d, %d\n",
+ lprintf(CTDL_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d\n",
((TheMessage == NULL) ? "NULL" : "not null"),
- msg_num,
mode, headers_only, do_proto, crlf);
- snprintf(mid, sizeof mid, "%ld", msg_num);
+ strcpy(mid, "unknown");
nl = (crlf ? "\r\n" : "\n");
if (!is_valid_message(TheMessage)) {
} else {
/* Parse the message text component */
mptr = TheMessage->cm_fields['M'];
- ma = malloc(sizeof(struct ma_info));
- memset(ma, 0, sizeof(struct ma_info));
- mime_parser(mptr, NULL, *mime_download, NULL, NULL, (void *)ma, 0);
- free(ma);
+ mime_parser(mptr, NULL, *mime_download, NULL, NULL, NULL, 0);
/* If there's no file open by this time, the requested
* section wasn't found, so print an error
*/
}
/* now for the user-mode message reading loops */
- if (do_proto) cprintf("%d Message %ld:\n", LISTING_FOLLOWS, msg_num);
+ if (do_proto) cprintf("%d msg:\n", LISTING_FOLLOWS);
/* Does the caller want to skip the headers? */
if (headers_only == HEADERS_NONE) goto START_TEXT;
cprintf(">%s", nl);
if (!is_room_aide() && (TheMessage->cm_anon_type == MES_ANONONLY)) {
- // cprintf("From: x@x.org (----)%s", nl);
cprintf("From: \"----\" <x@x.org>%s", nl);
}
else if (!is_room_aide() && (TheMessage->cm_anon_type == MES_ANONOPT)) {
- // cprintf("From: x@x.org (anonymous)%s", nl);
cprintf("From: \"anonymous\" <x@x.org>%s", nl);
}
else if (strlen(fuser) > 0) {
- // cprintf("From: %s (%s)%s", fuser, luser, nl);
cprintf("From: \"%s\" <%s>%s", luser, fuser, nl);
}
else {
- // cprintf("From: %s@%s (%s)%s", suser, snode, luser, nl);
cprintf("From: \"%s\" <%s@%s>%s", luser, suser, snode, nl);
}
/* Tell the client about the MIME parts in this message */
if (TheMessage->cm_format_type == FMT_RFC822) {
if ( (mode == MT_CITADEL) || (mode == MT_MIME) ) {
+ memset(&ma, 0, sizeof(struct ma_info));
mime_parser(mptr, NULL,
(do_proto ? *list_this_part : NULL),
(do_proto ? *list_this_pref : NULL),
(do_proto ? *list_this_suff : NULL),
- NULL, 0);
+ (void *)&ma, 0);
}
else if (mode == MT_RFC822) { /* unparsed RFC822 dump */
- /* FIXME ... we have to put some code in here to avoid
- * printing duplicate header information when both
- * Citadel and RFC822 headers exist. Preference should
- * probably be given to the RFC822 headers.
- */
- int done_rfc822_hdrs = 0;
- while (ch=*(mptr++), ch!=0) {
+ char *start_of_text = NULL;
+ start_of_text = strstr(mptr, "\n\r\n");
+ if (start_of_text == NULL) start_of_text = strstr(mptr, "\n\n");
+ if (start_of_text == NULL) start_of_text = mptr;
+ ++start_of_text;
+ start_of_text = strstr(start_of_text, "\n");
+ ++start_of_text;
+ while (ch=*mptr, ch!=0) {
if (ch==13) {
/* do nothing */
}
- else if (ch==10) {
- if (!done_rfc822_hdrs) {
- if (headers_only != HEADERS_NONE) {
- cprintf("%s", nl);
+ else switch(headers_only) {
+ case HEADERS_NONE:
+ if (mptr >= start_of_text) {
+ if (ch == 10) cprintf("%s", nl);
+ else cprintf("%c", ch);
}
- }
- else {
- if (headers_only != HEADERS_ONLY) {
- cprintf("%s", nl);
+ break;
+ case HEADERS_ONLY:
+ if (mptr < start_of_text) {
+ if (ch == 10) cprintf("%s", nl);
+ else cprintf("%c", ch);
}
- }
- if ((*(mptr) == 13) || (*(mptr) == 10)) {
- done_rfc822_hdrs = 1;
- }
- }
- else {
- if (done_rfc822_hdrs) {
- if (headers_only != HEADERS_NONE) {
- cprintf("%c", ch);
- }
- }
- else {
- if (headers_only != HEADERS_ONLY) {
- cprintf("%c", ch);
- }
- }
- if ((*mptr == 13) || (*mptr == 10)) {
- done_rfc822_hdrs = 1;
- }
+ break;
+ default:
+ if (ch == 10) cprintf("%s", nl);
+ else cprintf("%c", ch);
+ break;
}
+ ++mptr;
}
goto DONE;
}
* we use will display those parts as-is.
*/
if (TheMessage->cm_format_type == FMT_RFC822) {
- ma = malloc(sizeof(struct ma_info));
- memset(ma, 0, sizeof(struct ma_info));
+ memset(&ma, 0, sizeof(struct ma_info));
if (mode == MT_MIME) {
- strcpy(ma->chosen_part, "1");
+ strcpy(ma.chosen_part, "1");
mime_parser(mptr, NULL,
*choose_preferred, *fixed_output_pre,
- *fixed_output_post, (void *)ma, 0);
+ *fixed_output_post, (void *)&ma, 0);
mime_parser(mptr, NULL,
- *output_preferred, NULL, NULL, (void *)ma, 0);
+ *output_preferred, NULL, NULL, (void *)&ma, 0);
}
else {
mime_parser(mptr, NULL,
*fixed_output, *fixed_output_pre,
- *fixed_output_post, (void *)ma, 0);
+ *fixed_output_post, (void *)&ma, 0);
}
- free(ma);
}
DONE: /* now we're done */
msgid = extract_long(cmdbuf, 0);
extract_token(desired_section, cmdbuf, 1, '|', sizeof desired_section);
- safestrncpy(CC->download_desired_section, desired_section, sizeof CC->download_desired_section);
+ safestrncpy(CC->download_desired_section, desired_section,
+ sizeof CC->download_desired_section);
CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, 1);
}
* Save a message pointer into a specified room
* (Returns 0 for success, nonzero for failure)
* roomname may be NULL to use the current room
+ *
+ * Note that the 'supplied_msg' field may be set to NULL, in which case
+ * the message will be fetched from disk, by number, if we need to perform
+ * replication checks. This adds an additional database read, so if the
+ * caller already has the message in memory then it should be supplied.
*/
-int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
+int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int do_repl_check,
+ struct CtdlMessage *supplied_msg) {
int i;
char hold_rm[ROOMNAMELEN];
struct cdbdata *cdbfr;
long highest_msg = 0L;
struct CtdlMessage *msg = NULL;
- lprintf(CTDL_DEBUG, "CtdlSaveMsgPointerInRoom(%s, %ld, %d)\n",
- roomname, msgid, flags);
+ /*lprintf(CTDL_DEBUG,
+ "CtdlSaveMsgPointerInRoom(room=%s, msgid=%ld, repl=%d)\n",
+ roomname, msgid, do_repl_check);*/
strcpy(hold_rm, CC->room.QRname);
/* We may need to check to see if this message is real */
- if ( (flags & SM_VERIFY_GOODNESS)
- || (flags & SM_DO_REPL_CHECK)
- ) {
- msg = CtdlFetchMessage(msgid, 1);
+ if (do_repl_check) {
+ if (supplied_msg != NULL) {
+ msg = supplied_msg;
+ }
+ else {
+ msg = CtdlFetchMessage(msgid, 0);
+ }
if (msg == NULL) return(ERROR + ILLEGAL_VALUE);
}
/* Perform replication checks if necessary */
- if ( (flags & SM_DO_REPL_CHECK) && (msg != NULL) ) {
-
+ if ( (do_repl_check) && (msg != NULL) ) {
if (getroom(&CC->room,
((roomname != NULL) ? roomname : CC->room.QRname) )
!= 0) {
lprintf(CTDL_ERR, "No such room <%s>\n", roomname);
- if (msg != NULL) CtdlFreeMessage(msg);
+ if ( (msg != NULL) && (msg != supplied_msg) ) {
+ CtdlFreeMessage(msg);
+ }
return(ERROR + ROOM_NOT_FOUND);
}
- if (ReplicationChecks(msg) != 0) {
- getroom(&CC->room, hold_rm);
- if (msg != NULL) CtdlFreeMessage(msg);
- lprintf(CTDL_DEBUG,
- "Did replication, and newer exists\n");
- return(0);
- }
+ ReplicationChecks(msg);
}
/* Now the regular stuff */
((roomname != NULL) ? roomname : CC->room.QRname) )
!= 0) {
lprintf(CTDL_ERR, "No such room <%s>\n", roomname);
- if (msg != NULL) CtdlFreeMessage(msg);
+ if ( (msg != NULL) && (msg != supplied_msg) ) {
+ CtdlFreeMessage(msg);
+ }
return(ERROR + ROOM_NOT_FOUND);
}
num_msgs = 0;
} else {
msglist = malloc(cdbfr->len);
- if (msglist == NULL)
+ if (msglist == NULL) {
lprintf(CTDL_ALERT, "ERROR malloc msglist!\n");
+ }
num_msgs = cdbfr->len / sizeof(long);
memcpy(msglist, cdbfr->ptr, cdbfr->len);
cdb_free(cdbfr);
if (msglist[i] == msgid) {
lputroom(&CC->room); /* unlock the room */
getroom(&CC->room, hold_rm);
- if (msg != NULL) CtdlFreeMessage(msg);
+ if ( (msg != NULL) && (msg != supplied_msg) ) {
+ CtdlFreeMessage(msg);
+ }
free(msglist);
return(ERROR + ALREADY_EXISTS);
}
/* Free up the memory we used. */
free(msglist);
+ /* If the message has an Exclusive ID, index that... */
+ if (msg != NULL) {
+ if (msg->cm_fields['E'] != NULL) {
+ index_message_by_euid(msg->cm_fields['E'],
+ &CC->room, msgid);
+ }
+ }
+
/* Update the highest-message pointer and unlock the room. */
CC->room.QRhighest = highest_msg;
lputroom(&CC->room);
getroom(&CC->room, hold_rm);
/* Bump the reference count for this message. */
- if ((flags & SM_DONT_BUMP_REF)==0) {
- AdjRefCount(msgid, +1);
- }
+ AdjRefCount(msgid, +1);
/* Return success. */
- if (msg != NULL) CtdlFreeMessage(msg);
+ if ( (msg != NULL) && (msg != supplied_msg) ) {
+ CtdlFreeMessage(msg);
+ }
return (0);
}
/*
- * Back end for the ReplicationChecks() function
+ * Check to see if any messages already exist in the current room which
+ * carry the same Exclusive ID as this one. If any are found, delete them.
*/
-void check_repl(long msgnum, void *userdata) {
- lprintf(CTDL_DEBUG, "check_repl() replacing message %ld\n", msgnum);
- CtdlDeleteMessages(CC->room.QRname, msgnum, "", 0);
-}
+void ReplicationChecks(struct CtdlMessage *msg) {
+ long old_msgnum = (-1L);
+ if (DoesThisRoomNeedEuidIndexing(&CC->room) == 0) return;
-/*
- * Check to see if any messages already exist which carry the same Exclusive ID
- * as this one. If any are found, delete them.
- *
- */
-int ReplicationChecks(struct CtdlMessage *msg) {
- struct CtdlMessage *template;
- int abort_this = 0;
+ lprintf(CTDL_DEBUG, "Performing replication checks in <%s>\n",
+ CC->room.QRname);
/* No exclusive id? Don't do anything. */
- if (msg->cm_fields['E'] == NULL) return 0;
- if (strlen(msg->cm_fields['E']) == 0) return 0;
- lprintf(CTDL_DEBUG, "Exclusive ID: <%s>\n", msg->cm_fields['E']);
-
- template = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
- memset(template, 0, sizeof(struct CtdlMessage));
- template->cm_fields['E'] = strdup(msg->cm_fields['E']);
+ if (msg == NULL) return;
+ if (msg->cm_fields['E'] == NULL) return;
+ if (strlen(msg->cm_fields['E']) == 0) return;
+ /*lprintf(CTDL_DEBUG, "Exclusive ID: <%s> for room <%s>\n",
+ msg->cm_fields['E'], CC->room.QRname);*/
- CtdlForEachMessage(MSGS_ALL, 0L, NULL, template, check_repl, NULL);
-
- CtdlFreeMessage(template);
- lprintf(CTDL_DEBUG, "ReplicationChecks() returning %d\n", abort_this);
- return(abort_this);
+ old_msgnum = locate_message_by_euid(msg->cm_fields['E'], &CC->room);
+ if (old_msgnum > 0L) {
+ lprintf(CTDL_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum);
+ CtdlDeleteMessages(CC->room.QRname, old_msgnum, "", 0);
+ }
}
-
/*
* Save a message to disk and submit it into the delivery system.
*/
long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */
- struct recptypes *recps_to, /* To: recipients (if mail) */
- struct recptypes *recps_cc, /* Cc: recipients (if mail) */
- struct recptypes *recps_bcc, /* Bcc: recipients (if mail) */
+ struct recptypes *recps, /* recipients (if mail) */
char *force /* force a particular room? */
) {
char submit_filename[128];
char *instr;
struct ser_ret smr;
char *hold_R, *hold_D;
- int is_internet_mail = 0;
- int force_to_sent = 0; /* Force to 'sent items' room */
- size_t tmp;
+ char *collected_addresses = NULL;
+ struct addresses_to_be_filed *aptr = NULL;
lprintf(CTDL_DEBUG, "CtdlSubmitMsg() called\n");
if (is_valid_message(msg) == 0) return(-1); /* self check */
* giving it one, right now.
*/
if (msg->cm_fields['T'] == NULL) {
- lprintf(CTDL_DEBUG, "Generating timestamp\n");
snprintf(generated_timestamp, sizeof generated_timestamp, "%ld", (long)time(NULL));
msg->cm_fields['T'] = strdup(generated_timestamp);
}
/* If this message has no path, we generate one.
*/
if (msg->cm_fields['P'] == NULL) {
- lprintf(CTDL_DEBUG, "Generating path\n");
if (msg->cm_fields['A'] != NULL) {
msg->cm_fields['P'] = strdup(msg->cm_fields['A']);
for (a=0; a<strlen(msg->cm_fields['P']); ++a) {
}
/* Learn about what's inside, because it's what's inside that counts */
- lprintf(CTDL_DEBUG, "Learning what's inside\n");
if (msg->cm_fields['M'] == NULL) {
lprintf(CTDL_ERR, "ERROR: attempt to save message with NULL body\n");
return(-2);
}
/* Goto the correct room */
- force_to_sent = 0;
- if (recps_to) force_to_sent = 1;
- if (recps_cc) force_to_sent = 1;
- if (recps_bcc) force_to_sent = 1;
+ lprintf(CTDL_DEBUG, "Selected room %s\n", (recps) ? CC->room.QRname : SENTITEMS);
strcpy(hold_rm, CC->room.QRname);
strcpy(actual_rm, CC->room.QRname);
- if (force_to_sent) {
+ if (recps != NULL) {
strcpy(actual_rm, SENTITEMS);
}
- lprintf(CTDL_DEBUG, "Selected room %s\n", actual_rm);
/* If the user is a twit, move to the twit room for posting */
- lprintf(CTDL_DEBUG, "Handling twit stuff: %s\n",
- (CC->user.axlevel == 2) ? config.c_twitroom : "OK");
if (TWITDETECT) {
if (CC->user.axlevel == 2) {
strcpy(hold_rm, actual_rm);
strcpy(actual_rm, config.c_twitroom);
+ lprintf(CTDL_DEBUG, "Diverting to twit room\n");
}
}
lprintf(CTDL_DEBUG, "Performing before-save hooks\n");
if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-3);
- /* If this message has an Exclusive ID, perform replication checks */
- lprintf(CTDL_DEBUG, "Performing replication checks\n");
- if (ReplicationChecks(msg) > 0) return(-4);
+ /*
+ * If this message has an Exclusive ID, and the room is replication
+ * checking enabled, then do replication checks.
+ */
+ if (DoesThisRoomNeedEuidIndexing(&CC->room)) {
+ ReplicationChecks(msg);
+ }
/* Save it to disk */
lprintf(CTDL_DEBUG, "Saving to disk\n");
CC->redirect_buffer = malloc(SIZ);
CC->redirect_len = 0;
CC->redirect_alloc = SIZ;
- CtdlOutputPreLoadedMsg(msg, 0L, MT_RFC822, HEADERS_ALL, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1);
smi.meta_rfc822_length = CC->redirect_len;
free(CC->redirect_buffer);
CC->redirect_buffer = NULL;
* message, we want to BYPASS saving the sender's copy (because there
* is no local sender; it would otherwise go to the Trashcan).
*/
- if ((!CC->internal_pgm) || ((recps_to == NULL) && (recps_cc == NULL) && (recps_bcc == NULL))) {
- if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0) != 0) {
+ if ((!CC->internal_pgm) || (recps == NULL)) {
+ if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) {
lprintf(CTDL_ERR, "ERROR saving message pointer!\n");
- CtdlSaveMsgPointerInRoom(config.c_aideroom,
- newmsgid, 0);
+ CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
}
}
/* For internet mail, drop a copy in the outbound queue room */
- is_internet_mail = 0;
- if (recps_to != NULL) is_internet_mail = recps_to->num_internet;
- if (recps_cc != NULL) is_internet_mail = recps_cc->num_internet;
- if (recps_bcc != NULL) is_internet_mail = recps_bcc->num_internet;
- if (is_internet_mail) {
- CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0);
- }
-
- /* If other rooms are specified in the To: field, drop them there too. */
- /******* FIXME FIXME ADD CC AND BCC HERE *********/
- if (recps_to != NULL)
- if (recps_to->num_room > 0)
- for (i=0; i<num_tokens(recps_to->recp_room, '|'); ++i) {
- extract_token(recipient, recps_to->recp_room, i,
+ if (recps != NULL)
+ if (recps->num_internet > 0) {
+ CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0, msg);
+ }
+
+ /* If other rooms are specified, drop them there too. */
+ if (recps != NULL)
+ if (recps->num_room > 0)
+ for (i=0; i<num_tokens(recps->recp_room, '|'); ++i) {
+ extract_token(recipient, recps->recp_room, i,
'|', sizeof recipient);
lprintf(CTDL_DEBUG, "Delivering to room <%s>\n", recipient);
- CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0);
+ CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0, msg);
}
/* Bump this user's messages posted counter. */
/* If this is private, local mail, make a copy in the
* recipient's mailbox and bump the reference count.
*/
- /******* FIXME FIXME ADD CC AND BCC HERE *********/
- if (recps_to != NULL)
- if (recps_to->num_local > 0)
- for (i=0; i<num_tokens(recps_to->recp_local, '|'); ++i) {
- extract_token(recipient, recps_to->recp_local, i,
+ if (recps != NULL)
+ if (recps->num_local > 0)
+ for (i=0; i<num_tokens(recps->recp_local, '|'); ++i) {
+ extract_token(recipient, recps->recp_local, i,
'|', sizeof recipient);
lprintf(CTDL_DEBUG, "Delivering private local mail to <%s>\n",
recipient);
if (getuser(&userbuf, recipient) == 0) {
MailboxName(actual_rm, sizeof actual_rm,
&userbuf, MAILROOM);
- CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
+ CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg);
BumpNewMailCounter(userbuf.usernum);
}
else {
lprintf(CTDL_DEBUG, "No user <%s>\n", recipient);
- CtdlSaveMsgPointerInRoom(config.c_aideroom,
- newmsgid, 0);
+ CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
}
}
* node. We'll revisit this again in a year or so when everyone has
* a network spool receiver that can handle the new style messages.
*/
- /******* FIXME FIXME ADD CC AND BCC HERE *********/
- if (recps_to != NULL)
- if (recps_to->num_ignet > 0)
- for (i=0; i<num_tokens(recps_to->recp_ignet, '|'); ++i) {
- extract_token(recipient, recps_to->recp_ignet, i,
+ if (recps != NULL)
+ if (recps->num_ignet > 0)
+ for (i=0; i<num_tokens(recps->recp_ignet, '|'); ++i) {
+ extract_token(recipient, recps->recp_ignet, i,
'|', sizeof recipient);
hold_R = msg->cm_fields['R'];
/* For internet mail, generate delivery instructions.
* Yes, this is recursive. Deal with it. Infinite recursion does
* not happen because the delivery instructions message does not
- * have any recipients.
+ * contain a recipient.
*/
- if (is_internet_mail) {
+ if (recps != NULL)
+ if (recps->num_internet > 0) {
lprintf(CTDL_DEBUG, "Generating delivery instructions\n");
- instr = malloc(SIZ * 4);
- snprintf(instr, SIZ * 4,
+ instr = malloc(SIZ * 2);
+ snprintf(instr, SIZ * 2,
"Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
"bounceto|%s@%s\n",
SPOOLMIME, newmsgid, (long)time(NULL),
msg->cm_fields['A'], msg->cm_fields['N']
);
- if (recps_to) if (strlen(recps_to->recp_internet) > 0) {
- for (i=0; i<num_tokens(recps_to->recp_internet, '|'); ++i) {
- tmp = strlen(instr);
- extract_token(recipient, recps_to->recp_internet, i, '|', sizeof recipient);
- snprintf(&instr[tmp], SIZ * 4 - tmp,
- "remote|%s|0||\n", recipient);
- }
- }
-
- if (recps_cc) if (strlen(recps_cc->recp_internet) > 0) {
- for (i=0; i<num_tokens(recps_cc->recp_internet, '|'); ++i) {
- tmp = strlen(instr);
- extract_token(recipient, recps_cc->recp_internet, i, '|', sizeof recipient);
- snprintf(&instr[tmp], SIZ * 4 - tmp,
- "remote|%s|0||\n", recipient);
- }
- }
-
- if (recps_bcc) if (strlen(recps_bcc->recp_internet) > 0) {
- for (i=0; i<num_tokens(recps_bcc->recp_internet, '|'); ++i) {
- tmp = strlen(instr);
- extract_token(recipient, recps_bcc->recp_internet, i, '|', sizeof recipient);
- snprintf(&instr[tmp], SIZ * 4 - tmp,
- "remote|%s|0||\n", recipient);
- }
+ for (i=0; i<num_tokens(recps->recp_internet, '|'); ++i) {
+ size_t tmp = strlen(instr);
+ extract_token(recipient, recps->recp_internet, i, '|', sizeof recipient);
+ snprintf(&instr[tmp], SIZ * 2 - tmp,
+ "remote|%s|0||\n", recipient);
}
imsg = malloc(sizeof(struct CtdlMessage));
imsg->cm_format_type = FMT_RFC822;
imsg->cm_fields['A'] = strdup("Citadel");
imsg->cm_fields['M'] = instr;
- CtdlSubmitMsg(imsg, NULL, NULL, NULL, SMTP_SPOOLOUT_ROOM);
+ CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
CtdlFreeMessage(imsg);
}
+ /*
+ * Any addresses to harvest for someone's address book?
+ */
+ if ( (CC->logged_in) && (recps != NULL) ) {
+ collected_addresses = harvest_collected_addresses(msg);
+ }
+
+ if (collected_addresses != NULL) {
+ begin_critical_section(S_ATBF);
+ aptr = (struct addresses_to_be_filed *) malloc(sizeof(struct addresses_to_be_filed));
+ aptr->next = atbf;
+ MailboxName(actual_rm, sizeof actual_rm, &CC->user, USERCONTACTSROOM);
+ aptr->roomname = strdup(actual_rm);
+ aptr->collected_addresses = collected_addresses;
+ atbf = aptr;
+ end_critical_section(S_ATBF);
+ }
return(newmsgid);
}
+
+
+
+
+
/*
* Convenience function for generating small administrative messages.
*/
}
msg->cm_fields['M'] = strdup(text);
- CtdlSubmitMsg(msg, recp, NULL, NULL, room);
+ CtdlSubmitMsg(msg, recp, room);
CtdlFreeMessage(msg);
if (recp != NULL) free(recp);
}
struct CtdlMessage *CtdlMakeMessage(
struct ctdluser *author, /* author's user structure */
char *recipient, /* NULL if it's not mail */
+ char *recp_cc, /* NULL if it's not mail */
char *room, /* room where it's going */
int type, /* see MES_ types in header file */
int format_type, /* variformat, plain text, MIME... */
strcpy(dest_node, "");
striplt(recipient);
+ striplt(recp_cc);
snprintf(buf, sizeof buf, "cit%ld", author->usernum); /* Path */
msg->cm_fields['P'] = strdup(buf);
if (recipient[0] != 0) {
msg->cm_fields['R'] = strdup(recipient);
}
+ if (recp_cc[0] != 0) {
+ msg->cm_fields['Y'] = strdup(recp_cc);
+ }
if (dest_node[0] != 0) {
msg->cm_fields['D'] = strdup(dest_node);
}
}
-
/*
* Validate recipients, count delivery types and errors, and handle aliasing
* FIXME check for dupes!!!!!
+ * Returns 0 if all addresses are ok, -1 if no addresses were specified,
+ * or the number of addresses found invalid.
*/
struct recptypes *validate_recipients(char *recipients) {
struct recptypes *ret;
if ((ret->num_local + ret->num_internet + ret->num_ignet +
ret->num_room + ret->num_error) == 0) {
- ++ret->num_error;
+ ret->num_error = (-1);
strcpy(ret->errormsg, "No recipients specified.");
}
int anonymous = 0;
char errmsg[SIZ];
int err = 0;
+ struct recptypes *valid = NULL;
struct recptypes *valid_to = NULL;
struct recptypes *valid_cc = NULL;
struct recptypes *valid_bcc = NULL;
if (CC->user.axlevel < 2) {
strcpy(recp, "sysop");
+ strcpy(cc, "");
+ strcpy(bcc, "");
}
valid_to = validate_recipients(recp);
if (valid_to->num_error > 0) {
- cprintf("%d %s\n",
- ERROR + NO_SUCH_USER, valid_to->errormsg);
+ cprintf("%d Invalid recipient (To)\n", ERROR + NO_SUCH_USER);
free(valid_to);
return;
}
valid_cc = validate_recipients(cc);
if (valid_cc->num_error > 0) {
- cprintf("%d %s\n",
- ERROR + NO_SUCH_USER, valid_cc->errormsg);
+ cprintf("%d Invalid recipient (CC)\n", ERROR + NO_SUCH_USER);
free(valid_to);
free(valid_cc);
return;
valid_bcc = validate_recipients(bcc);
if (valid_bcc->num_error > 0) {
- cprintf("%d %s\n",
- ERROR + NO_SUCH_USER, valid_bcc->errormsg);
+ cprintf("%d Invalid recipient (BCC)\n", ERROR + NO_SUCH_USER);
free(valid_to);
free(valid_cc);
free(valid_bcc);
return;
}
+ /* Recipient required, but none were specified */
+ if ( (valid_to->num_error < 0) && (valid_cc->num_error < 0) && (valid_bcc->num_error < 0) ) {
+ free(valid_to);
+ free(valid_cc);
+ free(valid_bcc);
+ cprintf("%d At least one recipient is required.\n", ERROR + NO_SUCH_USER);
+ return;
+ }
+
if (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0) {
if (CtdlCheckInternetMailPermission(&CC->user)==0) {
cprintf("%d You do not have permission "
return;
}
+ /* We don't need these anymore because we'll do it differently below */
+ free(valid_to);
+ free(valid_cc);
+ free(valid_bcc);
+
/* Handle author masquerading */
if (CC->fake_postname[0]) {
strcpy(masquerade_as, CC->fake_postname);
} else {
cprintf("%d send message\n", SEND_LISTING);
}
- msg = CtdlMakeMessage(&CC->user, recp,
+
+ msg = CtdlMakeMessage(&CC->user, recp, cc,
CC->room.QRname, anonymous, format_type,
masquerade_as, subject, NULL);
+ /* Put together one big recipients struct containing to/cc/bcc all in
+ * one. This is for the envelope.
+ */
+ char *all_recps = malloc(SIZ * 3);
+ strcpy(all_recps, recp);
+ if (strlen(cc) > 0) {
+ if (strlen(all_recps) > 0) {
+ strcat(all_recps, ",");
+ }
+ strcat(all_recps, cc);
+ }
+ if (strlen(bcc) > 0) {
+ if (strlen(all_recps) > 0) {
+ strcat(all_recps, ",");
+ }
+ strcat(all_recps, bcc);
+ }
+ if (strlen(all_recps) > 0) {
+ valid = validate_recipients(all_recps);
+ }
+ else {
+ valid = NULL;
+ }
+ free(all_recps);
+
if (msg != NULL) {
- msgnum = CtdlSubmitMsg(msg, valid_to, valid_cc, valid_bcc, "");
+ msgnum = CtdlSubmitMsg(msg, valid, "");
if (do_confirm) {
cprintf("%ld\n", msgnum);
CtdlFreeMessage(msg);
}
CC->fake_postname[0] = '\0';
- free(valid_to);
- free(valid_cc);
- free(valid_bcc);
+ if (valid != NULL) {
+ free(valid);
+ }
return;
}
int CtdlCopyMsgToRoom(long msgnum, char *dest) {
int err;
- err = CtdlSaveMsgPointerInRoom(dest, msgnum,
- (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
+ err = CtdlSaveMsgPointerInRoom(dest, msgnum, 1, NULL);
if (err != 0) return(err);
return(0);
/* If the reference count is now zero, delete the message
* (and its supplementary record as well).
- * FIXME ... defer this so it doesn't keep the user waiting.
*/
if (smi.meta_refcount == 0) {
lprintf(CTDL_DEBUG, "Deleting message <%ld>\n", msgnum);
);
}
/* Now write the data */
- CtdlSubmitMsg(msg, NULL, NULL, NULL, roomname);
+ CtdlSubmitMsg(msg, NULL, roomname);
CtdlFreeMessage(msg);
}
projects / citadel.git / blobdiff