Merge pull request #9688 from bennet0496/sieve_fix_timeformat

ManageSieve: Fix timeformat processing for frontend the time picker

CHANGELOG.md

@@ -48,6 +48,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

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':
@@ -1040,6 +1041,8 @@ function sieve_formattime(hour, minutes) {
                 break;
             case 's':
                 time += '00';
+
+                break;
             default:
                 time += c;
         }