X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=5c10578c0160e711ab4464789833815bcda8bf91;hb=66f09fdd7c3f58e13ed01431dd5148302327ca6e;hp=78fda6fa2b9873b649a05c0e44d01114fbf76950;hpb=ffe9ea29a8fd7dfeb7c89760fde32b3f53f19a50;p=citadel.git

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 78fda6fa2..5c10578c0 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -116,6 +116,15 @@ char *msgkeys[] = {
 	NULL    /* Z */
 };
 
+void CtdlMsgSetCM_Fields(struct CtdlMessage *Msg, const char which, const char *buf, long length)
+{
+	if (Msg->cm_fields[which] != NULL)
+		free (Msg->cm_fields[which]);
+	Msg->cm_fields[which] = malloc(length + 1);
+	memcpy(Msg->cm_fields[which], buf, length);
+	Msg->cm_fields[which][length] = '\0';
+}
+
 /*
  * This function is self explanatory.
  * (What can I say, I'm in a weird mood today...)
@@ -1138,7 +1147,7 @@ void mime_download(char *name, char *filename, char *partnum, char *disp,
 			return;
 		}
 	
-		rv = fwrite(content, length, 1, CC->download_fp);
+		rv = fwrite(content, length, 1, CCC->download_fp);
 		if (rv <= 0) {
 			MSG_syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n",
 				   strerror(errno));
@@ -1204,6 +1213,7 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body)
 	MSG_syslog(LOG_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body);
 	dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
 	if (dmsgtext == NULL) {
+		MSG_syslog(LOG_ERR, "CtdlFetchMessage(%ld, %d) Failed!\n", msgnum, with_body);
 		return NULL;
 	}
 	mptr = dmsgtext->ptr;
@@ -1320,6 +1330,7 @@ int DupCMField(int i, struct CtdlMessage *OrgMsg, struct CtdlMessage *NewMsg)
 	if (NewMsg->cm_fields[i] == NULL)
 		return 0;
 	memcpy(NewMsg->cm_fields[i], OrgMsg->cm_fields[i], len);
+	NewMsg->cm_fields[i][len] = '\0';
 	return 1;
 }
 
@@ -1330,13 +1341,13 @@ struct CtdlMessage * CtdlDuplicateMessage(struct CtdlMessage *OrgMsg)
 
 	if (is_valid_message(OrgMsg) == 0) 
 		return NULL;
-	NewMsg = (struct CtdlMessage *)malloc(sizeof(struct CtdlMessage *));
+	NewMsg = (struct CtdlMessage *)malloc(sizeof(struct CtdlMessage));
 	if (NewMsg == NULL)
 		return NULL;
 
-	memcpy(NewMsg, OrgMsg, sizeof(struct CtdlMessage *));
+	memcpy(NewMsg, OrgMsg, sizeof(struct CtdlMessage));
 
-	memset(NewMsg->cm_fields, 0, sizeof(NewMsg->cm_fields));
+	memset(&NewMsg->cm_fields, 0, sizeof(char*) * 256);
 	
 	for (i = 0; i < 256; ++i)
 	{
@@ -3541,7 +3552,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
  */
 void quickie_message(const char *from,
 		     const char *fromaddr,
-		     char *to,
+		     const char *to,
 		     char *room,
 		     const char *text, 
 		     int format_type,
@@ -3588,25 +3599,25 @@ void quickie_message(const char *from,
 
 void flood_protect_quickie_message(const char *from,
 				   const char *fromaddr,
-				   char *to,
+				   const char *to,
 				   char *room,
 				   const char *text, 
 				   int format_type,
 				   const char *subject,
 				   int nCriterions,
 				   const char **CritStr,
-				   long *CritStrLen)
+				   long *CritStrLen,
+				   long ccid,
+				   long ioid,
+				   time_t NOW)
 {
 	int i;
-	struct UseTable ut;
 	u_char rawdigest[MD5_DIGEST_LEN];
 	struct MD5Context md5context;
 	StrBuf *guid;
-	struct cdbdata *cdbut;
 	char timestamp[64];
 	long tslen;
-	time_t ts = time(NULL);
-	time_t tsday = ts / (8*60*60); /* just care for a day... */
+	time_t tsday = NOW / (8*60*60); /* just care for a day... */
 
 	tslen = snprintf(timestamp, sizeof(timestamp), "%ld", tsday);
 	MD5Init(&md5context);
@@ -3624,27 +3635,22 @@ void flood_protect_quickie_message(const char *from,
 	StrBufAppendBufPlain(guid, HKEY("_fldpt"), 0);
 	if (StrLength(guid) > 40)
 		StrBufCutAt(guid, 40, NULL);
-	/* Find out if we've already sent a similar message */
-	memcpy(ut.ut_msgid, SKEY(guid));
-	ut.ut_timestamp = ts;
 
-	cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid));
-
-	if (cdbut != NULL) {
+	if (CheckIfAlreadySeen("FPAideMessage",
+			       guid,
+			       NOW,
+			       tsday,
+			       eUpdate,
+			       ccid,
+			       ioid)!= 0)
+	{
+		FreeStrBuf(&guid);
 		/* yes, we did. flood protection kicks in. */
 		syslog(LOG_DEBUG,
 		       "not sending message again\n");
-		cdb_free(cdbut);
+		return;
 	}
-
-	/* rewrite the record anyway, to update the timestamp */
-	cdb_store(CDB_USETABLE,
-		  SKEY(guid),
-		  &ut, sizeof(struct UseTable) );
-	
 	FreeStrBuf(&guid);
-
-	if (cdbut != NULL) return;
 	/* no, this message isn't sent recently; go ahead. */
 	quickie_message(from,
 			fromaddr,