extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fixed not working last event"

Browse Source
This commit is contained in:
Ralf Becker 2008-02-15 02:17:47 +00:00
parent 7c5b6c94d6
commit 9aa040bec2
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,16 +155,24 @@ class addressbook_merge // extends bo_merge
'num_rows' => 20, 'num_rows' => 20,
'order' => 'cal_start', 'order' => 'cal_start',
)); ));
array_unshift($events,false); unset($events[0]); // renumber the array to start with key 1, instead of 0 if ($events)
if ($last_event_too)
{ {
list($events['-1']) = $calendar->search(array( array_unshift($events,false); unset($events[0]); // renumber the array to start with key 1, instead of 0
}
else
{
$events = array();
}
if ($last_event_too=true)
{
$last = $calendar->search(array(
'end' => $calendar->now_su, 'end' => $calendar->now_su,
'users' => 'c'.$id, 'users' => 'c'.$id,
'offset' => 0, 'offset' => 0,
'num_rows' => 1, 'num_rows' => 1,
'order' => 'cal_start DESC', 'order' => 'cal_start DESC',
)); ));
if ($last) $events['-1'] = array_shift($last); // returned events are indexed by cal_id!
} }
$replacements = array(); $replacements = array();
foreach($events as $n => $event) foreach($events as $n => $event)
@ -311,7 +319,7 @@ class addressbook_merge // extends bo_merge
echo '<tr><td>$$'.$name.'$$</td><td colspan="3">'.$label."</td></tr>\n"; echo '<tr><td>$$'.$name.'$$</td><td colspan="3">'.$label."</td></tr>\n";
} }
$GLOBALS['egw']->translation->add_app('calendar'); $GLOBALS['egw']->translation->add_app('calendar');
echo '<tr><td colspan="4"><h3>'.lang('Calendar fields:')." # = 1, 2, ..., 20</h3></td></tr>"; echo '<tr><td colspan="4"><h3>'.lang('Calendar fields:')." # = 1, 2, ..., 20, -1</h3></td></tr>";
foreach(array( foreach(array(
'title' => lang('Title'), 'title' => lang('Title'),
'description' => lang('Description'), 'description' => lang('Description'),