From a57d6901677e99367c0724faec5f1a628e66ca12 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 21 Sep 2006 18:24:26 +1200 Subject: [PATCH] Kinda working with both Lightning & Evolution now. About to restructure to add TODO items and make certain queries easier. --- .gitignore | 1 + config/config.php | 9 +- dba/rscds.sql | 68 +- dba/sample-data.sql | 65 +- ....txt.html => dusseault-caldav-15.txt.html} | 4157 +++++++++-------- htdocs/caldav.php | 4 + ...client_configuration_help.php => help.php} | 4 +- htdocs/images/down.gif | Bin 0 -> 58 bytes htdocs/images/up.gif | Bin 0 -> 59 bytes htdocs/index.php | 3 +- htdocs/relationships.php | 44 + htdocs/roles.php | 40 + htdocs/rscds.css | 106 +- htdocs/users.php | 41 + inc/BasicAuthSession.php | 2 - inc/RSCDSSession.php | 62 +- inc/always.php | 63 +- inc/caldav-DELETE.php | 4 +- inc/caldav-GET.php | 16 +- inc/caldav-PUT.php | 73 +- inc/caldav-REPORT.php | 126 +- inc/interactive-page.php | 14 + inc/page-header.php | 7 + inc/rscds_configuration_missing.php | 2 +- inc/session-util.php | 31 + inc/vEvent.php | 34 +- rscds.webprj | 10 +- 27 files changed, 2879 insertions(+), 2107 deletions(-) rename docs/{dusseault-caldav-12.txt.html => dusseault-caldav-15.txt.html} (61%) rename htdocs/{client_configuration_help.php => help.php} (91%) create mode 100644 htdocs/images/down.gif create mode 100644 htdocs/images/up.gif create mode 100644 htdocs/relationships.php create mode 100644 htdocs/roles.php create mode 100644 htdocs/users.php create mode 100644 inc/interactive-page.php diff --git a/.gitignore b/.gitignore index e1b1fe1d..3dffcc84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ caldav.session rscds.session build +rscds.bfproject diff --git a/config/config.php b/config/config.php index 93e399fe..3703fbdd 100644 --- a/config/config.php +++ b/config/config.php @@ -4,11 +4,10 @@ // $c->admin_email = 'andrew@catalyst.net.nz'; // $c->system_name = "Really Simple CalDAV Store"; - $c->pg_connect[] = 'dbname=rscds port=5433 user=general'; - $c->pg_connect[] = 'dbname=rscds port=5432 user=general'; + $c->pg_connect[] = 'dbname=caldav port=5433 user=general'; + $c->pg_connect[] = 'dbname=caldav port=5432 user=general'; - $c->dbg['vevent'] = 1; - $c->dbg['put'] = 1; - $c->dbg['report'] = 1; + $c->dbg['ALL'] = 1; + $debuggroups['querystring'] = 1; ?> \ No newline at end of file diff --git a/dba/rscds.sql b/dba/rscds.sql index e0baa5c3..9ff92993 100644 --- a/dba/rscds.sql +++ b/dba/rscds.sql @@ -5,31 +5,34 @@ \i /usr/share/awl/dba/awl-tables.sql \i /usr/share/awl/dba/schema-management.sql -CREATE TABLE ics_event_data ( +-- The main event. Where we store the things the calendar throws at us. +CREATE TABLE caldav_data ( user_no INT references usr(user_no), - ics_event_name TEXT, - ics_event_etag TEXT, - ics_raw_data TEXT, + dav_name TEXT, + dav_etag TEXT, + caldav_data TEXT, + caldav_type TEXT, + logged_user INT references usr(user_no), - PRIMARY KEY ( user_no, ics_event_name, ics_event_etag ) + PRIMARY KEY ( user_no, vevent_name, vevent_etag ) ); -GRANT SELECT,INSERT,UPDATE,DELETE ON ics_event_data TO general; +GRANT SELECT,INSERT,UPDATE,DELETE ON vevent_data TO general; - -CREATE TABLE time_zones ( - tzid TEXT PRIMARY KEY, - location TEXT, - tz_spec TEXT, - pgtz TEXT +-- Not particularly needed, perhaps, except as a way to collect +-- a bunch of valid iCalendar time zone specifications... :-) +CREATE TABLE time_zone ( + tz_id TEXT PRIMARY KEY, + tz_locn TEXT, + tz_spec TEXT ); -GRANT SELECT,INSERT ON time_zones TO general; +GRANT SELECT,INSERT ON time_zone TO general; - -CREATE TABLE ical_events ( +-- The parsed event. Here we have pulled those events apart somewhat. +CREATE TABLE event ( user_no INT references usr(user_no), - ics_event_name TEXT, - ics_event_etag TEXT, + vevent_name TEXT, + vevent_etag TEXT, -- Extracted vEvent event data uid TEXT, @@ -42,12 +45,33 @@ CREATE TABLE ical_events ( transp TEXT, description TEXT, rrule TEXT, - tzid TEXT REFERENCES time_zones( tzid ), + tz_id TEXT REFERENCES time_zone( tz_id ), - -- Cascade updates / deletes from the ics_event_data table - CONSTRAINT ics_event_exists FOREIGN KEY ( user_no, ics_event_name, ics_event_etag ) - REFERENCES ics_event_data ( user_no, ics_event_name, ics_event_etag ) + -- Cascade updates / deletes from the vevent_data table + CONSTRAINT vevent_exists FOREIGN KEY ( user_no, vevent_name, vevent_etag ) + REFERENCES vevent_data ( user_no, vevent_name, vevent_etag ) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE ); -GRANT SELECT,INSERT,UPDATE,DELETE ON ical_events TO general; +GRANT SELECT,INSERT,UPDATE,DELETE ON event TO general; + +-- Each user can be related to each other user. This mechanism can also +-- be used to define groups of users, since some relationships are transitive. +CREATE TABLE relationship_type ( + rt_id SERIAL PRIMARY KEY, + rt_name TEXT, + rt_isgroup BOOLEAN, + rt_inverse INT, + confers TEXT DEFAULT 'RW', + prefix_match TEXT DEFAULT '' +); + +GRANT SELECT,INSERT,UPDATE,DELETE ON relationship_type TO general; + +CREATE TABLE relationship ( + from_user INT REFERENCES usr (user_no) ON UPDATE CASCADE, + to_user INT REFERENCES usr (user_no) ON UPDATE CASCADE, + rt_id INT REFERENCES relationship_type (rt_id) ON UPDATE CASCADE +); + +GRANT SELECT,INSERT,UPDATE,DELETE ON relationship TO general; diff --git a/dba/sample-data.sql b/dba/sample-data.sql index 525f8ce0..e02641e7 100644 --- a/dba/sample-data.sql +++ b/dba/sample-data.sql @@ -3,4 +3,67 @@ INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) VALUES( 1, TRUE, current_date, current_date, 'admin', '**nimda', 'Calendar Administrator', 'calendars@example.net' ); -SELECT setval('usr_user_no_seq', 1); +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) + VALUES( 2, TRUE, current_date, current_date, 'andrew', '**x', 'Andrew McMillan', 'andrew@catalyst.net.nz' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) + VALUES( 10, TRUE, current_date, current_date, 'user1', '**user1', 'User 1', 'user1@example.net' ); +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) + VALUES( 11, TRUE, current_date, current_date, 'user2', '**user2', 'User 2', 'user2@example.net' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) + VALUES( 20, TRUE, current_date, current_date, 'manager1', '**manager1', 'Manager 1', 'manager1@example.net' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) + VALUES( 30, TRUE, current_date, current_date, 'assistant1', '**assistant1', 'Assistant 1', 'assistant1@example.net' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) + VALUES( 100, TRUE, current_date, current_date, 'resource1', '*salt*unpossible', 'Resource 1', 'resource1@example.net' ); +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) + VALUES( 101, TRUE, current_date, current_date, 'resource2', '*salt*unpossible', 'Resource 2', 'resource2@example.net' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) + VALUES( 200, TRUE, current_date, current_date, 'resmgr1', '*salt*unpossible', 'Resource Managers', 'resource-managers@example.net' ); + +INSERT INTO usr ( user_no, active, email_ok, updated, username, password, fullname, email ) + VALUES( 300, TRUE, current_date, current_date, 'teamclient1', '*salt*unpossible', 'Team for Client1', 'team-client1@example.net' ); + +SELECT setval('usr_user_no_seq', 1000); + +INSERT INTO roles ( role_no, role_name ) VALUES( 1, 'Admin'); + +SELECT setval('roles_role_no_seq', 1); + +INSERT INTO role_member (user_no, role_no) VALUES( 1, 1); + +INSERT INTO relationship_type ( rt_id, rt_name, rt_isgroup, rt_inverse, confers, prefix_match ) + VALUES( 1, 'Meeting Admin', TRUE, NULL, 'RW', '' ); + +INSERT INTO relationship_type ( rt_id, rt_name, rt_isgroup, rt_inverse, confers, prefix_match ) + VALUES( 2, 'Assisted by', FALSE, 3, 'RW', '' ); + +INSERT INTO relationship_type ( rt_id, rt_name, rt_isgroup, rt_inverse, confers, prefix_match ) + VALUES( 3, 'Assistant to', FALSE, 2, 'RW', '' ); + +INSERT INTO relationship_type ( rt_id, rt_name, rt_isgroup, rt_inverse, confers, prefix_match ) + VALUES( 4, 'Team Member', FALSE, 4, 'R', '' ); + +INSERT INTO relationship_type ( rt_id, rt_name, rt_isgroup, rt_inverse, confers, prefix_match ) + VALUES( 5, 'Meeting Resource', TRUE, NULL, 'RW', '' ); + +-- The resources for meetings +INSERT INTO relationship ( from_user, to_user, rt_id ) VALUES( 200, 100, 5 ); +INSERT INTO relationship ( from_user, to_user, rt_id ) VALUES( 200, 101, 5 ); + +-- The people who administer meetings +INSERT INTO relationship ( from_user, to_user, rt_id ) VALUES( 10, 200, 1 ); +INSERT INTO relationship ( from_user, to_user, rt_id ) VALUES( 11, 200, 1 ); +INSERT INTO relationship ( from_user, to_user, rt_id ) VALUES( 30, 200, 1 ); + +-- Between a Manager and their PA +INSERT INTO relationship ( from_user, to_user, rt_id ) VALUES( 20, 30, 2 ); + +-- Between a team +INSERT INTO relationship ( from_user, to_user, rt_id ) VALUES( 20, 300, 4 ); +INSERT INTO relationship ( from_user, to_user, rt_id ) VALUES( 10, 300, 4 ); +INSERT INTO relationship ( from_user, to_user, rt_id ) VALUES( 30, 300, 4 ); diff --git a/docs/dusseault-caldav-12.txt.html b/docs/dusseault-caldav-15.txt.html similarity index 61% rename from docs/dusseault-caldav-12.txt.html rename to docs/dusseault-caldav-15.txt.html index 7a3bf369..26a669a6 100644 --- a/docs/dusseault-caldav-12.txt.html +++ b/docs/dusseault-caldav-15.txt.html @@ -1,70 +1,24 @@ - - - - -dusseault-caldav-12.txt - - -

draft-dusseault-caldav

-


-
 
 
 Network Working Group                                           C. Daboo
-Internet-Draft
-Expires: October 28, 2006                                B. Desruisseaux
+Internet-Draft                                            Apple Computer
+Expires: March 17, 2007                                  B. Desruisseaux
                                                                   Oracle
                                                             L. Dusseault
                                                                     OSAF
-                                                          April 26, 2006
+                                                      September 13, 2006
 
 
                Calendaring Extensions to WebDAV (CalDAV)
-                       draft-dusseault-caldav-12
+                       draft-dusseault-caldav-15
 
 Status of this Memo
 
    By submitting this Internet-Draft, each author represents that any
    applicable patent or other IPR claims of which he or she is aware
    have been or will be disclosed, and any of which he or she becomes
-   aware will be disclosed, in accordance with Section 6 of BCP 79.
+   aware will be disclosed, in accordance with Section 6 of BCP 79.
 
    Internet-Drafts are working documents of the Internet Engineering
    Task Force (IETF), its areas, and its working groups.  Note that
@@ -77,12 +31,12 @@ Status of this Memo
    material or to cite them other than as "work in progress."
 
    The list of current Internet-Drafts can be accessed at
-   http://www.ietf.org/ietf/1id-abstracts.txt.
+   http://www.ietf.org/ietf/1id-abstracts.txt.
 
    The list of Internet-Draft Shadow Directories can be accessed at
-   http://www.ietf.org/shadow.html.
+   http://www.ietf.org/shadow.html.
 
-   This Internet-Draft will expire on October 28, 2006.
+   This Internet-Draft will expire on March 17, 2007.
 
 Copyright Notice
 
@@ -98,9 +52,9 @@ Abstract
 
 
 
-Daboo, et al.           Expires October 28, 2006                [Page 1]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                 [Page 1]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    and calendar publishing.
@@ -108,146 +62,153 @@ Internet-Draft                   CalDAV                       April 2006
 
 Table of Contents
 
-   1.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . .   5
-     1.1.  Notational Conventions  . . . . . . . . . . . . . . . . .   5
-     1.2.  XML Namespaces and Processing . . . . . . . . . . . . . .   5
-   2.  Requirements Overview . . . . . . . . . . . . . . . . . . . .   6
-   3.  Calendaring Data Model  . . . . . . . . . . . . . . . . . . .   7
-     3.1.  Calendar Server . . . . . . . . . . . . . . . . . . . . .   7
-     3.2.  Recurrence and the Data Model . . . . . . . . . . . . . .   8
-   4.  Calendar Resources  . . . . . . . . . . . . . . . . . . . . .   8
-     4.1.  Calendar Object Resources . . . . . . . . . . . . . . . .   8
-     4.2.  Calendar Collection . . . . . . . . . . . . . . . . . . .  10
-   5.  Calendar Access Feature . . . . . . . . . . . . . . . . . . .  11
-     5.1.  Calendar Access Support . . . . . . . . . . . . . . . . .  11
+   1.  Introduction  . . . . . . . . . . . . . . . . . . . . . . . .   5
+     1.1.  Notational Conventions  . . . . . . . . . . . . . . . . .   5
+     1.2.  XML Namespaces and Processing . . . . . . . . . . . . . .   5
+     1.3.  Method Preconditions and Postconditions . . . . . . . . .   6
+   2.  Requirements Overview . . . . . . . . . . . . . . . . . . . .   6
+   3.  Calendaring Data Model  . . . . . . . . . . . . . . . . . . .   7
+     3.1.  Calendar Server . . . . . . . . . . . . . . . . . . . . .   7
+     3.2.  Recurrence and the Data Model . . . . . . . . . . . . . .   8
+   4.  Calendar Resources  . . . . . . . . . . . . . . . . . . . . .   9
+     4.1.  Calendar Object Resources . . . . . . . . . . . . . . . .   9
+     4.2.  Calendar Collection . . . . . . . . . . . . . . . . . . .  10
+   5.  Calendar Access Feature . . . . . . . . . . . . . . . . . . .  11
+     5.1.  Calendar Access Support . . . . . . . . . . . . . . . . .  11
        5.1.1.  Example: Using OPTIONS for the Discovery of
-               Calendar Access Support . . . . . . . . . . . . . . .  11
-     5.2.  Calendar Collection Properties  . . . . . . . . . . . . .  11
-       5.2.1.  CALDAV:calendar-description Property  . . . . . . . .  11
-       5.2.2.  CALDAV:calendar-timezone Property . . . . . . . . . .  12
-       5.2.3.  CALDAV:supported-calendar-component-set Property  . .  14
-       5.2.4.  CALDAV:supported-calendar-data Property . . . . . . .  15
-       5.2.5.  CALDAV:max-resource-size Property . . . . . . . . . .  15
-       5.2.6.  CALDAV:min-date-time Property . . . . . . . . . . . .  16
-       5.2.7.  CALDAV:max-date-time Property . . . . . . . . . . . .  17
-       5.2.8.  CALDAV:max-instances Property . . . . . . . . . . . .  18
-       5.2.9.  CALDAV:max-attendees-per-instance Property  . . . . .  19
-       5.2.10. Additional Precondition for PROPPATCH . . . . . . . .  19
-     5.3.  Creating Resources  . . . . . . . . . . . . . . . . . . .  20
-       5.3.1.  MKCALENDAR Method . . . . . . . . . . . . . . . . . .  20
-         5.3.1.1.  Status Codes  . . . . . . . . . . . . . . . . . .  21
-         5.3.1.2.  Example: Successful MKCALENDAR request  . . . . .  22
-       5.3.2.  Creating Calendar Object Resources  . . . . . . . . .  24
-         5.3.2.1.  Additional Preconditions for PUT, COPY and MOVE .  25
-       5.3.3.  Non-standard components, properties and parameters  .  27
-       5.3.4.  Calendar Object Resource Entity Tag . . . . . . . . .  27
-   6.  Calendaring Access Control  . . . . . . . . . . . . . . . . .  28
-     6.1.  Calendaring Privilege . . . . . . . . . . . . . . . . . .  28
-       6.1.1.  CALDAV:read-free-busy Privilege . . . . . . . . . . .  28
-     6.2.  Additional Principal Property . . . . . . . . . . . . . .  29
-       6.2.1.  CALDAV:calendar-home-set Property . . . . . . . . . .  29
-   7.  Calendaring Reports . . . . . . . . . . . . . . . . . . . . .  30
-     7.1.  REPORT Method . . . . . . . . . . . . . . . . . . . . . .  30
-     7.2.  Ordinary collections  . . . . . . . . . . . . . . . . . .  30
-     7.3.  Date and floating time  . . . . . . . . . . . . . . . . .  31
-     7.4.  Time range filtering  . . . . . . . . . . . . . . . . . .  31
+               Calendar Access Support . . . . . . . . . . . . . . .  12
+     5.2.  Calendar Collection Properties  . . . . . . . . . . . . .  12
+       5.2.1.  CALDAV:calendar-description Property  . . . . . . . .  12
+       5.2.2.  CALDAV:calendar-timezone Property . . . . . . . . . .  13
+       5.2.3.  CALDAV:supported-calendar-component-set Property  . .  14
+       5.2.4.  CALDAV:supported-calendar-data Property . . . . . . .  15
+       5.2.5.  CALDAV:max-resource-size Property . . . . . . . . . .  16
+       5.2.6.  CALDAV:min-date-time Property . . . . . . . . . . . .  17
+       5.2.7.  CALDAV:max-date-time Property . . . . . . . . . . . .  18
+       5.2.8.  CALDAV:max-instances Property . . . . . . . . . . . .  18
+       5.2.9.  CALDAV:max-attendees-per-instance Property  . . . . .  19
+       5.2.10. Additional Precondition for PROPPATCH . . . . . . . .  20
+     5.3.  Creating Resources  . . . . . . . . . . . . . . . . . . .  20
+       5.3.1.  MKCALENDAR Method . . . . . . . . . . . . . . . . . .  20
+         5.3.1.1.  Status Codes  . . . . . . . . . . . . . . . . . .  22
+         5.3.1.2.  Example: Successful MKCALENDAR request  . . . . .  23
+       5.3.2.  Creating Calendar Object Resources  . . . . . . . . .  25
+         5.3.2.1.  Additional Preconditions for PUT, COPY and MOVE .  26
+       5.3.3.  Non-standard components, properties and parameters  .  28
+       5.3.4.  Calendar Object Resource Entity Tag . . . . . . . . .  28
+   6.  Calendaring Access Control  . . . . . . . . . . . . . . . . .  29
+     6.1.  Calendaring Privilege . . . . . . . . . . . . . . . . . .  29
+       6.1.1.  CALDAV:read-free-busy Privilege . . . . . . . . . . .  29
+     6.2.  Additional Principal Property . . . . . . . . . . . . . .  30
+       6.2.1.  CALDAV:calendar-home-set Property . . . . . . . . . .  30
+   7.  Calendaring Reports . . . . . . . . . . . . . . . . . . . . .  31
+     7.1.  REPORT Method . . . . . . . . . . . . . . . . . . . . . .  31
+     7.2.  Ordinary collections  . . . . . . . . . . . . . . . . . .  31
+     7.3.  Date and floating time  . . . . . . . . . . . . . . . . .  32
 
 
 
-Daboo, et al.           Expires October 28, 2006                [Page 2]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                 [Page 2]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-     7.5.  Partial Retrieval . . . . . . . . . . . . . . . . . . . .  32
-     7.6.  Non-standard components, properties and parameters  . . .  33
-     7.7.  CALDAV:calendar-query Report  . . . . . . . . . . . . . .  33
-       7.7.1.  Example: Partial retrieval of events by time range  .  35
-       7.7.2.  Example: Partial retrieval of recurring events  . . .  39
-       7.7.3.  Example: Expanded retrieval of recurring events . . .  42
-       7.7.4.  Example: Partial retrieval of stored free busy
-               components  . . . . . . . . . . . . . . . . . . . . .  44
-       7.7.5.  Example: Retrieval of to-dos by alarm time range  . .  46
-       7.7.6.  Example: Retrieval of event by UID  . . . . . . . . .  48
-       7.7.7.  Example: Retrieval of events by PARTSTAT  . . . . . .  50
-       7.7.8.  Example: Retrieval of events only . . . . . . . . . .  52
-       7.7.9.  Example: Retrieval of all pending to-dos  . . . . . .  56
-       7.7.10. Example: Attempt to query unsupported property  . . .  59
-     7.8.  CALDAV:calendar-multiget Report . . . . . . . . . . . . .  60
-       7.8.1.  Example: Successful CALDAV:calendar-multiget Report .  61
-     7.9.  CALDAV:free-busy-query Report . . . . . . . . . . . . . .  63
-       7.9.1.  Example: Successful CALDAV:free-busy-query Report . .  65
-   8.  Guidelines  . . . . . . . . . . . . . . . . . . . . . . . . .  65
-     8.1.  Client-to-client Interoperability . . . . . . . . . . . .  66
-     8.2.  Synchronization Operations  . . . . . . . . . . . . . . .  66
-       8.2.1.  Use of Reports  . . . . . . . . . . . . . . . . . . .  66
-         8.2.1.1.  Restrict the Time Range . . . . . . . . . . . . .  66
-         8.2.1.2.  Synchronize by Time Range . . . . . . . . . . . .  66
-         8.2.1.3.  Synchronization Process . . . . . . . . . . . . .  67
-       8.2.2.  Restrict the Properties Returned  . . . . . . . . . .  69
-     8.3.  Use of Locking  . . . . . . . . . . . . . . . . . . . . .  69
-     8.4.  Finding calendars . . . . . . . . . . . . . . . . . . . .  69
-     8.5.  Storing and Using Attachments . . . . . . . . . . . . . .  71
-       8.5.1.  Inline attachments  . . . . . . . . . . . . . . . . .  71
-       8.5.2.  External attachments  . . . . . . . . . . . . . . . .  72
-     8.6.  Storing and Using Alarms  . . . . . . . . . . . . . . . .  73
-   9.  XML Element Definitions . . . . . . . . . . . . . . . . . . .  74
-     9.1.  CALDAV:calendar XML Element . . . . . . . . . . . . . . .  74
-     9.2.  CALDAV:mkcalendar XML Element . . . . . . . . . . . . . .  74
-     9.3.  CALDAV:mkcalendar-response XML Element  . . . . . . . . .  74
-     9.4.  CALDAV:calendar-query XML Element . . . . . . . . . . . .  75
-     9.5.  CALDAV:calendar-data XML Element  . . . . . . . . . . . .  75
-       9.5.1.  CALDAV:comp XML Element . . . . . . . . . . . . . . .  76
-       9.5.2.  CALDAV:allcomp XML Element  . . . . . . . . . . . . .  77
-       9.5.3.  CALDAV:allprop XML Element  . . . . . . . . . . . . .  77
-       9.5.4.  CALDAV:prop XML Element . . . . . . . . . . . . . . .  78
-       9.5.5.  CALDAV:expand XML Element . . . . . . . . . . . . . .  78
-       9.5.6.  CALDAV:limit-recurrence-set XML Element . . . . . . .  79
-       9.5.7.  CALDAV:limit-freebusy-set XML Element . . . . . . . .  80
-     9.6.  CALDAV:filter XML Element . . . . . . . . . . . . . . . .  81
-       9.6.1.  CALDAV:comp-filter XML Element  . . . . . . . . . . .  81
-       9.6.2.  CALDAV:prop-filter XML Element  . . . . . . . . . . .  82
+     7.4.  Time range filtering  . . . . . . . . . . . . . . . . . .  32
+     7.5.  Searching Text: Collations  . . . . . . . . . . . . . . .  33
+       7.5.1.  CALDAV:supported-collation-set Property . . . . . . .  34
+     7.6.  Partial Retrieval . . . . . . . . . . . . . . . . . . . .  34
+     7.7.  Non-standard components, properties and parameters  . . .  35
+     7.8.  CALDAV:calendar-query Report  . . . . . . . . . . . . . .  35
+       7.8.1.  Example: Partial retrieval of events by time range  .  38
+       7.8.2.  Example: Partial retrieval of recurring events  . . .  42
+       7.8.3.  Example: Expanded retrieval of recurring events . . .  45
+       7.8.4.  Example: Partial retrieval of stored free busy
+               components  . . . . . . . . . . . . . . . . . . . . .  47
+       7.8.5.  Example: Retrieval of to-dos by alarm time range  . .  49
+       7.8.6.  Example: Retrieval of event by UID  . . . . . . . . .  51
+       7.8.7.  Example: Retrieval of events by PARTSTAT  . . . . . .  53
+       7.8.8.  Example: Retrieval of events only . . . . . . . . . .  55
+       7.8.9.  Example: Retrieval of all pending to-dos  . . . . . .  59
+       7.8.10. Example: Attempt to query unsupported property  . . .  62
+     7.9.  CALDAV:calendar-multiget Report . . . . . . . . . . . . .  63
+       7.9.1.  Example: Successful CALDAV:calendar-multiget Report .  64
+     7.10. CALDAV:free-busy-query Report . . . . . . . . . . . . . .  66
+       7.10.1. Example: Successful CALDAV:free-busy-query Report . .  68
+   8.  Guidelines  . . . . . . . . . . . . . . . . . . . . . . . . .  68
+     8.1.  Client-to-client Interoperability . . . . . . . . . . . .  69
+     8.2.  Synchronization Operations  . . . . . . . . . . . . . . .  69
+       8.2.1.  Use of Reports  . . . . . . . . . . . . . . . . . . .  69
+         8.2.1.1.  Restrict the Time Range . . . . . . . . . . . . .  69
+         8.2.1.2.  Synchronize by Time Range . . . . . . . . . . . .  69
+         8.2.1.3.  Synchronization Process . . . . . . . . . . . . .  70
+       8.2.2.  Restrict the Properties Returned  . . . . . . . . . .  72
+     8.3.  Use of Locking  . . . . . . . . . . . . . . . . . . . . .  72
+     8.4.  Finding calendars . . . . . . . . . . . . . . . . . . . .  72
+     8.5.  Storing and Using Attachments . . . . . . . . . . . . . .  74
+       8.5.1.  Inline attachments  . . . . . . . . . . . . . . . . .  74
+       8.5.2.  External attachments  . . . . . . . . . . . . . . . .  75
+     8.6.  Storing and Using Alarms  . . . . . . . . . . . . . . . .  76
+   9.  XML Element Definitions . . . . . . . . . . . . . . . . . . .  77
+     9.1.  CALDAV:calendar XML Element . . . . . . . . . . . . . . .  77
+     9.2.  CALDAV:mkcalendar XML Element . . . . . . . . . . . . . .  77
+     9.3.  CALDAV:mkcalendar-response XML Element  . . . . . . . . .  77
+     9.4.  CALDAV:supported-collation XML Element  . . . . . . . . .  78
+     9.5.  CALDAV:calendar-query XML Element . . . . . . . . . . . .  78
+     9.6.  CALDAV:calendar-data XML Element  . . . . . . . . . . . .  79
+       9.6.1.  CALDAV:comp XML Element . . . . . . . . . . . . . . .  80
+       9.6.2.  CALDAV:allcomp XML Element  . . . . . . . . . . . . .  80
+       9.6.3.  CALDAV:allprop XML Element  . . . . . . . . . . . . .  81
+       9.6.4.  CALDAV:prop XML Element . . . . . . . . . . . . . . .  81
+       9.6.5.  CALDAV:expand XML Element . . . . . . . . . . . . . .  82
+       9.6.6.  CALDAV:limit-recurrence-set XML Element . . . . . . .  83
 
 
 
-Daboo, et al.           Expires October 28, 2006                [Page 3]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                 [Page 3]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-       9.6.3.  CALDAV:param-filter XML Element . . . . . . . . . . .  83
-       9.6.4.  CALDAV:is-not-defined XML Element . . . . . . . . . .  83
-       9.6.5.  CALDAV:text-match XML Element . . . . . . . . . . . .  84
-     9.7.  CALDAV:timezone XML Element . . . . . . . . . . . . . . .  84
-     9.8.  CALDAV:time-range XML Element . . . . . . . . . . . . . .  85
-     9.9.  CALDAV:calendar-multiget XML Element  . . . . . . . . . .  89
-     9.10. CALDAV:free-busy-query XML Element  . . . . . . . . . . .  90
-   10. Internationalization Considerations . . . . . . . . . . . . .  90
-   11. Security Considerations . . . . . . . . . . . . . . . . . . .  90
-   12. IANA Consideration  . . . . . . . . . . . . . . . . . . . . .  91
-     12.1. Namespace Registration  . . . . . . . . . . . . . . . . .  91
-   13. Acknowledgements  . . . . . . . . . . . . . . . . . . . . . .  91
-   14. References  . . . . . . . . . . . . . . . . . . . . . . . . .  92
-     14.1. Normative References  . . . . . . . . . . . . . . . . . .  92
-     14.2. Informative References  . . . . . . . . . . . . . . . . .  93
-   Appendix A.  CalDAV Method Privilege Table (Normative)  . . . . .  93
-   Appendix B.  Calendar collections used in the examples  . . . . .  93
+       9.6.7.  CALDAV:limit-freebusy-set XML Element . . . . . . . .  84
+     9.7.  CALDAV:filter XML Element . . . . . . . . . . . . . . . .  84
+       9.7.1.  CALDAV:comp-filter XML Element  . . . . . . . . . . .  85
+       9.7.2.  CALDAV:prop-filter XML Element  . . . . . . . . . . .  85
+       9.7.3.  CALDAV:param-filter XML Element . . . . . . . . . . .  86
+       9.7.4.  CALDAV:is-not-defined XML Element . . . . . . . . . .  87
+       9.7.5.  CALDAV:text-match XML Element . . . . . . . . . . . .  87
+     9.8.  CALDAV:timezone XML Element . . . . . . . . . . . . . . .  88
+     9.9.  CALDAV:time-range XML Element . . . . . . . . . . . . . .  88
+     9.10. CALDAV:calendar-multiget XML Element  . . . . . . . . . .  93
+     9.11. CALDAV:free-busy-query XML Element  . . . . . . . . . . .  94
+   10. Internationalization Considerations . . . . . . . . . . . . .  94
+   11. Security Considerations . . . . . . . . . . . . . . . . . . .  94
+   12. IANA Consideration  . . . . . . . . . . . . . . . . . . . . .  95
+     12.1. Namespace Registration  . . . . . . . . . . . . . . . . .  95
+   13. Acknowledgements  . . . . . . . . . . . . . . . . . . . . . .  96
+   14. References  . . . . . . . . . . . . . . . . . . . . . . . . .  96
+     14.1. Normative References  . . . . . . . . . . . . . . . . . .  96
+     14.2. Informative References  . . . . . . . . . . . . . . . . .  97
+   Appendix A.  CalDAV Method Privilege Table (Normative)  . . . . .  97
+   Appendix B.  Calendar collections used in the examples  . . . . .  98
    Appendix C.  Changes (to be removed prior to publication as an
-                RFC) . . . . . . . . . . . . . . . . . . . . . . . . 100
-     C.1.  Changes in -12  . . . . . . . . . . . . . . . . . . . . . 100
-     C.2.  Changes in -11  . . . . . . . . . . . . . . . . . . . . . 100
-     C.3.  Changes in -10  . . . . . . . . . . . . . . . . . . . . . 101
-     C.4.  Changes in -09  . . . . . . . . . . . . . . . . . . . . . 102
-     C.5.  Changes in -08  . . . . . . . . . . . . . . . . . . . . . 104
-     C.6.  Changes in -07  . . . . . . . . . . . . . . . . . . . . . 105
-     C.7.  Changes in -06  . . . . . . . . . . . . . . . . . . . . . 105
-     C.8.  Changes in -05  . . . . . . . . . . . . . . . . . . . . . 106
-     C.9.  Changes in -04  . . . . . . . . . . . . . . . . . . . . . 106
-     C.10. Changes in -03  . . . . . . . . . . . . . . . . . . . . . 107
-     C.11. Changes in -02  . . . . . . . . . . . . . . . . . . . . . 107
-     C.12. Changes in -01  . . . . . . . . . . . . . . . . . . . . . 107
-   Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . . 108
-   Intellectual Property and Copyright Statements  . . . . . . . . . 109
+                RFC) . . . . . . . . . . . . . . . . . . . . . . . . 104
+     C.1.  Changes in -15  . . . . . . . . . . . . . . . . . . . . . 104
+     C.2.  Changes in -14  . . . . . . . . . . . . . . . . . . . . . 105
+     C.3.  Changes in -13  . . . . . . . . . . . . . . . . . . . . . 105
+     C.4.  Changes in -12  . . . . . . . . . . . . . . . . . . . . . 106
+     C.5.  Changes in -11  . . . . . . . . . . . . . . . . . . . . . 106
+     C.6.  Changes in -10  . . . . . . . . . . . . . . . . . . . . . 107
+     C.7.  Changes in -09  . . . . . . . . . . . . . . . . . . . . . 108
+     C.8.  Changes in -08  . . . . . . . . . . . . . . . . . . . . . 109
+     C.9.  Changes in -07  . . . . . . . . . . . . . . . . . . . . . 110
+     C.10. Changes in -06  . . . . . . . . . . . . . . . . . . . . . 111
+     C.11. Changes in -05  . . . . . . . . . . . . . . . . . . . . . 111
+     C.12. Changes in -04  . . . . . . . . . . . . . . . . . . . . . 112
+     C.13. Changes in -03  . . . . . . . . . . . . . . . . . . . . . 113
+     C.14. Changes in -02  . . . . . . . . . . . . . . . . . . . . . 113
+     C.15. Changes in -01  . . . . . . . . . . . . . . . . . . . . . 113
+   Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . . 114
+   Intellectual Property and Copyright Statements  . . . . . . . . . 115
 
 
 
@@ -259,55 +220,45 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
+Daboo, et al.            Expires March 17, 2007                 [Page 4]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
+1.  Introduction
 
+   The concept of using HTTP [RFC2616] and WebDAV [RFC2518] as a basis
+   for a calendar access protocol is by no means a new concept: it was
+   discussed in the IETF CALSCH working group as early as 1997 or 1998.
+   Several companies have implemented calendar access protocols using
+   HTTP to upload and download iCalendar [RFC2445] objects, and using
+   WebDAV to get listings of resources.  However, those implementations
+   do not interoperate because there are many small and big decisions to
+   be made in how to model calendaring data as WebDAV resources, as well
+   as how to implement required features that aren't already part of
+   WebDAV.  This document proposes a way to model calendar data in
+   WebDAV, with additional features to make an interoperable calendar
+   access protocol.
 
-
-
-
-Daboo, et al.           Expires October 28, 2006                [Page 4]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-1.  Introduction
-
-   The concept of using HTTP [RFC2616] and WebDAV [I-D.ietf-webdav-
-   rfc2518bis] as a basis for a calendar access protocol is by no means
-   a new concept: it was discussed in the IETF CALSCH working group as
-   early as 1997 or 1998.  Several companies have implemented calendar
-   access protocols using HTTP to upload and download iCalendar
-   [RFC2445] objects, and using WebDAV to get listings of resources.
-   However, those implementations do not interoperate because there are
-   many small and big decisions to be made in how to model calendaring
-   data as WebDAV resources, as well as how to implement required
-   features that aren't already part of WebDAV.  This document proposes
-   a way to model calendar data in WebDAV, with additional features to
-   make an interoperable calendar access protocol.
-
-   Discussion of this Internet-Draft is taking place on the mailing list
-   <http://lists.osafoundation.org/mailman/listinfo/ietf-caldav>.
-
-1.1.  Notational Conventions
+1.1.  Notational Conventions
 
    The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
    "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
-   document are to be interpreted as described in [RFC2119].
+   document are to be interpreted as described in [RFC2119].
 
    The term "protected" is used in the Conformance field of property
-   definitions as defined in Section 1.4.2 of [RFC3253].
+   definitions as defined in Section 1.4.2 of [RFC3253].
 
    When XML element types in the namespaces "DAV:" and
    "urn:ietf:params:xml:ns:caldav" are referenced in this document
    outside of the context of an XML fragment, the string "DAV:" and
    "CALDAV:" will be prefixed to the element type names respectively.
 
-1.2.  XML Namespaces and Processing
+1.2.  XML Namespaces and Processing
 
    Definitions of XML elements in this document use XML element type
    declarations (as found in XML Document Type Declarations), described
-   in Section 3.2 of [W3C.REC-xml-20040204].
+   in Section 3.2 of [W3C.REC-xml-20060816].
 
    The namespace "urn:ietf:params:xml:ns:caldav" is reserved for the XML
    elements defined in this specification, its revisions, and related
@@ -316,74 +267,94 @@ Internet-Draft                   CalDAV                       April 2006
    namespace, and instead should use a namespace that they control.
 
    The XML declarations used in this document do not include namespace
-   information.  Thus, implementers MUST NOT use these declarations as
+   information.  Thus, implementers must not use these declarations as
    the only way to create valid CalDAV properties or to validate CalDAV
    XML element type.  Some of the declarations refer to XML elements
+   defined by WebDAV [RFC2518] which use the "DAV:" namespace.  Wherever
+   such XML elements appear, they are explicitly prefixed with "DAV:" to
+   avoid confusion.
 
 
 
-Daboo, et al.           Expires October 28, 2006                [Page 5]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                 [Page 5]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   defined by WebDAV [I-D.ietf-webdav-rfc2518bis] which use the "DAV:"
-   namespace.  Wherever such XML elements appear, they are explicitly
-   prefixed with "DAV:" to avoid confusion.
-
    Also note that some CalDAV XML element names are identical to WebDAV
    XML element names, though their namespace differs.  Care must be
    taken not to confuse the two sets of names.
 
    Processing of XML by CalDAV clients and servers MUST follow the rules
-   described in [I-D.ietf-webdav-rfc2518bis], in particular Sections 8.2
-   and 17, and Appendix A of that specification.
+   described in [RFC2518], in particular Section 14, and Appendices 3
+   and 4 of that specification.
+
+1.3.  Method Preconditions and Postconditions
+
+   A "precondition" of a method describes the state of the server that
+   must be true for that method to be performed.  A "postcondition" of a
+   method describes the state of the server that must be true after that
+   method has been completed.  If a method precondition or postcondition
+   for a request is not satisfied, the response status of the request
+   MUST be either 403 (Forbidden) if the request should not be repeated
+   because it will always fail, or 409 (Conflict) if it is expected that
+   the user might be able to resolve the conflict and resubmit the
+   request.
+
+   In order to allow better client handling of 403 and 409 responses, a
+   distinct XML element type is associated with each method precondition
+   and postcondition of a request.  When a particular precondition is
+   not satisfied or a particular postcondition cannot be achieved, the
+   appropriate XML element MUST be returned as the child of a top-level
+   DAV:error element in the response body, unless otherwise negotiated
+   by the request.
 
 
-2.  Requirements Overview
+2.  Requirements Overview
 
    This section lists what functionality is required of a CalDAV server.
    To advertise support for CalDAV, a server:
 
-   o  MUST support iCalendar [RFC2445] as a media type for calendar
+   o  MUST support iCalendar [RFC2445] as a media type for calendar
       object resource format;
 
-   o  MUST support WebDAV Class 1 and Class 3 [I-D.ietf-webdav-
-      rfc2518bis];
+   o  MUST support WebDAV Class 1 [RFC2518] (note that [I-D.ietf-webdav-
+      rfc2518bis] describes clarifications to [RFC2518] that aid
+      interoperability);
 
-   o  MUST support WebDAV ACL [RFC3744] with the additional privilege
-      defined in Section 6.1 of this document;
+   o  MUST support WebDAV ACL [RFC3744] with the additional privilege
+      defined in Section 6.1 of this document;
 
-   o  MUST support transport over TLS [RFC2246] as defined in [RFC2818];
+   o  MUST support transport over TLS [RFC2246] as defined in [RFC2818]
+      (note that [RFC2246] has been obsoleted by [RFC4346]);
 
-   o  MUST support ETags [RFC2616] with additional requirements
-      specified in Section 5.3.4 of this document;
 
-   o  MUST support all calendaring REPORTs defined in Section 7 of this
+
+
+
+Daboo, et al.            Expires March 17, 2007                 [Page 6]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+   o  MUST support ETags [RFC2616] with additional requirements
+      specified in Section 5.3.4 of this document;
+
+   o  MUST support all calendaring REPORTs defined in Section 7 of this
       document; and
 
    o  MUST advertise support on all calendar collections and calendar
       object resources for the calendaring REPORTs in the DAV:supported-
       report-set property as defined in Versioning Extensions to WebDAV
-      [RFC3253].
+      [RFC3253].
 
    In addition, a server:
 
-   o  SHOULD support the MKCALENDAR method defined in Section 5.3.1 of
+   o  SHOULD support the MKCALENDAR method defined in Section 5.3.1 of
       this document.
 
 
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006                [Page 6]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-3.  Calendaring Data Model
+3.  Calendaring Data Model
 
    One of the features which has made WebDAV a successful protocol is
    its firm data model.  This makes it a useful framework for other
@@ -399,9 +370,9 @@ Internet-Draft                   CalDAV                       April 2006
    called a "calendar object resource".  Each calendar object resource
    and each calendar collection can be individually locked and have
    individual WebDAV properties.  Requirements derived from this model
-   are provided in Section 4.1 and Section 4.2.
+   are provided in Section 4.1 and Section 4.2.
 
-3.1.  Calendar Server
+3.1.  Calendar Server
 
    A CalDAV server is a calendaring-aware engine combined with a WebDAV
    repository.  A WebDAV repository is a set of WebDAV collections,
@@ -414,6 +385,14 @@ Internet-Draft                   CalDAV                       April 2006
    or other Web server extension).
 
    A WebDAV repository MAY include calendar data in some parts of its
+
+
+
+Daboo, et al.            Expires March 17, 2007                 [Page 7]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    URL namespace, and non-calendaring data in other parts.
 
    A WebDAV repository can advertise itself as a CalDAV server if it
@@ -431,24 +410,15 @@ Internet-Draft                   CalDAV                       April 2006
    collection.
 
    The CalDAV server or repository is the canonical location for
+   calendar data and state information.  Clients may submit requests to
+   change data or download data.  Clients may store calendar objects
+   offline and attempt to synchronize at a later time.  However, clients
+   MUST be prepared for calendar data on the server to change between
+   the time of last synchronization and when attempting an update, as
+   calendar collections may be shared and accessible via multiple
+   clients.  Entity tags and other features make this possible.
 
-
-
-Daboo, et al.           Expires October 28, 2006                [Page 7]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-   calendar data and state information.  Both CalDAV servers and clients
-   MUST ensure that the data is consistent and compliant.  Clients may
-   submit requests to change data or download data.  Clients may store
-   calendar objects offline and attempt to synchronize at a later time.
-   However, clients MUST be prepared for calendar data on the server to
-   change between the time of last synchronization and when attempting
-   an update, as calendar collections may be shared and accessible via
-   multiple clients.  Entity tags and other features make this possible.
-
-3.2.  Recurrence and the Data Model
+3.2.  Recurrence and the Data Model
 
    Recurrence is an important part of the data model because it governs
    how many resources are expected to exist.  This specification models
@@ -472,9 +442,16 @@ Internet-Draft                   CalDAV                       April 2006
    time range.
 
 
-4.  Calendar Resources
 
-4.1.  Calendar Object Resources
+
+Daboo, et al.            Expires March 17, 2007                 [Page 8]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+4.  Calendar Resources
+
+4.1.  Calendar Object Resources
 
    Calendar object resources contained in calendar collections MUST NOT
    contain more than one type of calendar component (e.g., VEVENT,
@@ -487,14 +464,6 @@ Internet-Draft                   CalDAV                       April 2006
    stored in separate calendar object resources in the same collection.
 
    Calendar object resources contained in calendar collections MUST NOT
-
-
-
-Daboo, et al.           Expires October 28, 2006                [Page 8]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    specify the iCalendar METHOD property.
 
    The UID property value of the calendar components contained in a
@@ -516,6 +485,26 @@ Internet-Draft                   CalDAV                       April 2006
 
    For example, given the following iCalendar object:
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                 [Page 9]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
     BEGIN:VCALENDAR
     PRODID:-//Example Corp.//CalDAV Client//EN
     VERSION:2.0
@@ -544,20 +533,13 @@ Internet-Draft                   CalDAV                       April 2006
     END:VEVENT
     END:VCALENDAR
 
-
-
-Daboo, et al.           Expires October 28, 2006                [Page 9]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    The VEVENT component with the UID value "1@example.com", would be
    stored in its own calendar object resource.  The two VEVENT
    components with the UID value "2@example.com", which represent a
    recurring event where one recurrence instance has been overridden,
    would be stored in the same calendar object resource.
 
-4.2.  Calendar Collection
+4.2.  Calendar Collection
 
    A calendar collection contains calendar object resources that
    represent calendar components within a calendar.  A calendar
@@ -567,17 +549,25 @@ Internet-Draft                   CalDAV                       April 2006
    resourcetype property.  The element type declaration for CALDAV:
    calendar is:
 
-       <!ELEMENT calendar EMPTY>
+       
 
    A calendar collection can be created through provisioning (e.g.,
    automatically created when a user's account is provisioned), or it
-   can be created with the MKCALENDAR method (see Section 5.3.1).  This
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 10]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+   can be created with the MKCALENDAR method (see Section 5.3.1).  This
    method can be useful for a user to create additional calendars (e.g.,
    soccer schedule) or for users to share a calendar (e.g., team events
    or conference room).  Note however that this document doesn't define
    what extra calendar collections are for.  Users must rely on non-
    standard cues to find out what a calendar collection is for, or use
-   the CALDAV:calendar-description property defined in Section 5.2.1 to
+   the CALDAV:calendar-description property defined in Section 5.2.1 to
    provide such a cue.
 
    The following restrictions are applied to the resources within a
@@ -600,19 +590,12 @@ Internet-Draft                   CalDAV                       April 2006
        any calendar object resources contained in the calendar
        collection.
 
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 10]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    Multiple calendar collections MAY be children of the same collection.
 
 
-5.  Calendar Access Feature
+5.  Calendar Access Feature
 
-5.1.  Calendar Access Support
+5.1.  Calendar Access Support
 
    A server supporting the features described in this document MUST
    include "calendar-access" as a field in the DAV response header from
@@ -621,15 +604,28 @@ Internet-Draft                   CalDAV                       April 2006
    access" in the DAV response header MUST indicate that the server
    supports all MUST level requirements specified in this document.
 
-5.1.1.  Example: Using OPTIONS for the Discovery of Calendar Access
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 11]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+5.1.1.  Example: Using OPTIONS for the Discovery of Calendar Access
         Support
 
-   >> Request <<
+   >> Request <<
 
    OPTIONS /home/bernard/calendars/ HTTP/1.1
    Host: cal.example.com
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 200 OK
    Allow: OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE
@@ -643,26 +639,15 @@ Internet-Draft                   CalDAV                       April 2006
    "/home/bernard/calendars/" supports the properties, reports, methods,
    or privileges defined in this specification.
 
-5.2.  Calendar Collection Properties
+5.2.  Calendar Collection Properties
 
    This section defines properties that MAY be defined on calendar
    collections.
 
-5.2.1.  CALDAV:calendar-description Property
+5.2.1.  CALDAV:calendar-description Property
 
    Name: calendar-description
 
-
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 11]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    Namespace: urn:ietf:params:xml:ns:caldav
 
    Purpose: Provides a human-readable description of the calendar
@@ -670,29 +655,36 @@ Internet-Draft                   CalDAV                       April 2006
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MAY be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).  An xml:lang attribute indicating
-      the human language of the description SHOULD be set for this
-      property by clients or through server provisioning.  Servers MUST
-      return any xml:lang attribute if set for the property.
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).  An xml:lang attribute indicating the human language
+      of the description SHOULD be set for this property by clients or
+      through server provisioning.  Servers MUST return any xml:lang
+      attribute if set for the property.
 
    Description: If present, the property contains a description of the
       calendar collection that is suitable for presentation to a user.
       If not present, the client should assume no description for the
       calendar collection.
 
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 12]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Definition:
 
-         <!ELEMENT calendar-description (#PCDATA)>
+         
          PCDATA value: string
 
    Example:
 
-         <C:calendar-description xml:lang="fr-CA"
+         Calendrier de Mathilde Desruisseaux
 
-5.2.2.  CALDAV:calendar-timezone Property
+5.2.2.  CALDAV:calendar-timezone Property
 
    Name: calendar-timezone
 
@@ -702,8 +694,7 @@ Internet-Draft                   CalDAV                       April 2006
 
    Conformance: This property SHOULD be defined on all calendar
       collections.  If defined, it SHOULD NOT be returned by a PROPFIND
-      DAV:allprop request (as defined in Section 14.2 of [I-D.ietf-
-      webdav-rfc2518bis]).
+      DAV:allprop request (as defined in Section 12.14.1 of [RFC2518]).
 
    Description: The CALDAV:calendar-timezone property is used to specify
       the time zone the server should rely on to resolve "date" values
@@ -711,14 +702,6 @@ Internet-Draft                   CalDAV                       April 2006
       with UTC time" values.  The server will require this information
       to determine if a calendar component scheduled with "date" values
       or "date with local time" values overlaps a CALDAV:time-range
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 12]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
       specified in a CALDAV:calendar-query REPORT.  The server will also
       require this information to compute the proper FREEBUSY time
       period as "date with UTC time" in the VFREEBUSY component returned
@@ -729,21 +712,29 @@ Internet-Draft                   CalDAV                       April 2006
 
    Note: The iCalendar data embedded within the CALDAV:calendar-timezone
       XML element MUST follow the standard XML character data encoding
-      rules, including use of &lt;, &gt;, &amp; etc entity encoding or
-      the use of a <[!CDATA[ ... ]]> construct.  In the later case the
-      iCalendar data cannot contain the character sequence "]]>" which
+      rules, including use of <, >, & etc entity encoding or
+      the use of a  construct.  In the later case the
+      iCalendar data cannot contain the character sequence "]]>" which
       is the end delimiter for the CDATA section.
 
    Definition:
 
-         <!ELEMENT calendar-timezone (#PCDATA)>
+         
          PCDATA value: an iCalendar object with exactly one VTIMEZONE
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 13]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
                component.
 
    Example:
 
-   <C:calendar-timezone
-       xmlns:C="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+   BEGIN:VCALENDAR
    PRODID:-//Example Corp.//CalDAV Client//EN
    VERSION:2.0
    BEGIN:VTIMEZONE
@@ -754,28 +745,20 @@ Internet-Draft                   CalDAV                       April 2006
    RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
    TZOFFSETFROM:-0400
    TZOFFSETTO:-0500
-   TZNAME:Eastern Standard Time (US &amp; Canada)
+   TZNAME:Eastern Standard Time (US & Canada)
    END:STANDARD
    BEGIN:DAYLIGHT
    DTSTART:19870405T020000
    RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
    TZOFFSETFROM:-0500
    TZOFFSETTO:-0400
-   TZNAME:Eastern Daylight Time (US &amp; Canada)
+   TZNAME:Eastern Daylight Time (US & Canada)
    END:DAYLIGHT
    END:VTIMEZONE
    END:VCALENDAR
-   </C:calendar-timezone>
+   
 
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 13]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-5.2.3.  CALDAV:supported-calendar-component-set Property
+5.2.3.  CALDAV:supported-calendar-component-set Property
 
    Name: supported-calendar-component-set
 
@@ -787,20 +770,28 @@ Internet-Draft                   CalDAV                       April 2006
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:supported-calendar-component-set property is
       used to specify restrictions on the calendar component types that
       calendar object resources may contain in a calendar collection.
       Any attempt by the client to store calendar object resources with
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 14]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
       component types not listed in this property, if it exists, MUST
       result in an error, with the CALDAV:supported-calendar-component
-      precondition (Section 5.3.2.1) being violated.  Since this
+      precondition (Section 5.3.2.1) being violated.  Since this
       property is protected it cannot be changed by clients using a
       PROPPATCH request.  However, clients can initialize the value of
       this property when creating a new calendar collection with
-      MKCALENDAR.  The empty-element tag <C:comp name="VTIMEZONE"/> MUST
+      MKCALENDAR.  The empty-element tag  MUST
       only be specified if support for calendar object resources that
       only contain VTIMEZONE components is provided or desired.  Support
       for VTIMEZONE components in calendar object resources that contain
@@ -810,28 +801,17 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT supported-calendar-component-set (comp*)>
+         
 
    Example:
 
-         <C:supported-calendar-component-set
-             xmlns:C="urn:ietf:params:xml:ns:caldav">
-           <C:comp name="VEVENT"/>
-           <C:comp name="VTODO"/>
-         </C:supported-calendar-component-set>
+         
+           
+           
+         
 
-
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 14]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-5.2.4.  CALDAV:supported-calendar-data Property
+5.2.4.  CALDAV:supported-calendar-data Property
 
    Name: supported-calendar-data
 
@@ -842,8 +822,8 @@ Internet-Draft                   CalDAV                       April 2006
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:supported-calendar-data property is used to
       specify the media type supported for the calendar object resources
@@ -851,23 +831,31 @@ Internet-Draft                   CalDAV                       April 2006
       2.0).  Any attempt by the client to store calendar object
       resources with a media type not listed in this property MUST
       result in an error, with the CALDAV:supported-calendar-data
-      precondition (Section 5.3.2.1) being violated.  In the absence of
-      this property the server MUST accept data with the media type
+      precondition (Section 5.3.2.1) being violated.  In the absence of
+      this property the server MUST only accept data with the media type
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 15]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
       "text/calendar" and iCalendar version 2.0, and clients can assume
       that.
 
    Definition:
 
-         <!ELEMENT supported-calendar-data (calendar-data*)>
+         
 
    Example:
 
-         <C:supported-calendar-data
-            xmlns:C="urn:ietf:params:xml:ns:caldav">
-           <C:calendar-data content-type="text/calendar" version="2.0"/>
-         </C:supported-calendar-data>
+         
+           
+         
 
-5.2.5.  CALDAV:max-resource-size Property
+5.2.5.  CALDAV:max-resource-size Property
 
    Name: max-resource-size
 
@@ -877,42 +865,44 @@ Internet-Draft                   CalDAV                       April 2006
       resource in octets that the server is willing to accept when a
       calendar object resource is stored in a calendar collection.
 
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 15]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:max-resource-size is used to specify a
       numeric value that represents the maximum size in octets that the
       server is willing to accept when a calendar object resource is
       stored in a calendar collection.  Any attempt to store a calendar
       object resource exceeding this size MUST result in an error, with
-      the CALDAV:max-resource-size precondition (Section 5.3.2.1) being
+      the CALDAV:max-resource-size precondition (Section 5.3.2.1) being
       violated.  In the absence of this property the client can assume
       that the server will allow storing a resource of any reasonable
       size.
 
    Definition:
 
-         <!ELEMENT max-resource-size (#PCDATA)>
+         
          PCDATA value: a numeric value (positive integer)
 
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 16]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Example:
 
-         <C:max-resource-size xmlns:C="urn:ietf:params:xml:ns:caldav"
-         >102400</C:max-resource-size>
+         102400
 
-5.2.6.  CALDAV:min-date-time Property
+5.2.6.  CALDAV:min-date-time Property
 
    Name: min-date-time
 
@@ -925,8 +915,8 @@ Internet-Draft                   CalDAV                       April 2006
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:min-date-time is used to specify an iCalendar
       DATE-TIME value in UTC that indicates the earliest inclusive date
@@ -935,15 +925,7 @@ Internet-Draft                   CalDAV                       April 2006
       collection.  Any attempt to store a calendar object resource using
       a date or time value earlier than this value MUST result in an
       error, with the CALDAV:min-date-time precondition
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 16]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-      (Section 5.3.2.1) being violated.  Note that servers MUST accept
+      (Section 5.3.2.1) being violated.  Note that servers MUST accept
       recurring components that specify instances beyond this limit,
       provided none of those instances have been overridden.  In that
       case the server MAY simply ignore those instances outside of the
@@ -954,15 +936,24 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT min-date-time (#PCDATA)>
+         
          PCDATA value: an iCalendar format DATE-TIME value in UTC
 
    Example:
 
-         <C:min-date-time xmlns:C="urn:ietf:params:xml:ns:caldav"
-         >19000101T000000Z</C:min-date-time>
+         19000101T000000Z
 
-5.2.7.  CALDAV:max-date-time Property
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 17]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+5.2.7.  CALDAV:max-date-time Property
 
    Name: max-date-time
 
@@ -975,8 +966,8 @@ Internet-Draft                   CalDAV                       April 2006
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:max-date-time is used to specify an iCalendar
       DATE-TIME value in UTC that indicates the inclusive latest date
@@ -984,35 +975,39 @@ Internet-Draft                   CalDAV                       April 2006
       a calendar object resource stored in a calendar collection.  Any
       attempt to store a calendar object resource using a date or time
       value later than this value MUST result in an error, with the
-      CALDAV:max-date-time precondition (Section 5.3.2.1) being
+      CALDAV:max-date-time precondition (Section 5.3.2.1) being
       violated.  Note that servers MUST accept recurring components that
       specify instances beyond this limit, provided none of those
       instances have been overridden.  In that case the server MAY
       simply ignore those instances outside of the acceptable range when
       processing reports on the calendar object resource.  In the
       absence of this property the client can assume any valid iCalendar
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 17]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
       date may be used at least down to the CALDAV:min-date-time value
       if that is defined.
 
    Definition:
 
-         <!ELEMENT max-date-time (#PCDATA)>
+         
          PCDATA value: an iCalendar format DATE-TIME value in UTC
 
    Example:
 
-         <C:max-date-time xmlns:C="urn:ietf:params:xml:ns:caldav"
-         >20491231T235959Z</C:max-date-time>
+         20491231T235959Z
+
+5.2.8.  CALDAV:max-instances Property
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 18]
+
+Internet-Draft                   CalDAV                   September 2006
 
-5.2.8.  CALDAV:max-instances Property
 
    Name: max-instances
 
@@ -1024,8 +1019,8 @@ Internet-Draft                   CalDAV                       April 2006
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:max-instances is used to specify a numeric
       value that indicates the maximum number of recurrence instances
@@ -1033,29 +1028,21 @@ Internet-Draft                   CalDAV                       April 2006
       can generate.  Any attempt to store a calendar object resource
       with a recurrence pattern that generates more instances than this
       value MUST result in an error, with the CALDAV:max-instances
-      precondition (Section 5.3.2.1) being violated.  In the absence of
+      precondition (Section 5.3.2.1) being violated.  In the absence of
       this property the client can assume that the server has no limits
       on the number of recurrence instances it can handle or expand.
 
    Definition:
 
-         <!ELEMENT max-instances (#PCDATA)>
+         
          PCDATA value: a numeric value (integer greater than zero)
 
    Example:
 
-         <C:max-instances xmlns:C="urn:ietf:params:xml:ns:caldav"
-         >100</C:max-instances>
+         100
 
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 18]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-5.2.9.  CALDAV:max-attendees-per-instance Property
+5.2.9.  CALDAV:max-attendees-per-instance Property
 
    Name: max-attendees-per-instance
 
@@ -1067,8 +1054,16 @@ Internet-Draft                   CalDAV                       April 2006
 
    Conformance: This property MAY be defined on any calendar collection.
       If defined, it MUST be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 19]
+
+Internet-Draft                   CalDAV                   September 2006
+
 
    Description: The CALDAV:max-attendees-per-instance is used to specify
       a numeric value that indicates the maximum number of iCalendar
@@ -1076,42 +1071,32 @@ Internet-Draft                   CalDAV                       April 2006
       resource stored in a calendar collection.  Any attempt to store a
       calendar object resource with more ATTENDEE properties per
       instance than this value MUST result in an error, with the CALDAV:
-      max-attendees-per-instance precondition (Section 5.3.2.1) being
+      max-attendees-per-instance precondition (Section 5.3.2.1) being
       violated.  In the absence of this property the client can assume
       that the server can handle any number of ATTENDEE properties in a
       calendar component.
 
    Definition:
 
-         <!ELEMENT max-attendees-per-instance (#PCDATA)>
+         
          PCDATA value: a numeric value (integer greater than zero)
 
    Example:
 
-         <C:max-attendees-per-instance
+         25
 
-5.2.10.  Additional Precondition for PROPPATCH
+5.2.10.  Additional Precondition for PROPPATCH
 
-   This specification requires an additional Precondition (see Section
-   16 of [I-D.ietf-webdav-rfc2518bis] for the PROPPATCH method.  The
-   precondition is:
+   This specification requires an additional Precondition for the
+   PROPPATCH method.  The precondition is:
 
       (CALDAV:valid-calendar-data): The time zone specified in CALDAV:
       calendar-timezone property MUST be a valid iCalendar object
       containing a single valid VTIMEZONE component.
 
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 19]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-5.3.  Creating Resources
+5.3.  Creating Resources
 
    The creation of calendar collections and calendar object resources
    may be initiated by either a CalDAV client or by the CalDAV server.
@@ -1124,10 +1109,18 @@ Internet-Draft                   CalDAV                       April 2006
    and MUST understand objects appearing in calendar collections or
    according to the data model defined here.
 
-5.3.1.  MKCALENDAR Method
+5.3.1.  MKCALENDAR Method
 
    An HTTP request using the MKCALENDAR method creates a new calendar
    collection resource.  A server MAY restrict calendar collection
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 20]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    creation to particular collections.
 
    Support for MKCALENDAR on the server is only RECOMMENDED and not
@@ -1159,31 +1152,31 @@ Internet-Draft                   CalDAV                       April 2006
       If a request body is included, it MUST be a CALDAV:mkcalendar XML
       element.  Instruction processing MUST occur in the order
       instructions are received (i.e., from top to bottom).
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 20]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
       Instructions MUST either all be executed or none executed.  Thus
       if any error occurs during processing, all executed instructions
       MUST be undone and a proper error result returned.  Instruction
       processing details can be found in the definition of the DAV:set
-      instruction in Section 14.26 of [I-D.ietf-webdav-rfc2518bis].
+      instruction in Section 12.13.2 of [RFC2518].
 
-         <!ELEMENT mkcalendar (DAV:set)>
+         
 
       If a response body for a successful request is included, it MUST
       be a CALDAV:mkcalendar-response XML element.
 
-         <!ELEMENT mkcalendar-response ANY>
+         
 
       The response MUST include a Cache-Control:no-cache header.
 
    Preconditions:
 
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 21]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
       (DAV:resource-must-be-null): A resource MUST NOT exist at the
       Request-URI;
 
@@ -1204,64 +1197,65 @@ Internet-Draft                   CalDAV                       April 2006
       collection MUST contain both DAV:collection and CALDAV:calendar
       XML elements.
 
-5.3.1.1.  Status Codes
+5.3.1.1.  Status Codes
 
    The following are examples of response codes one would expect to get
    in a response to a MKCALENDAR request.  Note that this list is by no
    means exhaustive.
 
-      201 (Created) - The calendar collection resource was created in
+      201 (Created) - The calendar collection resource was created in
       its entirety;
 
-      207 (Multi-Status) - The calendar collection resource was not
+      207 (Multi-Status) - The calendar collection resource was not
       created since one or more DAV:set instructions specified in the
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 21]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
       request body could not be processed successfully.  The following
       are examples of response codes one would expect to be used in a
       207 (Multi-Status) response in this situation:
 
-         403 (Forbidden) - The client, for reasons the server chooses
+         403 (Forbidden) - The client, for reasons the server chooses
          not to specify, cannot alter one of the properties;
 
-         409 (Conflict) - The client has provided a value whose
+         409 (Conflict) - The client has provided a value whose
          semantics are not appropriate for the property.  This includes
          trying to set read-only properties;
 
-         424 (Failed Dependency) - The DAV:set instruction on the
+         424 (Failed Dependency) - The DAV:set instruction on the
          specified resource would have succeeded if it were not for the
          failure of another DAV:set instruction specified in the request
          body;
 
-         423 (Locked) - The specified resource is locked and the client
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 22]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+         423 (Locked) - The specified resource is locked and the client
          either is not a lock owner or the lock type requires a lock
          token to be submitted and the client did not submit it; and
 
-         507 (Insufficient Storage) - The server did not have sufficient
+         507 (Insufficient Storage) - The server did not have sufficient
          space to record the property;
 
-      403 (Forbidden) - This indicates at least one of two conditions:
+      403 (Forbidden) - This indicates at least one of two conditions:
       1) the server does not allow the creation of calendar collections
       at the given location in its namespace, or 2) the parent
       collection of the Request-URI exists but cannot accept members;
 
-      409 (Conflict) - A collection cannot be made at the Request-URI
+      409 (Conflict) - A collection cannot be made at the Request-URI
       until one or more intermediate collections have been created;
 
-      415 (Unsupported Media Type) - The server does not support the
+      415 (Unsupported Media Type) - The server does not support the
       request type of the body; and
 
-      507 (Insufficient Storage) - The resource does not have sufficient
+      507 (Insufficient Storage) - The resource does not have sufficient
       space to record the state of the resource after the execution of
       this method.
 
-5.3.1.2.  Example: Successful MKCALENDAR request
+5.3.1.2.  Example: Successful MKCALENDAR request
 
    This example creates a calendar collection called /home/lisa/
    calendars/events/ on the server cal.example.com with specific values
@@ -1274,30 +1268,46 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 22]
-
-Internet-Draft                   CalDAV                       April 2006
 
 
-   >> Request <<
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 23]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+   >> Request <<
 
    MKCALENDAR /home/lisa/calendars/events/ HTTP/1.1
    Host: cal.example.com
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:mkcalendar xmlns:D="DAV:"
-                 xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:set>
-       <D:prop>
-         <D:displayname>Lisa's Events</D:displayname>
-         <C:calendar-description xml:lang="en"
-   >Calendar restricted to events.</C:calendar-description>
-         <C:supported-calendar-component-set>
-           <C:comp name="VEVENT"/>
-         </C:supported-calendar-component-set>
-         <C:calendar-timezone><![CDATA[BEGIN:VCALENDAR
+   
+   
+     
+       
+         Lisa's Events
+         Calendar restricted to events.
+         
+           
+         
+         
+       
+     
+   
 
 
 
@@ -1330,19 +1340,19 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 23]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 24]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 201 Created
    Cache-Control: no-cache
    Date: Fri, 11 Nov 2005 09:32:12 GMT
    Content-Length: 0
 
-5.3.2.  Creating Calendar Object Resources
+5.3.2.  Creating Calendar Object Resources
 
    Clients populate calendar collections with calendar object resources.
    The URL for each calendar object resource is entirely arbitrary, and
@@ -1386,12 +1396,12 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 24]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 25]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   >> Request <<
+   >> Request <<
 
    PUT /home/lisa/calendars/events/qwue23489.ics HTTP/1.1
    If-None-Match: *
@@ -1411,7 +1421,7 @@ Internet-Draft                   CalDAV                       April 2006
    END:VEVENT
    END:VCALENDAR
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 201 Created
    Content-Length: 0
@@ -1422,17 +1432,16 @@ Internet-Draft                   CalDAV                       April 2006
    specific ETag in the "If-Match" header, rather than the "If-None-
    Match" header.
 
-   As indicated in Section 3.10 of [RFC2445], the URL of calendar object
+   As indicated in Section 3.10 of [RFC2445], the URL of calendar object
    resources containing (an arbitrary set of) calendaring and scheduling
    information may be suffixed by ".ics", and the URL of calendar object
    resources containing free or busy time information may be suffixed by
    ".ifb".
 
-5.3.2.1.  Additional Preconditions for PUT, COPY and MOVE
+5.3.2.1.  Additional Preconditions for PUT, COPY and MOVE
 
-   This specification creates additional Preconditions (see Section 16
-   of [I-D.ietf-webdav-rfc2518bis] for PUT, COPY and MOVE methods.
-   These preconditions apply:
+   This specification creates additional Preconditions for PUT, COPY and
+   MOVE methods.  These preconditions apply:
 
       When a PUT operation of a calendar object resource into a calendar
       collection occurs.
@@ -1442,9 +1451,10 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 25]
-
-Internet-Draft                   CalDAV                       April 2006
+
+Daboo, et al.            Expires March 17, 2007                [Page 26]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    The new preconditions are:
@@ -1461,7 +1471,7 @@ Internet-Draft                   CalDAV                       April 2006
 
       (CALDAV:valid-calendar-object-resource): The resource submitted in
       the PUT request, or targeted by a COPY or MOVE request MUST obey
-      all restrictions specified in Section 4.1 (e.g., calendar object
+      all restrictions specified in Section 4.1 (e.g., calendar object
       resources MUST NOT contain more than one type of calendar
       component, calendar object resources MUST NOT specify the
       iCalendar METHOD property, etc.);
@@ -1479,7 +1489,7 @@ Internet-Draft                   CalDAV                       April 2006
       Servers SHOULD report the URL of the resource that is already
       making use of the same UID property value in the DAV:href element;
 
-                <!ELEMENT no-uid-conflict (DAV:href)>
+                
 
       (CALDAV:calendar-collection-location-ok): In a COPY or MOVE
       request, when the Request-URI is a calendar collection, the
@@ -1489,7 +1499,7 @@ Internet-Draft                   CalDAV                       April 2006
       (CALDAV:max-resource-size): The resource submitted in the PUT
       request, or targeted by a COPY or MOVE request MUST have an octet
       size less than or equal to the value of the CALDAV:max-resource-
-      size property value (Section 5.2.5) on the calendar collection
+      size property value (Section 5.2.5) on the calendar collection
       where the resource will be stored;
 
       (CALDAV:min-date-time): The resource submitted in the PUT request,
@@ -1498,36 +1508,36 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 26]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 27]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
       instance) greater than or equal to the value of the CALDAV:min-
-      date-time property value (Section 5.2.6) on the calendar
+      date-time property value (Section 5.2.6) on the calendar
       collection where the resource will be stored;
 
       (CALDAV:max-date-time): The resource submitted in the PUT request,
       or targeted by a COPY or MOVE request MUST have all of its
       iCalendar date or time property values (for each recurring
       instance) less than the value of the CALDAV:max-date-time property
-      value (Section 5.2.7) on the calendar collection where the
+      value (Section 5.2.7) on the calendar collection where the
       resource will be stored;
 
       (CALDAV:max-instances): The resource submitted in the PUT request,
       or targeted by a COPY or MOVE request MUST generate a number of
       recurring instances less than or equal to the value of the CALDAV:
-      max-instances property value (Section 5.2.8) on the calendar
+      max-instances property value (Section 5.2.8) on the calendar
       collection where the resource will be stored;
 
       (CALDAV:max-attendees-per-instance): The resource submitted in the
       PUT request, or targeted by a COPY or MOVE request MUST have a
       number of ATTENDEE properties on any one instance less than or
       equal to the value of the CALDAV:max-attendees-per-instance
-      property value (Section 5.2.9) on the calendar collection where
+      property value (Section 5.2.9) on the calendar collection where
       the resource will be stored;
 
-5.3.3.  Non-standard components, properties and parameters
+5.3.3.  Non-standard components, properties and parameters
 
    iCalendar provides a "standard mechanism for doing non-standard
    things".  This extension support allows implementers to make use of
@@ -1544,9 +1554,9 @@ Internet-Draft                   CalDAV                       April 2006
    restrictions the server may have.  Servers SHOULD ensure that any
    "private" components, properties or parameters it uses follow the
    convention of including a vendor id in the "X-" name as described in
-   Section 4.2 of [RFC2445], e.g., "X-ABC-Private".
+   Section 4.2 of [RFC2445], e.g., "X-ABC-Private".
 
-5.3.4.  Calendar Object Resource Entity Tag
+5.3.4.  Calendar Object Resource Entity Tag
 
    The DAV:getetag property MUST be defined and set to a strong entity
    tag on all calendar object resources.
@@ -1554,9 +1564,9 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 27]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 28]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    A response to a GET request targeted at a calendar object resource
@@ -1576,25 +1586,25 @@ Internet-Draft                   CalDAV                       April 2006
 
    In the case where the data stored by a server as a result of a PUT
    request is not equivalent by octet equality to the submitted calendar
-   object resource, the behavior of the ETag response header is
-   undefined, with the exception that a strong entity tag MUST NOT be
-   returned in the response.  As a result, clients may need to retrieve
-   the modified calendar object resource (and ETag) as a basis for
-   further changes, rather than use the calendar object resource it had
-   sent with the PUT request.
+   object resource, the behavior of the ETag response header is not
+   specified here, with the exception that a strong entity tag MUST NOT
+   be returned in the response.  As a result, clients may need to
+   retrieve the modified calendar object resource (and ETag) as a basis
+   for further changes, rather than use the calendar object resource it
+   had sent with the PUT request.
 
 
-6.  Calendaring Access Control
+6.  Calendaring Access Control
 
-6.1.  Calendaring Privilege
+6.1.  Calendaring Privilege
 
    CalDAV servers MUST support and adhere to the requirements of WebDAV
-   ACL [RFC3744].  WebDAV ACL provides a framework for an extensible set
+   ACL [RFC3744].  WebDAV ACL provides a framework for an extensible set
    of privileges that can be applied to WebDAV collections and ordinary
    resources.  CalDAV servers MUST also support the calendaring
    privilege defined in this section.
 
-6.1.1.  CALDAV:read-free-busy Privilege
+6.1.1.  CALDAV:read-free-busy Privilege
 
    Calendar users often wish to allow other users to see their busy time
    information, without viewing the other details of the calendar
@@ -1605,21 +1615,21 @@ Internet-Draft                   CalDAV                       April 2006
    The CALDAV:read-free-busy privilege controls which calendar
    collections, regular collections and calendar object resources are
    examined when a CALDAV:free-busy-query REPORT request is processed
-   (see Section 7.9).  This privilege can be granted on calendar
+   (see Section 7.10).  This privilege can be granted on calendar
    collections, regular collections or calendar object resources.
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 28]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 29]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    Servers MUST support this privilege on all calendar collections,
    regular collections and calendar object resources.
 
 
-           <!ELEMENT read-free-busy EMPTY>
+           
 
    The CALDAV:read-free-busy privilege MUST be aggregated in the DAV:
    read privilege.  Servers MUST allow the CALDAV:read-free-busy to be
@@ -1630,12 +1640,12 @@ Internet-Draft                   CalDAV                       April 2006
    to GET, HEAD, OPTIONS and PROPFIND on the resource -- those
    operations are governed by the DAV:read privilege.
 
-6.2.  Additional Principal Property
+6.2.  Additional Principal Property
 
    This section defines an additional property for WebDAV principal
-   resources as defined in [RFC3744].
+   resources as defined in [RFC3744].
 
-6.2.1.  CALDAV:calendar-home-set Property
+6.2.1.  CALDAV:calendar-home-set Property
 
    Name: calendar-home-set
 
@@ -1644,11 +1654,10 @@ Internet-Draft                   CalDAV                       April 2006
    Purpose: Identifies the URL of any WebDAV collections that contain
       calendar collections owned by the associated principal resource.
 
-   Conformance: This property MAY be defined in a principal resource.
+   Conformance: This property SHOULD be defined on a principal resource.
       If defined, it MAY be protected and SHOULD NOT be returned by a
-      PROPFIND DAV:allprop request (as defined in Section 14.2 of
-      [I-D.ietf-webdav-rfc2518bis]).  Support for this property is
-      RECOMMENDED.
+      PROPFIND DAV:allprop request (as defined in Section 12.14.1 of
+      [RFC2518]).
 
    Description: The CALDAV:calendar-home-set property is meant to allow
       users to easily find the calendar collections owned by the
@@ -1660,42 +1669,43 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT calendar-home-set (DAV:href*)>
+         
 
 
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 29]
-
-Internet-Draft                   CalDAV                       April 2006
+
+Daboo, et al.            Expires March 17, 2007                [Page 30]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    Example:
 
-       <C:calendar-home-set xmlns:D="DAV:"
-                            xmlns:C="urn:ietf:params:xml:ns:caldav">
-         <D:href>http://cal.example.com/home/bernard/calendars/</D:href>
-       </C:calendar-home-set>
+       
+         http://cal.example.com/home/bernard/calendars/
+       
 
 
-7.  Calendaring Reports
+7.  Calendaring Reports
 
    This section defines the REPORTs that CalDAV servers MUST support on
    calendar collections and calendar object resources.
 
    CalDAV servers MUST advertise support for these REPORTs on all
    calendar collections and calendar object resources with the DAV:
-   supported-report-set property defined in Section 3.1.5 of [RFC3253].
+   supported-report-set property defined in Section 3.1.5 of [RFC3253].
    CalDAV servers MAY also advertise support for these REPORTs on
    ordinary collections.
 
    Some of these REPORTs allow calendar data (from possibly multiple
    resources) to be returned.
 
-7.1.  REPORT Method
+7.1.  REPORT Method
 
-   The REPORT method (defined in Section 3.6 of [RFC3253]) provides an
+   The REPORT method (defined in Section 3.6 of [RFC3253]) provides an
    extensible mechanism for obtaining information about one or more
    resources.  Unlike the PROPFIND method, which returns the value of
    one or more named properties, the REPORT method can involve more
@@ -1706,9 +1716,9 @@ Internet-Draft                   CalDAV                       April 2006
    the same request.
 
    CalDAV servers MUST support the DAV:expand-property REPORT defined in
-   Section 3.8 of [RFC3253].
+   Section 3.8 of [RFC3253].
 
-7.2.  Ordinary collections
+7.2.  Ordinary collections
 
    Servers MAY support the REPORTs defined in this document on ordinary
    collections (collections that are not calendar collections) in
@@ -1722,12 +1732,12 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 30]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 31]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-7.3.  Date and floating time
+7.3.  Date and floating time
 
    iCalendar provides a way to specify DATE and DATE-TIME values that
    are not bound to any time zone in particular, hereafter called
@@ -1758,7 +1768,7 @@ Internet-Draft                   CalDAV                       April 2006
    time".  If the CALDAV:calendar-timezone property is not defined,
    CalDAV servers MAY rely on the time zone of their choice.
 
-7.4.  Time range filtering
+7.4.  Time range filtering
 
    Some of the reports defined in this section can include a time range
    filter that is used to restrict the set of calendar object resources
@@ -1772,15 +1782,15 @@ Internet-Draft                   CalDAV                       April 2006
    component or property are determined and then compared to the
    requested time range.  If there is an overlap with the requested time
    range, then the calendar object resource matches the filter element.
-   The rules defined in [RFC2445] for determining the actual start and
+   The rules defined in [RFC2445] for determining the actual start and
    end times of calendar components MUST be used, and these are fully
-   enumerated in Section 9.8 of this document.
+   enumerated in Section 9.9 of this document.
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 31]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 32]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    When such time range filtering is used, special consideration must be
@@ -1790,30 +1800,118 @@ Internet-Draft                   CalDAV                       April 2006
    If one or more recurrence instances overlap the time range, then the
    calendar object resource matches the filter element.
 
-7.5.  Partial Retrieval
+7.5.  Searching Text: Collations
+
+   Some of the reports defined in this section do text matches of
+   character strings provided by the client and compared to stored
+   calendar data.  Since iCalendar data is by default encoded in the
+   UTF-8 charset and may include characters outside of the US-ASCII
+   charset range in some property and parameter values, there is a need
+   to ensure that text matching follows well-defined rules.
+
+   To deal with this, this specification makes use of the IANA Collation
+   Registry defined in [I-D.newman-i18n-comparator] to specify
+   collations that may be used to carry out the text comparison
+   operations with a well-defined rule.
+
+   The comparisons used in CalDAV are all "substring" matches as per
+   [I-D.newman-i18n-comparator] Section 4.2.  Collations supported by
+   the server MUST support "substring" match operations.
+
+   CalDAV servers are REQUIRED to support the "i;ascii-casemap" and
+   "i;octet" collations as described in [I-D.newman-i18n-comparator],
+   and MAY support other collations.
+
+   Servers MUST advertise the set of collations that they support via
+   the CALDAV:supported-collation-set property defined on any resource
+   that supports reports that use collations.
+
+   Clients MUST only use collations from the list advertised by the
+   server.
+
+   In the absence of a collation explicitly specified by the client, or
+   if the client specifies the "default" collation identifier (as
+   defined in [I-D.newman-i18n-comparator] Section 3.1), the server MUST
+   default to using "i;ascii-casemap" as the collation.
+
+   Wildcards (as defined in [I-D.newman-i18n-comparator] Section 3.2)
+   MUST NOT be used in the collation identifier.
+
+   If the client chooses a collation not supported by the server, the
+   server MUST respond with a CALDAV:supported-collation precondition
+   error response.
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 33]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+7.5.1.  CALDAV:supported-collation-set Property
+
+   Name: supported-collation-set
+
+   Namespace: urn:ietf:params:xml:ns:caldav
+
+   Purpose: Identifies the set of collations supported by the server for
+      text matching operations.
+
+   Conformance: This property MUST be defined on any resource that
+      supports a REPORT that does text matching.  If defined, it MUST be
+      protected and SHOULD NOT be returned by a PROPFIND DAV:allprop
+      request (as defined in Section 12.14.1 of [RFC2518]).
+
+   Description: The CALDAV:supported-collation-set property contains
+      zero or more CALDAV:supported-collation elements which specify the
+      collection identifiers of the collations supported by the server.
+
+   Definition:
+
+         
+           
+
+   Example:
+
+       
+         i;ascii-casemap
+         i;octet
+       
+
+7.6.  Partial Retrieval
 
    Some calendaring REPORTs defined in this document allow partial
-   retrieval of calendar object resources.  A CalDAV client MAY specify
+   retrieval of calendar object resources.  A CalDAV client can specify
    what information to return in the body of a calendaring REPORT
    request.
 
-   A CalDAV client MAY request particular WebDAV property values, all
+   A CalDAV client can request particular WebDAV property values, all
    WebDAV property values, or a list of the names of the resource's
-   WebDAV properties.  A CalDAV client MAY also request calendar data to
+   WebDAV properties.  A CalDAV client can also request calendar data to
    be returned and whether all calendar components and properties should
    be returned or only particular ones.  See CALDAV:calendar-data in
-   Section 9.5.
+   Section 9.6.
 
    By default, the returned calendar data will include the component
    that defines the recurrence set, referred to as the "master
    component", as well as the components that define exceptions to the
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 34]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    recurrence set, referred to as the "overridden components".
 
    A CalDAV client only interested in the recurrence instances that
-   overlap a specified time range MAY request to receive only the
+   overlap a specified time range can request to receive only the
    "master component" along with the "overridden components" that impact
    the specified time range and thus limit the data returned by the
-   server.  See CALDAV:limit-recurrence-set in Section 9.5.6.  An
+   server.  See CALDAV:limit-recurrence-set in Section 9.6.6.  An
    overridden component impacts a time range if its current start and
    end times overlap the time range, or if the original start and end
    times - the ones that would have been used if the instance were not
@@ -1822,24 +1920,17 @@ Internet-Draft                   CalDAV                       April 2006
    A CalDAV client with no support for recurrence properties (i.e.,
    EXDATE, EXRULE, RDATE and RRULE) and possibly VTIMEZONE components,
    or a client not willing to perform recurrence expansion because of
-   limited processing capability MAY request to receive only the
+   limited processing capability can request to receive only the
    recurrence instances that overlap a specified time range as separate
    calendar components that each define exactly one recurrence instance.
-   See CALDAV:expand in Section 9.5.5.
+   See CALDAV:expand in Section 9.6.5.
 
-   Finally, in the case of VFREEBUSY components, a CalDAV client MAY
+   Finally, in the case of VFREEBUSY components, a CalDAV client can
    request to receive only the FREEBUSY property values that overlap a
    specified time range.  See CALDAV:limit-freebusy-set in
-   Section 9.5.7.
+   Section 9.6.7.
 
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 32]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-7.6.  Non-standard components, properties and parameters
+7.7.  Non-standard components, properties and parameters
 
    Servers MUST support the use of non-standard component, property or
    parameter names in the CALDAV:calendar-data XML element in
@@ -1858,10 +1949,18 @@ Internet-Draft                   CalDAV                       April 2006
    non-standard component, property or parameter name which the server
    does not support queries on.
 
-7.7.  CALDAV:calendar-query Report
+7.8.  CALDAV:calendar-query Report
 
    The CALDAV:calendar-query REPORT performs a search for all calendar
    object resources that match a specified filter.  The response of this
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 35]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    REPORT will contain all the WebDAV properties and calendar object
    resource data specified in the request.  In the case of the CALDAV:
    calendar-data XML element, one can explicitly specify the calendar
@@ -1884,16 +1983,7 @@ Internet-Draft                   CalDAV                       April 2006
    Marshalling:
 
       The request body MUST be a CALDAV:calendar-query XML element as
-      defined in Section 9.4.
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 33]
-
-Internet-Draft                   CalDAV                       April 2006
-
+      defined in Section 9.5.
 
       The request MAY include a Depth header.  If no Depth header is
       included, Depth:0 is assumed.
@@ -1914,20 +2004,28 @@ Internet-Draft                   CalDAV                       April 2006
 
       (CALDAV:supported-calendar-data): The attributes "content-type"
       and "version" of the CALDAV:calendar-data XML element (see
-      Section 9.5) specify a media type supported by the server for
+      Section 9.6) specify a media type supported by the server for
       calendar object resources.
 
       (CALDAV:valid-filter): The CALDAV:filter XML element (see
-      Section 9.6) specified in the REPORT request MUST be valid.  For
-      instance, a CALDAV:filter cannot nest a <C:comp name="VEVENT">
-      element in a <C:comp name="VTODO"> element, or a CALDAV:filter
-      cannot nest a <C:time-range start="..." end="..."> element in a
-      <C:prop name="SUMMARY"> element.
+      Section 9.7) specified in the REPORT request MUST be valid.  For
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 36]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+      instance, a CALDAV:filter cannot nest a 
+      element in a  element, or a CALDAV:filter
+      cannot nest a  element in a
+       element.
 
       (CALDAV:supported-filter): The CALDAV:comp-filter (see
-      Section 9.6.1), CALDAV:prop-filter (see Section 9.6.2) and CALDAV:
-      param-filter (see Section 9.6.3) XML elements used in the CALDAV:
-      filter XML element (see Section 9.6) in the REPORT request only
+      Section 9.7.1), CALDAV:prop-filter (see Section 9.7.2) and CALDAV:
+      param-filter (see Section 9.7.3) XML elements used in the CALDAV:
+      filter XML element (see Section 9.7) in the REPORT request only
       make reference to components, properties and parameters for which
       queries are supported by the server. i.e., if the CALDAV:filter
       element attempts to reference an unsupported component, property
@@ -1935,34 +2033,30 @@ Internet-Draft                   CalDAV                       April 2006
       report the CALDAV:comp-filter, CALDAV:prop-filter or CALDAV:param-
       filter for which it does not provide support.
 
-            <!ELEMENT supported-filter (comp-filter*,
+            
 
       (CALDAV:valid-calendar-data): The time zone specified in the
       REPORT request MUST be a valid iCalendar object containing a
       single valid VTIMEZONE component.
 
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 34]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
       (CALDAV:min-date-time): Any XML element specifying a range of time
       MUST have its start or end date or time values greater than or
       equal to the value of the CALDAV:min-date-time property value
-      (Section 5.2.6) on the calendar collections being targeted by the
+      (Section 5.2.6) on the calendar collections being targeted by the
       REPORT;
 
       (CALDAV:max-date-time): Any XML element specifying a range of time
       MUST have its start or end date or time values less than or equal
       to the value of the CALDAV:max-date-time property value
-      (Section 5.2.7) on the calendar collections being targeted by the
+      (Section 5.2.7) on the calendar collections being targeted by the
       REPORT;
 
+      (CALDAV:supported-collation): Any XML attribute specifying a
+      collation MUST specify a collation supported by the server as
+      described in Section 7.5.
+
    Postconditions:
 
       (DAV:number-of-matches-within-limits): The number of matching
@@ -1971,7 +2065,15 @@ Internet-Draft                   CalDAV                       April 2006
       if a search specification would cause the return of an extremely
       large number of responses.
 
-7.7.1.  Example: Partial retrieval of events by time range
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 37]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+7.8.1.  Example: Partial retrieval of events by time range
 
    In this example, the client requests the server to return specific
    components and properties of the VEVENT components that overlap the
@@ -2002,12 +2104,32 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 35]
-
-Internet-Draft                   CalDAV                       April 2006
 
 
-   >> Request <<
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 38]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -2015,41 +2137,41 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:D="DAV:"
-                 xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop>
-       <D:getetag/>
-       <C:calendar-data>
-         <C:comp name="VCALENDAR">
-           <C:prop name="VERSION"/>
-           <C:comp name="VEVENT">
-             <C:prop name="SUMMARY"/>
-             <C:prop name="UID"/>
-             <C:prop name="DTSTART"/>
-             <C:prop name="DTEND"/>
-             <C:prop name="DURATION"/>
-             <C:prop name="RRULE"/>
-             <C:prop name="RDATE"/>
-             <C:prop name="EXRULE"/>
-             <C:prop name="EXDATE"/>
-             <C:prop name="RECURRENCE-ID"/>
-           </C:comp>
-           <C:comp name="VTIMEZONE"/>
-         </C:comp>
-       </C:calendar-data>
-     </D:prop>
-     <C:filter>
-       <C:comp-filter name="VCALENDAR">
-         <C:comp-filter name="VEVENT">
-           <C:time-range start="20060104T000000Z"
-                         end="20060105T000000Z"/>
-         </C:comp-filter>
-       </C:comp-filter>
-     </C:filter>
-   </C:calendar-query>
+   
+   
+     
+       
+       
+         
+           
+           
+             
+             
+             
+             
+             
+             
+             
+             
+             
+             
+           
+           
+         
+       
+     
+     
+       
+         
+           
+         
+       
+     
+   
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 207 Multi-Status
    Date: Fri, 11 Nov 2005 09:32:12 GMT
@@ -2058,20 +2180,20 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 36]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 39]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:multistatus xmlns:D="DAV:"
-              xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd2.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd2"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+   
+     
+       http://cal.example.com/bernard/work/abcd2.ics
+       
+         
+           "fffff-abcd2"
+           BEGIN:VCALENDAR
    VERSION:2.0
    BEGIN:VTIMEZONE
    LAST-MODIFIED:20040110T032845Z
@@ -2114,24 +2236,24 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 37]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 40]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd3.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd3"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+     
+       http://cal.example.com/bernard/work/abcd3.ics
+       
+         
+           "fffff-abcd3"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTIMEZONE
@@ -2159,23 +2281,23 @@ Internet-Draft                   CalDAV                       April 2006
    UID:DC6C50A017428C5216A2F1CD@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-   </D:multistatus>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+   
 
 
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 38]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 41]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-7.7.2.  Example: Partial retrieval of recurring events
+7.8.2.  Example: Partial retrieval of recurring events
 
    In this example, the client requests the server to return VEVENT
    components that overlap the time range from January 3rd, 2006 at 00:
@@ -2189,7 +2311,7 @@ Internet-Draft                   CalDAV                       April 2006
 
    See Appendix B for the calendar data being targeted by this example.
 
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -2197,26 +2319,26 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:D="DAV:"
-                     xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop>
-       <C:calendar-data>
-         <C:limit-recurrence-set start="20060103T000000Z"
-                                 end="20060105T000000Z"/>
-       </C:calendar-data>
-     </D:prop>
-     <C:filter>
-       <C:comp-filter name="VCALENDAR">
-         <C:comp-filter name="VEVENT">
-           <C:time-range start="20060103T000000Z"
-                         end="20060105T000000Z"/>
-         </C:comp-filter>
-       </C:comp-filter>
-     </C:filter>
-   </C:calendar-query>
+   
+   
+     
+       
+         
+       
+     
+     
+       
+         
+           
+         
+       
+     
+   
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 207 Multi-Status
    Date: Fri, 11 Nov 2006 09:32:12 GMT
@@ -2226,20 +2348,20 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 39]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 42]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:multistatus xmlns:D="DAV:"
-              xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd2.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd2"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+   
+     
+       http://cal.example.com/bernard/work/abcd2.ics
+       
+         
+           "fffff-abcd2"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTIMEZONE
@@ -2277,25 +2399,25 @@ Internet-Draft                   CalDAV                       April 2006
    UID:00959BC664CA650E933C892C@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
+   
+         
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 40]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 43]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd3.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd3"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+         HTTP/1.1 200 OK
+       
+     
+     
+       http://cal.example.com/bernard/work/abcd3.ics
+       
+         
+           "fffff-abcd3"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTIMEZONE
@@ -2331,22 +2453,22 @@ Internet-Draft                   CalDAV                       April 2006
    X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
+   
+         
+         HTTP/1.1 200 OK
+       
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 41]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 44]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-     </D:response>
-   </D:multistatus>
+     
+   
 
-7.7.3.  Example: Expanded retrieval of recurring events
+7.8.3.  Example: Expanded retrieval of recurring events
 
    In this example, the client requests the server to return VEVENT
    components that overlap the time range from January 2nd, 2006 at 00:
@@ -2358,7 +2480,7 @@ Internet-Draft                   CalDAV                       April 2006
 
    See Appendix B for the calendar data being targeted by this example.
 
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -2366,26 +2488,26 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:D="DAV:"
-                     xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop>
-       <C:calendar-data>
-         <C:expand start="20060103T000000Z"
-                   end="20060105T000000Z"/>
-       </C:calendar-data>
-     </D:prop>
-     <C:filter>
-       <C:comp-filter name="VCALENDAR">
-         <C:comp-filter name="VEVENT">
-           <C:time-range start="20060103T000000Z"
-                         end="20060105T000000Z"/>
-         </C:comp-filter>
-       </C:comp-filter>
-     </C:filter>
-   </C:calendar-query>
+   
+   
+     
+       
+         
+       
+     
+     
+       
+         
+           
+         
+       
+     
+   
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 207 Multi-Status
    Date: Fri, 11 Nov 2006 09:32:12 GMT
@@ -2394,20 +2516,20 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 42]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 45]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:multistatus xmlns:D="DAV:"
-              xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd2.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd2"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+   
+     
+       http://cal.example.com/bernard/work/abcd2.ics
+       
+         
+           "fffff-abcd2"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VEVENT
@@ -2427,17 +2549,17 @@ Internet-Draft                   CalDAV                       April 2006
    UID:00959BC664CA650E933C892C@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd3.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd3"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+     
+       http://cal.example.com/bernard/work/abcd3.ics
+       
+         
+           "fffff-abcd3"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VEVENT
@@ -2450,9 +2572,9 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 43]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 46]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    ORGANIZER:mailto:cyrus@example.com
@@ -2463,14 +2585,14 @@ Internet-Draft                   CalDAV                       April 2006
    X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-   </D:multistatus>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+   
 
-7.7.4.  Example: Partial retrieval of stored free busy components
+7.8.4.  Example: Partial retrieval of stored free busy components
 
    In this example, the client requests the server to return the
    VFREEBUSY components that have free busy information that overlap the
@@ -2506,12 +2628,12 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 44]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 47]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -2519,24 +2641,24 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:D="DAV:"
-                 xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop>
-       <C:calendar-data>
-         <C:limit-freebusy-set start="20060102T000000Z"
-                                 end="20060103T000000Z"/>
-       </C:calendar-data>
-     </D:prop>
-     <C:filter>
-       <C:comp-filter name="VCALENDAR">
-         <C:comp-filter name="VFREEBUSY">
-           <C:time-range start="20060102T000000Z"
-                           end="20060103T000000Z"/>
-         </C:comp-filter>
-       </C:comp-filter>
-     </C:filter>
-   </C:calendar-query>
+   
+   
+     
+       
+         
+       
+     
+     
+       
+         
+           
+         
+       
+     
+   
 
 
 
@@ -2562,27 +2684,27 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 45]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 48]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 207 Multi-Status
    Date: Fri, 11 Nov 2006 09:32:12 GMT
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:multistatus xmlns:D="DAV:"
-                  xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd8.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd8"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+   
+     
+       http://cal.example.com/bernard/work/abcd8.ics
+       
+         
+           "fffff-abcd8"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VFREEBUSY
@@ -2594,14 +2716,14 @@ Internet-Draft                   CalDAV                       April 2006
    FREEBUSY;FBTYPE=BUSY-TENTATIVE:20060102T100000Z/20060102T120000Z
    END:VFREEBUSY
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-   </D:multistatus>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+   
 
-7.7.5.  Example: Retrieval of to-dos by alarm time range
+7.8.5.  Example: Retrieval of to-dos by alarm time range
 
    In this example, the client requests the server to return the VTODO
    components that have an alarm trigger scheduled in the specified time
@@ -2618,12 +2740,12 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 46]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 49]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -2631,23 +2753,23 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop xmlns:D="DAV:">
-       <D:getetag/>
-       <C:calendar-data/>
-     </D:prop>
-     <C:filter>
-       <C:comp-filter name="VCALENDAR">
-         <C:comp-filter name="VTODO">
-           <C:comp-filter name="VALARM">
-             <C:time-range start="20060106T100000Z"
-                             end="20060107T100000Z"/>
-           </C:comp-filter>
-         </C:comp-filter>
-       </C:comp-filter>
-     </C:filter>
-   </C:calendar-query>
+   
+   
+     
+       
+       
+     
+     
+       
+         
+           
+             
+           
+         
+       
+     
+   
 
 
 
@@ -2674,27 +2796,27 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 47]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 50]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 207 Multi-Status
    Date: Fri, 11 Nov 2006 09:32:12 GMT
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:multistatus xmlns:D="DAV:"
-                  xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd4.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd4"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+   
+     
+       http://cal.example.com/bernard/work/abcd4.ics
+       
+         
+           "fffff-abcd4"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTODO
@@ -2711,14 +2833,14 @@ Internet-Draft                   CalDAV                       April 2006
    END:VALARM
    END:VTODO
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-   </D:multistatus>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+   
 
-7.7.6.  Example: Retrieval of event by UID
+7.8.6.  Example: Retrieval of event by UID
 
    In this example, the client requests the server to return the VEVENT
    component that has the UID property set to
@@ -2730,12 +2852,12 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 48]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 51]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -2743,40 +2865,40 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop xmlns:D="DAV:">
-       <D:getetag/>
-       <C:calendar-data/>
-     </D:prop>
-     <C:filter>
-       <C:comp-filter name="VCALENDAR">
-         <C:comp-filter name="VEVENT">
-           <C:prop-filter name="UID">
-             <C:text-match caseless="no">
-              DC6C50A017428C5216A2F1CD@example.com</C:text-match>
-           </C:prop-filter>
-         </C:comp-filter>
-       </C:comp-filter>
-     </C:filter>
-   </C:calendar-query>
+   
+   
+     
+       
+       
+     
+     
+       
+         
+           
+             DC6C50A017428C5216A2F1CD@example.com
+           
+         
+       
+     
+   
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 207 Multi-Status
    Date: Fri, 11 Nov 2006 09:32:12 GMT
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:multistatus xmlns:D="DAV:"
-                  xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd3.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd3"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+   
+     
+       http://cal.example.com/bernard/work/abcd3.ics
+       
+         
+           "fffff-abcd3"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTIMEZONE
@@ -2786,9 +2908,9 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 49]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 52]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    DTSTART:20000404T020000
@@ -2820,14 +2942,14 @@ Internet-Draft                   CalDAV                       April 2006
    X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-   </D:multistatus>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+   
 
-7.7.7.  Example: Retrieval of events by PARTSTAT
+7.8.7.  Example: Retrieval of events by PARTSTAT
 
    In this example, the client requests the server to return the VEVENT
    components that have the ATTENDEE property with the value
@@ -2842,12 +2964,12 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 50]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 53]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -2855,54 +2977,55 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop xmlns:D="DAV:">
-       <D:getetag/>
-       <C:calendar-data/>
-     </D:prop>
-     <C:filter>
-       <C:comp-filter name="VCALENDAR">
-         <C:comp-filter name="VEVENT">
-           <C:prop-filter name="ATTENDEE">
-             <C:text-match
-               caseless="yes">mailto:lisa@example.com</C:text-match>
-             <C:param-filter name="PARTSTAT">
-               <C:text-match caseless="yes">NEEDS-ACTION</C:text-match>
-             </C:param-filter>
-           </C:prop-filter>
-         </C:comp-filter>
-       </C:comp-filter>
-     </C:filter>
-   </C:calendar-query>
+   
+   
+     
+       
+       
+     
+     
+       
+         
+           
+             mailto:lisa@example.com
+             
+               NEEDS-ACTION
+             
+           
+         
+       
+     
+   
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 207 Multi-Status
    Date: Fri, 11 Nov 2006 09:32:12 GMT
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:multistatus xmlns:D="DAV:"
-                  xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd3.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd3"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+   
+     
+       http://cal.example.com/bernard/work/abcd3.ics
+       
+         
+           "fffff-abcd3"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 54]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    BEGIN:VTIMEZONE
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 51]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    LAST-MODIFIED:20040110T032845Z
    TZID:US/Eastern
    BEGIN:DAYLIGHT
@@ -2935,14 +3058,14 @@ Internet-Draft                   CalDAV                       April 2006
    X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-   </D:multistatus>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+   
 
-7.7.8.  Example: Retrieval of events only
+7.8.8.  Example: Retrieval of events only
 
    In this example, the client requests the server to return all VEVENT
    components.
@@ -2953,13 +3076,12 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-
-Daboo, et al.           Expires October 28, 2006               [Page 52]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 55]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -2967,35 +3089,35 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop xmlns:D="DAV:">
-       <D:getetag/>
-       <C:calendar-data/>
-     </D:prop>
-     <C:filter>
-       <C:comp-filter name="VCALENDAR">
-         <C:comp-filter name="VEVENT"/>
-       </C:comp-filter>
-     </C:filter>
-   </C:calendar-query>
+   
+   
+     
+       
+       
+     
+     
+       
+         
+       
+     
+   
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 207 Multi-Status
    Date: Fri, 11 Nov 2006 09:32:12 GMT
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:multistatus xmlns:D="DAV:"
-                  xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd1.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd1"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+   
+     
+       http://cal.example.com/bernard/work/abcd1.ics
+       
+         
+           "fffff-abcd1"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTIMEZONE
@@ -3010,9 +3132,9 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 53]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 56]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    END:DAYLIGHT
@@ -3033,17 +3155,17 @@ Internet-Draft                   CalDAV                       April 2006
    UID:74855313FA803DA593CD579A@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd2.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd2"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+     
+       http://cal.example.com/bernard/work/abcd2.ics
+       
+         
+           "fffff-abcd2"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTIMEZONE
@@ -3066,9 +3188,9 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 54]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 57]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    END:VTIMEZONE
@@ -3097,17 +3219,17 @@ Internet-Draft                   CalDAV                       April 2006
    UID:00959BC664CA650E933C892C@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd3.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd3"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+     
+       http://cal.example.com/bernard/work/abcd3.ics
+       
+         
+           "fffff-abcd3"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTIMEZONE
@@ -3122,9 +3244,9 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 55]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 58]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    END:DAYLIGHT
@@ -3151,14 +3273,14 @@ Internet-Draft                   CalDAV                       April 2006
    X-ABC-GUID:E1CX5Dr-0007ym-Hz@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-   </D:multistatus>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+   
 
-7.7.9.  Example: Retrieval of all pending to-dos
+7.8.9.  Example: Retrieval of all pending to-dos
 
    In this example, the client requests the server to return all VTODO
    components that do not include a "COMPLETED" property and do not have
@@ -3178,12 +3300,12 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 56]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 59]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -3191,52 +3313,52 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop xmlns:D="DAV:">
-       <D:getetag/>
-       <C:calendar-data/>
-     </D:prop>
-     <C:filter>
-       <C:comp-filter name="VCALENDAR">
-         <C:comp-filter name="VTODO">
-           <C:prop-filter name="COMPLETED">
-             <C:is-not-defined/>
-           </C:prop-filter>
-           <C:prop-filter name="STATUS">
-             <C:text-match
-                negate-condition="yes">CANCELLED</c:text-match>
-           </C:prop-filter>
-         </C:comp-filter>
-       </C:comp-filter>
-     </C:filter>
-   </C:calendar-query>
+   
+   
+     
+       
+       
+     
+     
+       
+         
+           
+             
+           
+           
+             CANCELLED
+           
+         
+       
+     
+   
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 207 Multi-Status
    Date: Fri, 11 Nov 2006 09:32:12 GMT
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:multistatus xmlns:D="DAV:"
-                  xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd4.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd4"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+   
+     
+       http://cal.example.com/bernard/work/abcd4.ics
+       
+         
+           "fffff-abcd4"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTODO
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 57]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 60]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    DTSTAMP:20060205T235335Z
@@ -3250,18 +3372,18 @@ Internet-Draft                   CalDAV                       April 2006
    END:VALARM
    END:VTODO
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
 
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd5.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd5"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+     
+       http://cal.example.com/bernard/work/abcd5.ics
+       
+         
+           "fffff-abcd5"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTODO
@@ -3278,24 +3400,24 @@ Internet-Draft                   CalDAV                       April 2006
    END:VALARM
    END:VTODO
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-   </D:multistatus>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+   
 
 
 
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 58]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 61]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-7.7.10.  Example: Attempt to query unsupported property
+7.8.10.  Example: Attempt to query unsupported property
 
    In this example, the client requests the server to return all VEVENT
    components that include an "X-ABC-GUID" property with a value
@@ -3304,7 +3426,7 @@ Internet-Draft                   CalDAV                       April 2006
 
    See Appendix B for the calendar data being targeted by this example.
 
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -3312,53 +3434,53 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop xmlns:D="DAV:">
-       <D:getetag/>
-       <C:calendar-data/>
-     </D:prop>
-     <C:filter>
-       <C:comp-filter name="VCALENDAR">
-         <C:comp-filter name="VEVENT">
-           <C:prop-filter name="X-ABC-GUID">
-             <C:text-match>ABC</C:text-match>
-           </C:prop-filter>
-         </C:comp-filter>
-       </C:comp-filter>
-     </C:filter>
-   </C:calendar-query>
+   
+   
+     
+       
+       
+     
+     
+       
+         
+           
+             ABC
+           
+         
+       
+     
+   
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 403 Forbidden
    Date: Fri, 11 Nov 2005 09:32:12 GMT
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:error>
-     <C:supported-filter>
-       <C:prop-filter name="X-ABC-GUID"/>
-     </C:supported-filter>
-   </D:error>
+   
+   
+     
+       
+     
+   
 
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 59]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 62]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-7.8.  CALDAV:calendar-multiget Report
+7.9.  CALDAV:calendar-multiget Report
 
    The CALDAV:calendar-multiget REPORT is used to retrieve specific
    calendar object resources from within a collection, if the Request-
    URI is a collection, or to retrieve a specific calendar object
    resource, if the Request-URI is a calendar object resource.  This
    REPORT is similar to the CALDAV:calendar-query REPORT (see
-   Section 7.7), except that it takes a list of DAV:href elements
+   Section 7.8), except that it takes a list of DAV:href elements
    instead of a CALDAV:filter element to determine which calendar object
    resources to return.
 
@@ -3367,7 +3489,7 @@ Internet-Draft                   CalDAV                       April 2006
    Marshalling:
 
       The request body MUST be a CALDAV:calendar-multiget XML element
-      (see Section 9.9).  If the Request-URI is a collection resource,
+      (see Section 9.10).  If the Request-URI is a collection resource,
       then the DAV:href elements MUST refer to calendar object resources
       within that collection, and they MAY refer to calendar object
       resources at any depth within the collection.  As a result the
@@ -3394,7 +3516,7 @@ Internet-Draft                   CalDAV                       April 2006
 
       (CALDAV:supported-calendar-data): The attributes "content-type"
       and "version" of the CALDAV:calendar-data XML elements (see
-      Section 9.5) specify a media type supported by the server for
+      Section 9.6) specify a media type supported by the server for
       calendar object resources.
 
       (CALDAV:min-date-time): Any XML element specifying a range of time
@@ -3402,55 +3524,55 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 60]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 63]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
       equal to the value of the CALDAV:min-date-time property value
-      (Section 5.2.6) on the calendar collections being targeted by the
+      (Section 5.2.6) on the calendar collections being targeted by the
       REPORT;
 
       (CALDAV:max-date-time): Any XML element specifying a range of time
       MUST have its start or end date or time values less than or equal
       to the value of the CALDAV:max-date-time property value
-      (Section 5.2.7) on the calendar collections being targeted by the
+      (Section 5.2.7) on the calendar collections being targeted by the
       REPORT;
 
    Postconditions:
 
       None.
 
-7.8.1.  Example: Successful CALDAV:calendar-multiget Report
+7.9.1.  Example: Successful CALDAV:calendar-multiget Report
 
    In this example, the client requests the server to return specific
    properties of the VEVENT components referenced by specific URIs.  In
    addition the DAV:getetag property is also requested and returned as
    part of the response.  Note that in this example, the resource at
-   http://cal.example.com/bernard/work/mtg1.ics does not exist,
+   http://cal.example.com/bernard/work/mtg1.ics does not exist,
    resulting in an error status response.
 
    See Appendix B for the calendar data being targeted by this example.
 
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-multiget xmlns:D="DAV:"
-                    xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop>
-       <D:getetag/>
-       <C:calendar-data/>
-     </D:prop>
-     <D:href>/bernard/work/abcd1.ics</D:href>
-     <D:href>/bernard/work/mtg1.ics</D:href>
-   </C:calendar-multiget>
+   
+   
+     
+       
+       
+     
+     /bernard/work/abcd1.ics
+     /bernard/work/mtg1.ics
+   
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 207 Multi-Status
    Date: Fri, 11 Nov 2006 09:32:12 GMT
@@ -3458,22 +3580,22 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 61]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 64]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:multistatus xmlns:D="DAV:"
-                  xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd1.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd1"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+   
+   
+     
+       http://cal.example.com/bernard/work/abcd1.ics
+       
+         
+           "fffff-abcd1"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTIMEZONE
@@ -3503,26 +3625,26 @@ Internet-Draft                   CalDAV                       April 2006
    UID:74855313FA803DA593CD579A@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/mtg1.ics</D:href>
-       <D:status>HTTP/1.1 404 Not Found</D:status>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
+     
+       http://cal.example.com/bernard/work/mtg1.ics
+       HTTP/1.1 404 Not Found
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 62]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 65]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-     </D:response>
-   </D:multistatus>
+     
+   
 
-7.9.  CALDAV:free-busy-query Report
+7.10.  CALDAV:free-busy-query Report
 
    The CALDAV:free-busy-query REPORT generates a VFREEBUSY component
    containing free busy information for all the calendar object
@@ -3570,16 +3692,16 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 63]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 66]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    Marshalling:
 
       The request body MUST be a CALDAV:free-busy-query XML element (see
-      Section 9.10, which MUST contain exactly one CALDAV:time-range XML
-      element, as defined in Section 9.8.
+      Section 9.11, which MUST contain exactly one CALDAV:time-range XML
+      element, as defined in Section 9.9.
 
       The request MAY include a Depth header.  If no Depth header is
       included, Depth:0 is assumed.
@@ -3626,12 +3748,12 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 64]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 67]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-7.9.1.  Example: Successful CALDAV:free-busy-query Report
+7.10.1.  Example: Successful CALDAV:free-busy-query Report
 
    In this example, the client requests the server to return free busy
    information on the calendar collection /bernard/work/, between 9:00
@@ -3641,7 +3763,7 @@ Internet-Draft                   CalDAV                       April 2006
 
    See Appendix B for the calendar data being targeted by this example.
 
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -3649,13 +3771,13 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:free-busy-query xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <C:time-range start="20060104T140000Z"
-                     end="20060105T220000Z"/>
-   </C:free-busy-query>
+   
+   
+     
+   
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 200 OK
    Date: Fri, 11 Nov 2006 09:32:12 GMT
@@ -3675,19 +3797,19 @@ Internet-Draft                   CalDAV                       April 2006
    END:VCALENDAR
 
 
-8.  Guidelines
+8.  Guidelines
 
 
 
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 65]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 68]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-8.1.  Client-to-client Interoperability
+8.1.  Client-to-client Interoperability
 
    There are a number of actions clients can take which will be legal
    (the server will not return errors) but which can degrade
@@ -3701,7 +3823,7 @@ Internet-Draft                   CalDAV                       April 2006
    usage, interoperability problems are likely to be more evident in
    CalDAV use cases.
 
-8.2.  Synchronization Operations
+8.2.  Synchronization Operations
 
    WebDAV already provides functionality required to synchronize a
    collection or set of collections, make changes offline, and a simple
@@ -3709,11 +3831,11 @@ Internet-Draft                   CalDAV                       April 2006
    making this work, but these are not required of all WebDAV servers.
    Since offline functionality is more important to calendar
    applications than to some other WebDAV applications, CalDAV servers
-   MUST support ETags as specified in Section 5.3.4.
+   MUST support ETags as specified in Section 5.3.4.
 
-8.2.1.  Use of Reports
+8.2.1.  Use of Reports
 
-8.2.1.1.  Restrict the Time Range
+8.2.1.1.  Restrict the Time Range
 
    The REPORTs provided in CalDAV can be used by clients to optimize
    their performance in terms of network bandwidth usage, and resource
@@ -3729,7 +3851,7 @@ Internet-Draft                   CalDAV                       April 2006
    set of returned components to just those needed to populate the
    current view.
 
-8.2.1.2.  Synchronize by Time Range
+8.2.1.2.  Synchronize by Time Range
 
    Typically in a calendar, historical data (events, to-dos etc. that
    have completed prior to the current date) do not change, though they
@@ -3738,9 +3860,9 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 66]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 69]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    and the future up to a reasonable limit (e.g., one week, one month).
@@ -3750,7 +3872,7 @@ Internet-Draft                   CalDAV                       April 2006
    examined.  This "just-in-time" synchronization can minimize bandwidth
    for common user interaction behaviors.
 
-8.2.1.3.  Synchronization Process
+8.2.1.3.  Synchronization Process
 
    If a client wants to support calendar data synchronization, as
    opposed to downloading calendar data each time it is needed, it needs
@@ -3794,9 +3916,9 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 67]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 70]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    REPORT /bernard/work/ HTTP/1.1
@@ -3805,21 +3927,21 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:D="DAV:"
-                     xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop>
-       <D:getetag/>
-     </D:prop>
-     <C:filter>
-       <C:comp-filter name="VCALENDAR">
-         <C:comp-filter name="VEVENT">
-           <C:time-range start="20040902T000000Z"
-                           end="20040903T000000Z"/>
-         </C:comp-filter>
-       </C:comp-filter>
-     </C:filter>
-   </C:calendar-query>
+   
+   
+     
+       
+     
+     
+       
+         
+           
+         
+       
+     
+   
 
    The client then uses the results to determine which calendar object
    resources have changed, been created or deleted on the server and how
@@ -3834,28 +3956,28 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-multiget xmlns:D="DAV:"
-                        xmlns:C="urn:ietf:params:xml:ns:caldav">
-     <D:prop>
-       <D:getetag/>
-       <C:calendar-data/>
-     </D:prop>
-     <D:href>/bernard/work/abcd1.ics</D:href>
-     <D:href>/bernard/work/mtg1.ics</D:href>
-   </C:calendar-multiget>
+   
+   
+     
+       
+       
+     
+     /bernard/work/abcd1.ics
+     /bernard/work/mtg1.ics
+   
 
 
 
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 68]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 71]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-8.2.2.  Restrict the Properties Returned
+8.2.2.  Restrict the Properties Returned
 
    Clients may not need all the calendar properties of a calendar object
    resource when presenting information to the user.  Since some
@@ -3870,7 +3992,7 @@ Internet-Draft                   CalDAV                       April 2006
    As a result the client will have to get the entire calendar object
    resource that is being changed.
 
-8.3.  Use of Locking
+8.3.  Use of Locking
 
    WebDAV locks can be used to prevent two clients modifying the same
    resource from either overwriting each others' changes (though that
@@ -3892,7 +4014,7 @@ Internet-Draft                   CalDAV                       April 2006
    means that if the client is unable to remove the lock, the other
    calendar users aren't prevented from making changes.
 
-8.4.  Finding calendars
+8.4.  Finding calendars
 
    Much of the time a calendar client (or agent) will discover a new
    calendar's location by being provided directly with the URL.  E.g., a
@@ -3906,9 +4028,9 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 69]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 72]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    The choice of HTTP URLs means that calendar object resources are
@@ -3925,10 +4047,10 @@ Internet-Draft                   CalDAV                       April 2006
    calendar in the same repository, that calendar can be found by using
    the principal namespace required by WebDAV ACL support.  For other
    cases, the authors have no universal solution but implementers can
-   consider whether to use vCard [RFC2426] or LDAP [RFC2251] standards
-   together with calendar attributes [RFC2739].
+   consider whether to use vCard [RFC2426] or LDAP [RFC4511] standards
+   together with calendar attributes [RFC2739].
 
-   Because CalDAV requires servers to support WebDAV ACL [RFC3744]
+   Because CalDAV requires servers to support WebDAV ACL [RFC3744]
    including principal namespaces, and with the addition of the CALDAV:
    calendar-home-set property, there are a couple options for CalDAV
    clients to find one's own calendar or another user's calendar.
@@ -3938,14 +4060,14 @@ Internet-Draft                   CalDAV                       April 2006
    current user.  Using this, a WebDAV client can learn "who am I" and
    "where are my calendars".  The REPORT request body looks like this:
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:principal-match xmlns:D="DAV:">
-     <D:self/>
-     <D:prop>
-       <C:calendar-home-set
-          xmlns:C="urn:ietf:params:xml:ns:caldav"/>
-     </D:prop>
-   </D:principal-match>
+   
+   
+     
+     
+       
+     
+   
 
    To find other users calendars, the DAV:principal-property-search
    REPORT can be used to filter on some properties and return others.
@@ -3962,25 +4084,25 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 70]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 73]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:principal-property-search xmlns:D="DAV:">
-     <D:property-search>
-       <D:prop>
-         <D:displayname/>
-       </D:prop>
-       <D:match>Laurie</D:match>
-     </D:property-search>
-     <D:prop>
-       <C:calendar-home-set
-          xmlns:C="urn:ietf:params:xml:ns:caldav"/>
-       <D:displayname/>
-     </D:prop>
-   </D:principal-property-search>
+   
+   
+     
+       
+         
+       
+       Laurie
+     
+     
+       
+       
+     
+   
 
    The server performs a case-sensitive or caseless search for a
    matching string subset of "Laurie" within the DAV:displayname
@@ -3988,16 +4110,16 @@ Internet-Draft                   CalDAV                       April 2006
    Desruisseaux" or "Wilfrid Laurier" all as matching DAV:displayname
    values, and the calendars for each of these.
 
-8.5.  Storing and Using Attachments
+8.5.  Storing and Using Attachments
 
    CalDAV clients MAY create attachments in calendar components either
    as inline or external.  This section contains some guidelines on
    creating and managing attachments.
 
-8.5.1.  Inline attachments
+8.5.1.  Inline attachments
 
    CalDAV clients MUST support inline attachments as specified in
-   iCalendar [RFC2445].  CalDAV servers MUST support inline attachments,
+   iCalendar [RFC2445].  CalDAV servers MUST support inline attachments,
    so clients can rely on being able to create attachments this way.  On
    the other hand, inline attachments have some drawbacks:
 
@@ -4005,10 +4127,10 @@ Internet-Draft                   CalDAV                       April 2006
       resources (i.e., refusing PUT requests of very large iCalendar
       objects).  Servers that do that MUST use the CALDAV:max-resource-
       size property on a calendar collection to inform the client as to
-      what the limitation is (see Section 5.2.5.
+      what the limitation is (see Section 5.2.5).
 
    o  Servers MAY impose storage quota limitations on calendar
-      collections (See [RFC4331]).
+      collections (See [RFC4331]).
 
    o  Any change to a calendar object resource containing an attachment
       requires the entire attachment to be re-uploaded.
@@ -4018,19 +4140,22 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 71]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 74]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
       attachment is unchanged.
 
-8.5.2.  External attachments
+8.5.2.  External attachments
 
-   CalDAV clients MUST support external attachments: if the client
-   accesses any calendar object resource it MUST be capable of also
-   accessing the external attachment if one exists.  An external
-   attachment could be:
+   CalDAV clients SHOULD support downloading of external attachments
+   referenced by arbitrary URI schemes, by either processing them
+   directly, or by passing the attachment URI to a suitable "helper
+   application" for processing, if such an application exists.  CalDAV
+   clients MUST support downloading of external attachments referenced
+   by the "http" or "https" URI schemes.  An external attachment could
+   be:
 
    o  In a collection in the calendar collection containing the calendar
       object resource;
@@ -4068,24 +4193,24 @@ Internet-Draft                   CalDAV                       April 2006
    using external attachments.  One reason for servers to support the
    storage of attachments within child collections of calendar
    collections is that ACL inheritance might make it easier to grant the
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 75]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    same permissions to attachments that are granted on the calendar
    collection.  Otherwise, it can be very difficult to keep permissions
    synchronized.  With attachments stored on separate repositories, it
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 72]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    can be impossible to keep permissions consistent -- the two
    repositories may not support the same permissions or have the same
    set of principals.  Some systems have used tickets or other anonymous
    access control mechanisms to provide partially satisfactory solutions
    to these kinds of problems.
 
-8.6.  Storing and Using Alarms
+8.6.  Storing and Using Alarms
 
    Note that all CalDAV calendar collections (including those which the
    user might treat as public or group calendars) can contain alarm
@@ -4111,7 +4236,7 @@ Internet-Draft                   CalDAV                       April 2006
       email, it SHOULD ignore the alarm but MUST continue to synchronize
       the alarm itself.
 
-      This specification makes no recommendations about executing alarm
+      This specification makes no recommendations about executing alarms
       of type PROCEDURE except to note that clients are advised to take
       care to avoid creating security holes by executing these.
 
@@ -4124,17 +4249,17 @@ Internet-Draft                   CalDAV                       April 2006
    synchronize the alarm data that already exists in the resources.
    Clients MAY execute alarms that are downloaded in this fashion,
    possibly based on user preference.  If a client is only doing read
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 76]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    operations on a calendar and there is no risk of losing alarm
    information, then the client MAY discard alarm information.
 
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 73]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    This specification makes no attempt to provide multi-user alarms on
    group calendars or to find out who an alarm is intended for.
    Addressing those issues might require extensions to iCalendar, for
@@ -4144,9 +4269,9 @@ Internet-Draft                   CalDAV                       April 2006
    public, group or resource calendars.
 
 
-9.  XML Element Definitions
+9.  XML Element Definitions
 
-9.1.  CALDAV:calendar XML Element
+9.1.  CALDAV:calendar XML Element
 
    Name: calendar
 
@@ -4154,13 +4279,13 @@ Internet-Draft                   CalDAV                       April 2006
 
    Purpose: Specifies the resource type of a calendar collection.
 
-   Description: See Section 4.2.
+   Description: See Section 4.2.
 
    Definition:
 
-         <!ELEMENT calendar EMPTY>
+         
 
-9.2.  CALDAV:mkcalendar XML Element
+9.2.  CALDAV:mkcalendar XML Element
 
    Name: mkcalendar
 
@@ -4169,38 +4294,56 @@ Internet-Draft                   CalDAV                       April 2006
    Purpose: Specifies a request that includes the WebDAV property values
       to be set for a calendar collection resource when it is created.
 
-   Description: See Section 5.3.1.
+   Description: See Section 5.3.1.
 
    Definition:
 
-         <!ELEMENT mkcalendar (DAV:set)>
+         
+
+9.3.  CALDAV:mkcalendar-response XML Element
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 77]
+
+Internet-Draft                   CalDAV                   September 2006
 
-9.3.  CALDAV:mkcalendar-response XML Element
 
    Name: mkcalendar-response
 
    Namespace: urn:ietf:params:xml:ns:caldav
 
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 74]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    Purpose: Specifies a response body for a successful MKCALENDAR
       request.
 
-   Description: See Section 5.3.1.
+   Description: See Section 5.3.1.
 
    Definition:
 
-         <!ELEMENT mkcalendar-response ANY>
+         
 
-9.4.  CALDAV:calendar-query XML Element
+9.4.  CALDAV:supported-collation XML Element
+
+   Name: supported-collation
+
+   Namespace: urn:ietf:params:xml:ns:caldav
+
+   Purpose: Identifies a single collation via its collation identifier
+      as defined by [I-D.newman-i18n-comparator].
+
+   Description: The CALDAV:supported-collation contains the text of a
+      collation identifier as described in Section 7.5.1.
+
+   Definition:
+
+         
+         PCDATA value: collation identifier
+
+9.5.  CALDAV:calendar-query XML Element
 
    Name: calendar-query
 
@@ -4208,15 +4351,25 @@ Internet-Draft                   CalDAV                       April 2006
 
    Purpose: Defines a REPORT for querying calendar object resources.
 
-   Description: See Section 7.7.
+   Description: See Section 7.8.
 
    Definition:
 
-         <!ELEMENT calendar-query ((DAV:allprop |
+         
 
-9.5.  CALDAV:calendar-data XML Element
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 78]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+9.6.  CALDAV:calendar-data XML Element
 
    Name: calendar-data
 
@@ -4239,14 +4392,6 @@ Internet-Draft                   CalDAV                       April 2006
       calendar-data XML element doesn't contain any CALDAV:comp element,
       calendar object resources will be returned in their entirety.
 
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 75]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
       Finally, when used in a calendaring REPORT response, the CALDAV:
       calendar-data XML element specifies the content of a calendar
       object resource.  Given that XML parsers normalize the two-
@@ -4269,40 +4414,38 @@ Internet-Draft                   CalDAV                       April 2006
 
    Note: The iCalendar data embedded within the CALDAV:calendar-data XML
       element MUST follow the standard XML character data encoding
-      rules, including use of &lt;, &gt;, &amp; etc entity encoding or
-      the use of a <[!CDATA[ ... ]]> construct.  In the later case the
-      iCalendar data cannot contain the character sequence "]]>" which
+      rules, including use of <, >, & etc entity encoding or
+      the use of a  construct.  In the later case the
+      iCalendar data cannot contain the character sequence "]]>" which
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 79]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
       is the end delimiter for the CDATA section.
 
    Definition:
 
-         <!ELEMENT calendar-data ((comp?, (expand |
+         
          PCDATA value: iCalendar object
 
-         <!ATTLIST calendar-data content-type CDATA "text/calendar">
-                                 version CDATA "2.0">
+         
+                                 version CDATA "2.0">
          content-type value: a MIME media type
          version value: a version string
 
-9.5.1.  CALDAV:comp XML Element
+9.6.1.  CALDAV:comp XML Element
 
    Name: comp
 
    Namespace: urn:ietf:params:xml:ns:caldav
 
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 76]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    Purpose: Defines which component types to return.
 
    Description: The name value is a calendar component name (e.g.,
@@ -4310,23 +4453,34 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT comp ((allprop | prop*), (allcomp | comp*))>
+         
 
-         <!ATTLIST comp name CDATA #REQUIRED>
+         
          name value: a calendar component name
 
    Note: The CALDAV:prop and CALDAV:allprop elements have the same name
-      as the DAV:prop and DAV:allprop elements defined in [I-D.ietf-
-      webdav-rfc2518bis].  However, the CALDAV:prop and CALDAV:allprop
-      element are defined in the "urn:ietf:params:xml:ns:caldav"
-      namespace instead of the "DAV:" namespace.
+      as the DAV:prop and DAV:allprop elements defined in [RFC2518].
+      However, the CALDAV:prop and CALDAV:allprop element are defined in
+      the "urn:ietf:params:xml:ns:caldav" namespace instead of the
+      "DAV:" namespace.
 
-9.5.2.  CALDAV:allcomp XML Element
+9.6.2.  CALDAV:allcomp XML Element
 
    Name: allcomp
 
    Namespace: urn:ietf:params:xml:ns:caldav
 
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 80]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Purpose: Specifies that all components shall be returned.
 
    Description: The CALDAV:allcomp XML element can be used when the
@@ -4335,9 +4489,9 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT allcomp EMPTY>
+         
 
-9.5.3.  CALDAV:allprop XML Element
+9.6.3.  CALDAV:allprop XML Element
 
    Name: allprop
 
@@ -4349,27 +4503,16 @@ Internet-Draft                   CalDAV                       April 2006
       client wants all properties of components returned by a
       calendaring REPORT request.
 
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 77]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    Definition:
 
-         <!ELEMENT allprop EMPTY>
+         
 
    Note: The CALDAV:allprop element has the same name as the DAV:allprop
-      element defined in [I-D.ietf-webdav-rfc2518bis].  However, the
-      CALDAV:allprop element is defined in the
-      "urn:ietf:params:xml:ns:caldav" namespace instead of the "DAV:"
-      namespace.
+      element defined in [RFC2518].  However, the CALDAV:allprop element
+      is defined in the "urn:ietf:params:xml:ns:caldav" namespace
+      instead of the "DAV:" namespace.
 
-9.5.4.  CALDAV:prop XML Element
+9.6.4.  CALDAV:prop XML Element
 
    Name: prop
 
@@ -4385,36 +4528,33 @@ Internet-Draft                   CalDAV                       April 2006
       property name and any iCalendar parameters and a trailing ":"
       without the subsequent value data.
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 81]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Definition:
 
-         <!ELEMENT prop EMPTY>
+         
 
-         <!ATTLIST prop name CDATA #REQUIRED
-                     novalue (yes | no) "no">
+         
          name value: a calendar property name
          novalue value: "yes" or "no"
 
    Note: The CALDAV:prop element has the same name as the DAV:prop
-      element defined in [I-D.ietf-webdav-rfc2518bis].  However, the
-      CALDAV:prop element is defined in the
-      "urn:ietf:params:xml:ns:caldav" namespace instead of the "DAV:"
-      namespace.
+      element defined in [RFC2518].  However, the CALDAV:prop element is
+      defined in the "urn:ietf:params:xml:ns:caldav" namespace instead
+      of the "DAV:" namespace.
 
-9.5.5.  CALDAV:expand XML Element
+9.6.5.  CALDAV:expand XML Element
 
    Name: expand
 
-
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 78]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    Namespace: urn:ietf:params:xml:ns:caldav
 
    Purpose: Forces the server to expand recurring components into
@@ -4441,14 +4581,26 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT expand EMPTY>
 
-         <!ATTLIST expand start CDATA #REQUIRED
-                         end   CDATA #REQUIRED>
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 82]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+         
+
+         
          start value: an iCalendar "date with UTC time"
          end value: an iCalendar "date with UTC time"
 
-9.5.6.  CALDAV:limit-recurrence-set XML Element
+9.6.6.  CALDAV:limit-recurrence-set XML Element
 
    Name: limit-recurrence-set
 
@@ -4463,14 +4615,6 @@ Internet-Draft                   CalDAV                       April 2006
       "overridden components" that impact a specified time range.  An
       overridden component impacts a time range if its current start and
       end times overlap the time range, or if the original start and end
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 79]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
       times - the ones that would have been used if the instance were
       not overridden - overlap the time range.  The "start" attribute
       specifies the inclusive start of the time range, and the "end"
@@ -4491,14 +4635,21 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT limit-recurrence-set EMPTY>
+         
 
-         <!ATTLIST limit-recurrence-set start CDATA #REQUIRED
-                                       end   CDATA #REQUIRED>
+         
          start value: an iCalendar "date with UTC time"
          end value: an iCalendar "date with UTC time"
 
-9.5.7.  CALDAV:limit-freebusy-set XML Element
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 83]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+9.6.7.  CALDAV:limit-freebusy-set XML Element
 
    Name: limit-freebusy-set
 
@@ -4519,24 +4670,16 @@ Internet-Draft                   CalDAV                       April 2006
       for CALDAV:time-range to determine if a FREEBUSY property value
       intersect the specified time range.
 
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 80]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    Definition:
 
-         <!ELEMENT limit-freebusy-set EMPTY>
+         
 
-         <!ATTLIST limit-freebusy-set start CDATA #REQUIRED
-                                     end   CDATA #REQUIRED>
+         
          start value: an iCalendar "date with UTC time"
          end value: an iCalendar "date with UTC time"
 
-9.6.  CALDAV:filter XML Element
+9.7.  CALDAV:filter XML Element
 
    Name: filter
 
@@ -4551,9 +4694,18 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT filter (comp-filter)>
+         
 
-9.6.1.  CALDAV:comp-filter XML Element
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 84]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+9.7.1.  CALDAV:comp-filter XML Element
 
    Name: comp-filter
 
@@ -4572,17 +4724,6 @@ Internet-Draft                   CalDAV                       April 2006
          any CALDAV:prop-filter and CALDAV:comp-filter child elements
          also match.
 
-
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 81]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
       or:
 
       *  A component of the type specified by the "name" attribute does
@@ -4590,13 +4731,13 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT comp-filter (is-not-defined | (time-range?,
-                                prop-filter*, comp-filter*))>
+         
 
-         <!ATTLIST comp-filter name CDATA #REQUIRED>
+         
          name value: a calendar component name (e.g., "VEVENT")
 
-9.6.2.  CALDAV:prop-filter XML Element
+9.7.2.  CALDAV:prop-filter XML Element
 
    Name: prop-filter
 
@@ -4612,6 +4753,14 @@ Internet-Draft                   CalDAV                       April 2006
       *  A property of the type specified by the "name" attribute
          exists, and the CALDAV:prop-filter is empty, or it matches the
          CALDAV:time-range XML element or CALDAV:text-match conditions
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 85]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
          if specified, and that any CALDAV:param-filter child elements
          also match.
 
@@ -4622,24 +4771,14 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT prop-filter ((is-not-defined |
+         
 
-         <!ATTLIST prop-filter name CDATA #REQUIRED>
+         
          name value: a calendar property name (e.g., "ATTENDEE")
 
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 82]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-9.6.3.  CALDAV:param-filter XML Element
+9.7.3.  CALDAV:param-filter XML Element
 
    Name: param-filter
 
@@ -4663,12 +4802,22 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT param-filter (is-not-defined | text-match)?>
+         
 
-         <!ATTLIST param-filter name CDATA #REQUIRED>
+         
          name value: a property parameter name (e.g., "PARTSTAT")
 
-9.6.4.  CALDAV:is-not-defined XML Element
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 86]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+9.7.4.  CALDAV:is-not-defined XML Element
 
    Name: is-not-defined
 
@@ -4684,18 +4833,9 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT is-not-defined EMPTY>
+         
 
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 83]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-9.6.5.  CALDAV:text-match XML Element
+9.7.5.  CALDAV:text-match XML Element
 
    Name: text-match
 
@@ -4708,17 +4848,10 @@ Internet-Draft                   CalDAV                       April 2006
       for a substring match against the property or parameter value
       specified in a calendaring REPORT request.
 
-      The "caseless" attribute indicates whether the match is case-
-      sensitive (value set to "no") or case-insensitive (value set to
-      "yes").  The default value is server-specified.  Support for the
-      "caseless" attribute is REQUIRED, and implementers of servers are
-      strongly encouraged to consult "The Unicode Standard" [UNICODE4],
-      especially Section 5.18, Subsection "Caseless Matching", for
-      guidance when implementing their case-insensitive matching
-      algorithms..  A server MAY ignore the caseless attribute when
-      applied to enumerated iCalendar property or parameter values, and
-      default to caseless matching for those values, since they are
-      defined as being case-insensitive in iCalendar.
+      The "collation" attribute is used to select the collation that the
+      server MUST use for character string matching.  In the absence of
+      this attribute the server MUST use the "i;ascii-casemap"
+      collation.
 
       The "negate-condition" attribute is used to indicate that this
       test returns a match if the text matches, when the attribute value
@@ -4729,28 +4862,29 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT text-match (#PCDATA)>
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 87]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+         
          PCDATA value: string
 
-         <!ATTLIST text-match caseless         (yes | no) #IMPLIED
-                              negate-condition (yes | no) "no">
+         
 
-9.7.  CALDAV:timezone XML Element
+9.8.  CALDAV:timezone XML Element
 
    Name: timezone
 
    Namespace: urn:ietf:params:xml:ns:caldav
 
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 84]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    Purpose: Specifies the time zone component to use when determining
       the results of a report.
 
@@ -4767,17 +4901,17 @@ Internet-Draft                   CalDAV                       April 2006
 
    Note: The iCalendar data embedded within the CALDAV:timezone XML
       element MUST follow the standard XML character data encoding
-      rules, including use of &lt;, &gt;, &amp; etc entity encoding or
-      the use of a <[!CDATA[ ... ]]> construct.  In the later case the
-      iCalendar data cannot contain the character sequence "]]>" which
+      rules, including use of <, >, & etc entity encoding or
+      the use of a  construct.  In the later case the
+      iCalendar data cannot contain the character sequence "]]>" which
       is the end delimiter for the CDATA section.
 
    Definition:
 
-         <!ELEMENT timezone (#PCDATA)>
+         
          PCDATA value: an iCalendar object with exactly one VTIMEZONE
 
-9.8.  CALDAV:time-range XML Element
+9.9.  CALDAV:time-range XML Element
 
    Name: time-range
 
@@ -4786,6 +4920,15 @@ Internet-Draft                   CalDAV                       April 2006
    Purpose: Specifies a time range to limit the set of calendar
       components returned by the server.
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 88]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    Description: The CALDAV:time-range XML element specifies that for a
       given calendaring REPORT request the server MUST only return the
       calendar object resources that, depending on the context, have a
@@ -4799,14 +4942,6 @@ Internet-Draft                   CalDAV                       April 2006
       If either the "start" or "end" attribute is not specified in the
       CALDAV:time-range XML element, assume "-infinity" and "+infinity"
       as their value respectively.  If both "start" and "end" are
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 85]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
       present, the value of the "end" attribute MUST be greater than the
       value of the "start" attribute.
 
@@ -4819,7 +4954,7 @@ Internet-Draft                   CalDAV                       April 2006
 
       A VEVENT component overlaps a given time range if the condition
       for the corresponding component state specified in the table below
-      is satisfied.  Note that as specified in [RFC2445] the DTSTART
+      is satisfied.  Note that as specified in [RFC2445] the DTSTART
       property is REQUIRED in the VEVENT component.  The conditions
       depend on the presence of the DTEND and DURATION properties in the
       VEVENT component.  Furthermore, the value of the DTEND property
@@ -4828,6 +4963,28 @@ Internet-Draft                   CalDAV                       April 2006
       properties is 1 day (+P1D) when the DTSTART is a DATE value, and 0
       seconds when the DTSTART is a DATE-TIME value.
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 89]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
       +---------------------------------------------------------------+
       | VEVENT has the DTEND property?                                |
       |   +-----------------------------------------------------------+
@@ -4839,33 +4996,51 @@ Internet-Draft                   CalDAV                       April 2006
       |   |   |   |   +-----------------------------------------------+
       |   |   |   |   | Condition to evaluate                         |
       +---+---+---+---+-----------------------------------------------+
-      | Y | N | N | * | (start <  DTEND AND end > DTSTART)            |
+      | Y | N | N | * | (start <  DTEND AND end > DTSTART)            |
       +---+---+---+---+-----------------------------------------------+
-      | N | Y | Y | * | (start <  DTSTART+DURATION AND end > DTSTART) |
+      | N | Y | Y | * | (start <  DTSTART+DURATION AND end > DTSTART) |
       |   |   +---+---+-----------------------------------------------+
-      |   |   | N | * | (start <= DTSTART AND end > DTSTART)          |
+      |   |   | N | * | (start <= DTSTART AND end > DTSTART)          |
       +---+---+---+---+-----------------------------------------------+
-      | N | N | N | Y | (start <= DTSTART AND end > DTSTART)          |
+      | N | N | N | Y | (start <= DTSTART AND end > DTSTART)          |
       +---+---+---+---+-----------------------------------------------+
-      | N | N | N | N | (start <  DTSTART+P1D AND end > DTSTART)      |
+      | N | N | N | N | (start <  DTSTART+P1D AND end > DTSTART)      |
       +---+---+---+---+-----------------------------------------------+
 
       A VTODO component is said to overlap a given time range if the
       condition for the corresponding component state specified in the
       table below is satisfied.  The conditions depend on the presence
       of the DTSTART, DURATION, DUE, COMPLETED and CREATED properties in
-      the VTODO component.  Note that as specified in [RFC2445] the DUE
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 86]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
+      the VTODO component.  Note that as specified in [RFC2445] the DUE
       value MUST be a DATE-TIME value equal to or after the DTSTART
       value, if specified.
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 90]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    +-------------------------------------------------------------------+
    | VTODO has the DTSTART property?                                   |
    |   +---------------------------------------------------------------+
@@ -4879,25 +5054,25 @@ Internet-Draft                   CalDAV                       April 2006
    |   |   |   |   |   +-----------------------------------------------+
    |   |   |   |   |   | Condition to evaluate                         |
    +---+---+---+---+---+-----------------------------------------------+
-   | Y | Y | N | * | * | (start  <= DTSTART+DURATION)  AND             |
-   |   |   |   |   |   | ((end   >  DTSTART)  OR                       |
-   |   |   |   |   |   |  (end   >= DTSTART+DURATION))                 |
+   | Y | Y | N | * | * | (start  <= DTSTART+DURATION)  AND             |
+   |   |   |   |   |   | ((end   >  DTSTART)  OR                       |
+   |   |   |   |   |   |  (end   >= DTSTART+DURATION))                 |
    +---+---+---+---+---+-----------------------------------------------+
-   | Y | N | Y | * | * | ((start <  DUE)      OR  (start <= DTSTART))  |
+   | Y | N | Y | * | * | ((start <  DUE)      OR  (start <= DTSTART))  |
    |   |   |   |   |   | AND                                           |
-   |   |   |   |   |   | ((end   >  DTSTART)  OR  (end   >= DUE))      |
+   |   |   |   |   |   | ((end   >  DTSTART)  OR  (end   >= DUE))      |
    +---+---+---+---+---+-----------------------------------------------+
-   | Y | N | N | * | * | (start  <= DTSTART)  AND (end >  DTSTART)     |
+   | Y | N | N | * | * | (start  <= DTSTART)  AND (end >  DTSTART)     |
    +---+---+---+---+---+-----------------------------------------------+
-   | N | N | Y | * | * | (start  <  DUE)      AND (end >= DUE)         |
+   | N | N | Y | * | * | (start  <  DUE)      AND (end >= DUE)         |
    +---+---+---+---+---+-----------------------------------------------+
-   | N | N | N | Y | Y | ((start <= CREATED)  OR  (start <= COMPLETED))|
+   | N | N | N | Y | Y | ((start <= CREATED)  OR  (start <= COMPLETED))|
    |   |   |   |   |   | AND                                           |
-   |   |   |   |   |   | ((end   >= CREATED)  OR  (end   >= COMPLETED))|
+   |   |   |   |   |   | ((end   >= CREATED)  OR  (end   >= COMPLETED))|
    +---+---+---+---+---+-----------------------------------------------+
-   | N | N | N | Y | N | (start  <= COMPLETED) AND (end  >= COMPLETED) |
+   | N | N | N | Y | N | (start  <= COMPLETED) AND (end  >= COMPLETED) |
    +---+---+---+---+---+-----------------------------------------------+
-   | N | N | N | N | Y | (end    >  CREATED)                           |
+   | N | N | N | N | Y | (end    >  CREATED)                           |
    +---+---+---+---+---+-----------------------------------------------+
    | N | N | N | N | N | TRUE                                          |
    +---+---+---+---+---+-----------------------------------------------+
@@ -4914,9 +5089,12 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 87]
-
-Internet-Draft                   CalDAV                       April 2006
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 91]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
       +----------------------------------------------------+
@@ -4926,9 +5104,9 @@ Internet-Draft                   CalDAV                       April 2006
       |   |   +--------------------------------------------+
       |   |   | Condition to evaluate                      |
       +---+---+--------------------------------------------+
-      | Y | Y | (start <= DTSTART)     AND (end > DTSTART) |
+      | Y | Y | (start <= DTSTART)     AND (end > DTSTART) |
       +---+---+--------------------------------------------+
-      | Y | N | (start <  DTSTART+P1D) AND (end > DTSTART) |
+      | Y | N | (start <  DTSTART+P1D) AND (end > DTSTART) |
       +---+---+--------------------------------------------+
       | N | * | FALSE                                      |
       +---+---+--------------------------------------------+
@@ -4955,10 +5133,10 @@ Internet-Draft                   CalDAV                       April 2006
       |   |   +----------------------------------------------+
       |   |   | Condition to evaluate                        |
       +---+---+----------------------------------------------+
-      | Y | * | (start <= DTEND) AND (end > DTSTART)         |
+      | Y | * | (start <= DTEND) AND (end > DTSTART)         |
       +---+---+----------------------------------------------+
-      | N | Y | (start <  freebusy-period-end) AND           |
-      |   |   | (end   >  freebusy-period-start)             |
+      | N | Y | (start <  freebusy-period-end) AND           |
+      |   |   | (end   >  freebusy-period-start)             |
       +---+---+----------------------------------------------+
       | N | N | FALSE                                        |
       +---+---+----------------------------------------------+
@@ -4970,15 +5148,15 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 88]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 92]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
       A VALARM component is said to overlap a given time range if the
       following condition holds:
 
-         (start <= trigger-time) AND (end > trigger-time)
+         (start <= trigger-time) AND (end > trigger-time)
 
       A VALARM component can be defined such that it triggers
       repeatedly.  Such a VALARM component is said to overlap a given
@@ -4989,7 +5167,7 @@ Internet-Draft                   CalDAV                       April 2006
       DTSTART, DUE and LAST-MODIFIED overlap a given time range if the
       following condition holds:
 
-          (start <= date-time) AND (end > date-time)
+          (start <= date-time) AND (end > date-time)
 
       Note that if DTEND is not present in a VEVENT, but DURATION is,
       then the test should instead operate on the 'effective' DTEND,
@@ -5002,14 +5180,14 @@ Internet-Draft                   CalDAV                       April 2006
 
    Definition:
 
-         <!ELEMENT time-range EMPTY>
+         
 
-         <!ATTLIST time-range start CDATA #IMPLIED
-                             end   CDATA #IMPLIED>
+         
          start value: an iCalendar "date with UTC time"
          end value: an iCalendar "date with UTC time"
 
-9.9.  CALDAV:calendar-multiget XML Element
+9.10.  CALDAV:calendar-multiget XML Element
 
    Name: calendar-multiget
 
@@ -5018,7 +5196,7 @@ Internet-Draft                   CalDAV                       April 2006
    Purpose: CalDAV REPORT used to retrieve specific calendar object
       resources.
 
-   Description: See Section 7.8.
+   Description: See Section 7.9.
 
 
 
@@ -5026,18 +5204,18 @@ Internet-Draft                   CalDAV                       April 2006
 
 
 
-Daboo, et al.           Expires October 28, 2006               [Page 89]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007                [Page 93]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
    Definition:
 
-         <!ELEMENT calendar-multiget ((DAV:allprop |
+         
 
-9.10.  CALDAV:free-busy-query XML Element
+9.11.  CALDAV:free-busy-query XML Element
 
    Name: free-busy-query
 
@@ -5046,24 +5224,29 @@ Internet-Draft                   CalDAV                       April 2006
    Purpose: CalDAV REPORT used to generate a VFREEBUSY to determine busy
       time over a specific time range.
 
-   Description: See Section 7.9.
+   Description: See Section 7.10.
 
    Definition:
 
-         <!ELEMENT free-busy-query (time-range)>
+         
 
 
-10.  Internationalization Considerations
+10.  Internationalization Considerations
 
    CalDAV allows internationalized strings to be stored and retrieved
-   for the description of calendar collections (see Section 5.2.1).
+   for the description of calendar collections (see Section 5.2.1).
+
+   The CALDAV:calendar-query report (Section 7.8) includes a text
+   searching option controlled by the CALDAV:text-match element and
+   details of character handling are covered in the description of that
+   element (see Section 9.7.5).
 
 
-11.  Security Considerations
+11.  Security Considerations
 
    HTTP protocol transactions are sent in the clear over the network
    unless protection from snooping is negotiated.  This can be
-   accomplished by use of TLS as defined in [RFC2818].  In particular,
+   accomplished by use of TLS as defined in [RFC2818].  In particular,
    HTTP Basic authentication MUST NOT be used unless TLS is in effect.
 
    Servers MUST take adequate precautions to ensure malicious clients
@@ -5075,36 +5258,49 @@ Internet-Draft                   CalDAV                       April 2006
    recurrences to be expanded over that range would likely constitute a
    denial-of-service attack on the server.
 
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 94]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    When creating new resources (including calendar collections), clients
    MUST ensure that the resource name (the last path segment of the
    resource URI) assigned to the new resource does not expose any data
    from within the iCalendar resource itself and information about the
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 90]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    nature of a calendar collection.  This is required to ensure that the
    presence of a specific iCalendar component or nature of components in
    a collection cannot be inferred based on the name of a resource.
 
-   Security considerations described in iCalendar [RFC2445] and iTIP
-   [RFC2446] are also applicable to CalDAV.
+   When rolling up free-busy information, more information about a
+   user's events is exposed if busy periods overlap or are adjacent
+   (this tells the client requesting the free-busy information that the
+   calendar owner has at least two events, rather than knowing only that
+   the calendar owner has one or more events during the busy period).
+   Thus, a conservative approach to calendar data privacy would have
+   servers always coalesce such busy periods when they are the same
+   type.
+
+   Procedure alarms are a known security risk for either clients or
+   servers to handle, particularly when the alarm was created by another
+   agent.  Clients and servers are not required to execute such
+   procedure alarms.
+
+   Security considerations described in iCalendar [RFC2445] and iTIP
+   [RFC2446] are also applicable to CalDAV.
 
    Beyond these, CalDAV does not raise any security considerations that
-   are not present in HTTP [RFC2616] and WebDAV [I-D.ietf-webdav-
-   rfc2518bis], [RFC3253], [RFC3744], as discussed in those documents.
+   are not present in HTTP [RFC2616] and WebDAV [RFC2518], [RFC3253],
+   [RFC3744], as discussed in those documents.
 
 
-12.  IANA Consideration
+12.  IANA Consideration
 
    This document uses one new URN to identify a new XML namespace.  The
-   URN conforms to a registry mechanism described in [RFC3688].
+   URN conforms to a registry mechanism described in [RFC3688].
 
-12.1.  Namespace Registration
+12.1.  Namespace Registration
 
    Registration request for the CalDAV namespace:
 
@@ -5116,112 +5312,126 @@ Internet-Draft                   CalDAV                       April 2006
    XML: None.  Namespace URIs do not represent an XML specification.
 
 
-13.  Acknowledgements
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 95]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+13.  Acknowledgements
 
    The authors would like to thank the following individuals for
    contributing their ideas and support for writing this specification:
    Michael Arick, Mario Bonin, Chris Bryant, Scott Carr, Mike Douglass,
-   Helge Hess, Dan Mosedale, Kervin L. Pierre, Julian F. Reschke, Mike
-   Shaver, Simon Vaillancourt, Wilfredo Sanchez and Jim Whitehead,
-   Alexey Melnikov, Jeff McCullough, Brian Moseley, Jari Urpalainen.
+   Ted Hardie, Sam Hartman, Helge Hess, Jeff McCullough, Alexey
+   Melnikov, Dan Mosedale, Brian Moseley, Kervin L. Pierre, Julian F.
+   Reschke, Wilfredo Sanchez Vega, Mike Shaver, Jari Urpalainen, Simon
+   Vaillancourt, Jim Whitehead.
 
    The authors would also like to thank the Calendaring and Scheduling
    Consortium for advice with this specification, and for organizing
    interoperability testing events to help refine it.
 
 
-14.  References
+14.  References
 
+14.1.  Normative References
 
+   [I-D.newman-i18n-comparator]
+              Newman, C., "Internet Application Protocol Collation
+              Registry", draft-newman-i18n-comparator-13 (work in
+              progress), August 2006.
 
+   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", BCP 14, RFC 2119, March 1997.
 
+   [RFC2246]  Dierks, T. and C. Allen, "The TLS Protocol Version 1.0",
+              RFC 2246, January 1999.
 
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 91]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-14.1.  Normative References
-
-   [I-D.ietf-webdav-rfc2518bis]
-              Dusseault, L., "HTTP Extensions for Distributed Authoring
-              - WebDAV", draft-ietf-webdav-rfc2518bis-14 (work in
-              progress), February 2006.
-
-   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
-              Requirement Levels", BCP 14, RFC 2119, March 1997.
-
-   [RFC2246]  Dierks, T. and C. Allen, "The TLS Protocol Version 1.0",
-              RFC 2246, January 1999.
-
-   [RFC2445]  Dawson, F. and Stenerson, D., "Internet Calendaring and
+   [RFC2445]  Dawson, F. and Stenerson, D., "Internet Calendaring and
               Scheduling Core Object Specification (iCalendar)",
-              RFC 2445, November 1998.
+              RFC 2445, November 1998.
 
-   [RFC2446]  Silverberg, S., Mansour, S., Dawson, F., and R. Hopson,
+   [RFC2446]  Silverberg, S., Mansour, S., Dawson, F., and R. Hopson,
               "iCalendar Transport-Independent Interoperability Protocol
               (iTIP) Scheduling Events, BusyTime, To-dos and Journal
-              Entries", RFC 2446, November 1998.
+              Entries", RFC 2446, November 1998.
 
-   [RFC2616]  Fielding, R., Gettys, J., Mogul, J., Frystyk, H.,
+   [RFC2518]  Goland, Y., Whitehead, E., Faizi, A., Carter, S., and D.
+              Jensen, "HTTP Extensions for Distributed Authoring --
+              WEBDAV", RFC 2518, February 1999.
+
+   [RFC2616]  Fielding, R., Gettys, J., Mogul, J., Frystyk, H.,
               Masinter, L., Leach, P., and T. Berners-Lee, "Hypertext
-              Transfer Protocol -- HTTP/1.1", RFC 2616, June 1999.
+              Transfer Protocol -- HTTP/1.1", RFC 2616, June 1999.
 
-   [RFC2818]  Rescorla, E., "HTTP Over TLS", RFC 2818, May 2000.
+   [RFC2818]  Rescorla, E., "HTTP Over TLS", RFC 2818, May 2000.
 
-   [RFC3253]  Clemm, G., Amsden, J., Ellison, T., Kaler, C., and J.
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 96]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+   [RFC3253]  Clemm, G., Amsden, J., Ellison, T., Kaler, C., and J.
               Whitehead, "Versioning Extensions to WebDAV (Web
-              Distributed Authoring and Versioning)", RFC 3253,
+              Distributed Authoring and Versioning)", RFC 3253,
               March 2002.
 
-   [RFC3688]  Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688,
+   [RFC3688]  Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688,
               January 2004.
 
-   [RFC3744]  Clemm, G., Reschke, J., Sedlar, E., and J. Whitehead, "Web
+   [RFC3744]  Clemm, G., Reschke, J., Sedlar, E., and J. Whitehead, "Web
               Distributed Authoring and Versioning (WebDAV) Access
-              Control Protocol", RFC 3744, May 2004.
+              Control Protocol", RFC 3744, May 2004.
 
-   [UNICODE4]
-              The Unicode Consortium, "The Unicode Standard, Version
-              4.0", Addison-Wesley, Boston, MA. ISBN 0-321-18578-1,
-              August 2003,
-              <http://www.unicode.org/versions/Unicode4.0.0/>.
+   [RFC4346]  Dierks, T. and E. Rescorla, "The Transport Layer Security
+              (TLS) Protocol Version 1.1", RFC 4346, April 2006.
 
-   [W3C.REC-xml-20040204]
-              Yergeau, F., Paoli, J., Sperberg-McQueen, C., Bray, T.,
+   [W3C.REC-xml-20060816]
+              Yergeau, F., Paoli, J., Bray, T., Sperberg-McQueen, C.,
+              and E. Maler, "Extensible Markup Language (XML) 1.0
+              (Fourth Edition)", World Wide Web Consortium
+              Recommendation REC-xml-20060816, August 2006,
+              .
 
+14.2.  Informative References
 
+   [I-D.ietf-webdav-rfc2518bis]
+              Dusseault, L., "HTTP Extensions for Distributed Authoring
+              - WebDAV", draft-ietf-webdav-rfc2518bis-15 (work in
+              progress), May 2006.
 
-Daboo, et al.           Expires October 28, 2006               [Page 92]
-
-Internet-Draft                   CalDAV                       April 2006
+   [RFC2426]  Dawson, F. and T. Howes, "vCard MIME Directory Profile",
+              RFC 2426, September 1998.
 
+   [RFC2739]  Small, T., Hennessy, D., and F. Dawson, "Calendar
+              Attributes for vCard and LDAP", RFC 2739, January 2000.
 
-              and E. Maler, "Extensible Markup Language (XML) 1.0 (Third
-              Edition)", W3C REC REC-xml-20040204, February 2004.
-
-14.2.  Informative References
-
-   [RFC2251]  Wahl, M., Howes, T., and S. Kille, "Lightweight Directory
-              Access Protocol (v3)", RFC 2251, December 1997.
-
-   [RFC2426]  Dawson, F. and T. Howes, "vCard MIME Directory Profile",
-              RFC 2426, September 1998.
-
-   [RFC2739]  Small, T., Hennessy, D., and F. Dawson, "Calendar
-              Attributes for vCard and LDAP", RFC 2739, January 2000.
-
-   [RFC4331]  Korver, B. and L. Dusseault, "Quota and Size Properties
+   [RFC4331]  Korver, B. and L. Dusseault, "Quota and Size Properties
               for Distributed Authoring and Versioning (DAV)
-              Collections", RFC 4331, February 2006.
+              Collections", RFC 4331, February 2006.
+
+   [RFC4511]  Sermersheim, J., "Lightweight Directory Access Protocol
+              (LDAP): The Protocol", RFC 4511, June 2006.
 
 
 Appendix A.  CalDAV Method Privilege Table (Normative)
 
    The following table extends the WebDAV Method Privilege Table
-   specified in Appendix B of [RFC3744].
+   specified in Appendix B of [RFC3744].
+
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 97]
+
+Internet-Draft                   CalDAV                   September 2006
+
 
    +------------+------------------------------------------------------+
    | METHOD     | PRIVILEGES                                           |
@@ -5241,21 +5451,7 @@ Appendix B.  Calendar collections used in the examples
    returned by a CALDAV:calendar-query REPORT request designed to return
    all the calendar data in the collection:
 
-
-
-
-
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 93]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-   >> Request <<
+   >> Request <<
 
    REPORT /bernard/work/ HTTP/1.1
    Host: cal.example.com
@@ -5263,37 +5459,45 @@ Internet-Draft                   CalDAV                       April 2006
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <C:calendar-query xmlns:D="DAV:"
-                    xmlns:C="urn:ietf:params:xml:ns:caldav">
-    <D:prop>
-      <D:getetag/>
-      <C:calendar-data/>
-    </D:prop>
-    <C:filter>
-      <C:comp-filter name="VCALENDAR">
-        <C:allprop/>
-        <C:allcomp/>
-      </C:comp-filter>
-    </C:filter>
-   </C:calendar-query>
+   
+   
+    
+      
+      
+    
+    
+      
+        
+        
+      
+    
+   
 
-   >> Response <<
+   >> Response <<
 
    HTTP/1.1 207 Multi-Status
    Content-Type: application/xml; charset="utf-8"
    Content-Length: xxxx
 
-   <?xml version="1.0" encoding="utf-8" ?>
-   <D:multistatus xmlns:D="DAV:"
-                 xmlns:C="urn:ietf:params:xml:ns:caldav">
+   
 
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd1.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd1"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 98]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+   
+
+     
+       http://cal.example.com/bernard/work/abcd1.ics
+       
+         
+           "fffff-abcd1"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTIMEZONE
@@ -5303,14 +5507,6 @@ Internet-Draft                   CalDAV                       April 2006
    DTSTART:20000404T020000
    RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
    TZNAME:EDT
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 94]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    TZOFFSETFROM:-0500
    TZOFFSETTO:-0400
    END:DAYLIGHT
@@ -5331,18 +5527,26 @@ Internet-Draft                   CalDAV                       April 2006
    UID:74855313FA803DA593CD579A@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
 
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd2.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd2"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+     
+       http://cal.example.com/bernard/work/abcd2.ics
+       
+         
+
+
+
+Daboo, et al.            Expires March 17, 2007                [Page 99]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+           "fffff-abcd2"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTIMEZONE
@@ -5359,14 +5563,6 @@ Internet-Draft                   CalDAV                       April 2006
    DTSTART:20001026T020000
    RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
    TZNAME:EST
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 95]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    TZOFFSETFROM:-0400
    TZOFFSETTO:-0500
    END:STANDARD
@@ -5388,18 +5584,26 @@ Internet-Draft                   CalDAV                       April 2006
    UID:00959BC664CA650E933C892C@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
 
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd3.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd3"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+     
+       http://cal.example.com/bernard/work/abcd3.ics
+       
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 100]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+         
+           "fffff-abcd3"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTIMEZONE
@@ -5415,14 +5619,6 @@ Internet-Draft                   CalDAV                       April 2006
    BEGIN:STANDARD
    DTSTART:20001026T020000
    RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 96]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    TZNAME:EST
    TZOFFSETFROM:-0400
    TZOFFSETTO:-0500
@@ -5442,18 +5638,26 @@ Internet-Draft                   CalDAV                       April 2006
    UID:DC6C50A017428C5216A2F1CD@example.com
    END:VEVENT
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
 
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd4.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd4"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+     
+       http://cal.example.com/bernard/work/abcd4.ics
+       
+         
+           "fffff-abcd4"
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 101]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTODO
@@ -5468,26 +5672,18 @@ Internet-Draft                   CalDAV                       April 2006
    END:VALARM
    END:VTODO
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
 
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 97]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-       </D:propstat>
-     </D:response>
-
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd5.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd5"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+     
+       http://cal.example.com/bernard/work/abcd5.ics
+       
+         
+           "fffff-abcd5"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTODO
@@ -5504,18 +5700,25 @@ Internet-Draft                   CalDAV                       April 2006
    END:VALARM
    END:VTODO
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
 
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd6.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd6"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 102]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+     
+       http://cal.example.com/bernard/work/abcd6.ics
+       
+         
+           "fffff-abcd6"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTODO
@@ -5527,28 +5730,20 @@ Internet-Draft                   CalDAV                       April 2006
    STATUS:COMPLETED
    SUMMARY:Task #3
    UID:E10BA47467C5C69BB74E8722@example.com
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 98]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    END:VTODO
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
 
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd7.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd7"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+     
+       http://cal.example.com/bernard/work/abcd7.ics
+       
+         
+           "fffff-abcd7"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VTODO
@@ -5561,18 +5756,25 @@ Internet-Draft                   CalDAV                       April 2006
    UID:E10BA47467C5C69BB74E8725@example.com
    END:VTODO
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
 
-     <D:response>
-       <D:href>http://cal.example.com/bernard/work/abcd8.ics</D:href>
-       <D:propstat>
-         <D:prop>
-           <D:getetag>"fffff-abcd8"</D:getetag>
-           <C:calendar-data>BEGIN:VCALENDAR
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 103]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+     
+       http://cal.example.com/bernard/work/abcd8.ics
+       
+         
+           "fffff-abcd8"
+           BEGIN:VCALENDAR
    VERSION:2.0
    PRODID:-//Example Corp.//CalDAV Client//EN
    BEGIN:VFREEBUSY
@@ -5583,32 +5785,103 @@ Internet-Draft                   CalDAV                       April 2006
    DTEND:20060108T000000Z
    FREEBUSY:20050531T230000Z/20050601T010000Z
    FREEBUSY;FBTYPE=BUSY-TENTATIVE:20060102T100000Z/20060102T120000Z
-
-
-
-Daboo, et al.           Expires October 28, 2006               [Page 99]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    FREEBUSY:20060103T100000Z/20060103T120000Z
    FREEBUSY:20060104T100000Z/20060104T120000Z
    FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:20060105T100000Z/20060105T120000Z
    FREEBUSY:20060106T100000Z/20060106T120000Z
    END:VFREEBUSY
    END:VCALENDAR
-   </C:calendar-data>
-         </D:prop>
-         <D:status>HTTP/1.1 200 OK</D:status>
-       </D:propstat>
-     </D:response>
+   
+         
+         HTTP/1.1 200 OK
+       
+     
 
-   </D:multistatus>
+   
 
 
 Appendix C.  Changes (to be removed prior to publication as an RFC)
 
-C.1.  Changes in -12
+C.1.  Changes in -15
+
+   a.  Switched to using collations for text-match element in calendar-
+       query report.
+
+   b.  Removed caseless attribute from text-match element.
+
+   c.  Removed UNICODE4 reference.
+
+   d.  Removed mailing list comment.
+
+   e.  Made calendar-home-set property a SHOULD as it was in previous
+       drafts.
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 104]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+   f.  Now require https download of external attachments.
+
+   g.  Changed some improper uses of 2119 terms to lowercase.
+
+   h.  Updated some references to latest specs.
+
+C.2.  Changes in -14
+
+   a.  Reverted to normative reference to 2518 and added informative
+       reference to 2518bis.
+
+   b.  Reinserted section describing preconditions/postconditions.
+
+   c.  Removed redundant compliance statement in last paragraph of
+       Section 3.
+
+   d.  Clarify that only text/calendar is allowed if supported-calendar-
+       data property is not present.
+
+   e.  Removed redundant compliance statement in Conformance paragraph
+       of Section 6.2.1.
+
+   f.  Removed redundant compliance statement in first paragraph of
+       Section 7.5.
+
+   g.  Fixed incorrect whitespace in elements in example in Section
+       7.7.6.
+
+   h.  Fixed incorrect CDATA descriptions in various places.
+
+C.3.  Changes in -13
+
+   a.  Changed mailing list draft description.
+
+   b.  Added security review suggested text to Security Considerations.
+
+   c.  Changed external attachment support to require http URI
+       downloads, and optionally others.
+
+   d.  Added reference to text-match element in Internationalization
+       Considerations section.
+
+   e.  Changed 'undefined' to 'not specified here' in ETag behavior
+       section.
+
+   f.  Added reference to RFC4346 with note that it obsoletes RFC2246
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 105]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+C.4.  Changes in -12
 
    a.  Changed requirements for ETags on PUT to better reflect the needs
        of CalDAV clients wrt synchronization and reflect what other
@@ -5617,7 +5890,7 @@ C.1.  Changes in -12
    b.  Changed CALDAV:read-free-busy privilege so that it is also
        defined on regular collections.
 
-C.2.  Changes in -11
+C.5.  Changes in -11
 
    a.  Added statement that calendar-query Depth defaults to zero if
        header is not present.  Fixed one multiget example's Depth
@@ -5639,20 +5912,12 @@ C.2.  Changes in -11
 
    g.  Now require 2518bis Class 3 behaviour.
 
-
-
-
-Daboo, et al.           Expires October 28, 2006              [Page 100]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    h.  Fixed indentation in examples and removed bogus whitespace before
-       </C:calendar-data> tags.
+        tags.
 
-   i.  Fixed </C:calendar-data/> typo.
+   i.  Fixed  typo.
 
-   j.  Added text to <C:calendar-data> element definition as a reminder
+   j.  Added text to  element definition as a reminder
        about the need to do XML character data encoding on any iCalendar
        data within that element.
 
@@ -5663,6 +5928,15 @@ Internet-Draft                   CalDAV                       April 2006
    l.  Added is-not-defined and negate-condition options to reports and
        a new example to illustrate use of those.
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 106]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    m.  Fixed descriptions of some calendar collection properties.
 
    n.  Removed section describing preconditions/postconditions as this
@@ -5685,7 +5959,7 @@ Internet-Draft                   CalDAV                       April 2006
 
    t.  Clarified dependence on UNICODE reference for caseless matching.
 
-C.3.  Changes in -10
+C.6.  Changes in -10
 
    a.  Added new section about support for X- items when storing data.
 
@@ -5694,15 +5968,6 @@ C.3.  Changes in -10
 
    c.  Added new text about always supporting X- in calendar-data.
 
-
-
-
-
-Daboo, et al.           Expires October 28, 2006              [Page 101]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    d.  Created new section for PUT, COPY and MOVE preconditions.
 
    e.  Report examples re-done with full listing of calendar data in
@@ -5719,12 +5984,21 @@ Internet-Draft                   CalDAV                       April 2006
    i.  Add constraint that free-busy-query can only be run on a
        collection.
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 107]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    j.  Add preconditions for calendar-timezone property/elements in
        MKCALENDAR, PROPPATCH and calendar-query REPORT.
 
    k.  Fix principal-match example.
 
-C.4.  Changes in -09
+C.7.  Changes in -09
 
    a.   Numerous editorial changes.
 
@@ -5752,13 +6026,6 @@ C.4.  Changes in -09
         repeating VALARM component is said to intersect a given time
         range if at least one of its trigger intersect the time range.
 
-
-
-Daboo, et al.           Expires October 28, 2006              [Page 102]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    j.   Clarified that calendar object resources stored in calendar
         collections MUST NOT specify the iCalendar METHOD property.
 
@@ -5775,6 +6042,13 @@ Internet-Draft                   CalDAV                       April 2006
    n.   Changed many ELEMENT and ATTLIST declarations to comply with DTD
         syntax.
 
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 108]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    o.   Changed XML element CALDAV:calendar-query to allow new XML
         element CALDAV:timezone.
 
@@ -5808,13 +6082,6 @@ Internet-Draft                   CalDAV                       April 2006
         calendar-timezone property for a given CALDAV:calendar-query
         REPORT request.
 
-
-
-Daboo, et al.           Expires October 28, 2006              [Page 103]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    y.   Added text on the conversion of "floating date" and "floating
         time" values to date with UTC time values.
 
@@ -5822,13 +6089,22 @@ Internet-Draft                   CalDAV                       April 2006
 
    aa.  Completed security considerations section.
 
-C.5.  Changes in -08
+C.8.  Changes in -08
 
    a.  Removed statement that said that client SHOULD always request
        DAV:getetag in calendar REPORTs.
 
    b.  Removed redefiniton of DAV:response.
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 109]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    c.  Removed XML elements CALDAV:calendar-data-only.
 
    d.  Removed resource type CALDAV:calendar-home.
@@ -5862,16 +6138,7 @@ C.5.  Changes in -08
 
    o.  Added guidelines on attachments and alarms.
 
-
-
-
-
-Daboo, et al.           Expires October 28, 2006              [Page 104]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
-C.6.  Changes in -07
+C.9.  Changes in -07
 
    a.  Various editorial changes.
 
@@ -5885,13 +6152,22 @@ C.6.  Changes in -07
 
    e.  Added pre- and postconditions to reports.
 
+
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 110]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    f.  Added new XML elements calendar-data-only and limit-recurrent-
        set.
 
    g.  Modified calendar-data XML element to support the attributes
        content-type and version.
 
-   h.  Reorganised sections 3, 4, 5 & 6 into two sections and re-ordered
+   h.  Reorganised sections 3, 4, 5 & 6 into two sections and re-ordered
        sub-sections.
 
    i.  Added comment about client not setting a duplicate displayname.
@@ -5903,7 +6179,7 @@ C.6.  Changes in -07
    l.  Rewrote section on calendar object resource restrictions for
        better clarity.
 
-C.7.  Changes in -06
+C.10.  Changes in -06
 
    a.  Reworded section "Recurrence and the Data Model".
 
@@ -5920,17 +6196,10 @@ C.7.  Changes in -06
    f.  Added informative "Guidelines" section, with information on
        locking and how to find calendar collections.
 
-
-
-Daboo, et al.           Expires October 28, 2006              [Page 105]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    g.  Moved "Sychronization Operations" section in the "Guidelines"
        section.
 
-C.8.  Changes in -05
+C.11.  Changes in -05
 
    a.  Removed a lot of non-normative text.
 
@@ -5940,6 +6209,14 @@ C.8.  Changes in -05
 
    d.  Removed 'ical' prefix/text from element names.
 
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 111]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
    e.  Relaxed WebDAV Class 2 (locking) requirement to a MAY.
 
    f.  Relaxed MKCALENDAR requirement to a SHOULD.
@@ -5966,7 +6243,7 @@ C.8.  Changes in -05
 
    p.  Grouped XML Element declarations in a separate section.
 
-C.9.  Changes in -04
+C.12.  Changes in -04
 
    a.  Added a note about the HTTP Location response header.
 
@@ -5974,15 +6251,6 @@ C.9.  Changes in -04
 
    c.  Removed reports calendar-property-search and calendar-time-range.
 
-
-
-
-
-Daboo, et al.           Expires October 28, 2006              [Page 106]
-
-Internet-Draft                   CalDAV                       April 2006
-
-
    d.  Removed section on CalDAV and timezones.
 
    e.  Added requirement to return ETag on creation.
@@ -5994,7 +6262,18 @@ Internet-Draft                   CalDAV                       April 2006
 
    h.  Removed dependencies on DASL.
 
-C.10.  Changes in -03
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 112]
+
+Internet-Draft                   CalDAV                   September 2006
+
+
+C.13.  Changes in -03
 
    a.  Removed Calendar Containers (simplification that doesn't seem to
        remove much functionality)
@@ -6003,7 +6282,7 @@ C.10.  Changes in -03
 
    c.  Added cal-scale property to calendars
 
-C.11.  Changes in -02
+C.14.  Changes in -02
 
    Basically still adding major sections of content:
 
@@ -6017,7 +6296,7 @@ C.11.  Changes in -02
 
    e.  Added new privileges for scheduling
 
-C.12.  Changes in -01
+C.15.  Changes in -01
 
    a.  Added section on privileges for calendaring, extending WebDAV ACL
        privilege set
@@ -6034,16 +6313,32 @@ C.12.  Changes in -01
 
 
 
-Daboo, et al.           Expires October 28, 2006              [Page 107]
-
-Internet-Draft                   CalDAV                       April 2006
+
+
+
+
+
+
+
+
+
+
+
+Daboo, et al.            Expires March 17, 2007               [Page 113]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
 Authors' Addresses
 
    Cyrus Daboo
+   Apple Computer, Inc.
+   1 Infinite Loop
+   Cupertino, CA  95014
+   USA
 
    Email: cyrus@daboo.name
+   URI:   http://www.apple.com/
 
 
    Bernard Desruisseaux
@@ -6054,7 +6349,7 @@ Authors' Addresses
    CA
 
    Email: bernard.desruisseaux@oracle.com
-   URI:   http://www.oracle.com/
+   URI:   http://www.oracle.com/
 
 
    Lisa Dusseault
@@ -6064,7 +6359,7 @@ Authors' Addresses
    US
 
    Email: lisa@osafoundation.org
-   URI:   http://www.osafoundation.org/
+   URI:   http://www.osafoundation.org/
 
 
 
@@ -6085,14 +6380,9 @@ Authors' Addresses
 
 
 
-
-
-
-
-
-Daboo, et al.           Expires October 28, 2006              [Page 108]
-
-Internet-Draft                   CalDAV                       April 2006
+Daboo, et al.            Expires March 17, 2007               [Page 114]
+
+Internet-Draft                   CalDAV                   September 2006
 
 
 Intellectual Property Statement
@@ -6111,7 +6401,7 @@ Intellectual Property Statement
    attempt made to obtain a general license or permission for the use of
    such proprietary rights by implementers or users of this
    specification can be obtained from the IETF on-line IPR repository at
-   http://www.ietf.org/ipr.
+   http://www.ietf.org/ipr.
 
    The IETF invites any interested party to bring to its attention any
    copyrights, patents or patent applications, or other proprietary
@@ -6146,10 +6436,5 @@ Acknowledgment
 
 
 
-Daboo, et al.           Expires October 28, 2006              [Page 109]
+Daboo, et al.            Expires March 17, 2007               [Page 115]
 
-
-

-

-
-
\ No newline at end of file diff --git a/htdocs/caldav.php b/htdocs/caldav.php index bb8508f3..2b303985 100644 --- a/htdocs/caldav.php +++ b/htdocs/caldav.php @@ -5,6 +5,10 @@ require_once("BasicAuthSession.php"); $raw_headers = apache_request_headers(); $raw_post = file_get_contents ( 'php://input'); +if ( $debugging && isset($_GET['method']) ) { + $_SERVER['REQUEST_METHOD'] = $_GET['method']; +} + switch ( $_SERVER['REQUEST_METHOD'] ) { case 'OPTIONS': include_once("caldav-OPTIONS.php"); diff --git a/htdocs/client_configuration_help.php b/htdocs/help.php similarity index 91% rename from htdocs/client_configuration_help.php rename to htdocs/help.php index 35ada2bd..621ea27c 100644 --- a/htdocs/client_configuration_help.php +++ b/htdocs/help.php @@ -3,6 +3,8 @@ require_once("always.php"); require_once("RSCDSSession.php"); $session->LoginRequired(); +require_once("interactive-page.php"); + $c->title = "Really Simple CalDAV Store - Configuration Help"; include("page-header.php"); @@ -22,6 +24,6 @@ echo << EOBODY; -include("page-header.php"); +include("page-footer.php"); ?> \ No newline at end of file diff --git a/htdocs/images/down.gif b/htdocs/images/down.gif new file mode 100644 index 0000000000000000000000000000000000000000..2f1637419a7e45e3b857a466bf636a942428e8a2 GIT binary patch literal 58 zcmZ?wbhEHbDzfNTbkyaN+=PyeE%-8V#R K^j0!4SOWmu6%RxJ literal 0 HcmV?d00001 diff --git a/htdocs/images/up.gif b/htdocs/images/up.gif new file mode 100644 index 0000000000000000000000000000000000000000..97c44ffec6342428ea8a7bdd2af83a11b44efa67 GIT binary patch literal 59 zcmZ?wbhEHbLoginRequired(); +require_once("interactive-page.php"); include("page-header.php"); echo <<You appear to be logged on as $session->username ($session->fullname)

Useful links:

EOBODY; diff --git a/htdocs/relationships.php b/htdocs/relationships.php new file mode 100644 index 00000000..2ca0d699 --- /dev/null +++ b/htdocs/relationships.php @@ -0,0 +1,44 @@ +LoginRequired(); + +require_once("interactive-page.php"); + + + require_once("classBrowser.php"); + $c->stylesheets[] = "css/browse.css"; + + $c->page_title = "User Relationships"; + $browser = new Browser($c->page_title); + + $browser->AddColumn( 'from_user', 'From', '', '##from_user_link##' ); + $browser->AddColumn( 'from_name', 'Name', '', '', 'ufrom.fullname' ); + $browser->AddHidden( 'from_user_link', "'' || from_user || ''" ); + $browser->AddColumn( 'to_user', 'From', '', '##to_user_link##' ); + $browser->AddColumn( 'to_name', 'Name', '', '', 'uto.fullname' ); + $browser->AddHidden( 'to_user_link', "'' || to_user || ''" ); + + $browser->SetJoins( 'relationship JOIN usr ufrom ON (ufrom.user_no = from_user) JOIN usr uto ON (uto.user_no = to_user) ' ); + + if ( isset( $_GET['o']) && isset($_GET['d']) ) { + $browser->AddOrder( $_GET['o'], $_GET['d'] ); + } + else + $browser->AddOrder( 'from_user', 'A' ); + + $browser->RowFormat( "\n", "\n", '#even' ); + $browser->DoQuery(); + + +// if ( $session->AllowedTo("Support") ) + $relationship_menu->AddOption("New Relationship","/relationship.php?create","Add a new relationship", false, 10); + + $active_menu_pattern = "#^/relationship#"; + +include("page-header.php"); + +echo $browser->Render(); + +include("page-footer.php"); +?> \ No newline at end of file diff --git a/htdocs/roles.php b/htdocs/roles.php new file mode 100644 index 00000000..aaaf950d --- /dev/null +++ b/htdocs/roles.php @@ -0,0 +1,40 @@ +LoginRequired(); + +require_once("interactive-page.php"); + + + require_once("classBrowser.php"); + $c->stylesheets[] = "css/browse.css"; + + $c->page_title = "System Roles"; + $browser = new Browser($c->page_title); + + $browser->AddColumn( 'role_no', 'No.', '', '##role_link##' ); + $browser->AddColumn( 'role_name', 'Name' ); + $browser->AddHidden( 'role_link', "'' || role_no || ''" ); + + $browser->SetJoins( "roles" ); + + if ( isset( $_GET['o']) && isset($_GET['d']) ) { + $browser->AddOrder( $_GET['o'], $_GET['d'] ); + } + else + $browser->AddOrder( 'role_no', 'A' ); + + $browser->RowFormat( "\n", "\n", '#even' ); + $browser->DoQuery(); + + +// if ( $session->AllowedTo("Admin") ) + $role_menu->AddOption("New Role","/role.php?create","Add a new role", false, 10); + + $active_menu_pattern = "#^/role#"; + +include("page-header.php"); + +echo $browser->Render(); +include("page-footer.php"); +?> \ No newline at end of file diff --git a/htdocs/rscds.css b/htdocs/rscds.css index 4b72a177..a85bfa3a 100644 --- a/htdocs/rscds.css +++ b/htdocs/rscds.css @@ -1,8 +1,106 @@ /* Basic overridable CSS for Really Simple CalDAV Store */ -span.prompt { +body, p, li, td { + padding: 0; + margin: 0; + border: none; +} + +.prompt { font-weight: bold; - width: 12em; - padding-right: 1em; - display: block; + padding: 1px 1em 1px 0.5em; + text-align: right; +} + +.error { + /* font-weight: bold; */ + font-size: 110%; + font-family: Bitstream Vera Sans, Vera Sans, sans-serif; + padding: 1px 0.3em; + background-color: #c00000; + color: #ffff00; +} + +h1, h2, h3, h4, h5 { + font-weight: bold; + font-family: Bitstream Vera Sans, Vera Sans, sans-serif; + padding-left: 0.3em; + padding-right: 0.3em; + padding-bottom: 0.1em; +} + +h1 { + font-size: 200%; + background-color: #30c050; + margin: 0; + padding: 0.3em; +} + +h1:first-letter { + font-size: 120%; +} + +h2 { + font-size: 160%; + background-color: #60e080; + margin: 0; + padding-top: 0.3em; + margin-top: 1px; +} + +p { + padding: 0.1em 0.3em 0.2em; +} + +input.text, input.password, label { + background-color: ffffe0; + color: navy; + border: thin solid #000000; + padding: 3px; +} + +label { + padding: 2px; +} + +#menu { + background-color: #084010; + color: white; + font-weight: bold; + padding: 2px 1px; + margin-bottom: 1px; +} + +#menu a.menu, #menu a.menu:hover, #menu a.menu_active, #menu a.menu_active:hover { + color: white; + text-decoration: none; + background-color: #10a020; + padding: 1px 0.2em; + margin-right: 0.2em; +} + +#menu a.menu:hover, #menu a.menu_active:hover { + color: yellow; + background-color: #088010; +} + +#submenu { + background-color: #105020; + color: white; + font-weight: bold; + padding: 2px 1px; + margin-bottom: 1px; +} + +#submenu a.submenu, #submenu a.submenu:hover, #submenu a.submenu_active, #submenu a.submenu_active:hover { + color: white; + text-decoration: none; + background-color: #20c040; + padding: 1px 0.2em; + margin-right: 0.2em; +} + +#submenu a.submenu:hover, #submenu a.submenu_active:hover { + color: yellow; + background-color: #10a020; } \ No newline at end of file diff --git a/htdocs/users.php b/htdocs/users.php new file mode 100644 index 00000000..54e10a1f --- /dev/null +++ b/htdocs/users.php @@ -0,0 +1,41 @@ +LoginRequired(); + +require_once("interactive-page.php"); + + + require_once("classBrowser.php"); + $c->stylesheets[] = "css/browse.css"; + + $browser = new Browser("Calendar Users"); + + $browser->AddColumn( 'user_no', 'No.', '', '##user_link##' ); + $browser->AddColumn( 'username', 'Name' ); + $browser->AddHidden( 'user_link', "'' || user_no || ''" ); + + $browser->SetJoins( 'usr' ); + + if ( isset( $_GET['o']) && isset($_GET['d']) ) { + $browser->AddOrder( $_GET['o'], $_GET['d'] ); + } + else + $browser->AddOrder( 'user_no', 'A' ); + + $browser->RowFormat( "\n", "\n", '#even' ); + $browser->DoQuery(); + + $c->page_title = "Calendar Users"; + +// if ( $session->AllowedTo("Support") ) + $user_menu->AddOption("New User","/user.php?create","Add a new user", false, 10); + + $active_menu_pattern = "#^/user#"; + +include("page-header.php"); + +echo $browser->Render(); + +include("page-footer.php"); +?> \ No newline at end of file diff --git a/inc/BasicAuthSession.php b/inc/BasicAuthSession.php index d511bee8..8033c7d6 100644 --- a/inc/BasicAuthSession.php +++ b/inc/BasicAuthSession.php @@ -9,8 +9,6 @@ * @license http://gnu.org/copyleft/gpl.html GNU GPL v2 */ -require_once("session-util.php"); - /** * A Class for handling a session using HTTP Basic Authentication * diff --git a/inc/RSCDSSession.php b/inc/RSCDSSession.php index 0ece17f3..7b724603 100644 --- a/inc/RSCDSSession.php +++ b/inc/RSCDSSession.php @@ -109,15 +109,58 @@ class RSCDSSession extends Session } + /** + * Internal function used to assign the session details to a user's new session. + * @param object $u The user+session object we (probably) read from the database. + */ + function AssignSessionDetails( $u ) { + parent::AssignSessionDetails( $u ); + $this->GetRoles(); + $this->GetRelationships(); + } + + + /** + * Method used to get the user's roles + */ + function GetRoles () { + $this->roles = array(); + $sql = 'SELECT role_name FROM roles JOIN role_member ON roles.role_no=role_member.role_no WHERE user_no = '.$this->user_no.';'; + $qry = new PgQuery( $sql ); + if ( $qry->Exec('RSCDSSession') && $qry->rows > 0 ) { + while( $role = $qry->Fetch() ) { + $this->roles[$role->role_name] = 1; + } + } + } + + /** -* Checks that this user is logged in, and presents a login screen if they aren't. -* -* The function can optionally confirm whether they are a member of one of a list -* of groups, and deny access if they are not a member of any of them. -* -* @param string $groups The list of groups that the user must be a member of one of to be allowed to proceed. -* @return boolean Whether or not the user is logged in and is a member of one of the required groups. +* Method used to get the user's relationships */ + function GetRelationships () { + $this->relationships = array(); + $sql = 'SELECT relationship.rt_id, rt_name, rt_isgroup, confers, prefix_match FROM relationship JOIN relationship_type USING (rt_id) WHERE from_user = '.$this->user_no.' UNION '; + $sql .= 'SELECT relationship_type.rt_id, rt_name, rt_isgroup, confers, prefix_match FROM relationship JOIN relationship_type ON (relationship.rt_id = relationship_type.rt_inverse) WHERE to_user = '.$this->user_no.';'; + $qry = new PgQuery( $sql ); + if ( $qry->Exec('RSCDSSession') && $qry->rows > 0 ) { + while( $relationship = $qry->Fetch() ) { + $this->relationships[$relationship->rt_id] = $relationship; + dbg_error_log( "RSCDSSession", "Relationships: %d - %s - %d - %s - %s -", $relationship->rt_id, $relationship->rt_name, $relationship->rt_isgroup, $relationship->confers, $relationship->prefix_match ); + } + } + } + + + /** + * Checks that this user is logged in, and presents a login screen if they aren't. + * + * The function can optionally confirm whether they are a member of one of a list + * of groups, and deny access if they are not a member of any of them. + * + * @param string $groups The list of groups that the user must be a member of one of to be allowed to proceed. + * @return boolean Whether or not the user is logged in and is a member of one of the required groups. + */ function LoginRequired( $groups = "" ) { global $c, $session, $main_menu, $sub_menu, $tab_menu; @@ -129,6 +172,11 @@ class RSCDSSession extends Session local_index_not_logged_in(); } else { + if ( $this->login_failed ) { + echo <<Invalid user name or password.

+EOHTML; + } echo <<Log On Please

For access to the $c->system_name you should log on with diff --git a/inc/always.php b/inc/always.php index e349420c..2c920d39 100644 --- a/inc/always.php +++ b/inc/always.php @@ -14,36 +14,15 @@ $c->sysabbr = 'rscds'; $c->admin_email = 'andrew@catalyst.net.nz'; $c->system_name = "Really Simple CalDAV Store"; $c->domain_name = $_SERVER['SERVER_NAME']; +$c->images = "/images"; +$c->save_time_zone_defs = 1; // Kind of private configuration values $c->total_query_time = 0; -$c->dbg = array( 'core' => 1 ); - -if ( $debugging && isset($_GET['method']) ) { - $_SERVER['REQUEST_METHOD'] = $_GET['method']; -} - -/** -* Writes a debug message into the error log using printf syntax -* @package rscds -*/ -function dbg_error_log() { - global $c; - $argc = func_num_args(); - $args = func_get_args(); - $component = array_shift($args); - if ( !isset($c->dbg[strtolower($component)]) ) return; - - if ( 2 <= $argc ) { - $format = array_shift($args); - } - else { - $format = "%s"; - } - error_log( $c->sysabbr.": DBG: $component:". vsprintf( $format, $args ) ); -} +$c->dbg = array( ); +require_once("AWLUtilities.php"); dbg_error_log( "core", "==========> method =%s= =%s:%d= =%s= =%s=", $_SERVER['REQUEST_METHOD'], $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['SCRIPT_NAME'], $_SERVER['PATH_INFO']); @@ -58,45 +37,11 @@ else { exit; } -/** -* Attempt to connect to the configured connect strings -*/ -$dbconn = false; -foreach( $c->pg_connect AS $k => $v ) { - if ( !$dbconn ) $dbconn = pg_Connect($v); -} -if ( ! $dbconn ) { - echo <<Database Error -

Database Error

-

Could not connect to PGPool or to Postgres

- - -EOERRMSG; - exit; -} - /** * Force the domain name to what was in the configuration file */ $_SERVER['SERVER_NAME'] = $c->domain_name; - -if ( !function_exists('apache_request_headers') ) { - function apache_request_headers() { - return getallheaders(); - } -} - -function dbg_log_array( $component, $name, $arr, $recursive = false ) { - foreach ($arr as $key => $value) { - dbg_error_log( $component, "%s: >>%s<< = >>%s<<", $name, $key, $value); - if ( $recursive && (gettype($value) == 'array' || gettype($value) == 'object') ) { - dbg_log_array( $component, "$name"."[$key]", $value, $recursive ); - } - } -} - include_once("PgQuery.php"); ?> \ No newline at end of file diff --git a/inc/caldav-DELETE.php b/inc/caldav-DELETE.php index dcfaaff6..f8ad690d 100644 --- a/inc/caldav-DELETE.php +++ b/inc/caldav-DELETE.php @@ -7,9 +7,9 @@ dbg_error_log("delete", "DELETE method handler"); $get_path = $_SERVER['PATH_INFO']; $etag_none_match = str_replace('"','',$_SERVER["HTTP_IF_NONE_MATCH"]); -$qry = new PgQuery( "SELECT * FROM ics_event_data WHERE user_no = ? AND ics_event_name = ? AND ics_event_etag = ?;", $session->user_no, $get_path, $etag_none_match ); +$qry = new PgQuery( "SELECT * FROM vevent_data WHERE user_no = ? AND vevent_name = ? AND vevent_etag = ?;", $session->user_no, $get_path, $etag_none_match ); if ( $qry->Exec("caldav-DELETE") && $qry->rows == 1 ) { - $qry = new PgQuery( "DELETE FROM ics_event_data WHERE user_no = ? AND ics_event_name = ? AND ics_event_etag = ?;", $session->user_no, $get_path, $etag_none_match ); + $qry = new PgQuery( "DELETE FROM vevent_data WHERE user_no = ? AND vevent_name = ? AND vevent_etag = ?;", $session->user_no, $get_path, $etag_none_match ); if ( $qry->Exec("caldav-DELETE") ) { header("HTTP/1.1 200 OK"); dbg_error_log( "delete", "DELETE: User: %d, ETag: %s, Path: %s", $session->user_no, $etag_none_match, $get_path); diff --git a/inc/caldav-GET.php b/inc/caldav-GET.php index b75b9ce1..30c742a0 100644 --- a/inc/caldav-GET.php +++ b/inc/caldav-GET.php @@ -7,21 +7,27 @@ dbg_error_log("get", "GET method handler"); $get_path = $_SERVER['PATH_INFO']; $etag_none_match = str_replace('"','',$_SERVER["HTTP_IF_NONE_MATCH"]); -$qry = new PgQuery( "SELECT * FROM ics_event_data WHERE user_no = ? AND ics_event_name = ? ;", $session->user_no, $get_path); -if ( $qry->Exec("caldav-GET") && $qry->rows == 1 ) { +$qry = new PgQuery( "SELECT * FROM vevent_data WHERE user_no = ? AND vevent_name = ? ;", $session->user_no, $get_path); +dbg_error_log("get", "%s", $qry->querystring ); +if ( $qry->Exec("GET") && $qry->rows == 1 ) { $event = $qry->Fetch(); header("HTTP/1.1 200 OK"); - header("ETag: $event->ics_event_etag"); + header("ETag: $event->vevent_etag"); header("Content-Type: text/calendar"); - print $event->ics_raw_data; + print $event->vevent_data; - dbg_error_log( "GET", "User: %d, ETag: %s, Path: %s", $session->user_no, $event->ics_event_etag, $get_path); + dbg_error_log( "GET", "User: %d, ETag: %s, Path: %s", $session->user_no, $event->vevent_etag, $get_path); } +else if ( $qry->rows != 1 ) { + header("HTTP/1.1 500 Internal Server Error"); + dbg_error_log("ERROR", "Multiple rows match for User: %d, ETag: %s, Path: %s", $session->user_no, $event->vevent_etag, $get_path); +} else { header("HTTP/1.1 500 Infernal Server Error"); + dbg_error_log("get", "Infernal Server Error"); } ?> \ No newline at end of file diff --git a/inc/caldav-PUT.php b/inc/caldav-PUT.php index 9fcd8d68..254bce49 100644 --- a/inc/caldav-PUT.php +++ b/inc/caldav-PUT.php @@ -17,49 +17,74 @@ $etag_match = str_replace('"','',$_SERVER["HTTP_IF_MATCH"]); dbg_log_array( "PUT", 'HEADERS', $raw_headers ); dbg_log_array( "PUT", '_SERVER', $_SERVER, true ); -if ( $etag_match == '*' || $etag_match == '' ) { - $qry = new PgQuery( "INSERT INTO ics_event_data ( user_no, ics_event_name, ics_event_etag, ics_raw_data ) VALUES( ?, ?, ?, ?)", $session->user_no, $put_path, $etag, $raw_post); - $qry->Exec("caldav-PUT"); - - header("HTTP/1.1 201 Created"); - header("ETag: $etag"); -} -else { - $qry = new PgQuery( "UPDATE ics_event_data SET ics_raw_data=?, ics_event_etag=? WHERE user_no=? AND ics_event_name=? AND ics_event_etag=?", - $raw_post, $etag, $session->user_no, $put_path, $etag_match ); - $qry->Exec("caldav-PUT"); - - header("HTTP/1.1 201 Replaced"); - header("ETag: $etag"); -} - include_once("vEvent.php"); $ev = new vEvent(array( 'vevent' => $raw_post )); dbg_log_array( "PUT", 'EVENT', $ev, true ); -$sql = "SET TIMEZONE TO ".qpg($ev->tzlocn).";"; + +if ( $etag_match == '*' || $etag_match == '' ) { + /** + * If they didn't send an etag_match header, we need to check if the PUT object already exists + * and we are hence updating it. And we just set our etag_match to that. + */ + $qry = new PgQuery( "SELECT * FROM vevent_data WHERE user_no=? AND vevent_name=?", $session->user_no, $put_path ); + $qry->Exec("PUT"); + if ( $qry->rows > 1 ) { + header("HTTP/1.1 500 Infernal Server Error"); + dbg_error_log("ERROR","Multiple events match replaced path for user %d, path %s", $session->user_no, $put_path ); + exit(0); + } + elseif ( $qry->rows == 1 ) { + $event = $qry->Fetch(); + $etag_match = $event->vevent_etag; + } +} + +if ( $etag_match == '*' || $etag_match == '' ) { + /** + * If we got this far without an etag we must be inserting it. + */ + $qry = new PgQuery( "INSERT INTO vevent_data ( user_no, vevent_name, vevent_etag, vevent_data, logged_user ) VALUES( ?, ?, ?, ?, ?)", + $session->user_no, $put_path, $etag, $raw_post, $session->user_no ); + $qry->Exec("PUT"); + + header("HTTP/1.1 201 Created"); + header("ETag: $etag"); + dbg_error_log( "PUT", "INSERT INTO vevent_data ( user_no, vevent_name, vevent_etag, vevent_data, logged_user ) VALUES( %d, '%s', '%s', '%s', %d)", + $session->user_no, $put_path, $etag, $raw_post, $session->user_no ); +} +else { + $qry = new PgQuery( "UPDATE vevent_data SET vevent_data=?, vevent_etag=?, logged_user=? WHERE user_no=? AND vevent_name=? AND vevent_etag=?", + $raw_post, $etag, $session->user_no, $session->user_no, $put_path, $etag_match ); + $qry->Exec("PUT"); + + header("HTTP/1.1 201 Replaced"); + header("ETag: $etag"); +} + +$sql = "SET TIMEZONE TO ".qpg($ev->tz_locn).";"; if ( $etag_match == '*' || $etag_match == '' ) { $sql .= <<user_no, $put_path, $etag, $ev->Get('uid'), $ev->Get('dtstamp'), $ev->Get('dtstart'), $ev->Get('dtend'), $ev->Get('summary'), $ev->Get('location'), - $ev->Get('class'), $ev->Get('transp'), $ev->Get('description'), $ev->Get('rrule'), $ev->Get('tzid') ); - $qry->Exec("caldav-PUT"); + $ev->Get('class'), $ev->Get('transp'), $ev->Get('description'), $ev->Get('rrule'), $ev->Get('tz_id') ); + $qry->Exec("PUT"); } else { $sql = <<Get('uid'), $ev->Get('dtstamp'), $ev->Get('dtstart'), $ev->Get('dtend'), $ev->Get('summary'), $ev->Get('location'), $ev->Get('class'), $ev->Get('transp'), $ev->Get('description'), $ev->Get('rrule'), - $ev->Get('tzid'), $session->user_no, $put_path, $etag ); - $qry->Exec("caldav-PUT"); + $ev->Get('tz_id'), $session->user_no, $put_path, $etag ); + $qry->Exec("PUT"); } dbg_error_log( "PUT", "User: %d, ETag: %s, Path: %s", $session->user_no, $etag, $put_path); diff --git a/inc/caldav-REPORT.php b/inc/caldav-REPORT.php index b1b25a56..07b3ae53 100644 --- a/inc/caldav-REPORT.php +++ b/inc/caldav-REPORT.php @@ -2,16 +2,18 @@ dbg_error_log("REPORT", "method handler"); +$attributes = array(); $parser = xml_parser_create_ns('UTF-8'); xml_parser_set_option ( $parser, XML_OPTION_SKIP_WHITE, 1 ); function xml_start_callback( $parser, $el_name, $el_attrs ) { - dbg_error_log( "REPORT", "Parsing $el_name" ); +// dbg_error_log( "REPORT", "Parsing $el_name" ); dbg_log_array( "REPORT", "$el_name::attrs", $el_attrs, true ); + $attributes[$el_name] = $el_attrs; } function xml_end_callback( $parser, $el_name ) { - dbg_error_log( "REPORT", "Finished Parsing $el_name" ); +// dbg_error_log( "REPORT", "Finished Parsing $el_name" ); } xml_set_element_handler ( $parser, 'xml_start_callback', 'xml_end_callback' ); @@ -20,25 +22,68 @@ $rpt_request = array(); xml_parse_into_struct( $parser, $raw_post, $rpt_request ); xml_parser_free($parser); - $reportnum = -1; $report = array(); foreach( $rpt_request AS $k => $v ) { switch ( $v['tag'] ) { + case 'URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-DATA': + dbg_log_array( "REPORT", "CALENDAR-DATA", $v, true ); + if ( $v['type'] == "complete" ) { + $report[$reportnum]['include_data'] = 1; + } + break; + case 'URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-QUERY': + dbg_log_array( "REPORT", "CALENDAR-QUERY", $v, true ); if ( $v['type'] == "open" ) { $reportnum++; $report_type = substr($v['tag'],30); $report[$reportnum]['type'] = $report_type; + $report[$reportnum]['include_href'] = 1; + $report[$reportnum]['include_data'] = 1; } else { unset($report_type); } break; + case 'URN:IETF:PARAMS:XML:NS:CALDAV:TIME-RANGE': + dbg_log_array( "REPORT", "TIME-RANGE", $v, true ); + if ( isset($v['attributes']['START']) ) { + $report[$reportnum]['start'] = $v['attributes']['START']; + } + if ( isset($v['attributes']['END']) ) { + $report[$reportnum]['end'] = $v['attributes']['END']; + } + break; + + case 'URN:IETF:PARAMS:XML:NS:CALDAV:COMP-FILTER': + dbg_log_array( "REPORT", "COMP-FILTER", $v, true ); + if ( isset($v['attributes']['NAME']) && ($v['attributes']['NAME'] == 'VCALENDAR' )) { + $report[$reportnum]['calendar'] = 1; + } + if ( isset($v['attributes']['NAME']) ) { + if ( isset($report[$reportnum]['calendar']) && ($v['attributes']['NAME'] == 'VEVENT') ) { + $report[$reportnum]['calendar-event'] = 1; + } + if ( isset($report[$reportnum]['calendar']) && ($v['attributes']['NAME'] == 'VTODO') ) { + $report[$reportnum]['calendar-todo'] = 1; + } + if ( isset($report[$reportnum]['calendar']) && ($v['attributes']['NAME'] == 'VFREEBUSY') ) { + $report[$reportnum]['calendar-freebusy'] = 1; + } + } + break; + + case 'URN:IETF:PARAMS:XML:NS:CALDAV:FILTER': + dbg_error_log( "REPORT", "Not using %s information which follows...", $v['tag'] ); + dbg_log_array( "REPORT", "FILTER", $v, true ); + break; + case 'DAV::PROP': + dbg_log_array( "REPORT", "DAV::PROP", $v, true ); if ( isset($report_type) ) { if ( $v['type'] == "open" ) { $report_properties = array(); @@ -69,19 +114,33 @@ foreach( $rpt_request AS $k => $v ) { } } -// dbg_log_array( 'RPT', $rpt_request, true ); - -// dbg_log_array( 'REPORT', $report, true ); +if ( $unsupported_stuff ) { + header('HTTP/1.1 403 Forbidden'); + header('Content-Type: application/xml; charset="utf-8"'); + echo << + + + + + +EOXML; + exit(0); +} header("HTTP/1.1 207 Multi-Status"); header("Content-type: text/xml;charset=UTF-8"); +/** +* FIXME - this needs to be rewritten using XML libraries, in the same manner +* in which the REPORT request is parsed, in fact. For the time being we will +* attach importance to the care and feeding of Evolution, however. +*/ $response_tpl = << - http://%s:%d%s%s + %s - "%s" + "%s"%s HTTP/1.1 200 OK @@ -89,6 +148,17 @@ $response_tpl = <<http://%s:%d%s%s +CALDATATPL; + +$calendar_data_tpl = <<%s +CALDATATPL; + +dbg_log_array("REPORT", "report", $report, true ); echo << @@ -96,12 +166,38 @@ echo <<Exec() && $qry->rows > 0 ) { - while( $event = $qry->Fetch() ) { - printf( $response_tpl, $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['SCRIPT_NAME'], $event->ics_event_name, $event->ics_event_etag ); - dbg_error_log("REPORT", "ETag >>%s<< >>http://%s:%s%s%s<<", $event->ics_event_etag, - $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['SCRIPT_NAME'], $event->ics_event_name); + for ( $i=0; $i <= $reportnum; $i++ ) { + dbg_error_log("REPORT", "Report[%d] Start:%s, End: %s, Events: %d, Todos: %d, Freebusy: %d", + $i, $report[$i]['start'], $report[$i]['end'], $report[$i]['calendar-event'], $report[$i]['calendar-todo'], $report[$i]['calendar-freebusy']); + if ( isset($report[$i]['calendar-event']) ) { + if ( isset($report[$i]['include_href']) ) dbg_error_log( "REPORT", "Returning href event data" ); + if ( isset($report[$i]['include_data']) ) dbg_error_log( "REPORT", "Returning full event data" ); + $sql = "SELECT * FROM vevent_data NATURAL JOIN event "; + $where = ""; + if ( isset( $report[$i]['start'] ) ) { + $where = "WHERE dtend >= ".qpg($report[$i]['start'])."::timestamp with time zone "; + } + if ( isset( $report[$i]['end'] ) ) { + if ( $where != "" ) $where .= "AND "; + $where .= "dtstart <= ".qpg($report[$i]['end'])."::timestamp with time zone "; + } + $sql .= $where; + $qry = new PgQuery( $sql ); + if ( $qry->Exec() && $qry->rows > 0 ) { + while( $event = $qry->Fetch() ) { + $calhref = ( isset($report[$i]['include_href']) ? sprintf( $calendar_href_tpl, $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['SCRIPT_NAME'], $event->vevent_name ) : "" ); + $caldata = ( isset($report[$i]['include_data']) ? sprintf( $calendar_data_tpl, $event->vevent_data ) : "" ); + printf( $response_tpl, $calhref, $event->vevent_etag, $caldata ); + dbg_error_log("REPORT", "ETag >>%s<< >>http://%s:%s%s%s<<", $event->vevent_etag, + $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['SCRIPT_NAME'], $event->vevent_name); + } + } + } + if ( isset($report[$i]['calendar-todo']) ) { + if ( isset($report[$i]['include_data']) ) dbg_error_log( "REPORT", "FIXME: Not returning full todo data" ); + } + if ( isset($report[$i]['calendar-freebusy']) ) { + if ( isset($report[$i]['include_data']) ) dbg_error_log( "REPORT", "FIXME: Not returning full freebusy data" ); } } diff --git a/inc/interactive-page.php b/inc/interactive-page.php new file mode 100644 index 00000000..deebf19e --- /dev/null +++ b/inc/interactive-page.php @@ -0,0 +1,14 @@ +AddOption("Home","/","Browse all users", false, 3900 ); +$page_menu->AddOption("Help","/help.php","Help on something or other", false, 4500 ); +$page_menu->AddOption("Logout","/?logout","Log out of the $c->system_name", false, 5400 ); + +$relationship_menu = new MenuSet('submenu', 'submenu', 'submenu_active'); +$user_menu = new MenuSet('submenu', 'submenu', 'submenu_active'); +$role_menu = new MenuSet('submenu', 'submenu', 'submenu_active'); + +$active_menu_pattern = '#^/(index.*)?$#' +?> \ No newline at end of file diff --git a/inc/page-header.php b/inc/page-header.php index c7212b91..75f921a0 100644 --- a/inc/page-header.php +++ b/inc/page-header.php @@ -14,4 +14,11 @@ echo << EOHDR; +if ( isset($page_menu) && is_object($page_menu) ) { + $page_menu->AddSubMenu( $relationship_menu, "Relationships", "/relationships.php", "Browse all relationships", false, 4050 ); + $page_menu->AddSubMenu( $user_menu, "Users", "/users.php", "Browse all users", false, 4100 ); + $page_menu->AddSubMenu( $role_menu, "Roles", "/roles.php", "Browse all roles", false, 4300 ); + $page_menu->MakeSomethingActive($active_menu_pattern); + echo $page_menu->Render(); +} ?> \ No newline at end of file diff --git a/inc/rscds_configuration_missing.php b/inc/rscds_configuration_missing.php index c3ea6bef..c0c45c4f 100644 --- a/inc/rscds_configuration_missing.php +++ b/inc/rscds_configuration_missing.php @@ -2,7 +2,7 @@ include("page-header.php"); echo <<WRMS Not Configured +

RSCDS Not Configured

The Bad News

There is no configuration file present in /etc/rscds/$_SERVER[SERVER_NAME]-conf.php so your installation is not fully set up.

diff --git a/inc/session-util.php b/inc/session-util.php index fd246689..8ffae8e3 100644 --- a/inc/session-util.php +++ b/inc/session-util.php @@ -52,4 +52,35 @@ if ( !function_exists("session_validate_password") ) { } } + + +if ( !function_exists("replace_uri_params") ) { + /** + * Given a URL (presumably the current one) and a parameter, replace the value of parameter, + * extending the URL as necessary if the parameter is not already there. + * @param string $uri The URI we will be replacing parameters in. + * @param array $replacements An array of replacement pairs array( "replace_this" => "with this" ) + * @return string The URI with the replacements done. + */ + function replace_uri_params( $uri, $replacements ) { + $replaced = $uri; + foreach( $replacements AS $param => $new_value ) { + $rxp = preg_replace( '/([\[\]])/', '\\\\$1', $param ); // Some parameters may be arrays. + $regex = "/([&?])($rxp)=([^&]+)/"; + dbg_error_log("core", "Looking for [%s] to replace with [%s] regex is %s and searching [%s]", $param, $new_value, $regex, $replaced ); + if ( preg_match( $regex, $replaced ) ) + $replaced = preg_replace( $regex, "\$1$param=$new_value", $replaced); + else + $replaced .= "&$param=$new_value"; + } + if ( ! preg_match( '/\?/', $replaced ) ) { + $replaced = preg_replace("/&(.+)$/", "?\$1", $replaced); + } + $replaced = str_replace("&", "--AmPeRsAnD--", $replaced); + $replaced = str_replace("&", "&", $replaced); + $replaced = str_replace("--AmPeRsAnD--", "&", $replaced); + dbg_error_log("core", "URI <<$uri>> morphed to <<$replaced>>"); + return $replaced; + } +} ?> \ No newline at end of file diff --git a/inc/vEvent.php b/inc/vEvent.php index 5bef2221..1d949e33 100644 --- a/inc/vEvent.php +++ b/inc/vEvent.php @@ -28,15 +28,15 @@ class vEvent { /** * An array of arbitrary properties - * @var props array + * @var properties array */ var $properties; /** - * The typical name for the standard timezone - * @var tzname string + * The typical location name for the standard timezone such as "Pacific/Auckland" + * @var tz_locn string */ - var $tzname; + var $tz_locn; /**#@-*/ @@ -49,7 +49,7 @@ class vEvent { global $c; // Probably a good idea to always have values for these things... - $this->properties['tzid'] = $c->local_tzid; + $this->properties['tz_id'] = $c->local_tzid; $this->properties['modified'] = time(); $this->properties['sequence'] = 1; $this->properties['uid'] = sprintf( "%s@%s", time() * 1000 + rand(0,1000), $c->domain_name); @@ -106,19 +106,16 @@ class vEvent { if ( $state == 'BEGIN:VEVENT' && $state != $v ) { list( $parameter, $value ) = preg_split('/:/', $v ); if ( preg_match('/^DT[A-Z]+;TZID=/', $parameter) ) { - list( $parameter, $tzid ) = preg_split('/;/', $parameter ); - $properties['TZID'] = $tzid; + list( $parameter, $tz_id ) = preg_split('/;/', $parameter ); + $properties['TZID'] = $tz_id; } $properties[strtoupper($parameter)] = $value; } if ( $state == 'BEGIN:VTIMEZONE' ) { $vtimezone .= $v . "\n"; list( $parameter, $value ) = preg_split('/:/', $v ); - if ( !isset($this->tzname) && $parameter == 'TZNAME' ) { - $this->tzname = $value; - } - if ( !isset($this->tzlocn) && $parameter == 'X-LIC-LOCATION' ) { - $this->tzlocn = $value; + if ( !isset($this->tz_locn) && $parameter == 'X-LIC-LOCATION' ) { + $this->tz_locn = $value; } } } @@ -136,19 +133,18 @@ class vEvent { * them into something that PostgreSQL can understand... */ function DealWithTimeZones() { - $qry = new PgQuery( "SELECT pgtz, location FROM time_zones WHERE tzid = ?;", $this->properties['TZID'] ); + $qry = new PgQuery( "SELECT tz_locn FROM time_zone WHERE tz_id = ?;", $this->properties['TZID'] ); if ( $qry->Exec('vEvent') && $qry->rows == 1 ) { $row = $qry->Fetch(); - $this->tzname = $row->pgtz; - $this->tzlocn = $row->location; + $this->tz_locn = $row->tz_locn; } else { - if ( !isset($this->tzlocn) ) { + if ( !isset($this->tz_locn) ) { // In case there was no X-LIC-LOCATION defined, let's hope there is something in the TZID - $this->tzlocn = preg_replace('/^.*([a-z]+\/[a-z]+)$/i','$1',$this->properties['TZID'] ); + $this->tz_locn = preg_replace('/^.*([a-z]+\/[a-z]+)$/i','$1',$this->properties['TZID'] ); } - $qry2 = new PgQuery( "INSERT INTO time_zones (tzid, location, tz_spec, pgtz) VALUES( ?, ?, ?, ? );", - $this->properties['TZID'], $this->tzlocn, $this->properties['VTIMEZONE'], $this->tzname ); + $qry2 = new PgQuery( "INSERT INTO time_zone (tz_id, tz_locn, tz_spec) VALUES( ?, ?, ? );", + $this->properties['TZID'], $this->tz_locn, $this->properties['VTIMEZONE'] ); $qry2->Exec("vEvent"); } } diff --git a/rscds.webprj b/rscds.webprj index be5a119a..0279d1a0 100644 --- a/rscds.webprj +++ b/rscds.webprj @@ -34,8 +34,12 @@ - - - + + + + + + +