X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=901ee0764125f8c1dbd4f6864ac7457809b1360b;hb=882ff5a53c3b4e440520a073cf07dc60b2671876;hp=870a83a0347dcd0e318e28330a130bb92b562e38;hpb=436e37f800487ea58343ba015299869d216269d2;p=citadel.git

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 870a83a03..901ee0764 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1,7 +1,7 @@
 /*
  * 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.
@@ -61,7 +61,7 @@ char *msgkeys[] = {
 	"rep2", // K -> eReplyTo
 	"list", // L -> eListID
 	"text", // M -> eMesageText
-	"locl",	// N -> eOrigLocal
+	NULL,	// N (formerly used as eNodename)
 	"room", // O -> eOriginalRoom
 	"path", // P -> eMessagePath
 	NULL,   // Q
@@ -113,7 +113,6 @@ eMsgField FieldOrder[]  = {
 	eOriginalRoom,
 	eRecipient   ,
 /* Semi-important fields */
-	eOrigLocal   ,
 	eBig_message ,
 	eExclusiveID ,
 	eWeferences  ,
@@ -1055,14 +1054,14 @@ void mime_download(char *name, char *filename, char *partnum, char *disp,
 	) {
 		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;
@@ -1690,10 +1689,7 @@ int CtdlOutputMsg(long msg_num,		/* message number (local) to fetch */
 }
 
 
-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];
@@ -1726,23 +1722,29 @@ void OutputCtdlMsgHeaders(
 		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.
+					}
+
+
+
 				}
 			}
 		}
@@ -1857,7 +1859,6 @@ void OutputRFC822MsgHeaders(
 			case eSuppressIdx:
 			case eExtnotify:
 			case eVltMsgNum:
-			case eOrigLocal:
 				/* these don't map to mime message headers. */
 				break;
 			}
@@ -2128,7 +2129,7 @@ int CtdlOutputPreLoadedMsg(
 
 	/* 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 */
@@ -2139,9 +2140,9 @@ int CtdlOutputPreLoadedMsg(
 		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, "");
@@ -2658,9 +2659,8 @@ void ReplicationChecks(struct CtdlMessage *msg) {
  * Save a message to disk and submit it into the delivery system.
  */
 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? */
+		   struct recptypes *recps,		/* recipients (if mail) */
+		   const char *force		/* force a particular room? */
 ) {
 	char hold_rm[ROOMNAMELEN];
 	char actual_rm[ROOMNAMELEN];
@@ -2839,7 +2839,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 	 */
 	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);
 		}
 	}
@@ -2986,7 +2986,7 @@ long quickie_message(const char *from,
 		     const char *subject)
 {
 	struct CtdlMessage *msg;
-	recptypes *recp = NULL;
+	struct recptypes *recp = NULL;
 
 	msg = malloc(sizeof(struct CtdlMessage));
 	memset(msg, 0, sizeof(struct CtdlMessage));
@@ -3022,7 +3022,7 @@ long quickie_message(const char *from,
 		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;
@@ -3612,7 +3612,7 @@ void CtdlWriteObject(char *req_room,			/* Room to stuff it in */
 			);
 	}
 	/* Now write the data */
-	CtdlSubmitMsg(msg, NULL, roomname, 0);
+	CtdlSubmitMsg(msg, NULL, roomname);
 	CM_Free(msg);
 }