From 88717d88057ac0c51a2d7842305c808691404e6f Mon Sep 17 00:00:00 2001
From: Mike Cochrane <mikec@mikenz.geek.nz>
Date: Sun, 20 Jul 2008 10:13:25 -0400
Subject: User definable timezones. Work in UTC internally and display per
 user/site default. http://laconi.ca/PITS/00011

darcs-hash:20080720141325-533db-87cb60501434c9dc0ac13716ba5d8b17754431f5.gz
---
 lib/common.php |  7 ++++---
 lib/util.php   | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 11 deletions(-)

(limited to 'lib')

diff --git a/lib/common.php b/lib/common.php
index 04242432c..b4c16660f 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -51,7 +51,7 @@ $config =
                           'locale_path' => './locale',
                           'language' => 'en_US',
                           'languages' => get_all_languages(),
-		      'email' => 
+		      'email' =>
 		      array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : NULL,
 			  'broughtby' => NULL,
 			  'timezone' => 'UTC',
@@ -101,8 +101,9 @@ $config['db'] =
 
 require_once(INSTALLDIR.'/config.php');
 
-if (function_exists('date_default_timezone_set') && $config['site']['timezone']) {
-	date_default_timezone_set($config['site']['timezone']);
+if (function_exists('date_default_timezone_set')) {
+	/* Work internally in UTC */
+	date_default_timezone_set('UTC');
 }
 
 require_once(INSTALLDIR.'/lib/util.php');
diff --git a/lib/util.php b/lib/util.php
index 1ec68863e..c095fe768 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -435,6 +435,18 @@ function common_textarea($id, $label, $content=NULL, $instructions=NULL) {
 	common_element_end('p');
 }
 
+function common_timezone() {
+	if (common_logged_in()) {
+		$user = common_current_user();
+		if ($user->timezone) {
+			return $user->timezone;
+		}
+	}
+
+	global $config;
+	return $config['site']['timezone'];
+}
+
 function common_language() {
 	$httplang = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : NULL;
         $language = array();
@@ -920,23 +932,31 @@ function common_date_string($dt) {
 }
 
 function common_exact_date($dt) {
-	$t = strtotime($dt);
-	return date(DATE_RFC850, $t);
+	$dateStr = date('d F Y H:i:s', strtotime($dt));
+	$d = new DateTime($dateStr, new DateTimeZone('UTC'));
+	$d->setTimezone(new DateTimeZone(common_timezone()));
+	return $d->format(DATE_RFC850);
 }
 
 function common_date_w3dtf($dt) {
-	$t = strtotime($dt);
-	return date(DATE_W3C, $t);
+	$dateStr = date('d F Y H:i:s', strtotime($dt));
+	$d = new DateTime($dateStr, new DateTimeZone('UTC'));
+	$d->setTimezone(new DateTimeZone(common_timezone()));
+	return $d->format(DATE_W3C);
 }
 
 function common_date_rfc2822($dt) {
-	$t = strtotime($dt);
-	return date("r", $t);
+	$dateStr = date('d F Y H:i:s', strtotime($dt));
+	$d = new DateTime($dateStr, new DateTimeZone('UTC'));
+	$d->setTimezone(new DateTimeZone(common_timezone()));
+	return $d->format('r');
 }
 
 function common_date_iso8601($dt) {
-	$t = strtotime($dt);
-	return date("c", $t);
+	$dateStr = date('d F Y H:i:s', strtotime($dt));
+	$d = new DateTime($dateStr, new DateTimeZone('UTC'));
+	$d->setTimezone(new DateTimeZone(common_timezone()));
+	return $d->format('c');
 }
 
 function common_redirect($url, $code=307) {
-- 
cgit v1.2.3-54-g00ecf