Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29767/phpicalendar/functions
Modified Files:
template.php
Log Message:
Dave Fallon's fix to display problem
Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** template.php 5 May 2005 00:36:53 -0000 1.67
--- template.php 5 May 2005 07:07:50 -0000 1.68
***************
*** 369,383 ****
if ($day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) {
foreach($master_array[$thisday] as $time_key => $time_arr) {
! if ((int)$time_key <= (int)$cal_time && is_array($time_arr) && $time_key != '-1') {
! foreach($time_arr as $event_tmp) {
! if ((int)$event_tmp['event_end'] > (int)$cal_time) {
! $this_time_arr[] = $event_tmp;
}
}
} else {
! #break;
}
}
! }else{
if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) {
$this_time_arr = $master_array[$thisday][$cal_time];
--- 369,385 ----
if ($day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) {
foreach($master_array[$thisday] as $time_key => $time_arr) {
! if ((int)$time_key <= (int)$cal_time) {
! if (is_array($time_arr) && $time_key != '-1') {
! foreach($time_arr as $uid => $event_tmp) {
! if ((int)$event_tmp['event_end'] > (int)$cal_time) {
! $this_time_arr[$uid] = $event_tmp;
! }
}
}
} else {
! break;
}
}
! } else {
if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) {
$this_time_arr = $master_array[$thisday][$cal_time];
***************
*** 571,589 ****
unset($this_time_arr);
-
// add events that overlap $day_start instead of cutting them out completely
if (($day_start == $cal_time) && (isset($master_array[$getdate]))) {
foreach($master_array[$getdate] as $time_key => $time_arr) {
! if ((int)$time_key <= (int)$cal_time && is_array($time_arr) && $time_key != '-1') {
! foreach($time_arr as $event_tmp) {
! if ((int)$event_tmp['event_end'] > (int)$cal_time) {
! $this_time_arr[] = $event_tmp;
}
}
} else {
! #break;
}
}
! }else{
// add events that overlap the start time
if (isset($master_array[$getdate][$cal_time]) && sizeof($master_array[$getdate][$cal_time]) > 0) {
--- 573,592 ----
unset($this_time_arr);
// add events that overlap $day_start instead of cutting them out completely
if (($day_start == $cal_time) && (isset($master_array[$getdate]))) {
foreach($master_array[$getdate] as $time_key => $time_arr) {
! if ((int)$time_key <= (int)$cal_time) {
! if (is_array($time_arr) && $time_key != '-1') {
! foreach($time_arr as $uid => $event_tmp) {
! if ((int)$event_tmp['event_end'] > (int)$cal_time) {
! $this_time_arr[$uid] = $event_tmp;
! }
}
}
} else {
! break;
}
}
! } else {
// add events that overlap the start time
if (isset($master_array[$getdate][$cal_time]) && sizeof($master_array[$getdate][$cal_time]) > 0) {
|
