From 023e4db443e72201789e53558171e21fac0823f0 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Mon, 28 Dec 2009 13:17:48 +1300
Subject: [PATCH] DAV::owner should be wrapped with DAV::property in DAV::ace
 response.

---
 inc/DAVResource.php                              |  2 +-
 .../regression-suite/820-Spec-PROPFIND-1.result  |  4 +++-
 .../regression-suite/823-Spec-PROPFIND-4.result  |  4 +++-
 .../regression-suite/826-Spec-PROPFIND.result    |  4 +++-
 .../regression-suite/827-Spec-PROPFIND.result    | 16 ++++++++++++----
 .../870-Principal-PROPFIND.result                |  4 +++-
 .../regression-suite/934-PROPFIND-acl.result     |  8 +++++---
 .../regression-suite/935-PROPFIND-acl.result     |  8 +++++---
 8 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/inc/DAVResource.php b/inc/DAVResource.php
index 493a9f6f..5a2bb558 100644
--- a/inc/DAVResource.php
+++ b/inc/DAVResource.php
@@ -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 ) );
diff --git a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
index 67df9914..9e0edb8c 100644
--- a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
+++ b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
@@ -7,7 +7,9 @@
     <acl>
      <ace>
       <principal>
-       <owner/>
+       <property>
+        <owner/>
+       </property>
       </principal>
       <grant>
        <privilege>
diff --git a/testing/tests/regression-suite/823-Spec-PROPFIND-4.result b/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
index 99dde57b..7ffc2eef 100644
--- a/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
+++ b/testing/tests/regression-suite/823-Spec-PROPFIND-4.result
@@ -7,7 +7,9 @@
     <acl>
      <ace>
       <principal>
-       <owner/>
+       <property>
+        <owner/>
+       </property>
       </principal>
       <grant>
        <privilege>
diff --git a/testing/tests/regression-suite/826-Spec-PROPFIND.result b/testing/tests/regression-suite/826-Spec-PROPFIND.result
index 3cbcd919..392d2638 100644
--- a/testing/tests/regression-suite/826-Spec-PROPFIND.result
+++ b/testing/tests/regression-suite/826-Spec-PROPFIND.result
@@ -7,7 +7,9 @@
     <acl>
      <ace>
       <principal>
-       <owner/>
+       <property>
+        <owner/>
+       </property>
       </principal>
       <grant>
        <privilege>
diff --git a/testing/tests/regression-suite/827-Spec-PROPFIND.result b/testing/tests/regression-suite/827-Spec-PROPFIND.result
index 73aeab81..c7834239 100644
--- a/testing/tests/regression-suite/827-Spec-PROPFIND.result
+++ b/testing/tests/regression-suite/827-Spec-PROPFIND.result
@@ -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>
diff --git a/testing/tests/regression-suite/870-Principal-PROPFIND.result b/testing/tests/regression-suite/870-Principal-PROPFIND.result
index 474b06a0..fed87b13 100644
--- a/testing/tests/regression-suite/870-Principal-PROPFIND.result
+++ b/testing/tests/regression-suite/870-Principal-PROPFIND.result
@@ -7,7 +7,9 @@
     <acl>
      <ace>
       <principal>
-       <owner/>
+       <property>
+        <owner/>
+       </property>
       </principal>
       <grant>
        <privilege>
diff --git a/testing/tests/regression-suite/934-PROPFIND-acl.result b/testing/tests/regression-suite/934-PROPFIND-acl.result
index 457bfde5..3535a1b1 100644
--- a/testing/tests/regression-suite/934-PROPFIND-acl.result
+++ b/testing/tests/regression-suite/934-PROPFIND-acl.result
@@ -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>
diff --git a/testing/tests/regression-suite/935-PROPFIND-acl.result b/testing/tests/regression-suite/935-PROPFIND-acl.result
index 839fc7c3..ebfe93b7 100644
--- a/testing/tests/regression-suite/935-PROPFIND-acl.result
+++ b/testing/tests/regression-suite/935-PROPFIND-acl.result
@@ -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>