diff options
| author | Nick Palmer <nick@sluggardy.net> | 2008-01-12 14:42:11 +0000 |
|---|---|---|
| committer | Nick Palmer <nick@sluggardy.net> | 2008-01-12 14:42:11 +0000 |
| commit | 309e1d2600a613a77772731ea045efe0525454fd (patch) | |
| tree | d3b2b70099983505e320e3dc4778e34f03e2284d | |
| parent | 965265d4fea99bc6d4bf7ed1744995790300ebef (diff) | |
| download | calendar-309e1d2600a613a77772731ea045efe0525454fd.tar.gz calendar-309e1d2600a613a77772731ea045efe0525454fd.tar.bz2 calendar-309e1d2600a613a77772731ea045efe0525454fd.zip | |
Get display offset from the standard place and remove double semicolons.
| -rw-r--r-- | Calendar.php | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/Calendar.php b/Calendar.php index 58bd0c5..fddaab5 100644 --- a/Calendar.php +++ b/Calendar.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_calendar/Calendar.php,v 1.42 2007/10/20 22:18:56 nickpalmer Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_calendar/Calendar.php,v 1.43 2008/01/12 14:42:11 nickpalmer Exp $ * @package calendar * * @copyright Copyright (c) 2004-2006, bitweaver.org @@ -25,12 +25,7 @@ class Calendar extends LibertyContent { LibertyContent::LibertyContent(); global $gBitUser; $this->mDate = new BitDate(0); - $this->display_offset; - if ( $gBitUser->getPreference('site_display_utc', "UTC") == 'Local' ) { - $this->display_offset = $this->mDate->display_offset; - } elseif ( $gBitUser->getPreference('site_display_utc', "UTC") == 'Fixed' ) { - $this->display_offset = $gBitUser->getPreference('site_display_timezone', 0); - } + $this->display_offset = BitDate::get_display_offset(); } /** @@ -52,10 +47,10 @@ class Calendar extends LibertyContent { foreach( $res['data'] as $item ) { // shift all time data by user timezone offset // and then display as a simple UTC time - $item['timestamp'] = $item[$pListHash['time_limit_column']] + $this->display_offset;; - $item['created'] = $item['created'] + $this->display_offset;; - $item['last_modified'] = $item['last_modified'] + $this->display_offset;; - $item['event_time'] = $item['event_time'] + $this->display_offset;; + $item['timestamp'] = $item[$pListHash['time_limit_column']] + $this->display_offset; + $item['created'] = $item['created'] + $this->display_offset; + $item['last_modified'] = $item['last_modified'] + $this->display_offset; + $item['event_time'] = $item['event_time'] + $this->display_offset; $item['parsed'] = $this->parseData($item['data'], $item['format_guid']); $dstart = $this->mDate->gmmktime( 0, 0, 0, $this->mDate->date( "m", $item['timestamp'], true ), $this->mDate->date( "d", $item['timestamp'], true ), $this->mDate->date( "Y", $item['timestamp'], true ) ); $ret[$dstart][] = $item; |