Skip to content

Commit 57540ee

Browse files
committed
Added new "DATE" datatype which uses the native mysql date format instead of tstamps in tform library. The old tstamp datatype as been renamed to "DATETSTAMP".
1 parent 6f4add6 commit 57540ee

File tree

4 files changed

+39
-4
lines changed

4 files changed

+39
-4
lines changed

interface/lib/classes/listform.inc.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,17 @@ public function decode($record)
281281
$record[$key] = htmlentities(stripslashes($record[$key]),ENT_QUOTES,$conf["html_content_encoding"]);
282282
break;
283283

284-
case 'DATE':
284+
case 'DATETSTAMP':
285+
if ($record[$key] > 0) {
286+
// is value int?
287+
if (ereg("^[0-9]+[.]?[0-9]*$", $record[$key], $p)) {
288+
$record[$key] = date($this->lng('conf_format_dateshort'), $record[$key]);
289+
} else {
290+
$record[$key] = date($this->lng('conf_format_dateshort'), strtotime($record[$key]));
291+
}
292+
}
293+
break;
294+
case 'DATE':
285295
if ($record[$key] > 0) {
286296
// is value int?
287297
if (ereg("^[0-9]+[.]?[0-9]*$", $record[$key], $p)) {
@@ -340,11 +350,17 @@ public function encode($record)
340350
}
341351
break;
342352

343-
case 'DATE':
353+
case 'DATETSTAMP':
344354
if($record[$key] > 0) {
345355
$record[$key] = date('Y-m-d',strtotime($record[$key]));
346356
}
347357
break;
358+
359+
case 'DATE':
360+
if($record[$key] != '' && $record[$key] != '0000-00-00') {
361+
$record[$key] = $record[$key];
362+
}
363+
break;
348364

349365
case 'DATETIME':
350366
if($record[$key] > 0) {

interface/lib/classes/tform.inc.php

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,18 @@ function decode($record,$tab) {
176176
$new_record[$key] = $record[$key];
177177
break;
178178

179-
case 'DATE':
179+
case 'DATETSTAMP':
180180
if($record[$key] > 0) {
181181
$new_record[$key] = date($this->dateformat,$record[$key]);
182182
}
183183
break;
184+
185+
case 'DATE':
186+
if($record[$key] != '' && $record[$key] != '0000-00-00') {
187+
$tmp = explode('-',$record[$key]);
188+
$new_record[$key] = date($this->dateformat,mktime(0, 0, 0, $tmp[1] , $tmp[2], $tmp[0]));
189+
}
190+
break;
184191

185192
case 'INTEGER':
186193
$new_record[$key] = intval($record[$key]);
@@ -596,13 +603,23 @@ function encode($record,$tab) {
596603
$new_record[$key] = implode($field['separator'],$record[$key]);
597604
}
598605
break;
599-
case 'DATE':
606+
case 'DATETSTAMP':
600607
if($record[$key] > 0) {
601608
list($tag,$monat,$jahr) = explode('.',$record[$key]);
602609
$new_record[$key] = mktime(0,0,0,$monat,$tag,$jahr);
603610
} else {
604611
$new_record[$key] = 0;
605612
}
613+
break;
614+
case 'DATE':
615+
if($record[$key] != '' && $record[$key] != '0000-00-00') {
616+
list($tag,$monat,$jahr) = explode('.',$record[$key]);
617+
$new_record[$key] = $jahr.'-'.$monat.'-'.$tag;
618+
//$tmp = strptime($record[$key],$this->dateformat);
619+
//$new_record[$key] = ($tmp['tm_year']+1900).'-'.($tmp['tm_mon']+1).'-'.$tmp['tm_mday'];
620+
} else {
621+
$new_record[$key] = '0000-00-00';
622+
}
606623
break;
607624
case 'INTEGER':
608625
$new_record[$key] = (isset($record[$key]))?$record[$key]:0;

interface/lib/lang/de.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ $wb['top_menu_sites'] = 'Sites';
3131
$wb['top_menu_dns'] = 'DNS';
3232
$wb['top_menu_tools'] = 'Tools';
3333
$wb['top_menu_help'] = 'Support';
34+
$wb['top_menu_billing'] = 'Billing';
3435
?>

interface/lib/lang/en.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@ $wb['top_menu_sites'] = 'Sites';
3131
$wb['top_menu_dns'] = 'DNS';
3232
$wb['top_menu_tools'] = 'Tools';
3333
$wb['top_menu_help'] = 'Help';
34+
$wb['top_menu_billing'] = 'Billing';
3435
$wb['toolsarea_head_txt'] = 'Tools';
3536
?>

0 commit comments

Comments
 (0)