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

fix to correctly separate different extra-data for repeating events

Browse Source
This commit is contained in:
Ralf Becker 2003-11-23 13:06:12 +00:00
parent 2fe29887ff
commit 5f3defc28f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/inc/class.bocalendar.inc.php
View File

@ -3041,14 +3041,14 @@
{ {
$str = lang($this->rpt_type[$event['recur_type']]); $str = lang($this->rpt_type[$event['recur_type']]);
$str_extra = ''; $str_extra = array();
if ($event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['month'] != 0 && $event['recur_enddate']['year'] != 0) if ($event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['month'] != 0 && $event['recur_enddate']['year'] != 0)
{ {
$recur_end = $this->maketime($event['recur_enddate']); $recur_end = $this->maketime($event['recur_enddate']);
if($recur_end != 0) if($recur_end != 0)
{ {
$recur_end -= $GLOBALS['phpgw']->datetime->tz_offset; $recur_end -= $GLOBALS['phpgw']->datetime->tz_offset;
$str_extra .= lang('ends').': '.lang($GLOBALS['phpgw']->common->show_date($recur_end,'l')).', '.$this->long_date($recur_end).' '; $str_extra[] = lang('ends').': '.lang($GLOBALS['phpgw']->common->show_date($recur_end,'l')).', '.$this->long_date($recur_end).' ';
} }
} }
// only weekly uses the recur-data (days) !!! // only weekly uses the recur-data (days) !!!
@ -3064,17 +3064,17 @@
} }
if(count($repeat_days)) if(count($repeat_days))
{ {
$str_extra .= lang('days repeated').': '.implode(', ',$repeat_days); $str_extra[] = lang('days repeated').': '.implode(', ',$repeat_days);
} }
} }
if($event['recur_interval'] != 0) if($event['recur_interval'] != 0)
{ {
$str_extra .= lang('Interval').': '.$event['recur_interval']; $str_extra[] = lang('Interval').': '.$event['recur_interval'];
} }
if($str_extra) if(count($str_extra))
{ {
$str .= ' ('.$str_extra.')'; $str .= ' ('.implode(', ',$str_extra).')';
} }
$var['recure_type'] = Array( $var['recure_type'] = Array(