extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 01:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

* CardDAV/Addressbook: Fix contact categories were cleared when DAVx5 synced some Android clients

Browse Source
This commit is contained in:
nathangray 2021-04-30 09:26:00 -06:00 committed by Ralf Becker
parent ab389f314e
commit feb4fbbe74
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addressbook/inc/class.addressbook_groupdav.inc.php
View File

@ -653,7 +653,19 @@ class addressbook_groupdav extends Api\CalDAV\Handler
}
elseif ($contactId > 0)
{
$contact['cat_id'] = null;
switch(Api\CalDAV\Handler::get_agent())
{
case 'davx5':
// DAVx5 does not always give us our categories back (Seems to depend on client)
if(is_null($contact['cat_id']) && $oldContact['cat_id'])
{
$contact['cat_id'] = $oldContact['cat_id'];
}
break;
default:
//
$contact['cat_id'] = null;
}
}
if (is_array($oldContact))
{

1
api/src/CalDAV/Handler.php
View File

@ -457,6 +457,7 @@ abstract class Handler
'evolution' => 'evolution', // Evolution
'thunderbird' => 'thunderbird', // SOGo connector for addressbook, no Lightning installed
'caldavsynchronizer'=> 'caldavsynchronizer', // Outlook CalDAV Synchroniser (https://caldavsynchronizer.org/)
'davx5' => 'davx5', // DAVx5 (https://www.davx5.com/)
) as $pattern => $name)
{
if (strpos($user_agent,$pattern) !== false)