nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-07-13 10:40:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DAV::owner should be wrapped with DAV::property in DAV::ace response.

Browse Source
This commit is contained in:
Andrew McMillan 2009-12-28 13:17:48 +13:00
parent 678b00a927
commit 023e4db443
8 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/DAVResource.php
View File

@ -885,7 +885,7 @@ EOQRY;
if ( isset($this->collection->default_privileges) ) $default_privs = $this->collection->default_privileges;
$acl = array();
$acl[] = $this->BuildACE($xmldoc, pow(2,25) - 1, new XMLElement('owner') );
$acl[] = $this->BuildACE($xmldoc, pow(2,25) - 1, new XMLElement('property', new XMLElement('owner')) );
$qry = new AwlQuery('SELECT dav_principal.dav_name, grants.* FROM grants JOIN dav_principal ON (to_principal=principal_id) WHERE by_collection = :collection_id OR by_principal = :principal_id ORDER BY by_collection',
array( ':collection_id' => $this->collection->collection_id, ':principal_id' => $this->principal->principal_id ) );

4
testing/tests/regression-suite/820-Spec-PROPFIND-1.result
View File

@ -7,7 +7,9 @@
<acl>
<ace>
<principal>
<owner/>
<property>
<owner/>
</property>
</principal>
<grant>
<privilege>

4
testing/tests/regression-suite/823-Spec-PROPFIND-4.result
View File

@ -7,7 +7,9 @@
<acl>
<ace>
<principal>
<owner/>
<property>
<owner/>
</property>
</principal>
<grant>
<privilege>

4
testing/tests/regression-suite/826-Spec-PROPFIND.result
View File

@ -7,7 +7,9 @@
<acl>
<ace>
<principal>
<owner/>
<property>
<owner/>
</property>
</principal>
<grant>
<privilege>

16
testing/tests/regression-suite/827-Spec-PROPFIND.result
View File

@ -7,7 +7,9 @@
<acl>
<ace>
<principal>
<owner/>
<property>
<owner/>
</property>
</principal>
<grant>
<privilege>
@ -176,7 +178,9 @@
<acl>
<ace>
<principal>
<owner/>
<property>
<owner/>
</property>
</principal>
<grant>
<privilege>
@ -452,7 +456,9 @@
<acl>
<ace>
<principal>
<owner/>
<property>
<owner/>
</property>
</principal>
<grant>
<privilege>
@ -663,7 +669,9 @@
<acl>
<ace>
<principal>
<owner/>
<property>
<owner/>
</property>
</principal>
<grant>
<privilege>

4
testing/tests/regression-suite/870-Principal-PROPFIND.result
View File

@ -7,7 +7,9 @@
<acl>
<ace>
<principal>
<owner/>
<property>
<owner/>
</property>
</principal>
<grant>
<privilege>

8
testing/tests/regression-suite/934-PROPFIND-acl.result
View File

@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
ETag: "3c91706759f813f5818c9b8c0ce93749"
Content-Length: 3241
ETag: "f77289f499b29c349a55dfa7c887f41a"
Content-Length: 3279
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -14,7 +14,9 @@ Content-Type: text/xml; charset="utf-8"
<acl>
<ace>
<principal>
<owner/>
<property>
<owner/>
</property>
</principal>
<grant>
<privilege>

8
testing/tests/regression-suite/935-PROPFIND-acl.result
View File

@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
ETag: "086405bbb629ed2167aa99d2f293cd2c"
Content-Length: 3430
ETag: "5cbcaed6b7f479b9a063da87cf26bded"
Content-Length: 3468
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -14,7 +14,9 @@ Content-Type: text/xml; charset="utf-8"
<acl>
<ace>
<principal>
<owner/>
<property>
<owner/>
</property>
</principal>
<grant>
<privilege>