// This program is open source software. Use, duplication, or disclosure
// are subject to the terms of the GNU General Public License version 3.
-#define PRODID "-//Citadel//NONSGML Citadel Calendar//EN"
-
-#include "../../ctdl_module.h"
#include <libical/ical.h>
+#include "../../ctdl_module.h"
#include "../../msgbase.h"
#include "../../internet_addressing.h"
-#include "serv_calendar.h"
#include "../../room_ops.h"
#include "../../euidindex.h"
#include "../../default_timezone.h"
#include "../../config.h"
-
-struct ical_respond_data {
- char desired_partnum[SIZ];
- icalcomponent *cal;
-};
-
+#include "serv_calendar.h"
// Utility function to create a new VCALENDAR component with some of the
// required fields already set the way we like them.
// If the caller did not supply a user, write to the currently selected room
if (!u) {
- struct CitContext *CCC = CC;
StrBuf *MsgBody;
msg = malloc(sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg->cm_anon_type = MES_NORMAL;
msg->cm_format_type = 4;
- CM_SetField(msg, eAuthor, CCC->user.fullname);
- CM_SetField(msg, eOriginalRoom, CCC->room.QRname);
+ CM_SetField(msg, eAuthor, CC->user.fullname);
+ CM_SetField(msg, eOriginalRoom, CC->room.QRname);
MsgBody = NewStrBufPlain(NULL, serlen + 100);
StrBufAppendBufPlain(MsgBody, HKEY("Content-type: text/calendar\r\n\r\n"), 0);
if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
safestrncpy(attendee_string, ch + 7, sizeof (attendee_string));
string_trim(attendee_string);
- recp = validate_recipients(attendee_string, NULL, 0);
+ recp = validate_recipients(attendee_string, 0);
if (recp != NULL) {
if (!strcasecmp(recp->recp_local, CC->user.fullname)) {
if (me_attend) icalproperty_free(me_attend);
);
if (msg != NULL) {
- valid = validate_recipients(organizer_string, NULL, 0);
+ valid = validate_recipients(organizer_string, 0);
CtdlSubmitMsg(msg, valid, "");
CM_Free(msg);
free_recipients(valid);
}
-// 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,
- struct icaltimetype t1end,
- struct icaltimetype t2start,
- struct icaltimetype t2end
-) {
- if (icaltime_is_null_time(t1start)) return(0);
- if (icaltime_is_null_time(t2start)) return(0);
-
- // if either event lacks end time, assume end = start
- if (icaltime_is_null_time(t1end)) {
- memcpy(&t1end, &t1start, sizeof(struct icaltimetype));
- }
- else {
- if (t1end.is_date && icaltime_compare(t1start, t1end)) {
-
- // the end date is non-inclusive so adjust it by one
- // day because our test is inclusive, note that a day is
- // not too much because we are talking about all day
- // events
- // if start = end we assume that nevertheless the whole
- // day is meant
-
- icaltime_adjust(&t1end, -1, 0, 0, 0);
- }
- }
-
- if (icaltime_is_null_time(t2end))
- memcpy(&t2end, &t2start, sizeof(struct icaltimetype));
- else {
- if (t2end.is_date && icaltime_compare(t2start, t2end)) {
- icaltime_adjust(&t2end, -1, 0, 0, 0);
- }
- }
-
- // First, check for all-day events
- if (t1start.is_date || t2start.is_date) {
- // If event 1 ends before event 2 starts, we're in the clear.
- if (icaltime_compare_date_only(t1end, t2start) < 0) return(0);
-
- // If event 2 ends before event 1 starts, we're also ok.
- if (icaltime_compare_date_only(t2end, t1start) < 0) return(0);
-
- return(1);
- }
-
- // syslog(LOG_DEBUG, "Comparing t1start %d:%d t1end %d:%d t2start %d:%d t2end %d:%d",
- // t1start.hour, t1start.minute, t1end.hour, t1end.minute,
- // t2start.hour, t2start.minute, t2end.hour, t2end.minute);
-
- // Now check for overlaps using date *and* time.
-
- // If event 1 ends before event 2 starts, we're in the clear.
- if (icaltime_compare(t1end, t2start) <= 0) return(0);
- // syslog(LOG_DEBUG, "calendar: first passed");
-
- // If event 2 ends before event 1 starts, we're also ok.
- if (icaltime_compare(t2end, t1start) <= 0) return(0);
- // syslog(LOG_DEBUG, "calendar: second passed");
-
- // Otherwise, they overlap.
- return(1);
-}
-
-
// Phase 6 of "hunt for conflicts"
// called by ical_conflicts_phase5()
//
// If not found, try it as an unqualified email address.
if (found_user != 0) {
strcpy(buf, who);
- recp = validate_recipients(buf, NULL, 0);
+ recp = validate_recipients(buf, 0);
syslog(LOG_DEBUG, "calendar: trying <%s>", buf);
if (recp != NULL) {
if (recp->num_local == 1) {
if (found_user != 0) {
snprintf(buf, sizeof buf, "%s@%s", who, CtdlGetConfigStr("c_fqdn"));
syslog(LOG_DEBUG, "calendar: trying <%s>", buf);
- recp = validate_recipients(buf, NULL, 0);
+ recp = validate_recipients(buf, 0);
if (recp != NULL) {
if (recp->num_local == 1) {
found_user = CtdlGetUser(&usbuf, recp->recp_local);
) {
snprintf(buf, sizeof buf, "%s@%s", who, host);
syslog(LOG_DEBUG, "calendar: trying <%s>", buf);
- recp = validate_recipients(buf, NULL, 0);
+ recp = validate_recipients(buf, 0);
if (recp != NULL) {
if (recp->num_local == 1) {
found_user = CtdlGetUser(&usbuf, recp->recp_local);
if (ird.cal == NULL) return;
- // Here we go: put the VEVENT into the VCALENDAR. We now no longer
- // are responsible for "the_request"'s memory -- it will be freed
- // when we free "encaps".
+ // Here we go: put the VEVENT componment into the VCALENDAR container.
- // If the top-level component is *not* a VCALENDAR, we can drop it right in.
- // This will almost never happen.
+ // If the top-level component is *not* a VCALENDAR container, we can drop it right in.
+ // This is rare but we have to be able to handle it.
if (icalcomponent_isa(ird.cal) != ICAL_VCALENDAR_COMPONENT) {
icalcomponent_add_component(encaps, ird.cal);
+ // And now, the parent VCALENDAR container owns the child component's memory.
}
- // In the more likely event that we're looking at a VCALENDAR with the VEVENT
- // and other components encapsulated inside, we have to extract them.
+ // In the more likely event that we're looking at a VCALENDAR container with the VEVENT
+ // and other components encapsulated inside, we have to extract them first.
else {
for (c = icalcomponent_get_first_component(ird.cal, ICAL_ANY_COMPONENT);
(c != NULL);
c = icalcomponent_get_next_component(ird.cal, ICAL_ANY_COMPONENT)
) {
-
// For VTIMEZONE components, suppress duplicates of the same tzid
-
if (icalcomponent_isa(c) == ICAL_VTIMEZONE_COMPONENT) {
icalproperty *p = icalcomponent_get_first_property(c, ICAL_TZID_PROPERTY);
if (p) {
const char *tzid = icalproperty_get_tzid(p);
if (!icalcomponent_get_timezone(encaps, tzid)) {
- icalcomponent_add_component(encaps,
- icalcomponent_new_clone(c));
+ icalcomponent_add_component(encaps, icalcomponent_new_clone(c));
}
}
}
icalcomponent_add_component(encaps, icalcomponent_new_clone(c));
}
}
- icalcomponent_free(ird.cal);
+ icalcomponent_free(ird.cal); // we cloned this component so free the original.
}
}
);
if (msg != NULL) {
- valid = validate_recipients(attendees_string, NULL, 0);
+ valid = validate_recipients(attendees_string, 0);
CtdlSubmitMsg(msg, valid, "");
CM_Free(msg);
free_recipients(valid);
}
-// This is an experimental implementation of CALDAV REPORT operations (RFC 4791 section 7)
-// fundamentally handled in the Citadel Server. A web implementation should be able to just
-// change the encapsulation to HTTP with the data format unchanged.
-void ical_report(void) {
- char buf[SIZ];
-
- // Only allow this operation if we're in a room containing a calendar or tasks view
- if ( (CC->room.QRdefaultview != VIEW_CALENDAR)
- && (CC->room.QRdefaultview != VIEW_TASKS)
- ) {
- cprintf("%d Not a calendar room\n", ERROR+NOT_HERE);
- return; // This room does not contain a calendar.
- }
-
- cprintf("%d Send query then receive response\n", SEND_THEN_RECV);
- while(client_getln(buf, sizeof buf) >= 0 && strcmp(buf,"000")) {
- }
- cprintf("000\n");
-}
-
-
// All Citadel calendar commands from the client come through here.
void cmd_ical(char *argbuf) {
char subcmd[64];
char partnum[256];
char action[256];
char who[256];
+ char coll[1024];
extract_token(subcmd, argbuf, 0, '|', sizeof subcmd);
// All other commands require a user to be logged in.
if (CtdlAccessCheck(ac_logged_in)) return;
- if (!strcasecmp(subcmd, "report")) {
- ical_report();
- return;
- }
-
if (!strcasecmp(subcmd, "respond")) {
msgnum = extract_long(argbuf, 1);
extract_token(partnum, argbuf, 2, '|', sizeof partnum);
projects / citadel.git / blobdiff