- added {DOCROOT_CLIENT} to directive placeholders (non-symlink docroot) - ...

Marius Burkard

2015-12-14 6b15d5f4e18578acb46be3babc46b7a9d3a9299c

 interface/lib/classes/tform_base.inc.php

@@ -126,6 +126,7 @@
   function loadFormDef($file, $module = '') {
      global $app, $conf;

      $app->plugin->raiseEvent('on_before_formdef', $module);
      include $file;
      $this->formDef = $form;

@@ -150,6 +151,8 @@
         $wb = $app->functions->array_merge($wb_global, $wb);
      }
      if(isset($wb_global)) unset($wb_global);
		
      $app->plugin->raiseEvent('on_after_formdef', $module);

      $this->wordbook = $wb;

@@ -1058,11 +1061,10 @@
            }
            break;



         case 'ISIPV4':
            $vip=1;
            if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
//            if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
            if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $field_value)){
               $groups=explode(".", $field_value);
               foreach($groups as $group){
                  if($group<0 or $group>255)
@@ -1078,6 +1080,7 @@
               }
            }
            break;

         case 'ISIP':
            if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
            if($validator['allowempty'] == 'y' && $field_value == '') {
@@ -1107,7 +1110,8 @@
                     if(preg_match("/^(\:\:([a-f0-9]{1,4}\:){0,6}?[a-f0-9]{0,4}|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){0,6}?\:\:|[a-f0-9]{1,4}(\:[a-f0-9]{1,4}){1,6}?\:\:([a-f0-9]{1,4}\:){1,6}?[a-f0-9]{1,4})(\/\d{1,3})?$/i", $field_value)){
                        $ip_ok = 1;
                     }
                     if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
//                     if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){
                     if(preg_match("/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/", $field_value)){
                        $ip_ok = 1;
                     }
                     if($ip_ok == 0) {