X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=d8b1ac9d2bd6b573806c92294731f0b81f4c1972;hp=9d4451309fd8e831bd3618b67779097a9b7efa8c;hb=0475c981817d12900332693297a77a9ae7168129;hpb=30a4090b04dff1084df3789efe78afd1e2bf6d90

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 9d4451309..d8b1ac9d2 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1,7 +1,7 @@
 /*
  * Implements the message store.
  *
- * Copyright (c) 1987-2012 by the citadel.org team
+ * 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.
@@ -22,6 +22,7 @@
 #include "ctdl_module.h"
 #include "citserver.h"
 #include "control.h"
+#include "config.h"
 #include "clientsocket.h"
 #include "genstamp.h"
 #include "room_ops.h"
@@ -1831,7 +1832,7 @@ void OutputRFC822MsgHeaders(
 				if (haschar(mptr, '@') == 0)
 				{
 					sanitize_truncated_recipient(mptr);
-					cprintf("To: %s@%s", mptr, config.c_fqdn);
+					cprintf("To: %s@%s", mptr, CtdlGetConfigStr("c_fqdn"));
 					cprintf("%s", nl);
 				}
 				else
@@ -2179,7 +2180,7 @@ int CtdlOutputPreLoadedMsg(
 	strcpy(suser, "");
 	strcpy(luser, "");
 	strcpy(fuser, "");
-	memcpy(snode, CFG_KEY(c_nodename) + 1);
+	memcpy(snode, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")) + 1);
 	if (mode == MT_RFC822) 
 		OutputRFC822MsgHeaders(
 			TheMessage,
@@ -2587,7 +2588,7 @@ long send_message(struct CtdlMessage *msg) {
 		msgidbuflen = snprintf(msgidbuf, sizeof msgidbuf, "%08lX-%08lX@%s",
 				       (long unsigned int) time(NULL),
 				       (long unsigned int) newmsgid,
-				       config.c_fqdn
+				       CtdlGetConfigStr("c_fqdn")
 			);
 
 		CM_SetField(msg, emessageId, msgidbuf, msgidbuflen);
@@ -2806,7 +2807,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 	if (TWITDETECT) {
 		if (CCC->user.axlevel == AxProbU) {
 			strcpy(hold_rm, actual_rm);
-			strcpy(actual_rm, config.c_twitroom);
+			strcpy(actual_rm, CtdlGetConfigStr("c_twitroom"));
 			MSGM_syslog(LOG_DEBUG, "Diverting to twit room\n");
 		}
 	}
@@ -2889,7 +2890,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 	if ((!CCC->internal_pgm) || (recps == NULL)) {
 		if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) {
 			MSGM_syslog(LOG_ERR, "ERROR saving message pointer!\n");
-			CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
+			CtdlSaveMsgPointerInRoom(CtdlGetConfigStr("c_aideroom"), newmsgid, 0, msg);
 		}
 	}
 
@@ -2918,7 +2919,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 	{
 		if (CCC->logged_in) 
 			snprintf(bounce_to, sizeof bounce_to, "%s@%s",
-				 CCC->user.fullname, config.c_nodename);
+				 CCC->user.fullname, CtdlGetConfigStr("c_nodename"));
 		else 
 			snprintf(bounce_to, sizeof bounce_to, "%s@%s",
 				 msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]);
@@ -2951,7 +2952,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 			}
 			else {
 				MSG_syslog(LOG_DEBUG, "No user <%s>\n", recipient);
-				CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
+				CtdlSaveMsgPointerInRoom(CtdlGetConfigStr("c_aideroom"), newmsgid, 0, msg);
 			}
 		}
 		recps->recp_local = pch;
@@ -2996,13 +2997,13 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 	}
 	else {
 		if (recps == NULL) {
-			qualified_for_journaling = config.c_journal_pubmsgs;
+			qualified_for_journaling = CtdlGetConfigInt("c_journal_pubmsgs");
 		}
 		else if (recps->num_local + recps->num_ignet + recps->num_internet > 0) {
-			qualified_for_journaling = config.c_journal_email;
+			qualified_for_journaling = CtdlGetConfigInt("c_journal_email");
 		}
 		else {
-			qualified_for_journaling = config.c_journal_pubmsgs;
+			qualified_for_journaling = CtdlGetConfigInt("c_journal_pubmsgs");
 		}
 	}
 
@@ -3065,7 +3066,7 @@ void quickie_message(const char *from,
 
 	if (fromaddr != NULL) CM_SetField(msg, erFc822Addr, fromaddr, strlen(fromaddr));
 	if (room != NULL) CM_SetField(msg, eOriginalRoom, room, strlen(room));
-	CM_SetField(msg, eNodeName, CFG_KEY(c_nodename));
+	CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
 	if (to != NULL) {
 		CM_SetField(msg, eRecipient, to, strlen(to));
 		recp = validate_recipients(to, NULL, 0);
@@ -3538,8 +3539,8 @@ struct CtdlMessage *CtdlMakeMessageLen(
 		CM_SetField(msg, eOriginalRoom, CCC->room.QRname, strlen(CCC->room.QRname));
 	}
 
-	CM_SetField(msg, eNodeName, CFG_KEY(c_nodename));
-	CM_SetField(msg, eHumanNode, CFG_KEY(c_humannode));
+	CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+	CM_SetField(msg, eHumanNode, CtdlGetConfigStr("c_humannode"), strlen(CtdlGetConfigStr("c_humannode")));
 
 	if (rcplen > 0) {
 		CM_SetField(msg, eRecipient, recipient, rcplen);
@@ -3591,7 +3592,7 @@ struct CtdlMessage *CtdlMakeMessageLen(
 	}
 	else {
 		StrBuf *MsgBody;
-		MsgBody = CtdlReadMessageBodyBuf(HKEY("000"), config.c_maxmsglen, NULL, 0, 0);
+		MsgBody = CtdlReadMessageBodyBuf(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0, 0);
 		if (MsgBody != NULL) {
 			CM_SetAsFieldSB(msg, eMesageText, &MsgBody);
 		}
@@ -4072,8 +4073,8 @@ void CtdlWriteObject(char *req_room,			/* Room to stuff it in */
 	msg->cm_format_type = 4;
 	CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
 	CM_SetField(msg, eOriginalRoom, req_room, strlen(req_room));
-	CM_SetField(msg, eNodeName, CFG_KEY(c_nodename));
-	CM_SetField(msg, eHumanNode, CFG_KEY(c_humannode));
+	CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+	CM_SetField(msg, eHumanNode, CtdlGetConfigStr("c_humannode"), strlen(CtdlGetConfigStr("c_humannode")));
 	msg->cm_flags = flags;
 	
 	CM_SetAsFieldSB(msg, eMesageText, &encoded_message);