extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed warning if tagWholeDayOnTop($dayEvents) is called with no array, eg. false because no events found

Browse Source
This commit is contained in:
Ralf Becker 2010-01-20 23:21:00 +00:00
parent 8c1e245925
commit 74383ecb15
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -2207,31 +2207,37 @@ class calendar_uiviews extends calendar_ui
function tagWholeDayOnTop($dayEvents)
{
$this->extraRows = $this->extraRowsOriginal;
foreach ($dayEvents as $day=>$oneDayEvents)
if (is_array($dayEvents))
{
$extraRowsToAdd = 0;
foreach ($oneDayEvents as $num=>$event)
foreach ($dayEvents as $day=>$oneDayEvents)
{
$start = $this->bo->date2array($event['start']);
$end = $this->bo->date2array($event['end']);
if(!$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59)
$extraRowsToAdd = 0;
foreach ($oneDayEvents as $num => $event)
{
if($event['non_blocking'])
$start = $this->bo->date2array($event['start']);
$end = $this->bo->date2array($event['end']);
if(!$start['hour'] && !$start['minute'] && $end['hour'] == 23 && $end['minute'] == 59)
{
$dayEvents[$day][$num]['whole_day_on_top']=true;
$this->whole_day_positions[$num]=($this->rowHeight*($num+2));
$extraRowsToAdd++;
}
else
{
$dayEvents[$day][$num]['whole_day']=true;
if($event['non_blocking'])
{
$dayEvents[$day][$num]['whole_day_on_top']=true;
$this->whole_day_positions[$num]=($this->rowHeight*($num+2));
$extraRowsToAdd++;
}
else
{
$dayEvents[$day][$num]['whole_day']=true;
}
}
}
// check after every day if we have to increase $this->extraRows
if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows)
{
$this->extraRows = ($this->extraRowsOriginal+$extraRowsToAdd);
}
}
// check after every day if we have to increase $this->extraRows
if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows) { $this->extraRows = ($this->extraRowsOriginal+$extraRowsToAdd); }
}
}
return $dayEvents;
}
}