Noodling on calendar query commands.

[citadel.git] / citadel / server / modules / calendar / serv_calendar.c

diff --git a/citadel/server/modules/calendar/serv_calendar.c b/citadel/server/modules/calendar/serv_calendar.c
index 6b05678a079c5215d9eb2c9f1d91153463599a57..39b62880af38f638661d67363df9993ade4866b8 100644 (file)
--- a/citadel/server/modules/calendar/serv_calendar.c
+++ b/citadel/server/modules/calendar/serv_calendar.c
@@ -7,23 +7,15 @@
 // 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.
@@ -1498,33 +1490,29 @@ void ical_getics_backend(long msgnum, void *data) {
 
        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));
                                        }
                                }
                        }
@@ -1534,7 +1522,7 @@ void ical_getics_backend(long msgnum, void *data) {
                                icalcomponent_add_component(encaps, icalcomponent_new_clone(c));
                        }
                }
-               icalcomponent_free(ird.cal);
+               icalcomponent_free(ird.cal);            // we cloned this component so free the original.
        }
 }
 
@@ -1545,8 +1533,9 @@ void ical_getics(void) {
        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.
@@ -1617,7 +1606,7 @@ void ical_putics(void) {
                && (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
@@ -2326,14 +2315,6 @@ void ical_fixed_output(char *ptr, int len) {
 }
 
 
-// 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];
@@ -2366,8 +2347,8 @@ void cmd_ical(char *argbuf) {
        // All other commands require a user to be logged in.
        if (CtdlAccessCheck(ac_logged_in)) return;
 
-       if (!strcasecmp(subcmd, "report")) {
-               ical_report();
+       if (!strcasecmp(subcmd, "query")) {
+               calendar_query();
                return;
        }