nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-26 02:44:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix untested scheduling code from Rob. New regression test results.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-24 08:12:58 +13:00
parent 898d9a456a
commit c080c8bc5e
15 changed files with 72 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/caldav-PUT-functions.php
View File

@ -237,7 +237,7 @@ function handle_schedule_request( $ical ) {
$deliver_path = preg_replace ( '/^.*caldav.php/','', $request->principal->schedule_inbox_url ); $deliver_path = preg_replace ( '/^.*caldav.php/','', $request->principal->schedule_inbox_url );
$ar = new DAVResource($deliver_path); $ar = new DAVResource($deliver_path);
write_resource( $request->user_no, $deliver_path . $etag . '.ics' , write_resource( $request->user_no, $deliver_path . $etag . '.ics' ,
$content , $ar->collection_id, $request->user_no, $content , $ar->GetProperty('collection_id'), $request->user_no,
md5($content), $ncal, $put_action_type='INSERT', $caldav_context=true, $log_action=true, $etag ); md5($content), $ncal, $put_action_type='INSERT', $caldav_context=true, $log_action=true, $etag );
//$etag = md5($content); //$etag = md5($content);
header('ETag: "'. $etag . '"' ); header('ETag: "'. $etag . '"' );

6
testing/tests/regression-suite/532-iCal4-PROPFIND.result
View File

@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
ETag: "04833ee3ba208ef1e89c2c0254b99737" ETag: "cf8ef9f46b19096c9036fef29ec62622"
Content-Length: 19035 Content-Length: 19066
Content-Type: text/xml; charset="utf-8" Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
@ -314,7 +314,7 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user1/.in/</href> <href>/caldav.php/user1/.in/</href>
<propstat> <propstat>
<prop> <prop>
<C:getctag>"1"</C:getctag> <C:getctag>"29a4f57ff8c8564c364d37fac0e18e34"</C:getctag>
<displayname>User 1 Inbox</displayname> <displayname>User 1 Inbox</displayname>
<C1:supported-calendar-component-set> <C1:supported-calendar-component-set>
<C1:comp name="VEVENT"/> <C1:comp name="VEVENT"/>

21
testing/tests/regression-suite/537-iCal4-PROPFIND.result
View File

@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
ETag: "7b9c0b8208dacb0433461fd66140cc9a" ETag: "60530d57c79ae87c8c63c20c78707c1c"
Content-Length: 425 Content-Length: 767
Content-Type: text/xml; charset="utf-8" Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user1/.in/</href> <href>/caldav.php/user1/.in/</href>
<propstat> <propstat>
<prop> <prop>
<C:getctag>"1"</C:getctag> <C:getctag>"29a4f57ff8c8564c364d37fac0e18e34"</C:getctag>
<resourcetype> <resourcetype>
<collection/> <collection/>
<C1:schedule-inbox/> <C1:schedule-inbox/>
@ -20,4 +20,19 @@ Content-Type: text/xml; charset="utf-8"
<status>HTTP/1.1 200 OK</status> <status>HTTP/1.1 200 OK</status>
</propstat> </propstat>
</response> </response>
<response>
<href>/caldav.php/user1/.in/15f40cce00b378332164188cf779f0d6.ics</href>
<propstat>
<prop>
<resourcetype/>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
<propstat>
<prop>
<C:getctag/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
</response>
</multistatus> </multistatus>

6
testing/tests/regression-suite/553-iPhone-PROPFIND.result
View File

@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
ETag: "2091d92f09f393ede66728896d167240" ETag: "75ce17e7c56b97eb73a7f8b716f47534"
Content-Length: 15401 Content-Length: 15432
Content-Type: text/xml; charset="utf-8" Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
@ -276,7 +276,7 @@ Content-Type: text/xml; charset="utf-8"
<propstat> <propstat>
<prop> <prop>
<displayname>User 1 Inbox</displayname> <displayname>User 1 Inbox</displayname>
<C1:getctag>"1"</C1:getctag> <C1:getctag>"29a4f57ff8c8564c364d37fac0e18e34"</C1:getctag>
<C:supported-calendar-component-set> <C:supported-calendar-component-set>
<C:comp name="VEVENT"/> <C:comp name="VEVENT"/>
<C:comp name="VTODO"/> <C:comp name="VTODO"/>

6
testing/tests/regression-suite/554-iPhone-PROPFIND.result
View File

@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
ETag: "2091d92f09f393ede66728896d167240" ETag: "75ce17e7c56b97eb73a7f8b716f47534"
Content-Length: 15401 Content-Length: 15432
Content-Type: text/xml; charset="utf-8" Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
@ -276,7 +276,7 @@ Content-Type: text/xml; charset="utf-8"
<propstat> <propstat>
<prop> <prop>
<displayname>User 1 Inbox</displayname> <displayname>User 1 Inbox</displayname>
<C1:getctag>"1"</C1:getctag> <C1:getctag>"29a4f57ff8c8564c364d37fac0e18e34"</C1:getctag>
<C:supported-calendar-component-set> <C:supported-calendar-component-set>
<C:comp name="VEVENT"/> <C:comp name="VEVENT"/>
<C:comp name="VTODO"/> <C:comp name="VTODO"/>

26
testing/tests/regression-suite/602-Soho-PROPFIND.result
View File

@ -1,8 +1,8 @@
HTTP/1.1 207 Multi-Status HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
ETag: "c54c9883b5a5959588d208034cd782e1" ETag: "44487da270d6e0c4f71f784688a0896d"
Content-Length: 14796 Content-Length: 15362
Content-Type: text/xml; charset="utf-8" Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
@ -447,6 +447,28 @@ Content-Type: text/xml; charset="utf-8"
<status>HTTP/1.1 404 Not Found</status> <status>HTTP/1.1 404 Not Found</status>
</propstat> </propstat>
</response> </response>
<response>
<href>/caldav.php/user1/.in/15f40cce00b378332164188cf779f0d6.ics</href>
<propstat>
<prop>
<C:calendar-home-set>
<href>/caldav.php/user1/</href>
</C:calendar-home-set>
<C:calendar-user-address-set>
<href>mailto:user1@example.net</href>
<href>/caldav.php/user1/</href>
</C:calendar-user-address-set>
</prop>
<status>HTTP/1.1 200 OK</status>
</propstat>
<propstat>
<prop>
<A:dropbox-home-URL/>
<A:notifications-URL/>
</prop>
<status>HTTP/1.1 404 Not Found</status>
</propstat>
</response>
<response> <response>
<href>/caldav.php/user1/.out/</href> <href>/caldav.php/user1/.out/</href>
<propstat> <propstat>

4
testing/tests/regression-suite/924-MOVE.result
View File

@ -5,9 +5,9 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
cd_collection: >1397< cd_collection: >1398<
cd_user_no: >10< cd_user_no: >10<
ci_collection: >1397< ci_collection: >1398<
ci_user_no: >10< ci_user_no: >10<
data_name: >/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< data_name: >/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
item_name: >/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics< item_name: >/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<

2
testing/tests/regression-suite/962-BIND.result
View File

@ -6,7 +6,7 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
bind_id: >1430< bind_id: >1431<
bound_source_id: >11< bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/user2/< dav_name: >/user4/user2/<

2
testing/tests/regression-suite/963-BIND.result
View File

@ -8,7 +8,7 @@ Content-Type: text/xml; charset="utf-8"
<error xmlns="DAV:"> <error xmlns="DAV:">
<DAV::can-overwrite/>A resource already exists at the destination. <DAV::can-overwrite/>A resource already exists at the destination.
</error> </error>
bind_id: >1430< bind_id: >1431<
bound_source_id: >11< bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/user2/< dav_name: >/user4/user2/<

4
testing/tests/regression-suite/972-BIND.result
View File

@ -6,14 +6,14 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
bind_id: >1430< bind_id: >1431<
bound_source_id: >11< bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH< dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/< dav_name: >/user4/user2/<
parent_container: >/user4/< parent_container: >/user4/<
ticket_id_length: >8< ticket_id_length: >8<
bind_id: >1431< bind_id: >1432<
bound_source_id: >10< bound_source_id: >10<
dav_displayname: >User 1's Calendaranza< dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/< dav_name: >/user4/user1/<

6
testing/tests/regression-suite/982-BIND.result
View File

@ -6,21 +6,21 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
bind_id: >1430< bind_id: >1431<
bound_source_id: >11< bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH< dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/< dav_name: >/user4/user2/<
length: >8< length: >8<
parent_container: >/user4/< parent_container: >/user4/<
bind_id: >1431< bind_id: >1432<
bound_source_id: >10< bound_source_id: >10<
dav_displayname: >User 1's Calendaranza< dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/< dav_name: >/user4/user1/<
length: >8< length: >8<
parent_container: >/user4/< parent_container: >/user4/<
bind_id: >1435< bind_id: >1436<
bound_source_id: >10< bound_source_id: >10<
dav_displayname: >User 1's Calendaranza< dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/< dav_name: >/user4/base/user1/<

8
testing/tests/regression-suite/983-BIND.result
View File

@ -6,28 +6,28 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
bind_id: >1430< bind_id: >1431<
bound_source_id: >11< bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH< dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/< dav_name: >/user4/user2/<
length: >8< length: >8<
parent_container: >/user4/< parent_container: >/user4/<
bind_id: >1431< bind_id: >1432<
bound_source_id: >10< bound_source_id: >10<
dav_displayname: >User 1's Calendaranza< dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/< dav_name: >/user4/user1/<
length: >8< length: >8<
parent_container: >/user4/< parent_container: >/user4/<
bind_id: >1435< bind_id: >1436<
bound_source_id: >10< bound_source_id: >10<
dav_displayname: >User 1's Calendaranza< dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/< dav_name: >/user4/base/user1/<
length: >8< length: >8<
parent_container: >/user4/base/< parent_container: >/user4/base/<
bind_id: >1436< bind_id: >1437<
bound_source_id: >11< bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/< dav_name: >/user4/base/user2/<

8
testing/tests/regression-suite/984-BIND.result
View File

@ -8,28 +8,28 @@ Content-Type: text/xml; charset="utf-8"
<error xmlns="DAV:"> <error xmlns="DAV:">
<DAV::can-overwrite/>A resource already exists at the destination. <DAV::can-overwrite/>A resource already exists at the destination.
</error> </error>
bind_id: >1430< bind_id: >1431<
bound_source_id: >11< bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH< dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/< dav_name: >/user4/user2/<
length: >8< length: >8<
parent_container: >/user4/< parent_container: >/user4/<
bind_id: >1431< bind_id: >1432<
bound_source_id: >10< bound_source_id: >10<
dav_displayname: >User 1's Calendaranza< dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/< dav_name: >/user4/user1/<
length: >8< length: >8<
parent_container: >/user4/< parent_container: >/user4/<
bind_id: >1435< bind_id: >1436<
bound_source_id: >10< bound_source_id: >10<
dav_displayname: >User 1's Calendaranza< dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/< dav_name: >/user4/base/user1/<
length: >8< length: >8<
parent_container: >/user4/base/< parent_container: >/user4/base/<
bind_id: >1436< bind_id: >1437<
bound_source_id: >11< bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin< dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/< dav_name: >/user4/base/user2/<

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

@ -6,7 +6,7 @@
<prop> <prop>
<displayname>A normal collection</displayname> <displayname>A normal collection</displayname>
<resource-id> <resource-id>
<href>/caldav.php/.resources/1433</href> <href>/caldav.php/.resources/1434</href>
</resource-id> </resource-id>
<parent-set> <parent-set>
<parent> <parent>
@ -90,7 +90,7 @@
<prop> <prop>
<displayname>A sub collection</displayname> <displayname>A sub collection</displayname>
<resource-id> <resource-id>
<href>/caldav.php/.resources/1434</href> <href>/caldav.php/.resources/1435</href>
</resource-id> </resource-id>
<parent-set> <parent-set>
<parent> <parent>

2
testing/tests/regression-suite/987-PROPFIND.result
View File

@ -6,7 +6,7 @@
<prop> <prop>
<displayname>A normal collection</displayname> <displayname>A normal collection</displayname>
<resource-id> <resource-id>
<href>/caldav.php/.resources/1433</href> <href>/caldav.php/.resources/1434</href>
</resource-id> </resource-id>
<parent-set> <parent-set>
<parent> <parent>