openrat-cms

commit d775892b8f558d5adbcb7191cb7cf16103eede67
parent 432fcac4977cd417e0f82ea9c4693d2fb4698812
Author: dankert <devnull@localhost>
Date:   Tue, 20 Oct 2009 09:17:57 +0200

UTC-Schalter war totaler Blödsinn, da Unix-Timestamp eh immer auf GMT bezogen ist...

Diffstat:
config/date.ini.php
 | 
8
--------
functions/common.inc.php
 | 
11
++---------
themes/default/include/html/date.inc.php
 | 
6
++----

3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/config/date.ini.php b/config/date.ini.php
@@ -22,11 +22,3 @@ UNIX = "U"
 LONG = "F j, Y, g:i a"
 
 
-
-; database settings for storing timestamps
-[database]
-
-; whether to store a timestamp value in UTC (GMT)
-; 'true'  means UTC
-; 'false' means local time (default)
-utc = false
diff --git a/functions/common.inc.php b/functions/common.inc.php
@@ -23,19 +23,12 @@ function convertToXmlAttribute( $value )
 
 /**
  * Ermittelt die aktuelle Systemzeit als Unix-Timestamp.<br>
- * Es wird konfigurationsgesteuert entweder die lokale Zeit oder
- * die GMT-Zeit (UTC) zurückgegeben.<br>
- * Konfigurationsschalter ist 'date/database/utc'.
+ * Unix-Timestamp ist immer bezogen auf GMT.
  * - 
  * @return Unix-Timestamp der aktuellen Zeit
  */
 function now()
 {
-	global $conf;
-	
-	if	( @$conf['date']['database']['utc'] )
-		return gmdate('U');
-	else
-		return time();
+	return time();
 }
 ?> 
\ No newline at end of file
diff --git a/themes/default/include/html/date.inc.php b/themes/default/include/html/date.inc.php
@@ -1,11 +1,9 @@
 <?php	
     global $conf;
 	$time = $attr_date;
-	
-	if	( @$conf['date']['database']['utc'] )
-		$time + date('Z');
-
 
+	// TODO: Benutzereinstellung 'Zeitzonen-Offset' auswerten.
+	
 	if	( $time==0)
 		echo lang('GLOBAL_UNKNOWN');
 	elseif ( !$conf['interface']['human_date_format'] )