X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fcalendar%2Fserv_calendar.c;h=8fc0dbad1e351f3457a1a2a0d43942bf2dcfe4e7;hb=c4609169aa7baf208848e72c16d33a3f892353b8;hp=a70baada454a2f2542ba6e3c23b993cf64abe9e5;hpb=848934c1722edc208c4df49c571586b72c3fc486;p=citadel.git

diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
index a70baada4..8fc0dbad1 100644
--- a/citadel/modules/calendar/serv_calendar.c
+++ b/citadel/modules/calendar/serv_calendar.c
@@ -3,22 +3,15 @@
  * room on a Citadel server.  It handles iCalendar objects using the
  * iTIP protocol.  See RFCs 2445 and 2446.
  *
+ * Copyright (c) 1987-2015 by the citadel.org team
  *
- * Copyright (c) 1987-2011 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.
  *
- *  This program is open source 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 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.
  */
 
 #define PRODID "-//Citadel//NONSGML Citadel Calendar//EN"
@@ -30,8 +23,10 @@
 #include "msgbase.h"
 #include "internet_addressing.h"
 #include "serv_calendar.h"
+#include "room_ops.h"
 #include "euidindex.h"
 #include "ical_dezonify.h"
+#include "config.h"
 
 
 
@@ -148,8 +143,8 @@ void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) {
 		msg->cm_format_type = 4;
 		CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
 		CM_SetField(msg, eOriginalRoom, CCC->room.QRname, strlen(CCC->room.QRname));
-		CM_SetField(msg, eNodeName, config.c_nodename, strlen(config.c_nodename));
-		CM_SetField(msg, eHumanNode, config.c_humannode, strlen(config.c_humannode));
+		CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+		CM_SetField(msg, eHumanNode, CtdlGetConfigStr("c_humannode"), strlen(CtdlGetConfigStr("c_humannode")));
 
 		MsgBody = NewStrBufPlain(NULL, serlen + 100);
 		StrBufAppendBufPlain(MsgBody, HKEY("Content-type: text/calendar\r\n\r\n"), 0);
@@ -159,7 +154,7 @@ void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) {
 	
 		/* Now write the data */
 		CtdlSubmitMsg(msg, NULL, "", QP_EADDR);
-		CtdlFreeMessage(msg);
+		CM_Free(msg);
 	}
 
 	/* In either case, now we can free the serialized calendar object */
@@ -184,13 +179,13 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
 	icalproperty *summary = NULL;
 	char summary_string[SIZ];
 	icalproperty *me_attend = NULL;
-	struct recptypes *recp = NULL;
+	recptypes *recp = NULL;
 	icalparameter *partstat = NULL;
 	char *serialized_reply = NULL;
 	char *reply_message_text = NULL;
 	const char *ch;
 	struct CtdlMessage *msg = NULL;
-	struct recptypes *valid = NULL;
+	recptypes *valid = NULL;
 
 	*organizer_string = '\0';
 	strcpy(summary_string, "Calendar item");
@@ -311,7 +306,7 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
 		if (msg != NULL) {
 			valid = validate_recipients(organizer_string, NULL, 0);
 			CtdlSubmitMsg(msg, valid, "", QP_EADDR);
-			CtdlFreeMessage(msg);
+			CM_Free(msg);
 			free_recipients(valid);
 		}
 	}
@@ -374,7 +369,7 @@ void ical_respond(long msgnum, char *partnum, char *action) {
 		return;
 	}
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) {
 		cprintf("%d Message %ld not found.\n",
 			ERROR + ILLEGAL_VALUE,
@@ -385,18 +380,17 @@ void ical_respond(long msgnum, char *partnum, char *action) {
 
 	memset(&ird, 0, sizeof ird);
 	strcpy(ird.desired_partnum, partnum);
-	mime_parser(msg->cm_fields[eMesageText],
-		NULL,
-		*ical_locate_part,		/* callback function */
-		NULL, NULL,
-		(void *) &ird,			/* user data */
-		0
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *ical_locate_part,		/* callback function */
+		    NULL, NULL,
+		    (void *) &ird,			/* user data */
+		    0
 	);
 
 	/* We're done with the incoming message, because we now have a
 	 * calendar object in memory.
 	 */
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 
 	/*
 	 * Here is the real meat of this function.  Handle the event.
@@ -636,19 +630,18 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) {
 	 * us the ability to load the event into memory so we can diddle the
 	 * attendees.
 	 */
-	msg = CtdlFetchMessage(msgnum_being_replaced, 1);
+	msg = CtdlFetchMessage(msgnum_being_replaced, 1, 1);
 	if (msg == NULL) {
 		return(2);			/* internal error */
 	}
 	oec.c = NULL;
-	mime_parser(msg->cm_fields[eMesageText],
-		NULL,
-		*ical_locate_original_event,	/* callback function */
-		NULL, NULL,
-		&oec,				/* user data */
-		0
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *ical_locate_original_event,	/* callback function */
+		    NULL, NULL,
+		    &oec,				/* user data */
+		    0
 	);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 
 	original_event = oec.c;
 	if (original_event == NULL) {
@@ -688,7 +681,7 @@ int ical_update_my_calendar_with_reply(icalcomponent *cal) {
 		if (msg != NULL) {
 			CIT_ICAL->avoid_sending_invitations = 1;
 			CtdlSubmitMsg(msg, NULL, roomname, QP_EADDR);
-			CtdlFreeMessage(msg);
+			CM_Free(msg);
 			CIT_ICAL->avoid_sending_invitations = 0;
 		}
 	}
@@ -717,7 +710,7 @@ void ical_handle_rsvp(long msgnum, char *partnum, char *action) {
 		return;
 	}
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) {
 		cprintf("%d Message %ld not found.\n",
 			ERROR + ILLEGAL_VALUE,
@@ -728,18 +721,17 @@ void ical_handle_rsvp(long msgnum, char *partnum, char *action) {
 
 	memset(&ird, 0, sizeof ird);
 	strcpy(ird.desired_partnum, partnum);
-	mime_parser(msg->cm_fields[eMesageText],
-		NULL,
-		*ical_locate_part,		/* callback function */
-		NULL, NULL,
-		(void *) &ird,			/* user data */
-		0
-	);
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *ical_locate_part,		/* callback function */
+		    NULL, NULL,
+		    (void *) &ird,			/* user data */
+		    0
+		);
 
 	/* We're done with the incoming message, because we now have a
 	 * calendar object in memory.
 	 */
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 
 	/*
 	 * Here is the real meat of this function.  Handle the event.
@@ -914,11 +906,11 @@ int ical_conflicts_phase6(struct icaltimetype t1start,
 			existing_msgnum,
 			conflict_event_uid,
 			conflict_event_summary,
-			(	((strlen(compare_uid)>0)
+			(	(!IsEmptyStr(compare_uid)
 				&&(!strcasecmp(compare_uid,
 				conflict_event_uid))) ? 1 : 0
-			)
-		);
+				)
+			);
 		conflict_reported = 1;
 	}
 
@@ -1156,18 +1148,17 @@ void ical_hunt_for_conflicts_backend(long msgnum, void *data) {
 
 	proposed_event = (icalcomponent *)data;
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) return;
 	memset(&ird, 0, sizeof ird);
 	strcpy(ird.desired_partnum, "_HUNT_");
-	mime_parser(msg->cm_fields[eMesageText],
-		NULL,
-		*ical_locate_part,		/* callback function */
-		NULL, NULL,
-		(void *) &ird,			/* user data */
-		0
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *ical_locate_part,		/* callback function */
+		    NULL, NULL,
+		    (void *) &ird,			/* user data */
+		    0
 	);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 
 	if (ird.cal == NULL) return;
 
@@ -1218,7 +1209,7 @@ void ical_conflicts(long msgnum, char *partnum) {
 	struct CtdlMessage *msg = NULL;
 	struct ical_respond_data ird;
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) {
 		cprintf("%d Message %ld not found\n",
 			ERROR + ILLEGAL_VALUE,
@@ -1229,15 +1220,14 @@ void ical_conflicts(long msgnum, char *partnum) {
 
 	memset(&ird, 0, sizeof ird);
 	strcpy(ird.desired_partnum, partnum);
-	mime_parser(msg->cm_fields[eMesageText],
-		NULL,
-		*ical_locate_part,		/* callback function */
-		NULL, NULL,
-		(void *) &ird,			/* user data */
-		0
-	);
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *ical_locate_part,		/* callback function */
+		    NULL, NULL,
+		    (void *) &ird,			/* user data */
+		    0
+		);
 
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 
 	if (ird.cal != NULL) {
 		ical_hunt_for_conflicts(ird.cal);
@@ -1406,18 +1396,17 @@ void ical_freebusy_backend(long msgnum, void *data) {
 
 	fb = (icalcomponent *)data;		/* User-supplied data will be the VFREEBUSY component */
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) return;
 	memset(&ird, 0, sizeof ird);
 	strcpy(ird.desired_partnum, "_HUNT_");
-	mime_parser(msg->cm_fields[eMesageText],
-		NULL,
-		*ical_locate_part,		/* callback function */
-		NULL, NULL,
-		(void *) &ird,			/* user data */
-		0
-	);
-	CtdlFreeMessage(msg);
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *ical_locate_part,		/* callback function */
+		    NULL, NULL,
+		    (void *) &ird,			/* user data */
+		    0
+		);
+	CM_Free(msg);
 
 	if (ird.cal) {
 		ical_add_to_freebusy(fb, ird.cal);		/* Add VEVENT times to VFREEBUSY */
@@ -1438,7 +1427,7 @@ void ical_freebusy(char *who) {
 	icalcomponent *encaps = NULL;
 	icalcomponent *fb = NULL;
 	int found_user = (-1);
-	struct recptypes *recp = NULL;
+	recptypes *recp = NULL;
 	char buf[256];
 	char host[256];
 	char type[256];
@@ -1465,7 +1454,7 @@ void ical_freebusy(char *who) {
 	 * primary FQDN of this Citadel node.
 	 */
 	if (found_user != 0) {
-		snprintf(buf, sizeof buf, "%s@%s", who, config.c_fqdn);
+		snprintf(buf, sizeof buf, "%s@%s", who, CtdlGetConfigStr("c_fqdn"));
 		syslog(LOG_DEBUG, "Trying <%s>\n", buf);
 		recp = validate_recipients(buf, NULL, 0);
 		if (recp != NULL) {
@@ -1537,7 +1526,7 @@ void ical_freebusy(char *who) {
 	sprintf(buf, "MAILTO:%s", who);
 	if (strchr(buf, '@') == NULL) {
 		strcat(buf, "@");
-		strcat(buf, config.c_fqdn);
+		strcat(buf, CtdlGetConfigStr("c_fqdn"));
 	}
 	for (i=0; buf[i]; ++i) {
 		if (buf[i]==' ') buf[i] = '_';
@@ -1607,18 +1596,17 @@ void ical_getics_backend(long msgnum, void *data) {
 
 	/* Look for the calendar event... */
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) return;
 	memset(&ird, 0, sizeof ird);
 	strcpy(ird.desired_partnum, "_HUNT_");
-	mime_parser(msg->cm_fields[eMesageText],
-		NULL,
-		*ical_locate_part,		/* callback function */
-		NULL, NULL,
-		(void *) &ird,			/* user data */
-		0
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *ical_locate_part,		/* callback function */
+		    NULL, NULL,
+		    (void *) &ird,			/* user data */
+		    0
 	);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 
 	if (ird.cal == NULL) return;
 
@@ -1761,7 +1749,7 @@ void ical_putics(void)
 	}
 
 	cprintf("%d Transmit data now\n", SEND_LISTING);
-	calstream = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0);
+	calstream = CtdlReadMessageBody(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0, 0);
 	if (calstream == NULL) {
 		return;
 	}
@@ -1998,7 +1986,7 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
 	icalcomponent *encaps = NULL;
 	char *request_message_text = NULL;
 	struct CtdlMessage *msg = NULL;
-	struct recptypes *valid = NULL;
+	recptypes *valid = NULL;
 	char attendees_string[SIZ];
 	int num_attendees = 0;
 	char this_attendee[256];
@@ -2210,7 +2198,7 @@ void ical_send_out_invitations(icalcomponent *top_level_cal, icalcomponent *cal)
 		if (msg != NULL) {
 			valid = validate_recipients(attendees_string, NULL, 0);
 			CtdlSubmitMsg(msg, valid, "", QP_EADDR);
-			CtdlFreeMessage(msg);
+			CM_Free(msg);
 			free_recipients(valid);
 		}
 	}
@@ -2392,7 +2380,7 @@ void ical_obj_beforesave_backend(char *name, char *filename, char *partnum,
  * If the message is being saved, we also set various message header fields
  * using data found in the iCalendar object.
  */
-int ical_obj_beforesave(struct CtdlMessage *msg)
+int ical_obj_beforesave(struct CtdlMessage *msg, recptypes *recp)
 {
 	/* First determine if this is a calendar or tasks room */
 	if (  (CC->room.QRdefaultview != VIEW_CALENDAR)
@@ -2407,18 +2395,17 @@ int ical_obj_beforesave(struct CtdlMessage *msg)
 		return(1);		/* You tried to save a non-RFC822 message! */
 	}
 
-	if (msg->cm_fields[eMesageText] == NULL) {
+	if (CM_IsEmpty(msg, eMesageText)) {
 		return(1);		/* You tried to save a null message! */
 	}
 
 	/* Do all of our lovely back-end parsing */
-	mime_parser(msg->cm_fields[eMesageText],
-		NULL,
-		*ical_obj_beforesave_backend,
-		NULL, NULL,
-		(void *)msg,
-		0
-	);
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *ical_obj_beforesave_backend,
+		    NULL, NULL,
+		    (void *)msg,
+		    0
+		);
 
 	return(0);
 }
@@ -2460,7 +2447,7 @@ void ical_obj_aftersave_backend(char *name, char *filename, char *partnum,
  * (This will start back end tasks such as automatic generation of invitations,
  * if such actions are appropriate.)
  */
-int ical_obj_aftersave(struct CtdlMessage *msg)
+int ical_obj_aftersave(struct CtdlMessage *msg, recptypes *recp)
 {
 	char roomname[ROOMNAMELEN];
 
@@ -2478,16 +2465,15 @@ int ical_obj_aftersave(struct CtdlMessage *msg)
 	if (msg->cm_format_type != 4) return(1);
 
 	/* Reject null messages */
-	if (msg->cm_fields[eMesageText] == NULL) return(1);
+	if (CM_IsEmpty(msg, eMesageText)) return(1);
 	
 	/* Now recurse through it looking for our icalendar data */
-	mime_parser(msg->cm_fields[eMesageText],
-		NULL,
-		*ical_obj_aftersave_backend,
-		NULL, NULL,
-		NULL,
-		0
-	);
+	mime_parser(CM_RANGE(msg, eMesageText),
+		    *ical_obj_aftersave_backend,
+		    NULL, NULL,
+		    NULL,
+		    0
+		);
 
 	return(0);
 }