extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 19:39:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed wrong status-code for CardDAV DELETE

Browse Source
This commit is contained in:
Ralf Becker 2012-10-01 17:26:52 +00:00
parent d7bc20bf6f
commit 8eb10b2409
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -751,7 +751,8 @@ class addressbook_bo extends addressbook_so
{ {
$delete = $old; $delete = $old;
$delete['tid'] = addressbook_so::DELETED_TYPE; $delete['tid'] = addressbook_so::DELETED_TYPE;
$ok = $this->save($delete); if ($check_etag) $delete['etag'] = $check_etag;
if (($ok = $this->save($delete))) $ok = true; // we have to return true or false
egw_link::unlink(0,'addressbook',$id,'','','',true); egw_link::unlink(0,'addressbook',$id,'','','',true);
} }
elseif (($ok = parent::delete($id,$check_etag))) elseif (($ok = parent::delete($id,$check_etag)))

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

@ -772,12 +772,15 @@ class addressbook_groupdav extends groupdav_handler
{ {
return $contact; return $contact;
} }
if (($Ok = isset($contact['list_id']) ? $this->bo->delete_list($contact['list_id']) !== false : if (isset($contact['list_id']))
$this->bo->delete($contact['id'],self::etag2value($this->http_if_match))) === 0) {
$ok = $this->bo->delete_list($contact['list_id']) !== false;
}
elseif (($ok = $this->bo->delete($contact['id'],self::etag2value($this->http_if_match))) === 0)
{ {
return '412 Precondition Failed'; return '412 Precondition Failed';
} }
return $Ok; return $ok;
} }
/** /**