* $Id$
*
* This module implements iCalendar object processing and the Calendar>
- * room on a Citadel/UX server. It handles iCalendar objects using the
+ * room on a Citadel server. It handles iCalendar objects using the
* iTIP protocol. See RFCs 2445 and 2446.
*
*/
#define PRODID "-//Citadel//NONSGML Citadel Calendar//EN"
#include "sysdep.h"
+#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
#include <limits.h>
#include "tools.h"
#include "msgbase.h"
#include "mime_parser.h"
+#include "internet_addressing.h"
#include "serv_calendar.h"
#ifdef CITADEL_WITH_CALENDAR_SERVICE
return;
}
- msg = CtdlFetchMessage(msgnum);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) {
cprintf("%d Message %ld not found.\n",
ERROR + ILLEGAL_VALUE,
* 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
* us the ability to load the event into memory so we can diddle the
* attendees.
*/
- msg = CtdlFetchMessage(msgnum_being_replaced);
+ msg = CtdlFetchMessage(msgnum_being_replaced, 1);
if (msg == NULL) {
return(2); /* internal error */
}
return;
}
- msg = CtdlFetchMessage(msgnum);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) {
cprintf("%d Message %ld not found.\n",
ERROR + ILLEGAL_VALUE,
strcpy(conflict_event_uid, "");
strcpy(conflict_event_summary, "");
- msg = CtdlFetchMessage(msgnum);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
memset(&ird, 0, sizeof ird);
strcpy(ird.desired_partnum, "_HUNT_");
struct CtdlMessage *msg;
struct ical_respond_data ird;
- msg = CtdlFetchMessage(msgnum);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) {
cprintf("%d Message %ld not found.\n",
ERROR + ILLEGAL_VALUE,
icalproperty_new_freebusy(my_period)
);
+ /* Make sure the DTSTART property of the freebusy *list* is set to
+ * the DTSTART property of the *earliest event*.
+ */
+ p = icalcomponent_get_first_property(fb, ICAL_DTSTART_PROPERTY);
+ if (p == NULL) {
+ icalcomponent_set_dtstart(fb,
+ icalcomponent_get_dtstart(cal) );
+ }
+ else {
+ if (icaltime_compare(
+ icalcomponent_get_dtstart(cal),
+ icalcomponent_get_dtstart(fb)
+ ) < 0) {
+ icalcomponent_set_dtstart(fb,
+ icalcomponent_get_dtstart(cal) );
+ }
+ }
+
+ /* Make sure the DTEND property of the freebusy *list* is set to
+ * the DTEND property of the *latest event*.
+ */
+ p = icalcomponent_get_first_property(fb, ICAL_DTEND_PROPERTY);
+ if (p == NULL) {
+ icalcomponent_set_dtend(fb,
+ icalcomponent_get_dtend(cal) );
+ }
+ else {
+ if (icaltime_compare(
+ icalcomponent_get_dtend(cal),
+ icalcomponent_get_dtend(fb)
+ ) > 0) {
+ icalcomponent_set_dtend(fb,
+ icalcomponent_get_dtend(cal) );
+ }
+ }
+
}
cal = (icalcomponent *)data;
- msg = CtdlFetchMessage(msgnum);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL) return;
memset(&ird, 0, sizeof ird);
strcpy(ird.desired_partnum, "_HUNT_");
char *serialized_request = NULL;
icalcomponent *encaps = NULL;
icalcomponent *fb = NULL;
+ int found_user = (-1);
+ struct recptypes *recp = NULL;
+ char buf[SIZ];
+ char host[SIZ];
+ char type[SIZ];
+ int i = 0;
+ int config_lines = 0;
+
+ /* First try an exact match. */
+ found_user = getuser(&usbuf, who);
+
+ /* If not found, try it as an unqualified email address. */
+ if (found_user != 0) {
+ strcpy(buf, who);
+ recp = validate_recipients(buf);
+ lprintf(CTDL_DEBUG, "Trying <%s>\n", buf);
+ if (recp != NULL) {
+ if (recp->num_local == 1) {
+ found_user = getuser(&usbuf, recp->recp_local);
+ }
+ free(recp);
+ }
+ }
- if (getuser(&usbuf, who) != 0) {
+ /* If still not found, try it as an address qualified with the
+ * primary FQDN of this Citadel node.
+ */
+ if (found_user != 0) {
+ snprintf(buf, sizeof buf, "%s@%s", who, config.c_fqdn);
+ lprintf(CTDL_DEBUG, "Trying <%s>\n", buf);
+ recp = validate_recipients(buf);
+ if (recp != NULL) {
+ if (recp->num_local == 1) {
+ found_user = getuser(&usbuf, recp->recp_local);
+ }
+ free(recp);
+ }
+ }
+
+ /* Still not found? Try qualifying it with every domain we
+ * might have addresses in.
+ */
+ if (found_user != 0) {
+ config_lines = num_tokens(inetcfg, '\n');
+ for (i=0; ((i < config_lines) && (found_user != 0)); ++i) {
+ extract_token(buf, inetcfg, i, '\n');
+ extract_token(host, buf, 0, '|');
+ extract_token(type, buf, 1, '|');
+
+ if ( (!strcasecmp(type, "localhost"))
+ || (!strcasecmp(type, "directory")) ) {
+ snprintf(buf, sizeof buf, "%s@%s", who, host);
+ lprintf(CTDL_DEBUG, "Trying <%s>\n", buf);
+ recp = validate_recipients(buf);
+ if (recp != NULL) {
+ if (recp->num_local == 1) {
+ found_user = getuser(&usbuf, recp->recp_local);
+ }
+ free(recp);
+ }
+ }
+ }
+ }
+
+ if (found_user != 0) {
cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
return;
}
return;
}
- lprintf(CTDL_DEBUG, "Adding busy time from events\n");
- CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
- NULL, ical_freebusy_backend, (void *)fb
- );
-
/* Set the method to PUBLISH */
icalcomponent_set_method(fb, ICAL_METHOD_PUBLISH);
/* Set the DTSTAMP to right now. */
icalcomponent_set_dtstamp(fb, icaltime_from_timet(time(NULL), 0));
- /* FIXME we still need (at least) DTSTART, DTEND, and the user's
- * e-mail address as ORGANIZER.
+ /* Add the user's email address as ORGANIZER */
+ sprintf(buf, "MAILTO:%s", who);
+ if (strchr(buf, '@') == NULL) {
+ strcat(buf, "@");
+ strcat(buf, config.c_fqdn);
+ }
+ for (i=0; i<strlen(buf); ++i) {
+ if (buf[i]==' ') buf[i] = '_';
+ }
+ icalcomponent_add_property(fb, icalproperty_new_organizer(buf));
+
+ /* 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
+ );
+
+ /* If values for DTSTART and DTEND are still not present, set them
+ * to yesterday and tomorrow as default values.
*/
+ if (icalcomponent_get_first_property(fb, ICAL_DTSTART_PROPERTY) == NULL) {
+ icalcomponent_set_dtstart(fb, icaltime_from_timet(time(NULL)-86400L, 0));
+ }
+ if (icalcomponent_get_first_property(fb, ICAL_DTEND_PROPERTY) == NULL) {
+ icalcomponent_set_dtend(fb, icaltime_from_timet(time(NULL)+86400L, 0));
+ }
/* Put the freebusy component into the calendar component */
lprintf(CTDL_DEBUG, "Encapsulating\n");
struct visit vbuf;
/* Create the calendar room if it doesn't already exist */
- create_room(USERCALENDARROOM, 4, "", 0, 1, 0);
+ create_room(USERCALENDARROOM, 4, "", 0, 1, 0, VIEW_CALENDAR);
/* Set expiration policy to manual; otherwise objects will be lost! */
if (lgetroom(&qr, USERCALENDARROOM)) {
return;
}
qr.QRep.expire_mode = EXPIRE_MANUAL;
- qr.QRdefaultview = 3; /* 3 = calendar view */
+ qr.QRdefaultview = VIEW_CALENDAR; /* 3 = calendar view */
lputroom(&qr);
/* Set the view to a calendar view */
CtdlGetRelationship(&vbuf, &CC->user, &qr);
- vbuf.v_view = 3; /* 3 = calendar */
+ vbuf.v_view = VIEW_CALENDAR;
CtdlSetRelationship(&vbuf, &CC->user, &qr);
/* Create the tasks list room if it doesn't already exist */
- create_room(USERTASKSROOM, 4, "", 0, 1, 0);
+ create_room(USERTASKSROOM, 4, "", 0, 1, 0, VIEW_TASKS);
/* Set expiration policy to manual; otherwise objects will be lost! */
if (lgetroom(&qr, USERTASKSROOM)) {
return;
}
qr.QRep.expire_mode = EXPIRE_MANUAL;
- qr.QRdefaultview = 4; /* 4 = tasks view */
+ qr.QRdefaultview = VIEW_TASKS;
lputroom(&qr);
/* Set the view to a task list view */
CtdlGetRelationship(&vbuf, &CC->user, &qr);
- vbuf.v_view = 4; /* 4 = tasks */
+ vbuf.v_view = VIEW_TASKS;
+ CtdlSetRelationship(&vbuf, &CC->user, &qr);
+
+ /* Create the notes room if it doesn't already exist */
+ create_room(USERNOTESROOM, 4, "", 0, 1, 0, VIEW_NOTES);
+
+ /* Set expiration policy to manual; otherwise objects will be lost! */
+ if (lgetroom(&qr, USERNOTESROOM)) {
+ lprintf(CTDL_CRIT, "Couldn't get the user calendar room!\n");
+ return;
+ }
+ qr.QRep.expire_mode = EXPIRE_MANUAL;
+ qr.QRdefaultview = VIEW_NOTES;
+ lputroom(&qr);
+
+ /* Set the view to a notes view */
+ CtdlGetRelationship(&vbuf, &CC->user, &qr);
+ vbuf.v_view = VIEW_NOTES;
CtdlSetRelationship(&vbuf, &CC->user, &qr);
return;
* 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,
+ icalproperty_get_comment(p));
}
p = ical_ctdl_get_subprop(cal, ICAL_SUMMARY_PROPERTY);
if (p != NULL) {
- strcpy(imm->subject,
+ strcat(imm->subject, " ");
+ strcat(imm->subject,
icalproperty_get_comment(p));
}
p = ical_ctdl_get_subprop(cal, ICAL_DTSTART_PROPERTY);
/*
* 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;
- /*
- * 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 our room */
- MailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM);
- if (strcasecmp(roomname, CC->room.QRname)) {
- return 0; /* It's not the Calendar room. */
+ /* 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