nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-04-30 16:00:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct response to supported-report-set property.

Browse Source
This commit is contained in:
Andrew McMillan 2009-12-24 21:37:29 +13:00
parent 46aa67acc8
commit b15b589b90
8 changed files with 79 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/CalDAVRequest.php
View File

@ -918,9 +918,9 @@ EOSQL;
$reports = array();
foreach( $this->supported_reports AS $k => $v ) {
dbg_error_log( 'caldav', 'Adding supported report "%s" which is "%s".', $k, $v );
$report = new XMLElement('supported-report');
$report = new XMLElement('report');
$reply->NSElement($report, $k );
$reports[] = $report;
$reports[] = new XMLElement('supported-report', $report );
}
return $reports;
}

4
inc/DAVResource.php
View File

@ -651,9 +651,9 @@ EOQRY;
$reports = array();
foreach( $this->supported_reports AS $k => $v ) {
dbg_error_log( 'DAVResource', ':BuildSupportedReports: Adding supported report "%s" which is "%s".', $k, $v );
$report = new XMLElement('supported-report');
$report = new XMLElement('report');
$reply->NSElement($report, $k );
$reports[] = $report;
$reports[] = new XMLElement('supported-report', $report );
}
return $reports;
}

16
testing/tests/regression-suite/531-iCal4-PROPFIND.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: "caffdb62355a041b215bfca256c7e14f"
Content-Length: 1439
ETag: "c3a398e212672c218ea97a56017b1166"
Content-Length: 1535
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -36,13 +36,19 @@ Content-Type: text/xml; charset="utf-8"
</principal-URL>
<supported-report-set>
<supported-report>
<principal-property-search/>
<report>
<principal-property-search/>
</report>
</supported-report>
<supported-report>
<expand-property/>
<report>
<expand-property/>
</report>
</supported-report>
<supported-report>
<sync-collection/>
<report>
<sync-collection/>
</report>
</supported-report>
</supported-report-set>
</prop>

16
testing/tests/regression-suite/916-PROPFIND-supported-stuff.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: "abfbbcc5572e1a2e160eac87352f15ca"
Content-Length: 1061
ETag: "7bb4b23aad9dc0617c966e0c8fc04bc3"
Content-Length: 1157
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -22,13 +22,19 @@ Content-Type: text/xml; charset="utf-8"
</supported-method-set>
<supported-report-set>
<supported-report>
<principal-property-search/>
<report>
<principal-property-search/>
</report>
</supported-report>
<supported-report>
<expand-property/>
<report>
<expand-property/>
</report>
</supported-report>
<supported-report>
<sync-collection/>
<report>
<sync-collection/>
</report>
</supported-report>
</supported-report-set>
<current-user-principal>

16
testing/tests/regression-suite/917-PROPFIND-supported-stuff.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: "25bc804e7cd5c233d7ac7b3a3357109b"
Content-Length: 1358
ETag: "3633f78583024cb6699239efbba3ec94"
Content-Length: 1454
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -33,13 +33,19 @@ Content-Type: text/xml; charset="utf-8"
</supported-method-set>
<supported-report-set>
<supported-report>
<principal-property-search/>
<report>
<principal-property-search/>
</report>
</supported-report>
<supported-report>
<expand-property/>
<report>
<expand-property/>
</report>
</supported-report>
<supported-report>
<sync-collection/>
<report>
<sync-collection/>
</report>
</supported-report>
</supported-report-set>
</prop>

28
testing/tests/regression-suite/918-PROPFIND-supported-stuff.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: "d0106b2b3cddd962bafded74285d643d"
Content-Length: 1658
ETag: "abd3df8ba7b00d965c7a77b891cb4e16"
Content-Length: 1850
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -30,22 +30,34 @@ Content-Type: text/xml; charset="utf-8"
</supported-method-set>
<supported-report-set>
<supported-report>
<principal-property-search/>
<report>
<principal-property-search/>
</report>
</supported-report>
<supported-report>
<expand-property/>
<report>
<expand-property/>
</report>
</supported-report>
<supported-report>
<sync-collection/>
<report>
<sync-collection/>
</report>
</supported-report>
<supported-report>
<C:calendar-query/>
<report>
<C:calendar-query/>
</report>
</supported-report>
<supported-report>
<C:calendar-multiget/>
<report>
<C:calendar-multiget/>
</report>
</supported-report>
<supported-report>
<C:free-busy-query/>
<report>
<C:free-busy-query/>
</report>
</supported-report>
</supported-report-set>
<C:supported-calendar-component-set>

16
testing/tests/regression-suite/919-PROPFIND-supported-stuff.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: "fa162cca33c127c460b2ebf292c0e058"
Content-Length: 1443
ETag: "134b9fb41e6c5b7354bdd0389bf219f2"
Content-Length: 1539
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -32,13 +32,19 @@ Content-Type: text/xml; charset="utf-8"
</supported-method-set>
<supported-report-set>
<supported-report>
<principal-property-search/>
<report>
<principal-property-search/>
</report>
</supported-report>
<supported-report>
<expand-property/>
<report>
<expand-property/>
</report>
</supported-report>
<supported-report>
<sync-collection/>
<report>
<sync-collection/>
</report>
</supported-report>
</supported-report-set>
<C:supported-calendar-component-set>

16
testing/tests/regression-suite/920-PROPFIND-supported-stuff.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: "66819702cbea0476ec78e4b35254c3e5"
Content-Length: 1446
ETag: "945223598c3b28fe6cbf9c6e6b74da04"
Content-Length: 1542
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
@ -32,13 +32,19 @@ Content-Type: text/xml; charset="utf-8"
</supported-method-set>
<supported-report-set>
<supported-report>
<principal-property-search/>
<report>
<principal-property-search/>
</report>
</supported-report>
<supported-report>
<expand-property/>
<report>
<expand-property/>
</report>
</supported-report>
<supported-report>
<sync-collection/>
<report>
<sync-collection/>
</report>
</supported-report>
</supported-report-set>
<C:supported-calendar-component-set>