vogelor
2010-05-01 cdaae64a7431af2bf6cb3c916f0e6bfbdd3fd93b
interface/lib/classes/tform.inc.php
@@ -176,9 +176,16 @@
                                        $new_record[$key] = $record[$key];
                                break;
                                case 'DATE':
                                case 'DATETSTAMP':
                                        if($record[$key] > 0) {
                                                $new_record[$key] = date($this->dateformat,$record[$key]);
                                        }
                                break;
                        case 'DATE':
                                        if($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]));
                                        }
                                break;
@@ -191,7 +198,7 @@
                                break;
                                case 'CURRENCY':
                                        $new_record[$key] = number_format($record[$key], 2, ',', '');
                                        $new_record[$key] = number_format((double)$record[$key], 2, ',', '');
                                break;
                                default:
@@ -354,7 +361,11 @@
                                        // If Datasource is set, get the data from there
                                        if(isset($field['datasource']) && is_array($field['datasource'])) {
                                                $field["value"] = $this->getDatasourceData($field, $record);
                                    if(is_array($field["value"])) {
                                       $field["value"] = $field["value"] + $this->getDatasourceData($field, $record);
                                    } else {
                                                   $field["value"] = $this->getDatasourceData($field, $record);
                                    }
                                        }
                              
                              // If a limitation for the values is set
@@ -463,7 +474,11 @@
                                // If Datasource is set, get the data from there
                                if(@is_array($field['datasource'])) {
                                   $field["value"] = $this->getDatasourceData($field, $record);
                                   if(is_array($field["value"])) {
                              $field["value"] = array_merge($field["value"],$this->getDatasourceData($field, $record));
                           } else {
                                       $field["value"] = $this->getDatasourceData($field, $record);
                           }
                                }
                        
                        // If a limitation for the values is set
@@ -476,8 +491,7 @@
                                        if(is_array($field['value'])) {
                                                $out = '';
                                                foreach($field['value'] as $k => $v) {
                                                    //$selected = ($k == $val)?' SELECTED':'';
                                       $selected = '';
                                                    $selected = ($k == $field["default"])?' SELECTED':'';
                                                    $out .= "<option value='$k'$selected>$v</option>\r\n";
                                                }
                                        }
@@ -596,7 +610,7 @@
                                                $new_record[$key] = implode($field['separator'],$record[$key]);
                                        }
                                break;
                                case 'DATE':
                                case 'DATETSTAMP':
                                        if($record[$key] > 0) {
                                                list($tag,$monat,$jahr) = explode('.',$record[$key]);
                                                $new_record[$key] = mktime(0,0,0,$monat,$tag,$jahr);
@@ -604,6 +618,16 @@
                                 $new_record[$key] = 0;
                              }
                                break;
                        case 'DATE':
                                        if($record[$key] != '' && $record[$key] != '0000-00-00') {
                                                list($tag,$monat,$jahr) = explode('.',$record[$key]);
                                                $new_record[$key] = $jahr.'-'.$monat.'-'.$tag;
                                    //$tmp = strptime($record[$key],$this->dateformat);
                                    //$new_record[$key] = ($tmp['tm_year']+1900).'-'.($tmp['tm_mon']+1).'-'.$tmp['tm_mday'];
                                        } else {
                                 $new_record[$key] = '0000-00-00';
                              }
                                break;
                                case 'INTEGER':
                                        $new_record[$key] = (isset($record[$key]))?$record[$key]:0;
                                        //if($new_record[$key] != $record[$key]) $new_record[$key] = $field['default'];