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

fix esync addressbooks to sync preferenence can be an array to

Browse Source
This commit is contained in:
Ralf Becker 2019-06-14 17:25:18 +02:00
parent 6f1590fcaf
commit 471742f7ec
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addressbook/inc/class.addressbook_zpush.inc.php
View File

@ -141,10 +141,11 @@ class addressbook_zpush implements activesync_plugin_write, activesync_plugin_se
if (!isset($this->addressbook)) $this->addressbook = new Api\Contacts();
// error_log(print_r($this->addressbook->get_addressbooks(Acl::READ),true));
$pref = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
$pref_abs = (string)$pref !== '' ? explode(',',$pref) : array();
$pref_abs = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
if (!is_array($pref_abs))
{
$pref_abs = $pref_abs ? explode(',',$pref_abs) : [];
}
foreach ($this->addressbook->get_addressbooks() as $account_id => $label)
{
if ((string)$account_id == $GLOBALS['egw_info']['user']['account_id'].'p')
@ -739,7 +740,12 @@ class addressbook_zpush implements activesync_plugin_write, activesync_plugin_se
if ($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one'] &&
$owner == $GLOBALS['egw_info']['user']['account_id'])
{
if (strpos($GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'],'A') !== false)
$prefs_abs = $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-abs'];
if (!is_array($prefs_abs))
{
$prefs_abs = $prefs_abs ? explode(',', $prefs_abs) : [];
}
if (in_array('A', $prefs_abs))
{
$owner = null; // all AB's
}