calendarevent: change sorting of hours and minutes to numeric

[pve-common.git] / src / PVE / CalendarEvent.pm

diff --git a/src/PVE/CalendarEvent.pm b/src/PVE/CalendarEvent.pm
index d235e0460d8c70e54568e504710183ad739690a2..2714841c1aab6039c4f6337e348d61d68231734d 100644 (file)
--- a/src/PVE/CalendarEvent.pm
+++ b/src/PVE/CalendarEvent.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 use Data::Dumper;
 use Time::Local;
+use PVE::JSONSchema;
 
 # Note: This class implements a parser/utils for systemd like calender exents
 # Date specification is currently not implemented
@@ -18,6 +19,18 @@ my $dow_names = {
     sat => 6,
 };
 
+PVE::JSONSchema::register_format('pve-calendar-event', \&pve_verify_calendar_event);
+sub pve_verify_calendar_event {
+    my ($text, $noerr) = @_;
+
+    eval { parse_calendar_event($text); };
+    if (my $err = $@) {
+       return undef if $noerr;
+       die "invalid calendar event '$text'\n";
+    }
+    return $text;
+}
+
 # The parser.
 # returns a $calspec hash which can be passed to compute_next_event()
 sub parse_calendar_event {
@@ -124,13 +137,13 @@ sub parse_calendar_event {
     if ($matchall_hours) {
        $h = '*';
     } else {
-       $h = [ sort keys %$hours_hash ];
+       $h = [ sort { $a <=> $b } keys %$hours_hash ];
     }
 
     if ($matchall_minutes) {
        $m = '*';
     } else {
-       $m = [ sort keys %$minutes_hash ];
+       $m = [ sort { $a <=> $b } keys %$minutes_hash ];
     }
 
     return { h => $h, m => $m, dow => [ sort keys %$dow_hash ]};