tbrehm
2012-10-30 4e7af155949b33ce78a8fc489d87b08ff3901772
Fixed: FS#2398 - Setting autoresponder start/end dates for a mailbox fails
2 files modified
17 ■■■■ changed files
interface/lib/classes/validate_autoresponder.inc.php 12 ●●●● patch | view | raw | blame | history
interface/web/mail/form/mail_user.tform.php 5 ●●●●● patch | view | raw | blame | history
interface/lib/classes/validate_autoresponder.inc.php
@@ -33,8 +33,15 @@
{
    function start_date($field_name, $field_value, $validator)
    {
        # save field value for later use in end_date()
        $this->start_date = $field_value;
        if ($this->_datetime_selected($field_value)) {
            return $this->is_future($field_name, $field_value, $validator);
            # We just require a start date be set
            return;
        }
        if($_POST['autoresponder'] == 'y') {
            return "No start date selected";
        }
    }
    
@@ -42,7 +49,8 @@
    {
        global $app;
        
        $start_date = $app->tform_actions->dataRecord['autoresponder_start_date'];
        $start_date = $this->start_date;
        //$start_date = $app->tform_actions->dataRecord['autoresponder_start_date'];
        
        $_msg = $this->not_empty('autoresponder_start_date', $start_date, $validator);
        if (!$_msg) // Start date set 
interface/web/mail/form/mail_user.tform.php
@@ -263,6 +263,11 @@
        'autoresponder_start_date' => array (
            'datatype'    => 'DATETIME',
            'formtype'    => 'DATETIME',
            'validators'=> array ( 0 => array ( 'type' => 'CUSTOM',
                'class' => 'validate_autoresponder',
                'function' => 'start_date',
                'errmsg'=> 'autoresponder_start_date_is_required'),
            )
        ),
        'autoresponder_end_date' => array (
            'datatype'    => 'DATETIME',