// 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 (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.
}
}
icalcomponent *encaps = NULL;
char *ser = NULL;
+ // 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)
+ && (CC->room.QRdefaultview != VIEW_TASKS)
) {
cprintf("%d Not a calendar room\n", ERROR+NOT_HERE);
return; // This room does not contain a calendar.
&& (CC->room.QRdefaultview != VIEW_TASKS)
) {
cprintf("%d Not a calendar room\n", ERROR+NOT_HERE);
- return;
+ return; // This room does not contain a calendar.
}
// Only allow this operation if we have permission to overwrite the existing calendar
}
-// 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) {
- cprintf("%d Hi from Citadel\n", CIT_OK);
-}
-
-
// 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