From 683446d905326f7d23de2c902880bc9fa8ef7d74 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 25 Mar 2024 13:04:23 -0700 Subject: [PATCH] Handle start and end times together --- webcit-ng/server/caldav_reports.c | 20 ++++++++++---------- webcit-ng/server/ctdlfunctions.c | 3 +-- webcit-ng/server/forum_view.c | 2 +- webcit-ng/server/html2html.c | 2 +- webcit-ng/server/main.c | 2 +- webcit-ng/server/tcp_sockets.c | 22 +++++++++++----------- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c index 485b2a3eb..1bb8b85bb 100644 --- a/webcit-ng/server/caldav_reports.c +++ b/webcit-ng/server/caldav_reports.c @@ -419,23 +419,23 @@ int caldav_apply_filters(void *cal, Array *filters, int apply_at_level) { } else if (!strcasecmp(t[1], "time-range")) { // RFC4791 9.9 - syslog(LOG_DEBUG, "time range filter at level %d FIXME add recurrence", this_rule_level); + syslog(LOG_DEBUG, "time range filter at level %d", this_rule_level); + char *tr_start = (char *)the_beginning_of_time; // default if not specified + char *tr_end = (char *)the_end_of_time; // default if not specified for (int i=2; (i+1)= 0) && (strcmp(buf, "")) && (strcmp(buf, "000"))) { - // rfc822 header parsing here + // RFC822 header parsing here if (!strncasecmp(buf, "Content-transfer-encoding:", 26)) { strcpy(content_transfer_encoding, &buf[26]); string_trim(content_transfer_encoding); diff --git a/webcit-ng/server/html2html.c b/webcit-ng/server/html2html.c index 8f0b4659d..8fb8be630 100644 --- a/webcit-ng/server/html2html.c +++ b/webcit-ng/server/html2html.c @@ -502,7 +502,7 @@ StrBuf *html2html(const char *charset_in, int treat_as_wiki, char *roomname, lon // Output our big pile of markup StrBufAppendBuf(Target, converted_msg, 0); - BAIL: // A little trailing vertical whitespace... +BAIL: // A little trailing vertical whitespace... StrBufAppendPrintf(Target, "
\n"); // Now give back the memory diff --git a/webcit-ng/server/main.c b/webcit-ng/server/main.c index e06d70693..f0bc295df 100644 --- a/webcit-ng/server/main.c +++ b/webcit-ng/server/main.c @@ -93,7 +93,7 @@ int main(int argc, char **argv) { openlog("webcit", (running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR)), LOG_DAEMON); // Tell 'em who's in da house - syslog(LOG_NOTICE, "MAKE WEBCIT GREAT AGAIN!"); + syslog(LOG_NOTICE, "WEBCIT-NG DEVELOPER BUILD"); syslog(LOG_NOTICE, "Copyright (C) 1996-2024 by the citadel.org team"); syslog(LOG_NOTICE, " "); syslog(LOG_NOTICE, "This program is open source software. Use, duplication, or"); diff --git a/webcit-ng/server/tcp_sockets.c b/webcit-ng/server/tcp_sockets.c index 6c5701266..928bebcac 100644 --- a/webcit-ng/server/tcp_sockets.c +++ b/webcit-ng/server/tcp_sockets.c @@ -1,6 +1,6 @@ // TCP sockets layer // -// Copyright (c) 1987-2022 by the citadel.org team +// Copyright (c) 1987-2024 by the citadel.org team // // This program is open source software. Use, duplication, or disclosure is subject to the GNU General Public License v3. @@ -78,7 +78,7 @@ retry: else if ((strchr(ip_addr, '.')) && (!strchr(ip_addr, ':'))) { // specific IPv4 ip_version = 4; if (inet_pton(AF_INET, ip_addr, &sin4.sin_addr) <= 0) { - syslog(LOG_WARNING, "Error binding to [%s] : %s\n", ip_addr, strerror(errno)); + syslog(LOG_WARNING, "tcp_sockets: error binding to [%s] : %m", ip_addr); return (-1); } } @@ -86,13 +86,13 @@ retry: ip_version = 6; if (inet_pton(AF_INET6, ip_addr, &sin6.sin6_addr) <= 0) { - syslog(LOG_WARNING, "Error binding to [%s] : %s\n", ip_addr, strerror(errno)); + syslog(LOG_WARNING, "tcp_sockets: error binding to [%s] : %m", ip_addr); return (-1); } } if (port_number == 0) { - syslog(LOG_WARNING, "Cannot start: no port number specified.\n"); + syslog(LOG_WARNING, "tcp_sockets: cannot start: no port number specified"); return (-1); } sin6.sin6_port = htons((u_short) port_number); @@ -107,7 +107,7 @@ retry: ip_addr = ipv4broadcast; goto retry; } - syslog(LOG_WARNING, "Can't create a listening socket: %s\n", strerror(errno)); + syslog(LOG_WARNING, "tcp_sockets: can't create a listening socket: %m"); return (-1); } @@ -123,13 +123,13 @@ retry: } if (b < 0) { - syslog(LOG_ERR, "Can't bind: %s\n", strerror(errno)); + syslog(LOG_ERR, "tcp_sockets: can't bind: %m"); close(s); return (-1); } if (listen(s, queue_len) < 0) { - syslog(LOG_ERR, "Can't listen: %s\n", strerror(errno)); + syslog(LOG_ERR, "tcp_sockets: can't listen: %m"); close(s); return (-1); } @@ -152,7 +152,7 @@ int webcit_uds_server(char *sockpath, int queue_len) { i = unlink(sockpath); if ((i != 0) && (errno != ENOENT)) { - syslog(LOG_WARNING, "webcit: can't unlink %s: %s", sockpath, strerror(errno)); + syslog(LOG_WARNING, "tcp_sockets: can't unlink %s: %m", sockpath); return (-1); } @@ -162,18 +162,18 @@ int webcit_uds_server(char *sockpath, int queue_len) { s = socket(AF_UNIX, SOCK_STREAM, 0); if (s < 0) { - syslog(LOG_WARNING, "webcit: Can't create a unix domain socket: %s", strerror(errno)); + syslog(LOG_WARNING, "tcp_sockets: can't create a unix domain socket: %m"); return (-1); } if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - syslog(LOG_WARNING, "webcit: Can't bind: %s", strerror(errno)); + syslog(LOG_WARNING, "tcp_sockets: Can't bind: %m"); close(s); return (-1); } if (listen(s, actual_queue_len) < 0) { - syslog(LOG_WARNING, "webcit: Can't listen: %s", strerror(errno)); + syslog(LOG_WARNING, "tcp_sockets: Can't listen: %m"); close(s); return (-1); } -- 2.30.2