diff options
| author | Steve Beaver <sbeaver@netgate.com> | 2018-09-27 08:32:39 -0400 |
|---|---|---|
| committer | jim-p <jimp@netgate.com> | 2018-10-17 09:51:58 -0400 |
| commit | 5baf07c8984abf55d3207b7c75a6ea03bfcb103f (patch) | |
| tree | 24882d27358ac2ab2ac382507b66a36ff5fd33bc /src/usr | |
| parent | 619f9e511f3d631486039f30c76c9ce6c321ec43 (diff) | |
| download | pfsense-5baf07c8984abf55d3207b7c75a6ea03bfcb103f.zip pfsense-5baf07c8984abf55d3207b7c75a6ea03bfcb103f.tar.gz | |
Simplify schedule validation
(cherry picked from commit bb7cabdb20e7bad06263d5b3888c71415d6861c1)
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/local/www/services_acb_settings.php | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/usr/local/www/services_acb_settings.php b/src/usr/local/www/services_acb_settings.php index 6f151da..ce610bd 100644 --- a/src/usr/local/www/services_acb_settings.php +++ b/src/usr/local/www/services_acb_settings.php @@ -88,20 +88,8 @@ if (isset($_POST['save'])) { } if ($_POST['frequency'] === 'cron') { - if(!preg_match('/^[0-9\*\/]+$/', $_POST['hours'])) { - $input_errors[] = gettext("Schedule hours may only contain numbers '*' or '/'"); - } - - if(!preg_match('/^[0-9\*\/]+$/', $_POST['day'])) { - $input_errors[] = gettext("Schedule days may only contain numbers '*' or '/'"); - } - - if(!preg_match('/^[0-9\*\/]+$/', $_POST['month'])) { - $input_errors[] = gettext("Schedule month may only contain numbers '*' or '/'"); - } - - if(!preg_match('/^[0-9\*\/]+$/', $_POST['dow'])) { - $input_errors[] = gettext("Schedule day of week may only contain numbers '*' or '/'"); + if (!preg_match('/^[0-9\*\/\-\,]+$/', $_POST['hours'] . $_POST['day'] . $_POST['month'] . $_POST['dow'])) { + $input_errors[] = gettext("Schedule values may only contain 0-9 - , / *"); } } |
