holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better handling for multi-day events - properly show up for each day of the week

Browse Source
This commit is contained in:
Nathan Gray 2011-02-18 16:09:42 +00:00
parent f41e44fee7
commit e70f70f148
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.calendar_merge.inc.php
View File

@ -82,6 +82,7 @@ class calendar_merge extends bo_merge
}
$this->query = $GLOBALS['egw']->session->appsession('session_data','calendar');
$this->query['users'] = explode(',', $this->query['owner']);
$this->query['num_rows'] = -1;
}
/**
@ -216,7 +217,14 @@ class calendar_merge extends bo_merge
{
foreach($list as $key => $event)
{
$days[date('Ymd',$_date)][date('l',$event['start'])][] = $this->calendar_replacements($event);
$start = egw_time::to($event['start'], 'array');
$end = egw_time::to($event['end'], 'array');
if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
$dow = date('l',$event['start']);
} else {
$dow = date('l', strtotime($day));
}
$days[date('Ymd',$_date)][$dow][] = $this->calendar_replacements($event);
}
if(strpos($repeat, '$$day/date$$') !== false) {
$date_marker = array('$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)));