X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fcalendar%2Fserv_calendar.c;h=83afa539bf60aafb66a1a2e8878b1c2bd8939f65;hp=02153287fd3996f8d19310e84ab945846f6b7124;hb=0387f48886a9395d89eaca01cd40ab751610426f;hpb=8179fa6e60da83d53435ed943d15a3eddb3a0d5f

diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
index 02153287f..83afa539b 100644
--- a/citadel/modules/calendar/serv_calendar.c
+++ b/citadel/modules/calendar/serv_calendar.c
@@ -3,7 +3,7 @@
  * room on a Citadel server.  It handles iCalendar objects using the
  * iTIP protocol.  See RFCs 2445 and 2446.
  *
- * Copyright (c) 1987-2018 by the citadel.org team
+ * Copyright (c) 1987-2020 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.
@@ -137,7 +137,6 @@ 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, 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);
@@ -146,7 +145,7 @@ void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) {
 		CM_SetAsFieldSB(msg, eMesageText, &MsgBody);
 	
 		/* Now write the data */
-		CtdlSubmitMsg(msg, NULL, "", QP_EADDR);
+		CtdlSubmitMsg(msg, NULL, "");
 		CM_Free(msg);
 	}
 
@@ -298,7 +297,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);
+			CtdlSubmitMsg(msg, valid, "");
 			CM_Free(msg);
 			free_recipients(valid);
 		}
@@ -361,7 +360,7 @@ void ical_respond(long msgnum, char *partnum, char *action) {
 		return;
 	}
 
-	msg = CtdlFetchMessage(msgnum, 1, 1);
+	msg = CtdlFetchMessage(msgnum, 1);
 	if (msg == NULL) {
 		cprintf("%d Message %ld not found.\n",
 			ERROR + ILLEGAL_VALUE,
@@ -620,7 +619,7 @@ 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, 1);
+	msg = CtdlFetchMessage(msgnum_being_replaced, 1);
 	if (msg == NULL) {
 		return(2);			/* internal error */
 	}
@@ -670,7 +669,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);
+			CtdlSubmitMsg(msg, NULL, roomname);
 			CM_Free(msg);
 			CIT_ICAL->avoid_sending_invitations = 0;
 		}
@@ -700,7 +699,7 @@ void ical_handle_rsvp(long msgnum, char *partnum, char *action) {
 		return;
 	}
 
-	msg = CtdlFetchMessage(msgnum, 1, 1);
+	msg = CtdlFetchMessage(msgnum, 1);
 	if (msg == NULL) {
 		cprintf("%d Message %ld not found.\n",
 			ERROR + ILLEGAL_VALUE,
@@ -1135,7 +1134,7 @@ void ical_hunt_for_conflicts_backend(long msgnum, void *data) {
 
 	proposed_event = (icalcomponent *)data;
 
-	msg = CtdlFetchMessage(msgnum, 1, 1);
+	msg = CtdlFetchMessage(msgnum, 1);
 	if (msg == NULL) return;
 	memset(&ird, 0, sizeof ird);
 	strcpy(ird.desired_partnum, "_HUNT_");
@@ -1194,7 +1193,7 @@ void ical_conflicts(long msgnum, char *partnum) {
 	struct CtdlMessage *msg = NULL;
 	struct ical_respond_data ird;
 
-	msg = CtdlFetchMessage(msgnum, 1, 1);
+	msg = CtdlFetchMessage(msgnum, 1);
 	if (msg == NULL) {
 		cprintf("%d Message %ld not found\n",
 			ERROR + ILLEGAL_VALUE,
@@ -1378,7 +1377,7 @@ void ical_freebusy_backend(long msgnum, void *data) {
 
 	fb = (icalcomponent *)data;		/* User-supplied data will be the VFREEBUSY component */
 
-	msg = CtdlFetchMessage(msgnum, 1, 1);
+	msg = CtdlFetchMessage(msgnum, 1);
 	if (msg == NULL) return;
 	memset(&ird, 0, sizeof ird);
 	strcpy(ird.desired_partnum, "_HUNT_");
@@ -1575,7 +1574,7 @@ void ical_getics_backend(long msgnum, void *data) {
 
 	/* Look for the calendar event... */
 
-	msg = CtdlFetchMessage(msgnum, 1, 1);
+	msg = CtdlFetchMessage(msgnum, 1);
 	if (msg == NULL) return;
 	memset(&ird, 0, sizeof ird);
 	strcpy(ird.desired_partnum, "_HUNT_");
@@ -2170,7 +2169,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);
+			CtdlSubmitMsg(msg, valid, "");
 			CM_Free(msg);
 			free_recipients(valid);
 		}