extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 08:09:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include recurring events in previous / next event for contact

Browse Source
This commit is contained in:
Nathan Gray 2012-01-23 15:34:12 +00:00
parent 4ab9c5ed1f
commit 3b17d0dde0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addressbook/inc/class.addressbook_merge.inc.php
View File

@ -83,12 +83,9 @@ class addressbook_merge extends bo_merge
'offset' => 0, 'offset' => 0,
'num_rows' => 20, 'num_rows' => 20,
'order' => 'cal_start', 'order' => 'cal_start',
'enum_recurring' => true
)); ));
if ($events) if (!$events)
{
array_unshift($events,false); unset($events[0]); // renumber the array to start with key 1, instead of 0
}
else
{ {
$events = array(); $events = array();
} }
@ -100,12 +97,17 @@ class addressbook_merge extends bo_merge
'offset' => 0, 'offset' => 0,
'num_rows' => 1, 'num_rows' => 1,
'order' => 'cal_start DESC', 'order' => 'cal_start DESC',
'enum_recurring' => true
)); ));
$events['-1'] = $last ? array_shift($last) : array(); // returned events are indexed by cal_id! $events['-1'] = $last ? array_shift($last) : array(); // returned events are indexed by cal_id!
} }
$replacements = array(); $replacements = array();
foreach($events as $n => $event) $n = 1; // Returned events are indexed by cal_id, need to index sequentially
foreach($events as $key => $event)
{ {
// Use -1 for previous key
if($key < 0) $n = $key;
foreach($calendar->event2array($event) as $name => $data) foreach($calendar->event2array($event) as $name => $data)
{ {
if (substr($name,-4) == 'date') $name = substr($name,0,-4); if (substr($name,-4) == 'date') $name = substr($name,0,-4);