From bd435f1cde6721e2173619c881e2af8637c85482 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 22 Dec 2023 10:52:57 -0500 Subject: [PATCH] Changed the arrangement of bytes in the universe --- webcit-ng/Makefile | 5 +++++ webcit-ng/api.txt | 6 ++++-- webcit-ng/server/caldav_reports.c | 2 +- webcit-ng/server/room_functions.c | 5 +++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/webcit-ng/Makefile b/webcit-ng/Makefile index 8c8e317fe..c29a595c8 100644 --- a/webcit-ng/Makefile +++ b/webcit-ng/Makefile @@ -1,3 +1,8 @@ +# Copyright (c) 1996-2023 by the citadel.org team +# +# This program is open source software. Use, duplication, or +# disclosure are subject to the GNU General Public License v3. + CFLAGS := $(CFLAGS) -ggdb -Wno-format-truncation LDFLAGS := $(LDFLAGS) diff --git a/webcit-ng/api.txt b/webcit-ng/api.txt index 378b5b59a..8660c8f2c 100644 --- a/webcit-ng/api.txt +++ b/webcit-ng/api.txt @@ -1,7 +1,9 @@ Method URL Function ------ ------------------------------ ------------------------------------- GET / Site root will redirect to a landing page + GET /ctdl/f/ returns a JSON-encoded list of accessible floors + GET /ctdl/r/ returns a JSON-encoded list of accessible rooms OPTIONS /ctdl/r// returns just what you'd expect PROPFIND /ctdl/r// Show a bunch of crap @@ -14,8 +16,8 @@ GET /ctdl/r//stat JSON dictionary of the server GET /ctdl/r// Retrieve the content of an individual message GET /ctdl/r///json Retrieve an individual message in a room, encapsulated in JSON GET /ctdl/r/// Retrieve a MIME component of a message, specified by partnum -DELETE /ctdl/r// Deletes a message from a room -MOVE /ctdl/r// Moves a message to another room (requires Destination) +DELETE /ctdl/r// Delete a message from a room +MOVE /ctdl/r// Move a message to another room (requires Destination) PUT /ctdl/r// DAV operation to insert a new message into a room Accepted parameters: diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c index dbaa9c597..d30894968 100644 --- a/webcit-ng/server/caldav_reports.c +++ b/webcit-ng/server/caldav_reports.c @@ -145,7 +145,7 @@ StrBuf *fetch_ical(struct ctdlsession * c, long msgnum) { // Called by caldav_report() to output a single item. // Our policy is to throw away the list of properties the client asked for, and just send everything. -void caldav_response(struct http_transaction *h, struct ctdlsession *c, StrBuf * ReportOut, StrBuf * ThisHref) { +void caldav_response(struct http_transaction *h, struct ctdlsession *c, StrBuf *ReportOut, StrBuf *ThisHref) { long msgnum; StrBuf *Caldata = NULL; char *euid; diff --git a/webcit-ng/server/room_functions.c b/webcit-ng/server/room_functions.c index a58197120..8d8ca3bcc 100644 --- a/webcit-ng/server/room_functions.c +++ b/webcit-ng/server/room_functions.c @@ -422,9 +422,10 @@ void propfind_the_room_itself(struct http_transaction *h, struct ctdlsession *c) if (msglist) { int i; for (i = 0; (msglist[i] > 0); ++i) { - if ((i % 10) == 0) + if ((i % 10) == 0) { syslog(LOG_DEBUG, "PROPFIND enumerated %d messages", i); - e = NULL; // EUID gets stored here + } + e = NULL; // EUID gets stored here timestamp = 0; char cbuf[1024]; -- 2.30.2