extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-18 11:58:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix addressbook - calendar permission issue blocking viewing contact calendar

Browse Source
This commit is contained in:
nathangray 2016-05-24 17:13:40 -06:00
parent 1756179bb3
commit 362366ed28
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Contacts.php
View File

@ -1586,7 +1586,7 @@ class Contacts extends Contacts\Storage
$data[] = array( $data[] = array(
'res_id' => $id, 'res_id' => $id,
'email' => $contact['email'] ? $contact['email'] : $contact['email_home'], 'email' => $contact['email'] ? $contact['email'] : $contact['email_home'],
'rights' => EGW_ACL_READ_FOR_PARTICIPANTS, 'rights' => Acl::CUSTOM1,
'name' => $this->link_title($contact), 'name' => $this->link_title($contact),
'cn' => trim($contact['n_given'].' '.$contact['n_family']), 'cn' => trim($contact['n_given'].' '.$contact['n_family']),
); );

5
calendar/inc/class.calendar_uilist.inc.php
View File

@ -371,9 +371,9 @@ class calendar_uilist extends calendar_ui
{ {
$search_params['users'] = is_array($params['col_filter']['participant']) ? $params['col_filter']['participant'] : array( $params['col_filter']['participant']); $search_params['users'] = is_array($params['col_filter']['participant']) ? $params['col_filter']['participant'] : array( $params['col_filter']['participant']);
} }
elseif (!$params['col_filter'] || !array_key_exists('participant',$params['col_filter'])) elseif (!$params['col_filter'] || !$params['col_filter']['participant'])
{ {
$search_params['users'] = explode(',',$this->owner); $search_params['users'] = $params['owner'] ? $params['owner'] : explode(',',$this->owner);
} }
if ($params['col_filter']) if ($params['col_filter'])
{ {
@ -396,6 +396,7 @@ class calendar_uilist extends calendar_ui
(count($search_params['users']) == 1 ? $this->bo->participant_name($search_params['users'][0]).': ' : '') . (count($search_params['users']) == 1 ? $this->bo->participant_name($search_params['users'][0]).': ' : '') .
$label); $label);
} }
error_log(__METHOD__ . ' ' .array2string($search_params));
foreach((array) $this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event) foreach((array) $this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
{ {