/*
* Message journaling functions.
+ *
+ * Copyright (c) 1987-2015 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 "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
#include <stdio.h>
-#include <fcntl.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
-
-#include <ctype.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <sys/stat.h>
#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "database.h"
-#include "msgbase.h"
-#include "support.h"
-#include "sysdep_decls.h"
+
+#include "ctdl_module.h"
+
#include "citserver.h"
-#include "room_ops.h"
-#include "user_ops.h"
-#include "file_ops.h"
#include "config.h"
-#include "control.h"
-#include "genstamp.h"
-#include "internet_addressing.h"
+#include "user_ops.h"
#include "serv_vcard.h" /* Needed for vcard_getuser and extract_inet_email_addrs */
+#include "internet_addressing.h"
#include "journaling.h"
-#include "ctdl_module.h"
-#include "threads.h"
-
struct jnlq *jnlq = NULL; /* journal queue */
/*
*/
void JournalBackgroundSubmit(struct CtdlMessage *msg,
StrBuf *saved_rfc822_version,
- struct recptypes *recps) {
+ recptypes *recps) {
struct jnlq *jptr = NULL;
/* Avoid double journaling! */
- if (msg->cm_fields[eJournal] != NULL) {
+ if (!CM_IsEmpty(msg, eJournal)) {
FreeStrBuf(&saved_rfc822_version);
return;
}
return;
}
memset(jptr, 0, sizeof(struct jnlq));
- if (recps != NULL) memcpy(&jptr->recps, recps, sizeof(struct recptypes));
- 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]);
+ if (recps != NULL) memcpy(&jptr->recps, recps, sizeof(recptypes));
+ if (!CM_IsEmpty(msg, eAuthor)) jptr->from = strdup(msg->cm_fields[eAuthor]);
+ if (!CM_IsEmpty(msg, eNodeName)) jptr->node = strdup(msg->cm_fields[eNodeName]);
+ if (!CM_IsEmpty(msg, erFc822Addr)) jptr->rfca = strdup(msg->cm_fields[erFc822Addr]);
+ if (!CM_IsEmpty(msg, eMsgSubject)) jptr->subj = strdup(msg->cm_fields[eMsgSubject]);
+ if (!CM_IsEmpty(msg, emessageId)) jptr->msgn = strdup(msg->cm_fields[emessageId]);
jptr->rfc822 = SmashStrBuf(&saved_rfc822_version);
/* Add to the queue */
void JournalRunQueueMsg(struct jnlq *jmsg) {
struct CtdlMessage *journal_msg = NULL;
- struct recptypes *journal_recps = NULL;
+ recptypes *journal_recps = NULL;
StrBuf *message_text = NULL;
char mime_boundary[256];
long mblen;
if (jmsg == NULL)
return;
- journal_recps = validate_recipients(config.c_journal_dest, NULL, 0);
+ journal_recps = validate_recipients(CtdlGetConfigStr("c_journal_dest"), NULL, 0);
if (journal_recps != NULL) {
if ( (journal_recps->num_local > 0)
journal_msg->cm_anon_type = MES_NORMAL;
journal_msg->cm_format_type = FMT_RFC822;
CM_SetField(journal_msg, eJournal, HKEY("is journal"));
- CM_SetField(journal_msg, eAuthor, jmsg->from, strlen(jmsg->from));
- CM_SetField(journal_msg, eNodeName, jmsg->node, strlen(jmsg->node));
- CM_SetField(journal_msg, erFc822Addr, jmsg->rfca, strlen(jmsg->rfca));
- CM_SetField(journal_msg, eMsgSubject, jmsg->subj, strlen(jmsg->subj));
+
+ if (!IsEmptyStr(jmsg->from)) {
+ CM_SetField(journal_msg, eAuthor, jmsg->from, strlen(jmsg->from));
+ }
+
+ if (!IsEmptyStr(jmsg->node)) {
+ CM_SetField(journal_msg, eNodeName, jmsg->node, strlen(jmsg->node));
+ }
+
+ if (!IsEmptyStr(jmsg->rfca)) {
+ CM_SetField(journal_msg, erFc822Addr, jmsg->rfca, strlen(jmsg->rfca));
+ }
+
+ if (!IsEmptyStr(jmsg->subj)) {
+ CM_SetField(journal_msg, eMsgSubject, jmsg->subj, strlen(jmsg->subj));
+ }
mblen = snprintf(mime_boundary, sizeof(mime_boundary),
"--Citadel-Journal-%08lx-%04x--", time(NULL), ++seq);
- rfc822len = strlen(jmsg->rfc822);
-
- message_text = NewStrBufPlain(NULL, rfc822len + sizeof(struct recptypes) + 1024);
+
+ if (!IsEmptyStr(jmsg->rfc822)) {
+ rfc822len = strlen(jmsg->rfc822);
+ }
+ else {
+ rfc822len = 0;
+ }
+
+ message_text = NewStrBufPlain(NULL, rfc822len + sizeof(recptypes) + 1024);
/*
* Here is where we begin to compose the journalized message.
"\r\n"
"Sender: "), 0);
- if (journal_msg->cm_fields[eAuthor])
+ if (CM_IsEmpty(journal_msg, eAuthor))
StrBufAppendBufPlain(
message_text,
journal_msg->cm_fields[eAuthor], -1, 0);
message_text,
HKEY("(null)"), 0);
- if (journal_msg->cm_fields[erFc822Addr]) {
+ if (!CM_IsEmpty(journal_msg, erFc822Addr)) {
StrBufAppendPrintf(message_text, " <%s>",
journal_msg->cm_fields[erFc822Addr]);
}
- else if (journal_msg->cm_fields[eNodeName]) {
+ else if (!CM_IsEmpty(journal_msg, eNodeName)) {
StrBufAppendPrintf(message_text, " @ %s",
journal_msg->cm_fields[eNodeName]);
}
/* Submit journal message */
CtdlSubmitMsg(journal_msg, journal_recps, "", 0);
- CtdlFreeMessage(journal_msg);
+ CM_Free(journal_msg);
}
free_recipients(journal_recps);