diff options
| author | Lester Caine <lester@lsces.co.uk> | 2008-07-21 13:37:05 +0000 |
|---|---|---|
| committer | Lester Caine <lester@lsces.co.uk> | 2008-07-21 13:37:05 +0000 |
| commit | f1e69f531d3b61011789656b87d917d38fc090ac (patch) | |
| tree | c0f88130846dd3d94a8e540190f63f22a9406db4 | |
| parent | 2269ff5cc978dc547000aa11ae3a9b1d03b3ed66 (diff) | |
| download | calendar-f1e69f531d3b61011789656b87d917d38fc090ac.tar.gz calendar-f1e69f531d3b61011789656b87d917d38fc090ac.tar.bz2 calendar-f1e69f531d3b61011789656b87d917d38fc090ac.zip | |
No need to call prepGetList twice - handled in getContentList
Range filter only needs '=' for the start time.
| -rw-r--r-- | Calendar.php | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/Calendar.php b/Calendar.php index 6aecf70..58f1b31 100644 --- a/Calendar.php +++ b/Calendar.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_calendar/Calendar.php,v 1.48 2008/06/25 22:21:08 spiderr Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_calendar/Calendar.php,v 1.49 2008/07/21 13:37:05 lsces Exp $ * @package calendar * * @copyright Copyright (c) 2004-2006, bitweaver.org @@ -42,20 +42,18 @@ class Calendar extends LibertyContent { **/ function getList( $pListHash ) { $ret = array(); - if( $this->prepGetList( $pListHash ) ) { - $res = $this->getContentList( $pListHash ); + $res = $this->getContentList( $pListHash ); - 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['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; - } + 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['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; } return $ret; } @@ -410,7 +408,7 @@ class Calendar extends LibertyContent { if( $bitEvent['timestamp'] >= $calDay[$key]['time'] && empty( $calDay[$key + 1]['time'] ) ) { $calDay[$key]['items'][] = $dayEvents[$i]; - } elseif( $bitEvent['timestamp'] >= $calDay[$key]['time'] && $bitEvent['timestamp'] <= $calDay[$key + 1]['time'] ) { + } elseif( $bitEvent['timestamp'] >= $calDay[$key]['time'] && $bitEvent['timestamp'] < $calDay[$key + 1]['time'] ) { $calDay[$key]['items'][] = $dayEvents[$i]; } } |