nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-01-27 00:33:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change REPORT to omit protocol://host:port from URLs also.

Browse Source
This commit is contained in:
Andrew McMillan 2007-11-25 12:47:41 +13:00
parent 6980fafede
commit 89c7a33694
13 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/caldav-REPORT.php
View File

@ -97,6 +97,9 @@ function calendar_to_xml( $properties, $item ) {
}
$url = $c->protocol_server_port_script . $item->dav_name;
$url = preg_replace( '#^(https?://.+)//#', '$1/', $url ); // Ensure we don't double any '/'
$url = preg_replace('#^https?://[^/]+#', '', $url );
$prop = new XMLElement("prop");
foreach( $properties AS $k => $v ) {
switch( $k ) {

6
testing/tests/regression-suite/102-Evo-REPORT-1.result
View File

@ -1,14 +1,14 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "7dd087918d1ab4ba7e7861307b57c6dd"
Content-Length: 341
ETag: "5d903e7367fc5fd8975cd2a2f12c94ef"
Content-Length: 326
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<propstat>
<prop>
<getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>

8
testing/tests/regression-suite/105-Evo-REPORT-1.result
View File

@ -1,14 +1,14 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "4b08329b0bd43cb3a95a0e4f8286c423"
Content-Length: 582
ETag: "278939915085a441aa95fa319fc3bb3a"
Content-Length: 552
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://mycaldav/caldav.php/user1/home/20061101T073004Z.ics</href>
<href>/caldav.php/user1/home/20061101T073004Z.ics</href>
<propstat>
<prop>
<getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
@ -17,7 +17,7 @@ Content-Type: text/xml; charset="utf-8"
</propstat>
</response>
<response>
<href>http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<propstat>
<prop>
<getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>

8
testing/tests/regression-suite/107-Evo-REPORT-1.result
View File

@ -1,14 +1,14 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "709206be6ed57942c30d98aa629efc6f"
Content-Length: 560
ETag: "83ce5baee07017b4b40318062103c2ce"
Content-Length: 530
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://mycaldav/user1/home/20061101T073004Z.ics</href>
<href>/user1/home/20061101T073004Z.ics</href>
<propstat>
<prop>
<getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
@ -17,7 +17,7 @@ Content-Type: text/xml; charset="utf-8"
</propstat>
</response>
<response>
<href>http://mycaldav/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<href>/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<propstat>
<prop>
<getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>

8
testing/tests/regression-suite/108-Evo-REPORT-1.result
View File

@ -1,14 +1,14 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "5a05dff964308972a179d2e7f44bf751"
Content-Length: 596
ETag: "9f89b851745eccbc4d1da3bf3f0bb9c7"
Content-Length: 570
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://myapms/calendar/caldav.php/user1/home/20061101T073004Z.ics</href>
<href>/calendar/caldav.php/user1/home/20061101T073004Z.ics</href>
<propstat>
<prop>
<getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
@ -17,7 +17,7 @@ Content-Type: text/xml; charset="utf-8"
</propstat>
</response>
<response>
<href>http://myapms/calendar/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<href>/calendar/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<propstat>
<prop>
<getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>

8
testing/tests/regression-suite/203-Moz-REPORT-2.result
View File

@ -1,14 +1,14 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "a57a6c930b230c67301c4295254a3521"
Content-Length: 2420
ETag: "6df625ac708940d88e7e400fa0cd2092"
Content-Length: 2390
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://mycaldav/caldav.php/user1/home/20061101T073004Z.ics</href>
<href>/caldav.php/user1/home/20061101T073004Z.ics</href>
<propstat>
<prop>
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
@ -57,7 +57,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<propstat>
<prop>
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR

6
testing/tests/regression-suite/204-Moz-REPORT-3.result
View File

@ -1,14 +1,14 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "46061ea7ac75102dbb315b82c666c24d"
Content-Length: 1110
ETag: "62d5362cafb71b92c39ff83bfec5f16d"
Content-Length: 1095
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://mycaldav/caldav.php/resource2/home/0A5EA1F0F2691A03E917E85F9F255448-0.ics</href>
<href>/caldav.php/resource2/home/0A5EA1F0F2691A03E917E85F9F255448-0.ics</href>
<propstat>
<prop>
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR

6
testing/tests/regression-suite/207-Moz-REPORT-4.result
View File

@ -1,14 +1,14 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "5ea083d59cfcd77e3baf11ef74297e6e"
Content-Length: 1358
ETag: "5acea2c1bc8250bf55a3a32f155c0872"
Content-Length: 1343
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://mycaldav/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
<href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
<propstat>
<prop>
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR

8
testing/tests/regression-suite/230-Moz-REPORT-Tasks-Completed.result
View File

@ -1,14 +1,14 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "8f48e613721a5ccb5e44c277f7a1a909"
Content-Length: 1630
ETag: "cf7647a0d4c17b2c0c8dcf418574fe09"
Content-Length: 1604
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://myapms/calendar/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics</href>
<href>/calendar/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics</href>
<propstat>
<prop>
<getetag>"509b0f0d8a3363379f9f5727f5dd74a0"</getetag>
@ -32,7 +32,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://myapms/calendar/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics</href>
<href>/calendar/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics</href>
<propstat>
<prop>
<getetag>"cb3d9dc3e8c157f53eba3ea0e1e0f146"</getetag>

12
testing/tests/regression-suite/231-Moz-REPORT-All-Tasks.result
View File

@ -1,14 +1,14 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "2d56ad662a3857cbba346a51e2287e22"
Content-Length: 4276
ETag: "4a177807973966b4873ffa2f0080b4a1"
Content-Length: 4224
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://myapms/calendar/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
<href>/calendar/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
<propstat>
<prop>
<getetag>"00ad5eb1eb5507884710b0b66aa5d5c4"</getetag>
@ -54,7 +54,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://myapms/calendar/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics</href>
<href>/calendar/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics</href>
<propstat>
<prop>
<getetag>"509b0f0d8a3363379f9f5727f5dd74a0"</getetag>
@ -78,7 +78,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://myapms/calendar/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics</href>
<href>/calendar/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics</href>
<propstat>
<prop>
<getetag>"cb3d9dc3e8c157f53eba3ea0e1e0f146"</getetag>
@ -104,7 +104,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://myapms/calendar/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics</href>
<href>/calendar/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics</href>
<propstat>
<prop>
<getetag>"a2990674708634a311bb98a59865ca50"</getetag>

6
testing/tests/regression-suite/850-Spec-REPORT-1.result
View File

@ -1,14 +1,14 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "3140e532d35ae4918005eb9bf5fcc26b"
Content-Length: 1456
ETag: "ed933141b8d662fd7a79e37399302fa4"
Content-Length: 1441
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://mycaldav/caldav.php/user1/home/20061101T073004Z.ics</href>
<href>/caldav.php/user1/home/20061101T073004Z.ics</href>
<propstat>
<prop>
<getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>

12
testing/tests/regression-suite/851-Spec-REPORT-1.result
View File

@ -1,14 +1,14 @@
HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access
ETag: "8bb1ae7c599f81130860154adb77364b"
Content-Length: 5175
ETag: "3902e726b3e12b996ddf533065b131ab"
Content-Length: 5115
Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
<propstat>
<prop>
<getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>
@ -51,7 +51,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://mycaldav/caldav.php/user1/home/20061101T073004Z.ics</href>
<href>/caldav.php/user1/home/20061101T073004Z.ics</href>
<propstat>
<prop>
<getetag>"c3658901fd4689d4a1e1d6f08601ef4f"</getetag>
@ -101,7 +101,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://mycaldav/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
<href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
<propstat>
<prop>
<getetag>"a1c6404d61190f9574e2bfd69383f144"</getetag>
@ -147,7 +147,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://mycaldav/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
<href>/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
<propstat>
<prop>
<getetag>"5def8ae2b20893a1c7f4dbaeb008f2f1"</getetag>

18
testing/tests/regression-suite/900-Moz-REPORT.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
ETag: "78f60a204e7deae626d7a11a8f7f8d8e"
Content-Length: 7901
ETag: "add7fd32d70e4f7378b7aff4cf4e32e1"
Content-Length: 7796
Keep-Alive: timeout=15, max=100
Connection: Keep-Alive
Content-Type: text/xml; charset="utf-8"
@ -10,7 +10,7 @@ Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:">
<response>
<href>http://mycaldav/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
<href>/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
<propstat>
<prop>
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
@ -56,7 +56,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://mycaldav/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
<href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
<propstat>
<prop>
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
@ -101,7 +101,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://mycaldav/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics</href>
<href>/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics</href>
<propstat>
<prop>
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
@ -141,7 +141,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://mycaldav/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics</href>
<href>/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics</href>
<propstat>
<prop>
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
@ -186,7 +186,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://mycaldav/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics</href>
<href>/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics</href>
<propstat>
<prop>
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
@ -241,7 +241,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://mycaldav/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
<href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
<propstat>
<prop>
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
@ -264,7 +264,7 @@ END:VCALENDAR
</propstat>
</response>
<response>
<href>http://mycaldav/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
<href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
<propstat>
<prop>
<calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR