diff --git a/.gitignore b/.gitignore index 38434378..5b9242fd 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ testing/tests/*/initial.dbdump testing/*-dumps testing/*.ics *.swp +davical.spec +docs/translation.pdf diff --git a/ChangeLog b/ChangeLog index 86a14435..16e9fe59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,137 @@ +2011-09-10 Andrew McMillan + * Write schedule resources to attendee calendars and inboxes on PUT. + +2011-09-09 Andrew McMillan + * Add test of error response for a REPORT which is not supported. + * Add support for the CalDAV:schedule-default-calendar-URL property. + +2011-09-08 Andrew McMillan + * Rename caldav-PUT.php to reflect it's calendaring association. + * Decruftify, and allow the squid pam to use 'path' instead of 'script' in it's config. + * Fix PROPPATCH behaviour on bound resources. + +2011-09-07 Andrew McMillan + * Correct handling of PUT with unreferenced VTIMEZONE + +2011-08-29 Andrew McMillan + * Restore default relationships, which still have utility in complex environments. + +2011-08-28 Andrew McMillan + * Workaround MacOS X 10.6 Addressbook cannot login to CardDav with '@' in username + +2011-08-26 Andrew McMillan + * Only include override components if they happen within the period. + * Change to depend on postgresql-client >= 8.1 and AWL = 0.47-1 + +2011-06-28 Rob Ostensen + * Add support for remote url BINDing + +2011-08-25 Andrew McMillan + * PROPPATCH is allowed on binds. + * Make locale handling use stuff pulled from transifex.net + * Add Brazilian Portuguese and Mexican Spanish. + +2011-08-24 Andrew McMillan + * Test results including calendar-auto-schedule header as default. + * Fix calendar-query handling of properties. + +2011-08-23 Andrew McMillan + * Fix XML output of block. + * Handle following & a single-ended time filter. + +2011-06-01 Andrew McMillan + * Allow the calendar-query expansion to return all events in floating time. + +2011-05-22 Andrew McMillan + * Setup test should recognise "Off" as well as "0" + +2011-05-18 Andrew McMillan + * Add first cut implementation of principal-match report. + +2011-05-13 Andrew McMillan + * When sync-collection is asked for data, only return it if < 50 rows. + +2011-04-03 Andrew McMillan + * Ensure dav_id_seq is initialized to a non-colliding value. + * Add support for Digest authentication. + +2011-04-01 Andrew McMillan + * When an import event has no UID we reluctantly assign one. + +2011-03-13 Andrew McMillan + * A more complete fix for weird passwords with LDAP. + * Apparently an attempt to bind with an empty password will return TRUE! + +2011-03-03 Felix Möller + * Add explaination for translators. + +2011-03-03 Andrew McMillan + * Fix bug in schedule status response where there is no authority. + +2011-02-27 Felix Möller + * Sync german translation with Transifex. + +2011-02-23 Andrew McMillan + * Fix sort order of members listed in a group. + * Add support for locking with memcached during delete to avoid deadlocks. + +2011-02-22 Andrew McMillan + * Force line endings to consistent CRLF in GET. + +2011-02-22 Felix Möller + * Producing tarballs now which can be build by rpmbuild -ta davical.tar.gz + +2011-02-22 Andrew McMillan + * Check for LDAP module, but only if LDAP is configured. + +2011-02-21 Felix Möller + * add automatic building of translation documentation + * Remove obsoleted strings from translation + * Adding documentation for translators + +2011-02-21 Andrew McMillan + * Move from extract.pl to standard xgettext + +2011-01-22 Felix Möller + * Removing the last traces of RSCDS and renaming it to DAViCal. + +2011-02-21 Andrew McMillan + * Build AWL desired version string as quoted value. + +2011-02-20 Andrew McMillan + * Correct error message for unsupported report request. + +2011-01-21 Andrew McMillan + * Ensure resources are always returned with CRLF rather than just LF. + +2011-01-18 Andrew McMillan + * Skip alarms with bogus trigger data. + +2011-01-15 Andrew McMillan + * Block invalid tickets from having access. + +2011-01-14 Andrew McMillan + * Add norwegian and estonian translation files. + +2011-01-12 Andrew McMillan + * Validate alarm date-time or duration before adding it to the DB. + +2011-01-04 Andrew McMillan + * Finally give up on the SQL rrule pre-processing. + * Move debug logged password behind specific 'password' debug setting. + * Obfuscate event data when reader only has read-free-busy permission. + +2011-01-03 Andrew McMillan + * List all of a user's calendar homes + * Extend default_privileges to members of a group. + +2010-12-31 Andrew McMillan + * Add support for caching of feed, and uncaching on collection change. + +2010-12-30 Andrew McMillan + * Let auth realm be 'per Principal' to work around Mozilla #247486 + * IMAP PAM authentication from Oliver Schulze + 2010-12-28 Andrew McMillan * Release 0.9.9.4 diff --git a/Makefile b/Makefile index 09017ec9..ba4292a6 100755 --- a/Makefile +++ b/Makefile @@ -10,6 +10,8 @@ snapshot : gitrev = $(shell git rev-parse --short HEAD) snapshot : version = $(majorversion)-git$(gitrev) snapshot : issnapshot = 1 +nodocs: htdocs/always.php built-po + all: htdocs/always.php built-docs built-po built-docs: docs/api/phpdoc.ini htdocs/*.php inc/*.php docs/translation.rst @@ -48,8 +50,8 @@ snapshot: release clean: rm -f built-docs built-po -find . -name "*~" -delete - rm docs/translation.pdf - rm davical.spec + -rm docs/translation.pdf + -rm davical.spec clean-all: clean -find docs/api/* ! -name "phpdoc.ini" ! -name ".gitignore" -delete diff --git a/VERSION b/VERSION index 40947dc4..b2c002a3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.9.4 +0.9.9.5 diff --git a/dba/caldav_functions.sql b/dba/caldav_functions.sql index bcddb973..bfb71aa4 100644 --- a/dba/caldav_functions.sql +++ b/dba/caldav_functions.sql @@ -1253,3 +1253,29 @@ END; $$ LANGUAGE plpgsql; CREATE TRIGGER alarm_changed AFTER UPDATE ON calendar_alarm FOR EACH ROW EXECUTE PROCEDURE alarm_changed(); + +CREATE or REPLACE FUNCTION real_path_exists( TEXT ) RETURNS BOOLEAN AS $$ +DECLARE + in_path ALIAS FOR $1; + tmp BOOLEAN; +BEGIN + IF in_path = '/' THEN + RETURN TRUE; + END IF; + IF in_path ~ '^/[^/]+/$' THEN + SELECT TRUE INTO tmp FROM usr WHERE username = substring( in_path from 2 for length(in_path) - 2); + IF FOUND THEN + RETURN TRUE; + END IF; + ELSE + IF in_path ~ '^/.*/$' THEN + SELECT TRUE INTO tmp FROM collection WHERE dav_name = in_path; + IF FOUND THEN + RETURN TRUE; + END IF; + END IF; + END IF; + RETURN FALSE; +END; +$$ LANGUAGE plpgsql ; + \ No newline at end of file diff --git a/dba/davical.sql b/dba/davical.sql index e6fe276b..105e09a6 100644 --- a/dba/davical.sql +++ b/dba/davical.sql @@ -100,6 +100,7 @@ CREATE TABLE collection ( UNIQUE(user_no,dav_name) ); +ALTER TABLE collection ADD CONSTRAINT unique_path UNIQUE (dav_name); -- The main event. Where we store the things the calendar throws at us. CREATE TABLE caldav_data ( @@ -147,7 +148,9 @@ CREATE TABLE calendar_item ( completed TIMESTAMP WITH TIME ZONE, dav_id INT8 UNIQUE, collection_id INT8 REFERENCES collection(collection_id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE, - + first_instance_start TIMESTAMP WITHOUT TIME ZONE DEFAULT NULL, + last_instance_end TIMESTAMP WITHOUT TIME ZONE DEFAULT NULL, + -- Cascade updates / deletes from the caldav_data table CONSTRAINT caldav_exists FOREIGN KEY ( user_no, dav_name ) REFERENCES caldav_data ( user_no, dav_name ) @@ -264,6 +267,7 @@ CREATE TABLE principal ( default_privileges BIT(24) ); +ALTER TABLE principal ADD CONSTRAINT unique_user UNIQUE (user_no); -- Allowing identification of group members. @@ -322,8 +326,8 @@ CREATE TABLE dav_binding ( parent_container TEXT NOT NULL, dav_name TEXT UNIQUE NOT NULL, dav_displayname TEXT, - external_url TEXT, - type TEXT + external_url TEXT, + type TEXT ); @@ -395,4 +399,33 @@ CREATE TABLE calendar_attendee ( PRIMARY KEY ( dav_id, attendee ) ); -SELECT new_db_revision(1,2,9, 'Septembre' ); + +CREATE or REPLACE FUNCTION real_path_exists( TEXT ) RETURNS BOOLEAN AS $$ +DECLARE + in_path ALIAS FOR $1; + tmp BOOLEAN; +BEGIN + IF in_path = '/' THEN + RETURN TRUE; + END IF; + IF in_path ~ '^/[^/]+/$' THEN + SELECT TRUE INTO tmp FROM usr WHERE username = substring( in_path from 2 for length(in_path) - 2); + IF FOUND THEN + RETURN TRUE; + END IF; + ELSE + IF in_path ~ '^/.*/$' THEN + SELECT TRUE INTO tmp FROM collection WHERE dav_name = in_path; + IF FOUND THEN + RETURN TRUE; + END IF; + END IF; + END IF; + RETURN FALSE; +END; +$$ LANGUAGE plpgsql ; + +ALTER TABLE dav_binding ADD CONSTRAINT "dav_name_does_not_exist" + CHECK (NOT real_path_exists(dav_name)); + +SELECT new_db_revision(1,2,10, 'Octobre' ); diff --git a/dba/windows/awl-tables.sql b/dba/windows/awl-tables.sql deleted file mode 100644 index ebdb51cc..00000000 --- a/dba/windows/awl-tables.sql +++ /dev/null @@ -1,96 +0,0 @@ --- Tables needed for AWL Libraries - -BEGIN; - -CREATE TABLE supported_locales ( - locale TEXT PRIMARY KEY, - locale_name_en TEXT, - locale_name_locale TEXT -); - --- This is the table of users for the system -CREATE TABLE usr ( - user_no SERIAL PRIMARY KEY, - active BOOLEAN DEFAULT TRUE, - email_ok TIMESTAMPTZ, - joined TIMESTAMPTZ DEFAULT current_timestamp, - updated TIMESTAMPTZ, - last_used TIMESTAMPTZ, - username TEXT NOT NULL, -- Note UNIQUE INDEX below constains case-insensitive uniqueness - password TEXT, - fullname TEXT, - email TEXT, - config_data TEXT, - date_format_type TEXT DEFAULT 'E', -- default to english date format dd/mm/yyyy - locale TEXT -); -CREATE FUNCTION max_usr() RETURNS INT4 AS 'SELECT max(user_no) FROM usr' LANGUAGE 'sql'; -CREATE UNIQUE INDEX usr_sk1_unique_username ON usr ( lower(username) ); - -CREATE TABLE usr_setting ( - user_no INT4 REFERENCES usr ( user_no ), - setting_name TEXT, - setting_value TEXT, - PRIMARY KEY ( user_no, setting_name ) -); - -CREATE FUNCTION get_usr_setting(INT4,TEXT) - RETURNS TEXT - AS 'SELECT setting_value FROM usr_setting - WHERE usr_setting.user_no = $1 - AND usr_setting.setting_name = $2 ' LANGUAGE 'sql'; - -CREATE TABLE roles ( - role_no SERIAL PRIMARY KEY, - role_name TEXT -); -CREATE FUNCTION max_roles() RETURNS INT4 AS 'SELECT max(role_no) FROM roles' LANGUAGE 'sql'; - - -CREATE TABLE role_member ( - role_no INT4 REFERENCES roles ( role_no ), - user_no INT4 REFERENCES usr ( user_no ) -); - - -CREATE TABLE session ( - session_id SERIAL PRIMARY KEY, - user_no INT4 REFERENCES usr ( user_no ), - session_start TIMESTAMPTZ DEFAULT current_timestamp, - session_end TIMESTAMPTZ DEFAULT current_timestamp, - session_key TEXT, - session_config TEXT -); -CREATE FUNCTION max_session() RETURNS INT4 AS 'SELECT max(session_id) FROM session' LANGUAGE 'sql'; - -CREATE TABLE tmp_password ( - user_no INT4 REFERENCES usr ( user_no ), - password TEXT, - valid_until TIMESTAMPTZ DEFAULT (current_timestamp + '1 day'::interval) -); -COMMIT; - -BEGIN; -GRANT SELECT,INSERT,UPDATE ON - usr - , usr_setting - , roles - , role_member - , session - , tmp_password - TO general; -GRANT SELECT,UPDATE ON - usr_user_no_seq - , session_session_id_seq - TO general; - -GRANT SELECT ON - supported_locales - TO general; - -GRANT DELETE ON - tmp_password - , role_member - TO general; - -COMMIT; \ No newline at end of file diff --git a/dba/windows/rscds.sql b/dba/windows/rscds.sql deleted file mode 100644 index 7f1afa6d..00000000 --- a/dba/windows/rscds.sql +++ /dev/null @@ -1,135 +0,0 @@ --- Really Simple CalDAV Store - Database Schema --- - --- Use the usr, group and schema management stufffrom libawl-php -\i awl-tables.sql -\i schema-management.sql - --- The main event. Where we store the things the calendar throws at us. -CREATE TABLE caldav_data ( - user_no INT references usr(user_no), - dav_name TEXT, - dav_etag TEXT, - created TIMESTAMP WITH TIME ZONE, - modified TIMESTAMP WITH TIME ZONE, - caldav_data TEXT, - caldav_type TEXT, - logged_user INT references usr(user_no), - - PRIMARY KEY ( user_no, dav_name ) -); - -GRANT SELECT,INSERT,UPDATE,DELETE ON caldav_data TO general; - --- 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_zone TO general; - --- The parsed calendar item. Here we have pulled those events/todos/journals apart somewhat. -CREATE TABLE calendar_item ( - user_no INT references usr(user_no), - dav_name TEXT, - dav_etag TEXT, - - -- Extracted vEvent/vTodo data - uid TEXT, - created TIMESTAMP, - last_modified TIMESTAMP, - dtstamp TIMESTAMP, - dtstart TIMESTAMP WITH TIME ZONE, - dtend TIMESTAMP WITH TIME ZONE, - due TIMESTAMP WITH TIME ZONE, - summary TEXT, - location TEXT, - description TEXT, - priority INT, - class TEXT, - transp TEXT, - rrule TEXT, - url TEXT, - percent_complete NUMERIC(7,2), - tz_id TEXT REFERENCES time_zone( tz_id ), - status TEXT, - - -- Cascade updates / deletes from the caldav_data table - CONSTRAINT caldav_exists FOREIGN KEY ( user_no, dav_name ) - REFERENCES caldav_data ( user_no, dav_name ) - MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE -); - -GRANT SELECT,INSERT,UPDATE,DELETE ON calendar_item TO general; - - --- Something that can look like a filesystem hierarchy where we store stuff -CREATE TABLE collection ( - user_no INT references usr(user_no), - parent_container TEXT, - dav_name TEXT, - dav_etag TEXT, - dav_displayname TEXT, - is_calendar BOOLEAN, - created TIMESTAMP WITH TIME ZONE, - modified TIMESTAMP WITH TIME ZONE, - - PRIMARY KEY ( user_no, dav_name ) -); - -GRANT SELECT,INSERT,UPDATE,DELETE ON collection 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_togroup BOOLEAN, - confers TEXT DEFAULT 'RW', - rt_fromgroup BOOLEAN -); - -GRANT SELECT,INSERT,UPDATE,DELETE ON relationship_type TO general; -GRANT SELECT,UPDATE ON relationship_type_rt_id_seq 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, - - PRIMARY KEY ( from_user, to_user, rt_id ) -); - -GRANT SELECT,INSERT,UPDATE,DELETE ON relationship TO general; - - -CREATE TABLE locks ( - dav_name TEXT, - opaquelocktoken TEXT UNIQUE NOT NULL, - type TEXT, - scope TEXT, - depth INT, - owner TEXT, - timeout INTERVAL, - start TIMESTAMP DEFAULT current_timestamp -); - -CREATE INDEX locks_dav_name_idx ON locks(dav_name); -GRANT SELECT,INSERT,UPDATE,DELETE ON locks TO general; - -CREATE TABLE property ( - dav_name TEXT, - property_name TEXT, - property_value TEXT, - changed_on TIMESTAMP DEFAULT current_timestamp, - changed_by INT REFERENCES usr ( user_no ), - PRIMARY KEY ( dav_name, property_name ) -); - -CREATE INDEX properties_dav_name_idx ON property(dav_name); -GRANT SELECT,INSERT,UPDATE,DELETE ON property TO general; - - -SELECT new_db_revision(1,1,7, 'July' ); diff --git a/dba/windows/schema-management.sql b/dba/windows/schema-management.sql deleted file mode 100644 index f18495d5..00000000 --- a/dba/windows/schema-management.sql +++ /dev/null @@ -1,59 +0,0 @@ --- SQL file for AWL tables - --- Table for holding the schema version so we can be more structured in future -CREATE TABLE awl_db_revision ( - schema_id INT4, - schema_major INT4, - schema_minor INT4, - schema_patch INT4, - schema_name TEXT, - applied_on TIMESTAMP WITH TIME ZONE DEFAULT current_timestamp -); -GRANT SELECT ON awl_db_revision TO general; - -CREATE or REPLACE FUNCTION check_db_revision( INT, INT, INT ) RETURNS BOOLEAN AS ' - DECLARE - major ALIAS FOR $1; - minor ALIAS FOR $2; - patch ALIAS FOR $3; - matching INT; - BEGIN - SELECT COUNT(*) INTO matching FROM awl_db_revision - WHERE schema_major = major AND schema_minor = minor AND schema_patch = patch; - IF matching != 1 THEN - RAISE EXCEPTION ''Database has not been upgraded to %.%.%'', major, minor, patch; - RETURN FALSE; - END IF; - SELECT COUNT(*) INTO matching FROM awl_db_revision - WHERE (schema_major = major AND schema_minor = minor AND schema_patch > patch) - OR (schema_major = major AND schema_minor > minor) - OR (schema_major > major) - ; - IF matching >= 1 THEN - RAISE EXCEPTION ''Database revisions after %.%.% have already been applied.'', major, minor, patch; - RETURN FALSE; - END IF; - RETURN TRUE; - END; -' LANGUAGE 'plpgsql'; - --- The schema_id should always be incremented. The major / minor / patch level should --- be incremented as seems appropriate... -CREATE or REPLACE FUNCTION new_db_revision( INT, INT, INT, TEXT ) RETURNS BOOLEAN AS ' - DECLARE - major ALIAS FOR $1; - minor ALIAS FOR $2; - patch ALIAS FOR $3; - blurb ALIAS FOR $4; - new_id INT; - BEGIN - SELECT MAX(schema_id) + 1 INTO new_id FROM awl_db_revision; - IF NOT FOUND OR new_id IS NULL THEN - new_id := 1; - END IF; - INSERT INTO awl_db_revision (schema_id, schema_major, schema_minor, schema_patch, schema_name) - VALUES( new_id, major, minor, patch, blurb ); - RETURN TRUE; - END; -' LANGUAGE 'plpgsql'; -SELECT new_db_revision(1,1,0, 'Dawn' ); diff --git a/debian/changelog b/debian/changelog index 61c68099..465f30a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +davical (0.9.9.5-1) unstable; urgency=low + + * New upstream release (closes:#610612, #639262) + + -- Andrew McMillan Mon, 12 Sep 2011 19:56:54 +1200 + davical (0.9.9.4-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 627ab46a..b84ac4e6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: web Priority: extra Maintainer: Andrew McMillan Standards-Version: 3.9.1 -Build-Depends: debhelper (>= 7), libawl-php +Build-Depends: debhelper (>= 7), libawl-php, gettext Vcs-git: git://repo.or.cz/davical.git Vcs-browser: http://repo.or.cz/w/davical.git Homepage: http://davical.org/ diff --git a/docs/api/awl/caldav/CalDAVClient.html b/docs/api/awl/caldav/CalDAVClient.html index c9318d27..253a4732 100644 --- a/docs/api/awl/caldav/CalDAVClient.html +++ b/docs/api/awl/caldav/CalDAVClient.html @@ -1270,7 +1270,7 @@

- Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3 + Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/awl/caldav/CalendarInfo.html b/docs/api/awl/caldav/CalendarInfo.html index 342cd393..802d5bb6 100644 --- a/docs/api/awl/caldav/CalendarInfo.html +++ b/docs/api/awl/caldav/CalendarInfo.html @@ -251,7 +251,7 @@

- Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3 + Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/awl/caldav/RRule.html b/docs/api/awl/caldav/RRule.html index 8c4be35f..e1e8a673 100644 --- a/docs/api/awl/caldav/RRule.html +++ b/docs/api/awl/caldav/RRule.html @@ -170,7 +170,7 @@

- Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3 + Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/awl/caldav/RepeatRule.html b/docs/api/awl/caldav/RepeatRule.html index bba78e8f..011cb133 100644 --- a/docs/api/awl/caldav/RepeatRule.html +++ b/docs/api/awl/caldav/RepeatRule.html @@ -24,8 +24,12 @@
+

This class is an implementation of RRULE parsing and expansion, as per RFC5545. It should be reasonably complete, except that it does not handle changing the WKST - there may be a few errors in unusual rules also, but all of the common cases should be handled correctly.

+

- Located in /inc/RRule-v2.php (line 310) + Located in /inc/RRule-v2.php (line 494)

@@ -52,29 +56,35 @@ date_mask ( $date,  $y,  $mo,  $d,  $h,  $mi,  $s)
-
+
+ + static void + rrule_day_number + ( $day) +
+
RepeatRule __construct - ( $basedate,  $rrule) + ( $basedate,  $rrule, [ $is_date = null], [ $return_floating_times = false])
void current - () + ([ $return_floating_times = false])
void key - () + ([ $return_floating_times = false])
void next - () + ([ $return_floating_times = false])
@@ -82,7 +92,7 @@ rewind ()
-
+
void set_timezone @@ -92,7 +102,7 @@ void Start - () + ([ $return_floating_times = false])
@@ -120,7 +130,7 @@
- static date_mask (line 469) + static date_mask (line 711)
@@ -162,12 +172,41 @@
- +
+
+ + static rrule_day_number (line 697) +
+ + +
    +
  • access: public
    • +
+ +
+ void + + rrule_day_number + + ( $day) +
+ +
    +
  • + + $day
    • +
+ + +
+ +
+
- Constructor __construct (line 334) + Constructor __construct (line 519)
@@ -180,7 +219,7 @@ __construct - ( $basedate,  $rrule) + ( $basedate,  $rrule, [ $is_date = null], [ $return_floating_times = false])
    @@ -190,16 +229,22 @@
  • $rrule
    • +
  • + + $is_date
    • +
  • + + $return_floating_times
-
+
- current (line 401) + current (line 592)
@@ -212,18 +257,23 @@ current - () + ([ $return_floating_times = false])
+
    +
  • + + $return_floating_times
    • +
-
+
- key (line 410) + key (line 602)
@@ -236,18 +286,23 @@ key - () + ([ $return_floating_times = false])
+
    +
  • + + $return_floating_times
    • +
-
+
- next (line 395) + next (line 586)
@@ -260,18 +315,23 @@ next - () + ([ $return_floating_times = false])
+
    +
  • + + $return_floating_times
    • +
-
+
- rewind (line 390) + rewind (line 581)
@@ -291,11 +351,11 @@
-
+
- set_timezone (line 377) + set_timezone (line 568)
@@ -320,11 +380,11 @@
-
+
- Start (line 382) + Start (line 573)
@@ -337,18 +397,23 @@ Start - () + ([ $return_floating_times = false])
+
    +
  • + + $return_floating_times
    • +
-
+
- valid (line 420) + valid (line 612)
@@ -373,7 +438,7 @@

- Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3 + Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/awl/caldav/RepeatRuleDateTime.html b/docs/api/awl/caldav/RepeatRuleDateTime.html index b67b8b68..19ddf736 100644 --- a/docs/api/awl/caldav/RepeatRuleDateTime.html +++ b/docs/api/awl/caldav/RepeatRuleDateTime.html @@ -29,7 +29,7 @@

Wrap the DateTime class to make it friendlier to passing in random strings from iCalendar objects, and especially the random stuff used to identify timezones. We also add some utility methods and stuff too, in order to simplify some of the operations we need to do with dates.

- Located in /inc/RRule-v2.php (line 80) + Located in /inc/RRule-v2.php (line 204)

@@ -79,11 +79,11 @@
-
+
RepeatRuleDateTime __construct - ([ $date = null], [ $dtz = null]) + ([ $date = null], [ $dtz = null], [ $is_date = null])
@@ -107,6 +107,12 @@ void FloatOrUTC + ([ $return_floating_times = false]) +
+
+ + void + getTimeZone ()
@@ -149,13 +155,7 @@ void RFC5545 - () -
-
- - void - RFC5545Duration - ( $end_stamp) + ([ $return_floating_times = false])
@@ -164,6 +164,18 @@ ()
+ + void + setAsDate + () +
+
+ + void + setAsFloat + () +
+
void setDate @@ -176,6 +188,12 @@ ( $tz)
+ + void + setYearDay + ( $yearday) +
+
void UTC @@ -213,14 +231,14 @@
-
+
static mixed $Format - = 'c' (line 82) + = 'c' (line 206)
@@ -251,11 +269,11 @@
-
+
- Constructor __construct (line 87) + Constructor __construct (line 211)
@@ -268,7 +286,7 @@ __construct - ([ $date = null], [ $dtz = null]) + ([ $date = null], [ $dtz = null], [ $is_date = null])
    @@ -278,6 +296,9 @@
  • $dtz
    • +
  • + + $is_date
@@ -288,11 +309,11 @@
-
+
- AsDate (line 180) + AsDate (line 308)
@@ -312,11 +333,11 @@
-
+
- day (line 288) + day (line 465)
@@ -333,11 +354,11 @@
-
+
- epoch (line 304) + epoch (line 481)
@@ -354,11 +375,43 @@
+
+ +
+ + FloatOrUTC (line 385) +
+ + +

If this is a localised time then this will return the UTC equivalent. If it is a floating time, then you will just get the floating time. If it is a date then it will be returned as a date. Note that if it is a *localised* date then the answer will still be the UTC equivalent but only the date itself will be returned.

+

If return_floating_times is true then all dates will be returned as floating times and UTC will not be returned.

+ + +
+ void + + FloatOrUTC + + ([ $return_floating_times = false]) +
+ +
    +
  • + + $return_floating_times
    • +
+ + +
+
- FloatOrUTC (line 225) + getTimeZone (line 429)
@@ -369,12 +422,17 @@
void - FloatOrUTC + getTimeZone ()
+
+
Redefinition of:
+
+
DateTime::getTimezone ( )
+
@@ -382,7 +440,7 @@
- hour (line 292) + hour (line 469)
@@ -403,7 +461,7 @@
- isDate (line 189) + isDate (line 322)
@@ -427,7 +485,7 @@
- isFloating (line 185) + isFloating (line 318)
@@ -451,7 +509,7 @@
- minute (line 296) + minute (line 473)
@@ -472,7 +530,7 @@
- modify (line 194) + modify (line 332)
@@ -506,7 +564,7 @@
- month (line 284) + month (line 461)
@@ -527,10 +585,11 @@
- RFC5545 (line 239) + RFC5545 (line 401)
+

Returns the string following a property name for an RFC5545 DATE-TIME value.

  • access: public
@@ -540,47 +599,23 @@ RFC5545 - () -
- - - -
- -
- -
- - RFC5545Duration (line 257) -
- - -
    -
  • access: public
    • -
- -
- void - - RFC5545Duration - - ( $end_stamp) + ([ $return_floating_times = false])
  • - $end_stamp
    • + $return_floating_times
-
+
- second (line 300) + second (line 477)
@@ -596,12 +631,60 @@
- + +
+ +
+ + setAsDate (line 327) +
+ + +
    +
  • access: public
    • +
+ +
+ void + + setAsDate + + () +
+ + + +
+
- setDate (line 272) + setAsFloat (line 313) +
+ + +
    +
  • access: public
    • +
+ +
+ void + + setAsFloat + + () +
+ + + +
+ +
+ +
+ + setDate (line 434)
@@ -634,11 +717,11 @@
-
+
- setTimeZone (line 262) + setTimeZone (line 419)
@@ -666,17 +749,45 @@
DateTime::setTimezone ( $timezone )
+
+ +
+ +
+ + setYearDay (line 442) +
+ + + +
+ void + + setYearDay + + ( $yearday) +
+ +
    +
  • + + $yearday
    • +
+ +
- UTC (line 213) + UTC (line 358)
+

Always returns a time localised to UTC. Even floating times are converted to UTC using the server's currently configured PHP timezone. Even dates will include a time, which will be non-zero if they were localised dates.

@@ -696,7 +807,7 @@
- year (line 280) + year (line 457)
@@ -717,7 +828,7 @@
- __toString (line 175) + __toString (line 303)
@@ -850,7 +961,7 @@

- Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3 + Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/awl/caldav/RepeatRuleTimeZone.html b/docs/api/awl/caldav/RepeatRuleTimeZone.html index feac7618..36983745 100644 --- a/docs/api/awl/caldav/RepeatRuleTimeZone.html +++ b/docs/api/awl/caldav/RepeatRuleTimeZone.html @@ -238,7 +238,7 @@

- Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3 + Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/awl/caldav/Rfc5545Duration.html b/docs/api/awl/caldav/Rfc5545Duration.html new file mode 100644 index 00000000..9e4b5b8b --- /dev/null +++ b/docs/api/awl/caldav/Rfc5545Duration.html @@ -0,0 +1,240 @@ + + + + + + Docs For Class Rfc5545Duration + + + + +
+

Class Rfc5545Duration

+ + +
+
Description
+
+ Description | + Methods (details) + +
+
+ +

Provide a useful way of dealing with RFC5545 duration strings of the form

+

^-?P(\dW)|((\dD)?(T(\dH)?(\dM)?(\dS)?)?)$

+

+ Located in /inc/RRule-v2.php (line 77) +

+ + + 

+	
+			

+

+
+
+
+
+	
+	

+		
Method Summary

+		

+			Description |
+												Methods (details)
+		

+		
			
+			

+																																				

+					 
+											static Rfc5545Duration
+										fromTwoDates
+											(RepeatRuleDateTime $d1, RepeatRuleDateTime $d2)
+									

+																												

+					 
+											Rfc5545Duration
+										__construct
+											(mixed $in_duration)
+									

+																

+					 
+											void
+										asSeconds
+										()
+									

+																

+					 
+											boolean
+										equals
+											(Rfc5545Duration $other)
+									

+																								

+					 
+											string
+										__toString
+										()
+									

+											

+		

+	
		
+
+	
+	
+	

+		
Methods

+		

+			Description |
+													Methods (details)
+						
+		

+		

+			
+
+

+	
+	

+		
+		static fromTwoDates (line 192)
+	
 
+	
+	
+
Factory method to return an Rfc5545Duration object from the difference  between two dates.

+
This is flawed, at present: we should really localise both dates and work  out the difference in days, then localise the times and work out the difference  between the clock times.  On the other hand we're replacing a quick and dirty  hack that did it exactly the same way in the past, so we're not making things  any *worse* and at least we're making it clear that it could be improved...
The problem strikes (as they all do) across DST boundaries.

+	
    
+				
  • todo: Improve this to calculate the days difference and then the clock time diff  and work from there.
    • 
+			

+	
+	

+		Rfc5545Duration
+		
+			fromTwoDates
+		
+					(RepeatRuleDateTime $d1, RepeatRuleDateTime $d2)
+			

+	
+			
+		
+			
+	

+
+

+	
+	

+		
+		Constructor __construct (line 87)
+	
 
+	
+	
+
Construct a new Rfc5545Duration either from incoming seconds or a text string.

+	
+	

+		Rfc5545Duration
+		
+			__construct
+		
+					(mixed $in_duration)
+			

+	
+			
    
+					
  • 
+				mixed
+				$in_duration			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		asSeconds (line 116)
+	
 
+	
+	
+
Returns the duration as epoch seconds.

+	
+	

+		void
+		
+			asSeconds
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		equals (line 107)
+	
 
+	
+	
+
Return true if $this and $other are equal, false otherwise.

+	
+	

+		boolean
+		
+			equals
+		
+					(Rfc5545Duration $other)
+			

+	
+			
+		
+			
+	

+
+

+	
+	

+		
+		__toString (line 145)
+	
 
+	
+	
+
Returns the duration as a text string of the form ^(-?)P(\d+W)|((\d+D)?(T(\d+H)?(\d+M)?(\d+S)?)?)$

+	
    
+				
  • return: The stringified stuff.
    • 
+			

+	
+	

+		string
+		
+			__toString
+		
+				()
+			

+	
+		
+			
+	

+						
+		

+	

+
+	
+	

+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
+	

+	

+
\ No newline at end of file
diff --git a/docs/api/awl/caldav/_inc---RRule-v2.php.html b/docs/api/awl/caldav/_inc---RRule-v2.php.html
index 3dd673fc..0b4261ce 100644
--- a/docs/api/awl/caldav/_inc---RRule-v2.php.html
+++ b/docs/api/awl/caldav/_inc---RRule-v2.php.html
@@ -59,6 +59,17 @@
 					
 											Wrap the DateTimeZone class to allow parsing some iCalendar TZID strangenesses
 										
+				
+								
+					
+						 class
+						Rfc5545Duration
+					
+					
+											Provide a useful way of dealing with RFC5545 duration strings of the form
+										
 				
 								
 					
@@ -79,7 +90,7 @@
 						RepeatRule
 					
 					
-											
+											This class is an implementation of RRULE parsing and expansion, as per RFC5545.  It should be reasonably  complete, except that it does not handle changing the WKST - there may be a few errors in unusual rules  also, but all of the common cases should be handled correctly.
 										
 				
 							
@@ -98,14 +109,14 @@
 					

 		
	
 			
-

+

 	
 	

 		 
 		
 			require_once
 			("vComponent.php")
-			(line 733)
+			(line 983)
 		
 	

 
@@ -127,23 +138,17 @@
 					

 		
	
 			
-

+

 	
 	

 		
 		
 			DEBUG_RRULE = false
-			(line 33)
+			(line 34)
 		
 	

 	
 	
-
Class for parsing RRule and getting us the dates

-	
 	
 		
 

@@ -163,11 +168,11 @@
 		

 		
	
 			
-

+

 	
 	

 		
-		expand_event_instances (line 813)
+		expand_event_instances (line 1064)
 	
 
 
 	
@@ -181,7 +186,7 @@
 		
 			expand_event_instances
 		
-					(object $vResource, [object $range_start = null], [object $range_end = null])
+					(object $vResource, [object $range_start = null], [object $range_end = null], [ $return_floating_times = false])
 			

 
 			
    
@@ -194,6 +199,35 @@
 					
  • 
 				object
 				$range_end: A RepeatRuleDateTime which is the end of the range for events, default +6 weeks			
    • 
+					
  • 
+				
+				$return_floating_times			
    • 
+				

+		
+	
+

+
+

+	
+	

+		
+		olson_from_vtimezone (line 19)
+	
 
+
+	
+
Try and extract something like "Pacific/Auckland" or "America/Indiana/Indianapolis" if possible, given  the VTIMEZONE component that is passed in.  This is much more complex than olson_from_tzstring since  we start to examine the rules and work out what actual timezone this might be.

+	

+		void
+		
+			olson_from_vtimezone
+		
+					( $vtz)
+			

+
+			
    
+					
  • 
+				vComponent
+				$vtz			
    • 
 				

 		
 	
@@ -203,7 +237,7 @@
 	
 	

 		
-		rdate_expand (line 744)
+		rdate_expand (line 994)
 	
 
 
 	
@@ -216,7 +250,7 @@
 		
 			rdate_expand
 		
-					( $dtstart, string $property, array $component, [array $range_end = null])
+					( $dtstart, string $property, array $component, [array $range_end = null], [ $is_date = null], [ $return_floating_times = false])
 			

 
 			
    
@@ -232,6 +266,12 @@
 					
  • 
 				
 				$dtstart			
    • 
+					
  • 
+				
+				$is_date			
    • 
+					
  • 
+				
+				$return_floating_times			
    • 
 				

 		
 	
@@ -241,7 +281,7 @@
 	
 	

 		
-		rrule_expand (line 771)
+		rrule_expand (line 1022)
 	
 
 
 	
@@ -254,7 +294,7 @@
 		
 			rrule_expand
 		
-					(object $dtstart, string $property, array $component, array $range_end)
+					(object $dtstart, string $property, array $component, array $range_end, [ $is_date = null], [ $return_floating_times = false])
 			

 
 			
    
@@ -270,6 +310,12 @@
 					
  • 
 				array
 				$range_end: A date after which we care less about expansion			
    • 
+					
  • 
+				
+				$is_date			
    • 
+					
  • 
+				
+				$return_floating_times			
    • 
 				

 		
 	
@@ -278,7 +324,7 @@
 	

 	
 	

-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	

 	

 
\ No newline at end of file
diff --git a/docs/api/awl/caldav/_inc---RRule.php.html b/docs/api/awl/caldav/_inc---RRule.php.html
index adae3950..c4583866 100644
--- a/docs/api/awl/caldav/_inc---RRule.php.html
+++ b/docs/api/awl/caldav/_inc---RRule.php.html
@@ -74,7 +74,7 @@
 	
 	
 	

-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	

 	

 
\ No newline at end of file
diff --git a/docs/api/awl/caldav/_inc---caldav-client-v2.php.html b/docs/api/awl/caldav/_inc---caldav-client-v2.php.html
index b8e8873f..6a0e1b67 100644
--- a/docs/api/awl/caldav/_inc---caldav-client-v2.php.html
+++ b/docs/api/awl/caldav/_inc---caldav-client-v2.php.html
@@ -108,7 +108,7 @@
 	
 	
 	

-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3
 	

 	

 
\ No newline at end of file
diff --git a/docs/api/awl/caldav/_inc---caldav-client.php.html b/docs/api/awl/caldav/_inc---caldav-client.php.html
index 40bc8d5b..4a54df53 100644
--- a/docs/api/awl/caldav/_inc---caldav-client.php.html
+++ b/docs/api/awl/caldav/_inc---caldav-client.php.html
@@ -63,7 +63,7 @@
 	
 	
 	

-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3
 	

 	

 
\ No newline at end of file
diff --git a/docs/api/awl/caldav/iCalDate.html b/docs/api/awl/caldav/iCalDate.html
index 286fcc8c..c14baf97 100644
--- a/docs/api/awl/caldav/iCalDate.html
+++ b/docs/api/awl/caldav/iCalDate.html
@@ -943,7 +943,7 @@
 
 	
 	

-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	

 	

 
\ No newline at end of file
diff --git a/docs/api/classtrees_awl.html b/docs/api/classtrees_awl.html
index e09cedbf..55062da9 100644
--- a/docs/api/classtrees_awl.html
+++ b/docs/api/classtrees_awl.html
@@ -33,6 +33,10 @@
 
 
+
Root class Rfc5545Duration

+
+
 
Root class RRule

 
@@ -46,7 +50,7 @@
 
  • RepeatRuleTimeZone
    • 
 
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:02 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3
 	
    
 	
 
\ No newline at end of file
diff --git a/docs/api/classtrees_davical.html b/docs/api/classtrees_davical.html
index 2cdba7f5..8dd0575d 100644
--- a/docs/api/classtrees_davical.html
+++ b/docs/api/classtrees_davical.html
@@ -21,14 +21,14 @@
 
 
-
    Root class CalDAVPrincipal
    
-
-
 
    Root class CalDAVRequest
    
 
 
+
    Root class CheckResult
    
+
+
 
    Root class DAVResource
    
 
    
 
\ No newline at end of file
diff --git a/docs/api/davical/AtomFeed.html b/docs/api/davical/AtomFeed.html
index 62b33d64..210f8409 100644
--- a/docs/api/davical/AtomFeed.html
+++ b/docs/api/davical/AtomFeed.html
@@ -519,7 +519,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:02 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/AtomXHTMLContent.html b/docs/api/davical/AtomXHTMLContent.html
index 2e5f5d36..3b98b565 100644
--- a/docs/api/davical/AtomXHTMLContent.html
+++ b/docs/api/davical/AtomXHTMLContent.html
@@ -142,7 +142,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/CheckResult.html b/docs/api/davical/CheckResult.html
new file mode 100644
index 00000000..5af303ca
--- /dev/null
+++ b/docs/api/davical/CheckResult.html
@@ -0,0 +1,271 @@
+
+
+  
+		
+			
+			Docs For Class CheckResult
+			
+			
+		
+		
+			
    			
+
     Class CheckResult
    
+
+
+
    
+	
    Description
    
+	
    
+					Description |
+															Methods (details)
+						
+					
    
+	
    
+        		
+		
    
+			Located in /htdocs/setup.php (line 8)
+		
    
+		
+				
+		
    
+	
+			
    
+
    
+
+
+
+
+	
+	
    
+		
    Method Summary
    
+		
    
+			Description |
+												Methods (details)
+		
    
+		
    			
+			
    
+																																																																
    
+					 
+											CheckResult
+										__construct
+											( $success, [ $description = null], [ $use_class = null])
+									
    
+																
    
+					 
+											void
+										getClass
+										()
+									
    
+																
    
+					 
+											void
+										getDescription
+										()
+									
    
+																
    
+					 
+											void
+										getOK
+										()
+									
    
+																
    
+					 
+											void
+										setClass
+											( $new_class)
+									
    
+																
    
+					 
+											void
+										setDescription
+											( $new_desc)
+									
    
+											
    
+		
    
+	
    		
+
+	
+	
+	
    
+		
    Methods
    
+		
    
+			Description |
+													Methods (details)
+						
+		
    
+		
    
+			
+
+
    
+	
+	
    
+		
+		Constructor __construct (line 13)
+	
     
+	
+	
+	
+	
    
+		CheckResult
+		
+			__construct
+		
+					( $success, [ $description = null], [ $use_class = null])
+			
    
+	
+			
      
+					
    • 
+				
+				$success			
      • 
+					
    • 
+				
+				$description			
      • 
+					
    • 
+				
+				$use_class			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		getClass (line 19)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			getClass
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		getDescription (line 31)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			getDescription
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		getOK (line 27)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			getOK
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		setClass (line 23)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			setClass
+		
+					( $new_class)
+			
    
+	
+			
      
+					
    • 
+				
+				$new_class			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		setDescription (line 35)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			setDescription
+		
+					( $new_desc)
+			
    
+	
+			
      
+					
    • 
+				
+				$new_desc			
      • 
+				
    
+		
+			
+	
    
+						
+		
    
+	
    
+
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/DAVTicket/DAVTicket.html b/docs/api/davical/DAVTicket/DAVTicket.html
index 765ed115..d103e0a4 100644
--- a/docs/api/davical/DAVTicket/DAVTicket.html
+++ b/docs/api/davical/DAVTicket/DAVTicket.html
@@ -99,7 +99,7 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
@@ -126,7 +126,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -147,7 +147,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -168,7 +168,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -194,7 +194,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -220,7 +220,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -246,7 +246,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:10 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html b/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html
index 4195ee25..c5dc126f 100644
--- a/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html
+++ b/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html
@@ -70,7 +70,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -97,7 +97,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:10 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/DAViCalSession/DAViCalSession.html b/docs/api/davical/DAViCalSession/DAViCalSession.html
index d7086f66..8b1de6ec 100644
--- a/docs/api/davical/DAViCalSession/DAViCalSession.html
+++ b/docs/api/davical/DAViCalSession/DAViCalSession.html
@@ -89,7 +89,7 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
@@ -98,7 +98,7 @@
 	
 	
 
    Create a new DAViCalSession object.
    
-
    We create a Session and extend it with some additional useful RSCDS  related information.
    
+
    We create a Session and extend it with some additional useful DAViCal  related information.
    
 	
 	
    
 		DAViCalSession
@@ -117,7 +117,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -144,7 +144,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -166,7 +166,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -202,7 +202,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/DAViCalSession/Tools.html b/docs/api/davical/DAViCalSession/Tools.html
index d09ebf1e..e6a64dd9 100644
--- a/docs/api/davical/DAViCalSession/Tools.html
+++ b/docs/api/davical/DAViCalSession/Tools.html
@@ -86,7 +86,7 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
@@ -107,7 +107,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -128,7 +128,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -149,7 +149,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -175,7 +175,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/DAViCalSession/_htdocs---tools.php.html b/docs/api/davical/DAViCalSession/_htdocs---tools.php.html
index 6c8c6d23..aecb29a9 100644
--- a/docs/api/davical/DAViCalSession/_htdocs---tools.php.html
+++ b/docs/api/davical/DAViCalSession/_htdocs---tools.php.html
@@ -70,14 +70,14 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
 		
 			include
 			(page-header.php)
-			(line 159)
+			(line 160)
 		
 	
    
 
@@ -85,14 +85,14 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
 		
 			include
 			(page-footer.php)
-			(line 161)
+			(line 162)
 		
 	
    
 
@@ -100,7 +100,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -115,7 +115,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -136,7 +136,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -151,7 +151,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -166,7 +166,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -187,7 +187,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html b/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html
index a51167b3..df5a9443 100644
--- a/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html
+++ b/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html
@@ -76,7 +76,7 @@
 					
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -109,7 +109,7 @@
 			
-
    
+
    
 	
 	
    
 		
@@ -144,7 +144,7 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
@@ -170,7 +170,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html b/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html
index d422ff27..015f75da 100644
--- a/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html
+++ b/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html
@@ -102,7 +102,7 @@
 					 
 											void
 										AssignSessionDetails
-											(object $u)
+											( $principal, object $u)
 									
    
 																
    
 					 
@@ -159,7 +159,7 @@
 		
    
 			
 
-
    
+
    
 
 	
    
 		
@@ -183,7 +183,7 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
@@ -207,7 +207,7 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
@@ -231,7 +231,7 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
@@ -270,7 +270,7 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
@@ -278,7 +278,7 @@
 	
     
 	
 	
-
    The constructor, which just calls the actual type configured
    
+
    The constructor, which just calls the type supplied or configured
    
 	
 	
    
 		HTTPAuthSession
@@ -292,11 +292,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		AllowedTo (line 259)
+		AllowedTo (line 317)
 	
     
 	
 	
@@ -323,11 +323,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		AssignSessionDetails (line 283)
+		AssignSessionDetails (line 341)
 	
     
 	
 	
@@ -338,23 +338,26 @@
 		
 			AssignSessionDetails
 		
-					(object $u)
+					( $principal, object $u)
 			
    
 	
 			
      
 					
    • 
 				object
 				$u: The user+session object we (probably) read from the database.			
      • 
+					
    • 
+				
+				$principal			
      • 
 				
    
 		
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		AuthFailedResponse (line 66)
+		AuthFailedResponse (line 72)
 	
     
 	
 	
@@ -377,11 +380,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		BasicAuthSession (line 84)
+		BasicAuthSession (line 98)
 	
     
 	
 	
@@ -399,11 +402,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		CheckPassword (line 215)
+		CheckPassword (line 269)
 	
     
 	
 	
@@ -429,11 +432,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		DigestAuthSession (line 162)
+		DigestAuthSession (line 174)
 	
     
 	
 	
@@ -452,11 +455,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		GetRoles (line 267)
+		GetRoles (line 325)
 	
     
 	
 	
@@ -474,11 +477,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		ParseDigestHeader (line 196)
+		ParseDigestHeader (line 236)
 	
     
 	
 	
@@ -507,7 +510,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html b/docs/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html
index 2cb0009c..930e465c 100644
--- a/docs/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html
+++ b/docs/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html
@@ -63,7 +63,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/Principal/CalDAVPrincipal.html b/docs/api/davical/Principal/DAVPrincipal.html
similarity index 58%
rename from docs/api/davical/Principal/CalDAVPrincipal.html
rename to docs/api/davical/Principal/DAVPrincipal.html
index 9c5164e7..27914839 100644
--- a/docs/api/davical/Principal/CalDAVPrincipal.html
+++ b/docs/api/davical/Principal/DAVPrincipal.html
@@ -3,7 +3,7 @@
   
 		
 			
-			Docs For Class CalDAVPrincipal
+			Docs For Class DAVPrincipal
 			
 			
 		
@@ -12,7 +12,7 @@
 
     Class CalDAVPrincipal
    
+														style="vertical-align: middle"> DAVPrincipal
 
 
 
    
@@ -27,11 +27,13 @@
         		
 
    A class for things to do with a DAV Principal
    
 		
    
-			Located in /inc/CalDAVPrincipal.php (line 25)
+			Located in /inc/DAVPrincipal.php (line 18)
 		
    
 		
 				
-		
    
+		
    Principal
+   |
+   --DAVPrincipal
    
 	
 			
    
 
    
@@ -50,67 +52,7 @@
 								
    
 		
    
 			
    
-																																																																																																																								
    
-					 
-					Whether
-					$by_email
-				
    
-																
    
-					 
-					The
-					$dav_name
-				
    
-																
    
-					 
-					RFC3744:
-					$group_membership
-				
    
-																
    
-					 
-					RFC3744:
-					$group_member_set
-				
    
-																
    
-					 
-					CardDAV:
-					$principal_address
-				
    
-																
    
-					 
-					caldav-cu-proxy-02:
-					$read_proxy_for
-				
    
-																
    
-					 
-					caldav-cu-proxy-02:
-					$read_proxy_group
-				
    
-																
    
-					 
-					draft-desruisseaux-caldav-sched-03:
-					$schedule_inbox_url
-				
    
-																
    
-					 
-					draft-desruisseaux-caldav-sched-03:
-					$schedule_outbox_url
-				
    
-																
    
-					 
-					The
-					$username
-				
    
-																
    
-					 
-					caldav-cu-proxy-02:
-					$write_proxy_for
-				
    
-																
    
-					 
-					caldav-cu-proxy-02:
-					$write_proxy_group
-				
    
-																
    
+																								
    
 					 
 					RFC3744:
 					$_is_group
@@ -131,7 +73,7 @@
 		
    
 		
    			
 			
    
-																																																																																																																																																																																																								
    
+																																																																																																																																																																								
    
 					 
 											boolean
 										__construct
@@ -162,18 +104,6 @@
 										()
 									
    
 																
    
-					 
-											string
-										dav_name
-										()
-									
    
-																
    
-					 
-											boolean
-										Exists
-										()
-									
    
-																
    
 					 
 											void
 										FetchProxyGroups
@@ -222,6 +152,12 @@
 										()
 									
    
 																
    
+					 
+											void
+										PropertySearch
+											( $parameters)
+									
    
+																
    
 					 
 											void
 										ProxyFor
@@ -240,28 +176,10 @@
 											(array $properties,  &$reply, [boolean $props_only = false], reference $reply)
 									
    
 																
    
-					 
-											string
-										url
-										()
-									
    
-																
    
-					 
-											string
-										username
-										()
-									
    
-																
    
 					 
 											void
-										UsernameFromEMail
-											(string $email)
-									
    
-																
    
-					 
-											void
-										UsernameFromPath
-											(string $path, [array $options = null])
+										unique_tag
+										()
 									
    
 																
    
 					 
@@ -287,288 +205,15 @@
 					
    
 		
    
 			
-
-
    
-
-	
    
-		
-		
-			Whether
-			$by_email
-						(line 69)
-		
-	
    
-
-	
-	
      
-				
    • var: or not we are using an e-mail address based URL.
      • 
-			
    
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			The
-			$dav_name
-						(line 119)
-		
-	
    
-
-	
-	
      
-				
    • var: dav_name for this principal - a partial path
      • 
-				
    • access: protected
      • 
-			
    
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			RFC3744:
-			$group_membership
-						(line 84)
-		
-	
    
-
-	
-	
      
-				
    • var: The groups in which the principal is directly a member.
      • 
-				
    • access: protected
      • 
-			
    
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			RFC3744:
-			$group_member_set
-						(line 79)
-		
-	
    
-
-	
-	
      
-				
    • var: The principals that are direct members of this group.
      • 
-				
    • access: protected
      • 
-			
    
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			CardDAV:
-			$principal_address
-						(line 109)
-		
-	
    
-
-	
-	
      
-				
    • var: The URL to an addressbook entry for this principal
      • 
-				
    • access: protected
      • 
-			
    
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			caldav-cu-proxy-02:
-			$read_proxy_for
-						(line 89)
-		
-	
    
-
-	
-	
      
-				
    • var: The principals which this one has read permissions on.
      • 
-				
    • access: protected
      • 
-			
    
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			caldav-cu-proxy-02:
-			$read_proxy_group
-						(line 99)
-		
-	
    
-
-	
-	
      
-				
    • var: The principals which have read permissions on this one.
      • 
-				
    • access: protected
      • 
-			
    
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			draft-desruisseaux-caldav-sched-03:
-			$schedule_inbox_url
-						(line 58)
-		
-	
    
-
-	
-	
      
-				
    • var: Identify the URL of the scheduling  Inbox collection owned by the associated principal resource.
      • 
-			
    
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			draft-desruisseaux-caldav-sched-03:
-			$schedule_outbox_url
-						(line 64)
-		
-	
    
-
-	
-	
      
-				
    • var: Identify the URL of the scheduling  Outbox collection owned by the associated principal resource.
      • 
-			
    
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			The
-			$username
-						(line 114)
-		
-	
    
-
-	
-	
      
-				
    • var: username for this principal
      • 
-				
    • access: protected
      • 
-			
    
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			caldav-cu-proxy-02:
-			$write_proxy_for
-						(line 94)
-		
-	
    
-
-	
-	
      
-				
    • var: The principals which this one has read-write prmissions for.
      • 
-				
    • access: protected
      • 
-			
    
-	
-	
-		
-		
-
-
    
-
-
    
-
-	
    
-		
-		
-			caldav-cu-proxy-02:
-			$write_proxy_group
-						(line 104)
-		
-	
    
-
-	
-	
      
-				
    • var: The principals which have write permissions on this one.
      • 
-				
    • access: protected
      • 
-			
    
-	
-	
-		
-		
-
-
    
 
-
    
+
    
 
 	
    
 		
 		
 			RFC3744:
 			$_is_group
-						(line 74)
+						(line 41)
 		
 	
    
 
@@ -583,7 +228,128 @@
 		
 
 
    
-						
+							
    Inherited Variables
    
+				
+									
    Inherited from Principal
    
+					
    
+													
+							
+								Principal::$by_email
    
+							    
+													
+							
+								Principal::$collections
    
+							    
+													
+							
+								Principal::$collection_id
    
+							    
+													
+							
+								Principal::$created
    
+							    
+													
+							
+								Principal::$date_format_type
    
+							    
+													
+							
+								Principal::$dav_name
    
+							    
+													
+							
+								Principal::$dead_properties
    
+							    
+													
+							
+								Principal::$default_calendar
    
+							    
+													
+							
+								Principal::$default_privileges
    
+							    
+													
+							
+								Principal::$displayname
    
+							    
+													
+							
+								Principal::$email
    
+							    
+													
+							
+								Principal::$email_ok
    
+							    
+													
+							
+								Principal::$exists
    
+							    
+													
+							
+								Principal::$fullname
    
+							    
+													
+							
+								Principal::$is_addressbook
    
+							    
+													
+							
+								Principal::$is_calendar
    
+							    
+													
+							
+								Principal::$is_principal
    
+							    
+													
+							
+								Principal::$locale
    
+							    
+													
+							
+								Principal::$modified
    
+							    
+													
+							
+								Principal::$original_request_url
    
+							    
+													
+							
+								Principal::$password
    
+							    
+													
+							
+								Principal::$principal_id
    
+							    
+													
+							
+								Principal::$privileges
    
+							    
+													
+							
+								Principal::$resourcetypes
    
+							    
+													
+							
+								Principal::$type_id
    
+							    
+													
+							
+								Principal::$url
    
+							    
+													
+							
+								Principal::$username
    
+							    
+													
+							
+								Principal::$user_active
    
+							    
+													
+							
+								Principal::$user_no
    
+							    
+											
     
+										
 		
    
 	
    
 	
@@ -599,11 +365,11 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
-		Constructor __construct (line 131)
+		Constructor __construct (line 94)
 	
     
 	
 	
@@ -626,14 +392,19 @@
 				$parameters: If null, an empty Principal is created.  If it               is an integer then that ID is read (if possible).  If it is               an array then the Principal matching the supplied elements               is read.  If it is an object then it is expected to be a 'usr'               record that was read elsewhere.			
 				
 		
+			
    
+		
    Redefinition of:
    
+		
    
+			
    Principal::__construct()
    
+					
    
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		addressbook_home_set (line 495)
+		addressbook_home_set (line 358)
 	
     
 	
 	
@@ -651,11 +422,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		AsCollection (line 552)
+		AsCollection (line 419)
 	
     
 	
 	
@@ -673,11 +444,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		calendar_free_busy_set (line 517)
+		calendar_free_busy_set (line 381)
 	
     
 	
 	
@@ -695,11 +466,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		calendar_home_set (line 473)
+		calendar_home_set (line 335)
 	
     
 	
 	
@@ -716,62 +487,12 @@
 		
 			
 	
    
-
-
    
-	
-	
    
-		
-		dav_name (line 429)
-	
     
-	
-	
-
    Return the partial path representing this principal
    
-	
      
-				
    • return: The dav_name
      • 
-			
    
-	
-	
    
-		string
-		
-			dav_name
-		
-				()
-			
    
-	
-		
-			
-	
    
-
+
 
    
 	
 	
    
 		
-		Exists (line 402)
-	
     
-	
-	
-
    Does this principal exist?
    
-	
      
-				
    • return: Whether or not it exists.
      • 
-			
    
-	
-	
    
-		boolean
-		
-			Exists
-		
-				()
-			
    
-	
-		
-			
-	
    
-
-
    
-	
-	
    
-		
-		FetchProxyGroups (line 259)
+		FetchProxyGroups (line 193)
 	
     
 	
 	
@@ -789,11 +510,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		GetProperty (line 442)
+		GetProperty (line 302)
 	
     
 	
 	
@@ -819,11 +540,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		GroupMemberSet (line 349)
+		GroupMemberSet (line 283)
 	
     
 	
 	
@@ -841,11 +562,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		GroupMembership (line 340)
+		GroupMembership (line 274)
 	
     
 	
 	
@@ -863,11 +584,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		InitialiseRecord (line 196)
+		InitialiseRecord (line 143)
 	
     
 	
 	
@@ -890,11 +611,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsGroup (line 411)
+		IsGroup (line 293)
 	
     
 	
 	
@@ -915,11 +636,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		PrincipalProperty (line 576)
+		PrincipalProperty (line 450)
 	
     
 	
 	
@@ -951,11 +672,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		Privileges (line 538)
+		Privileges (line 403)
 	
     
 	
 	
@@ -971,13 +692,39 @@
 	
 		
 			
+	
    
+
+
    
+	
+	
    
+		
+		PropertySearch (line 443)
+	
     
+	
+	
+	
+	
    
+		void
+		
+			PropertySearch
+		
+					( $parameters)
+			
    
+	
+			
      
+					
    • 
+				
+				$parameters			
      • 
+				
    
+		
+			
 	
    
 
 
    
 	
 	
    
 		
-		ProxyFor (line 330)
+		ProxyFor (line 264)
 	
     
 	
 	
@@ -1004,7 +751,7 @@
 	
 	
    
 		
-		ReadProxyGroup (line 311)
+		ReadProxyGroup (line 245)
 	
     
 	
 	
@@ -1026,7 +773,7 @@
 	
 	
    
 		
-		RenderAsXML (line 690)
+		RenderAsXML (line 568)
 	
     
 	
 	
@@ -1060,119 +807,37 @@
 		
 			
 	
    
-
+
 
    
 	
 	
    
 		
-		url (line 465)
+		unique_tag (line 323)
 	
     
 	
 	
-
    Return the URL for this principal
    
+
    Returns the unique_tag (ETag or getctag) for this resource
    
 	
      
-				
    • return: The principal-URL, or null if they don't exist
      • 
+				
    • access: public
      • 
 			
    
 	
-	
    
-		string
-		
-			url
-		
-				()
-			
    
-	
-		
-			
-	
    
-
-
    
-	
-	
    
-		
-		username (line 420)
-	
     
-	
-	
-
    Return the username
    
-	
      
-				
    • return: The username
      • 
-			
    
-	
-	
    
-		string
-		
-			username
-		
-				()
-			
    
-	
-		
-			
-	
    
-
-
    
-	
-	
    
-		
-		UsernameFromEMail (line 386)
-	
     
-	
-	
-
    Work out the username, based on the given e-mail
    
-	
 	
    
 		void
 		
-			UsernameFromEMail
+			unique_tag
 		
-					(string $email)
+				()
 			
    
 	
-			
      
-					
    • 
-				string
-				$email: The email address to be used.			
      • 
-				
    
-		
-			
-	
    
-
-
    
-	
-	
    
-		
-		UsernameFromPath (line 360)
-	
     
-	
-	
-
    Work out the username, based on elements of the path.
    
-	
-	
    
-		void
-		
-			UsernameFromPath
-		
-					(string $path, [array $options = null])
-			
    
-	
-			
      
-					
    • 
-				string
-				$path: The path to be used.			
      • 
-					
    • 
-				array
-				$options: The request options, controlling whether e-mail paths are allowed.			
      • 
-				
    
 		
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		WriteProxyGroup (line 320)
+		WriteProxyGroup (line 254)
 	
     
 	
 	
@@ -1189,13 +854,63 @@
 		
 			
 	
    
-						
+							
    Inherited Methods
    
+					
+									
+					
    Inherited From Principal
    
+					
    
+													 
+							Principal::__construct()
    
+													 
+							Principal::byEmail()
    
+													 
+							Principal::cacheDelete()
    
+													 
+							Principal::cacheFlush()
    
+													 
+							Principal::Create()
    
+													 
+							Principal::dav_name()
    
+													 
+							Principal::default_calendar()
    
+													 
+							Principal::email()
    
+													 
+							Principal::Exists()
    
+													 
+							Principal::FetchCollections()
    
+													 
+							Principal::FetchDeadProperties()
    
+													 
+							Principal::internal_url()
    
+													 
+							Principal::principal_id()
    
+													 
+							Principal::setUsername()
    
+													 
+							Principal::unCache()
    
+													 
+							Principal::Update()
    
+													 
+							Principal::updateableFields()
    
+													 
+							Principal::url()
    
+													 
+							Principal::username()
    
+													 
+							Principal::user_no()
    
+													 
+							Principal::__get()
    
+													 
+							Principal::__isset()
    
+											
    
+										
 		
    
 	
    
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/Principal/Principal.html b/docs/api/davical/Principal/Principal.html
new file mode 100644
index 00000000..02c9f221
--- /dev/null
+++ b/docs/api/davical/Principal/Principal.html
@@ -0,0 +1,1679 @@
+
+
+  
+		
+			
+			Docs For Class Principal
+			
+			
+		
+		
+			
    			
+
     Class Principal
    
+
+
+
    
+	
    Description
    
+	
    
+					Description |
+							Descendents
+			|											Vars (details)
+						|											Methods (details)
+						
+					
    
+	
    
+        		
+
    A class for things to do with a Principal
    
+		
    
+			Located in /inc/Principal.php (line 19)
+		
    
+		
+				
+		
    
+	
+			
    
+
    
+
+	
+	
    
+		
    Direct descendents
    
+		
    
+			Description |
+			Descendents
+			|												Vars (details)
+								|															Methods (details)
+							
+								
    
+		
    
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
    ClassDescription
    
+						 class
+						DAVPrincipal
+					
+											A class for things to do with a DAV Principal
+										
    
+		
    
+	
    
+
+
+	
+	
    
+		
    Variable Summary
    
+		
    
+			Description |
+							Descendants |
+						Vars (details)
+							| 
+									Methods (details)
+							
+								
    
+		
    
+			
    
+																																																																																																																																																																																																																																																								
    
+					 
+					boolean
+					$by_email
+				
    
+																
    
+					 
+					mixed
+					$collections
+				
    
+																
    
+					 
+					mixed
+					$collection_id
+				
    
+																
    
+					 
+					mixed
+					$created
+				
    
+																
    
+					 
+					mixed
+					$date_format_type
+				
    
+																
    
+					 
+					mixed
+					$dav_name
+				
    
+																
    
+					 
+					mixed
+					$dead_properties
+				
    
+																
    
+					 
+					mixed
+					$default_calendar
+				
    
+																
    
+					 
+					mixed
+					$default_privileges
+				
    
+																
    
+					 
+					mixed
+					$displayname
+				
    
+																
    
+					 
+					mixed
+					$email
+				
    
+																
    
+					 
+					mixed
+					$email_ok
+				
    
+																
    
+					 
+					boolean
+					$exists
+				
    
+																
    
+					 
+					mixed
+					$fullname
+				
    
+																
    
+					 
+					mixed
+					$is_addressbook
+				
    
+																
    
+					 
+					mixed
+					$is_calendar
+				
    
+																
    
+					 
+					mixed
+					$is_principal
+				
    
+																
    
+					 
+					mixed
+					$locale
+				
    
+																
    
+					 
+					mixed
+					$modified
+				
    
+																
    
+					 
+					The
+					$original_request_url
+				
    
+																
    
+					 
+					mixed
+					$password
+				
    
+																
    
+					 
+					mixed
+					$principal_id
+				
    
+																
    
+					 
+					mixed
+					$privileges
+				
    
+																
    
+					 
+					mixed
+					$resourcetypes
+				
    
+																
    
+					 
+					mixed
+					$type_id
+				
    
+																
    
+					 
+					The
+					$url
+				
    
+																
    
+					 
+					mixed
+					$username
+				
    
+																
    
+					 
+					mixed
+					$user_active
+				
    
+																
    
+					 
+					mixed
+					$user_no
+				
    
+											
    
+		
    
+	
    
+
+	
+	
    
+		
    Method Summary
    
+		
    
+			Description |
+							Descendants |
+																		Vars (details)
+				 
+				|
+						Methods (details)
+		
    
+		
    			
+			
    
+																												
    
+					 
+											static void
+										cacheDelete
+											( $type,  $value)
+									
    
+																
    
+					 
+											static void
+										cacheFlush
+											( $where, [ $whereparams = array()])
+									
    
+																																																																																																																
    
+					 
+											static void
+										updateableFields
+										()
+									
    
+																																																												
    
+					 
+											Principal
+										__construct
+											( $type,  $value, [ $use_cache = true])
+									
    
+																
    
+					 
+											void
+										byEmail
+										()
+									
    
+																																
    
+					 
+											void
+										Create
+											( $field_values)
+									
    
+																
    
+					 
+											string
+										dav_name
+										()
+									
    
+																
    
+					 
+											string
+										default_calendar
+										()
+									
    
+																
    
+					 
+											string
+										email
+										()
+									
    
+																
    
+					 
+											void
+										Exists
+										()
+									
    
+																
    
+					 
+											string
+										FetchCollections
+										()
+									
    
+																
    
+					 
+											void
+										FetchDeadProperties
+										()
+									
    
+																
    
+					 
+											void
+										internal_url
+											([ $type = 'principal'])
+									
    
+																
    
+					 
+											string
+										principal_id
+										()
+									
    
+																
    
+					 
+											string
+										setUsername
+											( $new_username)
+									
    
+																
    
+					 
+											void
+										unCache
+										()
+									
    
+																
    
+					 
+											void
+										Update
+											( $field_values)
+									
    
+																								
    
+					 
+											string
+										url
+											([string $type = 'principal'], [boolean $internal = false])
+									
    
+																
    
+					 
+											string
+										username
+										()
+									
    
+																
    
+					 
+											int
+										user_no
+										()
+									
    
+																
    
+					 
+											void
+										__get
+											($property $property)
+									
    
+																
    
+					 
+											void
+										__isset
+											($property $property)
+									
    
+											
    
+		
    
+	
    		
+
+	
+	
    
+		
    Variables
    
+		
    
+			Description |
+							Descendents |
+										Vars (details)
+						
+			
+										| 
+									Methods (details)
+							
+					
    
+		
    
+			
+
+
    
+
+	
    
+		
+		
+			boolean
+			$by_email
+						(line 92)
+		
+	
    
+
+	
+
    Whether this was retrieved using an e-mail address
    
+	
      
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$collections
+						(line 101)
+		
+	
    
+
+	
+	
      
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$collection_id
+						(line 67)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$created
+						(line 55)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$date_format_type
+						(line 60)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$dav_name
+						(line 53)
+		
+	
    
+
+	
+	
      
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$dead_properties
+						(line 102)
+		
+	
    
+
+	
+	
      
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$default_calendar
+						(line 103)
+		
+	
    
+
+	
+	
      
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$default_privileges
+						(line 64)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$displayname
+						(line 63)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$email
+						(line 52)
+		
+	
    
+
+	
+	
      
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$email_ok
+						(line 59)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			boolean
+			$exists
+						(line 76)
+		
+	
    
+
+	
+
    Whether this Principal actually exists in the database yet.
    
+	
      
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$fullname
+						(line 58)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$is_addressbook
+						(line 68)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$is_calendar
+						(line 66)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$is_principal
+						(line 65)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$locale
+						(line 61)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$modified
+						(line 56)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			The
+			$original_request_url
+						(line 86)
+		
+	
    
+
+	
+	
      
+				
    • var: actual requested URL for this principal, when the request was for /principals/... or such
      • 
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$password
+						(line 57)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$principal_id
+						(line 51)
+		
+	
    
+
+	
+	
      
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$privileges
+						(line 70)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$resourcetypes
+						(line 69)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$type_id
+						(line 62)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			The
+			$url
+						(line 81)
+		
+	
    
+
+	
+	
      
+				
    • var: home URL of the principal
      • 
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$username
+						(line 49)
+		
+	
    
+
+	
+
    Columns from the database
    
+	
      
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$user_active
+						(line 54)
+		
+	
    
+
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$user_no
+						(line 50)
+		
+	
    
+
+	
+	
      
+				
    • access: protected
      • 
+			
    
+	
+	
+		
+		
+
+
    
+						
+		
    
+	
    
+	
+	
+	
    
+		
    Methods
    
+		
    
+			Description |
+							Descendents |
+															Vars (details)
+														Methods (details)
+						
+		
    
+		
    
+			
+
+
    
+	
+	
    
+		
+		static cacheDelete (line 562)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			cacheDelete
+		
+					( $type,  $value)
+			
    
+	
+			
      
+					
    • 
+				
+				$type			
      • 
+					
    • 
+				
+				$value			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		static cacheFlush (line 551)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			cacheFlush
+		
+					( $where, [ $whereparams = array()])
+			
    
+	
+			
      
+					
    • 
+				
+				$where			
      • 
+					
    • 
+				
+				$whereparams			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		static updateableFields (line 30)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			updateableFields
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		Constructor __construct (line 105)
+	
     
+	
+	
+	
+	
    
+		Principal
+		
+			__construct
+		
+					( $type,  $value, [ $use_cache = true])
+			
    
+	
+			
      
+					
    • 
+				
+				$type			
      • 
+					
    • 
+				
+				$value			
      • 
+					
    • 
+				
+				$use_cache			
      • 
+				
    
+		
+			
+			
    
+		
    Redefined in descendants as:
    
+		
+	
    
+
+
    
+	
+	
    
+		
+		byEmail (line 267)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			byEmail
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		Create (line 540)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			Create
+		
+					( $field_values)
+			
    
+	
+			
      
+					
    • 
+				
+				$field_values			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		dav_name (line 359)
+	
     
+	
+	
+
    Return the partial path representing this principal
    
+	
      
+				
    • return: The dav_name
      • 
+			
    
+	
+	
    
+		string
+		
+			dav_name
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		default_calendar (line 407)
+	
     
+	
+	
+
    Return the default calendar for this principal
    
+	
      
+				
    • return: The internal dav_name for the home_calendar, or false if there is none
      • 
+			
    
+	
+	
    
+		string
+		
+			default_calendar
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		email (line 350)
+	
     
+	
+	
+
    Return the email
    
+	
      
+				
    • return: The email
      • 
+			
    
+	
+	
    
+		string
+		
+			email
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		Exists (line 262)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			Exists
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		FetchCollections (line 390)
+	
     
+	
+	
+
    Fetch the list of collections for this principal
    
+	
      
+				
    • return: The internal dav_name for the home_calendar, or null if there is none
      • 
+				
    • access: protected
      • 
+			
    
+	
+	
    
+		string
+		
+			FetchCollections
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		FetchDeadProperties (line 373)
+	
     
+	
+	
+
    Ensure the principal's dead properties are loaded
    
+	
      
+				
    • access: protected
      • 
+			
    
+	
+	
    
+		void
+		
+			FetchDeadProperties
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		internal_url (line 473)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			internal_url
+		
+					([ $type = 'principal'])
+			
    
+	
+			
      
+					
    • 
+				
+				$type			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		principal_id (line 341)
+	
     
+	
+	
+
    Return the principal_id
    
+	
      
+				
    • return: The principal_id
      • 
+			
    
+	
+	
    
+		string
+		
+			principal_id
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		setUsername (line 321)
+	
     
+	
+	
+
    Set the username - but only if the record does not yet exist!
    
+	
      
+				
    • return: The username
      • 
+			
    
+	
+	
    
+		string
+		
+			setUsername
+		
+					( $new_username)
+			
    
+	
+			
      
+					
    • 
+				
+				$new_username			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		unCache (line 478)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			unCache
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		Update (line 544)
+	
     
+	
+	
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			Update
+		
+					( $field_values)
+			
    
+	
+			
      
+					
    • 
+				
+				$field_values			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		url (line 447)
+	
     
+	
+	
+
    Return the URL for this principal
    
+	
      
+				
    • return: The principal-URL
      • 
+				
    • access: public
      • 
+			
    
+	
+	
    
+		string
+		
+			url
+		
+					([string $type = 'principal'], [boolean $internal = false])
+			
    
+	
+			
      
+					
    • 
+				string
+				$type: The type of URL we want (the principal, by default)			
      • 
+					
    • 
+				boolean
+				$internal: Whether an internal reference is requested			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		username (line 312)
+	
     
+	
+	
+
    Return the username
    
+	
      
+				
    • return: The username
      • 
+			
    
+	
+	
    
+		string
+		
+			username
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		user_no (line 332)
+	
     
+	
+	
+
    Return the user_no
    
+	
      
+				
    • return: The user_no
      • 
+			
    
+	
+	
    
+		int
+		
+			user_no
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		__get (line 229)
+	
     
+	
+	
+
    This will allow protected properties to be referenced for retrieval, but not  referenced for update.
    
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			__get
+		
+					($property $property)
+			
    
+	
+			
      
+					
    • 
+				$property
+				$property			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		__isset (line 239)
+	
     
+	
+	
+
    This will allow protected properties to be examined for whether they are set  without making them writable.  PHP 5.1 or later only.
    
+	
      
+				
    • access: public
      • 
+			
    
+	
+	
    
+		void
+		
+			__isset
+		
+					($property $property)
+			
    
+	
+			
      
+					
    • 
+				$property
+				$property			
      • 
+				
    
+		
+			
+	
    
+						
+		
    
+	
    
+
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/Principal/_inc---CalDAVPrincipal.php.html b/docs/api/davical/Principal/_inc---DAVPrincipal.php.html
similarity index 88%
rename from docs/api/davical/Principal/_inc---CalDAVPrincipal.php.html
rename to docs/api/davical/Principal/_inc---DAVPrincipal.php.html
index 44a9bfce..0989c95b 100644
--- a/docs/api/davical/Principal/_inc---CalDAVPrincipal.php.html
+++ b/docs/api/davical/Principal/_inc---DAVPrincipal.php.html
@@ -3,13 +3,13 @@
   
 		
 			
-			Docs for page CalDAVPrincipal.php
+			Docs for page DAVPrincipal.php
 			
 			
 		
 		
 			
    			
-
    File/inc/CalDAVPrincipal.php
    
+
    File/inc/DAVPrincipal.php
    
 
 
 
    
@@ -48,7 +48,7 @@
 						 class
-						CalDAVPrincipal
+						DAVPrincipal
 					
 					
 											A class for things to do with a DAV Principal
@@ -63,7 +63,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/Principal/_inc---Principal.php.html b/docs/api/davical/Principal/_inc---Principal.php.html
new file mode 100644
index 00000000..c3267e87
--- /dev/null
+++ b/docs/api/davical/Principal/_inc---Principal.php.html
@@ -0,0 +1,103 @@
+
+
+  
+		
+			
+			Docs for page Principal.php
+			
+			
+		
+		
+			
    			
+
    File/inc/Principal.php
    
+
+
+
    
+	
    Description
    
+	
    
+					Description |
+							Classes
+			|							Includes
+												
    
+	
    	
+		
+
    An object representing a 'Principal' read from the database
    
+	
+		
+			
    
+
    
+		
+		
+	
    
+		
    Classes
    
+		
    
+			Description |
+			Classes
+			|							Includes
+																		
    
+		
    	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
    ClassDescription
    
+						 class
+						Principal
+					
+											A class for things to do with a Principal
+										
    
+		
    
+	
    
+
+		
+	
    
+		
    Includes
    
+		
    
+			Description |
+							Classes
+				|						Includes
+														
    
+		
    	
+			
+
    
+	
+	
    
+		 
+		
+			require_once
+			('AwlCache.php')
+			(line 12)
+		
+	
    
+
+	
+
    An object representing a 'Principal' read from the database
    
+	
+	
+
    
+		
    
+	
    
+	
+	
+	
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/PublicSession/PublicSession.html b/docs/api/davical/PublicSession/PublicSession.html
index 3011c4fc..3c46d30a 100644
--- a/docs/api/davical/PublicSession/PublicSession.html
+++ b/docs/api/davical/PublicSession/PublicSession.html
@@ -101,7 +101,7 @@
 	
 	
    
 		
-		AllowedTo (line 78)
+		AllowedTo (line 92)
 	
     
 	
 	
@@ -133,7 +133,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/PublicSession/_inc---PublicSession.php.html b/docs/api/davical/PublicSession/_inc---PublicSession.php.html
index 75072dec..e58a9c72 100644
--- a/docs/api/davical/PublicSession/_inc---PublicSession.php.html
+++ b/docs/api/davical/PublicSession/_inc---PublicSession.php.html
@@ -63,7 +63,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/RRuleTest.html b/docs/api/davical/RRuleTest.html
index ef7edf21..e6512f01 100644
--- a/docs/api/davical/RRuleTest.html
+++ b/docs/api/davical/RRuleTest.html
@@ -295,7 +295,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/Request/CalDAVRequest.html b/docs/api/davical/Request/CalDAVRequest.html
index dce67ba8..b36fb678 100644
--- a/docs/api/davical/Request/CalDAVRequest.html
+++ b/docs/api/davical/Request/CalDAVRequest.html
@@ -27,7 +27,7 @@
         		
 
    A class for collecting things to do with this request.
    
 		
    
-			Located in /inc/CalDAVRequest.php (line 28)
+			Located in /inc/CalDAVRequest.php (line 29)
 		
    
 		
 				
@@ -50,7 +50,7 @@
 								
    
 		
    
 			
    
-																																																																																																																																
    
+																																																																																																																																								
    
 					 
 					mixed
 					$collection_id
@@ -74,6 +74,11 @@
 					 
 					mixed
 					$depth
+				
    
+																
    
+					 
+					mixed
+					$destination
 				
    
 																
    
 					 
@@ -92,7 +97,7 @@
 				
    
 																
    
 					 
-					CalDAVPrincipal
+					DAVPrincipal
 					$principal
 				
    
 																
    
@@ -136,7 +141,7 @@
 		
    
 		
    			
 			
    
-																																																																																																																																																																																																																																																																
    
+																																																																																																																																																																																																																																																								
    
 					 
 											CalDAVRequest
 										__construct
@@ -299,12 +304,6 @@
 											(array $unsupported)
 									
    
 																
    
-					 
-											void
-										UserFromPath
-										()
-									
    
-																
    
 					 
 											void
 										ValidateLockToken
@@ -342,7 +341,7 @@
 		
 			mixed
 			$collection_id
-						(line 68)
+						(line 69)
 		
 	
    
 
@@ -362,7 +361,7 @@
 		
 			mixed
 			$collection_path
-						(line 73)
+						(line 74)
 		
 	
    
 
@@ -382,7 +381,7 @@
 		
 			mixed
 			$collection_type
-						(line 79)
+						(line 80)
 		
 	
    
 
@@ -403,7 +402,7 @@
 		
 			mixed
 			$current_user_principal_xml
-						(line 58)
+						(line 59)
 		
 	
    
 
@@ -423,7 +422,7 @@
 		
 			mixed
 			$depth
-						(line 46)
+						(line 47)
 		
 	
    
 
@@ -435,15 +434,35 @@
 		
 
 
    
-
+
 
    
 
+	
    
+		
+		
+			mixed
+			$destination
+						(line 91)
+		
+	
    
+
+	
+
    The value of any 'Destionation:' header, if present.
    
+	
+	
+		
+		
+
+
    
+
+
    
+
 	
    
 		
 		
 			mixed
 			$exists
-						(line 85)
+						(line 86)
 		
 	
    
 
@@ -460,14 +479,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			mixed
 			$method
-						(line 40)
+						(line 41)
 		
 	
    
 
@@ -480,14 +499,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			mixed
 			$options
-						(line 30)
+						(line 31)
 		
 	
    
 
@@ -499,14 +518,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
-			CalDAVPrincipal
+			DAVPrincipal
 			$principal
-						(line 52)
+						(line 53)
 		
 	
    
 
@@ -519,14 +538,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			mixed
 			$privileges
-						(line 90)
+						(line 96)
 		
 	
    
 
@@ -542,14 +561,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			mixed
 			$raw_post
-						(line 35)
+						(line 36)
 		
 	
    
 
@@ -562,14 +581,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			mixed
 			$supported_privileges
-						(line 95)
+						(line 101)
 		
 	
    
 
@@ -582,14 +601,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			mixed
 			$ticket
-						(line 100)
+						(line 106)
 		
 	
    
 
@@ -605,14 +624,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			mixed
 			$user_agent
-						(line 63)
+						(line 64)
 		
 	
    
 
@@ -640,11 +659,11 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
-		Constructor __construct (line 105)
+		Constructor __construct (line 111)
 	
     
 	
 	
@@ -667,11 +686,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		AllowedTo (line 1001)
+		AllowedTo (line 955)
 	
     
 	
 	
@@ -695,11 +714,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		BuildSupportedPrivileges (line 963)
+		BuildSupportedPrivileges (line 917)
 	
     
 	
 	
@@ -725,11 +744,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		CoerceContentType (line 860)
+		CoerceContentType (line 813)
 	
     
 	
 	
@@ -747,11 +766,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		CollectionId (line 955)
+		CollectionId (line 909)
 	
     
 	
 	
@@ -769,11 +788,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		dav_name (line 726)
+		dav_name (line 679)
 	
     
 	
 	
@@ -791,11 +810,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		DepthRegexTail (line 744)
+		DepthRegexTail (line 697)
 	
     
 	
 	
@@ -813,11 +832,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		DoResponse (line 1178)
+		DoResponse (line 1132)
 	
     
 	
 	
@@ -846,11 +865,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		FailIfLocked (line 825)
+		FailIfLocked (line 778)
 	
     
 	
 	
@@ -871,11 +890,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		GetDepthName (line 735)
+		GetDepthName (line 688)
 	
     
 	
 	
@@ -893,11 +912,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		GetLockDetails (line 811)
+		GetLockDetails (line 764)
 	
     
 	
 	
@@ -920,11 +939,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		GetLockRow (line 755)
+		GetLockRow (line 708)
 	
     
 	
 	
@@ -950,11 +969,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		HavePrivilegeTo (line 1074)
+		HavePrivilegeTo (line 1028)
 	
     
 	
 	
@@ -977,11 +996,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsAddressBook (line 916)
+		IsAddressBook (line 870)
 	
     
 	
 	
@@ -999,11 +1018,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsCalendar (line 907)
+		IsCalendar (line 861)
 	
     
 	
 	
@@ -1021,11 +1040,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsCollection (line 896)
+		IsCollection (line 850)
 	
     
 	
 	
@@ -1043,11 +1062,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsInfiniteDepth (line 947)
+		IsInfiniteDepth (line 901)
 	
     
 	
 	
@@ -1065,11 +1084,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsLocked (line 678)
+		IsLocked (line 600)
 	
     
 	
 	
@@ -1090,11 +1109,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsPrincipal (line 925)
+		IsPrincipal (line 879)
 	
     
 	
 	
@@ -1112,11 +1131,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsProxyRequest (line 936)
+		IsProxyRequest (line 890)
 	
     
 	
 	
@@ -1134,11 +1153,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsPublic (line 715)
+		IsPublic (line 637)
 	
     
 	
 	
@@ -1156,11 +1175,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		MalformedRequest (line 1151)
+		MalformedRequest (line 1105)
 	
     
 	
 	
@@ -1183,11 +1202,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		NeedPrivilege (line 1110)
+		NeedPrivilege (line 1064)
 	
     
 	
 	
@@ -1216,11 +1235,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		PreconditionFailed (line 1135)
+		PreconditionFailed (line 1089)
 	
     
 	
 	
@@ -1249,11 +1268,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		Privileges (line 1066)
+		Privileges (line 1020)
 	
     
 	
 	
@@ -1271,11 +1290,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		setPermissions (line 610)
+		setPermissions (line 532)
 	
     
 	
 	
@@ -1301,11 +1320,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		UnsupportedRequest (line 1087)
+		UnsupportedRequest (line 1041)
 	
     
 	
 	
@@ -1326,35 +1345,13 @@
 				
 		
 			
-	
    
-
-
    
-	
-	
    
-		
-		UserFromPath (line 562)
-	
     
-	
-	
-
    Work out the user whose calendar we are accessing, based on elements of the path.
    
-	
-	
    
-		void
-		
-			UserFromPath
-		
-				()
-			
    
-	
-		
-			
 	
    
 
 
    
 	
 	
    
 		
-		ValidateLockToken (line 780)
+		ValidateLockToken (line 733)
 	
     
 	
 	
@@ -1381,7 +1378,7 @@
 	
 	
    
 		
-		XMLResponse (line 1163)
+		XMLResponse (line 1117)
 	
     
 	
 	
@@ -1412,7 +1409,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/Request/_inc---CalDAVRequest.php.html b/docs/api/davical/Request/_inc---CalDAVRequest.php.html
index 3d253f11..d0a2f09d 100644
--- a/docs/api/davical/Request/_inc---CalDAVRequest.php.html
+++ b/docs/api/davical/Request/_inc---CalDAVRequest.php.html
@@ -82,6 +82,36 @@
 		
 			include
 			("DAVTicket.php")
+			(line 20)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			("AwlCache.php")
+			(line 17)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			("DAVPrincipal.php")
 			(line 19)
 		
 	
    
@@ -97,21 +127,6 @@
 		
 			require_once
 			("XMLDocument.php")
-			(line 17)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			require_once
-			("CalDAVPrincipal.php")
 			(line 18)
 		
 	
    
@@ -133,13 +148,13 @@
 											
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
 		
 			DEPTH_INFINITY = 9999
-			(line 21)
+			(line 22)
 		
 	
    
 	
@@ -153,7 +168,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/Resource/DAVResource.html b/docs/api/davical/Resource/DAVResource.html
index 8f3b5c59..735fd2b6 100644
--- a/docs/api/davical/Resource/DAVResource.html
+++ b/docs/api/davical/Resource/DAVResource.html
@@ -28,7 +28,7 @@
         		
 
    A class for things to do with a DAV Resource
    
 		
    
-			Located in /inc/DAVResource.php (line 21)
+			Located in /inc/DAVResource.php (line 23)
 		
    
 		
 				
@@ -140,7 +140,7 @@
 		
    
 		
    			
 			
    
-																																																																																																																																																																																																																																																																																																																																																																																																
    
+																																																																																																																																																																																																																																																																																																																																																																																																																																
    
 					 
 											DAVResource
 										__construct
@@ -183,6 +183,12 @@
 											( &$reply, &XMLDocument $reply)
 									
    
 																
    
+					 
+											void
+										collection_id
+										()
+									
    
+																
    
 					 
 											void
 										ContainerExists
@@ -285,6 +291,12 @@
 											( &$xmldoc)
 									
    
 																
    
+					 
+											void
+										GetParentContainer
+										()
+									
    
+																
    
 					 
 											void
 										GetProperty
@@ -327,6 +339,12 @@
 										()
 									
    
 																
    
+					 
+											void
+										IsExternal
+										()
+									
    
+																
    
 					 
 											void
 										IsLocked
@@ -415,6 +433,12 @@
 											void
 										url
 										()
+									
    
+																
    
+					 
+											void
+										user_no
+										()
 									
    
 											
    
 		
    
@@ -436,14 +460,14 @@
 		
    
 			
 
-
    
+
    
 
 	
    
 		
 		
 			The
 			$bound_from
-						(line 61)
+						(line 63)
 		
 	
    
 
@@ -459,14 +483,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			The
 			$contenttype
-						(line 56)
+						(line 58)
 		
 	
    
 
@@ -482,14 +506,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			The
 			$dav_name
-						(line 26)
+						(line 28)
 		
 	
    
 
@@ -505,14 +529,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			Boolean:
 			$exists
-						(line 31)
+						(line 33)
 		
 	
    
 
@@ -528,14 +552,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			The
 			$parent
-						(line 46)
+						(line 48)
 		
 	
    
 
@@ -551,14 +575,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			The
 			$resource
-						(line 41)
+						(line 43)
 		
 	
    
 
@@ -574,14 +598,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			The
 			$resourcetypes
-						(line 51)
+						(line 53)
 		
 	
    
 
@@ -597,14 +621,14 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
 		
 			The
 			$unique_tag
-						(line 36)
+						(line 38)
 		
 	
    
 
@@ -636,11 +660,11 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
-		Constructor __construct (line 139)
+		Constructor __construct (line 146)
 	
     
 	
 	
@@ -663,11 +687,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		bound_from (line 1048)
+		bound_from (line 1138)
 	
     
 	
 	
@@ -685,11 +709,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		BuildACE (line 1173)
+		BuildACE (line 1284)
 	
     
 	
 	
@@ -718,11 +742,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		BuildPrivileges (line 680)
+		BuildPrivileges (line 762)
 	
     
 	
 	
@@ -748,11 +772,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		BuildSupportedMethods (line 769)
+		BuildSupportedMethods (line 851)
 	
     
 	
 	
@@ -770,11 +794,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		BuildSupportedReports (line 821)
+		BuildSupportedReports (line 903)
 	
     
 	
 	
@@ -797,11 +821,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		BuildTicketinfo (line 882)
+		BuildTicketinfo (line 964)
 	
     
 	
 	
@@ -829,13 +853,35 @@
 				
 		
 			
+	
    
+
+
    
+	
+	
    
+		
+		collection_id (line 1193)
+	
     
+	
+	
+
    Returns the internal collection_id for this collection, or the collection containing this resource
    
+	
+	
    
+		void
+		
+			collection_id
+		
+				()
+			
    
+	
+		
+			
 	
    
 
 
    
 	
 	
    
 		
-		ContainerExists (line 1016)
+		ContainerExists (line 1106)
 	
     
 	
 	
@@ -857,7 +903,7 @@
 	
 	
    
 		
-		ContainerType (line 1139)
+		ContainerType (line 1250)
 	
     
 	
 	
@@ -879,7 +925,7 @@
 	
 	
    
 		
-		DAV_AllProperties (line 1296)
+		DAV_AllProperties (line 1413)
 	
     
 	
 	
@@ -901,7 +947,7 @@
 	
 	
    
 		
-		dav_name (line 1039)
+		dav_name (line 1129)
 	
     
 	
 	
@@ -923,7 +969,7 @@
 	
 	
    
 		
-		Exists (line 998)
+		Exists (line 1088)
 	
     
 	
 	
@@ -945,11 +991,14 @@
 	
 	
    
 		
-		FetchCollection (line 301)
+		FetchCollection (line 470)
 	
     
 	
 	
 
    Find the collection associated with this resource.
    
+	
      
+				
    • access: protected
      • 
+			
    
 	
 	
    
 		void
@@ -967,11 +1016,14 @@
 	
 	
    
 		
-		FetchDeadProperties (line 538)
+		FetchDeadProperties (line 609)
 	
     
 	
 	
 
    Fetch any dead properties for this URL
    
+	
      
+				
    • access: protected
      • 
+			
    
 	
 	
    
 		void
@@ -989,7 +1041,7 @@
 	
 	
    
 		
-		FetchParentContainer (line 554)
+		FetchParentContainer (line 704)
 	
     
 	
 	
@@ -1011,11 +1063,14 @@
 	
 	
    
 		
-		FetchPrincipal (line 485)
+		FetchPrincipal (line 557)
 	
     
 	
 	
 
    Find the principal associated with this resource.
    
+	
      
+				
    • access: protected
      • 
+			
    
 	
 	
    
 		void
@@ -1033,11 +1088,14 @@
 	
 	
    
 		
-		FetchPrivileges (line 573)
+		FetchPrivileges (line 627)
 	
     
 	
 	
 
    Build permissions for this URL
    
+	
      
+				
    • access: protected
      • 
+			
    
 	
 	
    
 		void
@@ -1055,11 +1113,14 @@
 	
 	
    
 		
-		FetchResource (line 509)
+		FetchResource (line 580)
 	
     
 	
 	
 
    Retrieve the actual resource.
    
+	
      
+				
    • access: protected
      • 
+			
    
 	
 	
    
 		void
@@ -1077,7 +1138,7 @@
 	
 	
    
 		
-		FetchSupportedMethods (line 692)
+		FetchSupportedMethods (line 774)
 	
     
 	
 	
@@ -1099,7 +1160,7 @@
 	
 	
    
 		
-		FetchSupportedReports (line 783)
+		FetchSupportedReports (line 865)
 	
     
 	
 	
@@ -1121,7 +1182,7 @@
 	
 	
    
 		
-		FetchTickets (line 837)
+		FetchTickets (line 919)
 	
     
 	
 	
@@ -1143,7 +1204,7 @@
 	
 	
    
 		
-		FromPath (line 281)
+		FromPath (line 301)
 	
     
 	
 	
@@ -1170,7 +1231,7 @@
 	
 	
    
 		
-		FromRow (line 179)
+		FromRow (line 187)
 	
     
 	
 	
@@ -1197,7 +1258,7 @@
 	
 	
    
 		
-		GetACL (line 1194)
+		GetACL (line 1305)
 	
     
 	
 	
@@ -1219,12 +1280,34 @@
 		
 			
 	
    
-
+
 
    
 	
 	
    
 		
-		GetProperty (line 1225)
+		GetParentContainer (line 685)
+	
     
+	
+	
+
    Get a DAVResource which is the parent to this resource.
    
+	
+	
    
+		void
+		
+			GetParentContainer
+		
+				()
+			
    
+	
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		GetProperty (line 1337)
 	
     
 	
 	
@@ -1247,11 +1330,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		GetPropStat (line 1592)
+		GetPropStat (line 1712)
 	
     
 	
 	
@@ -1283,11 +1366,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		HavePrivilegeTo (line 643)
+		HavePrivilegeTo (line 725)
 	
     
 	
 	
@@ -1316,11 +1399,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsAddressbook (line 982)
+		IsAddressbook (line 1064)
 	
     
 	
 	
@@ -1338,11 +1421,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsBinding (line 990)
+		IsBinding (line 1072)
 	
     
 	
 	
@@ -1360,11 +1443,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsCalendar (line 962)
+		IsCalendar (line 1044)
 	
     
 	
 	
@@ -1382,11 +1465,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		IsCollection (line 946)
+		IsCollection (line 1028)
 	
     
 	
 	
@@ -1402,13 +1485,35 @@
 	
 		
 			
+	
    
+
+
    
+	
+	
    
+		
+		IsExternal (line 1080)
+	
     
+	
+	
+
    Checks whether this resource is a bind to an external resource
    
+	
+	
    
+		void
+		
+			IsExternal
+		
+				()
+			
    
+	
+		
+			
 	
    
 
 
    
 	
 	
    
 		
-		IsLocked (line 914)
+		IsLocked (line 996)
 	
     
 	
 	
@@ -1438,7 +1543,7 @@
 	
 	
    
 		
-		IsPrincipal (line 954)
+		IsPrincipal (line 1036)
 	
     
 	
 	
@@ -1460,7 +1565,7 @@
 	
 	
    
 		
-		IsPublic (line 1131)
+		IsPublic (line 1242)
 	
     
 	
 	
@@ -1482,7 +1587,7 @@
 	
 	
    
 		
-		IsSchedulingCollection (line 971)
+		IsSchedulingCollection (line 1053)
 	
     
 	
 	
@@ -1509,7 +1614,7 @@
 	
 	
    
 		
-		NeedPrivilege (line 665)
+		NeedPrivilege (line 747)
 	
     
 	
 	
@@ -1539,7 +1644,7 @@
 	
 	
    
 		
-		parent_path (line 1069)
+		parent_path (line 1159)
 	
     
 	
 	
@@ -1561,7 +1666,7 @@
 	
 	
    
 		
-		principal_url (line 1085)
+		principal_url (line 1175)
 	
     
 	
 	
@@ -1583,7 +1688,7 @@
 	
 	
    
 		
-		Privileges (line 631)
+		Privileges (line 713)
 	
     
 	
 	
@@ -1605,7 +1710,7 @@
 	
 	
    
 		
-		RenderAsXML (line 1650)
+		RenderAsXML (line 1770)
 	
     
 	
 	
@@ -1644,7 +1749,7 @@
 	
 	
    
 		
-		resource (line 1094)
+		resource (line 1202)
 	
     
 	
 	
@@ -1666,7 +1771,7 @@
 	
 	
    
 		
-		ResourceProperty (line 1315)
+		ResourceProperty (line 1432)
 	
     
 	
 	
@@ -1702,7 +1807,7 @@
 	
 	
    
 		
-		resource_id (line 1117)
+		resource_id (line 1228)
 	
     
 	
 	
@@ -1724,7 +1829,7 @@
 	
 	
    
 		
-		set_bind_location (line 1057)
+		set_bind_location (line 1147)
 	
     
 	
 	
@@ -1751,7 +1856,7 @@
 	
 	
    
 		
-		unique_tag (line 1103)
+		unique_tag (line 1211)
 	
     
 	
 	
@@ -1773,7 +1878,7 @@
 	
 	
    
 		
-		url (line 1028)
+		url (line 1118)
 	
     
 	
 	
@@ -1789,6 +1894,28 @@
 	
 		
 			
+	
    
+
+
    
+	
+	
    
+		
+		user_no (line 1184)
+	
     
+	
+	
+
    Returns the internal user_no for the principal for this resource
    
+	
+	
    
+		void
+		
+			user_no
+		
+				()
+			
    
+	
+		
+			
 	
    
 						
 		
    
@@ -1796,7 +1923,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/Resource/WritableCollection.html b/docs/api/davical/Resource/WritableCollection.html
index aa295456..f0560b8c 100644
--- a/docs/api/davical/Resource/WritableCollection.html
+++ b/docs/api/davical/Resource/WritableCollection.html
@@ -55,15 +55,15 @@
 			
    
 																																
    
 					 
-											void
+											string
 										WriteCalendarMember
-											($data $data, $create_resource $create_resource, [$segment_name $segment_name = null])
+											( $vcal, boolean $create_resource, [boolean $do_scheduling = false], [string $segment_name = null], [boolean $log_action = false])
 									
    
 																
    
 					 
-											void
+											string
 										WriteMember
-											($data $data, $create_resource $create_resource, [$segment_name $segment_name = null])
+											($resource $resource, $create_resource $create_resource, [$segment_name $segment_name = null], [boolean $log_action = true])
 									
    
 											
    
 		
    
@@ -136,67 +136,83 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
-		WriteCalendarMember (line 12)
+		WriteCalendarMember (line 19)
 	
     
 	
 	
-
    Writes the data to a member in the collection and returns the segment_name of the resource in our internal namespace.
    
+
    Writes the data to a member in the collection and returns the segment_name of the  resource in our internal namespace.
    
+	
      
+				
    • return: The segment_name of the resource within the collection, as written, or false on failure.
      • 
+			
    
 	
 	
    
-		void
+		string
 		
 			WriteCalendarMember
 		
-					($data $data, $create_resource $create_resource, [$segment_name $segment_name = null])
+					( $vcal, boolean $create_resource, [boolean $do_scheduling = false], [string $segment_name = null], [boolean $log_action = false])
 			
    
 	
 			
      
 					
    • 
-				$data
-				$data: iCalendar The resource to be written.			
      • 
+				vCalendar
+				$vcal: The resource to be written.			
 					
    • 
-				$create_resource
-				$create_resource: boolean True if this is a new resource.			
      • 
+				boolean
+				$create_resource: True if this is a new resource.			
 					
    • 
-				$segment_name
-				$segment_name: The name of the resource within the collection.			
      • 
+				boolean
+				$do_scheduling: True if we should also do scheduling for this write. Default false.			
+					
    • 
+				string
+				$segment_name: The name of the resource within the collection, or null if this                              call should invent one based on the UID of the vCalendar.			
      • 
+					
    • 
+				boolean
+				$log_action: Whether to log this action.  Defaults to false since this is normally called                              in situations where one is writing secondary data.			
      • 
 				
    
 		
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		WriteMember (line 259)
+		WriteMember (line 303)
 	
     
 	
 	
-
    Writes the data to a member in the collection and returns the segment_name of the resource in our internal namespace.
    
+
    Writes the data to a member in the collection and returns the segment_name of the  resource in our internal namespace.
    
+
    A caller who wants scheduling not to happen for this write must already  know they are dealing with a calendar, so should be calling WriteCalendarMember  directly.
    
+	
      
+				
    • return: The segment_name that was given, or one that was assigned if null was given.
      • 
+			
    
 	
 	
    
-		void
+		string
 		
 			WriteMember
 		
-					($data $data, $create_resource $create_resource, [$segment_name $segment_name = null])
+					($resource $resource, $create_resource $create_resource, [$segment_name $segment_name = null], [boolean $log_action = true])
 			
    
 	
 			
      
 					
    • 
-				$data
-				$data: mixed The resource to be written.			
      • 
+				boolean
+				$log_action: Whether to log this action.  Defaults to true since this is normally called                              in situations where one is writing primary data.			
+					
    • 
+				$resource
+				$resource: mixed The resource to be written.			
      • 
 					
    • 
 				$create_resource
 				$create_resource: boolean True if this is a new resource.			
      • 
 					
    • 
 				$segment_name
-				$segment_name: The name of the resource within the collection.			
      • 
+				$segment_name: The name of the resource within the collection, or false on failure.			
 				
    
 		
 			
@@ -221,6 +237,8 @@
 													 
 							DAVResource::BuildTicketinfo()
    
 													 
+							DAVResource::collection_id()
    
+													 
 							DAVResource::ContainerExists()
    
 													 
 							DAVResource::ContainerType()
    
@@ -255,6 +273,8 @@
 													 
 							DAVResource::GetACL()
    
 													 
+							DAVResource::GetParentContainer()
    
+													 
 							DAVResource::GetProperty()
    
 													 
 							DAVResource::GetPropStat()
    
@@ -269,6 +289,8 @@
 													 
 							DAVResource::IsCollection()
    
 													 
+							DAVResource::IsExternal()
    
+													 
 							DAVResource::IsLocked()
    
 													 
 							DAVResource::IsPrincipal()
    
@@ -298,6 +320,8 @@
 							DAVResource::unique_tag()
    
 													 
 							DAVResource::url()
    
+													 
+							DAVResource::user_no()
    
 											
 										
 		
    
@@ -305,7 +329,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/Resource/_inc---DAVResource.php.html b/docs/api/davical/Resource/_inc---DAVResource.php.html
index 4f172049..3eedd1b5 100644
--- a/docs/api/davical/Resource/_inc---DAVResource.php.html
+++ b/docs/api/davical/Resource/_inc---DAVResource.php.html
@@ -69,14 +69,14 @@
 				|						Includes
 														
    
 		
    	
-			
-
    
+			
+
    
 	
 	
    
 		 
 		
 			require_once
-			('AwlQuery.php')
+			('AwlCache.php')
 			(line 12)
 		
 	
    
@@ -89,6 +89,21 @@
 				
  • license: GNU GPL v3 or later
    • 
 			
 	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			('AwlQuery.php')
+			(line 13)
+		
+	
    
+
+	
+	
 
    
 
 
    
@@ -98,7 +113,22 @@
 		
 			require_once
 			('DAVTicket.php')
-			(line 13)
+			(line 14)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			('iCalendar.php')
+			(line 15)
 		
 	
    
 
@@ -112,7 +142,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/SqlToArray.html b/docs/api/davical/SqlToArray.html
new file mode 100644
index 00000000..9e3b8404
--- /dev/null
+++ b/docs/api/davical/SqlToArray.html
@@ -0,0 +1,273 @@
+
+
+  
+		
+			
+			Docs For Class SqlToArray
+			
+			
+		
+		
+			
    			
+
     Class SqlToArray
    
+
+
+
    
+	
    Description
    
+	
    
+					Description |
+													Vars (details)
+						|											Methods (details)
+						
+					
    
+	
    
+        		
+		
    
+			Located in /htdocs/SqlToArray.php (line 3)
+		
    
+		
+				
+		
    
+	
+			
    
+
    
+
+
+
+	
+	
    
+		
    Variable Summary
    
+		
    
+			Description |
+						Vars (details)
+							| 
+									Methods (details)
+							
+								
    
+		
    
+			
    
+																																								
    
+					 
+					mixed
+					$state
+				
    
+																
    
+					 
+					mixed
+					$statement
+				
    
+																
    
+					 
+					mixed
+					$statements
+				
    
+											
    
+		
    
+	
    
+
+	
+	
    
+		
    Method Summary
    
+		
    
+			Description |
+																		Vars (details)
+				 
+				|
+						Methods (details)
+		
    
+		
    			
+			
    
+																																								
    
+					 
+											SqlToArray
+										__construct
+											( $filename)
+									
    
+																
    
+					 
+											void
+										doNormalLine
+											( $s)
+									
    
+																
    
+					 
+											void
+										getStatements
+										()
+									
    
+											
    
+		
    
+	
    		
+
+	
+	
    
+		
    Variables
    
+		
    
+			Description |
+										Vars (details)
+						
+			
+										| 
+									Methods (details)
+							
+					
    
+		
    
+			
+
+
    
+
+	
    
+		
+		
+			mixed
+			$state
+						(line 6)
+		
+	
    
+
+	
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$statement
+						(line 5)
+		
+	
    
+
+	
+	
+	
+		
+		
+
+
    
+
+
    
+
+	
    
+		
+		
+			mixed
+			$statements
+						(line 4)
+		
+	
    
+
+	
+	
+	
+		
+		
+
+
    
+						
+		
    
+	
    
+	
+	
+	
    
+		
    Methods
    
+		
    
+			Description |
+															Vars (details)
+														Methods (details)
+						
+		
    
+		
    
+			
+
+
    
+	
+	
    
+		
+		Constructor __construct (line 8)
+	
     
+	
+	
+	
+	
    
+		SqlToArray
+		
+			__construct
+		
+					( $filename)
+			
    
+	
+			
      
+					
    • 
+				
+				$filename			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		doNormalLine (line 32)
+	
     
+	
+	
+	
+	
    
+		void
+		
+			doNormalLine
+		
+					( $s)
+			
    
+	
+			
      
+					
    • 
+				
+				$s			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		getStatements (line 45)
+	
     
+	
+	
+	
+	
    
+		void
+		
+			getStatements
+		
+				()
+			
    
+	
+		
+			
+	
    
+						
+		
    
+	
    
+
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/VCard.html b/docs/api/davical/VCard.html
index 1ffe056b..4d26e42d 100644
--- a/docs/api/davical/VCard.html
+++ b/docs/api/davical/VCard.html
@@ -88,7 +88,7 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
@@ -117,7 +117,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -143,7 +143,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -169,7 +169,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -200,7 +200,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---SqlToArray.php.html b/docs/api/davical/_htdocs---SqlToArray.php.html
new file mode 100644
index 00000000..8dc39eab
--- /dev/null
+++ b/docs/api/davical/_htdocs---SqlToArray.php.html
@@ -0,0 +1,63 @@
+
+
+  
+		
+			
+			Docs for page SqlToArray.php
+			
+			
+		
+		
+			
    			
+
    File/htdocs/SqlToArray.php
    
+
+
+
    
+	
    Description
    
+	
    
+					Description |
+							Classes
+														
    
+	
    	
+		
+		
+			
    
+
    
+		
+		
+	
    
+		
    Classes
    
+		
    
+			Description |
+			Classes
+																	
    
+		
    	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
    ClassDescription
    
+						 class
+						SqlToArray
+					
+											
+										
    
+		
    
+	
    
+
+	
+	
+	
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---admin.php.html b/docs/api/davical/_htdocs---admin.php.html
index fbd8022f..84187c50 100644
--- a/docs/api/davical/_htdocs---admin.php.html
+++ b/docs/api/davical/_htdocs---admin.php.html
@@ -206,7 +206,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:02 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---always.php.html b/docs/api/davical/_htdocs---always.php.html
index 6a195b1c..ede3a268 100644
--- a/docs/api/davical/_htdocs---always.php.html
+++ b/docs/api/davical/_htdocs---always.php.html
@@ -42,15 +42,15 @@
 				|													Functions
 					
    
 		
    	
-			
+			
 
    
 	
 	
    
 		 
 		
 			include
-			(davical_configuration_missing.php)
-			(line 141)
+			('../config/config.php')
+			(line 139)
 		
 	
    
 
@@ -65,53 +65,7 @@
 		
 			include
 			('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php')
-			(line 129)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include
-			('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php')
-			(line 123)
-		
-	
    
-
-	
-
    We use @file_exists because things like open_basedir might noisily deny  access which could break DAViCal completely by causing output to start  too early.
    
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include
-			('/etc/davical/config.php')
-			(line 126)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include
-			('../config/config.php')
-			(line 135)
+			(line 133)
 		
 	
    
 
@@ -119,19 +73,35 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
 		
 			include
 			('/usr/local/etc/davical/config.php')
-			(line 132)
+			(line 136)
 		
 	
    
 
 	
 	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php')
+			(line 127)
+		
+	
    
+
+	
+
    We use @file_exists because things like open_basedir might noisily deny  access which could break DAViCal completely by causing output to start  too early.
    
+	
 
    
 
 
    
@@ -141,7 +111,37 @@
 		
 			include
 			('config/config.php')
-			(line 138)
+			(line 142)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(davical_configuration_missing.php)
+			(line 145)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			('/etc/davical/config.php')
+			(line 130)
 		
 	
    
 
@@ -156,7 +156,7 @@
 		
 			include_once
 			('AWLUtilities.php')
-			(line 74)
+			(line 90)
 		
 	
    
 
@@ -171,7 +171,7 @@
 		
 			include_once
 			('AWLUtilities.php')
-			(line 86)
+			(line 77)
 		
 	
    
 
@@ -186,13 +186,28 @@
 		
 			require_once
 			('AwlQuery.php')
-			(line 187)
+			(line 191)
 		
 	
    
 
 	
 
    Force the domain name to what was in the configuration file
    
 	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			(Principal.php)
+			(line 209)
+		
+	
    
+
+	
+	
 
    
 		
    
 	
    
@@ -208,13 +223,13 @@
 					
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
 		
 			DAVICAL_ADDRESSBOOK_MAXPRIV = "1023"
-			(line 435)
+			(line 355)
 		
 	
    
 	
@@ -223,13 +238,13 @@
 		
 
    
 
-
    
+
    
 	
 	
    
 		
 		
 			DAVICAL_MAXPRIV = "65535"
-			(line 434)
+			(line 354)
 		
 	
    
 	
@@ -256,11 +271,11 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
-		bits_to_privilege (line 486)
+		bits_to_privilege (line 406)
 	
     
 
 	
@@ -288,11 +303,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		ConstructURL (line 354)
+		ConstructURL (line 273)
 	
     
 
 	
@@ -317,11 +332,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		DateToISODate (line 423)
+		DateToISODate (line 342)
 	
     
 
 	
@@ -331,23 +346,26 @@
 		
 			DateToISODate
 		
-					(string $indate)
+					(string $indate, [ $in_utc = false])
 			
    
 
 			
      
 					
    • 
 				string
 				$indate: The date to convert			
      • 
+					
    • 
+				
+				$in_utc			
      • 
 				
    
 		
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		DeconstructURL (line 383)
+		DeconstructURL (line 302)
 	
     
 
 	
@@ -375,7 +393,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
@@ -403,45 +421,13 @@
 				
 		
 	
-
    
-
-
    
-	
-	
    
-		
-		getPrincipalByID (line 284)
-	
     
-
-	
-
    Return a user record identified by a user_no, caching it for any subsequent lookup
    
-	
    
-		void
-		
-			getPrincipalByID
-		
-					( $principal_id, [boolean $use_cache = true], int $user_no)
-			
    
-
-			
      
-					
    • 
-				int
-				$user_no: The ID of the record to retrieve			
      • 
-					
    • 
-				boolean
-				$use_cache: Whether or not to use the cache (default: yes)			
      • 
-					
    • 
-				
-				$principal_id			
      • 
-				
    
-		
-	
 
    
 
 
    
 	
 	
    
 		
-		getStatusMessage (line 297)
+		getStatusMessage (line 216)
 	
     
 
 	
@@ -464,100 +450,13 @@
 				
 		
 	
-
    
-
-
    
-	
-	
    
-		
-		getUserByEMail (line 258)
-	
     
-
-	
-
    Return a user record identified by e-mail address, caching it for any subsequent lookup
    
-	
    
-		void
-		
-			getUserByEMail
-		
-					(string $email, [boolean $use_cache = true])
-			
    
-
-			
      
-					
    • 
-				string
-				$email: The email address of the user record to retrieve			
      • 
-					
    • 
-				boolean
-				$use_cache: Whether or not to use the cache (default: yes)			
      • 
-				
    
-		
-	
-
    
-
-
    
-	
-	
    
-		
-		getUserByID (line 271)
-	
     
-
-	
-
    Return a user record identified by a user_no, caching it for any subsequent lookup
    
-	
    
-		void
-		
-			getUserByID
-		
-					(int $user_no, [boolean $use_cache = true])
-			
    
-
-			
      
-					
    • 
-				int
-				$user_no: The ID of the record to retrieve			
      • 
-					
    • 
-				boolean
-				$use_cache: Whether or not to use the cache (default: yes)			
      • 
-				
    
-		
-	
-
    
-
-
    
-	
-	
    
-		
-		getUserByName (line 245)
-	
     
-
-	
-
    Return a user record identified by a username, caching it for any subsequent lookup
    
-	
    
-		void
-		
-			getUserByName
-		
-					(string $username, [boolean $use_cache = true])
-			
    
-
-			
      
-					
    • 
-				string
-				$username: The username of the record to retrieve			
      • 
-					
    • 
-				boolean
-				$use_cache: Whether or not to use the cache (default: yes)			
      • 
-				
    
-		
-	
 
    
 
-
    
+
    
 	
 	
    
 		
-		ISODateToHTTPDate (line 414)
+		ISODateToHTTPDate (line 333)
 	
     
 
 	
@@ -579,11 +478,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		privileges_to_XML (line 533)
+		privileges_to_XML (line 453)
 	
     
 
 	
@@ -608,11 +507,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		privilege_to_bits (line 436)
+		privilege_to_bits (line 356)
 	
     
 
 	
@@ -631,40 +530,12 @@
 				
 		
 	
-
    
-
-
    
-	
-	
    
-		
-		_davical_get_principal_query_cached (line 211)
-	
     
-
-	
-	
    
-		void
-		
-			_davical_get_principal_query_cached
-		
-					( $where,  $parameter)
-			
    
-
-			
      
-					
    • 
-				
-				$where			
      • 
-					
    • 
-				
-				$parameter			
      • 
-				
    
-		
-	
 
    
 		
    
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:02 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---createdb.php.html b/docs/api/davical/_htdocs---createdb.php.html
new file mode 100644
index 00000000..ec6c7cb9
--- /dev/null
+++ b/docs/api/davical/_htdocs---createdb.php.html
@@ -0,0 +1,99 @@
+
+
+  
+		
+			
+			Docs for page createdb.php
+			
+			
+		
+		
+			
    			
+
    File/htdocs/createdb.php
    
+
+
+
    
+	
    Description
    
+	
    
+					Description |
+									Includes
+			|											Functions
+			
    
+	
    	
+		
+		
+			
    
+
    
+		
+
+		
+	
    
+		
    Includes
    
+		
    
+			Description |
+						Includes
+			|													Functions
+					
    
+		
    	
+			
+
    
+	
+	
    
+		 
+		
+			include
+			('dbexec.php')
+			(line 14)
+		
+	
    
+
+	
+	
+
    
+		
    
+	
    
+	
+	
+	
+		
+	
    
+		
    Functions
    
+		
    
+			Description |
+										Includes
+				|												Functions
+		
    
+		
    	
+			
+
    
+	
+	
    
+		
+		removeComment (line 6)
+	
     
+
+	
+	
    
+		void
+		
+			removeComment
+		
+					( $s)
+			
    
+
+			
      
+					
    • 
+				
+				$s			
      • 
+				
    
+		
+	
+
    
+		
    
+	
    
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---dbexec.php.html b/docs/api/davical/_htdocs---dbexec.php.html
new file mode 100644
index 00000000..c2961e05
--- /dev/null
+++ b/docs/api/davical/_htdocs---dbexec.php.html
@@ -0,0 +1,63 @@
+
+
+  
+		
+			
+			Docs for page dbexec.php
+			
+			
+		
+		
+			
    			
+
    File/htdocs/dbexec.php
    
+
+
+
    
+	
    Description
    
+	
    
+					Description |
+									Includes
+												
    
+	
    	
+		
+		
+			
    
+
    
+		
+
+		
+	
    
+		
    Includes
    
+		
    
+			Description |
+						Includes
+														
    
+		
    	
+			
+
    
+	
+	
    
+		 
+		
+			include
+			('SqlToArray.php')
+			(line 36)
+		
+	
    
+
+	
+
    sudo -s su - postgres
    
+
    createuser jayden
    
+	
+
    
+		
    
+	
    
+	
+	
+	
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:10 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---feed.php.html b/docs/api/davical/_htdocs---feed.php.html
index 4db291af..5c790ac2 100644
--- a/docs/api/davical/_htdocs---feed.php.html
+++ b/docs/api/davical/_htdocs---feed.php.html
@@ -35,9 +35,24 @@
 			|													Functions
 					
    
 		
    	
-			
+			
 
    
 	
+	
    
+		 
+		
+			require_once
+			(HTTPAuthSession.php)
+			(line 14)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
 	
    
 		 
 		
@@ -55,6 +70,51 @@
 				
  • license: GPL
    • 
 			
 	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			('AwlCache.php')
+			(line 12)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			("vComponent.php")
+			(line 20)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			(DAVResource.php)
+			(line 21)
+		
+	
    
+
+	
+	
 
    
 
 
    
@@ -64,22 +124,7 @@
 		
 			require_once
 			(CalDAVRequest.php)
-			(line 15)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			require_once
-			(HTTPAuthSession.php)
-			(line 12)
+			(line 17)
 		
 	
    
 
@@ -101,11 +146,11 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
-		caldav_get_feed (line 26)
+		caldav_get_feed (line 32)
 	
     
 
 	
@@ -114,23 +159,26 @@
 		
 			caldav_get_feed
 		
-					( $request)
+					( $request,  $collection)
 			
    
 
 			
      
 					
    • 
 				
 				$request			
      • 
+					
    • 
+				
+				$collection			
      • 
 				
    
 		
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		hyperlink (line 22)
+		hyperlink (line 28)
 	
     
 
 	
@@ -156,7 +204,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---freebusy.php.html b/docs/api/davical/_htdocs---freebusy.php.html
index 09fa38fd..ba662f48 100644
--- a/docs/api/davical/_htdocs---freebusy.php.html
+++ b/docs/api/davical/_htdocs---freebusy.php.html
@@ -34,7 +34,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -49,7 +49,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -64,7 +64,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -79,7 +79,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -95,7 +95,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -116,7 +116,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---help.php.html b/docs/api/davical/_htdocs---help.php.html
index 0aa04970..145ea3dd 100644
--- a/docs/api/davical/_htdocs---help.php.html
+++ b/docs/api/davical/_htdocs---help.php.html
@@ -34,7 +34,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -49,7 +49,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -64,7 +64,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -79,7 +79,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -94,7 +94,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -115,7 +115,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---index.php.html b/docs/api/davical/_htdocs---index.php.html
index 03d302c9..651b00fb 100644
--- a/docs/api/davical/_htdocs---index.php.html
+++ b/docs/api/davical/_htdocs---index.php.html
@@ -34,7 +34,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -49,7 +49,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -65,7 +65,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -80,7 +80,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -95,7 +95,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -110,7 +110,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -131,7 +131,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---newfile.php.html b/docs/api/davical/_htdocs---newfile.php.html
new file mode 100644
index 00000000..d64ed250
--- /dev/null
+++ b/docs/api/davical/_htdocs---newfile.php.html
@@ -0,0 +1,61 @@
+
+
+  
+		
+			
+			Docs for page newfile.php
+			
+			
+		
+		
+			
    			
+
    File/htdocs/newfile.php
    
+
+
+
    
+	
    Description
    
+	
    
+					Description |
+									Includes
+												
    
+	
    	
+		
+		
+			
    
+
    
+		
+
+		
+	
    
+		
    Includes
    
+		
    
+			Description |
+						Includes
+														
    
+		
    	
+			
+
    
+	
+	
    
+		 
+		
+			require_once
+			('/home/karora/projects/awl/inc/XMLDocument.php')
+			(line 2)
+		
+	
    
+
+	
+	
+
    
+		
    
+	
    
+	
+	
+	
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---setup.php.html b/docs/api/davical/_htdocs---setup.php.html
index f7862e15..5102b407 100644
--- a/docs/api/davical/_htdocs---setup.php.html
+++ b/docs/api/davical/_htdocs---setup.php.html
@@ -16,7 +16,8 @@
 	
    Description
    
 	
    
 					Description |
-									Includes
+							Classes
+			|							Includes
 			|											Functions
 			
    
 	
    	
@@ -25,13 +26,43 @@
 			
    
 
    
 		
+		
+	
    
+		
    Classes
    
+		
    
+			Description |
+			Classes
+			|							Includes
+				|																Functions
+					
    
+		
    	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
    ClassDescription
    
+						 class
+						CheckResult
+					
+											
+										
    
+		
    
+	
    
 
 		
 	
    
 		
    Includes
    
 		
    
 			Description |
-						Includes
+							Classes
+				|						Includes
 			|													Functions
 					
    
 		
    	
@@ -43,37 +74,7 @@
 		
 			include
 			(page-footer.php)
-			(line 291)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include
-			(DAViCalSession.php)
-			(line 71)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include
-			(interactive-page.php)
-			(line 87)
+			(line 379)
 		
 	
    
 
@@ -88,7 +89,7 @@
 		
 			include
 			("./always.php")
-			(line 70)
+			(line 123)
 		
 	
    
 
@@ -103,7 +104,37 @@
 		
 			include
 			(page-header.php)
-			(line 88)
+			(line 133)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(interactive-page.php)
+			(line 132)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(DAViCalSession.php)
+			(line 124)
 		
 	
    
 
@@ -118,7 +149,7 @@
 		
 			require_once
 			("AwlQuery.php")
-			(line 90)
+			(line 135)
 		
 	
    
 
@@ -135,16 +166,37 @@
 		
    Functions
    
 		
    
 			Description |
-										Includes
+							Classes
+				|										Includes
 				|												Functions
 		
    
 		
    	
-			
+			
 
    
 	
 	
    
 		
-		build_site_statistics (line 123)
+		build_dependencies_table (line 227)
+	
     
+
+	
+	
    
+		void
+		
+			build_dependencies_table
+		
+				()
+			
    
+
+		
+	
+
    
+
+
    
+	
+	
    
+		
+		build_site_statistics (line 199)
 	
     
 
 	
@@ -160,11 +212,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		check_awl_version (line 113)
+		check_awl_version (line 184)
 	
     
 
 	
@@ -178,13 +230,33 @@
 
 		
 	
+
    
+
+
    
+	
+	
    
+		
+		check_datetime (line 138)
+	
     
+
+	
+	
    
+		void
+		
+			check_datetime
+		
+				()
+			
    
+
+		
+	
 
    
 
 
    
 	
 	
    
 		
-		check_davical_version (line 102)
+		check_davical_version (line 168)
 	
     
 
 	
@@ -204,7 +276,7 @@
 	
 	
    
 		
-		check_gettext (line 23)
+		check_gettext (line 60)
 	
     
 
 	
@@ -218,13 +290,53 @@
 
 		
 	
+
    
+
+
    
+	
+	
    
+		
+		check_iconv (line 67)
+	
     
+
+	
+	
    
+		void
+		
+			check_iconv
+		
+				()
+			
    
+
+		
+	
+
    
+
+
    
+	
+	
    
+		
+		check_ldap (line 74)
+	
     
+
+	
+	
    
+		void
+		
+			check_ldap
+		
+				()
+			
    
+
+		
+	
 
    
 
 
    
 	
 	
    
 		
-		check_magic_quotes_gpc (line 41)
+		check_magic_quotes_gpc (line 88)
 	
     
 
 	
@@ -244,7 +356,7 @@
 	
 	
    
 		
-		check_magic_quotes_runtime (line 51)
+		check_magic_quotes_runtime (line 92)
 	
     
 
 	
@@ -264,7 +376,7 @@
 	
 	
    
 		
-		check_pdo (line 12)
+		check_pdo (line 49)
 	
     
 
 	
@@ -284,7 +396,7 @@
 	
 	
    
 		
-		check_pdo_pgsql (line 16)
+		check_pdo_pgsql (line 53)
 	
     
 
 	
@@ -304,7 +416,7 @@
 	
 	
    
 		
-		check_pgsql (line 8)
+		check_pgsql (line 45)
 	
     
 
 	
@@ -325,7 +437,7 @@
 	
 	
    
 		
-		check_schema_version (line 92)
+		check_schema_version (line 146)
 	
     
 
 	
@@ -345,7 +457,7 @@
 	
 	
    
 		
-		check_suhosin_server_strip (line 30)
+		check_suhosin_server_strip (line 81)
 	
     
 
 	
@@ -365,7 +477,7 @@
 	
 	
    
 		
-		do_error (line 61)
+		do_error (line 99)
 	
     
 
 	
@@ -384,12 +496,58 @@
 				
 		
 	
+
    
+
+
    
+	
+	
    
+		
+		get_phpinfo (line 111)
+	
     
+
+	
+	
    
+		void
+		
+			get_phpinfo
+		
+				()
+			
    
+
+		
+	
+
    
+
+
    
+	
+	
    
+		
+		i18n (line 4)
+	
     
+
+	
+
    todo work out something more than true/false returns for dependency checks
    
+	
    
+		void
+		
+			i18n
+		
+					( $value)
+			
    
+
+			
      
+					
    • 
+				
+				$value			
      • 
+				
    
+		
+	
 
    
 		
    
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---test.php.html b/docs/api/davical/_htdocs---test.php.html
index c625addb..f13fc395 100644
--- a/docs/api/davical/_htdocs---test.php.html
+++ b/docs/api/davical/_htdocs---test.php.html
@@ -15,9 +15,7 @@
 
    
 	
    Description
    
 	
    
-					Description |
-									Includes
-												
    
+													
    
 	
    	
 		
 		
@@ -25,37 +23,12 @@
 
    
 		
 
-		
-	
    
-		
    Includes
    
-		
    
-			Description |
-						Includes
-														
    
-		
    	
-			
-
    
-	
-	
    
-		 
-		
-			include
-			('./always.php')
-			(line 3)
-		
-	
    
-
-	
-	
-
    
-		
    
-	
    
 	
 	
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---upgrade.php.html b/docs/api/davical/_htdocs---upgrade.php.html
index effc098c..97bdec1a 100644
--- a/docs/api/davical/_htdocs---upgrade.php.html
+++ b/docs/api/davical/_htdocs---upgrade.php.html
@@ -34,7 +34,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -49,7 +49,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -64,7 +64,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -79,7 +79,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -94,7 +94,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -110,7 +110,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -125,7 +125,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -146,7 +146,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_htdocs---well-known.php.html b/docs/api/davical/_htdocs---well-known.php.html
index 1e0a621e..f95f2f2d 100644
--- a/docs/api/davical/_htdocs---well-known.php.html
+++ b/docs/api/davical/_htdocs---well-known.php.html
@@ -36,7 +36,7 @@
 					
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -51,7 +51,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -66,7 +66,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -81,7 +81,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -110,7 +110,7 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
@@ -133,7 +133,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---AtomFeed.php.html b/docs/api/davical/_inc---AtomFeed.php.html
index 856c08ae..2a8df665 100644
--- a/docs/api/davical/_inc---AtomFeed.php.html
+++ b/docs/api/davical/_inc---AtomFeed.php.html
@@ -152,7 +152,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:02 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---WritableCollection.php.html b/docs/api/davical/_inc---WritableCollection.php.html
index 11ed873c..11300e22 100644
--- a/docs/api/davical/_inc---WritableCollection.php.html
+++ b/docs/api/davical/_inc---WritableCollection.php.html
@@ -64,7 +64,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -85,7 +85,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---caldav-LOCK.php.html b/docs/api/davical/_inc---caldav-LOCK.php.html
index 89bfefc2..eaf2d68d 100644
--- a/docs/api/davical/_inc---caldav-LOCK.php.html
+++ b/docs/api/davical/_inc---caldav-LOCK.php.html
@@ -56,7 +56,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---caldav-REPORT-calquery.php.html b/docs/api/davical/_inc---caldav-REPORT-calquery.php.html
index de70b057..e8b9f0c6 100644
--- a/docs/api/davical/_inc---caldav-REPORT-calquery.php.html
+++ b/docs/api/davical/_inc---caldav-REPORT-calquery.php.html
@@ -37,11 +37,11 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
-		apply_filter (line 80)
+		apply_filter (line 85)
 	
     
 
 	
@@ -72,11 +72,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		BuildSqlFilter (line 260)
+		BuildSqlFilter (line 285)
 	
     
 
 	
@@ -104,7 +104,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
@@ -129,11 +129,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		SqlFilterFragment (line 95)
+		SqlFilterFragment (line 101)
 	
     
 
 	
@@ -167,7 +167,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---caldav-REPORT-cardquery.php.html b/docs/api/davical/_inc---caldav-REPORT-cardquery.php.html
index f0b94402..f55e9d1e 100644
--- a/docs/api/davical/_inc---caldav-REPORT-cardquery.php.html
+++ b/docs/api/davical/_inc---caldav-REPORT-cardquery.php.html
@@ -36,7 +36,7 @@
 					
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -65,7 +65,7 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
@@ -90,7 +90,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
@@ -128,7 +128,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---caldav-REPORT-expand-property.php.html b/docs/api/davical/_inc---caldav-REPORT-expand-property.php.html
index 179bf9d7..339ce209 100644
--- a/docs/api/davical/_inc---caldav-REPORT-expand-property.php.html
+++ b/docs/api/davical/_inc---caldav-REPORT-expand-property.php.html
@@ -37,7 +37,7 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
@@ -72,7 +72,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
@@ -101,7 +101,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---caldav-REPORT-freebusy.php.html b/docs/api/davical/_inc---caldav-REPORT-freebusy.php.html
index 2a9164ce..46312c5b 100644
--- a/docs/api/davical/_inc---caldav-REPORT-freebusy.php.html
+++ b/docs/api/davical/_inc---caldav-REPORT-freebusy.php.html
@@ -34,7 +34,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -56,7 +56,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---caldav-REPORT-multiget.php.html b/docs/api/davical/_inc---caldav-REPORT-multiget.php.html
index 1e591d95..f5c91ab1 100644
--- a/docs/api/davical/_inc---caldav-REPORT-multiget.php.html
+++ b/docs/api/davical/_inc---caldav-REPORT-multiget.php.html
@@ -28,7 +28,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---caldav-REPORT-principal-match.php.html b/docs/api/davical/_inc---caldav-REPORT-principal-match.php.html
new file mode 100644
index 00000000..4f85174f
--- /dev/null
+++ b/docs/api/davical/_inc---caldav-REPORT-principal-match.php.html
@@ -0,0 +1,34 @@
+
+
+  
+		
+			
+			Docs for page caldav-REPORT-principal-match.php
+			
+			
+		
+		
+			
    			
+
    File/inc/caldav-REPORT-principal-match.php
    
+
+
+
    
+	
    Description
    
+	
    
+													
    
+	
    	
+		
+		
+			
    
+
    
+		
+
+	
+	
+	
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/_inc---caldav-REPORT-principal.php.html b/docs/api/davical/_inc---caldav-REPORT-principal.php.html
index 23898a7a..70cb8fd5 100644
--- a/docs/api/davical/_inc---caldav-REPORT-principal.php.html
+++ b/docs/api/davical/_inc---caldav-REPORT-principal.php.html
@@ -29,7 +29,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---check_UTF8.php.html b/docs/api/davical/_inc---check_UTF8.php.html
index ce512974..522a4838 100644
--- a/docs/api/davical/_inc---check_UTF8.php.html
+++ b/docs/api/davical/_inc---check_UTF8.php.html
@@ -37,7 +37,7 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
@@ -62,7 +62,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
@@ -89,7 +89,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
@@ -119,7 +119,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---davical_configuration_missing.php.html b/docs/api/davical/_inc---davical_configuration_missing.php.html
index b7de1d84..2e38ba30 100644
--- a/docs/api/davical/_inc---davical_configuration_missing.php.html
+++ b/docs/api/davical/_inc---davical_configuration_missing.php.html
@@ -34,7 +34,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -49,7 +49,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -70,7 +70,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---freebusy-functions.php.html b/docs/api/davical/_inc---freebusy-functions.php.html
index 0c2c9466..2e33d416 100644
--- a/docs/api/davical/_inc---freebusy-functions.php.html
+++ b/docs/api/davical/_inc---freebusy-functions.php.html
@@ -36,7 +36,7 @@
 					
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -52,7 +52,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -81,7 +81,7 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
@@ -118,7 +118,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---interactive-page.php.html b/docs/api/davical/_inc---interactive-page.php.html
index 0ced303a..7f51a7b0 100644
--- a/docs/api/davical/_inc---interactive-page.php.html
+++ b/docs/api/davical/_inc---interactive-page.php.html
@@ -34,7 +34,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -55,7 +55,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---other_translated_strings.php.html b/docs/api/davical/_inc---other_translated_strings.php.html
index 6e27833c..42d14552 100644
--- a/docs/api/davical/_inc---other_translated_strings.php.html
+++ b/docs/api/davical/_inc---other_translated_strings.php.html
@@ -28,7 +28,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---page-footer.php.html b/docs/api/davical/_inc---page-footer.php.html
index ae90fd07..0285b555 100644
--- a/docs/api/davical/_inc---page-footer.php.html
+++ b/docs/api/davical/_inc---page-footer.php.html
@@ -28,7 +28,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---page-header.php.html b/docs/api/davical/_inc---page-header.php.html
index 59319fe6..877d8389 100644
--- a/docs/api/davical/_inc---page-header.php.html
+++ b/docs/api/davical/_inc---page-header.php.html
@@ -85,7 +85,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---pubsub.php.html b/docs/api/davical/_inc---pubsub.php.html
index f65709f5..7bb49086 100644
--- a/docs/api/davical/_inc---pubsub.php.html
+++ b/docs/api/davical/_inc---pubsub.php.html
@@ -28,7 +28,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---test-RRULE-v2.php.html b/docs/api/davical/_inc---test-RRULE-v2.php.html
index a0a4a85d..18cb329c 100644
--- a/docs/api/davical/_inc---test-RRULE-v2.php.html
+++ b/docs/api/davical/_inc---test-RRULE-v2.php.html
@@ -115,7 +115,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---test-RRULE.php.html b/docs/api/davical/_inc---test-RRULE.php.html
index 92f4cfe3..c69594f6 100644
--- a/docs/api/davical/_inc---test-RRULE.php.html
+++ b/docs/api/davical/_inc---test-RRULE.php.html
@@ -100,7 +100,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---ui---collection-edit.php.html b/docs/api/davical/_inc---ui---collection-edit.php.html
index ccf213bc..573d2026 100644
--- a/docs/api/davical/_inc---ui---collection-edit.php.html
+++ b/docs/api/davical/_inc---ui---collection-edit.php.html
@@ -36,7 +36,7 @@
 					
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -51,7 +51,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -82,11 +82,11 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
-		edit_grant_row (line 389)
+		edit_grant_row (line 395)
 	
     
 
 	
@@ -107,11 +107,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		privilege_format_function (line 176)
+		privilege_format_function (line 179)
 	
     
 
 	
@@ -146,7 +146,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---ui---principal-browse.php.html b/docs/api/davical/_inc---ui---principal-browse.php.html
index 6c71d3ae..d31669ca 100644
--- a/docs/api/davical/_inc---ui---principal-browse.php.html
+++ b/docs/api/davical/_inc---ui---principal-browse.php.html
@@ -28,7 +28,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---ui---principal-edit.php.html b/docs/api/davical/_inc---ui---principal-edit.php.html
index 419ce3ff..a3be9674 100644
--- a/docs/api/davical/_inc---ui---principal-edit.php.html
+++ b/docs/api/davical/_inc---ui---principal-edit.php.html
@@ -41,7 +41,7 @@
 	
 	
    
 		
-		access_ticket_browser (line 769)
+		access_ticket_browser (line 772)
 	
     
 
 	
@@ -61,7 +61,7 @@
 	
 	
    
 		
-		bindings_to_other_browser (line 859)
+		bindings_to_other_browser (line 862)
 	
     
 
 	
@@ -81,7 +81,7 @@
 	
 	
    
 		
-		bindings_to_us_browser (line 895)
+		bindings_to_us_browser (line 898)
 	
     
 
 	
@@ -129,7 +129,7 @@
 	
 	
    
 		
-		confirm_delete_binding (line 919)
+		confirm_delete_binding (line 922)
 	
     
 
 	
@@ -154,7 +154,7 @@
 	
 	
    
 		
-		confirm_delete_bind_in (line 883)
+		confirm_delete_bind_in (line 886)
 	
     
 
 	
@@ -179,7 +179,7 @@
 	
 	
    
 		
-		confirm_delete_collection (line 848)
+		confirm_delete_collection (line 851)
 	
     
 
 	
@@ -232,7 +232,7 @@
 	
 	
    
 		
-		confirm_delete_ticket (line 803)
+		confirm_delete_ticket (line 806)
 	
     
 
 	
@@ -257,7 +257,7 @@
 	
 	
    
 		
-		edit_group_row (line 505)
+		edit_group_row (line 509)
 	
     
 
 	
@@ -282,7 +282,7 @@
 	
 	
    
 		
-		edit_ticket_row (line 738)
+		edit_ticket_row (line 741)
 	
     
 
 	
@@ -307,7 +307,7 @@
 	
 	
    
 		
-		grant_row_editor (line 567)
+		grant_row_editor (line 571)
 	
     
 
 	
@@ -347,7 +347,7 @@
 	
 	
    
 		
-		group_members_browser (line 526)
+		group_members_browser (line 530)
 	
     
 
 	
@@ -412,7 +412,7 @@
 	
 	
    
 		
-		principal_collection_browser (line 815)
+		principal_collection_browser (line 818)
 	
     
 
 	
@@ -452,7 +452,7 @@
 	
 	
    
 		
-		principal_grants_browser (line 637)
+		principal_grants_browser (line 641)
 	
     
 
 	
@@ -472,7 +472,7 @@
 	
 	
    
 		
-		ticket_row_editor (line 685)
+		ticket_row_editor (line 689)
 	
     
 
 	
@@ -491,7 +491,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/_inc---vcard.php.html b/docs/api/davical/_inc---vcard.php.html
index d22df1fa..64bbd151 100644
--- a/docs/api/davical/_inc---vcard.php.html
+++ b/docs/api/davical/_inc---vcard.php.html
@@ -64,7 +64,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -80,7 +80,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -101,7 +101,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/authentication/_inc---auth-functions.php.html b/docs/api/davical/authentication/_inc---auth-functions.php.html
index 8b173708..a5376655 100644
--- a/docs/api/davical/authentication/_inc---auth-functions.php.html
+++ b/docs/api/davical/authentication/_inc---auth-functions.php.html
@@ -83,7 +83,7 @@
 	
 	
    
 		
-		AuthExternalAWL (line 173)
+		AuthExternalAWL (line 268)
 	
     
 
 	
@@ -108,12 +108,40 @@
 		
 	
 
    
-
+
 
    
 	
 	
    
 		
-		CreateDefaultRelationships (line 82)
+		auth_functions_deprecated (line 31)
+	
     
+
+	
+	
    
+		void
+		
+			auth_functions_deprecated
+		
+					( $method, [ $message = null])
+			
    
+
+			
      
+					
    • 
+				
+				$method			
      • 
+					
    • 
+				
+				$message			
      • 
+				
    
+		
+	
+
    
+
+
    
+	
+	
    
+		
+		CreateDefaultRelationships (line 147)
 	
     
 
 	
@@ -135,19 +163,45 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		CreateHomeCalendar (line 35)
+		CreateHomeCalendar (line 138)
 	
     
 
 	
-
    Create a default home calendar for the user.
    
+
    Backward compatibility
    
 	
    
 		void
 		
 			CreateHomeCalendar
+		
+					(unknown_type $username)
+			
    
+
+			
      
+					
    • 
+				unknown_type
+				$username			
      • 
+				
    
+		
+	
+
    
+
+
    
+	
+	
    
+		
+		CreateHomeCollections (line 71)
+	
     
+
+	
+
    Creates some default home collections for the user.
    
+	
    
+		void
+		
+			CreateHomeCollections
 		
 					(string $username)
 			
    
@@ -159,13 +213,125 @@
 				
 		
 	
+
    
+
+
    
+	
+	
    
+		
+		getPrincipalByID (line 61)
+	
     
+
+	
+	
    
+		void
+		
+			getPrincipalByID
+		
+					( $principal_id, [ $use_cache = true])
+			
    
+
+			
      
+					
    • 
+				
+				$principal_id			
      • 
+					
    • 
+				
+				$use_cache			
      • 
+				
    
+		
+	
+
    
+
+
    
+	
+	
    
+		
+		getUserByEMail (line 51)
+	
     
+
+	
+	
    
+		void
+		
+			getUserByEMail
+		
+					( $email, [ $use_cache = true])
+			
    
+
+			
      
+					
    • 
+				
+				$email			
      • 
+					
    • 
+				
+				$use_cache			
      • 
+				
    
+		
+	
+
    
+
+
    
+	
+	
    
+		
+		getUserByID (line 56)
+	
     
+
+	
+	
    
+		void
+		
+			getUserByID
+		
+					( $user_no, [ $use_cache = true])
+			
    
+
+			
      
+					
    • 
+				
+				$user_no			
      • 
+					
    • 
+				
+				$use_cache			
      • 
+				
    
+		
+	
+
    
+
+
    
+	
+	
    
+		
+		getUserByName (line 46)
+	
     
+
+	
+	
    
+		void
+		
+			getUserByName
+		
+					( $username, [ $use_cache = true])
+			
    
+
+			
      
+					
    • 
+				
+				$username			
      • 
+					
    • 
+				
+				$use_cache			
      • 
+				
    
+		
+	
 
    
 
 
    
 	
 	
    
 		
-		UpdateUserFromExternal (line 91)
+		UpdateUserFromExternal (line 183)
 	
     
 
 	
@@ -193,7 +359,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_htdocs---caldav.php.html b/docs/api/davical/caldav/_htdocs---caldav.php.html
index 1f96ca82..9d33ff83 100644
--- a/docs/api/davical/caldav/_htdocs---caldav.php.html
+++ b/docs/api/davical/caldav/_htdocs---caldav.php.html
@@ -41,52 +41,7 @@
 			|													Functions
 					
    
 		
    	
-			
-
    
-	
-	
    
-		 
-		
-			include
-			(caldav-POST.php)
-			(line 82)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include
-			(caldav-MOVE.php)
-			(line 104)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include
-			(caldav-PUT-default.php)
-			(line 97)
-		
-	
    
-
-	
-	
-
    
-
+			
 
    
 	
 	
    
@@ -94,73 +49,42 @@
 		
 			include
 			(caldav-GET.php)
-			(line 81)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include
-			(caldav-PROPFIND.php)
-			(line 80)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include
-			(caldav-PUT.php)
-			(line 90)
-		
-	
    
-
-	
-
    use original DAViCal 'PUT' code which will be rewritten
    
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include
-			(caldav-PROPPATCH.php)
-			(line 84)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include
-			(caldav-MKTICKET.php)
 			(line 108)
 		
 	
    
 
 	
 	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(caldav-MOVE.php)
+			(line 130)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(caldav-PUT-default.php)
+			(line 123)
+		
+	
    
+
+	
+	
 
    
 
 
    
@@ -170,7 +94,37 @@
 		
 			include
 			(caldav-GET.php)
-			(line 83)
+			(line 110)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(caldav-PROPPATCH.php)
+			(line 111)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(caldav-PUT-vcalendar.php)
+			(line 116)
 		
 	
    
 
@@ -185,36 +139,36 @@
 		
 			include
 			(caldav-PUT-vcard.php)
-			(line 94)
+			(line 120)
 		
 	
    
 
 	
 	
 
    
-
+
 
    
 	
 	
    
 		 
 		
 			include
-			(caldav-MKCOL.php)
-			(line 102)
+			(caldav-PROPFIND.php)
+			(line 107)
 		
 	
    
 
 	
 	
 
    
-
+
 
    
 	
 	
    
 		 
 		
 			include
-			(caldav-DELTICKET.php)
+			(caldav-POST.php)
 			(line 109)
 		
 	
    
@@ -222,30 +176,30 @@
 	
 	
 
    
-
+
 
    
 	
 	
    
 		 
 		
 			include
-			(caldav-ACL.php)
-			(line 105)
+			(caldav-MKCOL.php)
+			(line 127)
 		
 	
    
 
 	
 	
 
    
-
+
 
    
 	
 	
    
 		 
 		
 			include
-			(caldav-MKCOL.php)
-			(line 101)
+			(caldav-MKTICKET.php)
+			(line 134)
 		
 	
    
 
@@ -260,7 +214,82 @@
 		
 			include
 			(caldav-DELETE.php)
-			(line 103)
+			(line 129)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(caldav-ACL.php)
+			(line 131)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(caldav-LOCK.php)
+			(line 132)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(caldav-MKCOL.php)
+			(line 128)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(caldav-DELTICKET.php)
+			(line 135)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			include
+			(caldav-LOCK.php)
+			(line 133)
 		
 	
    
 
@@ -268,14 +297,14 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
 		
 			include
 			(caldav-BIND.php)
-			(line 110)
+			(line 136)
 		
 	
    
 
@@ -283,43 +312,28 @@
 	
 
    
 
-
    
-	
-	
    
-		 
-		
-			include
-			(test-RRULE-v2.php)
-			(line 112)
-		
-	
    
-
-	
-	
-
    
-
 
    
 	
 	
    
 		 
 		
 			include
-			(caldav-LOCK.php)
-			(line 107)
+			(test-RRULE-v2.php)
+			(line 138)
 		
 	
    
 
 	
 	
 
    
-
+
 
    
 	
 	
    
 		 
 		
-			include
-			(caldav-LOCK.php)
+			include_once
+			(caldav-REPORT.php)
 			(line 106)
 		
 	
    
@@ -335,30 +349,18 @@
 		
 			include_once
 			(caldav-OPTIONS.php)
-			(line 78)
-		
-	
    
-
-	
-	
-
    
-
-
    
-	
-	
    
-		 
-		
-			include_once
-			(caldav-REPORT.php)
-			(line 79)
+			(line 105)
 		
 	
    
 
 	
+	
      
+				
    • todo: integrate handling this URL into CalDAVRequest.php
      • 
+			
    
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -379,29 +381,14 @@
 	
 
    
 
-
    
-	
-	
    
-		 
-		
-			require_once
-			(CalDAVRequest.php)
-			(line 60)
-		
-	
    
-
-	
-	
-
    
-
 
    
 	
 	
    
 		 
 		
 			require_once
-			(HTTPAuthSession.php)
-			(line 29)
+			(CalDAVRequest.php)
+			(line 87)
 		
 	
    
 
@@ -422,6 +409,21 @@
 
 	
 	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			(HTTPAuthSession.php)
+			(line 56)
+		
+	
    
+
+	
+	
 
    
 		
    
 	
    
@@ -437,12 +439,32 @@
 				|												Functions
 		
    
 		
    	
-			
+			
+
    
+	
+	
    
+		
+		logRequestHeaders (line 28)
+	
     
+
+	
+	
    
+		void
+		
+			logRequestHeaders
+		
+				()
+			
    
+
+		
+	
+
    
+
 
    
 	
 	
    
 		
-		send_dav_header (line 32)
+		send_dav_header (line 59)
 	
     
 
 	
@@ -461,7 +483,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:09 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_htdocs---public.php.html b/docs/api/davical/caldav/_htdocs---public.php.html
index 051955a1..ea758c39 100644
--- a/docs/api/davical/caldav/_htdocs---public.php.html
+++ b/docs/api/davical/caldav/_htdocs---public.php.html
@@ -47,7 +47,7 @@
 		
 			include_once
 			(caldav-GET.php)
-			(line 32)
+			(line 37)
 		
 	
    
 
@@ -62,7 +62,7 @@
 		
 			include_once
 			(caldav-OPTIONS.php)
-			(line 29)
+			(line 34)
 		
 	
    
 
@@ -77,7 +77,7 @@
 		
 			include_once
 			(caldav-PROPFIND.php)
-			(line 31)
+			(line 36)
 		
 	
    
 
@@ -92,7 +92,7 @@
 		
 			include_once
 			(caldav-REPORT.php)
-			(line 30)
+			(line 35)
 		
 	
    
 
@@ -107,7 +107,7 @@
 		
 			include_once
 			(test-RRULE.php)
-			(line 45)
+			(line 50)
 		
 	
    
 
@@ -122,7 +122,7 @@
 		
 			include_once
 			(caldav-GET.php)
-			(line 33)
+			(line 38)
 		
 	
    
 
@@ -173,7 +173,7 @@
 		
 			require_once
 			(CalDAVRequest.php)
-			(line 21)
+			(line 20)
 		
 	
    
 
@@ -188,7 +188,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-ACL.php.html b/docs/api/davical/caldav/_inc---caldav-ACL.php.html
index 7891c284..cfba150c 100644
--- a/docs/api/davical/caldav/_inc---caldav-ACL.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-ACL.php.html
@@ -17,7 +17,8 @@
 	
    
 					Description |
 									Includes
-												
    
+			|											Functions
+			
    
 	
    	
 		
 
    CalDAV Server - handle ACL method
    
@@ -37,7 +38,8 @@
 		
    
 			Description |
 						Includes
-														
    
+			|													Functions
+					
    
 		
    	
 			
 
    
@@ -59,9 +61,55 @@
 	
 	
 	
+		
+	
    
+		
    Functions
    
+		
    
+			Description |
+										Includes
+				|												Functions
+		
    
+		
    	
+			
+
    
+	
+	
    
+		
+		process_ace (line 107)
+	
     
+
+	
+
    Preconditions
    
+	
    
+		void
+		
+			process_ace
+		
+					( $grantor,  $by_principal,  $by_collection,  $ace)
+			
    
+
+			
      
+					
    • 
+				
+				$grantor			
      • 
+					
    • 
+				
+				$by_principal			
      • 
+					
    • 
+				
+				$by_collection			
      • 
+					
    • 
+				
+				$ace			
      • 
+				
    
+		
+	
+
    
+		
    
+	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-BIND.php.html b/docs/api/davical/caldav/_inc---caldav-BIND.php.html
index ecaf7388..aae7045c 100644
--- a/docs/api/davical/caldav/_inc---caldav-BIND.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-BIND.php.html
@@ -40,7 +40,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -55,7 +55,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -70,7 +70,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -83,6 +83,21 @@
 
 	
 	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			('external-fetch.php')
+			(line 51)
+		
+	
    
+
+	
+	
 
    
 		
    
 	
    
@@ -91,7 +106,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:07 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-DELETE.php.html b/docs/api/davical/caldav/_inc---caldav-DELETE.php.html
index d1686aba..c22c1cd3 100644
--- a/docs/api/davical/caldav/_inc---caldav-DELETE.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-DELETE.php.html
@@ -105,7 +105,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html b/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html
index 59feb4ff..dfce7827 100644
--- a/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html
@@ -62,7 +62,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-GET.php.html b/docs/api/davical/caldav/_inc---caldav-GET.php.html
index ad7fc31b..28c9177e 100644
--- a/docs/api/davical/caldav/_inc---caldav-GET.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-GET.php.html
@@ -90,7 +90,7 @@
 	
 	
    
 		
-		obfuscated_event (line 23)
+		obfuscated_event (line 26)
 	
     
 
 	
@@ -114,7 +114,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html b/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html
index 74780ba0..de7d96c9 100644
--- a/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html
@@ -97,7 +97,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-MKTICKET.php.html b/docs/api/davical/caldav/_inc---caldav-MKTICKET.php.html
index 63e10833..f7d49818 100644
--- a/docs/api/davical/caldav/_inc---caldav-MKTICKET.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-MKTICKET.php.html
@@ -84,7 +84,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-MOVE.php.html b/docs/api/davical/caldav/_inc---caldav-MOVE.php.html
index bf5f2d65..9ee745e7 100644
--- a/docs/api/davical/caldav/_inc---caldav-MOVE.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-MOVE.php.html
@@ -101,7 +101,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-OPTIONS.php.html b/docs/api/davical/caldav/_inc---caldav-OPTIONS.php.html
index 577cf311..f377f4bf 100644
--- a/docs/api/davical/caldav/_inc---caldav-OPTIONS.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-OPTIONS.php.html
@@ -67,7 +67,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-POST.php.html b/docs/api/davical/caldav/_inc---caldav-POST.php.html
index f7f6d6fd..ea3b2a61 100644
--- a/docs/api/davical/caldav/_inc---caldav-POST.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-POST.php.html
@@ -49,7 +49,7 @@
 		
 			include_once
 			('caldav-PUT-functions.php')
-			(line 15)
+			(line 14)
 		
 	
    
 
@@ -64,7 +64,7 @@
 		
 			include_once
 			('freebusy-functions.php')
-			(line 16)
+			(line 15)
 		
 	
    
 
@@ -91,21 +91,6 @@
 				
  • license: GNU GPL v2 or later
    • 
 			
 	
-
    
-
-
    
-	
-	
    
-		 
-		
-			require_once
-			("iCalendar.php")
-			(line 14)
-		
-	
    
-
-	
-	
 
    
 		
    
 	
    
@@ -122,11 +107,11 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
-		handle_cancel_request (line 116)
+		handle_cancel_request (line 114)
 	
     
 
 	
@@ -147,11 +132,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		handle_freebusy_request (line 34)
+		handle_freebusy_request (line 33)
 	
     
 
 	
@@ -175,7 +160,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html b/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html
index 5c302593..6b4ecc4a 100644
--- a/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html
@@ -82,7 +82,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-PUT-default.php.html b/docs/api/davical/caldav/_inc---caldav-PUT-default.php.html
index eea4f8d8..1b5253a7 100644
--- a/docs/api/davical/caldav/_inc---caldav-PUT-default.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-PUT-default.php.html
@@ -61,7 +61,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html b/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html
index dd7d5fc6..a1b79057 100644
--- a/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html
@@ -41,14 +41,14 @@
 			|													Functions
 					
    
 		
    	
-			
+			
 
    
 	
 	
    
 		 
 		
 			require_once
-			('WritableCollection.php')
+			('vComponent.php')
 			(line 19)
 		
 	
    
@@ -56,14 +56,44 @@
 	
 	
 
    
-
+
 
    
 	
 	
    
 		 
 		
 			require_once
-			('iCalendar.php')
+			('WritableCollection.php')
+			(line 21)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			('vCalendar.php')
+			(line 20)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			('AwlCache.php')
 			(line 18)
 		
 	
    
@@ -92,7 +122,7 @@
 	
 	
    
 		
-		controlRequestContainer (line 67)
+		controlRequestContainer (line 69)
 	
     
 
 	
@@ -125,41 +155,70 @@
 		
 	
 
    
-
+
 
    
 	
 	
    
 		
-		create_scheduling_requests (line 338)
+		do_scheduling_requests (line 318)
 	
     
 
 	
-
    Create scheduling requests in the schedule inbox for the
    
+
    Create/Update the scheduling requests for this resource.  This includes updating  the scheduled user's default calendar.
    
 	
    
 		void
 		
-			create_scheduling_requests
+			do_scheduling_requests
 		
-					( &$resource, iCalComponent $resource)
+					( $resource, boolean $create)
 			
    
 
 			
      
 					
    • 
-				iCalComponent
+				vComponent
 				$resource: The VEVENT/VTODO/... resource we are scheduling			
      • 
 					
    • 
-				
-				&$resource			
      • 
+				boolean
+				$create: true if the scheduling requests are being created.			
+				
    
+		
+	
+
    
+
+
    
+	
+	
    
+		
+		GetTZID (line 168)
+	
     
+
+	
+
    Get a TZID string from this VEVENT/VTODO/... component if we can
    
+	
      
+				
    • return: TZID value we found, or null
      • 
+			
    
+	
    
+		The
+		
+			GetTZID
+		
+					( $comp)
+			
    
+
+			
      
+					
    • 
+				vComponent
+				$comp			
      • 
 				
    
 		
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		handle_schedule_reply (line 251)
+		handle_schedule_reply (line 268)
 	
     
 
 	
@@ -172,23 +231,23 @@
 		
 			handle_schedule_reply
 		
-					(iCalComponent $ical)
+					( $ical)
 			
    
 
 			
      
 					
    • 
-				iCalComponent
+				vComponent
 				$ical: the VCALENDAR to deliver			
      • 
 				
    
 		
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		handle_schedule_request (line 165)
+		handle_schedule_request (line 181)
 	
     
 
 	
@@ -198,23 +257,23 @@
 		
 			handle_schedule_request
 		
-					(iCalComponent $ical)
+					(vComponent $ical)
 			
    
 
 			
      
 					
    • 
-				iCalComponent
+				vComponent
 				$ical: the VCALENDAR to deliver			
      • 
 				
    
 		
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		import_collection (line 403)
+		import_collection (line 385)
 	
     
 
 	
@@ -248,11 +307,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		public_events_only (line 141)
+		public_events_only (line 144)
 	
     
 
 	
@@ -280,11 +339,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		rollback_on_error (line 36)
+		rollback_on_error (line 38)
 	
     
 
 	
@@ -318,11 +377,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		simple_write_resource (line 1006)
+		simple_write_resource (line 1019)
 	
     
 
 	
@@ -354,52 +413,23 @@
 				
 		
 	
-
    
-
-
    
-	
-	
    
-		
-		update_scheduling_requests (line 368)
-	
     
-
-	
-
    Update scheduling requests in the schedule inbox for the
    
-	
    
-		void
-		
-			update_scheduling_requests
-		
-					( &$resource, iCalComponent $resource)
-			
    
-
-			
      
-					
    • 
-				iCalComponent
-				$resource: The VEVENT/VTODO/... resource we are scheduling			
      • 
-					
    • 
-				
-				&$resource			
      • 
-				
    
-		
-	
 
    
 
 
    
 	
 	
    
 		
-		write_alarms (line 641)
+		write_alarms (line 630)
 	
     
 
 	
-
    Given a dav_id and an original iCalComponent, pull out each of the VALARMs  and write the values into the calendar_alarm table.
    
+
    Given a dav_id and an original vCalendar, pull out each of the VALARMs  and write the values into the calendar_alarm table.
    
 	
    
 		null
 		
 			write_alarms
 		
-					(int $dav_id, iCalComponent $ical)
+					(int $dav_id,  $ical)
 			
    
 
 			
      
@@ -407,7 +437,7 @@
 				int
 				$dav_id: The dav_id of the caldav_data we're processing			
 					
    • 
-				iCalComponent
+				vComponent
 				$ical: The VEVENT or VTODO containing the VALARM			
      • 
 				
    
 		
@@ -418,7 +448,7 @@
 	
 	
    
 		
-		write_attendees (line 690)
+		write_attendees (line 687)
 	
     
 
 	
@@ -428,7 +458,7 @@
 		
 			write_attendees
 		
-					(int $dav_id, iCalComponent $ical)
+					(int $dav_id,  $ical)
 			
    
 
 			
      
@@ -436,7 +466,7 @@
 				int
 				$dav_id: The dav_id of the caldav_data we're processing			
 					
    • 
-				iCalComponent
+				vComponent
 				$ical: The VEVENT or VTODO containing the ATTENDEEs			
      • 
 				
    
 		
@@ -447,7 +477,7 @@
 	
 	
    
 		
-		write_resource (line 739)
+		write_resource (line 736)
 	
     
 
 	
@@ -460,7 +490,7 @@
 		
 			write_resource
 		
-					(int $user_no, string $path, string $caldav_data, int $collection_id, int $author, string $etag, object $ic, string $put_action_type, boolean $caldav_context, [string $log_action = true], [string $weak_etag = null])
+					(DAVResource $resource, string $caldav_data, DAVResource $collection, int $author, string $etag, string $put_action_type, boolean $caldav_context, [boolean $log_action = true], [string $weak_etag = null], int $user_no, string $path, int $collection_id, vComponent $ic, string 9)
 			
    
 
 			
      
@@ -483,7 +513,7 @@
 				string
 				$etag: An etag unique for this event			
 					
    • 
-				object
+				vComponent
 				$ic: The parsed iCalendar object			
      • 
 					
    • 
 				string
@@ -493,51 +523,19 @@
 				$caldav_context: True, if we are responding via CalDAV, false for other ways of calling this			
      • 
 					
    • 
 				string
-				$log_action: Either 'INSERT' or 'UPDATE': the type of action we are doing			
      • 
+				9: Either 'INSERT' or 'UPDATE': the type of action we are doing			
+					
    • 
+				boolean
+				$log_action: Whether to log the fact that we are writing this into an action log (if configured)			
      • 
 					
    • 
 				string
 				$weak_etag: An etag that is NOT modified on ATTENDEE changes for this event			
      • 
-				
    
-		
-	
-
    
-
-
    
-	
-	
    
-		
-		write_scheduling_request (line 313)
-	
     
-
-	
-
    Create a scheduling request in the schedule inbox for the
    
-	
      
-				
    • return: The result of the scheduling request, per caldav-sched #3.5.4
      • 
-			
    
-	
    
-		float
-		
-			write_scheduling_request
-		
-					( &$resource,  $attendee_value,  $create_resource, iCalComponent $resource, iCalProp $attendee)
-			
    
-
-			
      
 					
    • 
-				iCalComponent
-				$resource: The VEVENT/VTODO/... resource we are scheduling			
      • 
+				DAVResource
+				$resource			
 					
    • 
-				iCalProp
-				$attendee: The attendee we are scheduling			
      • 
-					
    • 
-				
-				&$resource			
      • 
-					
    • 
-				
-				$attendee_value			
      • 
-					
    • 
-				
-				$create_resource			
      • 
+				DAVResource
+				$collection			
 				
    
 		
 	
@@ -546,7 +544,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-PUT.php.html b/docs/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html
similarity index 81%
rename from docs/api/davical/caldav/_inc---caldav-PUT.php.html
rename to docs/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html
index d3873e00..2c93f51f 100644
--- a/docs/api/davical/caldav/_inc---caldav-PUT.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html
@@ -3,13 +3,13 @@
   
 		
 			
-			Docs for page caldav-PUT.php
+			Docs for page caldav-PUT-vcalendar.php
 			
 			
 		
 		
 			
    			
-
    File/inc/caldav-PUT.php
    
+
    File/inc/caldav-PUT-vcalendar.php
    
 
 
 
    
@@ -40,7 +40,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -55,7 +55,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -67,12 +67,6 @@
 	
    
 
 	
-
    CalDAV Server - handle PUT method
    
-	
 	
 
    
 		
    
@@ -82,7 +76,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-PUT-vcard.php.html b/docs/api/davical/caldav/_inc---caldav-PUT-vcard.php.html
index 3559fb3a..4dc906e9 100644
--- a/docs/api/davical/caldav/_inc---caldav-PUT-vcard.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-PUT-vcard.php.html
@@ -40,7 +40,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -55,7 +55,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -76,7 +76,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html b/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html
index 2e966e86..a0cb1c08 100644
--- a/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html
@@ -43,7 +43,7 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
@@ -75,7 +75,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html b/docs/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html
index 81eae084..b4c923a4 100644
--- a/docs/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html
@@ -43,7 +43,7 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
@@ -72,7 +72,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/caldav/_inc---caldav-REPORT.php.html b/docs/api/davical/caldav/_inc---caldav-REPORT.php.html
index 96f9dc08..d0d3cac4 100644
--- a/docs/api/davical/caldav/_inc---caldav-REPORT.php.html
+++ b/docs/api/davical/caldav/_inc---caldav-REPORT.php.html
@@ -41,15 +41,15 @@
 			|													Functions
 					
    
 		
    	
-			
-
    
+			
+
    
 	
 	
    
 		 
 		
 			include
-			("caldav-REPORT-principal.php")
-			(line 58)
+			("caldav-REPORT-cardquery.php")
+			(line 345)
 		
 	
    
 
@@ -57,7 +57,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -71,15 +71,30 @@
 	
 	
 
    
-
+
+
    
+	
+	
    
+		 
+		
+			include
+			("caldav-REPORT-principal.php")
+			(line 58)
+		
+	
    
+
+	
+	
+
    
+
 
    
 	
 	
    
 		 
 		
 			include
-			("caldav-REPORT-multiget.php")
-			(line 325)
+			("caldav-REPORT-calquery.php")
+			(line 331)
 		
 	
    
 
@@ -101,30 +116,30 @@
 	
 	
 
    
-
+
 
    
 	
 	
 
 	
 	
 
    
-
+
 
    
 	
 	
 
@@ -139,37 +154,37 @@
 		
 			include
 			("caldav-REPORT-multiget.php")
-			(line 320)
+			(line 336)
 		
 	
    
 
 	
 	
 
    
-
+
 
    
 	
 	
    
 		 
 		
 			include
-			("caldav-REPORT-calquery.php")
-			(line 315)
+			("caldav-REPORT-principal-match.php")
+			(line 78)
 		
 	
    
 
 	
 	
 
    
-
+
 
    
 	
 	
    
 		 
 		
 			include
-			("caldav-REPORT-cardquery.php")
-			(line 329)
+			("caldav-REPORT-multiget.php")
+			(line 341)
 		
 	
    
 
@@ -197,15 +212,45 @@
 			
 	
 
    
-
+
 
    
 	
 	
    
 		 
 		
 			require_once
-			("iCalendar.php")
-			(line 42)
+			("external-fetch.php")
+			(line 325)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			("external-fetch.php")
+			(line 65)
+		
+	
    
+
+	
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			("external-fetch.php")
+			(line 72)
 		
 	
    
 
@@ -241,6 +286,21 @@
 
 	
 	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			("iCalendar.php")
+			(line 42)
+		
+	
    
+
+	
+	
 
    
 		
    
 	
    
@@ -257,11 +317,11 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
-		calendar_to_xml (line 80)
+		calendar_to_xml (line 91)
 	
     
 
 	
@@ -289,11 +349,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		component_to_xml (line 185)
+		component_to_xml (line 196)
 	
     
 
 	
@@ -324,7 +384,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/external-bind/_inc---external-fetch.php.html b/docs/api/davical/external-bind/_inc---external-fetch.php.html
new file mode 100644
index 00000000..d3b7ee97
--- /dev/null
+++ b/docs/api/davical/external-bind/_inc---external-fetch.php.html
@@ -0,0 +1,142 @@
+
+
+  
+		
+			
+			Docs for page external-fetch.php
+			
+			
+		
+		
+			
    			
+
    File/inc/external-fetch.php
    
+
+
+
    
+	
    Description
    
+	
    
+					Description |
+															Functions
+			
    
+	
    	
+		
+
    Functions for managing external BIND resources
    
+	
+		
+			
    
+
    
+		
+
+	
+	
+	
+		
+	
    
+		
    Functions
    
+		
    
+			Description |
+															Functions
+		
    
+		
    	
+			
+
    
+	
+	
    
+		
+		create_external (line 13)
+	
     
+
+	
+
    Functions for managing external BIND resources
    
+	
+	
    
+		void
+		
+			create_external
+		
+					( $path,  $is_calendar,  $is_addressbook)
+			
    
+
+			
      
+					
    • 
+				
+				$path			
      • 
+					
    • 
+				
+				$is_calendar			
      • 
+					
    • 
+				
+				$is_addressbook			
      • 
+				
    
+		
+	
+
    
+
+
    
+	
+	
    
+		
+		fetch_external (line 37)
+	
     
+
+	
+	
    
+		void
+		
+			fetch_external
+		
+					( $bind_id,  $min_age)
+			
    
+
+			
      
+					
    • 
+				
+				$bind_id			
      • 
+					
    • 
+				
+				$min_age			
      • 
+				
    
+		
+	
+
    
+
+
    
+	
+	
    
+		
+		update_external (line 81)
+	
     
+
+	
+	
    
+		void
+		
+			update_external
+		
+					( $request)
+			
    
+
+			
      
+					
    • 
+				
+				$request			
      • 
+				
    
+		
+	
+
    
+		
    
+	
    
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/iSchedule/_inc---iSchedule.php.html b/docs/api/davical/iSchedule/_inc---iSchedule.php.html
index 38530c97..e4117ee5 100644
--- a/docs/api/davical/iSchedule/_inc---iSchedule.php.html
+++ b/docs/api/davical/iSchedule/_inc---iSchedule.php.html
@@ -72,7 +72,7 @@
 														
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -87,7 +87,7 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		 
@@ -116,7 +116,7 @@
 	
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/iSchedule/iSchedule.html b/docs/api/davical/iSchedule/iSchedule.html
index c357ef78..85f9dcfd 100644
--- a/docs/api/davical/iSchedule/iSchedule.html
+++ b/docs/api/davical/iSchedule/iSchedule.html
@@ -166,7 +166,7 @@
 		
    
 			
 
-
    
+
    
 
 	
    
 		
@@ -188,7 +188,7 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
@@ -210,7 +210,7 @@
 
 
    
 
-
    
+
    
 
 	
    
 		
@@ -247,7 +247,7 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
@@ -268,7 +268,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -290,7 +290,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -298,7 +298,7 @@
 	
     
 	
 	
-
    finds a remote calender server via DNS SRV records
    
+
    finds a remote calendar server via DNS SRV records
    
 	
 	
    
 		void
@@ -312,7 +312,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -334,7 +334,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -361,7 +361,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -383,7 +383,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -410,7 +410,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -440,7 +440,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -462,7 +462,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -484,7 +484,7 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
@@ -511,7 +511,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/ldap/_inc---drivers_imap_pam.php.html b/docs/api/davical/ldap/_inc---drivers_imap_pam.php.html
new file mode 100644
index 00000000..33a97621
--- /dev/null
+++ b/docs/api/davical/ldap/_inc---drivers_imap_pam.php.html
@@ -0,0 +1,147 @@
+
+
+  
+		
+			
+			Docs for page drivers_imap_pam.php
+			
+			
+		
+		
+			
    			
+
    File/inc/drivers_imap_pam.php
    
+
+
+
    
+	
    Description
    
+	
    
+					Description |
+							Classes
+			|							Includes
+			|											Functions
+			
    
+	
    	
+		
+
    Manages PAM repository connection with local imap server help
    
+	
+		
+			
    
+
    
+		
+		
+	
    
+		
    Classes
    
+		
    
+			Description |
+			Classes
+			|							Includes
+				|																Functions
+					
    
+		
    	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
    ClassDescription
    
+						 class
+						imapPamDrivers
+					
+											
+										
    
+		
    
+	
    
+
+		
+	
    
+		
    Includes
    
+		
    
+			Description |
+							Classes
+				|						Includes
+			|													Functions
+					
    
+		
    	
+			
+
    
+	
+	
    
+		 
+		
+			require_once
+			("auth-functions.php")
+			(line 14)
+		
+	
    
+
+	
+
    Manages PAM repository connection with local imap server help
    
+	
+	
+
    
+		
    
+	
    
+	
+	
+	
+		
+	
    
+		
    Functions
    
+		
    
+			Description |
+							Classes
+				|										Includes
+				|												Functions
+		
    
+		
    	
+			
+
    
+	
+	
    
+		
+		IMAP_PAM_check (line 54)
+	
     
+
+	
+
    Check the username / password against the PAM system
    
+	
    
+		void
+		
+			IMAP_PAM_check
+		
+					( $username,  $password)
+			
    
+
+			
      
+					
    • 
+				
+				$username			
      • 
+					
    • 
+				
+				$password			
      • 
+				
    
+		
+	
+
    
+		
    
+	
    
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:10 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/ldap/_inc---drivers_ldap.php.html b/docs/api/davical/ldap/_inc---drivers_ldap.php.html
index cf6b6180..a3ebb80d 100644
--- a/docs/api/davical/ldap/_inc---drivers_ldap.php.html
+++ b/docs/api/davical/ldap/_inc---drivers_ldap.php.html
@@ -24,7 +24,7 @@
 		
 
    Manages LDAP repository connection
    
 	
@@ -73,21 +73,21 @@
 					
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
 		
 			require_once
 			("auth-functions.php")
-			(line 13)
+			(line 14)
 		
 	
    
 
 	
 
    Manages LDAP repository connection
    
 	
@@ -109,11 +109,11 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
-		getStaticLdap (line 244)
+		getStaticLdap (line 242)
 	
     
 
 	
@@ -130,11 +130,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		LDAP_check (line 291)
+		LDAP_check (line 293)
 	
     
 
 	
@@ -159,11 +159,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		sync_LDAP (line 478)
+		sync_LDAP (line 496)
 	
     
 
 	
@@ -180,11 +180,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		sync_LDAP_groups (line 359)
+		sync_LDAP_groups (line 362)
 	
     
 
 	
@@ -201,11 +201,11 @@
 	
 
    
 
-
    
+
    
 	
 	
    
 		
-		sync_user_from_LDAP (line 261)
+		sync_user_from_LDAP (line 259)
 	
     
 
 	
@@ -215,16 +215,16 @@
 		
 			sync_user_from_LDAP
 		
-					( &$usr,  $mapping,  $ldap_values, object $usr)
+					(Principal &$principal,  $mapping,  $ldap_values, object $principal)
 			
    
 
 			
      
 					
    • 
 				object
-				$usr: A user record to be updated (or created)			
      • 
+				$principal: A Principal object to be updated (or created)			
 					
    • 
-				
-				&$usr			
      • 
+				Principal
+				&$principal			
 					
    • 
 				
 				$mapping			
      • 
@@ -239,7 +239,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:10 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html b/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html
index 9db07c52..2a25b776 100644
--- a/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html
+++ b/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html
@@ -24,9 +24,9 @@
 		
 
    Manages PAM repository connection with SQUID help
    
 	
 		
 			
    
@@ -73,23 +73,23 @@
 					
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
 		
 			require_once
 			("auth-functions.php")
-			(line 13)
+			(line 14)
 		
 	
    
 
 	
 
    Manages PAM repository connection with SQUID help
    
 	
 	
 
    
@@ -109,11 +109,11 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
-		SQUID_PAM_check (line 53)
+		SQUID_PAM_check (line 44)
 	
     
 
 	
@@ -141,7 +141,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:10 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/ldap/imapPamDrivers.html b/docs/api/davical/ldap/imapPamDrivers.html
new file mode 100644
index 00000000..567cbdf2
--- /dev/null
+++ b/docs/api/davical/ldap/imapPamDrivers.html
@@ -0,0 +1,139 @@
+
+
+  
+		
+			
+			Docs For Class imapPamDrivers
+			
+			
+		
+		
+			
    			
+
     Class imapPamDrivers
    
+
+
+
    
+	
    Description
    
+	
    
+					Description |
+															Methods (details)
+						
+					
    
+	
    
+        		
+		
    
+			Located in /inc/drivers_imap_pam.php (line 16)
+		
    
+		
+				
+		
    
+	
+			
    
+
    
+
+
+
+
+	
+	
    
+		
    Method Summary
    
+		
    
+			Description |
+												Methods (details)
+		
    
+		
    			
+			
    
+																																
    
+					 
+											imapPamDrivers
+										__construct
+											(string $imap_url)
+									
    
+																
    
+					 
+											imapPamDrivers
+										imapPamDrivers
+											(string $imap_url)
+									
    
+											
    
+		
    
+	
    		
+
+	
+	
+	
    
+		
    Methods
    
+		
    
+			Description |
+													Methods (details)
+						
+		
    
+		
    
+			
+
+
    
+	
+	
    
+		
+		Constructor __construct (line 39)
+	
     
+	
+	
+
    The constructor
    
+	
+	
    
+		imapPamDrivers
+		
+			__construct
+		
+					(string $imap_url)
+			
    
+	
+			
      
+					
    • 
+				string
+				$imap_url: formated for imap_open()			
      • 
+				
    
+		
+			
+	
    
+
+
    
+	
+	
    
+		
+		Constructor imapPamDrivers (line 29)
+	
     
+	
+	
+
    Constructor.
    
+	
+	
    
+		imapPamDrivers
+		
+			imapPamDrivers
+		
+					(string $imap_url)
+			
    
+	
+			
      
+					
    • 
+				string
+				$imap_url: formated for imap_open()			
      • 
+				
    
+		
+			
+	
    
+						
+		
    
+	
    
+
+	
+	
    
+		Documentation generated on Sun, 11 Sep 2011 20:48:10 +1200 by phpDocumentor 1.4.3
+	
    
+	
    
+
\ No newline at end of file
diff --git a/docs/api/davical/ldap/ldapDrivers.html b/docs/api/davical/ldap/ldapDrivers.html
index 185619fc..24b06f13 100644
--- a/docs/api/davical/ldap/ldapDrivers.html
+++ b/docs/api/davical/ldap/ldapDrivers.html
@@ -25,7 +25,7 @@
 	
    
         		
 		
    
-			Located in /inc/drivers_ldap.php (line 15)
+			Located in /inc/drivers_ldap.php (line 16)
 		
    
 		
 				
@@ -46,19 +46,13 @@
 		
    
 		
    			
 			
    
-																																																								
    
+																																																
    
 					 
 											ldapDrivers
 										__construct
 											(array $config)
 									
    
 																
    
-					 
-											ldapDrivers
-										ldapDrivers
-											(array $config)
-									
    
-																
    
 					 
 											void
 										getAllGroups
@@ -96,7 +90,7 @@
 	
 	
    
 		
-		Constructor __construct (line 43)
+		Constructor __construct (line 35)
 	
     
 	
 	
@@ -118,39 +112,12 @@
 		
 			
 	
    
-
+
 
    
 	
-	
    
-		
-		Constructor ldapDrivers (line 33)
-	
     
-	
-	
-
    Constructor.
    
-	
-	
    
-		ldapDrivers
-		
-			ldapDrivers
-		
-					(array $config)
-			
    
-	
-			
      
-					
    • 
-				array
-				$config: The configuration data			
      • 
-				
    
-		
-			
-	
    
-
-
    
-	
 	
    
 		
-		getAllGroups (line 155)
+		getAllGroups (line 147)
 	
     
 	
 	
@@ -173,11 +140,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		getAllUsers (line 124)
+		getAllUsers (line 116)
 	
     
 	
 	
@@ -200,11 +167,11 @@
 			
 	
    
 
-
    
+
    
 	
 	
    
 		
-		requestUser (line 190)
+		requestUser (line 182)
 	
     
 	
 	
@@ -244,7 +211,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:10 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/ldap/squidPamDrivers.html b/docs/api/davical/ldap/squidPamDrivers.html
index 05019f8b..161d6b51 100644
--- a/docs/api/davical/ldap/squidPamDrivers.html
+++ b/docs/api/davical/ldap/squidPamDrivers.html
@@ -25,7 +25,7 @@
 	
    
         		
 		
    
-			Located in /inc/drivers_squid_pam.php (line 15)
+			Located in /inc/drivers_squid_pam.php (line 16)
 		
    
 		
 				
@@ -46,17 +46,11 @@
 		
    
 		
    			
 			
    
-																																
    
+																								
    
 					 
 											squidPamDrivers
 										__construct
 											(string $config)
-									
    
-																
    
-					 
-											squidPamDrivers
-										squidPamDrivers
-											(string $config)
 									
    
 											
    
 		
    
@@ -78,7 +72,7 @@
 	
 	
    
 		
-		Constructor __construct (line 38)
+		Constructor __construct (line 30)
 	
     
 	
 	
@@ -99,33 +93,6 @@
 				
 		
 			
-	
    
-
-
    
-	
-	
    
-		
-		Constructor squidPamDrivers (line 28)
-	
     
-	
-	
-
    Constructor.
    
-	
-	
    
-		squidPamDrivers
-		
-			squidPamDrivers
-		
-					(string $config)
-			
    
-	
-			
      
-					
    • 
-				string
-				$config: path where /usr/lib/squid/pam_auth is			
      • 
-				
    
-		
-			
 	
    
 						
 		
    
@@ -133,7 +100,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:10 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/logging/_inc---log_caldav_action.php.html b/docs/api/davical/logging/_inc---log_caldav_action.php.html
index cc0d0063..80166913 100644
--- a/docs/api/davical/logging/_inc---log_caldav_action.php.html
+++ b/docs/api/davical/logging/_inc---log_caldav_action.php.html
@@ -47,7 +47,7 @@
 		
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		
@@ -88,7 +88,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:11 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/propfind/_inc---caldav-PROPFIND.php.html b/docs/api/davical/propfind/_inc---caldav-PROPFIND.php.html
index a000d719..8cbb59dd 100644
--- a/docs/api/davical/propfind/_inc---caldav-PROPFIND.php.html
+++ b/docs/api/davical/propfind/_inc---caldav-PROPFIND.php.html
@@ -42,7 +42,7 @@
 					
    
 		
    	
 			
-
    
+
    
 	
 	
    
 		 
@@ -55,21 +55,6 @@
 
 	
 	
-
    
-
-
    
-	
-	
    
-		 
-		
-			require_once
-			('DAVResource.php')
-			(line 17)
-		
-	
    
-
-	
-	
 
    
 
 
    
@@ -85,6 +70,37 @@
 
 	
 	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			("external-fetch.php")
+			(line 240)
+		
+	
    
+
+	
+
    Something that we can handle, at least roughly correctly.
    
+	
+
    
+
+
    
+	
+	
    
+		 
+		
+			require_once
+			('DAVResource.php')
+			(line 17)
+		
+	
    
+
+	
+	
 
    
 		
    
 	
    
@@ -134,7 +150,7 @@
 	
 	
    
 		
-		get_collection_contents (line 105)
+		get_collection_contents (line 104)
 	
     
 
 	
@@ -165,7 +181,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:03 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:08 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html b/docs/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html
index 9d6e0e53..8f4be574 100644
--- a/docs/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html
+++ b/docs/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html
@@ -24,9 +24,9 @@
 		
 
    Manages PAM repository connection with pwauth
    
 	
@@ -82,16 +82,16 @@
 		
 			require_once
 			("auth-functions.php")
-			(line 16)
+			(line 17)
 		
 	
    
 
 	
 
    Manages PAM repository connection with pwauth
    
 	
@@ -117,7 +117,7 @@
 	
 	
    
 		
-		PWAUTH_PAM_check (line 57)
+		PWAUTH_PAM_check (line 48)
 	
     
 
 	
@@ -145,7 +145,7 @@
 	
    
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:10 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/davical/pwauth/pwauthPamDrivers.html b/docs/api/davical/pwauth/pwauthPamDrivers.html
index 9cdf8514..89ca1794 100644
--- a/docs/api/davical/pwauth/pwauthPamDrivers.html
+++ b/docs/api/davical/pwauth/pwauthPamDrivers.html
@@ -25,7 +25,7 @@
 	
    
         		
 		
    
-			Located in /inc/drivers_pwauth_pam.php (line 18)
+			Located in /inc/drivers_pwauth_pam.php (line 19)
 		
    
 		
 				
@@ -46,17 +46,11 @@
 		
    
 		
    			
 			
    
-																																
    
+																								
    
 					 
 											pwauthPamDrivers
 										__construct
 											(string $config)
-									
    
-																
    
-					 
-											pwauthPamDrivers
-										pwauthPamDrivers
-											(string $config)
 									
    
 											
    
 		
    
@@ -74,11 +68,11 @@
 		
    
 			
 
-
    
+
    
 	
 	
    
 		
-		Constructor __construct (line 41)
+		Constructor __construct (line 33)
 	
     
 	
 	
@@ -99,33 +93,6 @@
 				
 		
 			
-	
    
-
-
    
-	
-	
    
-		
-		Constructor pwauthPamDrivers (line 31)
-	
     
-	
-	
-
    Constructor.
    
-	
-	
    
-		pwauthPamDrivers
-		
-			pwauthPamDrivers
-		
-					(string $config)
-			
    
-	
-			
      
-					
    • 
-				string
-				$config: path where pwauth is			
      • 
-				
    
-		
-			
 	
    
 						
 		
    
@@ -133,7 +100,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:04 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:10 +1200 by phpDocumentor 1.4.3
 	
    
 	
    
 
\ No newline at end of file
diff --git a/docs/api/elementindex.html b/docs/api/elementindex.html
index dfc3494e..5b32d8b4 100644
--- a/docs/api/elementindex.html
+++ b/docs/api/elementindex.html
@@ -128,7 +128,7 @@
 			addressbook_home_set
 					
 		
    
-			
    CalDAVPrincipal::addressbook_home_set() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::addressbook_home_set() in DAVPrincipal.php
    
 							
    Get the addressbook_home_set, as lazily as possible
    
 					
    
 			
    
@@ -184,7 +184,7 @@
 			AsCollection
 					
    
 		
    
-			
    CalDAVPrincipal::AsCollection() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::AsCollection() in DAVPrincipal.php
    
 							
    Returns a representation of the principal as a collection
    
 					
    
 			
    
@@ -196,11 +196,11 @@
 					
 			
    
 						Method
-			AssignSessionDetails
+			asSeconds
 					
    
 		
    
-			
    DAViCalSession::AssignSessionDetails() in DAViCalSession.php
    
-							
    Internal function used to assign the session details to a user's new session.
    
+			
    Rfc5545Duration::asSeconds() in RRule-v2.php
    
+							
    Returns the duration as epoch seconds.
    
 					
    
 			
    
 						Method
@@ -210,6 +210,14 @@
 			
    HTTPAuthSession::AssignSessionDetails() in HTTPAuthSession.php
    
 							
    Internal function used to assign the session details to a user's new session.
    
 					
+			
    
+						Method
+			AssignSessionDetails
+					
    
+		
    
+			
    DAViCalSession::AssignSessionDetails() in DAViCalSession.php
    
+							
    Internal function used to assign the session details to a user's new session.
    
+					
    
 			
    
 						Class
 			AtomEntry
@@ -255,6 +263,13 @@
 			
    HTTPAuthSession::AuthFailedResponse() in HTTPAuthSession.php
    
 							
    Authorisation failed, so we send some headers to say so.
    
 					
+			
    
+						Function
+			auth_functions_deprecated
+					
    
+		
    
+			
    auth_functions_deprecated() in auth-functions.php
    
+					
    
 			
    
 						Page
 			admin.php
@@ -318,7 +333,8 @@
 			$by_email
 					
    
 		
    
-			
    CalDAVPrincipal::$by_email in CalDAVPrincipal.php
    
+			
    Principal::$by_email in Principal.php
    
+							
    Whether this was retrieved using an e-mail address
    
 					
    
 			
    
 						Method
@@ -416,6 +432,13 @@
 					
 			
    
 						Function
+			build_dependencies_table
+					
    
+		
    
+			
    build_dependencies_table() in setup.php
    
+					
    
+			
    
+						Function
 			build_privileges_html
 					
    
 		
    
@@ -428,6 +451,13 @@
 		
    
 			
    build_site_statistics() in setup.php
    
 					
    
+			
    
+						Method
+			byEmail
+					
    
+		
    
+			
    Principal::byEmail() in Principal.php
    
+					
    
 		
 	
 	
    
@@ -445,6 +475,13 @@
 					
 			
    
 						Variable
+			$collections
+					
    
+		
    
+			
    Principal::$collections in Principal.php
    
+					
    
+			
    
+						Variable
 			$collection_id
 					
    
 		
    
@@ -453,6 +490,13 @@
 					
    
 			
    
 						Variable
+			$collection_id
+					
    
+		
    
+			
    Principal::$collection_id in Principal.php
    
+					
    
+			
    
+						Variable
 			$collection_path
 					
    
 		
    
@@ -476,12 +520,33 @@
 					
    
 			
    
 						Variable
+			$created
+					
    
+		
    
+			
    Principal::$created in Principal.php
    
+					
    
+			
    
+						Variable
 			$current_user_principal_xml
 					
    
 		
    
 			
    CalDAVRequest::$current_user_principal_xml in CalDAVRequest.php
    
 							
    The 'current_user_principal_xml' the DAV:current-user-principal answer. An  XMLElement object with an <href> or <unauthenticated> fragment.
    
 					
    
+			
    
+						Method
+			cacheDelete
+					
    
+		
    
+			
    Principal::cacheDelete() in Principal.php
    
+					
    
+			
    
+						Method
+			cacheFlush
+					
    
+		
    
+			
    Principal::cacheFlush() in Principal.php
    
+					
    
 			
    
 						Method
 			CalDAVClient
@@ -500,14 +565,6 @@
 					
 			
    
 						Class
-			CalDAVPrincipal
-					
    
-		
    
-			
    CalDAVPrincipal in CalDAVPrincipal.php
    
-							
    A class for things to do with a DAV Principal
    
-					
    
-			
    
-						Class
 			CalDAVRequest
 					
    
 		
    
@@ -534,7 +591,7 @@
 			calendar_free_busy_set
 					
 		
    
-			
    CalDAVPrincipal::calendar_free_busy_set() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::calendar_free_busy_set() in DAVPrincipal.php
    
 							
    Get the calendar_free_busy_set, as lazily as possible
    
 					
    
 			
    
@@ -542,7 +599,7 @@
 			calendar_home_set
 					
    
 		
    
-			
    CalDAVPrincipal::calendar_home_set() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::calendar_home_set() in DAVPrincipal.php
    
 							
    Get the calendar_home_set, as lazily as possible
    
 					
    
 			
    
@@ -561,6 +618,13 @@
 			
    HTTPAuthSession::CheckPassword() in HTTPAuthSession.php
    
 							
    CheckPassword does all of the password checking and  returns a user record object, or false if it all ends in tears.
    
 					
+			
    
+						Class
+			CheckResult
+					
    
+		
    
+			
    CheckResult in setup.php
    
+					
    
 			
    
 						Function
 			check_awl_version
@@ -570,6 +634,13 @@
 					
 			
    
 						Function
+			check_datetime
+					
    
+		
    
+			
    check_datetime() in setup.php
    
+					
    
+			
    
+						Function
 			check_davical_version
 					
    
 		
    
@@ -591,6 +662,20 @@
 					
    
 			
    
 						Function
+			check_iconv
+					
    
+		
    
+			
    check_iconv() in setup.php
    
+					
    
+			
    
+						Function
+			check_ldap
+					
    
+		
    
+			
    check_ldap() in setup.php
    
+					
    
+			
    
+						Function
 			check_magic_quotes_gpc
 					
    
 		
    
@@ -662,6 +747,14 @@
 			
    CalDAVRequest::CollectionId() in CalDAVRequest.php
    
 							
    Returns the ID of the collection of, or containing this request
    
 					
    
+			
    
+						Method
+			collection_id
+					
    
+		
    
+			
    DAVResource::collection_id() in DAVResource.php
    
+							
    Returns the internal collection_id for this collection, or the collection containing this resource
    
+					
    
 			
    
 						Function
 			component_to_xml
@@ -737,6 +830,13 @@
 			
    controlRequestContainer() in caldav-PUT-functions.php
    
 							
    Work out the location we are doing the PUT to, and check that we have the rights to  do the needful.
    
 					
+			
    
+						Method
+			Create
+					
    
+		
    
+			
    Principal::Create() in Principal.php
    
+					
    
 			
    
 						Function
 			CreateDefaultRelationships
@@ -758,15 +858,23 @@
 					
    
 		
    
 			
    CreateHomeCalendar() in auth-functions.php
    
-							
    Create a default home calendar for the user.
    
+							
    Backward compatibility
    
 					
    
 			
    
 						Function
-			create_scheduling_requests
+			CreateHomeCollections
 					
    
 		
    
-			
    create_scheduling_requests() in caldav-PUT-functions.php
    
-							
    Create scheduling requests in the schedule inbox for the
    
+			
    CreateHomeCollections() in auth-functions.php
    
+							
    Creates some default home collections for the user.
    
+					
    
+			
    
+						Function
+			create_external
+					
    
+		
    
+			
    create_external() in external-fetch.php
    
+							
    Functions for managing external BIND resources
    
 					
    
 			
    
 						Method
@@ -784,6 +892,13 @@
 					
 			
    
 						Page
+			createdb.php
+					
    
+		
    
+			
    createdb.php in createdb.php
    
+					
    
+			
    
+						Page
 			caldav-ACL.php
 					
    
 		
    
@@ -903,6 +1018,13 @@
 					
    
 			
    
 						Page
+			caldav-PUT-vcalendar.php
+					
    
+		
    
+			
    caldav-PUT-vcalendar.php in caldav-PUT-vcalendar.php
    
+					
    
+			
    
+						Page
 			caldav-PUT-vcard.php
 					
    
 		
    
@@ -910,13 +1032,6 @@
 					
    
 			
    
 						Page
-			caldav-PUT.php
-					
    
-		
    
-			
    caldav-PUT.php in caldav-PUT.php
    
-					
    
-			
    
-						Page
 			caldav-REPORT-calquery.php
 					
    
 		
    
@@ -959,6 +1074,13 @@
 					
    
 			
    
 						Page
+			caldav-REPORT-principal-match.php
+					
    
+		
    
+			
    caldav-REPORT-principal-match.php in caldav-REPORT-principal-match.php
    
+					
    
+			
    
+						Page
 			caldav-REPORT-principal.php
 					
    
 		
    
@@ -980,13 +1102,6 @@
 					
    
 			
    
 						Page
-			CalDAVPrincipal.php
-					
    
-		
    
-			
    CalDAVPrincipal.php in CalDAVPrincipal.php
    
-					
    
-			
    
-						Page
 			CalDAVRequest.php
 					
    
 		
    
@@ -1014,12 +1129,19 @@
 		
    
 	
    
 	
    
+			
    
+						Variable
+			$date_format_type
+					
    
+		
    
+			
    Principal::$date_format_type in Principal.php
    
+					
    
 			
    
 						Variable
 			$dav_name
 					
    
 		
    
-			
    CalDAVPrincipal::$dav_name in CalDAVPrincipal.php
    
+			
    Principal::$dav_name in Principal.php
    
 					
    
 			
    
 						Variable
@@ -1030,6 +1152,27 @@
 					
 			
    
 						Variable
+			$dead_properties
+					
    
+		
    
+			
    Principal::$dead_properties in Principal.php
    
+					
    
+			
    
+						Variable
+			$default_calendar
+					
    
+		
    
+			
    Principal::$default_calendar in Principal.php
    
+					
    
+			
    
+						Variable
+			$default_privileges
+					
    
+		
    
+			
    Principal::$default_privileges in Principal.php
    
+					
    
+			
    
+						Variable
 			$depth
 					
    
 		
    
@@ -1045,6 +1188,14 @@
 					
    
 			
    
 						Variable
+			$destination
+					
    
+		
    
+			
    CalDAVRequest::$destination in CalDAVRequest.php
    
+							
    The value of any 'Destionation:' header, if present.
    
+					
    
+			
    
+						Variable
 			$displayname
 					
    
 		
    
@@ -1052,6 +1203,13 @@
 					
    
 			
    
 						Variable
+			$displayname
+					
    
+		
    
+			
    Principal::$displayname in Principal.php
    
+					
    
+			
    
+						Variable
 			$domain
 					
    
 		
    
@@ -1112,6 +1270,14 @@
 					
    
 			
    
 						Class
+			DAVPrincipal
+					
    
+		
    
+			
    DAVPrincipal in DAVPrincipal.php
    
+							
    A class for things to do with a DAV Principal
    
+					
    
+			
    
+						Class
 			DAVResource
 					
    
 		
    
@@ -1139,7 +1305,14 @@
 			dav_name
 					
 		
    
-			
    CalDAVPrincipal::dav_name() in CalDAVPrincipal.php
    
+			
    DAVTicket::dav_name() in DAVTicket.php
    
+					
    
+			
    
+						Method
+			dav_name
+					
    
+		
    
+			
    Principal::dav_name() in Principal.php
    
 							
    Return the partial path representing this principal
    
 					
    
 			
    
@@ -1154,13 +1327,6 @@
 						Method
 			dav_name
 					
    
-		
    
-			
    DAVTicket::dav_name() in DAVTicket.php
    
-					
    
-			
    
-						Method
-			dav_name
-					
    
 		
    
 			
    CalDAVRequest::dav_name() in CalDAVRequest.php
    
 							
    Returns the dav_name of the resource in our internal namespace
    
@@ -1186,7 +1352,6 @@
 					
 		
    
 			
    DEBUG_RRULE in RRule-v2.php
    
-							
    Class for parsing RRule and getting us the dates
    
 					
    
 			
    
 						Function
@@ -1196,6 +1361,14 @@
 			
    DeconstructURL() in always.php
    
 							
    Deconstruct a dav_name from the supplied URL.  The dav_name will be urldecoded.
    
 					
+			
    
+						Method
+			default_calendar
+					
    
+		
    
+			
    Principal::default_calendar() in Principal.php
    
+							
    Return the default calendar for this principal
    
+					
    
 			
    
 						Function
 			delete_collection
@@ -1260,6 +1433,13 @@
 					
 			
    
 						Method
+			doNormalLine
+					
    
+		
    
+			
    SqlToArray::doNormalLine() in SqlToArray.php
    
+					
    
+			
    
+						Method
 			DoOptionsRequest
 					
    
 		
    
@@ -1305,6 +1485,21 @@
 		
    
 			
    do_error() in setup.php
    
 					
    
+			
    
+						Function
+			do_scheduling_requests
+					
    
+		
    
+			
    do_scheduling_requests() in caldav-PUT-functions.php
    
+							
    Create/Update the scheduling requests for this resource.  This includes updating  the scheduled user's default calendar.
    
+					
    
+			
    
+						Page
+			dbexec.php
+					
    
+		
    
+			
    dbexec.php in dbexec.php
    
+					
    
 			
    
 						Page
 			DAViCalSession.php
@@ -1321,6 +1516,13 @@
 					
 			
    
 						Page
+			DAVPrincipal.php
+					
    
+		
    
+			
    DAVPrincipal.php in DAVPrincipal.php
    
+					
    
+			
    
+						Page
 			DAVResource.php
 					
    
 		
    
@@ -1335,6 +1537,13 @@
 					
    
 			
    
 						Page
+			drivers_imap_pam.php
+					
    
+		
    
+			
    drivers_imap_pam.php in drivers_imap_pam.php
    
+					
    
+			
    
+						Page
 			drivers_ldap.php
 					
    
 		
    
@@ -1366,12 +1575,26 @@
 						Variable
 			$email
 					
+		
    
+			
    Principal::$email in Principal.php
    
+					
    
+			
    
+						Variable
+			$email
+					
    
 		
    
 			
    HTTPAuthSession::$email in HTTPAuthSession.php
    
 							
    User e-mail
    
 					
    
 			
    
 						Variable
+			$email_ok
+					
    
+		
    
+			
    Principal::$email_ok in Principal.php
    
+					
    
+			
    
+						Variable
 			$entry
 					
    
 		
    
@@ -1381,6 +1604,13 @@
 						Variable
 			$exists
 					
+		
    
+			
    DAVResource::$exists in DAVResource.php
    
+					
    
+			
    
+						Variable
+			$exists
+					
    
 		
    
 			
    CalDAVRequest::$exists in CalDAVRequest.php
    
 							
    The type of collection being requested:
    
@@ -1390,7 +1620,8 @@
 			$exists
 					
 		
    
-			
    DAVResource::$exists in DAVResource.php
    
+			
    Principal::$exists in Principal.php
    
+							
    Whether this Principal actually exists in the database yet.
    
 					
    
 			
    
 						Function
@@ -1422,6 +1653,14 @@
 					
 			
    
 						Method
+			email
+					
    
+		
    
+			
    Principal::email() in Principal.php
    
+							
    Return the email
    
+					
    
+			
    
+						Method
 			epoch
 					
    
 		
    
@@ -1429,11 +1668,18 @@
 					
    
 			
    
 						Method
+			equals
+					
    
+		
    
+			
    Rfc5545Duration::equals() in RRule-v2.php
    
+							
    Return true if $this and $other are equal, false otherwise.
    
+					
    
+			
    
+						Method
 			Exists
 					
    
 		
    
-			
    CalDAVPrincipal::Exists() in CalDAVPrincipal.php
    
-							
    Does this principal exist?
    
+			
    Principal::Exists() in Principal.php
    
 					
    
 			
    
 						Method
@@ -1466,6 +1712,13 @@
 		
    
 			
    AtomFeed::export() in AtomFeed.php
    
 					
    
+			
    
+						Page
+			external-fetch.php
+					
    
+		
    
+			
    external-fetch.php in external-fetch.php
    
+					
    
 		
    
 	
 	
    
@@ -1489,6 +1742,13 @@
 			
    HTTPAuthSession::$fullname in HTTPAuthSession.php
    
 							
    User full name
    
 					
+			
    
+						Variable
+			$fullname
+					
    
+		
    
+			
    Principal::$fullname in Principal.php
    
+					
    
 			
    
 						Method
 			FailIfLocked
@@ -1507,6 +1767,14 @@
 					
 			
    
 						Method
+			FetchCollections
+					
    
+		
    
+			
    Principal::FetchCollections() in Principal.php
    
+							
    Fetch the list of collections for this principal
    
+					
    
+			
    
+						Method
 			FetchDeadProperties
 					
    
 		
    
@@ -1515,6 +1783,14 @@
 					
    
 			
    
 						Method
+			FetchDeadProperties
+					
    
+		
    
+			
    Principal::FetchDeadProperties() in Principal.php
    
+							
    Ensure the principal's dead properties are loaded
    
+					
    
+			
    
+						Method
 			FetchParentContainer
 					
    
 		
    
@@ -1542,7 +1818,7 @@
 			FetchProxyGroups
 					
 		
    
-			
    CalDAVPrincipal::FetchProxyGroups() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::FetchProxyGroups() in DAVPrincipal.php
    
 							
    Split this out so we do it as infrequently as possible, given the cost.
    
 					
    
 			
    
@@ -1577,12 +1853,20 @@
 			
    DAVResource::FetchTickets() in DAVResource.php
    
 							
    Fetches an array of the access_ticket records applying to this path
    
 					
+			
    
+						Function
+			fetch_external
+					
    
+		
    
+			
    fetch_external() in external-fetch.php
    
+					
    
 			
    
 						Method
 			FloatOrUTC
 					
    
 		
    
 			
    RepeatRuleDateTime::FloatOrUTC() in RRule-v2.php
    
+							
    If this is a localised time then this will return the UTC equivalent.  If it is a  floating time, then you will just get the floating time.  If it is a date then it  will be returned as a date.  Note that if it is a *localised* date then the answer  will still be the UTC equivalent but only the date itself will be returned.
    
 					
    
 			
    
 						Method
@@ -1600,6 +1884,14 @@
 			
    DAVResource::FromRow() in DAVResource.php
    
 							
    Initialise from a database row
    
 					
+			
    
+						Method
+			fromTwoDates
+					
    
+		
    
+			
    Rfc5545Duration::fromTwoDates() in RRule-v2.php
    
+							
    Factory method to return an Rfc5545Duration object from the difference  between two dates.
    
+					
    
 			
    
 						Page
 			feed.php
@@ -1644,20 +1936,6 @@
 			
    HTTPAuthSession::$groups in HTTPAuthSession.php
    
 							
    Group rights
    
 					
-			
    
-						Variable
-			$group_membership
-					
    
-		
    
-			
    CalDAVPrincipal::$group_membership in CalDAVPrincipal.php
    
-					
    
-			
    
-						Variable
-			$group_member_set
-					
    
-		
    
-			
    CalDAVPrincipal::$group_member_set in CalDAVPrincipal.php
    
-					
    
 			
    
 						Method
 			GetACL
@@ -1692,6 +1970,13 @@
 					
 			
    
 						Method
+			getClass
+					
    
+		
    
+			
    CheckResult::getClass() in setup.php
    
+					
    
+			
    
+						Method
 			GetDepthName
 					
    
 		
    
@@ -1700,6 +1985,13 @@
 					
    
 			
    
 						Method
+			getDescription
+					
    
+		
    
+			
    CheckResult::getDescription() in setup.php
    
+					
    
+			
    
+						Method
 			GetEntryByHref
 					
    
 		
    
@@ -1778,13 +2070,35 @@
 			
    RRule::GetNext() in RRule.php
    
 							
    This is most of the meat of the RRULE processing, where we find the next date.
    
 					
    
+			
    
+						Method
+			getOK
+					
    
+		
    
+			
    CheckResult::getOK() in setup.php
    
+					
    
+			
    
+						Method
+			GetParentContainer
+					
    
+		
    
+			
    DAVResource::GetParentContainer() in DAVResource.php
    
+							
    Get a DAVResource which is the parent to this resource.
    
+					
    
 			
    
 						Function
 			getPrincipalByID
 					
    
 		
    
-			
    getPrincipalByID() in always.php
    
-							
    Return a user record identified by a user_no, caching it for any subsequent lookup
    
+			
    getPrincipalByID() in auth-functions.php
    
+					
    
+			
    
+						Method
+			GetProperty
+					
    
+		
    
+			
    DAVPrincipal::GetProperty() in DAVPrincipal.php
    
+							
    Return an arbitrary property
    
 					
    
 			
    
 						Method
@@ -1796,14 +2110,6 @@
 					
 			
    
 						Method
-			GetProperty
-					
    
-		
    
-			
    CalDAVPrincipal::GetProperty() in CalDAVPrincipal.php
    
-							
    Return an arbitrary property
    
-					
    
-			
    
-						Method
 			GetPropStat
 					
    
 		
    
@@ -1832,7 +2138,14 @@
 					
 		
    
 			
    iSchedule::getServer() in iSchedule.php
    
-							
    finds a remote calender server via DNS SRV records
    
+							
    finds a remote calendar server via DNS SRV records
    
+					
    
+			
    
+						Method
+			getStatements
+					
    
+		
    
+			
    SqlToArray::getStatements() in SqlToArray.php
    
 					
    
 			
    
 						Function
@@ -1852,6 +2165,13 @@
 					
 			
    
 						Method
+			getTimeZone
+					
    
+		
    
+			
    RepeatRuleDateTime::getTimeZone() in RRule-v2.php
    
+					
    
+			
    
+						Method
 			GetTodos
 					
    
 		
    
@@ -1868,27 +2188,32 @@
 					
    
 			
    
 						Function
+			GetTZID
+					
    
+		
    
+			
    GetTZID() in caldav-PUT-functions.php
    
+							
    Get a TZID string from this VEVENT/VTODO/... component if we can
    
+					
    
+			
    
+						Function
 			getUserByEMail
 					
    
 		
    
-			
    getUserByEMail() in always.php
    
-							
    Return a user record identified by e-mail address, caching it for any subsequent lookup
    
+			
    getUserByEMail() in auth-functions.php
    
 					
    
 			
    
 						Function
 			getUserByID
 					
    
 		
    
-			
    getUserByID() in always.php
    
-							
    Return a user record identified by a user_no, caching it for any subsequent lookup
    
+			
    getUserByID() in auth-functions.php
    
 					
    
 			
    
 						Function
 			getUserByName
 					
    
 		
    
-			
    getUserByName() in always.php
    
-							
    Return a user record identified by a username, caching it for any subsequent lookup
    
+			
    getUserByName() in auth-functions.php
    
 					
    
 			
    
 						Method
@@ -1953,6 +2278,13 @@
 					
 			
    
 						Function
+			get_phpinfo
+					
    
+		
    
+			
    get_phpinfo() in setup.php
    
+					
    
+			
    
+						Function
 			grant_row_editor
 					
    
 		
    
@@ -1971,7 +2303,7 @@
 			GroupMemberSet
 					
 		
    
-			
    CalDAVPrincipal::GroupMemberSet() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::GroupMemberSet() in DAVPrincipal.php
    
 							
    Accessor for the group member set - the members of this group
    
 					
    
 			
    
@@ -1979,7 +2311,7 @@
 			GroupMembership
 					
    
 		
    
-			
    CalDAVPrincipal::GroupMembership() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::GroupMembership() in DAVPrincipal.php
    
 							
    Accessor for the group membership - the groups this principal is a member of
    
 					
    
 			
    
@@ -2105,7 +2437,7 @@
 					
    
 		
    
 			
    HTTPAuthSession::HTTPAuthSession() in HTTPAuthSession.php
    
-							
    The constructor, which just calls the actual type configured
    
+							
    The constructor, which just calls the type supplied or configured
    
 					
    
 			
    
 						Class
@@ -2138,6 +2470,27 @@
 		
    
 	
    
 	
    
+			
    
+						Variable
+			$is_addressbook
+					
    
+		
    
+			
    Principal::$is_addressbook in Principal.php
    
+					
    
+			
    
+						Variable
+			$is_calendar
+					
    
+		
    
+			
    Principal::$is_calendar in Principal.php
    
+					
    
+			
    
+						Variable
+			$is_principal
+					
    
+		
    
+			
    Principal::$is_principal in Principal.php
    
+					
    
 			
    
 						Page
 			index.php
@@ -2145,6 +2498,14 @@
 		
    
 			
    index.php in index.php
    
 					
    
+			
    
+						Function
+			i18n
+					
    
+		
    
+			
    i18n() in setup.php
    
+							
    todo work out something more than true/false returns for dependency checks
    
+					
    
 			
    
 						Class
 			iCalDate
@@ -2168,6 +2529,29 @@
 		
    
 			
    DAVTicket::id() in DAVTicket.php
    
 					
    
+			
    
+						Method
+			imapPamDrivers
+					
    
+		
    
+			
    imapPamDrivers::imapPamDrivers() in drivers_imap_pam.php
    
+							
    Constructor.
    
+					
    
+			
    
+						Class
+			imapPamDrivers
+					
    
+		
    
+			
    imapPamDrivers in drivers_imap_pam.php
    
+					
    
+			
    
+						Function
+			IMAP_PAM_check
+					
    
+		
    
+			
    IMAP_PAM_check() in drivers_imap_pam.php
    
+							
    Check the username / password against the PAM system
    
+					
    
 			
    
 						Method
 			importFromDirectory
@@ -2202,16 +2586,15 @@
 			InitialiseRecord
 					
    
 		
    
-			
    CalDAVPrincipal::InitialiseRecord() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::InitialiseRecord() in DAVPrincipal.php
    
 							
    Initialise the Principal object from a $usr record from the DB.
    
 					
    
 			
    
 						Method
-			IsAddressBook
+			internal_url
 					
    
 		
    
-			
    CalDAVRequest::IsAddressBook() in CalDAVRequest.php
    
-							
    Returns true if the URL referenced by this request points at an addressbook collection.
    
+			
    Principal::internal_url() in Principal.php
    
 					
    
 			
    
 						Method
@@ -2223,6 +2606,14 @@
 					
 			
    
 						Method
+			IsAddressBook
+					
    
+		
    
+			
    CalDAVRequest::IsAddressBook() in CalDAVRequest.php
    
+							
    Returns true if the URL referenced by this request points at an addressbook collection.
    
+					
    
+			
    
+						Method
 			IsBinding
 					
    
 		
    
@@ -2234,16 +2625,16 @@
 			IsCalendar
 					
 		
    
-			
    CalDAVRequest::IsCalendar() in CalDAVRequest.php
    
-							
    Returns true if the URL referenced by this request points at a calendar collection.
    
+			
    DAVResource::IsCalendar() in DAVResource.php
    
+							
    Checks whether this resource is a calendar
    
 					
    
 			
    
 						Method
 			IsCalendar
 					
    
 		
    
-			
    DAVResource::IsCalendar() in DAVResource.php
    
-							
    Checks whether this resource is a calendar
    
+			
    CalDAVRequest::IsCalendar() in CalDAVRequest.php
    
+							
    Returns true if the URL referenced by this request points at a calendar collection.
    
 					
    
 			
    
 						Class
@@ -2265,16 +2656,16 @@
 			IsCollection
 					
    
 		
    
-			
    CalDAVRequest::IsCollection() in CalDAVRequest.php
    
-							
    Returns true if the URL referenced by this request points at a collection.
    
+			
    DAVResource::IsCollection() in DAVResource.php
    
+							
    Checks whether this resource is a collection
    
 					
    
 			
    
 						Method
 			IsCollection
 					
    
 		
    
-			
    DAVResource::IsCollection() in DAVResource.php
    
-							
    Checks whether this resource is a collection
    
+			
    CalDAVRequest::IsCollection() in CalDAVRequest.php
    
+							
    Returns true if the URL referenced by this request points at a collection.
    
 					
    
 			
    
 						Method
@@ -2285,6 +2676,14 @@
 					
 			
    
 						Method
+			IsExternal
+					
    
+		
    
+			
    DAVResource::IsExternal() in DAVResource.php
    
+							
    Checks whether this resource is a bind to an external resource
    
+					
    
+			
    
+						Method
 			isFloating
 					
    
 		
    
@@ -2295,7 +2694,7 @@
 			IsGroup
 					
 		
    
-			
    CalDAVPrincipal::IsGroup() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::IsGroup() in DAVPrincipal.php
    
 							
    Is this a group principal?
    
 					
    
 			
    
@@ -2311,7 +2710,7 @@
 			IsLocked
 					
    
 		
    
-			
    CalDAVRequest::IsLocked() in CalDAVRequest.php
    
+			
    DAVResource::IsLocked() in DAVResource.php
    
 							
    Checks whether the resource is locked, returning any lock token, or false
    
 					
    
 			
    
@@ -2319,7 +2718,7 @@
 			IsLocked
 					
    
 		
    
-			
    DAVResource::IsLocked() in DAVResource.php
    
+			
    CalDAVRequest::IsLocked() in CalDAVRequest.php
    
 							
    Checks whether the resource is locked, returning any lock token, or false
    
 					
    
 			
    
@@ -2335,16 +2734,16 @@
 			IsPrincipal
 					
    
 		
    
-			
    CalDAVRequest::IsPrincipal() in CalDAVRequest.php
    
-							
    Returns true if the URL referenced by this request points at a principal.
    
+			
    DAVResource::IsPrincipal() in DAVResource.php
    
+							
    Checks whether this resource is a principal
    
 					
    
 			
    
 						Method
 			IsPrincipal
 					
    
 		
    
-			
    DAVResource::IsPrincipal() in DAVResource.php
    
-							
    Checks whether this resource is a principal
    
+			
    CalDAVRequest::IsPrincipal() in CalDAVRequest.php
    
+							
    Returns true if the URL referenced by this request points at a principal.
    
 					
    
 			
    
 						Method
@@ -2401,6 +2800,13 @@
 		
    
 	
    
 	
    
+			
    
+						Variable
+			$locale
+					
    
+		
    
+			
    Principal::$locale in Principal.php
    
+					
    
 			
    
 						Page
 			log_caldav_action.php
@@ -2408,14 +2814,6 @@
 		
    
 			
    log_caldav_action.php in log_caldav_action.php
    
 					
    
-			
    
-						Method
-			ldapDrivers
-					
    
-		
    
-			
    ldapDrivers::ldapDrivers() in drivers_ldap.php
    
-							
    Constructor.
    
-					
    
 			
    
 						Class
 			ldapDrivers
@@ -2456,6 +2854,13 @@
 					
 			
    
 						Function
+			logRequestHeaders
+					
    
+		
    
+			
    logRequestHeaders() in caldav.php
    
+					
    
+			
    
+						Function
 			log_caldav_action
 					
    
 		
    
@@ -2478,6 +2883,13 @@
 			
    CalDAVRequest::$method in CalDAVRequest.php
    
 							
    The HTTP request method: PROPFIND, LOCK, REPORT, OPTIONS, etc...
    
 					
    
+			
    
+						Variable
+			$modified
+					
    
+		
    
+			
    Principal::$modified in Principal.php
    
+					
    
 			
    
 						Function
 			make_help_link
@@ -2545,12 +2957,11 @@
 	
    
 	
    
 			
    
-						Method
-			NeedPrivilege
+						Page
+			newfile.php
 					
    
 		
    
-			
    CalDAVRequest::NeedPrivilege() in CalDAVRequest.php
    
-							
    Send a need-privileges error response.  This function will only return  if the $href is not supplied and the current user has the specified  permission for the request path.
    
+			
    newfile.php in newfile.php
    
 					
    
 			
    
 						Method
@@ -2562,6 +2973,14 @@
 					
 			
    
 						Method
+			NeedPrivilege
+					
    
+		
    
+			
    CalDAVRequest::NeedPrivilege() in CalDAVRequest.php
    
+							
    Send a need-privileges error response.  This function will only return  if the $href is not supplied and the current user has the specified  permission for the request path.
    
+					
    
+			
    
+						Method
 			next
 					
    
 		
    
@@ -2582,6 +3001,13 @@
 		
    
 			
    CalDAVRequest::$options in CalDAVRequest.php
    
 					
    
+			
    
+						Variable
+			$original_request_url
+					
    
+		
    
+			
    Principal::$original_request_url in Principal.php
    
+					
    
 			
    
 						Page
 			other_translated_strings.php
@@ -2596,6 +3022,14 @@
 		
    
 			
    obfuscated_event() in caldav-GET.php
    
 					
    
+			
    
+						Function
+			olson_from_vtimezone
+					
    
+		
    
+			
    olson_from_vtimezone() in RRule-v2.php
    
+							
    Try and extract something like "Pacific/Auckland" or "America/Indiana/Indianapolis" if possible, given  the VTIMEZONE component that is passed in.  This is much more complex than olson_from_tzstring since  we start to examine the rules and work out what actual timezone this might be.
    
+					
    
 		
    
 	
 	
    
@@ -2627,6 +3061,13 @@
 					
 			
    
 						Variable
+			$password
+					
    
+		
    
+			
    Principal::$password in Principal.php
    
+					
    
+			
    
+						Variable
 			$port
 					
    
 		
    
@@ -2642,10 +3083,10 @@
 					
    
 			
    
 						Variable
-			$principal_address
+			$principal_id
 					
    
 		
    
-			
    CalDAVPrincipal::$principal_address in CalDAVPrincipal.php
    
+			
    Principal::$principal_id in Principal.php
    
 					
    
 			
    
 						Variable
@@ -2657,6 +3098,13 @@
 					
 			
    
 						Variable
+			$privileges
+					
    
+		
    
+			
    Principal::$privileges in Principal.php
    
+					
    
+			
    
+						Variable
 			$protocol
 					
    
 		
    
@@ -2685,6 +3133,13 @@
 					
    
 			
    
 						Page
+			Principal.php
+					
    
+		
    
+			
    Principal.php in Principal.php
    
+					
    
+			
    
+						Page
 			PublicSession.php
 					
    
 		
    
@@ -2774,12 +3229,20 @@
 			
    CalDAVRequest::PreconditionFailed() in CalDAVRequest.php
    
 							
    Send an error response for a failed precondition.
    
 					
    
+			
    
+						Class
+			Principal
+					
    
+		
    
+			
    Principal in Principal.php
    
+							
    A class for things to do with a Principal
    
+					
    
 			
    
 						Method
 			PrincipalProperty
 					
    
 		
    
-			
    CalDAVPrincipal::PrincipalProperty() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::PrincipalProperty() in DAVPrincipal.php
    
 							
    Returns properties which are specific to this principal
    
 					
    
 			
    
@@ -2805,6 +3268,14 @@
 					
 			
    
 						Method
+			principal_id
+					
    
+		
    
+			
    Principal::principal_id() in Principal.php
    
+							
    Return the principal_id
    
+					
    
+			
    
+						Method
 			principal_url
 					
    
 		
    
@@ -2823,7 +3294,7 @@
 			Privileges
 					
 		
    
-			
    CalDAVPrincipal::Privileges() in CalDAVPrincipal.php
    
+			
    CalDAVRequest::Privileges() in CalDAVRequest.php
    
 							
    Return the privileges bits for the current session user to this resource
    
 					
    
 			
    
@@ -2839,7 +3310,7 @@
 			Privileges
 					
    
 		
    
-			
    CalDAVRequest::Privileges() in CalDAVRequest.php
    
+			
    DAVPrincipal::Privileges() in DAVPrincipal.php
    
 							
    Return the privileges bits for the current session user to this resource
    
 					
    
 			
    
@@ -2867,6 +3338,21 @@
 					
 			
    
 						Function
+			process_ace
+					
    
+		
    
+			
    process_ace() in caldav-ACL.php
    
+							
    Preconditions
    
+					
    
+			
    
+						Method
+			PropertySearch
+					
    
+		
    
+			
    DAVPrincipal::PropertySearch() in DAVPrincipal.php
    
+					
    
+			
    
+						Function
 			property_response
 					
    
 		
    
@@ -2878,17 +3364,9 @@
 			ProxyFor
 					
 		
    
-			
    CalDAVPrincipal::ProxyFor() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::ProxyFor() in DAVPrincipal.php
    
 							
    Accessor for read or write proxy
    
 					
    
-			
    
-						Method
-			PublicSession
-					
    
-		
    
-			
    PublicSession::PublicSession() in PublicSession.php
    
-							
    The constructor, which just calls the actual type configured
    
-					
    
 			
    
 						Class
 			PublicSession
@@ -2897,6 +3375,14 @@
 			
    PublicSession in PublicSession.php
    
 							
    A Class for handling a public (anonymous) session
    
 					
+			
    
+						Method
+			PublicSession
+					
    
+		
    
+			
    PublicSession::PublicSession() in PublicSession.php
    
+							
    The constructor, which just calls the actual type configured
    
+					
    
 			
    
 						Function
 			public_events_only
@@ -2912,14 +3398,6 @@
 		
    
 			
    pwauthPamDrivers in drivers_pwauth_pam.php
    
 					
    
-			
    
-						Method
-			pwauthPamDrivers
-					
    
-		
    
-			
    pwauthPamDrivers::pwauthPamDrivers() in drivers_pwauth_pam.php
    
-							
    Constructor.
    
-					
    
 			
    
 						Function
 			PWAUTH_PAM_check
@@ -2946,20 +3424,6 @@
 					
 			
    
 						Variable
-			$read_proxy_for
-					
    
-		
    
-			
    CalDAVPrincipal::$read_proxy_for in CalDAVPrincipal.php
    
-					
    
-			
    
-						Variable
-			$read_proxy_group
-					
    
-		
    
-			
    CalDAVPrincipal::$read_proxy_group in CalDAVPrincipal.php
    
-					
    
-			
    
-						Variable
 			$recur
 					
    
 		
    
@@ -2983,6 +3447,13 @@
 						Variable
 			$resourcetypes
 					
+		
    
+			
    Principal::$resourcetypes in Principal.php
    
+					
    
+			
    
+						Variable
+			$resourcetypes
+					
    
 		
    
 			
    DAVResource::$resourcetypes in DAVResource.php
    
 					
    
@@ -3020,9 +3491,23 @@
 			ReadProxyGroup
 					
 		
    
-			
    CalDAVPrincipal::ReadProxyGroup() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::ReadProxyGroup() in DAVPrincipal.php
    
 							
    Accessor for the read proxy group
    
 					
    
+			
    
+						Function
+			removeComment
+					
    
+		
    
+			
    removeComment() in createdb.php
    
+					
    
+			
    
+						Method
+			render
+					
    
+		
    
+			
    Tools::render() in tools.php
    
+					
    
 			
    
 						Method
 			Render
@@ -3040,10 +3525,11 @@
 					
 			
    
 						Method
-			render
+			RenderAsXML
 					
    
 		
    
-			
    Tools::render() in tools.php
    
+			
    DAVPrincipal::RenderAsXML() in DAVPrincipal.php
    
+							
    Render XML for a single Principal (user) from the DB
    
 					
    
 			
    
 						Method
@@ -3055,14 +3541,6 @@
 					
 			
    
 						Method
-			RenderAsXML
-					
    
-		
    
-			
    CalDAVPrincipal::RenderAsXML() in CalDAVPrincipal.php
    
-							
    Render XML for a single Principal (user) from the DB
    
-					
    
-			
    
-						Method
 			RenderGMT
 					
    
 		
    
@@ -3089,6 +3567,7 @@
 					
 		
    
 			
    RepeatRule in RRule-v2.php
    
+							
    This class is an implementation of RRULE parsing and expansion, as per RFC5545.  It should be reasonably  complete, except that it does not handle changing the WKST - there may be a few errors in unusual rules  also, but all of the common cases should be handled correctly.
    
 					
    
 			
    
 						Class
@@ -3151,13 +3630,15 @@
 					
    
 		
    
 			
    RepeatRuleDateTime::RFC5545() in RRule-v2.php
    
+							
    Returns the string following a property name for an RFC5545 DATE-TIME value.
    
 					
    
 			
    
-						Method
-			RFC5545Duration
+						Class
+			Rfc5545Duration
 					
    
 		
    
-			
    RepeatRuleDateTime::RFC5545Duration() in RRule-v2.php
    
+			
    Rfc5545Duration in RRule-v2.php
    
+							
    Provide a useful way of dealing with RFC5545 duration strings of the form
    
 					
    
 			
    
 						Function
@@ -3175,14 +3656,6 @@
 			
    rollback_on_error() in caldav-PUT-functions.php
    
 							
    This function launches an error
    
 					
-			
    
-						Class
-			RRule
-					
    
-		
    
-			
    RRule in RRule.php
    
-							
    A Class for handling Events on a calendar which repeat
    
-					
    
 			
    
 						Method
 			RRule
@@ -3191,6 +3664,14 @@
 			
    RRule::RRule() in RRule.php
    
 							
    The constructor takes a start date and an RRULE definition.  Both of these  follow the iCalendar standard.
    
 					
+			
    
+						Class
+			RRule
+					
    
+		
    
+			
    RRule in RRule.php
    
+							
    A Class for handling Events on a calendar which repeat
    
+					
    
 			
    
 						Method
 			RRuleTest
@@ -3205,6 +3686,13 @@
 		
    
 			
    RRuleTest in test-RRULE.php
    
 					
    
+			
    
+						Method
+			rrule_day_number
+					
    
+		
    
+			
    RepeatRule::rrule_day_number() in RRule-v2.php
    
+					
    
 			
    
 						Function
 			rrule_expand
@@ -3221,20 +3709,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$schedule_inbox_url
-					
    
-		
    
-			
    CalDAVPrincipal::$schedule_inbox_url in CalDAVPrincipal.php
    
-					
    
-			
    
-						Variable
-			$schedule_outbox_url
-					
    
-		
    
-			
    CalDAVPrincipal::$schedule_outbox_url in CalDAVPrincipal.php
    
-					
    
 			
    
 						Variable
 			$selector
@@ -3261,6 +3735,27 @@
 					
 			
    
 						Variable
+			$state
+					
    
+		
    
+			
    SqlToArray::$state in SqlToArray.php
    
+					
    
+			
    
+						Variable
+			$statement
+					
    
+		
    
+			
    SqlToArray::$statement in SqlToArray.php
    
+					
    
+			
    
+						Variable
+			$statements
+					
    
+		
    
+			
    SqlToArray::$statements in SqlToArray.php
    
+					
    
+			
    
+						Variable
 			$supported_privileges
 					
    
 		
    
@@ -3274,6 +3769,13 @@
 		
    
 			
    setup.php in setup.php
    
 					
    
+			
    
+						Page
+			SqlToArray.php
+					
    
+		
    
+			
    SqlToArray.php in SqlToArray.php
    
+					
    
 			
    
 						Method
 			second
@@ -3297,6 +3799,27 @@
 					
 			
    
 						Method
+			setAsDate
+					
    
+		
    
+			
    RepeatRuleDateTime::setAsDate() in RRule-v2.php
    
+					
    
+			
    
+						Method
+			setAsFloat
+					
    
+		
    
+			
    RepeatRuleDateTime::setAsFloat() in RRule-v2.php
    
+					
    
+			
    
+						Method
+			setClass
+					
    
+		
    
+			
    CheckResult::setClass() in setup.php
    
+					
    
+			
    
+						Method
 			setContent
 					
    
 		
    
@@ -3315,14 +3838,14 @@
 			setDate
 					
 		
    
-			
    RepeatRuleDateTime::setDate() in RRule-v2.php
    
+			
    AtomEntry::setDate() in AtomFeed.php
    
 					
    
 			
    
 						Method
 			setDate
 					
    
 		
    
-			
    AtomEntry::setDate() in AtomFeed.php
    
+			
    RepeatRuleDateTime::setDate() in RRule-v2.php
    
 					
    
 			
    
 						Method
@@ -3356,6 +3879,13 @@
 						Method
 			setDescription
 					
    
+		
    
+			
    CheckResult::setDescription() in setup.php
    
+					
    
+			
    
+						Method
+			setDescription
+					
    
 		
    
 			
    AtomEntry::setDescription() in AtomFeed.php
    
 					
    
@@ -3395,14 +3925,14 @@
 			setId
 					
 		
    
-			
    AtomFeed::setId() in AtomFeed.php
    
+			
    AtomEntry::setId() in AtomFeed.php
    
 					
    
 			
    
 						Method
 			setId
 					
    
 		
    
-			
    AtomEntry::setId() in AtomFeed.php
    
+			
    AtomFeed::setId() in AtomFeed.php
    
 					
    
 			
    
 						Method
@@ -3481,6 +4011,14 @@
 					
 			
    
 						Method
+			setUsername
+					
    
+		
    
+			
    Principal::setUsername() in Principal.php
    
+							
    Set the username - but only if the record does not yet exist!
    
+					
    
+			
    
+						Method
 			SetWeekStart
 					
    
 		
    
@@ -3489,6 +4027,13 @@
 					
    
 			
    
 						Method
+			setYearDay
+					
    
+		
    
+			
    RepeatRuleDateTime::setYearDay() in RRule-v2.php
    
+					
    
+			
    
+						Method
 			set_bind_location
 					
    
 		
    
@@ -3542,12 +4087,11 @@
 			
    RRuleTest::SQLTest() in test-RRULE.php
    
 					
    
 			
    
-						Method
-			squidPamDrivers
+						Class
+			SqlToArray
 					
    
 		
    
-			
    squidPamDrivers::squidPamDrivers() in drivers_squid_pam.php
    
-							
    Constructor.
    
+			
    SqlToArray in SqlToArray.php
    
 					
    
 			
    
 						Class
@@ -3611,6 +4155,13 @@
 			
    CalDAVRequest::$ticket in CalDAVRequest.php
    
 							
    A DAVTicket object, if there is a ?ticket=id or Ticket: id with this request
    
 					
+			
    
+						Variable
+			$type_id
+					
    
+		
    
+			
    Principal::$type_id in Principal.php
    
+					
    
 			
    
 						Page
 			test.php
@@ -3687,6 +4238,13 @@
 						Variable
 			$url
 					
    
+		
    
+			
    Principal::$url in Principal.php
    
+					
    
+			
    
+						Variable
+			$url
+					
    
 		
    
 			
    CalendarInfo::$url in caldav-client-v2.php
    
 					
    
@@ -3702,7 +4260,15 @@
 			$username
 					
 		
    
-			
    CalDAVPrincipal::$username in CalDAVPrincipal.php
    
+			
    Principal::$username in Principal.php
    
+							
    Columns from the database
    
+					
    
+			
    
+						Variable
+			$user_active
+					
    
+		
    
+			
    Principal::$user_active in Principal.php
    
 					
    
 			
    
 						Variable
@@ -3724,6 +4290,13 @@
 						Variable
 			$user_no
 					
    
+		
    
+			
    Principal::$user_no in Principal.php
    
+					
    
+			
    
+						Variable
+			$user_no
+					
    
 		
    
 			
    HTTPAuthSession::$user_no in HTTPAuthSession.php
    
 							
    User ID number
    
@@ -3735,6 +4308,13 @@
 		
    
 			
    upgrade.php in upgrade.php
    
 					
    
+			
    
+						Method
+			unCache
+					
    
+		
    
+			
    Principal::unCache() in Principal.php
    
+					
    
 			
    
 						Function
 			unicodeToUtf8
@@ -3747,6 +4327,14 @@
 						Method
 			unique_tag
 					
    
+		
    
+			
    DAVPrincipal::unique_tag() in DAVPrincipal.php
    
+							
    Returns the unique_tag (ETag or getctag) for this resource
    
+					
    
+			
    
+						Method
+			unique_tag
+					
    
 		
    
 			
    DAVResource::unique_tag() in DAVResource.php
    
 							
    Returns the unique_tag (ETag or getctag) for this resource
    
@@ -3759,6 +4347,20 @@
 			
    CalDAVRequest::UnsupportedRequest() in CalDAVRequest.php
    
 							
    Sometimes it's a perfectly formed request, but we just don't do that :-(
    
 					
    
+			
    
+						Method
+			Update
+					
    
+		
    
+			
    Principal::Update() in Principal.php
    
+					
    
+			
    
+						Method
+			updateableFields
+					
    
+		
    
+			
    Principal::updateableFields() in Principal.php
    
+					
    
 			
    
 						Function
 			UpdateUserFromExternal
@@ -3769,11 +4371,10 @@
 					
 			
    
 						Function
-			update_scheduling_requests
+			update_external
 					
    
 		
    
-			
    update_scheduling_requests() in caldav-PUT-functions.php
    
-							
    Update scheduling requests in the schedule inbox for the
    
+			
    update_external() in external-fetch.php
    
 					
    
 			
    
 						Method
@@ -3788,40 +4389,32 @@
 			url
 					
    
 		
    
-			
    CalDAVPrincipal::url() in CalDAVPrincipal.php
    
+			
    Principal::url() in Principal.php
    
 							
    Return the URL for this principal
    
 					
    
 			
    
 						Method
-			UserFromPath
-					
    
-		
    
-			
    CalDAVRequest::UserFromPath() in CalDAVRequest.php
    
-							
    Work out the user whose calendar we are accessing, based on elements of the path.
    
-					
    
-			
    
-						Method
 			username
 					
    
 		
    
-			
    CalDAVPrincipal::username() in CalDAVPrincipal.php
    
+			
    Principal::username() in Principal.php
    
 							
    Return the username
    
 					
    
 			
    
 						Method
-			UsernameFromEMail
+			user_no
 					
    
 		
    
-			
    CalDAVPrincipal::UsernameFromEMail() in CalDAVPrincipal.php
    
-							
    Work out the username, based on the given e-mail
    
+			
    DAVResource::user_no() in DAVResource.php
    
+							
    Returns the internal user_no for the principal for this resource
    
 					
    
 			
    
 						Method
-			UsernameFromPath
+			user_no
 					
    
 		
    
-			
    CalDAVPrincipal::UsernameFromPath() in CalDAVPrincipal.php
    
-							
    Work out the username, based on elements of the path.
    
+			
    Principal::user_no() in Principal.php
    
+							
    Return the user_no
    
 					
    
 			
    
 						Method
@@ -3829,6 +4422,7 @@
 					
    
 		
    
 			
    RepeatRuleDateTime::UTC() in RRule-v2.php
    
+							
    Always returns a time localised to UTC.  Even floating times are converted to UTC  using the server's currently configured PHP timezone.  Even dates will include a  time, which will be non-zero if they were localised dates.
    
 					
    
 			
    
 						Function
@@ -3907,20 +4501,6 @@
 		
    
 	
    
 	
    
-			
    
-						Variable
-			$write_proxy_for
-					
    
-		
    
-			
    CalDAVPrincipal::$write_proxy_for in CalDAVPrincipal.php
    
-					
    
-			
    
-						Variable
-			$write_proxy_group
-					
    
-		
    
-			
    CalDAVPrincipal::$write_proxy_group in CalDAVPrincipal.php
    
-					
    
 			
    
 						Page
 			well-known.php
@@ -3971,7 +4551,7 @@
 					
    
 		
    
 			
    WritableCollection::WriteCalendarMember() in WritableCollection.php
    
-							
    Writes the data to a member in the collection and returns the segment_name of the resource in our internal namespace.
    
+							
    Writes the data to a member in the collection and returns the segment_name of the  resource in our internal namespace.
    
 					
    
 			
    
 						Method
@@ -3986,7 +4566,7 @@
 					
    
 		
    
 			
    WritableCollection::WriteMember() in WritableCollection.php
    
-							
    Writes the data to a member in the collection and returns the segment_name of the resource in our internal namespace.
    
+							
    Writes the data to a member in the collection and returns the segment_name of the  resource in our internal namespace.
    
 					
    
 			
    
 						Method
@@ -4000,7 +4580,7 @@
 			WriteProxyGroup
 					
    
 		
    
-			
    CalDAVPrincipal::WriteProxyGroup() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::WriteProxyGroup() in DAVPrincipal.php
    
 							
    Accessor for the write proxy group
    
 					
    
 			
    
@@ -4009,7 +4589,7 @@
 					
    
 		
    
 			
    write_alarms() in caldav-PUT-functions.php
    
-							
    Given a dav_id and an original iCalComponent, pull out each of the VALARMs  and write the values into the calendar_alarm table.
    
+							
    Given a dav_id and an original vCalendar, pull out each of the VALARMs  and write the values into the calendar_alarm table.
    
 					
    
 			
    
 						Function
@@ -4027,14 +4607,6 @@
 			
    write_resource() in caldav-PUT-functions.php
    
 							
    Actually write the resource to the database.  All checking of whether this is reasonable  should be done before this is called.
    
 					
-			
    
-						Function
-			write_scheduling_request
-					
    
-		
    
-			
    write_scheduling_request() in caldav-PUT-functions.php
    
-							
    Create a scheduling request in the schedule inbox for the
    
-					
    
 		
    
 	
 	
    
@@ -4100,14 +4672,7 @@
 			$_is_group
 					
 		
    
-			
    CalDAVPrincipal::$_is_group in CalDAVPrincipal.php
    
-					
    
-			
    
-						Function
-			_davical_get_principal_query_cached
-					
    
-		
    
-			
    _davical_get_principal_query_cached() in always.php
    
+			
    DAVPrincipal::$_is_group in DAVPrincipal.php
    
 					
    
 			
    
 						Method
@@ -4154,23 +4719,14 @@
 			__construct
 					
    
 		
    
-			
    squidPamDrivers::__construct() in drivers_squid_pam.php
    
-							
    The constructor
    
+			
    RepeatRuleDateTime::__construct() in RRule-v2.php
    
 					
    
 			
    
 						Method
 			__construct
 					
    
 		
    
-			
    iSchedule::__construct() in iSchedule.php
    
-					
    
-			
    
-						Method
-			__construct
-					
    
-		
    
-			
    pwauthPamDrivers::__construct() in drivers_pwauth_pam.php
    
-							
    The constructor
    
+			
    Principal::__construct() in Principal.php
    
 					
    
 			
    
 						Method
@@ -4183,13 +4739,6 @@
 						Method
 			__construct
 					
    
-		
    
-			
    RepeatRuleDateTime::__construct() in RRule-v2.php
    
-					
    
-			
    
-						Method
-			__construct
-					
    
 		
    
 			
    RepeatRule::__construct() in RRule-v2.php
    
 					
    
@@ -4198,29 +4747,7 @@
 			__construct
 					
 		
    
-			
    ldapDrivers::__construct() in drivers_ldap.php
    
-							
    Initializes the LDAP connection
    
-					
    
-			
    
-						Method
-			__construct
-					
    
-		
    
-			
    CalendarInfo::__construct() in caldav-client-v2.php
    
-					
    
-			
    
-						Method
-			__construct
-					
    
-		
    
-			
    AtomXHTMLContent::__construct() in AtomFeed.php
    
-					
    
-			
    
-						Method
-			__construct
-					
    
-		
    
-			
    AtomFeed::__construct() in AtomFeed.php
    
+			
    SqlToArray::__construct() in SqlToArray.php
    
 					
    
 			
    
 						Method
@@ -4234,24 +4761,22 @@
 			__construct
 					
    
 		
    
-			
    DAVTicket::__construct() in DAVTicket.php
    
-							
    Constructor
    
+			
    CheckResult::__construct() in setup.php
    
 					
    
 			
    
 						Method
 			__construct
 					
    
 		
    
-			
    CalDAVPrincipal::__construct() in CalDAVPrincipal.php
    
-							
    Constructor
    
+			
    Rfc5545Duration::__construct() in RRule-v2.php
    
+							
    Construct a new Rfc5545Duration either from incoming seconds or a text string.
    
 					
    
 			
    
 						Method
 			__construct
 					
    
 		
    
-			
    DAVResource::__construct() in DAVResource.php
    
-							
    Constructor
    
+			
    iSchedule::__construct() in iSchedule.php
    
 					
    
 			
    
 						Method
@@ -4265,16 +4790,110 @@
 						Method
 			__construct
 					
    
+		
    
+			
    DAVPrincipal::__construct() in DAVPrincipal.php
    
+							
    Constructor
    
+					
    
+			
    
+						Method
+			__construct
+					
    
 		
    
 			
    CalDAVRequest::__construct() in CalDAVRequest.php
    
 							
    Create a new CalDAVRequest object.
    
 					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    CalendarInfo::__construct() in caldav-client-v2.php
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    AtomFeed::__construct() in AtomFeed.php
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    AtomXHTMLContent::__construct() in AtomFeed.php
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    squidPamDrivers::__construct() in drivers_squid_pam.php
    
+							
    The constructor
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    DAVResource::__construct() in DAVResource.php
    
+							
    Constructor
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    DAVTicket::__construct() in DAVTicket.php
    
+							
    Constructor
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    pwauthPamDrivers::__construct() in drivers_pwauth_pam.php
    
+							
    The constructor
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    imapPamDrivers::__construct() in drivers_imap_pam.php
    
+							
    The constructor
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    ldapDrivers::__construct() in drivers_ldap.php
    
+							
    Initializes the LDAP connection
    
+					
    
+			
    
+						Method
+			__get
+					
    
+		
    
+			
    Principal::__get() in Principal.php
    
+							
    This will allow protected properties to be referenced for retrieval, but not  referenced for update.
    
+					
    
+			
    
+						Method
+			__isset
+					
    
+		
    
+			
    Principal::__isset() in Principal.php
    
+							
    This will allow protected properties to be examined for whether they are set  without making them writable.  PHP 5.1 or later only.
    
+					
    
 			
    
 						Method
 			__toString
 					
    
 		
    
-			
    RepeatRuleDateTime::__toString() in RRule-v2.php
    
+			
    Rfc5545Duration::__toString() in RRule-v2.php
    
+							
    Returns the duration as a text string of the form ^(-?)P(\d+W)|((\d+D)?(T(\d+H)?(\d+M)?(\d+S)?)?)$
    
 					
    
 			
    
 						Method
@@ -4283,6 +4902,13 @@
 		
    
 			
    CalendarInfo::__toString() in caldav-client-v2.php
    
 					
    
+			
    
+						Method
+			__toString
+					
    
+		
    
+			
    RepeatRuleDateTime::__toString() in RRule-v2.php
    
+					
    
 		
 
 
    
diff --git a/docs/api/elementindex_awl.html b/docs/api/elementindex_awl.html
index 749ba0e8..c72f22b8 100644
--- a/docs/api/elementindex_awl.html
+++ b/docs/api/elementindex_awl.html
@@ -30,6 +30,7 @@
 	l
 	m
 	n
+	o
 	p
 	r
 	s
@@ -93,6 +94,28 @@
 						Method
 			__construct
 					
+		
    
+			
    CalendarInfo::__construct() in caldav-client-v2.php
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    Rfc5545Duration::__construct() in RRule-v2.php
    
+							
    Construct a new Rfc5545Duration either from incoming seconds or a text string.
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    RepeatRuleDateTime::__construct() in RRule-v2.php
    
+					
    
+			
    
+						Method
+			__construct
+					
    
 		
    
 			
    RepeatRuleTimeZone::__construct() in RRule-v2.php
    
 					
    
@@ -103,20 +126,6 @@
 		
    
 			
    RepeatRule::__construct() in RRule-v2.php
    
 					
    
-			
    
-						Method
-			__construct
-					
    
-		
    
-			
    CalendarInfo::__construct() in caldav-client-v2.php
    
-					
    
-			
    
-						Method
-			__construct
-					
    
-		
    
-			
    RepeatRuleDateTime::__construct() in RRule-v2.php
    
-					
    
 			
    
 						Method
 			__toString
@@ -131,6 +140,14 @@
 		
    
 			
    RepeatRuleDateTime::__toString() in RRule-v2.php
    
 					
    
+			
    
+						Method
+			__toString
+					
    
+		
    
+			
    Rfc5545Duration::__toString() in RRule-v2.php
    
+							
    Returns the duration as a text string of the form ^(-?)P(\d+W)|((\d+D)?(T(\d+H)?(\d+M)?(\d+S)?)?)$
    
+					
    
 		
 	
 	
    
@@ -178,6 +195,14 @@
 		
    
 			
    RepeatRuleDateTime::AsDate() in RRule-v2.php
    
 					
    
+			
    
+						Method
+			asSeconds
+					
    
+		
    
+			
    Rfc5545Duration::asSeconds() in RRule-v2.php
    
+							
    Returns the duration as epoch seconds.
    
+					
    
 		
 	
 	
    
@@ -312,7 +337,6 @@
 					
 		
    
 			
    DEBUG_RRULE in RRule-v2.php
    
-							
    Class for parsing RRule and getting us the dates
    
 					
    
 			
    
 						Method
@@ -392,6 +416,14 @@
 		
    
 			
    RepeatRuleDateTime::epoch() in RRule-v2.php
    
 					
    
+			
    
+						Method
+			equals
+					
    
+		
    
+			
    Rfc5545Duration::equals() in RRule-v2.php
    
+							
    Return true if $this and $other are equal, false otherwise.
    
+					
    
 			
    
 						Function
 			expand_event_instances
@@ -421,6 +453,15 @@
 					
    
 		
    
 			
    RepeatRuleDateTime::FloatOrUTC() in RRule-v2.php
    
+							
    If this is a localised time then this will return the UTC equivalent.  If it is a  floating time, then you will just get the floating time.  If it is a date then it  will be returned as a date.  Note that if it is a *localised* date then the answer  will still be the UTC equivalent but only the date itself will be returned.
    
+					
    
+			
    
+						Method
+			fromTwoDates
+					
    
+		
    
+			
    Rfc5545Duration::fromTwoDates() in RRule-v2.php
    
+							
    Factory method to return an Rfc5545Duration object from the difference  between two dates.
    
 					
    
 		
 	
@@ -503,6 +544,13 @@
 					
 			
    
 						Method
+			getTimeZone
+					
    
+		
    
+			
    RepeatRuleDateTime::getTimeZone() in RRule-v2.php
    
+					
    
+			
    
+						Method
 			GetTodos
 					
    
 		
    
@@ -699,6 +747,22 @@
 			
    RepeatRule::next() in RRule-v2.php
    
 					
    
 		
+	
+	
    
+		
    o
    
+		
+		
    
+	
    
+	
    
+			
    
+						Function
+			olson_from_vtimezone
+					
    
+		
    
+			
    olson_from_vtimezone() in RRule-v2.php
    
+							
    Try and extract something like "Pacific/Auckland" or "America/Indiana/Indianapolis" if possible, given  the VTIMEZONE component that is passed in.  This is much more complex than olson_from_tzstring since  we start to examine the rules and work out what actual timezone this might be.
    
+					
    
+		
    
 	
 	
    
 		
    p
    
@@ -794,6 +858,7 @@
 					
 		
    
 			
    RepeatRule in RRule-v2.php
    
+							
    This class is an implementation of RRULE parsing and expansion, as per RFC5545.  It should be reasonably  complete, except that it does not handle changing the WKST - there may be a few errors in unusual rules  also, but all of the common cases should be handled correctly.
    
 					
    
 			
    
 						Class
@@ -824,13 +889,15 @@
 					
    
 		
    
 			
    RepeatRuleDateTime::RFC5545() in RRule-v2.php
    
+							
    Returns the string following a property name for an RFC5545 DATE-TIME value.
    
 					
    
 			
    
-						Method
-			RFC5545Duration
+						Class
+			Rfc5545Duration
 					
    
 		
    
-			
    RepeatRuleDateTime::RFC5545Duration() in RRule-v2.php
    
+			
    Rfc5545Duration in RRule-v2.php
    
+							
    Provide a useful way of dealing with RFC5545 duration strings of the form
    
 					
    
 			
    
 						Method
@@ -848,6 +915,13 @@
 			
    RRule in RRule.php
    
 							
    A Class for handling Events on a calendar which repeat
    
 					
+			
    
+						Method
+			rrule_day_number
+					
    
+		
    
+			
    RepeatRule::rrule_day_number() in RRule-v2.php
    
+					
    
 			
    
 						Function
 			rrule_expand
@@ -880,6 +954,20 @@
 					
 			
    
 						Method
+			setAsDate
+					
    
+		
    
+			
    RepeatRuleDateTime::setAsDate() in RRule-v2.php
    
+					
    
+			
    
+						Method
+			setAsFloat
+					
    
+		
    
+			
    RepeatRuleDateTime::setAsFloat() in RRule-v2.php
    
+					
    
+			
    
+						Method
 			SetContentType
 					
    
 		
    
@@ -965,6 +1053,13 @@
 					
    
 			
    
 						Method
+			setYearDay
+					
    
+		
    
+			
    RepeatRuleDateTime::setYearDay() in RRule-v2.php
    
+					
    
+			
    
+						Method
 			set_timezone
 					
    
 		
    
@@ -1036,6 +1131,7 @@
 					
 		
    
 			
    RepeatRuleDateTime::UTC() in RRule-v2.php
    
+							
    Always returns a time localised to UTC.  Even floating times are converted to UTC  using the server's currently configured PHP timezone.  Even dates will include a  time, which will be non-zero if they were localised dates.
    
 					
    
 		
 	
@@ -1121,6 +1217,7 @@
 	l
 	m
 	n
+	o
 	p
 	r
 	s
diff --git a/docs/api/elementindex_davical.html b/docs/api/elementindex_davical.html
index a4d032f3..4280faed 100644
--- a/docs/api/elementindex_davical.html
+++ b/docs/api/elementindex_davical.html
@@ -49,11 +49,18 @@
 	
    
 	
    
 			
    
-						Function
-			_davical_get_principal_query_cached
+						Method
+			__construct
 					
    
 		
    
-			
    _davical_get_principal_query_cached() in always.php
    
+			
    SqlToArray::__construct() in SqlToArray.php
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    CheckResult::__construct() in setup.php
    
 					
    
 			
    
 						Method
@@ -67,14 +74,14 @@
 			__construct
 					
    
 		
    
-			
    AtomEntry::__construct() in AtomFeed.php
    
+			
    AtomFeed::__construct() in AtomFeed.php
    
 					
    
 			
    
 						Method
 			__construct
 					
    
 		
    
-			
    AtomFeed::__construct() in AtomFeed.php
    
+			
    AtomEntry::__construct() in AtomFeed.php
    
 					
    
 			
    
 						Method
@@ -115,21 +122,52 @@
 			
    ldapDrivers::__construct() in drivers_ldap.php
    
 							
    Initializes the LDAP connection
    
 					
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    imapPamDrivers::__construct() in drivers_imap_pam.php
    
+							
    The constructor
    
+					
    
 			
    
 						Variable
 			$_is_group
 					
    
 		
    
-			
    CalDAVPrincipal::$_is_group in CalDAVPrincipal.php
    
+			
    DAVPrincipal::$_is_group in DAVPrincipal.php
    
 					
    
 			
    
 						Method
 			__construct
 					
    
 		
    
-			
    CalDAVPrincipal::__construct() in CalDAVPrincipal.php
    
+			
    Principal::__construct() in Principal.php
    
+					
    
+			
    
+						Method
+			__construct
+					
    
+		
    
+			
    DAVPrincipal::__construct() in DAVPrincipal.php
    
 							
    Constructor
    
 					
    
+			
    
+						Method
+			__get
+					
    
+		
    
+			
    Principal::__get() in Principal.php
    
+							
    This will allow protected properties to be referenced for retrieval, but not  referenced for update.
    
+					
    
+			
    
+						Method
+			__isset
+					
    
+		
    
+			
    Principal::__isset() in Principal.php
    
+							
    This will allow protected properties to be examined for whether they are set  without making them writable.  PHP 5.1 or later only.
    
+					
    
 			
    
 						Method
 			__construct
@@ -277,6 +315,13 @@
 			
    AuthExternalAWL() in auth-functions.php
    
 							
    Authenticate against a different PostgreSQL database which contains a usr table in  the AWL format.
    
 					
+			
    
+						Function
+			auth_functions_deprecated
+					
    
+		
    
+			
    auth_functions_deprecated() in auth-functions.php
    
+					
    
 			
    
 						Page
 			auth-functions.php
@@ -321,7 +366,7 @@
 			addressbook_home_set
 					
    
 		
    
-			
    CalDAVPrincipal::addressbook_home_set() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::addressbook_home_set() in DAVPrincipal.php
    
 							
    Get the addressbook_home_set, as lazily as possible
    
 					
    
 			
    
@@ -329,7 +374,7 @@
 			AsCollection
 					
    
 		
    
-			
    CalDAVPrincipal::AsCollection() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::AsCollection() in DAVPrincipal.php
    
 							
    Returns a representation of the principal as a collection
    
 					
    
 			
    
@@ -396,6 +441,13 @@
 					
 			
    
 						Function
+			build_dependencies_table
+					
    
+		
    
+			
    build_dependencies_table() in setup.php
    
+					
    
+			
    
+						Function
 			build_privileges_html
 					
    
 		
    
@@ -421,7 +473,15 @@
 			$by_email
 					
 		
    
-			
    CalDAVPrincipal::$by_email in CalDAVPrincipal.php
    
+			
    Principal::$by_email in Principal.php
    
+							
    Whether this was retrieved using an e-mail address
    
+					
    
+			
    
+						Method
+			byEmail
+					
    
+		
    
+			
    Principal::byEmail() in Principal.php
    
 					
    
 			
    
 						Method
@@ -501,6 +561,13 @@
 		
    
 			
    caldav_get_feed() in feed.php
    
 					
    
+			
    
+						Class
+			CheckResult
+					
    
+		
    
+			
    CheckResult in setup.php
    
+					
    
 			
    
 						Function
 			check_awl_version
@@ -510,6 +577,13 @@
 					
 			
    
 						Function
+			check_datetime
+					
    
+		
    
+			
    check_datetime() in setup.php
    
+					
    
+			
    
+						Function
 			check_davical_version
 					
    
 		
    
@@ -531,6 +605,20 @@
 					
    
 			
    
 						Function
+			check_iconv
+					
    
+		
    
+			
    check_iconv() in setup.php
    
+					
    
+			
    
+						Function
+			check_ldap
+					
    
+		
    
+			
    check_ldap() in setup.php
    
+					
    
+			
    
+						Function
 			check_magic_quotes_gpc
 					
    
 		
    
@@ -638,6 +726,13 @@
 					
    
 			
    
 						Page
+			createdb.php
+					
    
+		
    
+			
    createdb.php in createdb.php
    
+					
    
+			
    
+						Page
 			caldav-LOCK.php
 					
    
 		
    
@@ -680,6 +775,13 @@
 					
    
 			
    
 						Page
+			caldav-REPORT-principal-match.php
+					
    
+		
    
+			
    caldav-REPORT-principal-match.php in caldav-REPORT-principal-match.php
    
+					
    
+			
    
+						Page
 			caldav-REPORT-principal.php
 					
    
 		
    
@@ -713,7 +815,15 @@
 					
 		
    
 			
    CreateHomeCalendar() in auth-functions.php
    
-							
    Create a default home calendar for the user.
    
+							
    Backward compatibility
    
+					
    
+			
    
+						Function
+			CreateHomeCollections
+					
    
+		
    
+			
    CreateHomeCollections() in auth-functions.php
    
+							
    Creates some default home collections for the user.
    
 					
    
 			
    
 						Function
@@ -739,14 +849,6 @@
 			
    controlRequestContainer() in caldav-PUT-functions.php
    
 							
    Work out the location we are doing the PUT to, and check that we have the rights to  do the needful.
    
 					
-			
    
-						Function
-			create_scheduling_requests
-					
    
-		
    
-			
    create_scheduling_requests() in caldav-PUT-functions.php
    
-							
    Create scheduling requests in the schedule inbox for the
    
-					
    
 			
    
 						Page
 			caldav.php
@@ -847,6 +949,13 @@
 					
 			
    
 						Page
+			caldav-PUT-vcalendar.php
+					
    
+		
    
+			
    caldav-PUT-vcalendar.php in caldav-PUT-vcalendar.php
    
+					
    
+			
    
+						Page
 			caldav-PUT-vcard.php
 					
    
 		
    
@@ -854,13 +963,6 @@
 					
    
 			
    
 						Page
-			caldav-PUT.php
-					
    
-		
    
-			
    caldav-PUT.php in caldav-PUT.php
    
-					
    
-			
    
-						Page
 			caldav-REPORT-pps-set.php
 					
    
 		
    
@@ -880,6 +982,14 @@
 		
    
 			
    caldav-REPORT.php in caldav-REPORT.php
    
 					
    
+			
    
+						Function
+			create_external
+					
    
+		
    
+			
    create_external() in external-fetch.php
    
+							
    Functions for managing external BIND resources
    
+					
    
 			
    
 						Method
 			CheckPassword
@@ -889,19 +999,46 @@
 							
    CheckPassword does all of the password checking and  returns a user record object, or false if it all ends in tears.
    
 					
 			
    
-						Class
-			CalDAVPrincipal
+						Variable
+			$collections
 					
    
 		
    
-			
    CalDAVPrincipal in CalDAVPrincipal.php
    
-							
    A class for things to do with a DAV Principal
    
+			
    Principal::$collections in Principal.php
    
+					
    
+			
    
+						Variable
+			$collection_id
+					
    
+		
    
+			
    Principal::$collection_id in Principal.php
    
+					
    
+			
    
+						Variable
+			$created
+					
    
+		
    
+			
    Principal::$created in Principal.php
    
+					
    
+			
    
+						Method
+			cacheDelete
+					
    
+		
    
+			
    Principal::cacheDelete() in Principal.php
    
+					
    
+			
    
+						Method
+			cacheFlush
+					
    
+		
    
+			
    Principal::cacheFlush() in Principal.php
    
 					
    
 			
    
 						Method
 			calendar_free_busy_set
 					
    
 		
    
-			
    CalDAVPrincipal::calendar_free_busy_set() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::calendar_free_busy_set() in DAVPrincipal.php
    
 							
    Get the calendar_free_busy_set, as lazily as possible
    
 					
    
 			
    
@@ -909,15 +1046,15 @@
 			calendar_home_set
 					
    
 		
    
-			
    CalDAVPrincipal::calendar_home_set() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::calendar_home_set() in DAVPrincipal.php
    
 							
    Get the calendar_home_set, as lazily as possible
    
 					
    
 			
    
-						Page
-			CalDAVPrincipal.php
+						Method
+			Create
 					
    
 		
    
-			
    CalDAVPrincipal.php in CalDAVPrincipal.php
    
+			
    Principal::Create() in Principal.php
    
 					
    
 			
    
 						Page
@@ -998,6 +1135,14 @@
 					
 			
    
 						Method
+			collection_id
+					
    
+		
    
+			
    DAVResource::collection_id() in DAVResource.php
    
+							
    Returns the internal collection_id for this collection, or the collection containing this resource
    
+					
    
+			
    
+						Method
 			ContainerExists
 					
    
 		
    
@@ -1065,6 +1210,13 @@
 			
    DeconstructURL() in always.php
    
 							
    Deconstruct a dav_name from the supplied URL.  The dav_name will be urldecoded.
    
 					
    
+			
    
+						Method
+			doNormalLine
+					
    
+		
    
+			
    SqlToArray::doNormalLine() in SqlToArray.php
    
+					
    
 			
    
 						Function
 			do_error
@@ -1074,6 +1226,13 @@
 					
 			
    
 						Page
+			dbexec.php
+					
    
+		
    
+			
    dbexec.php in dbexec.php
    
+					
    
+			
    
+						Page
 			davical_configuration_missing.php
 					
    
 		
    
@@ -1094,6 +1253,14 @@
 			
    display_status() in caldav-REPORT-sync-collection.php
    
 							
    Build the array of properties to include in the report output
    
 					
    
+			
    
+						Function
+			do_scheduling_requests
+					
    
+		
    
+			
    do_scheduling_requests() in caldav-PUT-functions.php
    
+							
    Create/Update the scheduling requests for this resource.  This includes updating  the scheduled user's default calendar.
    
+					
    
 			
    
 						Class
 			DAViCalSession
@@ -1148,6 +1315,13 @@
 					
 			
    
 						Page
+			drivers_imap_pam.php
+					
    
+		
    
+			
    drivers_imap_pam.php in drivers_imap_pam.php
    
+					
    
+			
    
+						Page
 			drivers_ldap.php
 					
    
 		
    
@@ -1162,19 +1336,77 @@
 					
    
 			
    
 						Variable
+			$date_format_type
+					
    
+		
    
+			
    Principal::$date_format_type in Principal.php
    
+					
    
+			
    
+						Variable
 			$dav_name
 					
    
 		
    
-			
    CalDAVPrincipal::$dav_name in CalDAVPrincipal.php
    
+			
    Principal::$dav_name in Principal.php
    
+					
    
+			
    
+						Variable
+			$dead_properties
+					
    
+		
    
+			
    Principal::$dead_properties in Principal.php
    
+					
    
+			
    
+						Variable
+			$default_calendar
+					
    
+		
    
+			
    Principal::$default_calendar in Principal.php
    
+					
    
+			
    
+						Variable
+			$default_privileges
+					
    
+		
    
+			
    Principal::$default_privileges in Principal.php
    
+					
    
+			
    
+						Variable
+			$displayname
+					
    
+		
    
+			
    Principal::$displayname in Principal.php
    
+					
    
+			
    
+						Class
+			DAVPrincipal
+					
    
+		
    
+			
    DAVPrincipal in DAVPrincipal.php
    
+							
    A class for things to do with a DAV Principal
    
 					
    
 			
    
 						Method
 			dav_name
 					
    
 		
    
-			
    CalDAVPrincipal::dav_name() in CalDAVPrincipal.php
    
+			
    Principal::dav_name() in Principal.php
    
 							
    Return the partial path representing this principal
    
 					
    
+			
    
+						Method
+			default_calendar
+					
    
+		
    
+			
    Principal::default_calendar() in Principal.php
    
+							
    Return the default calendar for this principal
    
+					
    
+			
    
+						Page
+			DAVPrincipal.php
+					
    
+		
    
+			
    DAVPrincipal.php in DAVPrincipal.php
    
+					
    
 			
    
 						Page
 			drivers_pwauth_pam.php
@@ -1190,6 +1422,14 @@
 			
    CalDAVRequest::$depth in CalDAVRequest.php
    
 							
    The depth parameter from the request headers, coerced into a valid integer: 0, 1  or DEPTH_INFINITY which is defined above.  The default is set per various RFCs.
    
 					
+			
    
+						Variable
+			$destination
+					
    
+		
    
+			
    CalDAVRequest::$destination in CalDAVRequest.php
    
+							
    The value of any 'Destionation:' header, if present.
    
+					
    
 			
    
 						Method
 			dav_name
@@ -1310,6 +1550,13 @@
 		
    
 			
    AtomFeed::export() in AtomFeed.php
    
 					
    
+			
    
+						Page
+			external-fetch.php
+					
    
+		
    
+			
    external-fetch.php in external-fetch.php
    
+					
    
 			
    
 						Variable
 			$email
@@ -1318,13 +1565,42 @@
 			
    HTTPAuthSession::$email in HTTPAuthSession.php
    
 							
    User e-mail
    
 					
+			
    
+						Variable
+			$email
+					
    
+		
    
+			
    Principal::$email in Principal.php
    
+					
    
+			
    
+						Variable
+			$email_ok
+					
    
+		
    
+			
    Principal::$email_ok in Principal.php
    
+					
    
+			
    
+						Variable
+			$exists
+					
    
+		
    
+			
    Principal::$exists in Principal.php
    
+							
    Whether this Principal actually exists in the database yet.
    
+					
    
+			
    
+						Method
+			email
+					
    
+		
    
+			
    Principal::email() in Principal.php
    
+							
    Return the email
    
+					
    
 			
    
 						Method
 			Exists
 					
    
 		
    
-			
    CalDAVPrincipal::Exists() in CalDAVPrincipal.php
    
-							
    Does this principal exist?
    
+			
    Principal::Exists() in Principal.php
    
 					
    
 			
    
 						Variable
@@ -1378,6 +1654,13 @@
 		
    
 			
    freebusy-functions.php in freebusy-functions.php
    
 					
    
+			
    
+						Function
+			fetch_external
+					
    
+		
    
+			
    fetch_external() in external-fetch.php
    
+					
    
 			
    
 						Variable
 			$fullname
@@ -1386,12 +1669,35 @@
 			
    HTTPAuthSession::$fullname in HTTPAuthSession.php
    
 							
    User full name
    
 					
+			
    
+						Variable
+			$fullname
+					
    
+		
    
+			
    Principal::$fullname in Principal.php
    
+					
    
+			
    
+						Method
+			FetchCollections
+					
    
+		
    
+			
    Principal::FetchCollections() in Principal.php
    
+							
    Fetch the list of collections for this principal
    
+					
    
+			
    
+						Method
+			FetchDeadProperties
+					
    
+		
    
+			
    Principal::FetchDeadProperties() in Principal.php
    
+							
    Ensure the principal's dead properties are loaded
    
+					
    
 			
    
 						Method
 			FetchProxyGroups
 					
    
 		
    
-			
    CalDAVPrincipal::FetchProxyGroups() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::FetchProxyGroups() in DAVPrincipal.php
    
 							
    Split this out so we do it as infrequently as possible, given the cost.
    
 					
    
 			
    
@@ -1499,12 +1805,32 @@
 	
    
 	
    
 			
    
-						Function
-			getPrincipalByID
+						Method
+			getClass
 					
    
 		
    
-			
    getPrincipalByID() in always.php
    
-							
    Return a user record identified by a user_no, caching it for any subsequent lookup
    
+			
    CheckResult::getClass() in setup.php
    
+					
    
+			
    
+						Method
+			getDescription
+					
    
+		
    
+			
    CheckResult::getDescription() in setup.php
    
+					
    
+			
    
+						Method
+			getOK
+					
    
+		
    
+			
    CheckResult::getOK() in setup.php
    
+					
    
+			
    
+						Method
+			getStatements
+					
    
+		
    
+			
    SqlToArray::getStatements() in SqlToArray.php
    
 					
    
 			
    
 						Function
@@ -1514,30 +1840,6 @@
 			
    getStatusMessage() in always.php
    
 							
    Return the HTTP status code description for a given code. Hopefully  this is an efficient way to code this.
    
 					
-			
    
-						Function
-			getUserByEMail
-					
    
-		
    
-			
    getUserByEMail() in always.php
    
-							
    Return a user record identified by e-mail address, caching it for any subsequent lookup
    
-					
    
-			
    
-						Function
-			getUserByID
-					
    
-		
    
-			
    getUserByID() in always.php
    
-							
    Return a user record identified by a user_no, caching it for any subsequent lookup
    
-					
    
-			
    
-						Function
-			getUserByName
-					
    
-		
    
-			
    getUserByName() in always.php
    
-							
    Return a user record identified by a username, caching it for any subsequent lookup
    
-					
    
 			
    
 						Method
 			getXML
@@ -1569,6 +1871,13 @@
 					
 			
    
 						Function
+			get_phpinfo
+					
    
+		
    
+			
    get_phpinfo() in setup.php
    
+					
    
+			
    
+						Function
 			grant_row_editor
 					
    
 		
    
@@ -1595,6 +1904,42 @@
 		
    
 			
    group_row_editor() in principal-edit.php
    
 					
    
+			
    
+						Function
+			getPrincipalByID
+					
    
+		
    
+			
    getPrincipalByID() in auth-functions.php
    
+					
    
+			
    
+						Function
+			getUserByEMail
+					
    
+		
    
+			
    getUserByEMail() in auth-functions.php
    
+					
    
+			
    
+						Function
+			getUserByID
+					
    
+		
    
+			
    getUserByID() in auth-functions.php
    
+					
    
+			
    
+						Function
+			getUserByName
+					
    
+		
    
+			
    getUserByName() in auth-functions.php
    
+					
    
+			
    
+						Function
+			GetTZID
+					
    
+		
    
+			
    GetTZID() in caldav-PUT-functions.php
    
+							
    Get a TZID string from this VEVENT/VTODO/... component if we can
    
+					
    
 			
    
 						Method
 			GetRoles
@@ -1633,7 +1978,7 @@
 					
    
 		
    
 			
    iSchedule::getServer() in iSchedule.php
    
-							
    finds a remote calender server via DNS SRV records
    
+							
    finds a remote calendar server via DNS SRV records
    
 					
    
 			
    
 						Method
@@ -1667,26 +2012,12 @@
 			
    getStaticLdap() in drivers_ldap.php
    
 							
    A generic function to create and fetch static objects
    
 					
-			
    
-						Variable
-			$group_membership
-					
    
-		
    
-			
    CalDAVPrincipal::$group_membership in CalDAVPrincipal.php
    
-					
    
-			
    
-						Variable
-			$group_member_set
-					
    
-		
    
-			
    CalDAVPrincipal::$group_member_set in CalDAVPrincipal.php
    
-					
    
 			
    
 						Method
 			GetProperty
 					
    
 		
    
-			
    CalDAVPrincipal::GetProperty() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::GetProperty() in DAVPrincipal.php
    
 							
    Return an arbitrary property
    
 					
    
 			
    
@@ -1694,7 +2025,7 @@
 			GroupMemberSet
 					
    
 		
    
-			
    CalDAVPrincipal::GroupMemberSet() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::GroupMemberSet() in DAVPrincipal.php
    
 							
    Accessor for the group member set - the members of this group
    
 					
    
 			
    
@@ -1702,7 +2033,7 @@
 			GroupMembership
 					
    
 		
    
-			
    CalDAVPrincipal::GroupMembership() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::GroupMembership() in DAVPrincipal.php
    
 							
    Accessor for the group membership - the groups this principal is a member of
    
 					
    
 			
    
@@ -1747,6 +2078,14 @@
 					
 			
    
 						Method
+			GetParentContainer
+					
    
+		
    
+			
    DAVResource::GetParentContainer() in DAVResource.php
    
+							
    Get a DAVResource which is the parent to this resource.
    
+					
    
+			
    
+						Method
 			GetProperty
 					
    
 		
    
@@ -1827,7 +2166,7 @@
 					
 		
    
 			
    HTTPAuthSession::HTTPAuthSession() in HTTPAuthSession.php
    
-							
    The constructor, which just calls the actual type configured
    
+							
    The constructor, which just calls the type supplied or configured
    
 					
    
 			
    
 						Class
@@ -1875,6 +2214,14 @@
 		
    
 			
    index.php in index.php
    
 					
    
+			
    
+						Function
+			i18n
+					
    
+		
    
+			
    i18n() in setup.php
    
+							
    todo work out something more than true/false returns for dependency checks
    
+					
    
 			
    
 						Page
 			interactive-page.php
@@ -1934,20 +2281,71 @@
 			
    iSchedule in iSchedule.php
    
 							
    A class for handling iScheduling requests.
    
 					
+			
    
+						Method
+			imapPamDrivers
+					
    
+		
    
+			
    imapPamDrivers::imapPamDrivers() in drivers_imap_pam.php
    
+							
    Constructor.
    
+					
    
+			
    
+						Class
+			imapPamDrivers
+					
    
+		
    
+			
    imapPamDrivers in drivers_imap_pam.php
    
+					
    
+			
    
+						Function
+			IMAP_PAM_check
+					
    
+		
    
+			
    IMAP_PAM_check() in drivers_imap_pam.php
    
+							
    Check the username / password against the PAM system
    
+					
    
+			
    
+						Variable
+			$is_addressbook
+					
    
+		
    
+			
    Principal::$is_addressbook in Principal.php
    
+					
    
+			
    
+						Variable
+			$is_calendar
+					
    
+		
    
+			
    Principal::$is_calendar in Principal.php
    
+					
    
+			
    
+						Variable
+			$is_principal
+					
    
+		
    
+			
    Principal::$is_principal in Principal.php
    
+					
    
 			
    
 						Method
 			InitialiseRecord
 					
    
 		
    
-			
    CalDAVPrincipal::InitialiseRecord() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::InitialiseRecord() in DAVPrincipal.php
    
 							
    Initialise the Principal object from a $usr record from the DB.
    
 					
    
 			
    
 						Method
+			internal_url
+					
    
+		
    
+			
    Principal::internal_url() in Principal.php
    
+					
    
+			
    
+						Method
 			IsGroup
 					
    
 		
    
-			
    CalDAVPrincipal::IsGroup() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::IsGroup() in DAVPrincipal.php
    
 							
    Is this a group principal?
    
 					
    
 			
    
@@ -2048,6 +2446,14 @@
 					
 			
    
 						Method
+			IsExternal
+					
    
+		
    
+			
    DAVResource::IsExternal() in DAVResource.php
    
+							
    Checks whether this resource is a bind to an external resource
    
+					
    
+			
    
+						Method
 			IsLocked
 					
    
 		
    
@@ -2086,6 +2492,13 @@
 		
    
 	
    
 	
    
+			
    
+						Function
+			logRequestHeaders
+					
    
+		
    
+			
    logRequestHeaders() in caldav.php
    
+					
    
 			
    
 						Function
 			local_session_sql
@@ -2101,14 +2514,6 @@
 			
    DAViCalSession::LoginRequired() in DAViCalSession.php
    
 							
    Checks that this user is logged in, and presents a login screen if they aren't.
    
 					
-			
    
-						Method
-			ldapDrivers
-					
    
-		
    
-			
    ldapDrivers::ldapDrivers() in drivers_ldap.php
    
-							
    Constructor.
    
-					
    
 			
    
 						Class
 			ldapDrivers
@@ -2139,6 +2544,13 @@
 			
    log_caldav_action() in log_caldav_action.php
    
 							
    Log the action
    
 					
+			
    
+						Variable
+			$locale
+					
    
+		
    
+			
    Principal::$locale in Principal.php
    
+					
    
 		
    
 	
 	
    
@@ -2170,6 +2582,13 @@
 					
 			
    
 						Variable
+			$modified
+					
    
+		
    
+			
    Principal::$modified in Principal.php
    
+					
    
+			
    
+						Variable
 			$method
 					
    
 		
    
@@ -2192,6 +2611,13 @@
 		
    
 	
    
 	
    
+			
    
+						Page
+			newfile.php
+					
    
+		
    
+			
    newfile.php in newfile.php
    
+					
    
 			
    
 						Method
 			NeedPrivilege
@@ -2232,6 +2658,13 @@
 					
 			
    
 						Variable
+			$original_request_url
+					
    
+		
    
+			
    Principal::$original_request_url in Principal.php
    
+					
    
+			
    
+						Variable
 			$options
 					
    
 		
    
@@ -2340,6 +2773,14 @@
 					
    
 			
    
 						Function
+			process_ace
+					
    
+		
    
+			
    process_ace() in caldav-ACL.php
    
+							
    Preconditions
    
+					
    
+			
    
+						Function
 			property_response
 					
    
 		
    
@@ -2402,33 +2843,77 @@
 					
    
 			
    
 						Variable
-			$principal_address
+			$password
 					
    
 		
    
-			
    CalDAVPrincipal::$principal_address in CalDAVPrincipal.php
    
+			
    Principal::$password in Principal.php
    
+					
    
+			
    
+						Variable
+			$principal_id
+					
    
+		
    
+			
    Principal::$principal_id in Principal.php
    
+					
    
+			
    
+						Variable
+			$privileges
+					
    
+		
    
+			
    Principal::$privileges in Principal.php
    
+					
    
+			
    
+						Page
+			Principal.php
+					
    
+		
    
+			
    Principal.php in Principal.php
    
+					
    
+			
    
+						Class
+			Principal
+					
    
+		
    
+			
    Principal in Principal.php
    
+							
    A class for things to do with a Principal
    
 					
    
 			
    
 						Method
 			PrincipalProperty
 					
    
 		
    
-			
    CalDAVPrincipal::PrincipalProperty() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::PrincipalProperty() in DAVPrincipal.php
    
 							
    Returns properties which are specific to this principal
    
 					
    
 			
    
 						Method
+			principal_id
+					
    
+		
    
+			
    Principal::principal_id() in Principal.php
    
+							
    Return the principal_id
    
+					
    
+			
    
+						Method
 			Privileges
 					
    
 		
    
-			
    CalDAVPrincipal::Privileges() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::Privileges() in DAVPrincipal.php
    
 							
    Return the privileges bits for the current session user to this resource
    
 					
    
 			
    
 						Method
+			PropertySearch
+					
    
+		
    
+			
    DAVPrincipal::PropertySearch() in DAVPrincipal.php
    
+					
    
+			
    
+						Method
 			ProxyFor
 					
    
 		
    
-			
    CalDAVPrincipal::ProxyFor() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::ProxyFor() in DAVPrincipal.php
    
 							
    Accessor for read or write proxy
    
 					
    
 			
    
@@ -2454,14 +2939,6 @@
 			
    PublicSession in PublicSession.php
    
 							
    A Class for handling a public (anonymous) session
    
 					
-			
    
-						Method
-			pwauthPamDrivers
-					
    
-		
    
-			
    pwauthPamDrivers::pwauthPamDrivers() in drivers_pwauth_pam.php
    
-							
    Constructor.
    
-					
    
 			
    
 						Class
 			pwauthPamDrivers
@@ -2562,6 +3039,13 @@
 		
    
 			
    RRuleTest::$result_description in test-RRULE.php
    
 					
    
+			
    
+						Function
+			removeComment
+					
    
+		
    
+			
    removeComment() in createdb.php
    
+					
    
 			
    
 						Method
 			Render
@@ -2569,13 +3053,6 @@
 		
    
 			
    AtomXHTMLContent::Render() in AtomFeed.php
    
 					
    
-			
    
-						Class
-			RRuleTest
-					
    
-		
    
-			
    RRuleTest in test-RRULE.php
    
-					
    
 			
    
 						Method
 			RRuleTest
@@ -2583,6 +3060,13 @@
 		
    
 			
    RRuleTest::RRuleTest() in test-RRULE.php
    
 					
    
+			
    
+						Class
+			RRuleTest
+					
    
+		
    
+			
    RRuleTest in test-RRULE.php
    
+					
    
 			
    
 						Function
 			rollback
@@ -2630,24 +3114,17 @@
 					
 			
    
 						Variable
-			$read_proxy_for
+			$resourcetypes
 					
    
 		
    
-			
    CalDAVPrincipal::$read_proxy_for in CalDAVPrincipal.php
    
-					
    
-			
    
-						Variable
-			$read_proxy_group
-					
    
-		
    
-			
    CalDAVPrincipal::$read_proxy_group in CalDAVPrincipal.php
    
+			
    Principal::$resourcetypes in Principal.php
    
 					
    
 			
    
 						Method
 			ReadProxyGroup
 					
    
 		
    
-			
    CalDAVPrincipal::ReadProxyGroup() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::ReadProxyGroup() in DAVPrincipal.php
    
 							
    Accessor for the read proxy group
    
 					
    
 			
    
@@ -2655,7 +3132,7 @@
 			RenderAsXML
 					
    
 		
    
-			
    CalDAVPrincipal::RenderAsXML() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::RenderAsXML() in DAVPrincipal.php
    
 							
    Render XML for a single Principal (user) from the DB
    
 					
    
 			
    
@@ -2720,6 +3197,27 @@
 		
    
 	
    
 	
    
+			
    
+						Variable
+			$state
+					
    
+		
    
+			
    SqlToArray::$state in SqlToArray.php
    
+					
    
+			
    
+						Variable
+			$statement
+					
    
+		
    
+			
    SqlToArray::$statement in SqlToArray.php
    
+					
    
+			
    
+						Variable
+			$statements
+					
    
+		
    
+			
    SqlToArray::$statements in SqlToArray.php
    
+					
    
 			
    
 						Page
 			setup.php
@@ -2727,6 +3225,13 @@
 		
    
 			
    setup.php in setup.php
    
 					
    
+			
    
+						Page
+			SqlToArray.php
+					
    
+		
    
+			
    SqlToArray.php in SqlToArray.php
    
+					
    
 			
    
 						Function
 			send_page_header
@@ -2736,6 +3241,13 @@
 					
 			
    
 						Method
+			setClass
+					
    
+		
    
+			
    CheckResult::setClass() in setup.php
    
+					
    
+			
    
+						Method
 			setContent
 					
    
 		
    
@@ -2760,14 +3272,21 @@
 			setDateModified
 					
 		
    
-			
    AtomEntry::setDateModified() in AtomFeed.php
    
+			
    AtomFeed::setDateModified() in AtomFeed.php
    
 					
    
 			
    
 						Method
 			setDateModified
 					
    
 		
    
-			
    AtomFeed::setDateModified() in AtomFeed.php
    
+			
    AtomEntry::setDateModified() in AtomFeed.php
    
+					
    
+			
    
+						Method
+			setDescription
+					
    
+		
    
+			
    CheckResult::setDescription() in setup.php
    
 					
    
 			
    
 						Method
@@ -2810,21 +3329,14 @@
 			setLink
 					
    
 		
    
-			
    AtomEntry::setLink() in AtomFeed.php
    
+			
    AtomFeed::setLink() in AtomFeed.php
    
 					
    
 			
    
 						Method
 			setLink
 					
    
 		
    
-			
    AtomFeed::setLink() in AtomFeed.php
    
-					
    
-			
    
-						Method
-			setTitle
-					
    
-		
    
-			
    AtomFeed::setTitle() in AtomFeed.php
    
+			
    AtomEntry::setLink() in AtomFeed.php
    
 					
    
 			
    
 						Method
@@ -2833,6 +3345,13 @@
 		
    
 			
    AtomEntry::setTitle() in AtomFeed.php
    
 					
    
+			
    
+						Method
+			setTitle
+					
    
+		
    
+			
    AtomFeed::setTitle() in AtomFeed.php
    
+					
    
 			
    
 						Function
 			SqlFilterCardDAV
@@ -2856,6 +3375,13 @@
 		
    
 			
    RRuleTest::SQLTest() in test-RRULE.php
    
 					
    
+			
    
+						Class
+			SqlToArray
+					
    
+		
    
+			
    SqlToArray in SqlToArray.php
    
+					
    
 			
    
 						Function
 			send_dav_header
@@ -2896,14 +3422,6 @@
 			
    iSchedule::signDKIM() in iSchedule.php
    
 							
    signs a POST body and headers
    
 					
-			
    
-						Method
-			squidPamDrivers
-					
    
-		
    
-			
    squidPamDrivers::squidPamDrivers() in drivers_squid_pam.php
    
-							
    Constructor.
    
-					
    
 			
    
 						Class
 			squidPamDrivers
@@ -2944,18 +3462,12 @@
 							
    Synchronise a cached user with one from LDAP
    
 					
 			
    
-						Variable
-			$schedule_inbox_url
+						Method
+			setUsername
 					
    
 		
    
-			
    CalDAVPrincipal::$schedule_inbox_url in CalDAVPrincipal.php
    
-					
    
-			
    
-						Variable
-			$schedule_outbox_url
-					
    
-		
    
-			
    CalDAVPrincipal::$schedule_outbox_url in CalDAVPrincipal.php
    
+			
    Principal::setUsername() in Principal.php
    
+							
    Set the username - but only if the record does not yet exist!
    
 					
    
 			
    
 						Variable
@@ -3033,6 +3545,13 @@
 					
 			
    
 						Variable
+			$type_id
+					
    
+		
    
+			
    Principal::$type_id in Principal.php
    
+					
    
+			
    
+						Variable
 			$ticket
 					
    
 		
    
@@ -3080,11 +3599,10 @@
 					
    
 			
    
 						Function
-			update_scheduling_requests
+			update_external
 					
    
 		
    
-			
    update_scheduling_requests() in caldav-PUT-functions.php
    
-							
    Update scheduling requests in the schedule inbox for the
    
+			
    update_external() in external-fetch.php
    
 					
    
 			
    
 						Variable
@@ -3096,17 +3614,68 @@
 					
 			
    
 						Variable
+			$url
+					
    
+		
    
+			
    Principal::$url in Principal.php
    
+					
    
+			
    
+						Variable
 			$username
 					
    
 		
    
-			
    CalDAVPrincipal::$username in CalDAVPrincipal.php
    
+			
    Principal::$username in Principal.php
    
+							
    Columns from the database
    
+					
    
+			
    
+						Variable
+			$user_active
+					
    
+		
    
+			
    Principal::$user_active in Principal.php
    
+					
    
+			
    
+						Variable
+			$user_no
+					
    
+		
    
+			
    Principal::$user_no in Principal.php
    
+					
    
+			
    
+						Method
+			unCache
+					
    
+		
    
+			
    Principal::unCache() in Principal.php
    
+					
    
+			
    
+						Method
+			unique_tag
+					
    
+		
    
+			
    DAVPrincipal::unique_tag() in DAVPrincipal.php
    
+							
    Returns the unique_tag (ETag or getctag) for this resource
    
+					
    
+			
    
+						Method
+			Update
+					
    
+		
    
+			
    Principal::Update() in Principal.php
    
+					
    
+			
    
+						Method
+			updateableFields
+					
    
+		
    
+			
    Principal::updateableFields() in Principal.php
    
 					
    
 			
    
 						Method
 			url
 					
    
 		
    
-			
    CalDAVPrincipal::url() in CalDAVPrincipal.php
    
+			
    Principal::url() in Principal.php
    
 							
    Return the URL for this principal
    
 					
    
 			
    
@@ -3114,24 +3683,16 @@
 			username
 					
    
 		
    
-			
    CalDAVPrincipal::username() in CalDAVPrincipal.php
    
+			
    Principal::username() in Principal.php
    
 							
    Return the username
    
 					
    
 			
    
 						Method
-			UsernameFromEMail
+			user_no
 					
    
 		
    
-			
    CalDAVPrincipal::UsernameFromEMail() in CalDAVPrincipal.php
    
-							
    Work out the username, based on the given e-mail
    
-					
    
-			
    
-						Method
-			UsernameFromPath
-					
    
-		
    
-			
    CalDAVPrincipal::UsernameFromPath() in CalDAVPrincipal.php
    
-							
    Work out the username, based on elements of the path.
    
+			
    Principal::user_no() in Principal.php
    
+							
    Return the user_no
    
 					
    
 			
    
 						Variable
@@ -3149,14 +3710,6 @@
 			
    CalDAVRequest::UnsupportedRequest() in CalDAVRequest.php
    
 							
    Sometimes it's a perfectly formed request, but we just don't do that :-(
    
 					
-			
    
-						Method
-			UserFromPath
-					
    
-		
    
-			
    CalDAVRequest::UserFromPath() in CalDAVRequest.php
    
-							
    Work out the user whose calendar we are accessing, based on elements of the path.
    
-					
    
 			
    
 						Variable
 			$unique_tag
@@ -3180,6 +3733,14 @@
 			
    DAVResource::url() in DAVResource.php
    
 							
    Returns the URL of our resource
    
 					
+			
    
+						Method
+			user_no
+					
    
+		
    
+			
    DAVResource::user_no() in DAVResource.php
    
+							
    Returns the internal user_no for the principal for this resource
    
+					
    
 		
    
 	
 	
    
@@ -3290,7 +3851,7 @@
 					
 		
    
 			
    write_alarms() in caldav-PUT-functions.php
    
-							
    Given a dav_id and an original iCalComponent, pull out each of the VALARMs  and write the values into the calendar_alarm table.
    
+							
    Given a dav_id and an original vCalendar, pull out each of the VALARMs  and write the values into the calendar_alarm table.
    
 					
    
 			
    
 						Function
@@ -3308,34 +3869,12 @@
 			
    write_resource() in caldav-PUT-functions.php
    
 							
    Actually write the resource to the database.  All checking of whether this is reasonable  should be done before this is called.
    
 					
-			
    
-						Function
-			write_scheduling_request
-					
    
-		
    
-			
    write_scheduling_request() in caldav-PUT-functions.php
    
-							
    Create a scheduling request in the schedule inbox for the
    
-					
    
-			
    
-						Variable
-			$write_proxy_for
-					
    
-		
    
-			
    CalDAVPrincipal::$write_proxy_for in CalDAVPrincipal.php
    
-					
    
-			
    
-						Variable
-			$write_proxy_group
-					
    
-		
    
-			
    CalDAVPrincipal::$write_proxy_group in CalDAVPrincipal.php
    
-					
    
 			
    
 						Method
 			WriteProxyGroup
 					
    
 		
    
-			
    CalDAVPrincipal::WriteProxyGroup() in CalDAVPrincipal.php
    
+			
    DAVPrincipal::WriteProxyGroup() in DAVPrincipal.php
    
 							
    Accessor for the write proxy group
    
 					
    
 			
    
@@ -3352,7 +3891,7 @@
 					
    
 		
    
 			
    WritableCollection::WriteCalendarMember() in WritableCollection.php
    
-							
    Writes the data to a member in the collection and returns the segment_name of the resource in our internal namespace.
    
+							
    Writes the data to a member in the collection and returns the segment_name of the  resource in our internal namespace.
    
 					
    
 			
    
 						Method
@@ -3360,7 +3899,7 @@
 					
    
 		
    
 			
    WritableCollection::WriteMember() in WritableCollection.php
    
-							
    Writes the data to a member in the collection and returns the segment_name of the resource in our internal namespace.
    
+							
    Writes the data to a member in the collection and returns the segment_name of the  resource in our internal namespace.
    
 					
    
 		
 	
diff --git a/docs/api/errors.html b/docs/api/errors.html
index dd0c7bad..41e7c4ce 100644
--- a/docs/api/errors.html
+++ b/docs/api/errors.html
@@ -27,25 +27,30 @@
 caldav-PROPFIND.php
    
 caldav-PROPPATCH.php
    
 caldav-PUT-default.php
    
+caldav-PUT-vcalendar.php
    
 caldav-PUT-vcard.php
    
-caldav-PUT.php
    
 caldav-REPORT-calquery.php
    
 caldav-REPORT-cardquery.php
    
 caldav-REPORT-expand-property.php
    
 caldav-REPORT-freebusy.php
    
 caldav-REPORT-multiget.php
    
+caldav-REPORT-principal-match.php
    
 caldav-REPORT-principal.php
    
 caldav-REPORT.php
    
 caldav.php
    
 CalDAVRequest.php
    
 check_UTF8.php
    
 collection-edit.php
    
+createdb.php
    
 davical_configuration_missing.php
    
 DAVResource.php
    
 DAVTicket.php
    
+dbexec.php
    
+drivers_imap_pam.php
    
 drivers_ldap.php
    
 drivers_pwauth_pam.php
    
 drivers_squid_pam.php
    
+external-fetch.php
    
 feed.php
    
 freebusy-functions.php
    
 freebusy.php
    
@@ -54,15 +59,18 @@
 interactive-page.php
    
 iSchedule.php
    
 log_caldav_action.php
    
+newfile.php
    
 other_translated_strings.php
    
 page-footer.php
    
 page-header.php
    
 principal-browse.php
    
 principal-edit.php
    
+Principal.php
    
 public.php
    
 pubsub.php
    
 RRule-v2.php
    
 setup.php
    
+SqlToArray.php
    
 test-RRULE-v2.php
    
 test-RRULE.php
    
 test.php
    
@@ -75,26 +83,28 @@
 
    Post-parsing
    
 
    Warnings:

    
 Warning - 
-duplicate class element "RRuleTest" in file /home/karora/projects/davical/inc/test-RRULE-v2.php will be ignored.
-Use an @ignore tag on the original if you want this case to be documented.
    
-Warning - 
-duplicate function element "apply_filter" in file /home/karora/projects/davical/inc/caldav-REPORT-cardquery.php will be ignored.
-Use an @ignore tag on the original if you want this case to be documented.
    
-Warning - 
-duplicate class element "CalDAVClient" in file /home/karora/projects/davical/inc/caldav-client-v2.php will be ignored.
-Use an @ignore tag on the original if you want this case to be documented.
    
-Warning - Class VCard parent vComponent not found
    
-Warning - Class AtomFeed parent XMLDocument not found
    
-Warning - Class DAViCalSession parent Session not found
    
-Warning - 
-duplicate function element "privilege_format_function" in file /home/karora/projects/davical/inc/ui/principal-edit.php will be ignored.
-Use an @ignore tag on the original if you want this case to be documented.
    
-Warning - 
 duplicate function element "check_for_expansion" in file /home/karora/projects/davical/inc/caldav-REPORT-multiget.php will be ignored.
 Use an @ignore tag on the original if you want this case to be documented.
    
 Warning - 
 duplicate function element "edit_grant_row" in file /home/karora/projects/davical/inc/ui/principal-edit.php will be ignored.
 Use an @ignore tag on the original if you want this case to be documented.
    
+Warning - Class VCard parent vComponent not found
    
+Warning - 
+duplicate class element "CalDAVClient" in file /home/karora/projects/davical/inc/caldav-client-v2.php will be ignored.
+Use an @ignore tag on the original if you want this case to be documented.
    
+Warning - 
+duplicate function element "apply_filter" in file /home/karora/projects/davical/inc/caldav-REPORT-cardquery.php will be ignored.
+Use an @ignore tag on the original if you want this case to be documented.
    
+Warning - 
+duplicate class element "RRuleTest" in file /home/karora/projects/davical/inc/test-RRULE-v2.php will be ignored.
+Use an @ignore tag on the original if you want this case to be documented.
    
+Warning - @todo on an include element is ignored (line 105, file /home/karora/projects/davical/htdocs/caldav.php)
    
+Warning - 
+duplicate function element "privilege_format_function" in file /home/karora/projects/davical/inc/ui/principal-edit.php will be ignored.
+Use an @ignore tag on the original if you want this case to be documented.
    
+Warning - Class DAViCalSession parent Session not found
    
+Warning - @todo on an include element is ignored (line 105, file /home/karora/projects/davical/htdocs/caldav.php)
    
+Warning - Class AtomFeed parent XMLDocument not found
    
 
 
    admin.php
    
 
    Warnings:

    
@@ -102,9 +112,9 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
 
    always.php
    
 
    Warnings:

    
-Warning on line 26 - Page-level DocBlock precedes "function early_exception_handler", use another DocBlock to document the source element
    
+Warning on line 28 - Page-level DocBlock precedes "function early_exception_handler", use another DocBlock to document the source element
    
 
    Errors:

    
-Error on line 26 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
+Error on line 28 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 
 
    AtomFeed.php
    
 
    Warnings:

    
@@ -117,8 +127,8 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
    Warnings:

    
 Warning on line 27 - Page-level DocBlock precedes "require_once "DataUpdate.php"", use another DocBlock to document the source element
    
 
    Errors:

    
-Error on line 27 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 Error on line 27 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage authentication"
    
+Error on line 27 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 
 
    caldav-ACL.php
    
 
    Warnings:

    
@@ -139,8 +149,8 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
    Warnings:

    
 Warning on line 12 - Page-level DocBlock precedes "require_once 'DAVResource.php'", use another DocBlock to document the source element
    
 
    Errors:

    
-Error on line 12 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"
    
 Error on line 12 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
+Error on line 12 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"
    
 
 
    caldav-DELTICKET.php
    
 
    Warnings:

    
@@ -152,35 +162,33 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
 
    caldav-LOCK.php
    
 
    Warnings:

    
-Warning on line 148 - Unknown tag "@TODO:" used
    
 Warning on line 161 - File "/home/karora/projects/davical/inc/caldav-LOCK.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 
 
    caldav-MKCOL.php
    
 
    Warnings:

    
 Warning on line 11 - Page-level DocBlock precedes "require_once 'AwlQuery.php'", use another DocBlock to document the source element
    
 
    Errors:

    
-Error on line 11 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 Error on line 11 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"
    
+Error on line 11 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 
 
    caldav-MKTICKET.php
    
 
    Warnings:

    
 Warning on line 19 - package davical is already in category Technical, will now replace with category Documentation
    
 Warning on line 20 - Page-level DocBlock precedes "require_once 'DAVResource.php'", use another DocBlock to document the source element
    
 
    Errors:

    
-Error on line 20 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 Error on line 20 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"
    
+Error on line 20 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 
 
    caldav-MOVE.php
    
 
    Warnings:

    
 Warning on line 12 - Page-level DocBlock precedes "require_once 'DAVResource.php'", use another DocBlock to document the source element
    
-Warning on line 117 - Unknown tag "@TODO:" used
    
 
 
    caldav-OPTIONS.php
    
 
    Warnings:

    
 Warning on line 12 - Page-level DocBlock precedes "include_once 'DAVResource.php'", use another DocBlock to document the source element
    
 
    Errors:

    
-Error on line 12 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 Error on line 12 - "include" include_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"
    
+Error on line 12 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 
 
    caldav-POST.php
    
 
    Warnings:

    
@@ -203,21 +211,18 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
    caldav-PUT-default.php
    
 
    Warnings:

    
 Warning on line 12 - Page-level DocBlock precedes "require_once 'DAVResource.php'", use another DocBlock to document the source element
    
+
+
    caldav-PUT-vcalendar.php
    
+
    Warnings:

    
+Warning on line 12 - Page-level DocBlock precedes "require_once 'DAVResource.php'", use another DocBlock to document the source element
    
 
 
    caldav-PUT-vcard.php
    
 
    Warnings:

    
 Warning on line 12 - Page-level DocBlock precedes "require_once 'DAVResource.php'", use another DocBlock to document the source element
    
-
-
    caldav-PUT.php
    
-
    Warnings:

    
-Warning on line 12 - Page-level DocBlock precedes "require_once 'DAVResource.php'", use another DocBlock to document the source element
    
-
    Errors:

    
-Error on line 12 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
-Error on line 12 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"
    
 
 
    caldav-REPORT-calquery.php
    
 
    Warnings:

    
-Warning on line 333 - File "/home/karora/projects/davical/inc/caldav-REPORT-calquery.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 363 - File "/home/karora/projects/davical/inc/caldav-REPORT-calquery.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 
 
    caldav-REPORT-cardquery.php
    
 
    Warnings:

    
@@ -235,6 +240,10 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
    Warnings:

    
 Warning on line 107 - Unknown tag "@todo:" used
    
 Warning on line 125 - File "/home/karora/projects/davical/inc/caldav-REPORT-multiget.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+
+
    caldav-REPORT-principal-match.php
    
+
    Warnings:

    
+Warning on line 56 - File "/home/karora/projects/davical/inc/caldav-REPORT-principal-match.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 
 
    caldav-REPORT-principal.php
    
 
    Warnings:

    
@@ -250,14 +259,13 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
    caldav.php
    
 
    Warnings:

    
 Warning on line 22 - Page-level DocBlock precedes "require 'well-known.php'", use another DocBlock to document the source element
    
-Warning on line 69 - Unknown tag "@TODO:" used
    
 
    Errors:

    
 Error on line 22 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 Error on line 22 - "include" require's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"
    
 
 
    CalDAVRequest.php
    
 
    Warnings:

    
-Warning on line 16 - Page-level DocBlock precedes "require_once "XMLDocument.php"", use another DocBlock to document the source element
    
+Warning on line 16 - Page-level DocBlock precedes "require_once "AwlCache.php"", use another DocBlock to document the source element
    
 
 
    check_UTF8.php
    
 
    Warnings:

    
@@ -265,7 +273,11 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
 
    collection-edit.php
    
 
    Warnings:

    
-Warning on line 532 - File "/home/karora/projects/davical/inc/ui/collection-edit.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 538 - File "/home/karora/projects/davical/inc/ui/collection-edit.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+
+
    createdb.php
    
+
    Warnings:

    
+Warning on line 31 - File "/home/karora/projects/davical/htdocs/createdb.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 
 
    davical_configuration_missing.php
    
 
    Warnings:

    
@@ -273,8 +285,8 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
 
    DAVResource.php
    
 
    Warnings:

    
-Warning on line 11 - Page-level DocBlock precedes "require_once 'AwlQuery.php'", use another DocBlock to document the source element
    
 Warning on line 11 - package davical is already in category Technical, will now replace with category Documentation
    
+Warning on line 11 - Page-level DocBlock precedes "require_once 'AwlCache.php'", use another DocBlock to document the source element
    
 
    Errors:

    
 Error on line 11 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 Error on line 11 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage Resource"
    
@@ -283,37 +295,56 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
    Warnings:

    
 Warning on line 11 - Page-level DocBlock precedes "require_once 'AwlQuery.php'", use another DocBlock to document the source element
    
 
    Errors:

    
-Error on line 11 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage DAVTicket"
    
 Error on line 11 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
+Error on line 11 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage DAVTicket"
    
+
+
    dbexec.php
    
+
    Warnings:

    
+Warning on line 58 - File "/home/karora/projects/davical/htdocs/dbexec.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+
+
    drivers_imap_pam.php
    
+
    Warnings:

    
+Warning on line 13 - Page-level DocBlock precedes "require_once "auth-functions.php"", use another DocBlock to document the source element
    
+Warning on line 13 - package davical is already in category Documentation, will now replace with category Technical
    
+Warning on line 16 - no @package tag was used in a DocBlock for class imapPamDrivers
    
+
    Errors:

    
+Error on line 13 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage ldap"
    
+Error on line 13 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 
 
    drivers_ldap.php
    
 
    Warnings:

    
-Warning on line 12 - Page-level DocBlock precedes "require_once "auth-functions.php"", use another DocBlock to document the source element
    
-Warning on line 15 - no @package tag was used in a DocBlock for class ldapDrivers
    
+Warning on line 13 - Page-level DocBlock precedes "require_once "auth-functions.php"", use another DocBlock to document the source element
    
+Warning on line 16 - no @package tag was used in a DocBlock for class ldapDrivers
    
 
    Errors:

    
-Error on line 12 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
-Error on line 12 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage ldap"
    
+Error on line 13 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
+Error on line 13 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage ldap"
    
 
 
    drivers_pwauth_pam.php
    
 
    Warnings:

    
-Warning on line 15 - package davical is already in category Documentation, will now replace with category Technical
    
-Warning on line 15 - Page-level DocBlock precedes "require_once "auth-functions.php"", use another DocBlock to document the source element
    
-Warning on line 18 - no @package tag was used in a DocBlock for class pwauthPamDrivers
    
+Warning on line 16 - Page-level DocBlock precedes "require_once "auth-functions.php"", use another DocBlock to document the source element
    
+Warning on line 19 - no @package tag was used in a DocBlock for class pwauthPamDrivers
    
 
    Errors:

    
-Error on line 15 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
-Error on line 15 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage pwauth"
    
+Error on line 16 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage pwauth"
    
+Error on line 16 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 
 
    drivers_squid_pam.php
    
 
    Warnings:

    
-Warning on line 12 - Page-level DocBlock precedes "require_once "auth-functions.php"", use another DocBlock to document the source element
    
-Warning on line 15 - no @package tag was used in a DocBlock for class squidPamDrivers
    
+Warning on line 13 - Page-level DocBlock precedes "require_once "auth-functions.php"", use another DocBlock to document the source element
    
+Warning on line 16 - no @package tag was used in a DocBlock for class squidPamDrivers
    
 
    Errors:

    
-Error on line 12 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage ldap"
    
-Error on line 12 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
+Error on line 13 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
+Error on line 13 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage ldap"
    
+
+
    external-fetch.php
    
+
    Warnings:

    
+Warning on line 34 - Page-level DocBlock precedes "function create_external", use another DocBlock to document the source element
    
+
    Errors:

    
+Error on line 34 - "function" create_external's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage external-bind"
    
+Error on line 34 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 
 
    feed.php
    
 
    Warnings:

    
-Warning on line 193 - File "/home/karora/projects/davical/htdocs/feed.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 206 - File "/home/karora/projects/davical/htdocs/feed.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 
 
    freebusy-functions.php
    
 
    Warnings:

    
@@ -340,16 +371,20 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
    Warnings:

    
 Warning on line 16 - Page-level DocBlock precedes "require_once "XMLDocument.php"", use another DocBlock to document the source element
    
 
    Errors:

    
-Error on line 16 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 Error on line 16 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage iSchedule"
    
+Error on line 16 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 
 
    log_caldav_action.php
    
 
    Warnings:

    
 Warning on line 24 - package davical is already in category Documentation, will now replace with category Technical
    
+
+
    newfile.php
    
+
    Warnings:

    
+Warning on line 49 - File "/home/karora/projects/davical/htdocs/newfile.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 
 
    other_translated_strings.php
    
 
    Warnings:

    
-Warning on line 52 - File "/home/karora/projects/davical/inc/other_translated_strings.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 50 - File "/home/karora/projects/davical/inc/other_translated_strings.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 
 
    page-footer.php
    
 
    Warnings:

    
@@ -365,14 +400,21 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
 
    principal-edit.php
    
 
    Warnings:

    
-Warning on line 971 - File "/home/karora/projects/davical/inc/ui/principal-edit.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 974 - File "/home/karora/projects/davical/inc/ui/principal-edit.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+
+
    Principal.php
    
+
    Warnings:

    
+Warning on line 11 - Page-level DocBlock precedes "require_once 'AwlCache.php'", use another DocBlock to document the source element
    
+
    Errors:

    
+Error on line 11 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage Principal"
    
+Error on line 11 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 
 
    public.php
    
 
    Warnings:

    
 Warning on line 10 - Page-level DocBlock precedes "require "./always.php"", use another DocBlock to document the source element
    
 
    Errors:

    
-Error on line 10 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 Error on line 10 - "include" require's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"
    
+Error on line 10 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    
 
 
    pubsub.php
    
 
    Warnings:

    
@@ -380,18 +422,20 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
 
    RRule-v2.php
    
 
    Warnings:

    
-Warning on line 32 - Page-level DocBlock precedes "define DEBUG_RRULE", use another DocBlock to document the source element
    
 Warning on line 38 - no @package tag was used in a DocBlock for class RepeatRuleTimeZone
    
-Warning on line 79 - no @package tag was used in a DocBlock for class RepeatRuleDateTime
    
-Warning on line 309 - no @package tag was used in a DocBlock for class RepeatRule
    
-
    Errors:

    
-Error on line 32 - DEBUG_RRULE define's DocBlock has @package tag, illegal. ignoring tag "@package awl"
    
-Error on line 32 - "define" DEBUG_RRULE's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"
    
+Warning on line 76 - no @package tag was used in a DocBlock for class Rfc5545Duration
    
+Warning on line 203 - no @package tag was used in a DocBlock for class RepeatRuleDateTime
    
+Warning on line 493 - no @package tag was used in a DocBlock for class RepeatRule
    
 
 
    setup.php
    
 
    Warnings:

    
-Warning on line 6 - Unknown tag "@TODO:" used
    
-Warning on line 7 - no @package tag was used in a DocBlock for file /home/karora/projects/davical/htdocs/setup.php
    
+Warning on line 7 - no @package tag was used in a DocBlock for class CheckResult
    
+Warning on line 378 - File "/home/karora/projects/davical/htdocs/setup.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+
+
    SqlToArray.php
    
+
    Warnings:

    
+Warning on line 2 - no @package tag was used in a DocBlock for class SqlToArray
    
+Warning on line 47 - File "/home/karora/projects/davical/htdocs/SqlToArray.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 
 
    test-RRULE-v2.php
    
 
    Warnings:

    
@@ -405,7 +449,7 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
 
    test.php
    
 
    Warnings:

    
-Warning on line 9 - File "/home/karora/projects/davical/htdocs/test.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 27 - File "/home/karora/projects/davical/htdocs/test.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 
 
    tools.php
    
 
    Warnings:

    
@@ -431,9 +475,9 @@ Use an @ignore tag on the original if you want this case to be documented.
    
 
    WritableCollection.php
    
 
    Warnings:

    
 Warning on line 3 - no @package tag was used in a DocBlock for class WritableCollection
    
-Warning on line 268 - File "/home/karora/projects/davical/inc/WritableCollection.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
+Warning on line 321 - File "/home/karora/projects/davical/inc/WritableCollection.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
 
\ No newline at end of file
diff --git a/docs/api/index.html b/docs/api/index.html
index e756a6e5..e8583bda 100644
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -4,7 +4,7 @@
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    
 
-	
+	
   DAViCal
   
 
diff --git a/docs/api/li_awl.html b/docs/api/li_awl.html
index bc74995e..a3880c3a 100644
--- a/docs/api/li_awl.html
+++ b/docs/api/li_awl.html
@@ -36,9 +36,11 @@
 															
    ClassRepeatRule
    
 															
    ClassRepeatRuleDateTime
    
 															
    ClassRepeatRuleTimeZone
    
+															
    ClassRfc5545Duration
    
 															
    ClassRRule
    
 																										
     Functions
    
 															
    Functionexpand_event_instances
    
+															
    Functionolson_from_vtimezone
    
 															
    Functionrdate_expand
    
 															
    Functionrrule_expand
    
 																										
     Files
    
diff --git a/docs/api/li_davical.html b/docs/api/li_davical.html
index f761859b..323a21cc 100644
--- a/docs/api/li_davical.html
+++ b/docs/api/li_davical.html
@@ -26,7 +26,9 @@
 										    						    
    ClassAtomEntry
    
 					    										    						    
    ClassAtomFeed
    
 					    										    						    
    ClassAtomXHTMLContent
    
+					    										    						    
    ClassCheckResult
    
 					    										    						    
    ClassRRuleTest
    
+					    										    						    
    ClassSqlToArray
    
 					    										    						    
    ClassVCard
    
 					    																		
     Functions
    
 											
    Functionaccess_ticket_browser
    
@@ -35,13 +37,17 @@
 											
    Functionbindings_to_us_browser
    
 											
    Functionbits_to_privilege
    
 											
    FunctionBuildSqlFilter
    
+											
    Functionbuild_dependencies_table
    
 											
    Functionbuild_privileges_html
    
 											
    Functionbuild_site_statistics
    
 											
    Functioncaldav_get_feed
    
 											
    Functioncheck_awl_version
    
+											
    Functioncheck_datetime
    
 											
    Functioncheck_davical_version
    
 											
    Functioncheck_for_expansion
    
 											
    Functioncheck_gettext
    
+											
    Functioncheck_iconv
    
+											
    Functioncheck_ldap
    
 											
    Functioncheck_magic_quotes_gpc
    
 											
    Functioncheck_magic_quotes_runtime
    
 											
    Functioncheck_pdo
    
@@ -64,20 +70,18 @@
 											
    Functionedit_group_row
    
 											
    Functionedit_ticket_row
    
 											
    Functionexpand_properties
    
-											
    FunctiongetPrincipalByID
    
 											
    FunctiongetStatusMessage
    
-											
    FunctiongetUserByEMail
    
-											
    FunctiongetUserByID
    
-											
    FunctiongetUserByName
    
 											
    Functionget_address_properties
    
 											
    Functionget_freebusy
    
 											
    Functionget_href_containers
    
+											
    Functionget_phpinfo
    
 											
    Functiongrant_row_editor
    
 											
    Functiongroup_memberships_browser
    
 											
    Functiongroup_members_browser
    
 											
    Functiongroup_row_editor
    
 											
    Functionhandle_subaction
    
 											
    Functionhyperlink
    
+											
    Functioni18n
    
 											
    Functionischedule_get
    
 											
    FunctionISODateToHTTPDate
    
 											
    Functionmake_help_link
    
@@ -87,13 +91,13 @@
 											
    Functionprivileges_to_XML
    
 											
    Functionprivilege_format_function
    
 											
    Functionprivilege_to_bits
    
+											
    FunctionremoveComment
    
 											
    Functionsend_page_header
    
 											
    FunctionSqlFilterCardDAV
    
 											
    FunctionSqlFilterFragment
    
 											
    Functionticket_row_editor
    
 											
    FunctionunicodeToUtf8
    
 											
    Functionutf8ToUnicode
    
-											
    Function_davical_get_principal_query_cached
    
 																		
     Files
    
 											
    Fileadmin.php
    
 											
    Filealways.php
    
@@ -104,16 +108,20 @@
 											
    Filecaldav-REPORT-expand-property.php
    
 											
    Filecaldav-REPORT-freebusy.php
    
 											
    Filecaldav-REPORT-multiget.php
    
+											
    Filecaldav-REPORT-principal-match.php
    
 											
    Filecaldav-REPORT-principal.php
    
 											
    Filecheck_UTF8.php
    
 											
    Filecollection-edit.php
    
+											
    Filecreatedb.php
    
 											
    Filedavical_configuration_missing.php
    
+											
    Filedbexec.php
    
 											
    Filefeed.php
    
 											
    Filefreebusy-functions.php
    
 											
    Filefreebusy.php
    
 											
    Filehelp.php
    
 											
    Fileindex.php
    
 											
    Fileinteractive-page.php
    
+											
    Filenewfile.php
    
 											
    Fileother_translated_strings.php
    
 											
    Filepage-footer.php
    
 											
    Filepage-header.php
    
@@ -121,6 +129,7 @@
 											
    Fileprincipal-edit.php
    
 											
    Filepubsub.php
    
 											
    Filesetup.php
    
+											
    FileSqlToArray.php
    
 											
    Filetest-RRULE-v2.php
    
 											
    Filetest-RRULE.php
    
 											
    Filetest.php
    
@@ -137,8 +146,14 @@
 					
    
 																									
     Functions
    
 															
    FunctionAuthExternalAWL
    
+															
    Functionauth_functions_deprecated
    
 															
    FunctionCreateDefaultRelationships
    
 															
    FunctionCreateHomeCalendar
    
+															
    FunctionCreateHomeCollections
    
+															
    FunctiongetPrincipalByID
    
+															
    FunctiongetUserByEMail
    
+															
    FunctiongetUserByID
    
+															
    FunctiongetUserByName
    
 															
    FunctionUpdateUserFromExternal
    
 																										
     Files
    
 															
    Fileauth-functions.php
    
@@ -155,26 +170,27 @@
 															
    Functioncalendar_to_xml
    
 															
    Functioncomponent_to_xml
    
 															
    FunctioncontrolRequestContainer
    
-															
    Functioncreate_scheduling_requests
    
 															
    Functiondelete_collection
    
 															
    Functiondisplay_status
    
+															
    Functiondo_scheduling_requests
    
+															
    FunctionGetTZID
    
 															
    Functionhandle_cancel_request
    
 															
    Functionhandle_freebusy_request
    
 															
    Functionhandle_schedule_reply
    
 															
    Functionhandle_schedule_request
    
 															
    Functionimport_collection
    
+															
    FunctionlogRequestHeaders
    
 															
    Functionobfuscated_event
    
+															
    Functionprocess_ace
    
 															
    Functionproperty_response
    
 															
    Functionpublic_events_only
    
 															
    Functionrollback
    
 															
    Functionrollback_on_error
    
 															
    Functionsend_dav_header
    
 															
    Functionsimple_write_resource
    
-															
    Functionupdate_scheduling_requests
    
 															
    Functionwrite_alarms
    
 															
    Functionwrite_attendees
    
 															
    Functionwrite_resource
    
-															
    Functionwrite_scheduling_request
    
 																										
     Files
    
 															
    Filecaldav-ACL.php
    
 															
    Filecaldav-BIND.php
    
@@ -189,8 +205,8 @@
 															
    Filecaldav-PROPPATCH.php
    
 															
    Filecaldav-PUT-default.php
    
 															
    Filecaldav-PUT-functions.php
    
+															
    Filecaldav-PUT-vcalendar.php
    
 															
    Filecaldav-PUT-vcard.php
    
-															
    Filecaldav-PUT.php
    
 															
    Filecaldav-REPORT-pps-set.php
    
 															
    Filecaldav-REPORT-sync-collection.php
    
 															
    Filecaldav-REPORT.php
    
@@ -232,6 +248,21 @@
 						
 							
 											
+				
    Sub-packageexternal-bind
    
+				
    
+					
    
+																									
     Functions
    
+															
    Functioncreate_external
    
+															
    Functionfetch_external
    
+															
    Functionupdate_external
    
+																										
     Files
    
+															
    Fileexternal-fetch.php
    
+																		
    
+				
    
+								
+						
+							
+											
 				
    Sub-packageHTTPAuthSession
    
 				
    
 					
    
@@ -262,16 +293,19 @@
 				
    
 					
    
 																			
     Classes
    
+															
    ClassimapPamDrivers
    
 															
    ClassldapDrivers
    
 															
    ClasssquidPamDrivers
    
 																										
     Functions
    
 															
    FunctiongetStaticLdap
    
+															
    FunctionIMAP_PAM_check
    
 															
    FunctionLDAP_check
    
 															
    FunctionSQUID_PAM_check
    
 															
    Functionsync_LDAP
    
 															
    Functionsync_LDAP_groups
    
 															
    Functionsync_user_from_LDAP
    
 																										
     Files
    
+															
    Filedrivers_imap_pam.php
    
 															
    Filedrivers_ldap.php
    
 															
    Filedrivers_squid_pam.php
    
 																		
    
@@ -297,9 +331,11 @@
 				
    
 					
    
 																			
     Classes
    
-															
    ClassCalDAVPrincipal
    
+															
    ClassDAVPrincipal
    
+															
    ClassPrincipal
    
 																																
     Files
    
-															
    FileCalDAVPrincipal.php
    
+															
    FileDAVPrincipal.php
    
+															
    FilePrincipal.php
    
 																		
    
 				
    
 								
diff --git a/docs/api/todolist.html b/docs/api/todolist.html
index 5963f989..3dd5f350 100644
--- a/docs/api/todolist.html
+++ b/docs/api/todolist.html
@@ -21,9 +21,14 @@
 
    local_session_sql()
    
 
      
     
    • Make this a defined constant
      • 
+
    
+
    awl
    
+
    Rfc5545Duration::fromTwoDates()
    
+
      
+    
    • Improve this to calculate the days difference and then the clock time diff  and work from there.
      • 
 
    
 	
    
-		Documentation generated on Tue, 28 Dec 2010 02:16:05 +1300 by phpDocumentor 1.4.3
+		Documentation generated on Sun, 11 Sep 2011 20:48:12 +1200 by phpDocumentor 1.4.3
 	
    
 	
 
\ No newline at end of file
diff --git a/docs/website/images/flattr-badge-large.png b/docs/website/images/flattr-badge-large.png
new file mode 100644
index 00000000..c03a4fa3
Binary files /dev/null and b/docs/website/images/flattr-badge-large.png differ
diff --git a/docs/website/images/paypal_donate_button.png b/docs/website/images/paypal_donate_button.png
new file mode 100644
index 00000000..c0e367a2
Binary files /dev/null and b/docs/website/images/paypal_donate_button.png differ
diff --git a/htdocs/always.php b/htdocs/always.php
index b5c31217..662fca72 100644
--- a/htdocs/always.php
+++ b/htdocs/always.php
@@ -173,7 +173,7 @@ init_gettext( 'davical', $c->locale_path );
 */
 $c->code_version = 0;
 $c->want_awl_version = '0.47';
-$c->version_string = '0.9.9.4'; // The actual version # is replaced into that during the build /release process
+$c->version_string = '0.9.9.5'; // The actual version # is replaced into that during the build /release process
 if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
   $c->code_major = $matches[1];
   $c->code_minor = $matches[2];
@@ -190,7 +190,7 @@ $_SERVER['SERVER_NAME'] = $c->domain_name;
 
 require_once('AwlQuery.php');
 
-$c->want_dbversion = array(1,2,9);
+$c->want_dbversion = array(1,2,10);
 $c->schema_version = 0;
 $qry = new AwlQuery( 'SELECT schema_major, schema_minor, schema_patch FROM awl_db_revision ORDER BY schema_id DESC LIMIT 1;' );
 if ( $qry->Exec('always',__LINE__,__FILE__) && $row = $qry->Fetch() ) {
diff --git a/inc/CalDAVRequest.php b/inc/CalDAVRequest.php
index dfe846d4..254a0995 100644
--- a/inc/CalDAVRequest.php
+++ b/inc/CalDAVRequest.php
@@ -85,6 +85,11 @@ class CalDAVRequest
   */
   protected $exists;
 
+  /**
+  * The value of any 'Destionation:' header, if present.
+  */
+  var $destination;
+
   /**
   * The decimal privileges allowed by this user to the identified resource.
   */
@@ -166,7 +171,12 @@ class CalDAVRequest
     /**
     * MOVE/COPY use a "Destination" header and (optionally) an "Overwrite" one.
     */
-    if ( isset($_SERVER['HTTP_DESTINATION']) ) $this->destination = $_SERVER['HTTP_DESTINATION'];
+    if ( isset($_SERVER['HTTP_DESTINATION']) ) {
+      $this->destination = $_SERVER['HTTP_DESTINATION'];
+      if ( preg_match('{^(https?)://([a-z.-]+)(:[0-9]+)?(/.*)$}', $this->destination, $matches ) ) {
+        $this->destination = $matches[4];
+      }
+    }
     $this->overwrite = ( isset($_SERVER['HTTP_OVERWRITE']) && ($_SERVER['HTTP_OVERWRITE'] == 'F') ? false : true ); // RFC4918, 9.8.4 says default True.
 
     /**
diff --git a/inc/Principal.php b/inc/Principal.php
index 3f7593e3..a0618db6 100644
--- a/inc/Principal.php
+++ b/inc/Principal.php
@@ -489,7 +489,9 @@ class Principal {
       $field_values->{'user_active'} = $field_values->{'active'};
     if ( !isset($field_values->{'modified'}) && isset($field_values->{'updated'}) )
       $field_values->{'modified'} = $field_values->{'updated'};
-
+    if ( !isset($field_values->{'type_id'}) )
+      $field_values->{'type_id'} = 1; // Default to 'person'
+    
       
     $sql = '';
     if ( $inserting ) {
@@ -518,10 +520,10 @@ class Principal {
           throw new Exception( get_class($this).'::Create: Mandatory field "'.$k.'" is not set.');
         } 
       }
-      $sql = 'INSERT INTO '.$this->db_tablename.' ('.implode(',',$insert_fields).') VALUES('.implode(',',$param_names).')';
+      $sql = 'INSERT INTO '.self::$db_tablename.' ('.implode(',',$insert_fields).') VALUES('.implode(',',$param_names).')';
     }
     else {
-      $sql = 'UPDATE '.$this->db_tablename.' SET '.implode(',',$update_list);
+      $sql = 'UPDATE '.self::$db_tablename.' SET '.implode(',',$update_list);
       $sql .= ' WHERE principal_id=:principal_id';
       $sql_params[':principal_id'] = $this->principal_id; 
     }
diff --git a/inc/always.php.in b/inc/always.php.in
index cf4f1ef7..8b5f4eb8 100644
--- a/inc/always.php.in
+++ b/inc/always.php.in
@@ -339,8 +339,9 @@ function ISODateToHTTPDate( $isodate ) {
 * Convert a date into ISO format into the sparkly new ISO format.
 * @param string $indate The date to convert
 */
-function DateToISODate( $indate ) {
+function DateToISODate( $indate, $in_utc=false ) {
   // Use strtotime since strptime is not available on Windows platform.
+  if ( $in_utc ) return( gmdate('Ymd\THis\Z', strtotime($indate)) );
   return( date('c', strtotime($indate)) );
 }
 
diff --git a/inc/caldav-BIND.php b/inc/caldav-BIND.php
index 674451bd..429de2ae 100644
--- a/inc/caldav-BIND.php
+++ b/inc/caldav-BIND.php
@@ -58,7 +58,7 @@ if ( preg_match ( '{^https?://[A-Za-z][^/]*/.+$}', $href ) ) {
 		create_external ( '/.external/'. md5($href) ,true,false );
 	  $qry->QDo('SELECT collection_id FROM collection WHERE dav_name = :dav_name ', array( ':dav_name' => '/.external/'. md5($href) ));
 	  if ( $qry->rows() != 1 || !($row = $qry->Fetch()) ) 
-			$request->DoResponse(500,translate('Database Error1'));
+			$request->DoResponse(500,translate('Database Error'));
 		$dav_id = $row->collection_id;
 	}
 
@@ -78,12 +78,12 @@ if ( preg_match ( '{^https?://[A-Za-z][^/]*/.+$}', $href ) ) {
 	if ( $qry->Exec('BIND',__LINE__,__FILE__) ) {
 		$qry = new AwlQuery( 'SELECT bind_id from dav_binding where dav_name = :dav_name', array( ':dav_name' => $destination_path ) );
 	  if ( ! $qry->Exec('BIND',__LINE__,__FILE__) || $qry->rows() != 1 || !($row = $qry->Fetch()) ) 
-			$request->DoResponse(500,translate('Database Error1'));
+			$request->DoResponse(500,translate('Database Error'));
 		fetch_external ( $row->bind_id, '' );
 	  $request->DoResponse(201);
  	} 
 	else {
-	  $request->DoResponse(500,translate('Database Error2'));
+	  $request->DoResponse(500,translate('Database Error'));
 	}
 } 
 else {
diff --git a/inc/caldav-DELETE.php b/inc/caldav-DELETE.php
index a930ce5f..d6ecab87 100644
--- a/inc/caldav-DELETE.php
+++ b/inc/caldav-DELETE.php
@@ -48,21 +48,23 @@ if ( ! ( $dav_resource->resource_id() > 0 ) ) {
 $qry = new AwlQuery();
 $qry->Begin();
 
-if ( $dav_resource->IsBinding() ) {
-  $params = array( ':dav_name' => $dav_resource->dav_name() );
-
-  if ( $qry->QDo("DELETE FROM dav_binding WHERE dav_name = :dav_name", $params )
-    && $qry->Commit() ) {
-    @dbg_error_log( "DELETE", "DELETE: Binding: %d, ETag: %s, Path: %s", $session->user_no, $request->etag_if_match, $request->path);
-    $request->DoResponse( 204 );
+if ( $dav_resource->IsCollection() ) {
+  if ( $dav_resource->IsBinding() ) {
+    $params = array( ':dav_name' => $dav_resource->dav_name() );
+  
+    if ( $qry->QDo("DELETE FROM dav_binding WHERE dav_name = :dav_name", $params )
+      && $qry->Commit() ) {
+      @dbg_error_log( "DELETE", "DELETE: Binding: %d, ETag: %s, Path: %s", $session->user_no, $request->etag_if_match, $request->path);
+      $request->DoResponse( 204 );
+    }
   }
-}
-else if ( $dav_resource->IsCollection() ) {
-  if ( delete_collection( $dav_resource->resource_id() ) && $qry->Commit() ) {
-    // Uncache anything to do with the collection
-    $cache = getCacheInstance();
-    $cache->delete( 'collection-'.$dav_resource->dav_name(), null );
-    $request->DoResponse( 204 );
+  else {
+    if ( delete_collection( $dav_resource->resource_id() ) && $qry->Commit() ) {
+      // Uncache anything to do with the collection
+      $cache = getCacheInstance();
+      $cache->delete( 'collection-'.$dav_resource->dav_name(), null );
+      $request->DoResponse( 204 );
+    }
   }
 }
 else {
diff --git a/inc/drivers_ldap.php b/inc/drivers_ldap.php
index 4c5f2a4b..895a2311 100644
--- a/inc/drivers_ldap.php
+++ b/inc/drivers_ldap.php
@@ -277,7 +277,7 @@ function sync_user_from_LDAP( Principal &$principal, $mapping, $ldap_values ) {
       }
     }
   }
-  if ( $principal->Exists ) {
+  if ( $principal->Exists() ) {
     $principal->Update($fields_to_set);
   }
   else {
@@ -362,7 +362,7 @@ function LDAP_check($username, $password ){
 function sync_LDAP_groups(){
   global $c;
   $ldapDriver = getStaticLdap();
-  if ( $ldapDriver->valid ) return;
+  if ( ! $ldapDriver->valid ) return;
 
   $mapping = $c->authenticate_hook['config']['group_mapping_field'];
   //$attributes = array('cn','modifyTimestamp','memberUid');
@@ -467,7 +467,7 @@ function sync_LDAP_groups(){
           Principal::cacheDelete('username', $member);
         }
       }
-      $remove_users = array_diff ( $db_members, $ldap_members );
+      $remove_users = @array_flip( @array_flip( array_diff( $db_members, $ldap_members ) ));
       if ( sizeof ( $remove_users ) ){
         $c->messages[] = sprintf(i18n('- removing %s from group : %s'),join(', ', $remove_users ), $group);
         foreach ( $remove_users as $member ){
diff --git a/po/de.po b/po/de.po
index 6b6302c9..c3b2f9e5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-07-09 18:08+0000\n"
 "Last-Translator: gurkenpapst \n"
 "Language-Team: German (http://www.transifex.net/projects/p/davical/team/de/)\n"
@@ -392,6 +392,9 @@ msgstr "Datumsformat"
 msgid "Default Privileges"
 msgstr "Standardrechte"
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Löschen"
 
diff --git a/po/es_AR.po b/po/es_AR.po
index 1aef9251..cfe4ad21 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-03-22 15:19+0000\n"
 "Last-Translator: fmms \n"
 "Language-Team: LANGUAGE \n"
@@ -373,6 +373,9 @@ msgstr "Formato de Fecha"
 msgid "Default Privileges"
 msgstr ""
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Borrar"
 
diff --git a/po/es_MX.po b/po/es_MX.po
index 0ff9b0fa..7b67eb1e 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-08-02 19:21+0000\n"
 "Last-Translator: pr3d4t0r \n"
 "Language-Team: Spanish (Mexican) (http://www.transifex.net/projects/p/davical/team/es_MX/)\n"
@@ -386,6 +386,9 @@ msgstr "Formato de Fecha"
 msgid "Default Privileges"
 msgstr "Privilegios Automáticos"
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Eliminar"
 
diff --git a/po/es_VE.po b/po/es_VE.po
index 1b6ddf39..b8c43894 100644
--- a/po/es_VE.po
+++ b/po/es_VE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-03-26 13:25+0000\n"
 "Last-Translator: e1th0r \n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.net/projects/p/davical/team/es_VE/)\n"
@@ -371,6 +371,9 @@ msgstr ""
 msgid "Default Privileges"
 msgstr ""
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
diff --git a/po/et.po b/po/et.po
index 8fbc7d25..b7b9bd4e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-03-22 15:19+0000\n"
 "Last-Translator: fmms \n"
 "Language-Team: Estonian (http://www.transifex.net/projects/p/davical/team/et/)\n"
@@ -370,6 +370,9 @@ msgstr ""
 msgid "Default Privileges"
 msgstr ""
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 3c3b6cb2..1e2e80ab 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-04-05 16:53+0000\n"
 "Last-Translator: tikismoke \n"
 "Language-Team: French (http://www.transifex.net/projects/p/davical/team/fr/)\n"
@@ -379,6 +379,9 @@ msgstr "Format des dates"
 msgid "Default Privileges"
 msgstr "Privilèges par défaut"
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Supprimer"
 
diff --git a/po/hu.po b/po/hu.po
index 078887cd..f7ced691 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-03-22 15:19+0000\n"
 "Last-Translator: fmms \n"
 "Language-Team: LANGUAGE \n"
@@ -373,6 +373,9 @@ msgstr "Dátumformátum"
 msgid "Default Privileges"
 msgstr ""
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Törlés"
 
diff --git a/po/it.po b/po/it.po
index 03c893ed..ff565a5d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-03-22 15:19+0000\n"
 "Last-Translator: fmms \n"
 "Language-Team: LANGUAGE \n"
@@ -374,6 +374,9 @@ msgstr "Formato data"
 msgid "Default Privileges"
 msgstr ""
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Elimina"
 
diff --git a/po/ja.po b/po/ja.po
index e5e8f552..518e98fa 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-03-22 15:19+0000\n"
 "Last-Translator: fmms \n"
 "Language-Team: LANGUAGE \n"
@@ -373,6 +373,9 @@ msgstr "日付スタイル"
 msgid "Default Privileges"
 msgstr "デフォルトの権限"
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "削除"
 
diff --git a/po/messages.pot b/po/messages.pot
index 6c453527..f6876a9d 100644
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-02 23:13+0100\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -383,6 +383,9 @@ msgstr ""
 msgid "Default Privileges"
 msgstr ""
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr ""
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index c66c593d..c582a827 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-08-15 23:39+0000\n"
 "Last-Translator: aleksand \n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/davical/team/nb_NO/)\n"
@@ -385,6 +385,9 @@ msgstr "Datoformat"
 msgid "Default Privileges"
 msgstr "Standard privilegier"
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Slett"
 
diff --git a/po/nl.po b/po/nl.po
index 706a9859..67e2c033 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-03-22 15:19+0000\n"
 "Last-Translator: fmms \n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/davical/team/nl/)\n"
@@ -375,6 +375,9 @@ msgstr "Opmaak datum"
 msgid "Default Privileges"
 msgstr "Standaard Privileges"
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Verwijder"
 
diff --git a/po/pl.po b/po/pl.po
index 2d80237c..485c84b3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-03-22 15:19+0000\n"
 "Last-Translator: fmms \n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/davical/team/pl/)\n"
@@ -374,6 +374,9 @@ msgstr "Format daty"
 msgid "Default Privileges"
 msgstr ""
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Usuń"
 
diff --git a/po/pofilelist.txt b/po/pofilelist.txt
index 6860b55a..c624a50a 100644
--- a/po/pofilelist.txt
+++ b/po/pofilelist.txt
@@ -1,47 +1,3 @@
-htdocs/always.php
-htdocs/caldav.php
-htdocs/feed.php
-htdocs/freebusy.php
-htdocs/help.php
-htdocs/public.php
-htdocs/setup.php
-htdocs/tools.php
-htdocs/upgrade.php
-htdocs/well-known.php
-inc/auth-functions.php
-inc/caldav-BIND.php
-inc/caldav-DELETE.php
-inc/caldav-GET.php
-inc/caldav-MKCOL.php
-inc/caldav-MOVE.php
-inc/caldav-OPTIONS.php
-inc/caldav-PROPFIND.php
-inc/caldav-PROPPATCH.php
-inc/caldav-PUT-default.php
-inc/caldav-PUT-functions.php
-inc/caldav-PUT.php
-inc/caldav-PUT-vcard.php
-inc/caldav-REPORT-calquery.php
-inc/caldav-REPORT-cardquery.php
-inc/caldav-REPORT.php
-inc/caldav-REPORT-sync-collection.php
-inc/CalDAVRequest.php
-inc/DAViCalSession.php
-inc/DAVResource.php
-inc/drivers_imap_pam.php
-inc/drivers_ldap.php
-inc/drivers_pwauth_pam.php
-inc/drivers_squid_pam.php
-inc/interactive-page.php
-inc/iSchedule.php
-inc/other_translated_strings.php
-inc/page-header.php
-inc/Principal.php
-inc/ui/collection-edit.php
-inc/ui/principal-browse.php
-inc/ui/principal-edit.php
-inc/WritableCollection.php
-
 ../awl/inc/classBrowser.php
 ../awl/inc/classEditor.php
 ../awl/inc/DataEntry.php
@@ -49,4 +5,6 @@ inc/WritableCollection.php
 ../awl/inc/PgQuery.php
 ../awl/inc/Session.php
 ../awl/inc/User.php
+../awl/inc/vCalendar.php
+../awl/inc/vComponent.php
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f92f1f19..7618e031 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-08-04 14:25+0000\n"
 "Last-Translator: aagaio \n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/davical/team/pt_BR/)\n"
@@ -384,6 +384,9 @@ msgstr "Estilo da data"
 msgid "Default Privileges"
 msgstr "Privilégios padrão"
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Excluir"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index e091842f..a4462cac 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-03-22 22:02+0000\n"
 "Last-Translator: m42 \n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/davical/team/pt_PT/)\n"
@@ -385,6 +385,9 @@ msgstr "Estilo de data"
 msgid "Default Privileges"
 msgstr "Privilégios predefinidos"
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Eliminar"
 
diff --git a/po/ru.po b/po/ru.po
index 00615f43..2c1f5729 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-03-22 15:19+0000\n"
 "Last-Translator: fmms \n"
 "Language-Team: LANGUAGE \n"
@@ -372,6 +372,9 @@ msgstr ""
 msgid "Default Privileges"
 msgstr ""
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Удалить"
 
diff --git a/po/sv.po b/po/sv.po
index 345e5eab..0bd7eb73 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 11:42+1200\n"
+"POT-Creation-Date: 2011-09-11 10:15+1200\n"
 "PO-Revision-Date: 2011-03-22 15:19+0000\n"
 "Last-Translator: fmms \n"
 "Language-Team: LANGUAGE \n"
@@ -373,6 +373,9 @@ msgstr "Datumformat"
 msgid "Default Privileges"
 msgstr "Standardrättigheter"
 
+msgid "Default relationships added."
+msgstr ""
+
 msgid "Delete"
 msgstr "Radera"
 
diff --git a/scripts/po/rebuild-translations.sh b/scripts/po/rebuild-translations.sh
index 069aabbd..71916153 100755
--- a/scripts/po/rebuild-translations.sh
+++ b/scripts/po/rebuild-translations.sh
@@ -13,17 +13,22 @@ APPLICATION="davical"
 AWL_LOCATION="../awl"
 
 if [ ! -d "${AWL_LOCATION}" ]; then
-  AWL_LOCATION=/usr/share/awl
+  AWL_LOCATION="`find .. -type d -name 'awl-*.*'`"
   if [ ! -d "${AWL_LOCATION}" ]; then
-    echo "I can't find a location for the AWL libraries and I need those strings too"
-    exit 1
+    AWL_LOCATION=/usr/share/awl
+    if [ ! -d "${AWL_LOCATION}" ]; then
+      echo "I can't find a location for the AWL libraries and I need those strings too"
+      exit 1
+    fi
   fi
 fi
 
-sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt > ${PODIR}/pofilelist.tmp
+egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1
+sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt >> ${PODIR}/pofilelist.tmp1
+sort ${PODIR}/pofilelist.tmp1 | uniq > ${PODIR}/pofilelist.tmp
 xgettext --no-location --add-comments=Translators --keyword=translate --keyword=i18n --output=${PODIR}/messages.tmp -s -f ${PODIR}/pofilelist.tmp
 sed 's.^"Content-Type: text/plain; charset=CHARSET\\n"."Content-Type: text/plain; charset=UTF-8\\n".' ${PODIR}/messages.tmp > ${PODIR}/messages.pot
-rm ${PODIR}/messages.tmp ${PODIR}/pofilelist.tmp
+rm ${PODIR}/messages.tmp ${PODIR}/pofilelist.tmp ${PODIR}/pofilelist.tmp1
 
 locale_list() {
   ls ${PODIR}/*.po | cut -f2 -d/ | cut -f1 -d.
diff --git a/testing/tests/binding/1030-PUT-whole-subcalendar.result b/testing/tests/binding/1030-PUT-whole-subcalendar.result
index 0a9f8622..312a74d6 100644
--- a/testing/tests/binding/1030-PUT-whole-subcalendar.result
+++ b/testing/tests/binding/1030-PUT-whole-subcalendar.result
@@ -8,6 +8,11 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
+         dav_etag: >0e091d7cf1ea4f613199a2a60090a7e1<
+         dav_name: >/user4/base/newcalendar/4887b3b0-0f91-012d-1259-002421a2359e.ics<
+          dtstart: >2010-07-17 10:00:00+12<
+          summary: >New Event<
+
          dav_etag: >228540edb5690f6e8adb855aaa98ee98<
          dav_name: >/user4/base/newcalendar/73d1f980-ec28-012c-11f9-002421a2359e.ics<
           dtstart: >2010-01-06 11:00:00+13<
@@ -33,11 +38,6 @@ Content-Type: text/plain; charset="utf-8"
           dtstart: >2010-05-03 13:00:00+12<
           summary: >Youngberg Hill Winemaker Dinner @ The Stephanie Inn<
 
-         dav_etag: >0e091d7cf1ea4f613199a2a60090a7e1<
-         dav_name: >/user4/base/newcalendar/4887b3b0-0f91-012d-1259-002421a2359e.ics<
-          dtstart: >2010-07-17 10:00:00+12<
-          summary: >New Event<
-
          dav_etag: >a5972f272523b97d6cade1486a8b1c40<
          dav_name: >/user4/base/newcalendar/ed3beb90-0f8a-012d-1259-002421a2359e.ics<
           dtstart: >2010-07-18 05:00:00+12<
diff --git a/testing/tests/binding/1032-BIND-admin.result b/testing/tests/binding/1032-BIND-admin.result
index cec700af..9cc8db69 100644
--- a/testing/tests/binding/1032-BIND-admin.result
+++ b/testing/tests/binding/1032-BIND-admin.result
@@ -55,7 +55,7 @@ target_collection: >11<
 target_resource_i: >NULL<
      ticket_owner: >1003<
 
-          bind_id: >1628<
+          bind_id: >1625<
        bind_owner: >1<
   bound_source_id: >12<
   dav_displayname: >user3 home<
diff --git a/testing/tests/binding/1100-BIND.result b/testing/tests/binding/1100-BIND.result
index c91139c8..431e14bf 100644
--- a/testing/tests/binding/1100-BIND.result
+++ b/testing/tests/binding/1100-BIND.result
@@ -35,7 +35,7 @@ Content-Type: text/plain; charset="utf-8"
            length: >8<
  parent_container: >/user4/base/<
 
-          bind_id: >1629<
+          bind_id: >1626<
   bound_source_id: >1601<
   dav_displayname: >A normal collection<
          dav_name: >/user4/boundbase/<
diff --git a/testing/tests/binding/1101-PROPFIND-normal.result b/testing/tests/binding/1101-PROPFIND-normal.result
index f3609ca3..59b09b60 100644
--- a/testing/tests/binding/1101-PROPFIND-normal.result
+++ b/testing/tests/binding/1101-PROPFIND-normal.result
@@ -112,7 +112,7 @@
    
     newcalendar
     
-     /caldav.php/.resources/1618
+     /caldav.php/.resources/1615
     
     
      
diff --git a/testing/tests/binding/1102-PROPFIND-bound.result b/testing/tests/binding/1102-PROPFIND-bound.result
index 8c2270a4..1dbe5ca9 100644
--- a/testing/tests/binding/1102-PROPFIND-bound.result
+++ b/testing/tests/binding/1102-PROPFIND-bound.result
@@ -125,7 +125,7 @@
    
     newcalendar
     
-     /caldav.php/.resources/1618
+     /caldav.php/.resources/1615
     
     
      
diff --git a/testing/tests/carddav/Restore-Database.result b/testing/tests/carddav/Restore-Database.result
index 80453e61..a389687f 100644
--- a/testing/tests/carddav/Restore-Database.result
+++ b/testing/tests/carddav/Restore-Database.result
@@ -1,6 +1,6 @@
  setval 
 --------
-   1629
+   1626
 (1 row)
 
  setval 
diff --git a/testing/tests/scheduling/Restore-Database.result b/testing/tests/scheduling/Restore-Database.result
index e6084764..685b8c70 100644
--- a/testing/tests/scheduling/Restore-Database.result
+++ b/testing/tests/scheduling/Restore-Database.result
@@ -1,6 +1,6 @@
  setval 
 --------
-   1641
+   1638
 (1 row)
 
  setval