#include "citadel.h"
#include "server.h"
#include "citserver.h"
-#include "sysdep_decls.h"
#include "support.h"
#include "config.h"
-#include "serv_extensions.h"
#include "user_ops.h"
#include "room_ops.h"
#include "tools.h"
#include "internet_addressing.h"
#include "serv_calendar.h"
#include "euidindex.h"
+#include "ctdl_module.h"
#ifdef CITADEL_WITH_CALENDAR_SERVICE
#include <ical.h>
#include "ical_dezonify.h"
+
+
struct ical_respond_data {
char desired_partnum[SIZ];
icalcomponent *cal;
* Send a reply to a meeting invitation.
*
* 'request' is the invitation to reply to.
- * 'action' is the string "accept" or "decline".
+ * 'action' is the string "accept" or "decline" or "tentative".
*
- * (Sorry about this being more than 80 columns ... there was just
- * no easy way to break it down sensibly.)
- *
- * ok
*/
void ical_send_a_reply(icalcomponent *request, char *action) {
icalcomponent *the_reply = NULL;
if (me_attend) icalproperty_free(me_attend);
me_attend = icalproperty_new_clone(attendee);
}
- free(recp);
+ free_recipients(recp);
}
}
}
icalproperty_get_summary(summary) );
}
}
-
}
/* Now generate the reply message and send it out. */
reply_message_text = malloc(strlen(serialized_reply) + SIZ);
if (reply_message_text != NULL) {
sprintf(reply_message_text,
- "Content-type: text/calendar\r\n\r\n%s\r\n",
+ "Content-type: text/calendar charset=\"utf-8\"\r\n\r\n%s\r\n",
serialized_reply
);
"", /* cc */
CC->room.QRname, 0, FMT_RFC822,
"",
+ "",
summary_string, /* Use summary for subject */
NULL,
reply_message_text);
valid = validate_recipients(organizer_string);
CtdlSubmitMsg(msg, valid, "");
CtdlFreeMessage(msg);
+ free_recipients(valid);
}
}
free(serialized_reply);
* Respond to a meeting request.
*/
void ical_respond(long msgnum, char *partnum, char *action) {
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
struct ical_respond_data ird;
if (
}
/* Now that we've processed this message, we don't need it
- * anymore. So delete it.
+ * anymore. So delete it. (NOTE we don't do this anymore.)
+ CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
*/
- CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "", 1);
/* Free the memory we allocated and return a response. */
icalcomponent_free(ird.cal);
char uid[SIZ];
char hold_rm[ROOMNAMELEN];
long msgnum_being_replaced = 0;
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
struct original_event_container oec;
icalcomponent *original_event;
char *serialized_event = NULL;
message_text = malloc(strlen(serialized_event) + SIZ);
if (message_text != NULL) {
sprintf(message_text,
- "Content-type: text/calendar\r\n\r\n%s\r\n",
+ "Content-type: text/calendar charset=\"utf-8\"\r\n\r\n%s\r\n",
serialized_event
);
roomname,
0, FMT_RFC822,
"",
+ "",
"", /* no subject */
NULL,
message_text);
* passes it up to ical_update_my_calendar_with_reply() for processing.
*/
void ical_handle_rsvp(long msgnum, char *partnum, char *action) {
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
struct ical_respond_data ird;
int ret;
}
/* Now that we've processed this message, we don't need it
- * anymore. So delete it. (Maybe make this optional?)
+ * anymore. So delete it. (Don't do this anymore.)
+ CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
*/
- CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "", 1);
/* Free the memory we allocated and return a response. */
icalcomponent_free(ird.cal);
*/
void ical_hunt_for_conflicts_backend(long msgnum, void *data) {
icalcomponent *cal;
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
struct ical_respond_data ird;
struct icaltimetype t1start, t1end, t2start, t2end;
icalproperty *p;
cprintf("%d Conflicting events:\n", LISTING_FOLLOWS);
- CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
+ CtdlForEachMessage(MSGS_ALL, 0, NULL,
+ NULL,
NULL,
ical_hunt_for_conflicts_backend,
(void *) cal
* Hunt for conflicts (Phase 1 -- retrieve the object and call Phase 2)
*/
void ical_conflicts(long msgnum, char *partnum) {
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
struct ical_respond_data ird;
msg = CtdlFetchMessage(msgnum, 1);
*/
void ical_freebusy_backend(long msgnum, void *data) {
icalcomponent *cal;
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
struct ical_respond_data ird;
cal = (icalcomponent *)data;
if (recp->num_local == 1) {
found_user = getuser(&usbuf, recp->recp_local);
}
- free(recp);
+ free_recipients(recp);
}
}
if (recp->num_local == 1) {
found_user = getuser(&usbuf, recp->recp_local);
}
- free(recp);
+ free_recipients(recp);
}
}
if (recp->num_local == 1) {
found_user = getuser(&usbuf, recp->recp_local);
}
- free(recp);
+ free_recipients(recp);
}
}
}
/* Add busy time from events */
lprintf(CTDL_DEBUG, "Adding busy time from events\n");
- CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
- NULL, ical_freebusy_backend, (void *)fb
- );
+ CtdlForEachMessage(MSGS_ALL, 0, NULL, NULL, NULL, ical_freebusy_backend, (void *)fb );
/* If values for DTSTART and DTEND are still not present, set them
* to yesterday and tomorrow as default values.
*/
void ical_getics_backend(long msgnum, void *data) {
icalcomponent *encaps, *c;
- struct CtdlMessage *msg;
+ struct CtdlMessage *msg = NULL;
struct ical_respond_data ird;
encaps = (icalcomponent *)data;
/* Set the Version Number */
icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
- /* Set the method to REQUEST */
+ /* Set the method to PUBLISH */
icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
/* Now go through the room encapsulating all calendar items. */
- CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
+ CtdlForEachMessage(MSGS_ALL, 0, NULL,
+ NULL,
NULL,
ical_getics_backend,
(void *) encaps
* the entire calendar with an entire new (or updated) calendar.
* (Careful: this opens an S_ROOMS critical section!)
*/
- CtdlDeleteMessages(CC->room.QRname, NULL, 0, "", 0);
+ CtdlDeleteMessages(CC->room.QRname, NULL, 0, "");
/* If the top-level component is *not* a VCALENDAR, we can drop it right
* in. This will almost never happen.
"", /* No single recipient here */
CC->room.QRname, 0, FMT_RFC822,
"",
+ "",
summary_string, /* Use summary for subject */
NULL,
request_message_text);
valid = validate_recipients(attendees_string);
CtdlSubmitMsg(msg, valid, "");
CtdlFreeMessage(msg);
+ free_recipients(valid);
}
}
free(serialized_request);
icalproperty *organizer = NULL;
char organizer_string[SIZ];
+ lprintf(CTDL_DEBUG, "ical_saving_vevent() has been called!\n");
+
/* Don't send out invitations unless the client wants us to. */
if (CIT_ICAL->server_generated_invitations == 0) {
return;
* Send out invitations if, and only if, this user is the Organizer.
*/
if (icalcomponent_isa(cal) == ICAL_VEVENT_COMPONENT) {
- organizer = icalcomponent_get_first_property(cal,
- ICAL_ORGANIZER_PROPERTY);
+ organizer = icalcomponent_get_first_property(cal, ICAL_ORGANIZER_PROPERTY);
if (organizer != NULL) {
if (icalproperty_get_organizer(organizer)) {
strcpy(organizer_string,
char *disp, void *content, char *cbtype, char *cbcharset, size_t length,
char *encoding, void *cbuserdata)
{
- icalcomponent *cal, *nested_event, *nested_todo;
+ icalcomponent *cal, *nested_event, *nested_todo, *whole_cal;
icalproperty *p;
struct icalmessagemod *imm;
char new_uid[SIZ];
imm = (struct icalmessagemod *)cbuserdata;
- /* If this is a text/calendar object, hunt for the UID and drop it in
+ /* We're only interested in calendar data. */
+ if (strcasecmp(cbtype, "text/calendar")) {
+ return;
+ }
+
+ /* Hunt for the UID and drop it in
* the "user data" pointer for the MIME parser. When
* ical_obj_beforesave() sees it there, it'll set the Exclusive msgid
* to that string.
*/
- if (!strcasecmp(cbtype, "text/calendar")) {
- cal = icalcomponent_new_from_string(content);
- if (cal != NULL) {
- if (icalcomponent_isa(cal) == ICAL_VCALENDAR_COMPONENT) {
- nested_event = icalcomponent_get_first_component(
- cal, ICAL_VEVENT_COMPONENT
- );
+ whole_cal = icalcomponent_new_from_string(content);
+ cal = whole_cal;
+ if (cal != NULL) {
+ if (icalcomponent_isa(cal) == ICAL_VCALENDAR_COMPONENT) {
+ nested_event = icalcomponent_get_first_component(
+ cal, ICAL_VEVENT_COMPONENT);
+ if (nested_event != NULL) {
+ cal = nested_event;
+ }
+ else {
nested_todo = icalcomponent_get_first_component(
- cal, ICAL_VTODO_COMPONENT
- );
- if (nested_event != NULL) {
- cal = nested_event;
- }
- else if (nested_todo != NULL) {
+ cal, ICAL_VTODO_COMPONENT);
+ if (nested_todo != NULL) {
cal = nested_todo;
}
}
}
+
if (cal != NULL) {
p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY);
if (p == NULL) {
}
if (p != NULL) {
strcpy(imm->uid, icalproperty_get_comment(p));
- /* strcpy(imm->subject, icalproperty_get_comment(p)); old aethera hack */
}
p = ical_ctdl_get_subprop(cal, ICAL_SUMMARY_PROPERTY);
if (p != NULL) {
if (p != NULL) {
imm->dtstart = icaltime_as_timet(icalproperty_get_dtstart(p));
}
- icalcomponent_free(cal);
+ }
+ icalcomponent_free(cal);
+ if (whole_cal != cal) {
+ icalcomponent_free(whole_cal);
}
}
}
-
/*
* See if we need to prevent the object from being saved (we don't allow
* MIME types other than text/calendar in "calendar" or "tasks" rooms). Also,
*/
int ical_obj_beforesave(struct CtdlMessage *msg)
{
- char *p;
- int a;
struct icalmessagemod imm;
/* First determine if this is a calendar or tasks room */
- if ( (CC->room.QRdefaultview != VIEW_CALENDAR)
- &&(CC->room.QRdefaultview != VIEW_TASKS) ) {
+ if ( (CC->room.QRdefaultview != VIEW_CALENDAR)
+ && (CC->room.QRdefaultview != VIEW_TASKS)
+ ) {
return(0); /* Not a vCalendar-centric room */
}
/* It must be an RFC822 message! */
if (msg->cm_format_type != 4) {
- return 1; /* You tried to save a non-RFC822 message! */
+ lprintf(CTDL_DEBUG, "Rejecting non-RFC822 message\n");
+ return(1); /* You tried to save a non-RFC822 message! */
}
+
+ if (msg->cm_fields['M'] == NULL) {
+ return(1); /* You tried to save a null message! */
+ }
+
+ memset(&imm, 0, sizeof(struct icalmessagemod));
- /* Find the Content-Type: header */
- p = msg->cm_fields['M'];
- a = strlen(p);
- while (--a > 0) {
- if (!strncasecmp(p, "Content-Type: ", 14)) { /* Found it */
- if (!strncasecmp(p + 14, "text/calendar", 13)) {
- memset(&imm, 0, sizeof(struct icalmessagemod));
- mime_parser(msg->cm_fields['M'],
- NULL,
- *ical_ctdl_set_exclusive_msgid,
- NULL, NULL,
- (void *)&imm,
- 0
- );
- if (strlen(imm.uid) > 0) {
- if (msg->cm_fields['E'] != NULL) {
- free(msg->cm_fields['E']);
- }
- msg->cm_fields['E'] = strdup(imm.uid);
- }
- if (strlen(imm.subject) > 0) {
- if (msg->cm_fields['U'] != NULL) {
- free(msg->cm_fields['U']);
- }
- msg->cm_fields['U'] = strdup(imm.subject);
- }
- if (imm.dtstart > 0) {
- if (msg->cm_fields['T'] != NULL) {
- free(msg->cm_fields['T']);
- }
- msg->cm_fields['T'] = strdup("000000000000000000");
- sprintf(msg->cm_fields['T'], "%ld", imm.dtstart);
- }
- return 0;
- }
- else {
- return 1;
- }
+ /* Do all of our lovely back-end parsing */
+ mime_parser(msg->cm_fields['M'],
+ NULL,
+ *ical_ctdl_set_exclusive_msgid,
+ NULL, NULL,
+ (void *)&imm,
+ 0
+ );
+
+ if (strlen(imm.uid) > 0) {
+ if (msg->cm_fields['E'] != NULL) {
+ free(msg->cm_fields['E']);
}
- p++;
+ msg->cm_fields['E'] = strdup(imm.uid);
+ lprintf(CTDL_DEBUG, "Saving calendar UID <%s>\n", msg->cm_fields['E']);
}
-
- /* Oops! No Content-Type in this message! How'd that happen? */
- lprintf(CTDL_ERR, "RFC822 message with no Content-Type header!\n");
- return 1;
+ if (strlen(imm.subject) > 0) {
+ if (msg->cm_fields['U'] != NULL) {
+ free(msg->cm_fields['U']);
+ }
+ msg->cm_fields['U'] = strdup(imm.subject);
+ }
+ if (imm.dtstart > 0) {
+ if (msg->cm_fields['T'] != NULL) {
+ free(msg->cm_fields['T']);
+ }
+ msg->cm_fields['T'] = strdup("000000000000000000");
+ sprintf(msg->cm_fields['T'], "%ld", imm.dtstart);
+ }
+
+ return(0);
}
{
icalcomponent *cal;
- /* If this is a text/calendar object, hunt for the UID and drop it in
+ /* We're only interested in calendar items here. */
+ if (strcasecmp(cbtype, "text/calendar")) {
+ return;
+ }
+
+ /* Hunt for the UID and drop it in
* the "user data" pointer for the MIME parser. When
* ical_obj_beforesave() sees it there, it'll set the Exclusive msgid
* to that string.
/*
* Things we need to do after saving a calendar event.
+ * (This will start back end tasks such as automatic generation of invitations,
+ * if such actions are appropriate.)
*/
int ical_obj_aftersave(struct CtdlMessage *msg)
{
char roomname[ROOMNAMELEN];
- char *p;
- int a;
/*
* If this isn't the Calendar> room, no further action is necessary.
/* First determine if this is our room */
MailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM);
if (strcasecmp(roomname, CC->room.QRname)) {
- return 0; /* It's not the Calendar room. */
+ return(0); /* Not the Calendar room -- don't do anything. */
}
- /* Then determine content-type of the message */
-
/* It must be an RFC822 message! */
if (msg->cm_format_type != 4) return(1);
+
+ /* Reject null messages */
+ if (msg->cm_fields['M'] == NULL) return(1);
- /* Find the Content-Type: header */
- p = msg->cm_fields['M'];
- a = strlen(p);
- while (--a > 0) {
- if (!strncasecmp(p, "Content-Type: ", 14)) { /* Found it */
- if (!strncasecmp(p + 14, "text/calendar", 13)) {
- mime_parser(msg->cm_fields['M'],
- NULL,
- *ical_obj_aftersave_backend,
- NULL, NULL,
- NULL,
- 0
- );
- return 0;
- }
- else {
- return 1;
- }
- }
- p++;
- }
-
- /* Oops! No Content-Type in this message! How'd that happen? */
- lprintf(CTDL_ERR, "RFC822 message with no Content-Type header!\n");
- return 1;
+ /* Now recurse through it looking for our icalendar data */
+ mime_parser(msg->cm_fields['M'],
+ NULL,
+ *ical_obj_aftersave_backend,
+ NULL, NULL,
+ NULL,
+ 0
+ );
+
+ return(0);
}
/*
* Register this module with the Citadel server.
*/
-char *serv_calendar_init(void)
+CTDL_MODULE_INIT(calendar)
{
#ifdef CITADEL_WITH_CALENDAR_SERVICE
CtdlRegisterMessageHook(ical_obj_beforesave, EVT_BEFORESAVE);
CtdlRegisterSessionHook(ical_session_shutdown, EVT_STOP);
CtdlRegisterFixedOutputHook("text/calendar", ical_fixed_output);
#endif
+
+ /* return our Subversion id for the Log */
return "$Id$";
}
-
-
-
+void serv_calendar_destroy(void)
+{
+#ifdef CITADEL_WITH_CALENDAR_SERVICE
+ icaltimezone_free_builtin_timezones();
+#endif
+}
projects / citadel.git / blobdiff