mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 23:29:31 +01:00
* Addressbook: allow sharing of individual contacts to make them available to other addressbooks or users
add contact info to check_shared_with call, so sharerequires policy uses current data
This commit is contained in:
parent
23223d785d
commit
acf9b33afb
@ -2219,7 +2219,7 @@ class addressbook_ui extends addressbook_bo
|
||||
foreach($content['shared'] as $key => $shared)
|
||||
{
|
||||
$shared_value = $shared['shared_id'].':'.$shared['shared_with'].':'.$shared['shared_by'].':'.$shared['shared_writable'];
|
||||
if (($k = array_search($shared_value, $content['shared_values'])) === false)
|
||||
if (($k = array_search($shared_value, (array)$content['shared_values'])) === false)
|
||||
{
|
||||
unset($content['shared'][$key]);
|
||||
}
|
||||
@ -2228,9 +2228,11 @@ class addressbook_ui extends addressbook_bo
|
||||
unset($content['shared_values'][$k]);
|
||||
}
|
||||
}
|
||||
foreach($content['shared_values'] as $account_id)
|
||||
foreach((array)$content['shared_values'] as $account_id)
|
||||
{
|
||||
$content['shared'][] = [
|
||||
'contact_id' => $content['id'],
|
||||
'contact' => $content,
|
||||
'shared_with' => $account_id,
|
||||
'shared_by' => $this->user,
|
||||
'shared_at' => new Api\DateTime(),
|
||||
|
Loading…
Reference in New Issue
Block a user