Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/lib/classes/tform_base.inc.php

@@ -98,7 +98,7 @@
   var $errorMessage = '';

   var $dateformat = "d.m.Y";
   var $datetimeformat = 'd.m.Y H:i';
   var $datetimeformat = 'd.m.Y H:i'; // is set to the correct value in loadFormDef
   var $formDef = array();
   var $wordbook;
   var $module;
@@ -206,7 +206,7 @@
               break;

            case 'DATE':
               if($record[$key] != '' && $record[$key] != '0000-00-00') {
               if($record[$key] != '' && !is_null($record[$key]) && $record[$key] != '0000-00-00') {
                  $tmp = explode('-', $record[$key]);
                  $new_record[$key] = date($this->dateformat, mktime(0, 0, 0, $tmp[1]  , $tmp[2], $tmp[0]));
               }
@@ -770,7 +770,7 @@
               }
               break;
            case 'DATE':
               if($record[$key] != '' && $record[$key] != '0000-00-00') {
               if($record[$key] != '' && !is_null($record[$key]) && $record[$key] != '0000-00-00') {
                  if(function_exists('date_parse_from_format')) {
                     $date_parts = date_parse_from_format($this->dateformat, $record[$key]);
                     $new_record[$key] = $date_parts['year'].'-'.str_pad($date_parts['month'], 2, "0", STR_PAD_LEFT).'-'.str_pad($date_parts['day'], 2, "0", STR_PAD_LEFT);
@@ -779,7 +779,7 @@
                     $new_record[$key] = date('Y-m-d', $tmp);
                  }
               } else {
                  $new_record[$key] = '0000-00-00';
                  $new_record[$key] = null;
               }
               break;
            case 'INTEGER':
@@ -802,11 +802,19 @@
                     $new_record[$key] = date( 'Y-m-d H:i:s', mktime($_dt_hour, $_dt_minute, $_dt_second, $_dt_month, $_dt_day, $_dt_year) );
                  }
               } else {*/
                  if($record[$key] != '' && $record[$key] != '0000-00-00 00:00:00') {
                     $tmp = strtotime($record[$key]);
                     $new_record[$key] = date($this->datetimeformat, $tmp);
                  if($record[$key] != '' && !is_null($record[$key]) && $record[$key] != '0000-00-00 00:00:00') {
                     //$tmp = strtotime($record[$key]);
                     //$new_record[$key] = date($this->datetimeformat, $tmp);
                     $parsed_date = date_parse_from_format($this->datetimeformat,$record[$key]);
                     if($parsed_date['error_count'] > 0 || ($parsed_date['year'] == 1899 && $parsed_date['month'] == 12 && $parsed_date['day'] == 31)) {
                        // There was an error, set the date to 0
                        $new_record[$key] = null;
                     } else {
                        // Date parsed successfully. Convert it to database format
                        $new_record[$key] = date( 'Y-m-d H:i:s', mktime($parsed_date['hour'], $parsed_date['minute'], $parsed_date['second'], $parsed_date['month'], $parsed_date['day'], $parsed_date['year']) );
                     }
                  } else {
                     $new_record[$key] = '0000-00-00 00:00:00';
                     $new_record[$key] = null;
                  }
               /*}*/
               break;
@@ -966,19 +974,25 @@
               }
            }
         case 'ISEMAIL':
            if(function_exists('filter_var')) {
               if(filter_var($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";
            if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
            if($validator['allowempty'] == 'y' && $field_value == '') {
               //* Do nothing
            } else {
               if(function_exists('filter_var')) {
                  if(filter_var($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";
               } else $this->errorMessage .= "function filter_var missing <br />\r\n";
            }
            break;
         case 'ISINT':
            if(function_exists('filter_var') && $field_value < 2147483647) {
               //if($field_value != '' && filter_var($field_value, FILTER_VALIDATE_INT, array("options" => array('min_range'=>0))) === false) {
               if($field_value != '' && filter_var($field_value, FILTER_VALIDATE_INT) === false) {
                  $errmsg = $validator['errmsg'];
                  if(isset($this->wordbook[$errmsg])) {
@@ -1099,6 +1113,25 @@
               }
            }
            break;
			
         case 'ISDATETIME':
            /* Checks a datetime value against the date format of the current language */
            if($validator['allowempty'] != 'y') $validator['allowempty'] = 'n';
            if($validator['allowempty'] == 'y' && $field_value == '') {
               //* Do nothing
            } else {
               $parsed_date = date_parse_from_format($this->datetimeformat,$field_value);
               if($parsed_date['error_count'] > 0 || ($parsed_date['year'] == 1899 && $parsed_date['month'] == 12 && $parsed_date['day'] == 31)) {
                  $errmsg = $validator['errmsg'];
                  if(isset($this->wordbook[$errmsg])) {
                     $this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
                  } else {
                     $this->errorMessage .= $errmsg."<br />\r\n";
                  }
               }
            }
            break;
			
         case 'RANGE':
            //* Checks if the value is within the given range or above / below a value
            //* Range examples: < 10 = ":10", between 2 and 10 = "2:10", above 5 = "5:".