extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 09:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change calendar filter 'all' to include 'owner'; typo in get_recurrences()

Browse Source
This commit is contained in:
Jörg Lehrke 2009-11-29 21:02:15 +00:00
parent 1230fc99c9
commit 3fa506f24a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_so.inc.php
View File

@ -338,7 +338,7 @@ class calendar_so
'cal_user_type' => $type, 'cal_user_type' => $type,
'cal_user_id' => $ids, '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); $cal_table_def = $this->db->get_table_definitions('calendar',$this->cal_table);
$to_or[] = $this->db->expression($cal_table_def,array('cal_owner' => $ids)); $to_or[] = $this->db->expression($cal_table_def,array('cal_owner' => $ids));
@ -1381,7 +1381,7 @@ ORDER BY cal_user_type, cal_usre_id
$participant_status = array(); $participant_status = array();
$where = array('cal_id' => $cal_id); $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)$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) if ($start != 0 && $end != 0)
{ {
$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start . $where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
@ -1398,7 +1398,7 @@ ORDER BY cal_user_type, cal_usre_id
'cal_user_id' => $user_id, '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)$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) if ($start != 0 && $end != 0)
{ {
$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start . $where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .