Widget: agenda/calendar validation of custom interval xibosignage/xib…

…o#3060
dasgarner · Jun 5, 2023 · b1e2206 · b1e2206
1 parent f0a6419
commit b1e2206
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/Widget/Definition/Property.php b/lib/Widget/Definition/Property.php
@@ -23,6 +23,7 @@
 namespace Xibo\Widget\Definition;
 
 use Carbon\Carbon;
+use Carbon\CarbonInterval;
 use Illuminate\Support\Str;
 use Respect\Validation\Validator as v;
 use Xibo\Support\Exception\InvalidArgumentException;
@@ -242,7 +243,14 @@ public function validate(array $properties, string $stage): Property
                         case 'interval':
                             if (!empty($this->value)) {
                                 // Try to create a date interval from it
-                                $dateInterval = \DateInterval::createFromDateString($this->value);
+                                $dateInterval = CarbonInterval::createFromDateString($this->value);
+                                if ($dateInterval === false) {
+                                    throw new InvalidArgumentException(
+                                        // phpcs:ignore Generic.Files.LineLength
+                                        __('That is not a valid date interval, please use natural language such as 1 week'),
+                                        'customInterval'
+                                    );
+                                }
 
                                 // Use now and add the date interval to it
                                 $now = Carbon::now();