Merged Revisions 3771-3801 from stable branch.

tbrehm

2013-02-12 72695f0356210b5ca68d33d09e91c00ed9d6c2b6

 interface/lib/classes/tform.inc.php

@@ -937,7 +937,18 @@
                              }
                                break;
                        case 'ISIP':
                        if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
                        if($validator['allowempty'] == 'y' && $field_value == '') {
                           //* Do nothing
                        } else {
                        //* Check if its a IPv4 or IPv6 address
                           if(isset($validator['separator']) && $validator['separator'] != '') {
                              //* When the field may contain several IP addresses, split them by the char defined as separator
                              $field_value_array = explode($validator['separator'],$field_value);
                           } else {
                              $field_value_array[] = $field_value;
                           }
                           foreach($field_value_array as $field_value) {
                        if(function_exists('filter_var')) {
                           if(!filter_var($field_value,FILTER_VALIDATE_IP)) {
                              $errmsg = $validator['errmsg'];
@@ -965,6 +976,8 @@
                              }
                           }
                        }
                           }
                        }
                                break;
                        case 'RANGE':
                                        //* Checks if the value is within the given range or above / below a value