projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dc7628b
)
Handle start and end times together
author
Art Cancro
<ajc@citadel.org>
Mon, 25 Mar 2024 20:04:23 +0000
(13:04 -0700)
committer
Art Cancro
<ajc@citadel.org>
Tue, 26 Mar 2024 20:12:37 +0000
(13:12 -0700)
webcit-ng/server/caldav_reports.c
patch
|
blob
|
history
webcit-ng/server/ctdlfunctions.c
patch
|
blob
|
history
webcit-ng/server/forum_view.c
patch
|
blob
|
history
webcit-ng/server/html2html.c
patch
|
blob
|
history
webcit-ng/server/main.c
patch
|
blob
|
history
webcit-ng/server/tcp_sockets.c
patch
|
blob
|
history
diff --git
a/webcit-ng/server/caldav_reports.c
b/webcit-ng/server/caldav_reports.c
index 485b2a3eb0647ff368976f53d53803a07cb2fa52..1bb8b85bba93995957bbb97befbb5a80f7cd6481 100644
(file)
--- 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
}
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)<num_tokens; i+=2) {
for (int i=2; (i+1)<num_tokens; i+=2) {
- char *tr_start = (char *)the_beginning_of_time; // default if not specified
- char *tr_end = (char *)the_end_of_time; // default if not specified
if (!strcasecmp(t[i], "start")) {
tr_start = t[i+1];
}
else if (!strcasecmp(t[i], "end")) {
tr_end = t[i+1];
}
if (!strcasecmp(t[i], "start")) {
tr_start = t[i+1];
}
else if (!strcasecmp(t[i], "end")) {
tr_end = t[i+1];
}
- if (caldav_time_range_filter_matches(cal, tr_start, tr_end)) {
- syslog(LOG_DEBUG, "time range matches");
- }
- else {
- syslog(LOG_DEBUG, "time range does not match -- rejecting");
-
qual = 0
;
- }
+ }
+ if (caldav_time_range_filter_matches(cal, tr_start, tr_end)) {
+ syslog(LOG_DEBUG, "time range matches");
+ }
+ else {
+
syslog(LOG_DEBUG, "time range does not match -- rejecting")
;
+ qual = 0;
}
}
}
}
diff --git
a/webcit-ng/server/ctdlfunctions.c
b/webcit-ng/server/ctdlfunctions.c
index 407d153409e466ae1b75c1cdd079ba8a9479417c..ca3886a35ead44cb9f894f1e2273c0341c45ff82 100644
(file)
--- a/
webcit-ng/server/ctdlfunctions.c
+++ b/
webcit-ng/server/ctdlfunctions.c
@@
-20,8
+20,7
@@
void ctdl_delete_msgs(struct ctdlsession *c, long *msgnums, int num_msgs) {
strcpy(buf, "DELE ");
do {
sprintf(&buf[strlen(buf)], "%ld", msgnums[i]);
strcpy(buf, "DELE ");
do {
sprintf(&buf[strlen(buf)], "%ld", msgnums[i]);
- if ((((i + 1) % 50) == 0) || (i == num_msgs - 1)) // delete up to 50 messages with one server command
- {
+ if ((((i + 1) % 50) == 0) || (i == num_msgs - 1)) { // delete up to 50 messages with one server command
syslog(LOG_DEBUG, "%s", buf);
ctdl_printf(c, "%s", buf);
ctdl_readline(c, buf, sizeof(buf));
syslog(LOG_DEBUG, "%s", buf);
ctdl_printf(c, "%s", buf);
ctdl_readline(c, buf, sizeof(buf));
diff --git
a/webcit-ng/server/forum_view.c
b/webcit-ng/server/forum_view.c
index 89303256aa0a83bbacd8c1925099bd4a0bf83abb..a0753652c39eb26196ce3d2ebcf6c6f8b6cc358b 100644
(file)
--- a/
webcit-ng/server/forum_view.c
+++ b/
webcit-ng/server/forum_view.c
@@
-123,7
+123,7
@@
void json_render_one_message(struct http_transaction *h, struct ctdlsession *c,
if (!strcmp(buf, "text")) {
while ((ctdl_readline(c, buf, sizeof(buf)) >= 0) && (strcmp(buf, "")) && (strcmp(buf, "000"))) {
if (!strcmp(buf, "text")) {
while ((ctdl_readline(c, buf, sizeof(buf)) >= 0) && (strcmp(buf, "")) && (strcmp(buf, "000"))) {
- //
rfc
822 header parsing here
+ //
RFC
822 header parsing here
if (!strncasecmp(buf, "Content-transfer-encoding:", 26)) {
strcpy(content_transfer_encoding, &buf[26]);
string_trim(content_transfer_encoding);
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 8f0b4659d8477e638739cc0fdcda7498da984ad5..8fb8be6305a6975cd27aa95f5afbc0508ead4678 100644
(file)
--- 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);
// 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, "<br>\n");
// Now give back the memory
StrBufAppendPrintf(Target, "<br>\n");
// Now give back the memory
diff --git
a/webcit-ng/server/main.c
b/webcit-ng/server/main.c
index e06d70693ae1d09b269c43b40fbd33470aca6772..f0bc295df64f19415b66ed6eaa6857179e2533cf 100644
(file)
--- 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
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");
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 6c5701266a52bd6c0551dd7f111a4859819ab773..928bebcacd9738d1577bc862df3042ea6c9da113 100644
(file)
--- a/
webcit-ng/server/tcp_sockets.c
+++ b/
webcit-ng/server/tcp_sockets.c
@@
-1,6
+1,6
@@
// TCP sockets layer
//
// TCP sockets layer
//
-// Copyright (c) 1987-202
2
by the citadel.org team
+// Copyright (c) 1987-202
4
by the citadel.org team
//
// This program is open source software. Use, duplication, or disclosure is subject to the GNU General Public License v3.
//
// 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) {
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);
}
}
return (-1);
}
}
@@
-86,13
+86,13
@@
retry:
ip_version = 6;
if (inet_pton(AF_INET6, ip_addr, &sin6.sin6_addr) <= 0) {
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) {
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);
return (-1);
}
sin6.sin6_port = htons((u_short) port_number);
@@
-107,7
+107,7
@@
retry:
ip_addr = ipv4broadcast;
goto 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);
}
return (-1);
}
@@
-123,13
+123,13
@@
retry:
}
if (b < 0) {
}
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) {
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);
}
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)) {
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);
}
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) {
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) {
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) {
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);
}
close(s);
return (-1);
}