From: <jl...@us...> - 2009-11-29 21:02:31
|
Author: jlehrke Date: Sun Nov 29 22:02:15 2009 New Revision: 28624 URL: http://www.egroupware.org/viewvc/egroupware?rev=28624&view=rev Log: Change calendar filter 'all' to include 'owner'; typo in get_recurrences() Modified: trunk/calendar/inc/class.calendar_so.inc.php Modified: trunk/calendar/inc/class.calendar_so.inc.php URL: http://www.egroupware.org/viewvc/egroupware/trunk/calendar/inc/class.calendar_so.inc.php?rev=28624&r1=28623&r2=28624&view=diff ============================================================================== --- trunk/calendar/inc/class.calendar_so.inc.php (original) +++ trunk/calendar/inc/class.calendar_so.inc.php Sun Nov 29 22:02:15 2009 @@ -338,7 +338,7 @@ 'cal_user_type' => $type, 'cal_user_id' => $ids, )); - if ($type == 'u' && $filter == 'owner') + if ($type == 'u' && ($filter == 'owner' || $filter == 'all')) { $cal_table_def = $this->db->get_table_definitions('calendar',$this->cal_table); $to_or[] = $this->db->expression($cal_table_def,array('cal_owner' => $ids)); @@ -1381,7 +1381,7 @@ $participant_status = array(); $where = array('cal_id' => $cal_id); if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')'; - if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date =< ' . (int)$end . ')'; + if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')'; if ($start != 0 && $end != 0) { $where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start . @@ -1398,7 +1398,7 @@ 'cal_user_id' => $user_id, ); if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')'; - if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date =< ' . (int)$end . ')'; + if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')'; if ($start != 0 && $end != 0) { $where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start . |