/*
* Implements the message store.
*
- * Copyright (c) 1987-2020 by the citadel.org team
+ * Copyright (c) 1987-2021 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.
"rep2", // K -> eReplyTo
"list", // L -> eListID
"text", // M -> eMesageText
- NULL, // N (formerly used as eNodeName)
+ NULL, // N (formerly used as eNodename)
"room", // O -> eOriginalRoom
"path", // P -> eMessagePath
NULL, // Q
) {
CC->download_fp = tmpfile();
if (CC->download_fp == NULL) {
- syslog(LOG_EMERG, "msgbase: mime_download() couldn't write: %m");
+ syslog(LOG_ERR, "msgbase: mime_download() couldn't write: %m");
cprintf("%d cannot open temporary file: %s\n", ERROR + INTERNAL_ERROR, strerror(errno));
return;
}
rv = fwrite(content, length, 1, CC->download_fp);
if (rv <= 0) {
- syslog(LOG_EMERG, "msgbase: mime_download() Couldn't write: %m");
+ syslog(LOG_ERR, "msgbase: mime_download() Couldn't write: %m");
cprintf("%d unable to write tempfile.\n", ERROR + TOO_BIG);
fclose(CC->download_fp);
CC->download_fp = NULL;
}
-void OutputCtdlMsgHeaders(
- struct CtdlMessage *TheMessage,
- int do_proto) /* do Citadel protocol responses? */
-{
+void OutputCtdlMsgHeaders(struct CtdlMessage *TheMessage, int do_proto) {
int i;
char buf[SIZ];
char display_name[256];
eMsgField Field;
Field = FieldOrder[i];
if (Field != eMesageText) {
- if ( (!CM_IsEmpty(TheMessage, Field))
- && (msgkeys[Field] != NULL) ) {
- if ((Field == eenVelopeTo) ||
- (Field == eRecipient) ||
- (Field == eCarbonCopY)) {
+ if ( (!CM_IsEmpty(TheMessage, Field)) && (msgkeys[Field] != NULL) ) {
+ if ((Field == eenVelopeTo) || (Field == eRecipient) || (Field == eCarbonCopY)) {
sanitize_truncated_recipient(TheMessage->cm_fields[Field]);
}
if (Field == eAuthor) {
- if (do_proto) cprintf("%s=%s\n",
- msgkeys[Field],
- display_name);
+ if (do_proto) {
+ cprintf("%s=%s\n", msgkeys[Field], display_name);
+ }
}
/* Masquerade display name if needed */
else {
if (do_proto) {
cprintf("%s=%s\n", msgkeys[Field], TheMessage->cm_fields[Field]);
}
+ }
+ /* Give the client a hint about whether the message originated locally */
+ if (Field == erFc822Addr) {
+ if (IsDirectory(TheMessage->cm_fields[Field] ,0)) {
+ cprintf("locl=yes\n"); // message originated locally.
+ }
+
+
+
}
}
}
/* Tell the client which format type we're using. */
if ( (mode == MT_CITADEL) && (do_proto) ) {
- cprintf("type=%d\n", TheMessage->cm_format_type);
+ cprintf("type=%d\n", TheMessage->cm_format_type); // Tell the client which format type we're using.
}
/* nhdr=yes means that we're only displaying headers, no body */
cprintf("nhdr=yes\n");
}
- if ((mode == MT_CITADEL) || (mode == MT_MIME))
+ if ((mode == MT_CITADEL) || (mode == MT_MIME)) {
OutputCtdlMsgHeaders(TheMessage, do_proto);
-
+ }
/* begin header processing loop for RFC822 transfer format */
strcpy(suser, "");
*/
long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */
recptypes *recps, /* recipients (if mail) */
- const char *force, /* force a particular room? */
- int flags /* should the message be exported clean? */
+ const char *force /* force a particular room? */
) {
char hold_rm[ROOMNAMELEN];
char actual_rm[ROOMNAMELEN];
*/
if ((!CC->internal_pgm) || (recps == NULL)) {
if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) {
- syslog(LOG_ERR, "msgbase: ERROR saving message pointer!");
+ syslog(LOG_ERR, "msgbase: ERROR saving message pointer %ld in %s", newmsgid, actual_rm);
CtdlSaveMsgPointerInRoom(CtdlGetConfigStr("c_aideroom"), newmsgid, 0, msg);
}
}
CM_SetField(msg, eMesageText, text, -1);
}
- long msgnum = CtdlSubmitMsg(msg, recp, room, 0);
+ long msgnum = CtdlSubmitMsg(msg, recp, room);
CM_Free(msg);
if (recp != NULL) free_recipients(recp);
return msgnum;
);
}
/* Now write the data */
- CtdlSubmitMsg(msg, NULL, roomname, 0);
+ CtdlSubmitMsg(msg, NULL, roomname);
CM_Free(msg);
}