tbrehm
2011-09-07 3fd6591a688b841359a64cd0631d8e01a940541b
Fixed: FS#1717 - Regular Expression (@reboot) in User Cron
2 files modified
10 ■■■■■ changed files
interface/lib/classes/validate_cron.inc.php 8 ●●●●● patch | view | raw | blame | history
interface/web/sites/form/cron.tform.php 2 ●●● patch | view | raw | blame | history
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.
interface/web/sites/form/cron.tform.php
@@ -129,7 +129,7 @@
            'formtype'  => 'TEXT',
            'validators'    => array (  0 => array (    'type'  => 'CUSTOM',
                                                        'class' => 'validate_cron',
                                                        'function' => 'run_time_format',
                                                        'function' => 'run_month_format',
                                                        'errmsg'=> 'run_month_error_format'),
                                    ),
            'default'   => '',