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

Fix for bug #415126 - Repeating Daily events

Browse Source
This commit is contained in:
skeeter 2001-04-14 02:05:54 +00:00
parent 3a593f09c8
commit a17a84fd72
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/edit_entry_handler.php
View File

@ -121,6 +121,13 @@
$phpgw->calendar->event->id = $id; $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) switch($recur_type)
{ {
case RECUR_NONE: case RECUR_NONE:

25
calendar/inc/class.calendar_sql.inc.php
View File

@ -260,7 +260,7 @@ class calendar_ extends calendar__
// But until then, do it this way... // But until then, do it this way...
//Legacy Support //Legacy Support
$rpt_type = strtolower($this->stream->f('cal_type')); $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) //Legacy Support (New)
switch($this->event->rpt_type) switch($this->event->rpt_type)
@ -297,8 +297,8 @@ class calendar_ extends calendar__
//$this->event->recur_enddate = unserialize($this->stream->f('recur_enddate')); //$this->event->recur_enddate = unserialize($this->stream->f('recur_enddate'));
// But until then, do it this way... // But until then, do it this way...
//Legacy Support //Legacy Support
$this->event->recur_use_end = $this->stream->f('cal_use_end'); $this->event->rpt_end_use = $this->stream->f('cal_use_end');
if($this->event->recur_use_end == True) if($this->event->rpt_end_use == True)
{ {
$date = $this->localdates($this->stream->f('cal_end')); $date = $this->localdates($this->stream->f('cal_end'));
//Legacy Support //Legacy Support
@ -319,6 +319,7 @@ class calendar_ extends calendar__
else else
{ {
//Legacy Support //Legacy Support
$this->event->rpt_end_use = 0;
$this->event->rpt_end = 0; $this->event->rpt_end = 0;
$this->event->rpt_end_day = 0; $this->event->rpt_end_day = 0;
$this->event->rpt_end_month = 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,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,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,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 //Legacy Support
@ -681,13 +682,13 @@ class calendar_ extends calendar__
$this->set_common_recur(intval($year),intval($month),intval($day),$interval); $this->set_common_recur(intval($year),intval($month),intval($day),$interval);
$this->event->rpt_sun = (intval($weekdays) & M_SUNDAY ?1:0); $this->event->rpt_sun = (intval($weekdays) & M_SUNDAY ? 1 : 0);
$this->event->rpt_mon = (intval($weekdays) & M_MONDAY ?1:0); $this->event->rpt_mon = (intval($weekdays) & M_MONDAY ? 1 : 0);
$this->event->rpt_tue = (intval($weekdays) & M_TUESDAY ?1:0); $this->event->rpt_tue = (intval($weekdays) & M_TUESDAY ? 1 : 0);
$this->event->rpt_wed = (intval($weekdays) & M_WEDNESDAY?1:0); $this->event->rpt_wed = (intval($weekdays) & M_WEDNESDAY ? 1 : 0);
$this->event->rpt_thu = (intval($weekdays) & M_THURSDAY ?1:0); $this->event->rpt_thu = (intval($weekdays) & M_THURSDAY ? 1 : 0);
$this->event->rpt_fri = (intval($weekdays) & M_FRIDAY ?1:0); $this->event->rpt_fri = (intval($weekdays) & M_FRIDAY ? 1 : 0);
$this->event->rpt_sat = (intval($weekdays) & M_SATURDAY ?1:0); $this->event->rpt_sat = (intval($weekdays) & M_SATURDAY ? 1 : 0);
$this->event->rpt_days = $this->event->rpt_days =
($this->event->rpt_sun == 1?'y':'n') ($this->event->rpt_sun == 1?'y':'n')
@ -900,7 +901,7 @@ class calendar_ extends calendar__
} }
else else
{ {
$end = 'NULL'; $end = '0';
$use_end = 0; $use_end = 0;
} }