icalcomponent *icalcomponent_new_citadel_vcalendar(void) {
icalcomponent *encaps;
- encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
+ encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
lprintf(3, "Error at %s:%d - could not allocate component!\n",
__FILE__, __LINE__);
/* Set the Version Number */
icalcomponent_add_property(encaps, icalproperty_new_version("2.0"));
+
+ return(encaps);
}
*
* ok
*/
-void ical_write_to_cal(struct usersupp *u, icalcomponent *cal) {
+void ical_write_to_cal(struct ctdluser *u, icalcomponent *cal) {
char temp[PATH_MAX];
FILE *fp;
char *ser;
*/
if (icalcomponent_isa(cal) == ICAL_VEVENT_COMPONENT) {
- ical_write_to_cal(&CC->usersupp, cal);
+ ical_write_to_cal(&CC->user, cal);
}
striplt(attendee_string);
recp = validate_recipients(attendee_string);
if (recp != NULL) {
- if (!strcasecmp(recp->recp_local, CC->usersupp.fullname)) {
+ if (!strcasecmp(recp->recp_local, CC->user.fullname)) {
if (me_attend) icalproperty_free(me_attend);
me_attend = icalproperty_new_clone(attendee);
}
serialized_reply
);
- msg = CtdlMakeMessage(&CC->usersupp, organizer_string,
- CC->quickroom.QRname, 0, FMT_RFC822,
+ msg = CtdlMakeMessage(&CC->user, organizer_string,
+ CC->room.QRname, 0, FMT_RFC822,
"",
summary_string, /* Use summary for subject */
reply_message_text);
/* Now that we've processed this message, we don't need it
* anymore. So delete it.
*/
- CtdlDeleteMessages(CC->quickroom.QRname, msgnum, "");
+ CtdlDeleteMessages(CC->room.QRname, msgnum, "");
/* Free the memory we allocated and return a response. */
icalcomponent_free(ird.cal);
ical_learn_uid_of_reply(uid, cal);
lprintf(9, "UID of event being replied to is <%s>\n", uid);
- strcpy(hold_rm, CC->quickroom.QRname); /* save current room */
+ strcpy(hold_rm, CC->room.QRname); /* save current room */
- if (getroom(&CC->quickroom, USERCALENDARROOM) != 0) {
- getroom(&CC->quickroom, hold_rm);
+ if (getroom(&CC->room, USERCALENDARROOM) != 0) {
+ getroom(&CC->room, hold_rm);
lprintf(3, "cannot get user calendar room\n");
return(2);
}
CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
template, ical_hunt_for_event_to_update, &msgnum_being_replaced);
CtdlFreeMessage(template);
- getroom(&CC->quickroom, hold_rm); /* return to saved room */
+ getroom(&CC->room, hold_rm); /* return to saved room */
lprintf(9, "msgnum_being_replaced == %ld\n", msgnum_being_replaced);
if (msgnum_being_replaced == 0) {
icalcomponent_free(original_event); /* Don't need this anymore. */
if (serialized_event == NULL) return(2);
- MailboxName(roomname, sizeof roomname, &CC->usersupp, USERCALENDARROOM);
+ MailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM);
message_text = mallok(strlen(serialized_event) + SIZ);
if (message_text != NULL) {
serialized_event
);
- msg = CtdlMakeMessage(&CC->usersupp,
+ msg = CtdlMakeMessage(&CC->user,
"", /* No recipient */
roomname,
0, FMT_RFC822,
}
/* Now that we've processed this message, we don't need it
- * anymore. So delete it. FIXME uncomment this when ready!
+ * anymore. So delete it. (Maybe make this optional?)
*/
- CtdlDeleteMessages(CC->quickroom.QRname, msgnum, "");
+ CtdlDeleteMessages(CC->room.QRname, msgnum, "");
/* Free the memory we allocated and return a response. */
icalcomponent_free(ird.cal);
/*
* Check to see if two events overlap. Returns nonzero if they do.
+ * (This function is used in both Citadel and WebCit. If you change it in
+ * one place, change it in the other. Better yet, put it in a library.)
*/
int ical_ctdl_is_overlap(
struct icaltimetype t1start,
void ical_hunt_for_conflicts(icalcomponent *cal) {
char hold_rm[ROOMNAMELEN];
- strcpy(hold_rm, CC->quickroom.QRname); /* save current room */
+ strcpy(hold_rm, CC->room.QRname); /* save current room */
- if (getroom(&CC->quickroom, USERCALENDARROOM) != 0) {
- getroom(&CC->quickroom, hold_rm);
+ if (getroom(&CC->room, USERCALENDARROOM) != 0) {
+ getroom(&CC->room, hold_rm);
cprintf("%d You do not have a calendar.\n", ERROR);
return;
}
);
cprintf("000\n");
- getroom(&CC->quickroom, hold_rm); /* return to saved room */
+ getroom(&CC->room, hold_rm); /* return to saved room */
}
/*
- * Remove all properties from a VEVENT that are not supplying the
- * bare minimum for free/busy data.
+ * Look for busy time in a VEVENT and add it to the supplied VFREEBUSY.
*/
-void ical_freebusy_strip(icalcomponent *cal) {
-
+void ical_add_to_freebusy(icalcomponent *fb, icalcomponent *cal) {
icalproperty *p;
- int did_something = 1;
+ icalvalue *v;
+ struct icalperiodtype my_period;
if (cal == NULL) return;
+ my_period = icalperiodtype_null_period();
if (icalcomponent_isa(cal) != ICAL_VEVENT_COMPONENT) {
- ical_freebusy_strip(
+ ical_add_to_freebusy(fb,
icalcomponent_get_first_component(
cal, ICAL_VEVENT_COMPONENT
)
ical_dezonify(cal);
- while (did_something) {
- did_something = 0;
- for ( p=icalcomponent_get_first_property
- (cal, ICAL_ANY_PROPERTY);
- p != NULL;
- p = icalcomponent_get_next_property
- (cal, ICAL_ANY_PROPERTY)
- ) {
-
- if (
- (icalproperty_isa(p)==ICAL_DTSTART_PROPERTY)
- || (icalproperty_isa(p)==ICAL_DTEND_PROPERTY)
- || (icalproperty_isa(p)==ICAL_DURATION_PROPERTY)
- || (icalproperty_isa(p)==ICAL_FREEBUSY_PROPERTY)
- || (icalproperty_isa(p)==ICAL_TRANSP_PROPERTY)
- ) {
- /* keep it */
- }
- else {
- /* delete it */
- icalcomponent_remove_property(cal, p);
- icalproperty_free(p);
- did_something = 1;
+ /* If this event is not opaque, the user isn't publishing it as
+ * busy time, so don't bother doing anything else.
+ */
+ p = icalcomponent_get_first_property(cal, ICAL_TRANSP_PROPERTY);
+ if (p != NULL) {
+ v = icalproperty_get_value(p);
+ if (v != NULL) {
+ if (icalvalue_get_transp(v) != ICAL_TRANSP_OPAQUE) {
+ return;
}
-
}
}
+ /* Convert the DTSTART and DTEND properties to an icalperiod. */
+ p = icalcomponent_get_first_property(cal, ICAL_DTSTART_PROPERTY);
+ if (p != NULL) {
+ my_period.start = icalproperty_get_dtstart(p);
+ }
+
+ p = icalcomponent_get_first_property(cal, ICAL_DTEND_PROPERTY);
+ if (p != NULL) {
+ my_period.end = icalproperty_get_dtstart(p);
+ }
+
+ /* Now add it. */
+ icalcomponent_add_property(fb,
+ icalproperty_new_freebusy(my_period)
+ );
+
}
if (ird.cal == NULL) return;
- /* FIXME ... now extract ird.cal's FREEBUSY info, and add to cal. */
+ ical_add_to_freebusy(cal, ird.cal);
/* Now free the memory. */
icalcomponent_free(ird.cal);
* Grab another user's free/busy times
*/
void ical_freebusy(char *who) {
- struct usersupp usbuf;
+ struct ctdluser usbuf;
char calendar_room_name[ROOMNAMELEN];
char hold_rm[ROOMNAMELEN];
char *serialized_request = NULL;
MailboxName(calendar_room_name, sizeof calendar_room_name,
&usbuf, USERCALENDARROOM);
- strcpy(hold_rm, CC->quickroom.QRname); /* save current room */
+ strcpy(hold_rm, CC->room.QRname); /* save current room */
- if (getroom(&CC->quickroom, USERCALENDARROOM) != 0) {
+ if (getroom(&CC->room, calendar_room_name) != 0) {
cprintf("%d Cannot open calendar\n", ERROR+ROOM_NOT_FOUND);
- getroom(&CC->quickroom, hold_rm);
- return;
- }
-
-
- /* Create a VCALENDAR in which we will encapsulate all the VFREEBUSYs */
- encaps = icalcomponent_new_citadel_vcalendar();
- if (encaps == NULL) {
- cprintf("%d Internal error: cannot allocate memory.\n",
- ERROR+INTERNAL_ERROR);
- getroom(&CC->quickroom, hold_rm);
+ getroom(&CC->room, hold_rm);
return;
}
/* Create a VFREEBUSY subcomponent */
- fb = icalcomponent_new(ICAL_VFREEBUSY_COMPONENT);
+ lprintf(9, "Creating VFREEBUSY component\n");
+ fb = icalcomponent_new_vfreebusy();
if (fb == NULL) {
cprintf("%d Internal error: cannot allocate memory.\n",
ERROR+INTERNAL_ERROR);
icalcomponent_free(encaps);
- getroom(&CC->quickroom, hold_rm);
+ getroom(&CC->room, hold_rm);
return;
}
- /* Put the freebusy component into the calendar component */
- icalcomponent_add_component(encaps, fb);
-
+ lprintf(9, "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.
+ */
+
+ /* Put the freebusy component into the calendar component */
+ lprintf(9, "Encapsulating\n");
+ encaps = ical_encapsulate_subcomponent(fb);
+ if (encaps == NULL) {
+ icalcomponent_free(fb);
+ cprintf("%d Internal error: cannot allocate memory.\n",
+ ERROR+INTERNAL_ERROR);
+ getroom(&CC->room, hold_rm);
+ return;
+ }
+
+ /* Set the method to PUBLISH */
+ lprintf(9, "Setting method\n");
+ icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
+
/* Serialize it */
+ lprintf(9, "Serializing\n");
serialized_request = strdoop(icalcomponent_as_ical_string(encaps));
icalcomponent_free(encaps); /* Don't need this anymore. */
cprintf("%d Here is the free/busy data:\n", LISTING_FOLLOWS);
if (serialized_request != NULL) {
client_write(serialized_request, strlen(serialized_request));
+ phree(serialized_request);
}
cprintf("\n000\n");
/* Go back to the room from which we came... */
- getroom(&CC->quickroom, hold_rm);
-
- cprintf("%d not implemented yet\n", ERROR);
+ getroom(&CC->room, hold_rm);
}
char action[SIZ];
char who[SIZ];
- if (CtdlAccessCheck(ac_logged_in)) return;
-
extract(subcmd, argbuf, 0);
+ /* Allow "test" and "freebusy" subcommands without logging in. */
+
if (!strcmp(subcmd, "test")) {
cprintf("%d This server supports calendaring\n", CIT_OK);
return;
}
- else if (!strcmp(subcmd, "respond")) {
+ if (!strcmp(subcmd, "freebusy")) {
+ extract(who, argbuf, 1);
+ ical_freebusy(who);
+ return;
+ }
+
+ if (CtdlAccessCheck(ac_logged_in)) return;
+
+ if (!strcmp(subcmd, "respond")) {
msgnum = extract_long(argbuf, 1);
extract(partnum, argbuf, 2);
extract(action, argbuf, 3);
ical_respond(msgnum, partnum, action);
+ return;
}
- else if (!strcmp(subcmd, "handle_rsvp")) {
+ if (!strcmp(subcmd, "handle_rsvp")) {
msgnum = extract_long(argbuf, 1);
extract(partnum, argbuf, 2);
extract(action, argbuf, 3);
ical_handle_rsvp(msgnum, partnum, action);
+ return;
}
- else if (!strcmp(subcmd, "conflicts")) {
+ if (!strcmp(subcmd, "conflicts")) {
msgnum = extract_long(argbuf, 1);
extract(partnum, argbuf, 2);
ical_conflicts(msgnum, partnum);
- }
-
- else if (!strcmp(subcmd, "freebusy")) {
- extract(who, argbuf, 1);
- ical_freebusy(who);
- }
-
- else {
- cprintf("%d Invalid subcommand\n", ERROR+CMD_NOT_SUPPORTED);
return;
}
- /* should never get here */
+ cprintf("%d Invalid subcommand\n", ERROR+CMD_NOT_SUPPORTED);
}
*/
void ical_create_room(void)
{
- struct quickroom qr;
+ struct ctdlroom qr;
struct visit vbuf;
/* Create the calendar room if it doesn't already exist */
lputroom(&qr);
/* Set the view to a calendar view */
- CtdlGetRelationship(&vbuf, &CC->usersupp, &qr);
+ CtdlGetRelationship(&vbuf, &CC->user, &qr);
vbuf.v_view = 3; /* 3 = calendar */
- CtdlSetRelationship(&vbuf, &CC->usersupp, &qr);
+ CtdlSetRelationship(&vbuf, &CC->user, &qr);
/* Create the tasks list room if it doesn't already exist */
create_room(USERTASKSROOM, 4, "", 0, 1, 0);
lputroom(&qr);
/* Set the view to a task list view */
- CtdlGetRelationship(&vbuf, &CC->usersupp, &qr);
+ CtdlGetRelationship(&vbuf, &CC->user, &qr);
vbuf.v_view = 4; /* 4 = tasks */
- CtdlSetRelationship(&vbuf, &CC->usersupp, &qr);
+ CtdlSetRelationship(&vbuf, &CC->user, &qr);
return;
}
}
/* Encapsulate the VEVENT component into a complete VCALENDAR */
- encaps = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
+ encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
lprintf(3, "Error at %s:%d - could not allocate component!\n",
__FILE__, __LINE__);
serialized_request
);
- msg = CtdlMakeMessage(&CC->usersupp,
+ msg = CtdlMakeMessage(&CC->user,
"", /* No single recipient here */
- CC->quickroom.QRname, 0, FMT_RFC822,
+ CC->room.QRname, 0, FMT_RFC822,
"",
summary_string, /* Use summary for subject */
request_message_text);
*/
/* First determine if this is our room */
- MailboxName(roomname, sizeof roomname, &CC->usersupp, USERCALENDARROOM);
- if (strcasecmp(roomname, CC->quickroom.QRname)) {
+ 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 our room */
- MailboxName(roomname, sizeof roomname, &CC->usersupp, USERCALENDARROOM);
- if (strcasecmp(roomname, CC->quickroom.QRname)) {
+ MailboxName(roomname, sizeof roomname, &CC->user, USERCALENDARROOM);
+ if (strcasecmp(roomname, CC->room.QRname)) {
return 0; /* It's not the Calendar room. */
}
projects / citadel.git / blobdiff