From 22f2acdc604c9f78ffc1c23e9291c18eb1f1e17f Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Thu, 28 Jun 2012 14:16:56 -0400
Subject: [PATCH] Use time zone class - we can't join to the table due to
upgrade restrictions
---
include/class.staff.php | 3 +--
main.inc.php | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/class.staff.php b/include/class.staff.php
index 0563d5017..99c101f00 100644
--- a/include/class.staff.php
+++ b/include/class.staff.php
@@ -25,6 +25,7 @@ class Staff {
var $dept;
var $teams;
+ var $timezone;
var $stats;
function Staff($var) {
@@ -56,12 +57,10 @@ class Staff {
if(($time=strtotime($this->ht['passwdreset']?$this->ht['passwdreset']:$this->ht['added'])))
$this->ht['passwd_change'] = time()-$time; //XXX: check timezone issues.
- /* TODO: Add timezone class
if($this->ht['timezone_id'])
$this->ht['tz_offset'] = Timezone::getOffsetById($this->ht['timezone_id']);
elseif($this->ht['timezone_offset'])
$this->ht['tz_offset'] = $this->ht['timezone_offset'];
- */
return ($this->id);
}
diff --git a/main.inc.php b/main.inc.php
index 155e4c852..31b044f4b 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -102,6 +102,7 @@
require(INCLUDE_DIR.'class.log.php');
require(INCLUDE_DIR.'class.mcrypt.php');
require(INCLUDE_DIR.'class.misc.php');
+ require(INCLUDE_DIR.'class.timezone.php');
require(INCLUDE_DIR.'class.http.php');
require(INCLUDE_DIR.'class.nav.php');
require(INCLUDE_DIR.'class.format.php'); //format helpers
--
GitLab