From 57540eebc0e035f023afef66b3bbc00f315951bf Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Fri, 09 Apr 2010 09:49:20 -0400 Subject: [PATCH] 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". --- interface/lib/classes/listform.inc.php | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php index 542bce6..c97e39d 100644 --- a/interface/lib/classes/listform.inc.php +++ b/interface/lib/classes/listform.inc.php @@ -281,7 +281,17 @@ $record[$key] = htmlentities(stripslashes($record[$key]),ENT_QUOTES,$conf["html_content_encoding"]); break; - case 'DATE': + case 'DATETSTAMP': + if ($record[$key] > 0) { + // is value int? + if (ereg("^[0-9]+[.]?[0-9]*$", $record[$key], $p)) { + $record[$key] = date($this->lng('conf_format_dateshort'), $record[$key]); + } else { + $record[$key] = date($this->lng('conf_format_dateshort'), strtotime($record[$key])); + } + } + break; + case 'DATE': if ($record[$key] > 0) { // is value int? if (ereg("^[0-9]+[.]?[0-9]*$", $record[$key], $p)) { @@ -340,11 +350,17 @@ } break; - case 'DATE': + case 'DATETSTAMP': if($record[$key] > 0) { $record[$key] = date('Y-m-d',strtotime($record[$key])); } break; + + case 'DATE': + if($record[$key] != '' && $record[$key] != '0000-00-00') { + $record[$key] = $record[$key]; + } + break; case 'DATETIME': if($record[$key] > 0) { -- Gitblit v1.9.1