icalcomponent *cal;
};
-/* Session-local data for calendaring. */
-long SYM_CIT_ICAL;
-
/*
* Utility function to create a new VCALENDAR component with some of the
encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
- lprintf(3, "Error at %s:%d - could not allocate component!\n",
+ lprintf(CTDL_CRIT, "Error at %s:%d - could not allocate component!\n",
__FILE__, __LINE__);
return NULL;
}
*
* 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);
}
strcpy(summary_string, "Calendar item");
if (request == NULL) {
- lprintf(3, "ERROR: trying to reply to NULL event?\n");
+ lprintf(CTDL_ERR, "ERROR: trying to reply to NULL event?\n");
return;
}
the_reply = icalcomponent_new_clone(request);
if (the_reply == NULL) {
- lprintf(3, "ERROR: cannot clone request\n");
+ lprintf(CTDL_ERR, "ERROR: cannot clone request\n");
return;
}
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);
msg = CtdlFetchMessage(msgnum);
if (msg == NULL) {
cprintf("%d Message %ld not found.\n",
- ERROR+ILLEGAL_VALUE,
+ ERROR + ILLEGAL_VALUE,
(long)msgnum
);
return;
/* 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);
return;
}
else {
- cprintf("%d No calendar object found\n", ERROR);
+ cprintf("%d No calendar object found\n", ERROR + ROOM_NOT_FOUND);
return;
}
/* Figure out just what event it is we're dealing with */
strcpy(uid, "--==<< InVaLiD uId >>==--");
ical_learn_uid_of_reply(uid, cal);
- lprintf(9, "UID of event being replied to is <%s>\n", uid);
+ lprintf(CTDL_DEBUG, "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);
- lprintf(3, "cannot get user calendar room\n");
+ if (getroom(&CC->room, USERCALENDARROOM) != 0) {
+ getroom(&CC->room, hold_rm);
+ lprintf(CTDL_CRIT, "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);
+ lprintf(CTDL_DEBUG, "msgnum_being_replaced == %ld\n", msgnum_being_replaced);
if (msgnum_being_replaced == 0) {
return(1); /* no calendar event found */
}
original_event = oec.c;
if (original_event == NULL) {
- lprintf(3, "ERROR: Original_component is NULL.\n");
+ lprintf(CTDL_ERR, "ERROR: Original_component is NULL.\n");
return(2);
}
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,
msg = CtdlFetchMessage(msgnum);
if (msg == NULL) {
cprintf("%d Message %ld not found.\n",
- ERROR+ILLEGAL_VALUE,
+ ERROR + ILLEGAL_VALUE,
(long)msgnum
);
return;
/* Now that we've processed this message, we don't need it
* 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);
return;
}
else {
- cprintf("%d No calendar object found\n", ERROR);
+ cprintf("%d No calendar object found\n", ERROR + ROOM_NOT_FOUND);
return;
}
/*
* 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);
- cprintf("%d You do not have a calendar.\n", ERROR);
+ if (getroom(&CC->room, USERCALENDARROOM) != 0) {
+ getroom(&CC->room, hold_rm);
+ cprintf("%d You do not have a calendar.\n", ERROR + ROOM_NOT_FOUND);
return;
}
);
cprintf("000\n");
- getroom(&CC->quickroom, hold_rm); /* return to saved room */
+ getroom(&CC->room, hold_rm); /* return to saved room */
}
msg = CtdlFetchMessage(msgnum);
if (msg == NULL) {
cprintf("%d Message %ld not found.\n",
- ERROR+ILLEGAL_VALUE,
+ ERROR + ILLEGAL_VALUE,
(long)msgnum
);
return;
return;
}
else {
- cprintf("%d No calendar object found\n", ERROR);
+ cprintf("%d No calendar object found\n", ERROR + ROOM_NOT_FOUND);
return;
}
* 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) {
- cprintf("%d Cannot open calendar\n", ERROR+ROOM_NOT_FOUND);
- getroom(&CC->quickroom, hold_rm);
+ if (getroom(&CC->room, calendar_room_name) != 0) {
+ cprintf("%d Cannot open calendar\n", ERROR + ROOM_NOT_FOUND);
+ getroom(&CC->room, hold_rm);
return;
}
/* Create a VFREEBUSY subcomponent */
- lprintf(9, "Creating VFREEBUSY component\n");
+ lprintf(CTDL_DEBUG, "Creating VFREEBUSY component\n");
fb = icalcomponent_new_vfreebusy();
if (fb == NULL) {
cprintf("%d Internal error: cannot allocate memory.\n",
- ERROR+INTERNAL_ERROR);
+ ERROR + INTERNAL_ERROR);
icalcomponent_free(encaps);
- getroom(&CC->quickroom, hold_rm);
+ getroom(&CC->room, hold_rm);
return;
}
- lprintf(9, "Adding busy time from events\n");
+ lprintf(CTDL_DEBUG, "Adding busy time from events\n");
CtdlForEachMessage(MSGS_ALL, 0, "text/calendar",
NULL, ical_freebusy_backend, (void *)fb
);
- /* FIXME there are still more fields to be added here before we can
- * call this finished. We need a DTSTAMP, and probably the user's
- * e-mail address as an ORGANIZER, and maybe a few others. Add them
- * in this location.
+ /* 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");
+ lprintf(CTDL_DEBUG, "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->quickroom, hold_rm);
+ ERROR + INTERNAL_ERROR);
+ getroom(&CC->room, hold_rm);
return;
}
/* Set the method to PUBLISH */
- lprintf(9, "Setting method\n");
+ lprintf(CTDL_DEBUG, "Setting method\n");
icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
/* Serialize it */
- lprintf(9, "Serializing\n");
+ lprintf(CTDL_DEBUG, "Serializing\n");
serialized_request = strdoop(icalcomponent_as_ical_string(encaps));
icalcomponent_free(encaps); /* Don't need this anymore. */
cprintf("\n000\n");
/* Go back to the room from which we came... */
- getroom(&CC->quickroom, hold_rm);
+ getroom(&CC->room, hold_rm);
}
char action[SIZ];
char who[SIZ];
- if (CtdlAccessCheck(ac_logged_in)) return;
-
extract(subcmd, argbuf, 0);
- if (!strcmp(subcmd, "test")) {
+ /* Allow "test" and "freebusy" subcommands without logging in. */
+
+ if (!strcasecmp(subcmd, "test")) {
cprintf("%d This server supports calendaring\n", CIT_OK);
return;
}
- else if (!strcmp(subcmd, "respond")) {
+ if (!strcasecmp(subcmd, "freebusy")) {
+ extract(who, argbuf, 1);
+ ical_freebusy(who);
+ return;
+ }
+
+ if (!strcasecmp(subcmd, "sgi")) {
+ CIT_ICAL->server_generated_invitations =
+ (extract_int(argbuf, 1) ? 1 : 0) ;
+ cprintf("%d %d\n",
+ CIT_OK, CIT_ICAL->server_generated_invitations);
+ return;
+ }
+
+ if (CtdlAccessCheck(ac_logged_in)) return;
+
+ if (!strcasecmp(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 (!strcasecmp(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 (!strcasecmp(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 */
/* Set expiration policy to manual; otherwise objects will be lost! */
if (lgetroom(&qr, USERCALENDARROOM)) {
- lprintf(3, "Couldn't get the user calendar room!\n");
+ lprintf(CTDL_CRIT, "Couldn't get the user calendar room!\n");
return;
}
qr.QRep.expire_mode = EXPIRE_MANUAL;
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);
/* Set expiration policy to manual; otherwise objects will be lost! */
if (lgetroom(&qr, USERTASKSROOM)) {
- lprintf(3, "Couldn't get the user calendar room!\n");
+ lprintf(CTDL_CRIT, "Couldn't get the user calendar room!\n");
return;
}
qr.QRep.expire_mode = EXPIRE_MANUAL;
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;
}
icalproperty *summary = NULL;
if (cal == NULL) {
- lprintf(3, "ERROR: trying to reply to NULL event?\n");
+ lprintf(CTDL_ERR, "ERROR: trying to reply to NULL event?\n");
return;
}
/* Clone the event */
the_request = icalcomponent_new_clone(cal);
if (the_request == NULL) {
- lprintf(3, "ERROR: cannot clone calendar object\n");
+ lprintf(CTDL_ERR, "ERROR: cannot clone calendar object\n");
return;
}
strcpy(this_attendee, icalproperty_get_attendee(attendee) );
if (!strncasecmp(this_attendee, "MAILTO:", 7)) {
strcpy(this_attendee, &this_attendee[7]);
- snprintf(&attendees_string[strlen(attendees_string)],
- sizeof(attendees_string) - strlen(attendees_string),
- "%s, ",
- this_attendee
- );
- ++num_attendees;
+
+ if (!CtdlIsMe(this_attendee)) { /* don't send an invitation to myself! */
+ snprintf(&attendees_string[strlen(attendees_string)],
+ sizeof(attendees_string) - strlen(attendees_string),
+ "%s, ",
+ this_attendee
+ );
+ ++num_attendees;
+ }
}
}
}
- lprintf(9, "<%d> attendees: <%s>\n", num_attendees, attendees_string);
+ lprintf(CTDL_DEBUG, "<%d> attendees: <%s>\n", num_attendees, attendees_string);
/* If there are no attendees, there are no invitations to send, so...
* don't bother putting one together! Punch out, Maverick!
/* Encapsulate the VEVENT component into a complete VCALENDAR */
encaps = icalcomponent_new_vcalendar();
if (encaps == NULL) {
- lprintf(3, "Error at %s:%d - could not allocate component!\n",
+ lprintf(CTDL_DEBUG, "Error at %s:%d - could not allocate component!\n",
__FILE__, __LINE__);
icalcomponent_free(the_request);
return;
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);
icalproperty *organizer = NULL;
char organizer_string[SIZ];
+ /* Don't send out invitations unless the client wants us to. */
+ if (CIT_ICAL->server_generated_invitations == 0) {
+ return;
+ }
+
/* Don't send out invitations if we've been asked not to. */
- lprintf(9, "CIT_ICAL->avoid_sending_invitations = %d\n",
- CIT_ICAL->avoid_sending_invitations);
if (CIT_ICAL->avoid_sending_invitations > 0) {
return;
}
*/
/* 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. */
}
}
/* Oops! No Content-Type in this message! How'd that happen? */
- lprintf(7, "RFC822 message with no Content-Type header!\n");
+ lprintf(CTDL_ERR, "RFC822 message with no Content-Type header!\n");
return 1;
}
*/
/* 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. */
}
}
/* Oops! No Content-Type in this message! How'd that happen? */
- lprintf(7, "RFC822 message with no Content-Type header!\n");
+ lprintf(CTDL_ERR, "RFC822 message with no Content-Type header!\n");
return 1;
}
char *serv_calendar_init(void)
{
#ifdef CITADEL_WITH_CALENDAR_SERVICE
- SYM_CIT_ICAL = CtdlGetDynamicSymbol();
CtdlRegisterMessageHook(ical_obj_beforesave, EVT_BEFORESAVE);
CtdlRegisterMessageHook(ical_obj_aftersave, EVT_AFTERSAVE);
CtdlRegisterSessionHook(ical_create_room, EVT_LOGIN);
projects / citadel.git / blobdiff