forked from extern/egroupware
Fix for bug #415126 - Repeating Daily events
This commit is contained in:
parent
3a593f09c8
commit
a17a84fd72
@ -121,6 +121,13 @@
|
||||
$phpgw->calendar->event->id = $id;
|
||||
}
|
||||
|
||||
if($rpt_use_end != 'y')
|
||||
{
|
||||
$recur_enddate[year] = 0;
|
||||
$recur_enddate[month] = 0;
|
||||
$recur_enddate[mday] = 0;
|
||||
}
|
||||
|
||||
switch($recur_type)
|
||||
{
|
||||
case RECUR_NONE:
|
||||
|
@ -260,7 +260,7 @@ class calendar_ extends calendar__
|
||||
// But until then, do it this way...
|
||||
//Legacy Support
|
||||
$rpt_type = strtolower($this->stream->f('cal_type'));
|
||||
$this->event->rpt_type = !$rpt_type?'none':$rpt_type;
|
||||
$this->event->rpt_type = (!$rpt_type?'none':$rpt_type);
|
||||
|
||||
//Legacy Support (New)
|
||||
switch($this->event->rpt_type)
|
||||
@ -297,8 +297,8 @@ class calendar_ extends calendar__
|
||||
//$this->event->recur_enddate = unserialize($this->stream->f('recur_enddate'));
|
||||
// But until then, do it this way...
|
||||
//Legacy Support
|
||||
$this->event->recur_use_end = $this->stream->f('cal_use_end');
|
||||
if($this->event->recur_use_end == True)
|
||||
$this->event->rpt_end_use = $this->stream->f('cal_use_end');
|
||||
if($this->event->rpt_end_use == True)
|
||||
{
|
||||
$date = $this->localdates($this->stream->f('cal_end'));
|
||||
//Legacy Support
|
||||
@ -319,6 +319,7 @@ class calendar_ extends calendar__
|
||||
else
|
||||
{
|
||||
//Legacy Support
|
||||
$this->event->rpt_end_use = 0;
|
||||
$this->event->rpt_end = 0;
|
||||
$this->event->rpt_end_day = 0;
|
||||
$this->event->rpt_end_month = 0;
|
||||
@ -357,7 +358,7 @@ class calendar_ extends calendar__
|
||||
$this->event->recur_data += (substr($rpt_days,3,1)=='Y'?M_WEDNESDAY:0);
|
||||
$this->event->recur_data += (substr($rpt_days,4,1)=='Y'?M_THURSDAY:0);
|
||||
$this->event->recur_data += (substr($rpt_days,5,1)=='Y'?M_FRIDAY:0);
|
||||
$this->event->recur_data += (substr($rpt_days,6,1)=='Y'?M_SAYURDAY:0);
|
||||
$this->event->recur_data += (substr($rpt_days,6,1)=='Y'?M_SATURDAY:0);
|
||||
}
|
||||
|
||||
//Legacy Support
|
||||
@ -900,7 +901,7 @@ class calendar_ extends calendar__
|
||||
}
|
||||
else
|
||||
{
|
||||
$end = 'NULL';
|
||||
$end = '0';
|
||||
$use_end = 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user