From e11f5dde0d79d82386f60aad5cdee6e77c52f79c Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Wed, 11 Feb 2009 05:41:31 -0500
Subject: [PATCH] improved displaying of dates.
---
interface/lib/classes/listform.inc.php | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index a3946eb..41b93d4 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -38,7 +38,6 @@
private $pagingValues;
private $searchChanged = 0;
private $module;
- private $dateformat = 'Y-m-d H:i';
public $wordbook;
public function loadListDef($file, $module = '')
@@ -280,7 +279,25 @@
break;
case 'DATE':
- $record[$key] = ($record[$key] > 0) ? date($this->dateformat,$record[$key]) : '';
+ 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 'DATETIME':
+ if ($record[$key] > 0) {
+ // is value int?
+ if (ereg("^[0-9]+[.]?[0-9]*$", $record[$key], $p)) {
+ $record[$key] = date($this->lng('conf_format_datetime'), $record[$key]);
+ } else {
+ $record[$key] = date($this->lng('conf_format_datetime'), strtotime($record[$key]));
+ }
+ }
break;
case 'INTEGER':
@@ -322,8 +339,13 @@
case 'DATE':
if($record[$key] > 0) {
- list($tag,$monat,$jahr) = explode('.',$record[$key]);
- $record[$key] = mktime(0,0,0,$monat,$tag,$jahr);
+ $record[$key] = date('Y-m-d',strtotime($record[$key]));
+ }
+ break;
+
+ case 'DATETIME':
+ if($record[$key] > 0) {
+ $record[$key] = date('Y-m-d H:i:s',strtotime($record[$key]));
}
break;
--
Gitblit v1.9.1