The server command 'ICAL report' is now 'ICAL query' with the intent that
it will handle CalDAV 'calendar-query' REPORTs, but not other REPORTs.
Likewise, functions with names including the string 'calendar_report' have
been changed to 'calendar_query'.
#include "serv_calendar.h"
#include "serv_calendar.h"
-// CtdlForEachMessage callback for calendar_report()
-void calendar_report_backend(long msgnum, void *data) {
+// CtdlForEachMessage callback for calendar_query()
+void calendar_query_backend(long msgnum, void *data) {
struct CtdlMessage *msg = NULL;
struct ical_respond_data ird;
struct CtdlMessage *msg = NULL;
struct ical_respond_data ird;
- syslog(LOG_DEBUG, "calendar_report: calendar_report_backend(%ld)", msgnum);
+ syslog(LOG_DEBUG, "calendar_query: calendar_query_backend(%ld)", msgnum);
// Look for the calendar event...
msg = CtdlFetchMessage(msgnum, 1);
// Look for the calendar event...
msg = CtdlFetchMessage(msgnum, 1);
// Go through a calendar room and output calendar objects after applying caller specified filters.
// It is intended as a data source for WebCit (both the UI and CalDAV)
// Go through a calendar room and output calendar objects after applying caller specified filters.
// It is intended as a data source for WebCit (both the UI and CalDAV)
-void calendar_report(void) {
+void calendar_query(void) {
void *filter_rules; // Don't know yet what form this will take
// Only allow this operation if we're in a room containing a calendar or tasks view
void *filter_rules; // Don't know yet what form this will take
// Only allow this operation if we're in a room containing a calendar or tasks view
CtdlForEachMessage(MSGS_ALL, 0, NULL,
NULL,
NULL,
CtdlForEachMessage(MSGS_ALL, 0, NULL,
NULL,
NULL,
- calendar_report_backend,
+ calendar_query_backend,
// All other commands require a user to be logged in.
if (CtdlAccessCheck(ac_logged_in)) return;
// All other commands require a user to be logged in.
if (CtdlAccessCheck(ac_logged_in)) return;
- if (!strcasecmp(subcmd, "report")) {
- calendar_report();
+ if (!strcasecmp(subcmd, "query")) {
+ calendar_query();
// Everything below was generated by `cproto *.c 2>/dev/null`
// Everything below was generated by `cproto *.c 2>/dev/null`
-// calendar_report.c
-void calendar_report_backend(long msgnum, void *data);
-void calendar_report(void);
+// calendar_query.c
+void calendar_query_backend(long msgnum, void *data);
+void calendar_query(void);
// serv_calendar.c
icalcomponent *icalcomponent_new_citadel_vcalendar(void);
// serv_calendar.c
icalcomponent *icalcomponent_new_citadel_vcalendar(void);