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

Marius Burkard

2016-07-12 28ad72e0d41a02009f7f40bb6352e03556bb8676

 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';