From 195553ad26b4c8c3639041698309b47ae6d1b1f3 Mon Sep 17 00:00:00 2001
From: Jim Hu <jimhu@users.sourceforge.net>
Date: Sat, 27 Dec 2008 11:42:41 +0000
Subject: do not check overlap on all day events -- yet

---
 calendars/test.ics             | 11 +++++------
 config.inc.php                 |  2 +-
 functions/parse/end_vevent.php |  4 ++--
 functions/template.php         |  1 +
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/calendars/test.ics b/calendars/test.ics
index e1930b4..2ceb909 100644
--- a/calendars/test.ics
+++ b/calendars/test.ics
@@ -43,8 +43,8 @@ DTSTAMP:20081128T075151Z
 LAST-MODIFIED:20081128T075152
 SUMMARY:Witchcraft EST
 CATEGORIES:jdr
-DTSTART;TZID=US/Eastern:20081211T100000
-DTEND;TZID=US/Eastern:20081211T130000
+DTSTART;TZID=US/Eastern:20081211T160000
+DTEND;TZID=US/Eastern:20081212T03000
 CLASS:PUBLIC
 SEQUENCE:1
 CREATED:20081128T075152
@@ -67,11 +67,10 @@ END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:7
 DTSTAMP:20020918T224617Z
-SUMMARY:Daily for 10 occurrences
+SUMMARY:5 days
 STATUS:CONFIRMED
-DURATION:PT1H30M
-DTSTART;TZID=US/Eastern:20100902T090000
-RRULE:FREQ=DAILY;COUNT=10
+DURATION:P4DT48H
+DTSTART;TZID=US/Eastern:20081212
 URL:http://google.com
 END:VEVENT
 
diff --git a/config.inc.php b/config.inc.php
index 28ec7f3..bc48501 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -14,7 +14,7 @@ $configs = array(
 	'show_search'	=> 'yes',
 #	'show_todos'	=> 'no',
 	'show_completed'	=> 'no',
-#	'timezone'	=> 'US/Central',
+	'timezone'	=> 'US/Central',
 #	'timezone'	=> 'America/Bogota',
 #	'timezone'	=> 'Europe/Paris',
 #	'gridLength' => 5,
diff --git a/functions/parse/end_vevent.php b/functions/parse/end_vevent.php
index 502d54c..9a13bbe 100644
--- a/functions/parse/end_vevent.php
+++ b/functions/parse/end_vevent.php
@@ -320,7 +320,7 @@ foreach($recur_data as $recur_data_unixtime) {
 			# the day is not the last day of the recurrence
 			if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400';
 		}
-		if($this_date_tmp == $end_date_tmp && $end_time == '0000') continue;
+		if($this_date_tmp == $end_date_tmp && ($end_time == '0000' ||$time_key == -1)) continue;
 		$master_array[$this_date_tmp][$time_key][$uid] = array (
 			'event_start' => $start_time,                	# hhmm
 			'event_end' => $end_time,                    	# hhmm
@@ -342,7 +342,7 @@ foreach($recur_data as $recur_data_unixtime) {
 			'url' => $url, 
 			'recur' => $recur
 			);
-		checkOverlap($this_date_tmp, $time_key, $uid);
+		if($time_key > -1) checkOverlap($this_date_tmp, $time_key, $uid);
 	}
 } # end foreach recur_data 
 unset($recur_data);
diff --git a/functions/template.php b/functions/template.php
index 969e7e7..95b0586 100644
--- a/functions/template.php
+++ b/functions/template.php
@@ -914,6 +914,7 @@ class Page {
 				if ($type != 'small') {
 					foreach ($master_array[$daylink] as $cal_time => $event_times) {
 						foreach ($event_times as $uid => $val) {
+							if (!isset($val['calnumber'])) continue;
 							$event_calno 	= $val['calnumber'];
 							$event_calno	= (($event_calno - 1) % $unique_colors) + 1;
 							if ($cal_time == -1) {
-- 
cgit v1.2.3