Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into st...

Marius Burkard

2016-07-12 28ad72e0d41a02009f7f40bb6352e03556bb8676

 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' => '',