Merge branch 'master' of git.ispconfig.org:florian030/ispconfig3

Florian Schaal

2016-07-20 ca80807a1347484d23e52ca104d2f7db750ac415

Merge branch 'master' of git.ispconfig.org:florian030/ispconfig3

 interface/lib/classes/tform_base.inc.php

@@ -992,6 +992,26 @@
                    }
                }
                break;
            case 'ISDOMAIN':
                $error = false;
                if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
                if($validator['allowempty'] == 'y' && $field_value == '') {
                    //* Do nothing
                } else {
                    if(function_exists('filter_var')) {
                        if(filter_var('check@'.$field_value, FILTER_VALIDATE_EMAIL) === false) {
                            $errmsg = $validator['errmsg'];
                            if(isset($this->wordbook[$errmsg])) {
                                $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
                            } else {
                                $this->errorMessage .= $errmsg."<br />\r\n";
                            }
                        }

                    } else $this->errorMessage .= "function filter_var missing <br />\r\n";
                }
                unset($error);
                break;
            case 'ISEMAIL':
                $error = false;
                if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';

 interface/web/mail/form/mail_domain.tform.php

@@ -88,8 +88,7 @@
                    'errmsg'=> 'domain_error_empty'),
                1 => array ( 'type' => 'UNIQUE',
                    'errmsg'=> 'domain_error_unique'),
                2 => array ( 'type' => 'REGEX',
                    'regex' => '/^[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/',
                2 => array ( 'type' => 'ISDOMAIN',
                    'errmsg'=> 'domain_error_regex'),
            ),
            'default' => '',