From 75b59ce12db9418b09fc8a5709a146eddb0dad93 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Mon, 8 Jun 2015 19:03:57 +0000
Subject: [PATCH] added time zone setting to server profile

---
 lam/lib/account.inc | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/lam/lib/account.inc b/lam/lib/account.inc
index 6765093b..4155bc7c 100644
--- a/lam/lib/account.inc
+++ b/lam/lib/account.inc
@@ -917,8 +917,10 @@ function compareDN(&$a, &$b) {
  * @return String formated time
  */
 function formatLDAPTimestamp($time) {
-	return substr($time, 6, 2) . '.' . substr($time, 4, 2) . '.' . substr($time, 0, 4) .
-		' ' . substr($time, 8, 2) . ':' . substr($time, 10, 2) . ':' . substr($time, 12, 2) . ' GMT';
+	$timeNumbers = substr($time, 0, -1);
+	$dateTime = DateTime::createFromFormat('YmdHis', $timeNumbers, new DateTimeZone('UTC'));
+	$dateTime->setTimezone(getTimeZone());
+	return $dateTime->format('d.m.Y H:i:s');
 }
 
 /**
@@ -1267,4 +1269,14 @@ function getTimeZoneOffsetHours() {
 	return round($dtz->getOffset(new DateTime('UTC')) / 3600);
 }
 
+/**
+ * Returns the configured time zone.
+ * 
+ * @return DateTimeZone time zone
+ */
+function getTimeZone() {
+	$timeZone = $_SESSION['config']->getTimeZone();
+	return new DateTimeZone($timeZone);
+}
+
 ?>