Merged revisions 3536-3555 from 3.0.5 stable branch.

tbrehm

2012-10-16 a008884b8f041577d43675f13c492f45fb9ee066

 interface/web/sites/form/web_domain.tform.php

@@ -119,14 +119,18 @@
      'domain' => array (
         'datatype'   => 'VARCHAR',
         'formtype'   => 'TEXT',
            'filters'   => array( 0 => array( 'event' => 'SAVE',
                                              'type' => 'IDNTOASCII'),
                                  1 => array( 'event' => 'SHOW',
                                              'type' => 'IDNTOUTF8'),
                                  2 => array( 'event' => 'SAVE',
                                              'type' => 'TOLOWER')
                                ),
            'validators'    => array (  0 => array (    'type'  => 'CUSTOM',
                                                        'class' => 'validate_domain',
                                                        'function' => 'web_domain',
                                                        'errmsg'=> 'domain_error_regex'),
                                    ),
         'filters'   => array (    0 => array (   'event'   => 'SAVE',
                                       'type'   => 'TOLOWER'),
                           ),
         'default'   => '',
         'value'      => '',
         'width'      => '30',
@@ -293,7 +297,7 @@
      'redirect_path' => array (
         'datatype'   => 'VARCHAR',
         'validators'   => array (    0 => array (   'type'   => 'REGEX',
                                          'regex' => '@^(([\.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
                                          'regex' => '@^(([\.]{0})|((ftp|https?)://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~!]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~!]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
                                          'errmsg'=> 'redirect_error_regex'),
                           ),
         'formtype'   => 'TEXT',