Experimenting with the code layout for calendar report handling.

[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 2569fb5dd43d22ffcc7c29c8338a55dfc68602a2..ac9d74465a993c258a75ee76204b5fec95a21c94 100644 (file)
--- a/citadel/server/modules/calendar/serv_calendar.c
+++ b/citadel/server/modules/calendar/serv_calendar.c
@@ -2327,27 +2327,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) {
-       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];
@@ -2381,7 +2360,7 @@ void cmd_ical(char *argbuf) {
        if (CtdlAccessCheck(ac_logged_in)) return;
 
        if (!strcasecmp(subcmd, "report")) {
-               ical_report();
+               calendar_report();
                return;
        }