openrat-cms

commit fd6e1f0e0c8f0f717949d508f4f6c49bdde3352d
parent 78d7d5bcdc76f3986ac34aefda7c34ff57f9a6ae
Author: dankert <devnull@localhost>
Date:   Wed, 14 Oct 2009 23:08:15 +0200

Konfiguration der Datumformate umstrukturiert, neue Einstellung für UTC

Diffstat:
actionClasses/ElementAction.class.php
 | 
4
++--
config/date-formats.ini.php
 | 
26
--------------------------
config/date.ini.php
 | 
30
++++++++++++++++++++++++++++++

3 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/actionClasses/ElementAction.class.php b/actionClasses/ElementAction.class.php
@@ -297,7 +297,7 @@ class ElementAction extends Action
 	
 				case 'dateformat':
 
-					$ini_date_format = $conf['date-formats'];
+					$ini_date_format = $conf['date']['format'];
 					$dateformat = array();
 
 					$this->setTemplateVar('dateformat','');
@@ -568,7 +568,7 @@ class ElementAction extends Action
 	function saveproperties()
 	{
 		global $conf;
-		$ini_date_format = $conf['date-formats'];
+		$ini_date_format = $conf['date']['format'];
 	
 		if	( $this->hasRequestVar('dateformat'))
 			$this->element->dateformat  = $ini_date_format[$this->getRequestVar('dateformat')];
diff --git a/config/date-formats.ini.php b/config/date-formats.ini.php
@@ -1,25 +0,0 @@
-; <?php die('no access'); ?>
-
-; date formats
-; see http://www.php.net/manual/en/function.date.php for details
-;
-; any ideas of other useful date formates? please mail them to cms-df@jandankert.de
-;
-; $Id$
-
-SHORT = ""
-ISO8601SHORT = "Ymd"
-ISO8601 = "Y-m-d"
-ISO8601BAS = "Ymd\THis"
-ISO8601EXT = "Y-m-d\TH:i:s"
-ISO8601FULL = "Y-m-d\TH:i:sO"
-ISO8601WEEK = "Y\WW"
-GER1 = "d\.m\.Y"
-GER2 = "d\.m\.Y\, H:i"
-GER3 = "d\.m\.Y\, H:i:s"
-GER4 = "d\. F Y\, H:i:s"
-ENGLONG = "l dS of F Y h:i:s A"
-GMDATE = "D, d M Y H:i:s \G\M\T"
-RFC822 = "r"
-UNIX = "U"
-LONG = "F j, Y, g:i a"-
\ No newline at end of file
diff --git a/config/date.ini.php b/config/date.ini.php
@@ -0,0 +1,30 @@
+; <?php die('no access'); ?>
+
+; date formats
+; see http://www.php.net/manual/en/function.date.php for details
+[format]
+
+SHORT = ""
+ISO8601SHORT = "Ymd"
+ISO8601 = "Y-m-d"
+ISO8601BAS = "Ymd\THis"
+ISO8601EXT = "Y-m-d\TH:i:s"
+ISO8601FULL = "Y-m-d\TH:i:sO"
+ISO8601WEEK = "Y\WW"
+GER1 = "d\.m\.Y"
+GER2 = "d\.m\.Y\, H:i"
+GER3 = "d\.m\.Y\, H:i:s"
+GER4 = "d\. F Y\, H:i:s"
+ENGLONG = "l dS of F Y h:i:s A"
+GMDATE = "D, d M Y H:i:s \G\M\T"
+RFC822 = "r"
+UNIX = "U"
+LONG = "F j, Y, g:i a"
+
+
+
+; database settings for storing timestamps
+[database]
+
+; whether to store a timestamp value in UTC (GMT)
+utc = true