X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnotes%2Fserv_notes.c;h=4ae8ac077a90a2863e899c42edd2eda8771131d6;hb=882ff5a53c3b4e440520a073cf07dc60b2671876;hp=db8474b1ace28dd9604369e92143ec002bace775;hpb=f1ee61891901850ebbdee1e9440b363dc6df540a;p=citadel.git

diff --git a/citadel/modules/notes/serv_notes.c b/citadel/modules/notes/serv_notes.c
index db8474b1a..4ae8ac077 100644
--- a/citadel/modules/notes/serv_notes.c
+++ b/citadel/modules/notes/serv_notes.c
@@ -1,21 +1,15 @@
 /*
  * Handles functions related to yellow sticky notes.
  *
- * Copyright (c) 2007-2009 by the citadel.org team
+ * Copyright (c) 2007-2012 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * 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.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -27,18 +21,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -51,7 +34,6 @@
 #include "user_ops.h"
 #include "database.h"
 #include "msgbase.h"
-
 #include "ctdl_module.h"
 
 
@@ -80,7 +62,7 @@ void notes_extract_vnote(char *name, char *filename, char *partnum, char *disp,
  * and modern vNote format notes) and does its best to learn the subject (summary)
  * and EUID (uid) of the note for Citadel's own nefarious purposes.
  */
-int serv_notes_beforesave(struct CtdlMessage *msg)
+int serv_notes_beforesave(struct CtdlMessage *msg, struct recptypes *recp)
 {
 	char *p;
 	int a, i;
@@ -106,8 +88,8 @@ int serv_notes_beforesave(struct CtdlMessage *msg)
 	 * any existing message containing that UUID.
 	 */
 	strcpy(uuid, "");
-	p = msg->cm_fields['M'];
-	a = strlen(p);
+	p = msg->cm_fields[eMesageText];
+	a = msg->cm_lengths[eMesageText];
 	while (--a > 0) {
 		if (!strncasecmp(p, "X-KOrg-Note-Id: ", 16)) {	/* Found it */
 			safestrncpy(uuid, p + 16, sizeof(uuid));
@@ -120,16 +102,9 @@ int serv_notes_beforesave(struct CtdlMessage *msg)
 
 			syslog(LOG_DEBUG, "UUID of note is: %s\n", uuid);
 			if (!IsEmptyStr(uuid)) {
+				CM_SetField(msg, eExclusiveID, uuid, strlen(uuid));
 
-				if (msg->cm_fields['E'] != NULL) {
-					free(msg->cm_fields['E']);
-				}
-				msg->cm_fields['E'] = strdup(uuid);
-
-				if (msg->cm_fields['U'] != NULL) {
-					free(msg->cm_fields['U']);
-				}
-				msg->cm_fields['U'] = strdup(uuid);
+				CM_CopyField(msg, eMsgSubject, eExclusiveID);
 			}
 		}
 		p++;
@@ -137,35 +112,30 @@ int serv_notes_beforesave(struct CtdlMessage *msg)
 
 	/* Modern clients are using vNote format.  Check for one... */
 
-	mime_parser(msg->cm_fields['M'],
-		NULL,
-		*notes_extract_vnote,
-		NULL, NULL,
-		&v,		/* user data ptr - put the vnote here */
-		0
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *notes_extract_vnote,
+		    NULL, NULL,
+		    &v,		/* user data ptr - put the vnote here */
+		    0
 	);
 
 	if (v == NULL) return(0);	/* no vNotes were found in this message */
 
 	/* Set the message EUID to the vNote UID */
 
-	if (v->uid) if (!IsEmptyStr(v->uid)) {
+	if ((v->uid) && (!IsEmptyStr(v->uid))) {
 		syslog(LOG_DEBUG, "UID of vNote is: %s\n", v->uid);
-		if (msg->cm_fields['E'] != NULL) {
-			free(msg->cm_fields['E']);
-		}
-		msg->cm_fields['E'] = strdup(v->uid);
+		CM_SetField(msg, eExclusiveID, v->uid, strlen(v->uid));
 	}
 
 	/* Set the message Subject to the vNote Summary */
 
-	if (v->summary) if (!IsEmptyStr(v->summary)) {
-		if (msg->cm_fields['U'] != NULL) {
-			free(msg->cm_fields['U']);
-		}
-		msg->cm_fields['U'] = strdup(v->summary);
-		if (strlen(msg->cm_fields['U']) > 72) {
-			strcpy(&msg->cm_fields['U'][68], "...");
+	if ((v->summary) && (!IsEmptyStr(v->summary))) {
+		CM_SetField(msg, eMsgSubject, v->summary, strlen(v->summary));
+
+		if (msg->cm_lengths[eMsgSubject] > 72) {
+			strcpy(&msg->cm_fields[eMsgSubject][68], "...");
+			CM_CutFieldAt(msg, eMsgSubject, 72);
 		}
 	}
 
@@ -182,6 +152,6 @@ CTDL_MODULE_INIT(notes)
 		CtdlRegisterMessageHook(serv_notes_beforesave, EVT_BEFORESAVE);
 	}
 	
-	/* return our Subversion id for the Log */
+	/* return our module name for the log */
 	return "notes";
 }