From 9cb77e00c93ad86c95e23b9377bcf2f92da9c75a Mon Sep 17 00:00:00 2001 From: mcramer <m.cramer@pixcept.de> Date: Thu, 01 Nov 2012 07:52:23 -0400 Subject: [PATCH] Fixed: - log parsing did not recognize lines with multiple recipients - spamfilter_users added to datalog status messages --- interface/lib/classes/validate_cron.inc.php | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/interface/lib/classes/validate_cron.inc.php b/interface/lib/classes/validate_cron.inc.php index c42e06d..e551af3 100644 --- a/interface/lib/classes/validate_cron.inc.php +++ b/interface/lib/classes/validate_cron.inc.php @@ -55,6 +55,14 @@ if(preg_match("'^([a-z0-9][a-z0-9-]{0,62}\.)+([a-z]{2,30})$'i", $parsed["host"]) == false) return $this->get_error($validator['errmsg']); } } + + function run_month_format($field_name, $field_value, $validator) { + global $app; + //* allow value @reboot in month field + if($field_value != '@reboot') { + return $this->run_time_format($field_name, $field_value, $validator); + } + } /* Validator function to check if a given cron time is in correct form. @@ -70,7 +78,7 @@ if(preg_match("'^[0-9\-\,\/\*]+$'", $field_value) == false) return $this->get_error($validator['errmsg']); // allowed characters are 0-9, comma, *, -, / elseif(preg_match("'[\-\,\/][\-\,\/]'", $field_value) == true) return $this->get_error($validator['errmsg']); // comma, - and / never stand together //* now split list and check each entry. store used values in array for later limit-check - $time_list = split(",", $field_value); + $time_list = explode(",", $field_value); if(count($time_list) < 1) return $this->get_error($validator['errmsg']); $max_entry = 0; -- Gitblit v1.9.1