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

remove config allowing to immediately delete contacts (as it's required for sync)

Browse Source
This commit is contained in:
Ralf Becker 2021-05-18 14:02:51 +02:00
parent 45c89a7930
commit 166718a22c
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -920,14 +920,10 @@ class addressbook_groupdav extends Api\CalDAV\Handler
'addressbook-multiget' => Api\CalDAV::mkprop('supported-report',array( 'addressbook-multiget' => Api\CalDAV::mkprop('supported-report',array(
Api\CalDAV::mkprop('report',array( Api\CalDAV::mkprop('report',array(
Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-multiget',''))))), Api\CalDAV::mkprop(Api\CalDAV::CARDDAV,'addressbook-multiget',''))))),
); 'sync-collection' => Api\CalDAV::mkprop('supported-report',array(
// only advertice rfc 6578 sync-collection report, if "delete-prevention" is switched on (deleted entries get marked deleted but not actualy deleted
if ($GLOBALS['egw_info']['server']['history'])
{
$props['supported-report-set']['sync-collection'] = Api\CalDAV::mkprop('supported-report',array(
Api\CalDAV::mkprop('report',array( Api\CalDAV::mkprop('report',array(
Api\CalDAV::mkprop('sync-collection',''))))); Api\CalDAV::mkprop('sync-collection',''))))),
} );
return $props; return $props;
} }

3
addressbook/templates/default/config.xet
View File

@ -101,8 +101,7 @@
<row> <row>
<description value="Prevent deleting of contacts"/> <description value="Prevent deleting of contacts"/>
<select id="newsettings[history]"> <select id="newsettings[history]">
<option value="">No</option> <option value="">Yes, only admins can purge deleted items</option>
<option value="history">Yes, only admins can purge deleted items</option>
<option value="userpurge">Yes, users can purge their deleted items</option> <option value="userpurge">Yes, users can purge their deleted items</option>
</select> </select>
</row> </row>

3
api/src/Contacts.php
View File

@ -848,10 +848,9 @@ class Contacts extends Contacts\Storage
if ($this->check_perms(Acl::DELETE,$c,$deny_account_delete)) if ($this->check_perms(Acl::DELETE,$c,$deny_account_delete))
{ {
if (!($old = $this->read($id))) return false; if (!($old = $this->read($id))) return false;
// check if we only mark contacts as deleted, or really delete them
// already marked as deleted item and accounts are always really deleted // already marked as deleted item and accounts are always really deleted
// we cant mark accounts as deleted, as no such thing exists for accounts! // we cant mark accounts as deleted, as no such thing exists for accounts!
if ($old['owner'] && $this->delete_history != '' && $old['tid'] != self::DELETED_TYPE) if ($old['owner'] && $old['tid'] !== self::DELETED_TYPE)
{ {
$delete = $old; $delete = $old;
$delete['tid'] = self::DELETED_TYPE; $delete['tid'] = self::DELETED_TYPE;