/*
- * $Id: $
- *
* Message journaling functions.
- *
*/
#include "sysdep.h"
#include <errno.h>
#include <stdarg.h>
#include <sys/stat.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
-#include "serv_extensions.h"
#include "database.h"
#include "msgbase.h"
#include "support.h"
#include "file_ops.h"
#include "config.h"
#include "control.h"
-#include "tools.h"
-#include "mime_parser.h"
-#include "html.h"
#include "genstamp.h"
#include "internet_addressing.h"
-#include "vcard.h"
-#include "serv_vcard.h"
+#include "serv_vcard.h" /* Needed for vcard_getuser and extract_inet_email_addrs */
#include "journaling.h"
+#include "ctdl_module.h"
+#include "threads.h"
+
struct jnlq *jnlq = NULL; /* journal queue */
/*
* Hand off a copy of a message to be journalized.
*/
void JournalBackgroundSubmit(struct CtdlMessage *msg,
- char *saved_rfc822_version,
+ StrBuf *saved_rfc822_version,
struct recptypes *recps) {
struct jnlq *jptr = NULL;
/* Avoid double journaling! */
- if (msg->cm_fields['J'] != NULL) {
- free(saved_rfc822_version);
+ if (msg->cm_fields[eJournal] != NULL) {
+ FreeStrBuf(&saved_rfc822_version);
return;
}
jptr = (struct jnlq *)malloc(sizeof(struct jnlq));
if (jptr == NULL) {
- free(saved_rfc822_version);
+ FreeStrBuf(&saved_rfc822_version);
return;
}
memset(jptr, 0, sizeof(struct jnlq));
if (recps != NULL) memcpy(&jptr->recps, recps, sizeof(struct recptypes));
- if (msg->cm_fields['A'] != NULL) jptr->from = strdup(msg->cm_fields['A']);
- if (msg->cm_fields['N'] != NULL) jptr->node = strdup(msg->cm_fields['N']);
- if (msg->cm_fields['F'] != NULL) jptr->rfca = strdup(msg->cm_fields['F']);
- if (msg->cm_fields['U'] != NULL) jptr->subj = strdup(msg->cm_fields['U']);
- if (msg->cm_fields['I'] != NULL) jptr->msgn = strdup(msg->cm_fields['I']);
- jptr->rfc822 = saved_rfc822_version;
+ if (msg->cm_fields[eAuthor] != NULL) jptr->from = strdup(msg->cm_fields[eAuthor]);
+ if (msg->cm_fields[eNodeName] != NULL) jptr->node = strdup(msg->cm_fields[eNodeName]);
+ if (msg->cm_fields[erFc822Addr] != NULL) jptr->rfca = strdup(msg->cm_fields[erFc822Addr]);
+ if (msg->cm_fields[eMsgSubject] != NULL) jptr->subj = strdup(msg->cm_fields[eMsgSubject]);
+ if (msg->cm_fields[emessageId] != NULL) jptr->msgn = strdup(msg->cm_fields[emessageId]);
+ jptr->rfc822 = SmashStrBuf(&saved_rfc822_version);
/* Add to the queue */
begin_critical_section(S_JOURNAL_QUEUE);
/*
* Convert a local user name to an internet email address for the journal
*/
+
+/*
+ * TODODRW: change this into a CtdlModuleDo type function that returns alternative address info
+ * for this local user. Something like CtdlModuleGoGetAddr(char *localuser, int type, char *alt_addr, size_t alt_addr_len)
+ * where type can be ADDR_EMAIL, ADDR_FIDO, ADDR_UUCP, ADDR_WEB, ADDR_POSTAL etc etc.
+ * This then begs the question of what should be returned. Is it wise to return a single char* using a comma as a
+ * delimiter? Or would it be better to return a linked list of some kind?
+ */
void local_to_inetemail(char *inetemail, char *localuser, size_t inetemail_len) {
struct ctdluser us;
struct vCard *v;
strcpy(inetemail, "");
- if (getuser(&us, localuser) != 0) {
+ if (CtdlGetUser(&us, localuser) != 0) {
return;
}
return;
}
- extract_primary_inet_email(inetemail, inetemail_len, v);
+ extract_inet_email_addrs(inetemail, inetemail_len, NULL, 0, v, 1);
vcard_free(v);
}
static int seq = 0;
int i;
- journal_recps = validate_recipients(config.c_journal_dest);
+ if (jmsg == NULL)
+ return;
+ journal_recps = validate_recipients(config.c_journal_dest, NULL, 0);
if (journal_recps != NULL) {
if ( (journal_recps->num_local > 0)
journal_msg->cm_magic = CTDLMESSAGE_MAGIC;
journal_msg->cm_anon_type = MES_NORMAL;
journal_msg->cm_format_type = FMT_RFC822;
- journal_msg->cm_fields['J'] = strdup("is journal");
- journal_msg->cm_fields['A'] = jmsg->from;
- journal_msg->cm_fields['N'] = jmsg->node;
- journal_msg->cm_fields['F'] = jmsg->rfca;
- journal_msg->cm_fields['U'] = jmsg->subj;
+ journal_msg->cm_fields[eJournal] = strdup("is journal");
+ journal_msg->cm_fields[eAuthor] = jmsg->from;
+ journal_msg->cm_fields[eNodeName] = jmsg->node;
+ journal_msg->cm_fields[erFc822Addr] = jmsg->rfca;
+ journal_msg->cm_fields[eMsgSubject] = jmsg->subj;
sprintf(mime_boundary, "--Citadel-Journal-%08lx-%04x--", time(NULL), ++seq);
message_text = malloc(strlen(jmsg->rfc822) + sizeof(struct recptypes) + 1024);
,
mime_boundary,
mime_boundary,
- ( journal_msg->cm_fields['A'] ? journal_msg->cm_fields['A'] : "(null)" )
+ ( journal_msg->cm_fields[eAuthor] ? journal_msg->cm_fields[eAuthor] : "(null)" )
);
- if (journal_msg->cm_fields['F']) {
+ if (journal_msg->cm_fields[erFc822Addr]) {
sprintf(&message_text[strlen(message_text)], "<%s>",
- journal_msg->cm_fields['F']);
+ journal_msg->cm_fields[erFc822Addr]);
}
- else if (journal_msg->cm_fields['N']) {
+ else if (journal_msg->cm_fields[eNodeName]) {
sprintf(&message_text[strlen(message_text)], "@ %s",
- journal_msg->cm_fields['N']);
+ journal_msg->cm_fields[eNodeName]);
}
sprintf(&message_text[strlen(message_text)],
mime_boundary
);
- journal_msg->cm_fields['M'] = message_text;
+ journal_msg->cm_fields[eMesageText] = message_text;
free(jmsg->rfc822);
free(jmsg->msgn);
/* Submit journal message */
- CtdlSubmitMsg(journal_msg, journal_recps, "");
+ CtdlSubmitMsg(journal_msg, journal_recps, "", 0);
CtdlFreeMessage(journal_msg);
}
- free(journal_recps);
+ free_recipients(journal_recps);
}
/* We are responsible for freeing this memory. */
projects / citadel.git / blobdiff