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

This fixes various little errors. One important thing is that when checking for overlapping events, it does not take into account repeating events.

Browse Source
This commit is contained in:
skeeter 2001-06-16 19:09:21 +00:00
parent 18372e44a5
commit 0f055a3543
1 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
calendar/inc/class.calendar.inc.php
View File

@ -675,15 +675,18 @@ class calendar extends calendar_
$outer_etime = mktime($outer->end->hour,$outer->end->min,$outer->end->sec,$outer->end->month,$outer->end->mday,$outer->end->year) - $this->datetime->tz_offset; $outer_etime = mktime($outer->end->hour,$outer->end->min,$outer->end->sec,$outer->end->month,$outer->end->mday,$outer->end->year) - $this->datetime->tz_offset;
$ostime = $phpgw->common->show_date($outer_stime,'Hi'); $ostime = $phpgw->common->show_date($outer_stime,'Hi');
$oetime = $phpgw->common->show_date($outer_etime,'Hi'); $oetime = $phpgw->common->show_date($outer_etime,'Hi');
if($outer_stime < $datetime) if($outer->recur_type == MCAL_RECUR_NONE)
{ {
$ostime = 0; if($outer_stime < $datetime)
} {
$ostime = 0;
}
if($outer_etime > $eod) if($outer_etime > $eod)
{ {
$oetime = 2359; $oetime = 2359;
}
} }
for($inner_loop=$outer_loop;$inner_loop<$this->sorted_events_matching;$inner_loop++) for($inner_loop=$outer_loop;$inner_loop<$this->sorted_events_matching;$inner_loop++)
@ -694,18 +697,20 @@ class calendar extends calendar_
$istime = $phpgw->common->show_date($inner_stime,'Hi'); $istime = $phpgw->common->show_date($inner_stime,'Hi');
$ietime = $phpgw->common->show_date($inner_etime,'Hi'); $ietime = $phpgw->common->show_date($inner_etime,'Hi');
if($inner_stime < $datetime) if($inner->recur_type == MCAL_RECUR_NONE)
{ {
$istime = 0; if($inner_stime < $datetime)
{
$istime = 0;
}
if($inner_etime > ($datetime + 86399))
{
$ietime = 2359;
}
} }
if($inner_etime > ($datetime + 86399)) if(($ostime > $istime) || (($ostime == $istime) && ($oetime > $ietime)))
{
$ietime = 2359;
}
if(($ostime > $istime) ||
(($ostime == $istime) && ($oetime > $ietime)))
{ {
$temp = $events[$inner_loop]; $temp = $events[$inner_loop];
$events[$inner_loop] = $events[$outer_loop]; $events[$inner_loop] = $events[$outer_loop];
@ -904,12 +909,9 @@ class calendar extends calendar_
$retval = Array(); $retval = Array();
$ok = False; $ok = False;
$starttime -= $this->datetime->tz_offset;
$endtime -= $this->datetime->tz_offset;
if($starttime == $endtime) if($starttime == $endtime)
{ {
$endtime = mktime(0,0,0,$phpgw->common->show_date($starttime,'m'),$phpgw->common->show_date($starttime,'d') + 1,$phpgw->common->show_date($starttime,'Y')) - $this->datetime->tz_offset - 1; $endtime = mktime(23,59,59,$phpgw->common->show_date($starttime,'m'),$phpgw->common->show_date($starttime,'d') + 1,$phpgw->common->show_date($starttime,'Y')) - $this->datetime->tz_offset;
} }
$sql = 'AND ((('.$starttime.' <= phpgw_cal.datetime) AND ('.$endtime.' >= phpgw_cal.datetime) AND ('.$endtime.' <= phpgw_cal.edatetime)) ' $sql = 'AND ((('.$starttime.' <= phpgw_cal.datetime) AND ('.$endtime.' >= phpgw_cal.datetime) AND ('.$endtime.' <= phpgw_cal.edatetime)) '
@ -922,13 +924,18 @@ class calendar extends calendar_
$p_g = ''; $p_g = '';
if(count($participants)) if(count($participants))
{ {
while(list($user,) = each($participants)) $users = '';
while(list($user,$status) = each($participants))
{ {
if($p_g) if($users)
{ {
$p_g .= ' OR '; $users .= ',';
} }
$p_g .= 'phpgw_cal_user.cal_login='.$user; $users .= $user;
}
if($users)
{
$p_g .= 'phpgw_cal_user.cal_login in ('.$users.')';
} }
} }
if($p_g) if($p_g)
@ -942,13 +949,16 @@ class calendar extends calendar_
$sql .= ' AND phpgw_cal.cal_id <> '.$id; $sql .= ' AND phpgw_cal.cal_id <> '.$id;
} }
$db2 = $phpgw->db; $sql .= ' ORDER BY phpgw_cal.datetime ASC, phpgw_cal.edatetime ASC, phpgw_cal.priority ASC';
$events = $this->get_event_ids(False,$sql); $events = $this->get_event_ids(False,$sql);
if($events == False) if($events == False)
{ {
return false; return false;
} }
$db2 = $phpgw->db;
for($i=0;$i<count($events);$i++) for($i=0;$i<count($events);$i++)
{ {
$db2->query('SELECT recur_type FROM phpgw_cal_repeats WHERE cal_id='.$events[$i],__LINE__,__FILE__); $db2->query('SELECT recur_type FROM phpgw_cal_repeats WHERE cal_id='.$events[$i],__LINE__,__FILE__);
@ -1712,26 +1722,26 @@ class calendar extends calendar_
// Repeated Events // Repeated Events
$rpt_type = Array( $rpt_type = Array(
'none', MCAL_RECUR_NONE => 'none',
'daily', MCAL_RECUR_DAILY => 'daily',
'weekly', MCAL_RECUR_WEEKLY => 'weekly',
'monthlybyday', MCAL_RECUR_MONTHLY_WDAY => 'monthlybyday',
'monthlybydate', MCAL_RECUR_MONTHLY_MDAY => 'monthlybydate',
'yearly' MCAL_RECUR_YEARLY => 'yearly'
); );
$str = lang($rpt_type[$event->recur_type]); $str = lang($rpt_type[$event->recur_type]);
if($event->recur_type <> MCAL_RECUR_NONE) if($event->recur_type <> MCAL_RECUR_NONE)
{ {
$str .= ' ('; $str_extra = '';
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 = mktime($event->recur_enddate->hour,$event->recur_enddate->min,$event->recur_enddate->sec,$event->recur_enddate->month,$event->recur_enddate->mday,$event->recur_enddate->year); $recur_end = mktime($event->recur_enddate->hour,$event->recur_enddate->min,$event->recur_enddate->sec,$event->recur_enddate->month,$event->recur_enddate->mday,$event->recur_enddate->year);
if($recur_end != 0) if($recur_end != 0)
{ {
$recur_end -= $this->datetime->tz_offset; $recur_end -= $this->datetime->tz_offset;
$str .= lang('ends').': '.lang($phpgw->common->show_date($recur_end,'l')); $str_extra .= lang('ends').': '.lang($phpgw->common->show_date($recur_end,'l'));
$str .= ', '.lang($phpgw->common->show_date($recur_end,'F')); $str_extra .= ', '.lang($phpgw->common->show_date($recur_end,'F'));
$str .= ' '.$phpgw->common->show_date($recur_end,'d, Y').' '; $str_extra .= ' '.$phpgw->common->show_date($recur_end,'d, Y').' ';
} }
} }
if($event->recur_type == MCAL_RECUR_WEEKLY || $event->recur_type == MCAL_RECUR_DAILY) if($event->recur_type == MCAL_RECUR_WEEKLY || $event->recur_type == MCAL_RECUR_DAILY)
@ -1777,14 +1787,18 @@ class calendar extends calendar_
} }
if($repeat_days <> '') if($repeat_days <> '')
{ {
$str .= lang('days repeated').': '.$repeat_days; $str_extra .= lang('days repeated').': '.$repeat_days;
} }
} }
if($event->recur_interval) if($event->recur_interval)
{ {
$str .= lang('Interval').': '.$event->recur_interval; $str_extra .= lang('Interval').': '.$event->recur_interval;
}
if($str_extra)
{
$str .= ' ('.$str_extra.')';
} }
$str .= ')';
$var = Array( $var = Array(
'field' => lang('Repetition'), 'field' => lang('Repetition'),