* reply's copy will have the same address, but an updated
* status.)
*/
- TRACE;
icalcomponent_remove_property(event, e_attendee);
- TRACE;
icalproperty_free(e_attendee);
- TRACE;
icalcomponent_remove_property(reply, r_attendee);
- TRACE;
icalcomponent_add_property(event, r_attendee);
- TRACE;
/* Since we diddled both sets of attendees, we have to start
* the iteration over again. This will not create an infinite
* the summary of the event (becomes message subject),
* and the start time (becomes message date/time).
*/
-void ical_ctdl_set_extended_msgid(char *name, char *filename, char *partnum,
+void ical_ctdl_set_exclusive_msgid(char *name, char *filename, char *partnum,
char *disp, void *content, char *cbtype, size_t length,
char *encoding, void *cbuserdata)
{
- icalcomponent *cal;
+ icalcomponent *cal, *nested_event, *nested_todo;
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
* the "user data" pointer for the MIME parser. When
- * ical_obj_beforesave() sees it there, it'll set the Extended msgid
+ * 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) {
- cal = icalcomponent_get_first_component(
+ nested_event = icalcomponent_get_first_component(
cal, ICAL_VEVENT_COMPONENT
);
+ nested_todo = icalcomponent_get_first_component(
+ cal, ICAL_VTODO_COMPONENT
+ );
+ if (nested_event != NULL) {
+ cal = nested_event;
+ }
+ else if (nested_todo != NULL) {
+ cal = nested_todo;
+ }
}
}
if (cal != NULL) {
p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY);
+ if (p == NULL) {
+ /* If there's no uid we must generate one */
+ generate_uuid(new_uid);
+ icalcomponent_add_property(cal, icalproperty_new_uid(new_uid));
+ p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY);
+ }
if (p != NULL) {
strcpy(imm->uid, icalproperty_get_comment(p));
strcpy(imm->subject,
/*
* See if we need to prevent the object from being saved (we don't allow
- * MIME types other than text/calendar in the Calendar> room). Also, when
- * saving an event to the calendar, set the message's Citadel extended message
- * ID to the UID of the object. This causes our replication checker to
+ * MIME types other than text/calendar in "calendar" or "tasks" rooms). Also,
+ * when saving an event to the calendar, set the message's Citadel exclusive
+ * message ID to the UID of the object. This causes our replication checker to
* automatically delete any existing instances of the same object. (Isn't
* that cool?)
*
*/
int ical_obj_beforesave(struct CtdlMessage *msg)
{
- char roomname[ROOMNAMELEN];
char *p;
int a;
struct icalmessagemod imm;
- int do_this_hook = 0;
- /*
- * Only messages with content-type text/calendar
- * may be saved to Calendar>. If the message is bound for
- * Calendar> but doesn't have this content-type, throw an error
- * so that the message may not be posted.
- */
-
- /* First determine if this is the user's calendar or tasks room */
- do_this_hook = 0;
- MailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM);
- if (!strcasecmp(roomname, CC->room.QRname)) {
- do_this_hook = 1;
- }
- MailboxName(roomname, sizeof roomname, &CC->user, USERTASKSROOM);
- if (!strcasecmp(roomname, CC->room.QRname)) {
- do_this_hook = 1;
- }
-
- if (!do_this_hook) {
+ /* First determine if this is a calendar or tasks room */
+ if ( (CC->curr_view != VIEW_CALENDAR)
+ &&(CC->curr_view != VIEW_TASKS) ) {
return(0); /* Not a vCalendar-centric room */
}
- /* Then determine content-type of the message */
-
/* It must be an RFC822 message! */
- /* FIXME: Not handling MIME multipart messages; implement with IMIP */
- if (msg->cm_format_type != 4)
+ if (msg->cm_format_type != 4) {
return 1; /* You tried to save a non-RFC822 message! */
+ }
/* Find the Content-Type: header */
p = msg->cm_fields['M'];
memset(&imm, 0, sizeof(struct icalmessagemod));
mime_parser(msg->cm_fields['M'],
NULL,
- *ical_ctdl_set_extended_msgid,
+ *ical_ctdl_set_exclusive_msgid,
NULL, NULL,
(void *)&imm,
0
/* If this is a text/calendar object, 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 Extended msgid
+ * ical_obj_beforesave() sees it there, it'll set the Exclusive msgid
* to that string.
*/
if (!strcasecmp(cbtype, "text/calendar")) {
void ical_session_startup(void) {
- CtdlAllocUserData(SYM_CIT_ICAL, sizeof(struct cit_ical));
+ CIT_ICAL = malloc(sizeof(struct cit_ical));
memset(CIT_ICAL, 0, sizeof(struct cit_ical));
}
+void ical_session_shutdown(void) {
+ free(CIT_ICAL);
+}
+
#endif /* CITADEL_WITH_CALENDAR_SERVICE */
CtdlRegisterSessionHook(ical_create_room, EVT_LOGIN);
CtdlRegisterProtoHook(cmd_ical, "ICAL", "Citadel iCal commands");
CtdlRegisterSessionHook(ical_session_startup, EVT_START);
+ CtdlRegisterSessionHook(ical_session_shutdown, EVT_STOP);
#endif
return "$Id$";
}
projects / citadel.git / blobdiff