From 5734dd935b64e7f27472d4064c3dd1a0210ff5af Mon Sep 17 00:00:00 2001 From: Bennet Becker Date: Mon, 4 Nov 2024 10:05:59 +0100 Subject: [PATCH 1/3] Managesieve: fix 12h format in sieve_formattime() --- plugins/managesieve/managesieve.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js index c9b43fa622..9d99475619 100644 --- a/plugins/managesieve/managesieve.js +++ b/plugins/managesieve/managesieve.js @@ -1022,8 +1022,9 @@ function sieve_formattime(hour, minutes) { break; case 'g': case 'h': - h = hour == 0 ? 12 : hour > 12 ? hour - 12 : hour; - time += (c == 'h' && hour < 10 ? '0' : '') + hour; + h = hour % 12; + h = h === 0 ? 12 : h; + time += (c === 'h' && h < 10 ? '0' : '') + h; break; case 'G': From 4124db97e2ea2be71526ba82a38f23d6ed93e267 Mon Sep 17 00:00:00 2001 From: Bennet Becker Date: Mon, 4 Nov 2024 10:06:59 +0100 Subject: [PATCH 2/3] Managesieve: fix appended 's' when seconds are in time format in sieve_formattime() --- plugins/managesieve/managesieve.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js index 9d99475619..003cc0c16f 100644 --- a/plugins/managesieve/managesieve.js +++ b/plugins/managesieve/managesieve.js @@ -1041,6 +1041,8 @@ function sieve_formattime(hour, minutes) { break; case 's': time += '00'; + + break; default: time += c; } From 689a81a2379deaca9c8fbb38ba6397f726d26aea Mon Sep 17 00:00:00 2001 From: Bennet Becker Date: Tue, 5 Nov 2024 20:04:05 +0100 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e7e392b9f..8a0b9443ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ - Managesieve: Support :encodeurl (RFC 5435) (#8917) - Managesieve: Add List-ID to the list of headers for creating new sieve-filters (#8307) - Managesieve: Support an array in managesieve_host option (#9447) +- Managesieve: Fix the frontend datetime picker not respecting the 12h format and apending a dangling 's' to the seconds (#9688) - Password: Add `ldap_samba_ad` driver (#8525) - Password: Allow LDAP access using LDAP URI and SASL binding (#8402) - Password: Use Guzzle HTTP Client in the `pwned` driver