/*
- * $Id: $
+ * $Id$
*
* Message journaling functions.
*
#include <sys/stat.h>
#include "citadel.h"
#include "server.h"
-#include "serv_extensions.h"
#include "database.h"
#include "msgbase.h"
#include "support.h"
#include "html.h"
#include "genstamp.h"
#include "internet_addressing.h"
+#include "vcard.h"
+#include "serv_vcard.h" /* Needed for vcard_getuser and extract_inet_email_addrs */
#include "journaling.h"
struct jnlq *jnlq = NULL; /* journal queue */
}
+/*
+ * Convert a local user name to an internet email address for the journal
+ */
+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) {
+ return;
+ }
+
+ v = vcard_get_user(&us);
+ if (v == NULL) {
+ return;
+ }
+
+ extract_inet_email_addrs(inetemail, inetemail_len, NULL, 0, v, 1);
+ vcard_free(v);
+}
+
+
/*
* Called by JournalRunQueue() to send an individual message.
*/
char *message_text = NULL;
char mime_boundary[256];
char recipient[256];
+ char inetemail[256];
static int seq = 0;
int i;
for (i=0; i<jmsg->recps.num_local; ++i) {
extract_token(recipient, jmsg->recps.recp_local,
i, '|', sizeof recipient);
+ local_to_inetemail(inetemail, recipient, sizeof inetemail);
sprintf(&message_text[strlen(message_text)],
- " %s\r\n", recipient);
+ " %s <%s>\r\n", recipient, inetemail);
}
}
CtdlFreeMessage(journal_msg);
}
- free(journal_recps);
+ free_recipients(journal_recps);
}
/* We are responsible for freeing this memory. */