From 44df9b9f32df36fafc626c41f6f0c3fb978f9686 Mon Sep 17 00:00:00 2001 From: Rob Ostensen Date: Fri, 2 Dec 2011 11:16:28 -0600 Subject: [PATCH 01/18] When creating an external bind attempts to create an external bind to the local host should be excluded --- inc/caldav-BIND.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inc/caldav-BIND.php b/inc/caldav-BIND.php index 429de2ae..ed104aaf 100644 --- a/inc/caldav-BIND.php +++ b/inc/caldav-BIND.php @@ -47,7 +47,8 @@ if ( $destination->Exists() ) { $request->PreconditionFailed(403,'DAV::can-overwrite',translate('A resource already exists at the destination.')); } -if ( preg_match ( '{^https?://[A-Za-z][^/]*/.+$}', $href ) ) { +if ( preg_match ( '{^https?://[A-Za-z][^/]*/.+$}', $href ) && ! stripos( $href, 'localhost' ) < 9 + && ! stripos( $href, '127.0.0.1' ) < 9 && ! stripos( $href, $_SERVER['SERVER_NAME'] ) < 9 && ! stripos( $href, $_SERVER['SERVER_ADDR'] ) < 9 ) { require_once('external-fetch.php'); $qry = new AwlQuery( ); $qry->QDo('SELECT collection_id FROM collection WHERE dav_name = :dav_name ', array( ':dav_name' => '/.external/'. md5($href) )); From f0e60b8fb297cf16446e1bf5f4ee623f57945be1 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 3 Dec 2011 14:19:50 +1300 Subject: [PATCH 02/18] Use supplied content_type even on zero-length requests. --- inc/CalDAVRequest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/CalDAVRequest.php b/inc/CalDAVRequest.php index 52649da3..b6463f38 100644 --- a/inc/CalDAVRequest.php +++ b/inc/CalDAVRequest.php @@ -182,11 +182,11 @@ class CalDAVRequest $_SERVER['REQUEST_METHOD'] = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } $this->method = $_SERVER['REQUEST_METHOD']; + $this->content_type = (isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : null); + if ( preg_match( '{^(\S+/\S+)\s*(;.*)?$}', $this->content_type, $matches ) ) { + $this->content_type = $matches[1]; + } if ( isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['CONTENT_LENGTH'] > 7 ) { - $this->content_type = (isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : null); - if ( preg_match( '{^(\S+/\S+)\s*(;.*)?$}', $this->content_type, $matches ) ) { - $this->content_type = $matches[1]; - } if ( $this->method == 'PROPFIND' || $this->method == 'REPORT' ) { if ( !preg_match( '{^(text|application)/xml$}', $this->content_type ) ) { @dbg_error_log( "LOG request", 'Request is "%s" but client set content-type to "%s". Assuming they meant XML!', From 7332b7820d4e8a5b6410b8405a450766a98d2a5e Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 3 Dec 2011 14:20:12 +1300 Subject: [PATCH 03/18] Note in phpdoc that this is deprecated and what to use instead. --- inc/DAVResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/DAVResource.php b/inc/DAVResource.php index 7d21dd8c..9cff34da 100644 --- a/inc/DAVResource.php +++ b/inc/DAVResource.php @@ -710,7 +710,7 @@ EOQRY; /** - * Fetch the parent to this resource. + * Fetch the parent to this resource. This is deprecated - use GetParentContainer() instead. */ function FetchParentContainer() { deprecated('DAVResource::FetchParentContainer'); From 65319da222a5d8d2161894fdd913b9632de555af Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 3 Dec 2011 14:20:24 +1300 Subject: [PATCH 04/18] Switch to non-deprecated name. --- inc/caldav-PUT-default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/caldav-PUT-default.php b/inc/caldav-PUT-default.php index 612f6a4c..0e530873 100644 --- a/inc/caldav-PUT-default.php +++ b/inc/caldav-PUT-default.php @@ -24,7 +24,7 @@ $lock_opener = $request->FailIfLocked(); $dest = new DAVResource($request->path); -$container = $dest->FetchParentContainer(); +$container = $dest->GetParentContainer(); if ( $container->IsCalendar() ) { $request->PreconditionFailed(412,'urn:ietf:params:xml:ns:caldav:supported-calendar-data', translate('Incorrect content type for calendar: ') . $request->content_type ); From 77a0fe293b8ad84436ebd9534d9469bc51c842f8 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 3 Dec 2011 14:20:43 +1300 Subject: [PATCH 05/18] Fix date-time formatting. --- inc/tz/expand.php | 2 +- inc/tz/list.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/tz/expand.php b/inc/tz/expand.php index 9fe0edbf..781ee4be 100644 --- a/inc/tz/expand.php +++ b/inc/tz/expand.php @@ -163,7 +163,7 @@ $vtz = new vCalendar($tz->vtimezone); $response = new XMLDocument(array("urn:ietf:params:xml:ns:timezone-service" => "")); $timezones = $response->NewXMLElement('urn:ietf:params:xml:ns:timezone-service:timezones'); -$qry = new AwlQuery('SELECT to_char(max(last_modified),\'YYYY-MM-DD\"T\"HH24:MI:SS"Z"\') AS dtstamp FROM timezones'); +$qry = new AwlQuery('SELECT to_char(max(last_modified),\'YYYY-MM-DD"T"HH24:MI:SS"Z"\') AS dtstamp FROM timezones'); if ( $qry->Exec('tz/list',__LINE__,__FILE__) && $qry->rows() > 0 ) { $row = $qry->Fetch(); $timezones->NewElement('dtstamp', $row->dtstamp); diff --git a/inc/tz/list.php b/inc/tz/list.php index 74075c8f..b8281f0e 100644 --- a/inc/tz/list.php +++ b/inc/tz/list.php @@ -13,7 +13,7 @@ require_once('vComponent.php'); $response = new XMLDocument( array("urn:ietf:params:xml:ns:timezone-service" => "") ); $tzlist = $response->NewXMLElement('timezone-list'); -$qry = new AwlQuery('SELECT to_char(max(last_modified),\'YYYY-MM-DD\"T\"HH24:MI:SS"Z"\') AS dtstamp FROM timezones'); +$qry = new AwlQuery('SELECT to_char(max(last_modified),\'YYYY-MM-DD"T"HH24:MI:SS"Z"\') AS dtstamp FROM timezones'); if ( $qry->Exec('tz/list',__LINE__,__FILE__) && $qry->rows() > 0 ) { $row = $qry->Fetch(); $tzlist->NewElement('dtstamp', $row->dtstamp); @@ -22,7 +22,7 @@ else { $tzlist->NewElement('dtstamp', gmdate('Y-m-d\TH:i:s\Z')); } -$sql = 'SELECT our_tzno, tzid, active, to_char(last_modified,\'YYYY-MM-DD\"T\"HH24:MI:SS"Z"\') AS last_modified, olson_name, vtimezone FROM timezones'; +$sql = 'SELECT our_tzno, tzid, active, to_char(last_modified,\'YYYY-MM-DD"T"HH24:MI:SS"Z"\') AS last_modified, olson_name, vtimezone FROM timezones'; $params = array(); $where = ''; if ( $returnall !== true ) { From 6483b562ca88edc0446690bcf92d57c2e9737c7b Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 3 Dec 2011 14:21:34 +1300 Subject: [PATCH 06/18] Now returning a slightly informative error message. --- testing/tests/binding/1014-PUT-bound-fail.result | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/tests/binding/1014-PUT-bound-fail.result b/testing/tests/binding/1014-PUT-bound-fail.result index 72f76268..95923476 100644 --- a/testing/tests/binding/1014-PUT-bound-fail.result +++ b/testing/tests/binding/1014-PUT-bound-fail.result @@ -2,7 +2,7 @@ HTTP/1.1 403 Forbidden Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -Content-Length: 0 +Content-Length: 19 Content-Type: text/plain; charset="utf-8" - +No write permission From b4e50d8803f790ef8b9e94b5507951e7a0613f25 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 3 Dec 2011 14:22:09 +1300 Subject: [PATCH 07/18] One more sync-action in prior tests. --- testing/tests/binding/1036-REPORT-sync-initial-bound.result | 4 ++-- testing/tests/binding/Restore-Database.result | 2 +- testing/tests/carddav/2010-REPORT-sync-initial.result | 4 ++-- testing/tests/carddav/2039-REPORT-sync-changed.result | 4 ++-- testing/tests/carddav/Restore-Database.result | 2 +- testing/tests/scheduling/Restore-Database.result | 2 +- testing/tests/timezone/Restore-Database.result | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testing/tests/binding/1036-REPORT-sync-initial-bound.result b/testing/tests/binding/1036-REPORT-sync-initial-bound.result index 36699bdb..a34dd13d 100644 --- a/testing/tests/binding/1036-REPORT-sync-initial-bound.result +++ b/testing/tests/binding/1036-REPORT-sync-initial-bound.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "e9729234a084898506d4821483a404c9" +ETag: "51330ec2c1868a584176caf2d8b0b195" Content-Length: 2292 Content-Type: text/xml; charset="utf-8" @@ -89,5 +89,5 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - data:,5 + data:,6 diff --git a/testing/tests/binding/Restore-Database.result b/testing/tests/binding/Restore-Database.result index 2a81253e..2c6a0629 100644 --- a/testing/tests/binding/Restore-Database.result +++ b/testing/tests/binding/Restore-Database.result @@ -25,7 +25,7 @@ setval -------- - 4 + 5 (1 row) setval diff --git a/testing/tests/carddav/2010-REPORT-sync-initial.result b/testing/tests/carddav/2010-REPORT-sync-initial.result index cef5dd00..bbea6a16 100644 --- a/testing/tests/carddav/2010-REPORT-sync-initial.result +++ b/testing/tests/carddav/2010-REPORT-sync-initial.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "3446b8401735be64ec24b3e1af5362db" +ETag: "e7de8b24ed85d9e45aaef081a5e527a6" Content-Length: 948 Content-Type: text/xml; charset="utf-8" @@ -38,5 +38,5 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - data:,6 + data:,7 diff --git a/testing/tests/carddav/2039-REPORT-sync-changed.result b/testing/tests/carddav/2039-REPORT-sync-changed.result index af80f2b5..d0902bdb 100644 --- a/testing/tests/carddav/2039-REPORT-sync-changed.result +++ b/testing/tests/carddav/2039-REPORT-sync-changed.result @@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "f0c7bfe2540087faa968b4a4321f8953" +ETag: "6c643c2bb832c75fb7417ba9e47269f0" Content-Length: 1794 Content-Type: text/xml; charset="utf-8" @@ -71,5 +71,5 @@ Content-Type: text/xml; charset="utf-8" HTTP/1.1 200 OK - data:,7 + data:,8 diff --git a/testing/tests/carddav/Restore-Database.result b/testing/tests/carddav/Restore-Database.result index 25703e47..48aa1289 100644 --- a/testing/tests/carddav/Restore-Database.result +++ b/testing/tests/carddav/Restore-Database.result @@ -25,7 +25,7 @@ setval -------- - 5 + 6 (1 row) setval diff --git a/testing/tests/scheduling/Restore-Database.result b/testing/tests/scheduling/Restore-Database.result index 90d7af1f..08356c1e 100644 --- a/testing/tests/scheduling/Restore-Database.result +++ b/testing/tests/scheduling/Restore-Database.result @@ -25,7 +25,7 @@ setval -------- - 7 + 8 (1 row) setval diff --git a/testing/tests/timezone/Restore-Database.result b/testing/tests/timezone/Restore-Database.result index 1ae8b555..a13d63ab 100644 --- a/testing/tests/timezone/Restore-Database.result +++ b/testing/tests/timezone/Restore-Database.result @@ -25,7 +25,7 @@ setval -------- - 7 + 8 (1 row) setval From 612ac73a3055aac52c28e2fe6e80a11f1bde8934 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 7 Dec 2011 14:53:26 +1300 Subject: [PATCH 08/18] Try to short-circuit so we only do expansion if we know we need it. --- inc/caldav-REPORT-calquery.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/inc/caldav-REPORT-calquery.php b/inc/caldav-REPORT-calquery.php index eda04f9d..5c01caea 100644 --- a/inc/caldav-REPORT-calquery.php +++ b/inc/caldav-REPORT-calquery.php @@ -341,7 +341,11 @@ if ( $qry->Exec("calquery",__LINE__,__FILE__) && $qry->rows() > 0 ) { } if ( $need_expansion ) { $vResource = new vComponent($dav_object->caldav_data); + $expanded = getVCalendarRange($vResource); + if ( !$expanded->overlaps($range_filter) ) continue; + $expanded = expand_event_instances($vResource, $expand_range_start, $expand_range_end, $expand_as_floating ); + if ( $expanded->ComponentCount() == 0 ) continue; if ( $need_expansion ) $dav_object->caldav_data = $expanded->Render(); } @@ -356,6 +360,7 @@ if ( $qry->Exec("calquery",__LINE__,__FILE__) && $qry->rows() > 0 ) { } } } + $multistatus = new XMLElement( "multistatus", $responses, $reply->GetXmlNsArray() ); $request->XMLResponse( 207, $multistatus ); From 23dd6285d75ebd1660ca804ae83c1d3914b59327 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 7 Dec 2011 14:55:03 +1300 Subject: [PATCH 09/18] Add the "CardDAV" word into DAViCal's description. --- debian/control | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/debian/control b/debian/control index f3ac6859..e006bb43 100644 --- a/debian/control +++ b/debian/control @@ -12,22 +12,23 @@ Package: davical Architecture: all Depends: ${misc:Depends}, debconf (>= 1.0.32), php5-pgsql, postgresql-client (>= 8.1), libawl-php (>= 0.49-1~), libawl-php (<< 0.50), libdbd-pg-perl, libyaml-perl Recommends: postgresql (>= 8.3) -Description: The DAViCal CalDAV Server - The DAViCal CalDAV Server is designed to trivially store - CalDAV calendars, such as those from Evolution, Sunbird/Lightning, +Description: The DAViCal CalDAV & CardDAV Server + The DAViCal CalDAV Server is designed to store CalDAV calendars and + CardDAV addressbooks, such as those from Evolution, Sunbird/Lightning, Mulberry, iCal, iPhone or SOHO Organizer, in a central location, - providing shared calendars, free/busy publication and a basic - administration interface. + providing shared calendars, free/busy publication and a + basic administration interface. Package: davical-doc Section: doc Architecture: all Depends: ${misc:Depends} -Description: The DAViCal CalDAV Server - documentation - The DAViCal CalDAV Server is designed to trivially store - CalDAV calendars, such as those from Evolution, Sunbird/Lightning, - Mulberry, iCal or SOHO Organizer, in a central location, providing - shared calendars, free/busy publication and basic administration +Description: The DAViCal CalDAV & CardDAV Server - technical documentation + The DAViCal CalDAV Server is designed to store CalDAV calendars and + CardDAV addressbooks, such as those from Evolution, Sunbird/Lightning, + Mulberry, iCal, iPhone or SOHO Organizer, in a central location, + providing shared calendars, free/busy publication and a + basic administration interface. . This package contains detailed technical documentation for the classes and methods in the DAViCal programs. Some user-centric From 1d424693adaa3047e11f6b8247775fc42870862e Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 7 Dec 2011 14:55:22 +1300 Subject: [PATCH 10/18] Fix missing END:VCALENDAR. --- testing/tests/regression-suite/0996-PUT-odd-characters.test | 1 + 1 file changed, 1 insertion(+) diff --git a/testing/tests/regression-suite/0996-PUT-odd-characters.test b/testing/tests/regression-suite/0996-PUT-odd-characters.test index 8a9973ea..3c6ac3c3 100644 --- a/testing/tests/regression-suite/0996-PUT-odd-characters.test +++ b/testing/tests/regression-suite/0996-PUT-odd-characters.test @@ -60,6 +60,7 @@ DURATION:P1D LOCATION:Chamisal Vineyards\\, Oregon X-VENUE:Chamisal Vineyards END:VEVENT +END:VCALENDAR ENDDATA QUERY From e641ed0876a5aea3c9bc31db6a73f328329c6892 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 14 Dec 2011 22:18:14 +1300 Subject: [PATCH 11/18] Catch missing-xml in request separately from invalid-xml. --- inc/CalDAVRequest.php | 3 +++ testing/tests/regression-suite/0949-MKTICKET.result | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/inc/CalDAVRequest.php b/inc/CalDAVRequest.php index b6463f38..46ef5799 100644 --- a/inc/CalDAVRequest.php +++ b/inc/CalDAVRequest.php @@ -515,6 +515,9 @@ EOSQL; * should reasonably expect to see either text/xml or application/xml */ if ( isset($this->content_type) && preg_match( '#(application|text)/xml#', $this->content_type ) ) { + if ( !isset($this->raw_post) || $this->raw_post == '' ) { + $this->XMLResponse( 400, new XMLElement( 'error', new XMLElement('missing-xml'), array( 'xmlns' => 'DAV:') ) ); + } $xml_parser = xml_parser_create_ns('UTF-8'); $this->xml_tags = array(); xml_parser_set_option ( $xml_parser, XML_OPTION_SKIP_WHITE, 1 ); diff --git a/testing/tests/regression-suite/0949-MKTICKET.result b/testing/tests/regression-suite/0949-MKTICKET.result index f15646ad..b23db8bc 100644 --- a/testing/tests/regression-suite/0949-MKTICKET.result +++ b/testing/tests/regression-suite/0949-MKTICKET.result @@ -2,13 +2,13 @@ HTTP/1.1 400 Bad Request Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "7bc3d8a76fb705dfff8a6654bb8d7fb8" -Content-Length: 155 +ETag: "4ec54351d43b4404acdf28263d694a2b" +Content-Length: 86 Content-Type: text/xml; charset="utf-8" - - + + dav_owner_id: >1002< From 71b90d367adea5c894407cb80b3c10e9befd9ea3 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 14 Dec 2011 22:18:24 +1300 Subject: [PATCH 12/18] Handle bound resources correctly in sync-collection report. --- inc/caldav-REPORT-sync-collection.php | 8 ++++++- .../1036-REPORT-sync-initial-bound.result | 22 +++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/inc/caldav-REPORT-sync-collection.php b/inc/caldav-REPORT-sync-collection.php index 349bd87c..34de6302 100644 --- a/inc/caldav-REPORT-sync-collection.php +++ b/inc/caldav-REPORT-sync-collection.php @@ -37,7 +37,10 @@ $collection = new DAVResource( $request->path ); if ( !$collection->Exists() ) { $request->DoResponse( 404 ); } - +$bound_from = $collection->bound_from(); +$collection_path = $collection->dav_name(); +$request_via_binding = ($bound_from != $collection_path); + $params = array( ':collection_id' => $collection->GetProperty('collection_id'), ':sync_token' => $sync_token ); $sql = "SELECT new_sync_token( :sync_token, :collection_id)"; $qry = new AwlQuery($sql, $params); @@ -101,6 +104,9 @@ EOSQL; $c->sync_resource_data_ok = false; } while( $object = $qry->Fetch() ) { + if ( $request_via_binding ) + $object->dav_name = str_replace( $bound_from, $collection_path, $object->dav_name); + if ( $object->dav_name == $last_dav_name ) { /** The complex case: this is the second or subsequent for this dav_id */ if ( $object->sync_status == 404 ) { diff --git a/testing/tests/binding/1036-REPORT-sync-initial-bound.result b/testing/tests/binding/1036-REPORT-sync-initial-bound.result index a34dd13d..b84bf95e 100644 --- a/testing/tests/binding/1036-REPORT-sync-initial-bound.result +++ b/testing/tests/binding/1036-REPORT-sync-initial-bound.result @@ -2,14 +2,14 @@ HTTP/1.1 207 Multi-Status Date: Dow, 01 Jan 2000 00:00:00 GMT DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule -ETag: "51330ec2c1868a584176caf2d8b0b195" -Content-Length: 2292 +ETag: "7aa94bdf662d6b03f844eaf18239d0a8" +Content-Length: 2301 Content-Type: text/xml; charset="utf-8" - /caldav.php/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics + /caldav.php/user4/user2/33169d69-2969-4a96-a3e1-2e312b7614e6.ics "f2c974ff51cb52cde0668544deb36380" @@ -18,7 +18,7 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user2/home/047871e3-6b70-4178-9af8-0ceb50f7b092.ics + /caldav.php/user4/user2/047871e3-6b70-4178-9af8-0ceb50f7b092.ics "58cba7e3fafb6080e85619ea77d08c7a" @@ -27,7 +27,7 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user2/home/9429a973-2b13-4b1a-be09-948d75425c45.ics + /caldav.php/user4/user2/9429a973-2b13-4b1a-be09-948d75425c45.ics "13249ced6c7527191a003f54f7e3cd25" @@ -36,7 +36,7 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user2/home/7d729xc0-0895-012d-124e-002421a2359e.ics + /caldav.php/user4/user2/7d729xc0-0895-012d-124e-002421a2359e.ics "848df16c32fc3ce319083ae84c2603a3" @@ -45,7 +45,7 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user2/home/bd262d20-1cdb-012d-1264-002421a2359e.ics + /caldav.php/user4/user2/bd262d20-1cdb-012d-1264-002421a2359e.ics "671d4ee904be6c16dd1be076619fe7c0" @@ -54,7 +54,7 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user2/home/56f0e0e0-f742-012d-680c-002421a2359e.ics + /caldav.php/user4/user2/56f0e0e0-f742-012d-680c-002421a2359e.ics "e18c0d539b6dcb56df2d266dd4305008" @@ -63,7 +63,7 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user2/home/thiswillworkfine.ics + /caldav.php/user4/user2/thiswillworkfine.ics "9a8d7696ee2e0a0f1f4170fe4f094a3a" @@ -72,7 +72,7 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user2/home/thiswillalsobegood.ics + /caldav.php/user4/user2/thiswillalsobegood.ics "1c7895f11787e71fd6dbe3260d72d4a0" @@ -81,7 +81,7 @@ Content-Type: text/xml; charset="utf-8" - /caldav.php/user2/home/70399cd7-50a4-4be4-a665-af593e19a7fd.ics + /caldav.php/user4/user2/70399cd7-50a4-4be4-a665-af593e19a7fd.ics "ea6b316ca24db20f5eb37d1abd60f8c1" From d226395258a9efc96332f521b9f47f12c8416d03 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 14 Dec 2011 22:19:16 +1300 Subject: [PATCH 13/18] Minor updates to tests. --- testing/tests/binding/Restore-Database.result | 2 +- testing/tests/carddav/Restore-Database.result | 2 +- .../0996-PUT-odd-characters.result | 3 +- .../0997-PUT-many-overrides.result | 478 +++++++++++++++++ .../0997-PUT-many-overrides.test | 489 ++++++++++++++++++ .../tests/scheduling/Restore-Database.result | 2 +- testing/tests/timezone/5010-list.result | 8 +- .../tests/timezone/5020-updatecheck.result | 4 +- .../tests/timezone/Restore-Database.result | 2 +- 9 files changed, 982 insertions(+), 8 deletions(-) create mode 100644 testing/tests/regression-suite/0997-PUT-many-overrides.result create mode 100644 testing/tests/regression-suite/0997-PUT-many-overrides.test diff --git a/testing/tests/binding/Restore-Database.result b/testing/tests/binding/Restore-Database.result index 2c6a0629..893a89f3 100644 --- a/testing/tests/binding/Restore-Database.result +++ b/testing/tests/binding/Restore-Database.result @@ -30,7 +30,7 @@ setval -------- - 13 + 14 (1 row) setval diff --git a/testing/tests/carddav/Restore-Database.result b/testing/tests/carddav/Restore-Database.result index 48aa1289..61bf628a 100644 --- a/testing/tests/carddav/Restore-Database.result +++ b/testing/tests/carddav/Restore-Database.result @@ -30,7 +30,7 @@ setval -------- - 13 + 14 (1 row) setval diff --git a/testing/tests/regression-suite/0996-PUT-odd-characters.result b/testing/tests/regression-suite/0996-PUT-odd-characters.result index b090666c..07a8ca0b 100644 --- a/testing/tests/regression-suite/0996-PUT-odd-characters.result +++ b/testing/tests/regression-suite/0996-PUT-odd-characters.result @@ -51,8 +51,9 @@ DURATION:P1D LOCATION:Chamisal Vineyards\\, Oregon X-VENUE:Chamisal Vineyards END:VEVENT +END:VCALENDAR < - dav_etag: >4d7d14bee6ce017c086e6f1de56f1641< + dav_etag: >82d83a8c540d8fa53d5ad843b6456558< dav_name: >/User Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics< description: >2nd Annual Lobsterfest Saturday, August 7 diff --git a/testing/tests/regression-suite/0997-PUT-many-overrides.result b/testing/tests/regression-suite/0997-PUT-many-overrides.result new file mode 100644 index 00000000..a69e1996 --- /dev/null +++ b/testing/tests/regression-suite/0997-PUT-many-overrides.result @@ -0,0 +1,478 @@ + + Event Data: >BEGIN:VCALENDAR +PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN +VERSION:2.0 +BEGIN:VTIMEZONE +TZID:Europe/Zagreb +X-LIC-LOCATION:Europe/Zagreb +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19701025T030000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +CREATED:20101126T133639Z +LAST-MODIFIED:20101126T133639Z +DTSTAMP:20101126T133640Z +UID:KOrganizer-1348288421.174 +SUMMARY:Kosarkaska utakmica +DTSTART;TZID=Europe/Zagreb:20101128T110000 +DTEND;TZID=Europe/Zagreb:20101128T130000 +LOCATION:Zagrebacki velesajam +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110402T095510Z +LAST-MODIFIED:20110402T095533Z +DTSTAMP:20110402T095533Z +UID:9fc3d340-fd02-4198-9b7f-bd9b339fdf01 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110329T193000 +DTEND;TZID=Europe/Zagreb:20110329T220000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110406T222101Z +LAST-MODIFIED:20110406T222129Z +DTSTAMP:20110406T222129Z +UID:b5185f5f-c60d-43e2-8727-d73b05f0b403 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110408T180000 +DTEND;TZID=Europe/Zagreb:20110408T210000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110405T141057Z +LAST-MODIFIED:20110410T105121Z +DTSTAMP:20110410T105121Z +UID:ad2e3d46-338c-4123-bfed-edf0d06a3f5d +SUMMARY:Vaterpolo PMF +DTSTART;TZID=Europe/Zagreb:20110411T120000 +DTEND;TZID=Europe/Zagreb:20110411T130000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110406T222101Z +LAST-MODIFIED:20110412T145952Z +DTSTAMP:20110412T145952Z +UID:97f37cf2-a89a-4eb9-aff7-024e21d4ac63 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110413T200000 +DTEND;TZID=Europe/Zagreb:20110413T230000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110417T133012Z +LAST-MODIFIED:20110417T133033Z +DTSTAMP:20110417T133033Z +UID:d98993b2-3fc1-4f40-a3b7-1744f2eff118 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110419T193000 +DTEND;TZID=Europe/Zagreb:20110419T223000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110509T075204Z +DTSTAMP:20110509T075204Z +UID:d9600248-ff59-45aa-a08b-d16d09f7443c +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110509T150000 +DTEND;TZID=Europe/Zagreb:20110509T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103420Z +LAST-MODIFIED:20110320T103436Z +DTSTAMP:20110320T103436Z +UID:bf913c7d-8e42-4d30-989b-3f86c3e7f130 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110322T200000 +DTEND;TZID=Europe/Zagreb:20110322T230000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110414T134428Z +LAST-MODIFIED:20110414T134446Z +DTSTAMP:20110414T134446Z +UID:6d870107-9251-4eb1-baff-9cc9c9d995a0 +SUMMARY:Vaterpolo +DTSTART;TZID=Europe/Zagreb:20110415T120000 +DTEND;TZID=Europe/Zagreb:20110415T130000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110320T103513Z +DTSTAMP:20110320T103513Z +UID:b79f6edf-3b11-439f-85af-7eca5d5e7d6e +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110321T150000 +DTEND;TZID=Europe/Zagreb:20110321T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110405T141057Z +LAST-MODIFIED:20110405T141143Z +DTSTAMP:20110405T141143Z +UID:3bc03dfc-c7e1-4500-ae67-a17c309025e8 +SUMMARY:Vaterpolo PMF +DTSTART;TZID=Europe/Zagreb:20110406T133000 +DTEND;TZID=Europe/Zagreb:20110406T143000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110430T093717Z +LAST-MODIFIED:20110430T093741Z +DTSTAMP:20110430T093741Z +UID:d0fe1e24-25c9-4f1a-a1a5-7e4c38b2a4bd +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110427T193000 +DTEND;TZID=Europe/Zagreb:20110427T223000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110430T093903Z +LAST-MODIFIED:20110503T141014Z +DTSTAMP:20110503T141014Z +UID:e8835dcb-9c58-446c-8020-1d14e299994b +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110506T190000 +DTEND;TZID=Europe/Zagreb:20110506T220000 +DESCRIPTION:protiv VIDRE\; dvorana u podsusedu +TRANSP:OPAQUE +SEQUENCE:2 +X-MOZ-GENERATION:2 +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110503T141104Z +DTSTAMP:20110503T141104Z +UID:631e6b38-c41c-49c6-8902-357650d1332c +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110502T150000 +DTEND;TZID=Europe/Zagreb:20110502T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110412T145824Z +DTSTAMP:20110412T145824Z +UID:2f32a2e1-f739-4c1a-920b-a605cc969e25 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110411T150000 +DTEND;TZID=Europe/Zagreb:20110411T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110414T134428Z +LAST-MODIFIED:20110416T203013Z +DTSTAMP:20110416T203013Z +UID:63d93f32-aa1d-4aaf-b0c6-f332689c395b +SUMMARY:Vaterpolo +DTSTART;TZID=Europe/Zagreb:20110415T140000 +DTEND;TZID=Europe/Zagreb:20110415T150000 +TRANSP:OPAQUE +SEQUENCE:1 +X-MOZ-GENERATION:1 +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110417T195943Z +DTSTAMP:20110417T195943Z +UID:96d9a904-21da-44cf-a818-ace2e24117f3 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110418T150000 +DTEND;TZID=Europe/Zagreb:20110418T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110513T180125Z +LAST-MODIFIED:20110513T180150Z +DTSTAMP:20110513T180150Z +UID:6541bbc5-5054-4482-9656-781fccb1c9c0 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110513T160000 +DTEND;TZID=Europe/Zagreb:20110513T170000 +DESCRIPTION:s filom u dvorani Precko +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110520T201034Z +LAST-MODIFIED:20110520T201057Z +DTSTAMP:20110520T201057Z +UID:585e23cf-ef43-459a-9ad7-f05ceadc369e +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110524T190000 +DTEND;TZID=Europe/Zagreb:20110524T220000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110311T213444Z +LAST-MODIFIED:20110311T213526Z +DTSTAMP:20110311T213526Z +UID:abe35ff2-22ca-4abc-84ed-75cd594f152a +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110311T190000 +DTEND;TZID=Europe/Zagreb:20110311T220000 +LOCATION:Rugvica +DESCRIPTION:igramo protiv STK Rugvice +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110314T195438Z +LAST-MODIFIED:20110314T195500Z +DTSTAMP:20110314T195500Z +UID:f1a6d3ca-6070-453f-ae7d-10e204569461 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110317T200000 +DTEND;TZID=Europe/Zagreb:20110317T210000 +DESCRIPTION:protiv Mladih purgera +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110328T181956Z +DTSTAMP:20110328T181956Z +UID:db31907b-1b8a-4f70-aa8e-e2c86ffc125a +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110328T150000 +DTEND;TZID=Europe/Zagreb:20110328T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110602T091841Z +LAST-MODIFIED:20110602T091933Z +DTSTAMP:20110602T091933Z +UID:158bce95-0f67-4cfc-9cc0-df42603a7497 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110606T193000 +DTEND;TZID=Europe/Zagreb:20110606T230000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110603T144349Z +LAST-MODIFIED:20110603T144405Z +DTSTAMP:20110603T144405Z +UID:e0b1fbe6-885e-447b-8811-0d0dafc7cc9a +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110603T100000 +DTEND;TZID=Europe/Zagreb:20110603T130000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110605T191628Z +LAST-MODIFIED:20110605T191643Z +DTSTAMP:20110605T191643Z +UID:d59ca055-4396-442c-af99-5c45cfd8e75d +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110604T180000 +DTEND;TZID=Europe/Zagreb:20110604T210000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110607T222032Z +LAST-MODIFIED:20110607T222045Z +DTSTAMP:20110607T222045Z +UID:6ec29b6e-c8f3-40b3-87d3-d7ebe742a8cc +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110606T150000 +DTEND;TZID=Europe/Zagreb:20110606T160000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111007T155910Z +LAST-MODIFIED:20111007T155930Z +DTSTAMP:20111007T155930Z +UID:807b2e3b-6bc1-4fd4-8002-6a4a3d6ab210 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111010T200000 +DTEND;TZID=Europe/Zagreb:20111010T230000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111009T102456Z +LAST-MODIFIED:20111009T102524Z +DTSTAMP:20111009T102524Z +UID:17848910-224e-4b2e-82a1-880e7579fc09 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20111009T190000 +DTEND;TZID=Europe/Zagreb:20111009T210000 +LOCATION:faks +DESCRIPTION:trening s najmanom na faksu +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111010T141132Z +LAST-MODIFIED:20111010T141158Z +DTSTAMP:20111010T141158Z +UID:1dc66abb-d265-4115-bed1-8647076b6a6e +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111014T203000 +DTEND;TZID=Europe/Zagreb:20111014T230000 +DESCRIPTION:Odra Vex dizajn +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111014T073351Z +LAST-MODIFIED:20111014T073406Z +DTSTAMP:20111014T073406Z +UID:40881d4c-03b1-4bd6-9486-47c88e42d4a9 +SUMMARY:Girje +DTSTART;TZID=Europe/Zagreb:20111011T190000 +DTEND;TZID=Europe/Zagreb:20111011T200000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111015T174624Z +LAST-MODIFIED:20111015T174705Z +DTSTAMP:20111015T174705Z +UID:9d8b6e90-6ba9-4bec-8000-e1f9609b84a7 +SUMMARY:Stolni +DTSTART;TZID=Europe/Zagreb:20111015T170000 +DTEND;TZID=Europe/Zagreb:20111015T190000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111016T111311Z +LAST-MODIFIED:20111016T111339Z +DTSTAMP:20111016T111339Z +UID:8f2601db-6537-40aa-91b5-3bff62c6aaeb +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111018T193000 +DTEND;TZID=Europe/Zagreb:20111018T220000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111022T125946Z +LAST-MODIFIED:20111022T130003Z +DTSTAMP:20111022T130003Z +UID:c606f5b2-4519-4b4c-9010-96ca6d301e70 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20111022T100000 +DTEND;TZID=Europe/Zagreb:20111022T120000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111022T125946Z +LAST-MODIFIED:20111022T130030Z +DTSTAMP:20111022T130030Z +UID:178d87de-d399-422f-955c-3d8867a7f384 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20111023T100000 +DTEND;TZID=Europe/Zagreb:20111023T120000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111007T155910Z +LAST-MODIFIED:20111026T212929Z +DTSTAMP:20111026T212929Z +UID:104e403e-9639-4316-813f-e843520901a5 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111028T203000 +DTEND;TZID=Europe/Zagreb:20111028T233000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111111T094915Z +LAST-MODIFIED:20111111T094932Z +DTSTAMP:20111111T094932Z +UID:64804e8e-fef5-46e3-b2a2-b494d9120dc1 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111111T190000 +DTEND;TZID=Europe/Zagreb:20111111T213000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111113T175921Z +LAST-MODIFIED:20111113T175937Z +DTSTAMP:20111113T175937Z +UID:72181664-03b7-4789-90a0-8bbec9300b5c +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111116T193000 +DTEND;TZID=Europe/Zagreb:20111116T220000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111126T133916Z +LAST-MODIFIED:20111126T133937Z +DTSTAMP:20111126T133937Z +UID:f3f56428-d648-4d8a-9174-57927d74e346 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111124T193000 +DTEND;TZID=Europe/Zagreb:20111124T223000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111126T133916Z +LAST-MODIFIED:20111126T134122Z +DTSTAMP:20111126T134122Z +UID:548df49b-2451-4224-bd7b-5780dd93a19e +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111201T193000 +DTEND;TZID=Europe/Zagreb:20111201T223000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111014T073351Z +LAST-MODIFIED:20111127T154401Z +DTSTAMP:20111127T154401Z +UID:154529bd-dcd2-43ad-900e-050a4d22f3a1 +SUMMARY:Girje +RRULE:FREQ=WEEKLY;UNTIL=20111220T180000Z;BYDAY=MO,TH +DTSTART;TZID=Europe/Zagreb:20111013T190000 +DTEND;TZID=Europe/Zagreb:20111013T200000 +TRANSP:OPAQUE +SEQUENCE:1 +X-MOZ-GENERATION:3 +END:VEVENT +BEGIN:VEVENT +CREATED:20111126T134122Z +LAST-MODIFIED:20111126T134129Z +DTSTAMP:20111126T134129Z +UID:154529bd-dcd2-43ad-900e-050a4d22f3a1 +SUMMARY:Girje +RECURRENCE-ID;TZID=Europe/Zagreb:20111201T190000 +DTSTART;TZID=Europe/Zagreb:20111130T190000 +DTEND;TZID=Europe/Zagreb:20111130T200000 +SEQUENCE:2 +TRANSP:OPAQUE +X-MOZ-GENERATION:2 +END:VEVENT +BEGIN:VEVENT +CREATED:20111127T154352Z +LAST-MODIFIED:20111127T154401Z +DTSTAMP:20111127T154401Z +UID:154529bd-dcd2-43ad-900e-050a4d22f3a1 +SUMMARY:Girje +RECURRENCE-ID;TZID=Europe/Zagreb:20111205T190000 +DTSTART;TZID=Europe/Zagreb:20111206T190000 +DTEND;TZID=Europe/Zagreb:20111206T200000 +SEQUENCE:2 +TRANSP:OPAQUE +X-MOZ-GENERATION:3 +END:VEVENT +END:VCALENDAR +< + dav_etag: >76e05bffe4f06d622b02cc0095b5eb25< + dav_name: >/User Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics< + description: >NULL< + dtstart: >2010-11-28 23:00:00+13< + summary: >Kosarkaska utakmica< + diff --git a/testing/tests/regression-suite/0997-PUT-many-overrides.test b/testing/tests/regression-suite/0997-PUT-many-overrides.test new file mode 100644 index 00000000..810b1419 --- /dev/null +++ b/testing/tests/regression-suite/0997-PUT-many-overrides.test @@ -0,0 +1,489 @@ +# +# Attempt to put an event containing many overrides +# +TYPE=PUT +URL=http://regression.host/caldav.php/User%20Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics + +HEADER=Content-Type: text/calendar; charset=utf-8 +AUTH=User Six:user6 + +BEGINDATA +BEGIN:VCALENDAR +PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN +VERSION:2.0 +BEGIN:VTIMEZONE +TZID:Europe/Zagreb +X-LIC-LOCATION:Europe/Zagreb +BEGIN:DAYLIGHT +TZOFFSETFROM:+0100 +TZOFFSETTO:+0200 +TZNAME:CEST +DTSTART:19700329T020000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETFROM:+0200 +TZOFFSETTO:+0100 +TZNAME:CET +DTSTART:19701025T030000 +RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10 +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +CREATED:20101126T133639Z +LAST-MODIFIED:20101126T133639Z +DTSTAMP:20101126T133640Z +UID:KOrganizer-1348288421.174 +SUMMARY:Kosarkaska utakmica +DTSTART;TZID=Europe/Zagreb:20101128T110000 +DTEND;TZID=Europe/Zagreb:20101128T130000 +LOCATION:Zagrebacki velesajam +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110402T095510Z +LAST-MODIFIED:20110402T095533Z +DTSTAMP:20110402T095533Z +UID:9fc3d340-fd02-4198-9b7f-bd9b339fdf01 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110329T193000 +DTEND;TZID=Europe/Zagreb:20110329T220000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110406T222101Z +LAST-MODIFIED:20110406T222129Z +DTSTAMP:20110406T222129Z +UID:b5185f5f-c60d-43e2-8727-d73b05f0b403 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110408T180000 +DTEND;TZID=Europe/Zagreb:20110408T210000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110405T141057Z +LAST-MODIFIED:20110410T105121Z +DTSTAMP:20110410T105121Z +UID:ad2e3d46-338c-4123-bfed-edf0d06a3f5d +SUMMARY:Vaterpolo PMF +DTSTART;TZID=Europe/Zagreb:20110411T120000 +DTEND;TZID=Europe/Zagreb:20110411T130000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110406T222101Z +LAST-MODIFIED:20110412T145952Z +DTSTAMP:20110412T145952Z +UID:97f37cf2-a89a-4eb9-aff7-024e21d4ac63 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110413T200000 +DTEND;TZID=Europe/Zagreb:20110413T230000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110417T133012Z +LAST-MODIFIED:20110417T133033Z +DTSTAMP:20110417T133033Z +UID:d98993b2-3fc1-4f40-a3b7-1744f2eff118 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110419T193000 +DTEND;TZID=Europe/Zagreb:20110419T223000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110509T075204Z +DTSTAMP:20110509T075204Z +UID:d9600248-ff59-45aa-a08b-d16d09f7443c +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110509T150000 +DTEND;TZID=Europe/Zagreb:20110509T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103420Z +LAST-MODIFIED:20110320T103436Z +DTSTAMP:20110320T103436Z +UID:bf913c7d-8e42-4d30-989b-3f86c3e7f130 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110322T200000 +DTEND;TZID=Europe/Zagreb:20110322T230000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110414T134428Z +LAST-MODIFIED:20110414T134446Z +DTSTAMP:20110414T134446Z +UID:6d870107-9251-4eb1-baff-9cc9c9d995a0 +SUMMARY:Vaterpolo +DTSTART;TZID=Europe/Zagreb:20110415T120000 +DTEND;TZID=Europe/Zagreb:20110415T130000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110320T103513Z +DTSTAMP:20110320T103513Z +UID:b79f6edf-3b11-439f-85af-7eca5d5e7d6e +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110321T150000 +DTEND;TZID=Europe/Zagreb:20110321T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110405T141057Z +LAST-MODIFIED:20110405T141143Z +DTSTAMP:20110405T141143Z +UID:3bc03dfc-c7e1-4500-ae67-a17c309025e8 +SUMMARY:Vaterpolo PMF +DTSTART;TZID=Europe/Zagreb:20110406T133000 +DTEND;TZID=Europe/Zagreb:20110406T143000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110430T093717Z +LAST-MODIFIED:20110430T093741Z +DTSTAMP:20110430T093741Z +UID:d0fe1e24-25c9-4f1a-a1a5-7e4c38b2a4bd +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110427T193000 +DTEND;TZID=Europe/Zagreb:20110427T223000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110430T093903Z +LAST-MODIFIED:20110503T141014Z +DTSTAMP:20110503T141014Z +UID:e8835dcb-9c58-446c-8020-1d14e299994b +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110506T190000 +DTEND;TZID=Europe/Zagreb:20110506T220000 +DESCRIPTION:protiv VIDRE\; dvorana u podsusedu +TRANSP:OPAQUE +SEQUENCE:2 +X-MOZ-GENERATION:2 +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110503T141104Z +DTSTAMP:20110503T141104Z +UID:631e6b38-c41c-49c6-8902-357650d1332c +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110502T150000 +DTEND;TZID=Europe/Zagreb:20110502T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110412T145824Z +DTSTAMP:20110412T145824Z +UID:2f32a2e1-f739-4c1a-920b-a605cc969e25 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110411T150000 +DTEND;TZID=Europe/Zagreb:20110411T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110414T134428Z +LAST-MODIFIED:20110416T203013Z +DTSTAMP:20110416T203013Z +UID:63d93f32-aa1d-4aaf-b0c6-f332689c395b +SUMMARY:Vaterpolo +DTSTART;TZID=Europe/Zagreb:20110415T140000 +DTEND;TZID=Europe/Zagreb:20110415T150000 +TRANSP:OPAQUE +SEQUENCE:1 +X-MOZ-GENERATION:1 +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110417T195943Z +DTSTAMP:20110417T195943Z +UID:96d9a904-21da-44cf-a818-ace2e24117f3 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110418T150000 +DTEND;TZID=Europe/Zagreb:20110418T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110513T180125Z +LAST-MODIFIED:20110513T180150Z +DTSTAMP:20110513T180150Z +UID:6541bbc5-5054-4482-9656-781fccb1c9c0 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110513T160000 +DTEND;TZID=Europe/Zagreb:20110513T170000 +DESCRIPTION:s filom u dvorani Precko +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110520T201034Z +LAST-MODIFIED:20110520T201057Z +DTSTAMP:20110520T201057Z +UID:585e23cf-ef43-459a-9ad7-f05ceadc369e +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110524T190000 +DTEND;TZID=Europe/Zagreb:20110524T220000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110311T213444Z +LAST-MODIFIED:20110311T213526Z +DTSTAMP:20110311T213526Z +UID:abe35ff2-22ca-4abc-84ed-75cd594f152a +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110311T190000 +DTEND;TZID=Europe/Zagreb:20110311T220000 +LOCATION:Rugvica +DESCRIPTION:igramo protiv STK Rugvice +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110314T195438Z +LAST-MODIFIED:20110314T195500Z +DTSTAMP:20110314T195500Z +UID:f1a6d3ca-6070-453f-ae7d-10e204569461 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110317T200000 +DTEND;TZID=Europe/Zagreb:20110317T210000 +DESCRIPTION:protiv Mladih purgera +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110320T103444Z +LAST-MODIFIED:20110328T181956Z +DTSTAMP:20110328T181956Z +UID:db31907b-1b8a-4f70-aa8e-e2c86ffc125a +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110328T150000 +DTEND;TZID=Europe/Zagreb:20110328T160000 +LOCATION:PBF +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110602T091841Z +LAST-MODIFIED:20110602T091933Z +DTSTAMP:20110602T091933Z +UID:158bce95-0f67-4cfc-9cc0-df42603a7497 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20110606T193000 +DTEND;TZID=Europe/Zagreb:20110606T230000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110603T144349Z +LAST-MODIFIED:20110603T144405Z +DTSTAMP:20110603T144405Z +UID:e0b1fbe6-885e-447b-8811-0d0dafc7cc9a +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110603T100000 +DTEND;TZID=Europe/Zagreb:20110603T130000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110605T191628Z +LAST-MODIFIED:20110605T191643Z +DTSTAMP:20110605T191643Z +UID:d59ca055-4396-442c-af99-5c45cfd8e75d +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110604T180000 +DTEND;TZID=Europe/Zagreb:20110604T210000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20110607T222032Z +LAST-MODIFIED:20110607T222045Z +DTSTAMP:20110607T222045Z +UID:6ec29b6e-c8f3-40b3-87d3-d7ebe742a8cc +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20110606T150000 +DTEND;TZID=Europe/Zagreb:20110606T160000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111007T155910Z +LAST-MODIFIED:20111007T155930Z +DTSTAMP:20111007T155930Z +UID:807b2e3b-6bc1-4fd4-8002-6a4a3d6ab210 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111010T200000 +DTEND;TZID=Europe/Zagreb:20111010T230000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111009T102456Z +LAST-MODIFIED:20111009T102524Z +DTSTAMP:20111009T102524Z +UID:17848910-224e-4b2e-82a1-880e7579fc09 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20111009T190000 +DTEND;TZID=Europe/Zagreb:20111009T210000 +LOCATION:faks +DESCRIPTION:trening s najmanom na faksu +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111010T141132Z +LAST-MODIFIED:20111010T141158Z +DTSTAMP:20111010T141158Z +UID:1dc66abb-d265-4115-bed1-8647076b6a6e +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111014T203000 +DTEND;TZID=Europe/Zagreb:20111014T230000 +DESCRIPTION:Odra Vex dizajn +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111014T073351Z +LAST-MODIFIED:20111014T073406Z +DTSTAMP:20111014T073406Z +UID:40881d4c-03b1-4bd6-9486-47c88e42d4a9 +SUMMARY:Girje +DTSTART;TZID=Europe/Zagreb:20111011T190000 +DTEND;TZID=Europe/Zagreb:20111011T200000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111015T174624Z +LAST-MODIFIED:20111015T174705Z +DTSTAMP:20111015T174705Z +UID:9d8b6e90-6ba9-4bec-8000-e1f9609b84a7 +SUMMARY:Stolni +DTSTART;TZID=Europe/Zagreb:20111015T170000 +DTEND;TZID=Europe/Zagreb:20111015T190000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111016T111311Z +LAST-MODIFIED:20111016T111339Z +DTSTAMP:20111016T111339Z +UID:8f2601db-6537-40aa-91b5-3bff62c6aaeb +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111018T193000 +DTEND;TZID=Europe/Zagreb:20111018T220000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111022T125946Z +LAST-MODIFIED:20111022T130003Z +DTSTAMP:20111022T130003Z +UID:c606f5b2-4519-4b4c-9010-96ca6d301e70 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20111022T100000 +DTEND;TZID=Europe/Zagreb:20111022T120000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111022T125946Z +LAST-MODIFIED:20111022T130030Z +DTSTAMP:20111022T130030Z +UID:178d87de-d399-422f-955c-3d8867a7f384 +SUMMARY:Stolni tenis +DTSTART;TZID=Europe/Zagreb:20111023T100000 +DTEND;TZID=Europe/Zagreb:20111023T120000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111007T155910Z +LAST-MODIFIED:20111026T212929Z +DTSTAMP:20111026T212929Z +UID:104e403e-9639-4316-813f-e843520901a5 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111028T203000 +DTEND;TZID=Europe/Zagreb:20111028T233000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111111T094915Z +LAST-MODIFIED:20111111T094932Z +DTSTAMP:20111111T094932Z +UID:64804e8e-fef5-46e3-b2a2-b494d9120dc1 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111111T190000 +DTEND;TZID=Europe/Zagreb:20111111T213000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111113T175921Z +LAST-MODIFIED:20111113T175937Z +DTSTAMP:20111113T175937Z +UID:72181664-03b7-4789-90a0-8bbec9300b5c +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111116T193000 +DTEND;TZID=Europe/Zagreb:20111116T220000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111126T133916Z +LAST-MODIFIED:20111126T133937Z +DTSTAMP:20111126T133937Z +UID:f3f56428-d648-4d8a-9174-57927d74e346 +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111124T193000 +DTEND;TZID=Europe/Zagreb:20111124T223000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111126T133916Z +LAST-MODIFIED:20111126T134122Z +DTSTAMP:20111126T134122Z +UID:548df49b-2451-4224-bd7b-5780dd93a19e +SUMMARY:SOKAZ +DTSTART;TZID=Europe/Zagreb:20111201T193000 +DTEND;TZID=Europe/Zagreb:20111201T223000 +TRANSP:OPAQUE +END:VEVENT +BEGIN:VEVENT +CREATED:20111014T073351Z +LAST-MODIFIED:20111127T154401Z +DTSTAMP:20111127T154401Z +UID:154529bd-dcd2-43ad-900e-050a4d22f3a1 +SUMMARY:Girje +RRULE:FREQ=WEEKLY;UNTIL=20111220T180000Z;BYDAY=MO,TH +DTSTART;TZID=Europe/Zagreb:20111013T190000 +DTEND;TZID=Europe/Zagreb:20111013T200000 +TRANSP:OPAQUE +SEQUENCE:1 +X-MOZ-GENERATION:3 +END:VEVENT +BEGIN:VEVENT +CREATED:20111126T134122Z +LAST-MODIFIED:20111126T134129Z +DTSTAMP:20111126T134129Z +UID:154529bd-dcd2-43ad-900e-050a4d22f3a1 +SUMMARY:Girje +RECURRENCE-ID;TZID=Europe/Zagreb:20111201T190000 +DTSTART;TZID=Europe/Zagreb:20111130T190000 +DTEND;TZID=Europe/Zagreb:20111130T200000 +SEQUENCE:2 +TRANSP:OPAQUE +X-MOZ-GENERATION:2 +END:VEVENT +BEGIN:VEVENT +CREATED:20111127T154352Z +LAST-MODIFIED:20111127T154401Z +DTSTAMP:20111127T154401Z +UID:154529bd-dcd2-43ad-900e-050a4d22f3a1 +SUMMARY:Girje +RECURRENCE-ID;TZID=Europe/Zagreb:20111205T190000 +DTSTART;TZID=Europe/Zagreb:20111206T190000 +DTEND;TZID=Europe/Zagreb:20111206T200000 +SEQUENCE:2 +TRANSP:OPAQUE +X-MOZ-GENERATION:3 +END:VEVENT +END:VCALENDAR +ENDDATA + +QUERY +SELECT caldav_data.caldav_data AS "Event Data", caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary, description + FROM caldav_data JOIN calendar_item USING(dav_name) + WHERE caldav_data.dav_name ~ 'c0f7c860-1345-012d-125f-002421a2359e.ics' +ENDQUERY + + diff --git a/testing/tests/scheduling/Restore-Database.result b/testing/tests/scheduling/Restore-Database.result index 08356c1e..e8e8775f 100644 --- a/testing/tests/scheduling/Restore-Database.result +++ b/testing/tests/scheduling/Restore-Database.result @@ -30,7 +30,7 @@ setval -------- - 13 + 14 (1 row) setval diff --git a/testing/tests/timezone/5010-list.result b/testing/tests/timezone/5010-list.result index a2df3fe0..2375a6d0 100644 --- a/testing/tests/timezone/5010-list.result +++ b/testing/tests/timezone/5010-list.result @@ -1,6 +1,6 @@ HTTP/1.1 200 OK Date: Dow, 01 Jan 2000 00:00:00 GMT -Content-Length: 3064 +Content-Length: 3238 Content-Type: application/xml; charset="utf-8" @@ -30,6 +30,12 @@ Content-Type: application/xml; charset="utf-8" Europe/Prague + + Europe/Zagreb + all good + + Europe/Zagreb + /mozilla.org/20050126_1/Antarctica/McMurdo all good diff --git a/testing/tests/timezone/5020-updatecheck.result b/testing/tests/timezone/5020-updatecheck.result index 4eafa2ca..1b7a4a13 100644 --- a/testing/tests/timezone/5020-updatecheck.result +++ b/testing/tests/timezone/5020-updatecheck.result @@ -46,7 +46,7 @@ Writing new zone for 'Europe/Rome' Writing new zone for 'Europe/Vilnius' Writing new zone for 'Europe/Skopje' Writing new zone for 'Europe/Vaduz' -Writing new zone for 'Europe/Zagreb' +Writing updated zone for 'Europe/Zagreb' Writing new zone for 'Europe/Paris' Writing new zone for 'Europe/Luxembourg' Writing new zone for 'Europe/Kaliningrad' @@ -365,4 +365,4 @@ Writing new zone for 'Asia/Amman' Writing new zone for 'Asia/Jakarta' Writing new zone for 'Asia/Baghdad' Writing new zone for 'Asia/Rangoon' -Added 362 new zones, updated data for 5 zones and added 0 new aliases +Added 361 new zones, updated data for 6 zones and added 0 new aliases diff --git a/testing/tests/timezone/Restore-Database.result b/testing/tests/timezone/Restore-Database.result index a13d63ab..92a25f9f 100644 --- a/testing/tests/timezone/Restore-Database.result +++ b/testing/tests/timezone/Restore-Database.result @@ -30,7 +30,7 @@ setval -------- - 13 + 14 (1 row) setval From ea465c52858dba53d2180bdd59a119749bebd5da Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 4 Jan 2012 16:19:29 +1300 Subject: [PATCH 14/18] Website tweaks. --- docs/website/index.php | 4 ++-- docs/website/style.css | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/website/index.php b/docs/website/index.php index eeb12c5a..64bd7e86 100644 --- a/docs/website/index.php +++ b/docs/website/index.php @@ -65,10 +65,10 @@ sending patches for things here and there. Some more notable contributors inclu

Contributing to DAViCal

-

We welcome contributions from interested people. You don't need to be able to write code - there are lots of +

DAViCal LogoWe welcome contributions from interested people. You don't need to be able to write code - there are lots of small tasks around the project that can be done. CalDAV server:

-Here are some things you could do that will help us to concentrate on making DAViCal a better:
    +

    Here are some things you could do that will help us to concentrate on making DAViCal better:

    • writing documentation
    • helping people on IRC, on the mailing list or sf.net forums
    • translating the DAViCal interface to another language
      • diff --git a/docs/website/style.css b/docs/website/style.css index a8b6d26c..5e059868 100644 --- a/docs/website/style.css +++ b/docs/website/style.css @@ -202,6 +202,11 @@ pre { vertical-align: text-top; } +.gone { + width: 0.01em; + height: 0.01em; +} + .prompt { font-weight: 700; width: 4em; From 70f6587a189b250d2dbf1c9db71f32fcbcae53eb Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Wed, 4 Jan 2012 16:48:45 +1300 Subject: [PATCH 15/18] Release 1.0.0 --- ChangeLog | 90 ++++++ VERSION | 2 +- debian/changelog | 6 + debian/control | 4 +- docs/api/awl/caldav/CalDAVClient.html | 2 +- docs/api/awl/caldav/CalendarInfo.html | 2 +- docs/api/awl/caldav/RRule.html | 2 +- docs/api/awl/caldav/RepeatRule.html | 2 +- docs/api/awl/caldav/RepeatRuleDateRange.html | 2 +- docs/api/awl/caldav/RepeatRuleDateTime.html | 2 +- docs/api/awl/caldav/RepeatRuleTimeZone.html | 2 +- docs/api/awl/caldav/Rfc5545Duration.html | 2 +- docs/api/awl/caldav/_inc---RRule-v2.php.html | 2 +- docs/api/awl/caldav/_inc---RRule.php.html | 2 +- .../caldav/_inc---caldav-client-v2.php.html | 2 +- .../awl/caldav/_inc---caldav-client.php.html | 2 +- docs/api/awl/caldav/iCalDate.html | 2 +- docs/api/classtrees_awl.html | 2 +- docs/api/classtrees_davical.html | 2 +- docs/api/davical/AtomEntry.html | 2 +- docs/api/davical/AtomFeed.html | 2 +- docs/api/davical/AtomXHTMLContent.html | 2 +- docs/api/davical/CheckResult.html | 14 +- docs/api/davical/DAVTicket/DAVTicket.html | 2 +- .../DAVTicket/_inc---DAVTicket.php.html | 2 +- .../DAViCalSession/DAViCalSession.html | 2 +- docs/api/davical/DAViCalSession/Tools.html | 2 +- .../DAViCalSession/_htdocs---tools.php.html | 2 +- .../_inc---DAViCalSession.php.html | 2 +- .../HTTPAuthSession/HTTPAuthSession.html | 14 +- .../_inc---HTTPAuthSession.php.html | 2 +- docs/api/davical/Principal/DAVPrincipal.html | 44 +-- docs/api/davical/Principal/Principal.html | 42 +-- .../Principal/_inc---DAVPrincipal.php.html | 40 ++- .../Principal/_inc---Principal.php.html | 2 +- .../davical/PublicSession/PublicSession.html | 2 +- .../_inc---PublicSession.php.html | 2 +- docs/api/davical/RRuleTest.html | 2 +- docs/api/davical/Request/CalDAVRequest.html | 58 ++-- .../Request/_inc---CalDAVRequest.php.html | 2 +- docs/api/davical/Resource/DAVResource.html | 299 ++++++++++------- .../davical/Resource/WritableCollection.html | 122 ++++++- .../Resource/_inc---DAVResource.php.html | 25 +- docs/api/davical/SqlToArray.html | 2 +- docs/api/davical/VCard.html | 2 +- .../api/davical/_htdocs---SqlToArray.php.html | 2 +- docs/api/davical/_htdocs---admin.php.html | 2 +- docs/api/davical/_htdocs---always.php.html | 44 +-- docs/api/davical/_htdocs---createdb.php.html | 2 +- docs/api/davical/_htdocs---dbexec.php.html | 2 +- docs/api/davical/_htdocs---feed.php.html | 2 +- docs/api/davical/_htdocs---freebusy.php.html | 2 +- docs/api/davical/_htdocs---help.php.html | 2 +- docs/api/davical/_htdocs---index.php.html | 2 +- docs/api/davical/_htdocs---newfile.php.html | 2 +- docs/api/davical/_htdocs---setup.php.html | 98 +++--- docs/api/davical/_htdocs---test.php.html | 2 +- docs/api/davical/_htdocs---upgrade.php.html | 2 +- docs/api/davical/_inc---AtomFeed.php.html | 2 +- .../_inc---WritableCollection.php.html | 4 +- .../_inc---autodiscover-handler.php.html | 2 +- docs/api/davical/_inc---caldav-LOCK.php.html | 4 +- .../_inc---caldav-REPORT-calquery.php.html | 12 +- .../_inc---caldav-REPORT-cardquery.php.html | 10 +- ...c---caldav-REPORT-expand-property.php.html | 6 +- .../_inc---caldav-REPORT-freebusy.php.html | 4 +- .../_inc---caldav-REPORT-multiget.php.html | 2 +- ...c---caldav-REPORT-principal-match.php.html | 2 +- .../_inc---caldav-REPORT-principal.php.html | 2 +- docs/api/davical/_inc---check_UTF8.php.html | 2 +- ...c---davical_configuration_missing.php.html | 2 +- .../_inc---freebusy-functions.php.html | 2 +- .../davical/_inc---interactive-page.php.html | 2 +- .../_inc---other_translated_strings.php.html | 2 +- docs/api/davical/_inc---page-footer.php.html | 2 +- docs/api/davical/_inc---page-header.php.html | 2 +- docs/api/davical/_inc---pubsub.php.html | 2 +- .../api/davical/_inc---test-RRULE-v2.php.html | 2 +- docs/api/davical/_inc---test-RRULE.php.html | 2 +- .../_inc---ui---collection-edit.php.html | 6 +- .../_inc---ui---external-browse.php.html | 2 +- .../_inc---ui---principal-browse.php.html | 2 +- .../_inc---ui---principal-edit.php.html | 2 +- docs/api/davical/_inc---vcard.php.html | 2 +- docs/api/davical/_inc---well-known.php.html | 2 +- .../_inc---auth-functions.php.html | 2 +- .../davical/caldav/_htdocs---caldav.php.html | 2 +- .../davical/caldav/_htdocs---public.php.html | 2 +- .../davical/caldav/_inc---caldav-ACL.php.html | 2 +- .../caldav/_inc---caldav-BIND.php.html | 4 +- .../caldav/_inc---caldav-DELETE.php.html | 21 +- .../caldav/_inc---caldav-DELTICKET.php.html | 4 +- .../davical/caldav/_inc---caldav-GET.php.html | 8 +- .../caldav/_inc---caldav-MKCOL.php.html | 8 +- .../caldav/_inc---caldav-MKTICKET.php.html | 6 +- .../caldav/_inc---caldav-MOVE.php.html | 6 +- .../caldav/_inc---caldav-OPTIONS.php.html | 4 +- .../caldav/_inc---caldav-POST.php.html | 12 +- .../caldav/_inc---caldav-PROPPATCH.php.html | 6 +- .../caldav/_inc---caldav-PUT-default.php.html | 4 +- .../_inc---caldav-PUT-functions.php.html | 44 +-- .../_inc---caldav-PUT-vcalendar.php.html | 6 +- .../caldav/_inc---caldav-PUT-vcard.php.html | 6 +- .../_inc---caldav-REPORT-pps-set.php.html | 4 +- ...c---caldav-REPORT-sync-collection.php.html | 4 +- .../caldav/_inc---caldav-REPORT.php.html | 246 +++++++------- .../caldav/_inc---schedule-functions.php.html | 303 ++++++++++++++++++ .../_inc---external-fetch.php.html | 2 +- .../iSchedule/_inc---iSchedule.php.html | 2 +- docs/api/davical/iSchedule/iSchedule.html | 2 +- .../ldap/_inc---drivers_imap_pam.php.html | 2 +- .../davical/ldap/_inc---drivers_ldap.php.html | 4 +- .../ldap/_inc---drivers_rimap.php.html | 2 +- .../ldap/_inc---drivers_squid_pam.php.html | 2 +- docs/api/davical/ldap/imapPamDrivers.html | 2 +- docs/api/davical/ldap/ldapDrivers.html | 2 +- docs/api/davical/ldap/squidPamDrivers.html | 2 +- .../logging/_inc---log_caldav_action.php.html | 2 +- .../propfind/_inc---caldav-PROPFIND.php.html | 14 +- .../pwauth/_inc---drivers_pwauth_pam.php.html | 2 +- docs/api/davical/pwauth/pwauthPamDrivers.html | 2 +- .../davical/tzservice/_htdocs---tz.php.html | 2 +- .../_inc---tz---capabilities.php.html | 2 +- .../tzservice/_inc---tz---expand.php.html | 2 +- .../tzservice/_inc---tz---get.php.html | 2 +- .../tzservice/_inc---tz---list.php.html | 2 +- docs/api/elementindex.html | 289 +++++++++++------ docs/api/elementindex_davical.html | 113 ++++++- docs/api/errors.html | 64 ++-- docs/api/index.html | 2 +- docs/api/li_davical.html | 9 +- docs/api/todolist.html | 2 +- htdocs/always.php | 4 +- 133 files changed, 1573 insertions(+), 740 deletions(-) create mode 100644 docs/api/davical/caldav/_inc---schedule-functions.php.html diff --git a/ChangeLog b/ChangeLog index 91539912..d9e00b49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,93 @@ +2012-01-04 Andrew McMillan + * Release 1.0 + +2011-12-14 Andrew McMillan + * Handle bound resources correctly in sync-collection report. + * Catch missing-xml in request separately from invalid-xml. + +2011-12-07 Andrew McMillan + * Add the "CardDAV" word into DAViCal's description. + * Improve expand performance by only doing expansion if we know we need it. + +2011-12-03 Andrew McMillan + * Use supplied content_type even on zero-length requests. + +2011-12-03 Rob Ostensen + * When creating an external bind don't consider local host as external + +2011-11-30 Andrew McMillan + * Strip URL-unfriendly characters from UID before using it as URL segment. + +2011-11-29 Andrew McMillan + * Slightly more helpful 403 response. + +2011-11-27 Andrew McMillan + * Fix logic error in hide_TODO setting. + * Make hide_alarm work on bound resources. + +2011-11-26 Andrew McMillan + * Correct bug in sync-collection report response. + * Fix BIT24 casting for the LDAP driver. + +2011-11-25 Andrew McMillan + * Remove password from LDAP log messages. + +2011-11-22 Andrew McMillan + * Fix for MOVE into a bound location. + +2011-11-21 Andrew McMillan + * Tooltips for schedule-deliver and schedule-send. + * Current localisations from Transifex. + * The tooltips for schedule-send and schedule-deliver should be different! + * Correctly calculate the next alarm time. + * Update e-mail address to current one, mention wiki. + +2011-11-09 Andrew McMillan + * Make sync-collection handle new format for sync token. + * Don't allow a / in the UID to infect the path on import. + +2011-11-09 Rob Ostensen + * Fix propfind depth:1 on bind to external url + +2011-11-02 Andrew McMillan + * Handle DELETE scheduling actions. + * Force output buffers to be flushed, if they're turned on. + * Correct handling of empty CardDAV:address-data element in request. + +2011-11-01 Andrew McMillan + * Update refresh-alarms script to newer style initialisation. + * Fix handling of active flag for general external authentication mechanisms. + * Update website to reflect new default calendar name. + +2011-10-31 Andrew McMillan + * Rationalise confidential event rewriting. + +2011-10-30 Andrew McMillan + * Add the $c->hide_alarms functionality into DAVResource class. + +2011-10-28 Andrew McMillan + * Allow LDAP sync to work if the date is reasonable and no 'format_updated' is set. + * We don't need to test for the PostgreSQL non-PDO drivers now. + * Switch out deprecated LDAP mappings before we use them anywhere. + * Fix LDAP user creation where memcached support is off. + +2011-10-27 Andrew McMillan + * Add test for PHP filter module and wiki links for each test. + +2011-10-25 Andrew McMillan + * Updates to Brazilian Portuguese, German and Dutch translations. + * We need $c to be global here. + * A couple more places restricting numeric usernames. + +2011-10-25 Rob Ostensen + * External bind changes, added a clean up button, urls now show for + external collections and added a few strings for translation + +2011-10-24 Andrew McMillan + * Release 0.9.9.7 + * More fixes to CalDAV Scheduling + - Handle REPLY from ATTENDEE accepting/declining meeting. + - Handle processing on ORGANIZER further changing meeting. 2011-10-24 Andrew McMillan * Release 0.9.9.7 * More work on CalDAV Scheduling diff --git a/VERSION b/VERSION index f8182616..3eefcb9d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.9.7 +1.0.0 diff --git a/debian/changelog b/debian/changelog index 58039b65..ebe90663 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +davical (1.0.0-1) unstable; urgency=low + + * New upstream release (closes:#643809, #618957). + + -- Andrew McMillan Wed, 04 Jan 2012 16:41:50 +1300 + davical (0.9.9.7-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index e006bb43..4e91505e 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: davical Section: web Priority: extra Maintainer: Andrew McMillan -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Build-Depends: debhelper (>= 7), libawl-php, gettext Vcs-git: git://repo.or.cz/davical.git Vcs-browser: http://repo.or.cz/w/davical.git @@ -10,7 +10,7 @@ Homepage: http://davical.org/ Package: davical Architecture: all -Depends: ${misc:Depends}, debconf (>= 1.0.32), php5-pgsql, postgresql-client (>= 8.1), libawl-php (>= 0.49-1~), libawl-php (<< 0.50), libdbd-pg-perl, libyaml-perl +Depends: ${misc:Depends}, debconf (>= 1.0.32), php5-pgsql, postgresql-client (>= 8.1), libawl-php (>= 0.50-1~), libawl-php (<< 0.51), libdbd-pg-perl, libyaml-perl Recommends: postgresql (>= 8.3) Description: The DAViCal CalDAV & CardDAV Server The DAViCal CalDAV Server is designed to store CalDAV calendars and diff --git a/docs/api/awl/caldav/CalDAVClient.html b/docs/api/awl/caldav/CalDAVClient.html index d358fa34..f3f57d8c 100644 --- a/docs/api/awl/caldav/CalDAVClient.html +++ b/docs/api/awl/caldav/CalDAVClient.html @@ -1270,7 +1270,7 @@

      - Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:16 +1300 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 f217007d..fec0f960 100644 --- a/docs/api/awl/caldav/CalendarInfo.html +++ b/docs/api/awl/caldav/CalendarInfo.html @@ -251,7 +251,7 @@

      - Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:16 +1300 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 61d1916a..26133eb7 100644 --- a/docs/api/awl/caldav/RRule.html +++ b/docs/api/awl/caldav/RRule.html @@ -170,7 +170,7 @@

      - Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 82c91365..e4deee1f 100644 --- a/docs/api/awl/caldav/RepeatRule.html +++ b/docs/api/awl/caldav/RepeatRule.html @@ -472,7 +472,7 @@

      - Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 by phpDocumentor 1.4.3

      \ No newline at end of file diff --git a/docs/api/awl/caldav/RepeatRuleDateRange.html b/docs/api/awl/caldav/RepeatRuleDateRange.html index c3971a8f..669db546 100644 --- a/docs/api/awl/caldav/RepeatRuleDateRange.html +++ b/docs/api/awl/caldav/RepeatRuleDateRange.html @@ -261,7 +261,7 @@

      - Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 e5a68c1d..7d6c2974 100644 --- a/docs/api/awl/caldav/RepeatRuleDateTime.html +++ b/docs/api/awl/caldav/RepeatRuleDateTime.html @@ -1043,7 +1043,7 @@

      - Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 6ea109ea..0ded1b09 100644 --- a/docs/api/awl/caldav/RepeatRuleTimeZone.html +++ b/docs/api/awl/caldav/RepeatRuleTimeZone.html @@ -238,7 +238,7 @@

      - Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 index fdbe2132..18c2349b 100644 --- a/docs/api/awl/caldav/Rfc5545Duration.html +++ b/docs/api/awl/caldav/Rfc5545Duration.html @@ -234,7 +234,7 @@

      - Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 25c8fcd1..179e3895 100644 --- a/docs/api/awl/caldav/_inc---RRule-v2.php.html +++ b/docs/api/awl/caldav/_inc---RRule-v2.php.html @@ -393,7 +393,7 @@

      - Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 2cc9b6b6..31b68bdf 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 Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 dffe1f4e..1d4404d8 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 Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:16 +1300 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 08178e4a..e607bbc3 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 Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:16 +1300 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 710b1d50..95cb8f1f 100644 --- a/docs/api/awl/caldav/iCalDate.html +++ b/docs/api/awl/caldav/iCalDate.html @@ -943,7 +943,7 @@

      - Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 aef9ff64..6b668aac 100644 --- a/docs/api/classtrees_awl.html +++ b/docs/api/classtrees_awl.html @@ -54,7 +54,7 @@
    • RepeatRuleTimeZone

    - Documentation generated on Mon, 24 Oct 2011 20:09:24 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:15 +1300 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 e7779814..729779bd 100644 --- a/docs/api/classtrees_davical.html +++ b/docs/api/classtrees_davical.html @@ -106,7 +106,7 @@
  • AtomFeed

- Documentation generated on Mon, 24 Oct 2011 20:09:24 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:15 +1300 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/davical/AtomEntry.html b/docs/api/davical/AtomEntry.html index 6af40383..213e5f61 100644 --- a/docs/api/davical/AtomEntry.html +++ b/docs/api/davical/AtomEntry.html @@ -550,7 +550,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:15 +1300 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/davical/AtomFeed.html b/docs/api/davical/AtomFeed.html index 37e6fa7f..c203319e 100644 --- a/docs/api/davical/AtomFeed.html +++ b/docs/api/davical/AtomFeed.html @@ -519,7 +519,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:16 +1300 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 957acca1..ce41d6d0 100644 --- a/docs/api/davical/AtomXHTMLContent.html +++ b/docs/api/davical/AtomXHTMLContent.html @@ -142,7 +142,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:16 +1300 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 index 14d66ba6..043cdee8 100644 --- a/docs/api/davical/CheckResult.html +++ b/docs/api/davical/CheckResult.html @@ -98,7 +98,7 @@
-
+
@@ -130,7 +130,7 @@
-
+
@@ -154,7 +154,7 @@
-
+
@@ -178,7 +178,7 @@
-
+
@@ -202,7 +202,7 @@
-
+
@@ -231,7 +231,7 @@
-
+
@@ -265,7 +265,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 792ea230..7974b761 100644 --- a/docs/api/davical/DAVTicket/DAVTicket.html +++ b/docs/api/davical/DAVTicket/DAVTicket.html @@ -246,7 +246,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 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 48a74130..0da74ce7 100644 --- a/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html +++ b/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html @@ -97,7 +97,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 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 da3af906..a3989450 100644 --- a/docs/api/davical/DAViCalSession/DAViCalSession.html +++ b/docs/api/davical/DAViCalSession/DAViCalSession.html @@ -202,7 +202,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 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 180141ae..915ff58f 100644 --- a/docs/api/davical/DAViCalSession/Tools.html +++ b/docs/api/davical/DAViCalSession/Tools.html @@ -175,7 +175,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 90b45c65..5026062a 100644 --- a/docs/api/davical/DAViCalSession/_htdocs---tools.php.html +++ b/docs/api/davical/DAViCalSession/_htdocs---tools.php.html @@ -217,7 +217,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 4024b954..91aae319 100644 --- a/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html +++ b/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html @@ -170,7 +170,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 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 c8c75d88..8320623c 100644 --- a/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html +++ b/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html @@ -296,7 +296,7 @@
- AllowedTo (line 318) + AllowedTo (line 327)
@@ -327,7 +327,7 @@
- AssignSessionDetails (line 342) + AssignSessionDetails (line 351)
@@ -406,7 +406,7 @@
- CheckPassword (line 273) + CheckPassword (line 278)
@@ -436,7 +436,7 @@
- DigestAuthSession (line 178) + DigestAuthSession (line 183)
@@ -459,7 +459,7 @@
- GetRoles (line 326) + GetRoles (line 335)
@@ -481,7 +481,7 @@
- ParseDigestHeader (line 240) + ParseDigestHeader (line 245)
@@ -510,7 +510,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 fe7918dc..1ae3ef47 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 Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/davical/Principal/DAVPrincipal.html b/docs/api/davical/Principal/DAVPrincipal.html index 8f69a5f6..af30fbfe 100644 --- a/docs/api/davical/Principal/DAVPrincipal.html +++ b/docs/api/davical/Principal/DAVPrincipal.html @@ -27,7 +27,7 @@

A class for things to do with a DAV Principal

- Located in /inc/DAVPrincipal.php (line 18) + Located in /inc/DAVPrincipal.php (line 19)

@@ -213,7 +213,7 @@ RFC3744: $_is_group - (line 41) + (line 42)
@@ -369,7 +369,7 @@
- Constructor __construct (line 94) + Constructor __construct (line 95)
@@ -405,7 +405,7 @@
- addressbook_home_set (line 358) + addressbook_home_set (line 359)
@@ -427,7 +427,7 @@
- AsCollection (line 419) + AsCollection (line 420)
@@ -449,7 +449,7 @@
- calendar_free_busy_set (line 381) + calendar_free_busy_set (line 382)
@@ -471,7 +471,7 @@
- calendar_home_set (line 335) + calendar_home_set (line 336)
@@ -493,7 +493,7 @@
- FetchProxyGroups (line 193) + FetchProxyGroups (line 194)
@@ -515,7 +515,7 @@
- GetProperty (line 302) + GetProperty (line 303)
@@ -545,7 +545,7 @@
- GroupMemberSet (line 283) + GroupMemberSet (line 284)
@@ -567,7 +567,7 @@
- GroupMembership (line 274) + GroupMembership (line 275)
@@ -589,7 +589,7 @@
- InitialiseRecord (line 143) + InitialiseRecord (line 144)
@@ -616,7 +616,7 @@
- IsGroup (line 293) + IsGroup (line 294)
@@ -641,7 +641,7 @@
- PrincipalProperty (line 450) + PrincipalProperty (line 451)
@@ -677,7 +677,7 @@
- Privileges (line 403) + Privileges (line 404)
@@ -699,7 +699,7 @@
- PropertySearch (line 443) + PropertySearch (line 444)
@@ -725,7 +725,7 @@
- ProxyFor (line 264) + ProxyFor (line 265)
@@ -752,7 +752,7 @@
- ReadProxyGroup (line 245) + ReadProxyGroup (line 246)
@@ -774,7 +774,7 @@
- RenderAsXML (line 568) + RenderAsXML (line 569)
@@ -813,7 +813,7 @@
- unique_tag (line 323) + unique_tag (line 324)
@@ -838,7 +838,7 @@
- WriteProxyGroup (line 254) + WriteProxyGroup (line 255)
@@ -911,7 +911,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 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 index 643aaa3a..537b41c9 100644 --- a/docs/api/davical/Principal/Principal.html +++ b/docs/api/davical/Principal/Principal.html @@ -1060,7 +1060,7 @@
- static cacheDelete (line 588) + static cacheDelete (line 598)
@@ -1092,7 +1092,7 @@
- static cacheFlush (line 577) + static cacheFlush (line 587)
@@ -1193,7 +1193,7 @@
- byEmail (line 284) + byEmail (line 288)
@@ -1217,7 +1217,7 @@
- Create (line 566) + Create (line 576)
@@ -1246,7 +1246,7 @@
- dav_name (line 376) + dav_name (line 380)
@@ -1271,7 +1271,7 @@
- default_calendar (line 424) + default_calendar (line 428)
@@ -1296,7 +1296,7 @@
- email (line 367) + email (line 371)
@@ -1321,7 +1321,7 @@
- Exists (line 279) + Exists (line 283)
@@ -1345,7 +1345,7 @@
- FetchCollections (line 407) + FetchCollections (line 411)
@@ -1371,7 +1371,7 @@
- FetchDeadProperties (line 390) + FetchDeadProperties (line 394)
@@ -1396,7 +1396,7 @@
- internal_url (line 490) + internal_url (line 494)
@@ -1425,7 +1425,7 @@
- principal_id (line 358) + principal_id (line 362)
@@ -1450,7 +1450,7 @@
- setUsername (line 338) + setUsername (line 342)
@@ -1480,7 +1480,7 @@
- unCache (line 495) + unCache (line 499)
@@ -1504,7 +1504,7 @@
- Update (line 570) + Update (line 580)
@@ -1533,7 +1533,7 @@
- url (line 464) + url (line 468)
@@ -1567,7 +1567,7 @@
- username (line 329) + username (line 333)
@@ -1592,7 +1592,7 @@
- user_no (line 349) + user_no (line 353)
@@ -1617,7 +1617,7 @@
- __get (line 246) + __get (line 251)
@@ -1647,7 +1647,7 @@
- __isset (line 256) + __isset (line 261)
@@ -1678,7 +1678,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/davical/Principal/_inc---DAVPrincipal.php.html b/docs/api/davical/Principal/_inc---DAVPrincipal.php.html index 091111b8..fea1cb97 100644 --- a/docs/api/davical/Principal/_inc---DAVPrincipal.php.html +++ b/docs/api/davical/Principal/_inc---DAVPrincipal.php.html @@ -17,7 +17,8 @@
Description | Classes -
+ | Includes +

An object representing a DAV 'Principal'

@@ -36,7 +37,8 @@
Description | Classes -
+ | Includes +
@@ -58,12 +60,44 @@ + +
+
Includes
+
+ Description | + Classes + | Includes +
+
+ +
+ +
+ + + require_once + ('Principal.php') + (line 12) + +
+ + +

An object representing a DAV 'Principal'

+ + +
+
+

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 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 index 3ee97173..754c5221 100644 --- a/docs/api/davical/Principal/_inc---Principal.php.html +++ b/docs/api/davical/Principal/_inc---Principal.php.html @@ -97,7 +97,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 1eebd6c9..19a1b415 100644 --- a/docs/api/davical/PublicSession/PublicSession.html +++ b/docs/api/davical/PublicSession/PublicSession.html @@ -133,7 +133,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 051a479d..45aa2d86 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 Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 61536435..524e3a5e 100644 --- a/docs/api/davical/RRuleTest.html +++ b/docs/api/davical/RRuleTest.html @@ -295,7 +295,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 ced370db..1115d910 100644 --- a/docs/api/davical/Request/CalDAVRequest.html +++ b/docs/api/davical/Request/CalDAVRequest.html @@ -690,7 +690,7 @@
- AllowedTo (line 992) + AllowedTo (line 995)
@@ -718,7 +718,7 @@
- BuildSupportedPrivileges (line 954) + BuildSupportedPrivileges (line 957)
@@ -748,7 +748,7 @@
- CoerceContentType (line 846) + CoerceContentType (line 849)
@@ -770,7 +770,7 @@
- CollectionId (line 946) + CollectionId (line 949)
@@ -792,7 +792,7 @@
- dav_name (line 712) + dav_name (line 715)
@@ -814,7 +814,7 @@
- DepthRegexTail (line 730) + DepthRegexTail (line 733)
@@ -836,7 +836,7 @@
- DoResponse (line 1169) + DoResponse (line 1172)
@@ -869,7 +869,7 @@
- FailIfLocked (line 811) + FailIfLocked (line 814)
@@ -894,7 +894,7 @@
- GetDepthName (line 721) + GetDepthName (line 724)
@@ -916,7 +916,7 @@
- GetLockDetails (line 797) + GetLockDetails (line 800)
@@ -943,7 +943,7 @@
- GetLockRow (line 741) + GetLockRow (line 744)
@@ -973,7 +973,7 @@
- HavePrivilegeTo (line 1065) + HavePrivilegeTo (line 1068)
@@ -1000,7 +1000,7 @@
- IsAddressBook (line 907) + IsAddressBook (line 910)
@@ -1022,7 +1022,7 @@
- IsCalendar (line 898) + IsCalendar (line 901)
@@ -1044,7 +1044,7 @@
- IsCollection (line 887) + IsCollection (line 890)
@@ -1066,7 +1066,7 @@
- IsInfiniteDepth (line 938) + IsInfiniteDepth (line 941)
@@ -1088,7 +1088,7 @@
- IsLocked (line 633) + IsLocked (line 636)
@@ -1113,7 +1113,7 @@
- IsPrincipal (line 916) + IsPrincipal (line 919)
@@ -1135,7 +1135,7 @@
- IsProxyRequest (line 927) + IsProxyRequest (line 930)
@@ -1157,7 +1157,7 @@
- IsPublic (line 670) + IsPublic (line 673)
@@ -1179,7 +1179,7 @@
- MalformedRequest (line 1142) + MalformedRequest (line 1145)
@@ -1206,7 +1206,7 @@
- NeedPrivilege (line 1101) + NeedPrivilege (line 1104)
@@ -1239,7 +1239,7 @@
- PreconditionFailed (line 1126) + PreconditionFailed (line 1129)
@@ -1275,7 +1275,7 @@
- Privileges (line 1057) + Privileges (line 1060)
@@ -1297,7 +1297,7 @@
- setPermissions (line 565) + setPermissions (line 568)
@@ -1327,7 +1327,7 @@
- UnsupportedRequest (line 1078) + UnsupportedRequest (line 1081)
@@ -1354,7 +1354,7 @@
- ValidateLockToken (line 766) + ValidateLockToken (line 769)
@@ -1381,7 +1381,7 @@
- XMLResponse (line 1154) + XMLResponse (line 1157)
@@ -1412,7 +1412,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 f6551c30..9bc2b667 100644 --- a/docs/api/davical/Request/_inc---CalDAVRequest.php.html +++ b/docs/api/davical/Request/_inc---CalDAVRequest.php.html @@ -168,7 +168,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 8feb0908..37539e41 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 23) + Located in /inc/DAVResource.php (line 24)

@@ -140,7 +140,7 @@
-
+
DAVResource __construct @@ -345,6 +345,12 @@ ()
+ + void + IsInSchedulingCollection + ([string $type = 'any']) +
+
void IsLocked @@ -363,6 +369,12 @@ ()
+ + void + IsPublicOnly + () +
+
void IsSchedulingCollection @@ -460,14 +472,14 @@
-
+
The $bound_from - (line 63) + (line 64)
@@ -483,14 +495,14 @@
-
+
The $contenttype - (line 58) + (line 59)
@@ -506,14 +518,14 @@
-
+
The $dav_name - (line 28) + (line 29)
@@ -529,14 +541,14 @@
-
+
Boolean: $exists - (line 33) + (line 34)
@@ -552,14 +564,14 @@
-
+
The $parent - (line 48) + (line 49)
@@ -575,14 +587,14 @@
-
+
The $resource - (line 43) + (line 44)
@@ -598,14 +610,14 @@
-
+
The $resourcetypes - (line 53) + (line 54)
@@ -621,14 +633,14 @@
-
+
The $unique_tag - (line 38) + (line 39)
@@ -660,11 +672,11 @@
-
+
- Constructor __construct (line 146) + Constructor __construct (line 147)
@@ -687,11 +699,11 @@
-
+
- bound_from (line 1138) + bound_from (line 1161)
@@ -709,11 +721,11 @@
-
+
- BuildACE (line 1284) + BuildACE (line 1315)
@@ -742,11 +754,11 @@
-
+
- BuildPrivileges (line 762) + BuildPrivileges (line 773)
@@ -772,11 +784,11 @@
-
+
- BuildSupportedMethods (line 851) + BuildSupportedMethods (line 862)
@@ -794,11 +806,11 @@
-
+
- BuildSupportedReports (line 903) + BuildSupportedReports (line 914)
@@ -821,11 +833,11 @@
-
+
- BuildTicketinfo (line 964) + BuildTicketinfo (line 975)
@@ -855,11 +867,11 @@
-
+
- collection_id (line 1193) + collection_id (line 1216)
@@ -877,11 +889,11 @@
-
+
- ContainerExists (line 1106) + ContainerExists (line 1129)
@@ -899,11 +911,11 @@
-
+
- ContainerType (line 1250) + ContainerType (line 1281)
@@ -921,11 +933,11 @@
-
+
- DAV_AllProperties (line 1413) + DAV_AllProperties (line 1449)
@@ -943,11 +955,11 @@
-
+
- dav_name (line 1129) + dav_name (line 1152)
@@ -965,11 +977,11 @@
-
+
- Exists (line 1088) + Exists (line 1111)
@@ -987,11 +999,11 @@
-
+
- FetchCollection (line 470) + FetchCollection (line 481)
@@ -1012,11 +1024,11 @@
-
+
- FetchDeadProperties (line 609) + FetchDeadProperties (line 620)
@@ -1037,15 +1049,15 @@
-
+
- FetchParentContainer (line 704) + FetchParentContainer (line 715)
-

Fetch the parent to this resource.

+

Fetch the parent to this resource. This is deprecated - use GetParentContainer() instead.

void @@ -1059,11 +1071,11 @@
-
+
- FetchPrincipal (line 557) + FetchPrincipal (line 568)
@@ -1084,11 +1096,11 @@
-
+
- FetchPrivileges (line 627) + FetchPrivileges (line 638)
@@ -1109,11 +1121,11 @@
-
+
- FetchResource (line 580) + FetchResource (line 591)
@@ -1134,11 +1146,11 @@
-
+
- FetchSupportedMethods (line 774) + FetchSupportedMethods (line 785)
@@ -1156,11 +1168,11 @@
-
+
- FetchSupportedReports (line 865) + FetchSupportedReports (line 876)
@@ -1178,11 +1190,11 @@
-
+
- FetchTickets (line 919) + FetchTickets (line 930)
@@ -1200,11 +1212,11 @@
-
+
- FromPath (line 301) + FromPath (line 313)
@@ -1227,11 +1239,11 @@
-
+
- FromRow (line 187) + FromRow (line 188)
@@ -1254,11 +1266,11 @@
-
+
- GetACL (line 1305) + GetACL (line 1336)
@@ -1281,11 +1293,11 @@
-
+
- GetParentContainer (line 685) + GetParentContainer (line 696)
@@ -1303,11 +1315,11 @@
-
+
- GetProperty (line 1337) + GetProperty (line 1368)
@@ -1330,11 +1342,11 @@
-
+
- GetPropStat (line 1724) + GetPropStat (line 1765)
@@ -1366,11 +1378,11 @@
-
+
- HavePrivilegeTo (line 725) + HavePrivilegeTo (line 736)
@@ -1399,11 +1411,11 @@
-
+
- IsAddressbook (line 1064) + IsAddressbook (line 1087)
@@ -1421,11 +1433,11 @@
-
+
- IsBinding (line 1072) + IsBinding (line 1095)
@@ -1443,11 +1455,11 @@
-
+
- IsCalendar (line 1044) + IsCalendar (line 1055)
@@ -1465,11 +1477,11 @@
-
+
- IsCollection (line 1028) + IsCollection (line 1039)
@@ -1487,11 +1499,11 @@
-
+
- IsExternal (line 1080) + IsExternal (line 1103)
@@ -1507,13 +1519,40 @@ +
+ +
+ +
+ + IsInSchedulingCollection (line 1076) +
+ + +

Checks whether this resource is IN a scheduling inbox/outbox collection

+ +
+ void + + IsInSchedulingCollection + + ([string $type = 'any']) +
+ +
    +
  • + string + $type: The type of scheduling collection, 'inbox', 'outbox' or 'any'
    • +
+ +
- IsLocked (line 996) + IsLocked (line 1007)
@@ -1543,7 +1582,7 @@
- IsPrincipal (line 1036) + IsPrincipal (line 1047)
@@ -1565,7 +1604,7 @@
- IsPublic (line 1242) + IsPublic (line 1265)
@@ -1582,16 +1621,38 @@
- +
- IsSchedulingCollection (line 1053) + IsPublicOnly (line 1273)
-

Checks whether this resource is a calendar

+

Checks whether the target collection is for public events only

+ +
+ void + + IsPublicOnly + + () +
+ + + +
+ +
+ +
+ + IsSchedulingCollection (line 1064) +
+ + +

Checks whether this resource is a scheduling inbox/outbox collection

void @@ -1604,17 +1665,17 @@
  • string - $type: The type of scheduling collection, 'read', 'write' or 'any'
    • + $type: The type of scheduling collection, 'inbox', 'outbox' or 'any'
-
+
- NeedPrivilege (line 747) + NeedPrivilege (line 758)
@@ -1640,11 +1701,11 @@
-
+
- parent_path (line 1159) + parent_path (line 1182)
@@ -1662,11 +1723,11 @@
-
+
- principal_url (line 1175) + principal_url (line 1198)
@@ -1684,11 +1745,11 @@
-
+
- Privileges (line 713) + Privileges (line 724)
@@ -1706,11 +1767,11 @@
-
+
- RenderAsXML (line 1782) + RenderAsXML (line 1823)
@@ -1745,11 +1806,11 @@
-
+
- resource (line 1202) + resource (line 1225)
@@ -1767,11 +1828,11 @@
-
+
- ResourceProperty (line 1432) + ResourceProperty (line 1468)
@@ -1803,11 +1864,11 @@
-
+
- resource_id (line 1228) + resource_id (line 1251)
@@ -1825,11 +1886,11 @@
-
+
- set_bind_location (line 1147) + set_bind_location (line 1170)
@@ -1852,11 +1913,11 @@
-
+
- unique_tag (line 1211) + unique_tag (line 1234)
@@ -1874,11 +1935,11 @@
-
+
- url (line 1118) + url (line 1141)
@@ -1896,11 +1957,11 @@
-
+
- user_no (line 1184) + user_no (line 1207)
@@ -1923,7 +1984,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 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 c6d01f31..8a0e3e5d 100644 --- a/docs/api/davical/Resource/WritableCollection.html +++ b/docs/api/davical/Resource/WritableCollection.html @@ -53,7 +53,25 @@
-
+
+ + boolean + actualDeleteCalendarMember + (vCalendar $member_dav_name) +
+
+ + null + WriteCalendarAlarms + ( $dav_id,  $vcal) +
+
+ + null + WriteCalendarAttendees + (int $dav_id,  $vcal) +
+
string WriteCalendarMember @@ -135,9 +153,99 @@
- +
+
+ + actualDeleteCalendarMember (line 412) +
+ + +

Writes the data to a member in the collection and returns the segment_name of the resource in our internal namespace.

+
    +
  • return: Success is true, or false on failure.
    • +
+ +
+ boolean + + actualDeleteCalendarMember + + (vCalendar $member_dav_name) +
+ +
    +
  • + vCalendar + $member_dav_name: The path to the resource to be deleted.
    • +
+ + +
+ +
+ +
+ + WriteCalendarAlarms (line 312) +
+ + +

Given a dav_id and an original vCalendar, pull out each of the VALARMs and write the values into the calendar_alarm table.

+ +
+ null + + WriteCalendarAlarms + + ( $dav_id,  $vcal) +
+ +
    +
  • + + $dav_id
    • +
  • + vCalendar + $vcal
    • +
+ + +
+ +
+ +
+ + WriteCalendarAttendees (line 374) +
+ + +

Parse out the attendee property and write a row to the calendar_attendee table for each one.

+ +
+ null + + WriteCalendarAttendees + + (int $dav_id,  $vcal) +
+ +
    +
  • + int + $dav_id: The dav_id of the caldav_data we're processing
    • +
  • + vComponent + $vcal: The VEVENT or VTODO containing the ATTENDEEs
    • +
+ + +
+ +
+
WriteCalendarMember (line 33) @@ -178,11 +286,11 @@
-
+
- WriteMember (line 301) + WriteMember (line 286)
@@ -291,12 +399,16 @@ DAVResource::IsExternal()
+ DAVResource::IsInSchedulingCollection()
+ DAVResource::IsLocked()
DAVResource::IsPrincipal()
DAVResource::IsPublic()
+ DAVResource::IsPublicOnly()
+ DAVResource::IsSchedulingCollection()
DAVResource::NeedPrivilege()
@@ -329,7 +441,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 6c5069cb..a40fe43a 100644 --- a/docs/api/davical/Resource/_inc---DAVResource.php.html +++ b/docs/api/davical/Resource/_inc---DAVResource.php.html @@ -70,7 +70,7 @@
-
+
@@ -91,7 +91,7 @@
-
+
@@ -104,6 +104,21 @@ +
+ +
+ +
+ + + require_once + ('DAVPrincipal.php') + (line 14) + +
+ + +
@@ -113,7 +128,7 @@ require_once ('DAVTicket.php') - (line 14) + (line 15)
@@ -128,7 +143,7 @@ require_once ('iCalendar.php') - (line 15) + (line 16)
@@ -142,7 +157,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 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 index 8167860a..ef0c6c4d 100644 --- a/docs/api/davical/SqlToArray.html +++ b/docs/api/davical/SqlToArray.html @@ -267,7 +267,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 751d53ba..80dbb2a4 100644 --- a/docs/api/davical/VCard.html +++ b/docs/api/davical/VCard.html @@ -200,7 +200,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 index dd2e9b74..c0a114de 100644 --- a/docs/api/davical/_htdocs---SqlToArray.php.html +++ b/docs/api/davical/_htdocs---SqlToArray.php.html @@ -57,7 +57,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 61a25387..ee11798a 100644 --- a/docs/api/davical/_htdocs---admin.php.html +++ b/docs/api/davical/_htdocs---admin.php.html @@ -206,7 +206,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:24 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:15 +1300 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 4ee856ca..e21843cc 100644 --- a/docs/api/davical/_htdocs---always.php.html +++ b/docs/api/davical/_htdocs---always.php.html @@ -50,7 +50,7 @@ include ('../config/config.php') - (line 141) + (line 142)
@@ -65,7 +65,7 @@ include ('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') - (line 135) + (line 136)
@@ -80,7 +80,7 @@ include ('/usr/local/etc/davical/config.php') - (line 138) + (line 139)
@@ -95,7 +95,7 @@ include ('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') - (line 129) + (line 130)
@@ -111,7 +111,7 @@ include ('config/config.php') - (line 144) + (line 145)
@@ -126,7 +126,7 @@ include (davical_configuration_missing.php) - (line 147) + (line 148)
@@ -141,7 +141,7 @@ include ('/etc/davical/config.php') - (line 132) + (line 133)
@@ -156,7 +156,7 @@ include_once ('AWLUtilities.php') - (line 90) + (line 91)
@@ -171,7 +171,7 @@ include_once ('AWLUtilities.php') - (line 77) + (line 78)
@@ -186,7 +186,7 @@ require_once ('AwlQuery.php') - (line 193) + (line 194)
@@ -202,7 +202,7 @@ require_once (Principal.php) - (line 211) + (line 212)
@@ -229,7 +229,7 @@ DAVICAL_ADDRESSBOOK_MAXPRIV = "1023" - (line 357) + (line 358)
@@ -244,7 +244,7 @@ DAVICAL_MAXPRIV = "65535" - (line 356) + (line 357)
@@ -275,7 +275,7 @@
- bits_to_privilege (line 409) + bits_to_privilege (line 410)
@@ -307,7 +307,7 @@
- ConstructURL (line 275) + ConstructURL (line 276)
@@ -336,7 +336,7 @@
- DateToISODate (line 344) + DateToISODate (line 345)
@@ -365,7 +365,7 @@
- DeconstructURL (line 304) + DeconstructURL (line 305)
@@ -427,7 +427,7 @@
- getStatusMessage (line 218) + getStatusMessage (line 219)
@@ -456,7 +456,7 @@
- ISODateToHTTPDate (line 335) + ISODateToHTTPDate (line 336)
@@ -482,7 +482,7 @@
- privileges_to_XML (line 456) + privileges_to_XML (line 457)
@@ -511,7 +511,7 @@
- privilege_to_bits (line 358) + privilege_to_bits (line 359)
@@ -535,7 +535,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:24 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:15 +1300 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 index 5636ec55..1fe5e0f7 100644 --- a/docs/api/davical/_htdocs---createdb.php.html +++ b/docs/api/davical/_htdocs---createdb.php.html @@ -93,7 +93,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 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 index c07cc387..6c0aa8b8 100644 --- a/docs/api/davical/_htdocs---dbexec.php.html +++ b/docs/api/davical/_htdocs---dbexec.php.html @@ -57,7 +57,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 f56cfff8..28aaf54a 100644 --- a/docs/api/davical/_htdocs---feed.php.html +++ b/docs/api/davical/_htdocs---feed.php.html @@ -204,7 +204,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 0690fe1a..e87ae300 100644 --- a/docs/api/davical/_htdocs---freebusy.php.html +++ b/docs/api/davical/_htdocs---freebusy.php.html @@ -116,7 +116,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 6b297fe7..8453e0b5 100644 --- a/docs/api/davical/_htdocs---help.php.html +++ b/docs/api/davical/_htdocs---help.php.html @@ -115,7 +115,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 5376711a..2fd59413 100644 --- a/docs/api/davical/_htdocs---index.php.html +++ b/docs/api/davical/_htdocs---index.php.html @@ -131,7 +131,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 index 4692d759..72e869d1 100644 --- a/docs/api/davical/_htdocs---newfile.php.html +++ b/docs/api/davical/_htdocs---newfile.php.html @@ -55,7 +55,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 ac5cef9f..c9d3d4e6 100644 --- a/docs/api/davical/_htdocs---setup.php.html +++ b/docs/api/davical/_htdocs---setup.php.html @@ -67,14 +67,14 @@
-
+
include (page-footer.php) - (line 387) + (line 397)
@@ -82,14 +82,14 @@
-
+
include ("./always.php") - (line 130) + (line 137)
@@ -97,14 +97,14 @@
-
+
include (page-header.php) - (line 140) + (line 147)
@@ -112,14 +112,14 @@
-
+
include (interactive-page.php) - (line 139) + (line 146)
@@ -127,14 +127,14 @@
-
+
include (DAViCalSession.php) - (line 131) + (line 138)
@@ -142,14 +142,14 @@
-
+
require_once ("AwlQuery.php") - (line 142) + (line 149)
@@ -172,11 +172,11 @@
-
+
- build_dependencies_table (line 234) + build_dependencies_table (line 241)
@@ -192,11 +192,11 @@
-
+
- build_site_statistics (line 206) + build_site_statistics (line 213)
@@ -212,11 +212,11 @@
-
+
- check_awl_version (line 191) + check_awl_version (line 198)
@@ -232,11 +232,11 @@
-
+
- check_calendar (line 81) + check_calendar (line 88)
@@ -252,11 +252,11 @@
-
+
- check_datetime (line 145) + check_datetime (line 152)
@@ -272,11 +272,11 @@
-
+
- check_davical_version (line 175) + check_davical_version (line 182)
@@ -292,7 +292,7 @@
-
+
@@ -312,7 +312,7 @@
-
+
@@ -332,7 +332,7 @@
-
+
@@ -352,11 +352,11 @@
-
+
- check_magic_quotes_gpc (line 95) + check_magic_quotes_gpc (line 102)
@@ -372,11 +372,11 @@
-
+
- check_magic_quotes_runtime (line 99) + check_magic_quotes_runtime (line 106)
@@ -392,7 +392,7 @@
-
+
@@ -412,7 +412,7 @@
-
+
@@ -432,7 +432,7 @@
-
+
@@ -451,13 +451,33 @@ +
+ +
+ +
+ + check_real_php (line 81) +
+ + +
+ void + + check_real_php + + () +
+ + +
- check_schema_version (line 153) + check_schema_version (line 160)
@@ -477,7 +497,7 @@
- check_suhosin_server_strip (line 88) + check_suhosin_server_strip (line 95)
@@ -497,7 +517,7 @@
- do_error (line 106) + do_error (line 113)
@@ -522,7 +542,7 @@
- get_phpinfo (line 118) + get_phpinfo (line 125)
@@ -567,7 +587,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 58588323..078a20a5 100644 --- a/docs/api/davical/_htdocs---test.php.html +++ b/docs/api/davical/_htdocs---test.php.html @@ -28,7 +28,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 afca8980..52d41b98 100644 --- a/docs/api/davical/_htdocs---upgrade.php.html +++ b/docs/api/davical/_htdocs---upgrade.php.html @@ -146,7 +146,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 631b5db4..424baa00 100644 --- a/docs/api/davical/_inc---AtomFeed.php.html +++ b/docs/api/davical/_inc---AtomFeed.php.html @@ -152,7 +152,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:15 +1300 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 f8a1b7dd..93798a6d 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 Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/davical/_inc---autodiscover-handler.php.html b/docs/api/davical/_inc---autodiscover-handler.php.html index b388af7d..33705d4b 100644 --- a/docs/api/davical/_inc---autodiscover-handler.php.html +++ b/docs/api/davical/_inc---autodiscover-handler.php.html @@ -115,7 +115,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:16 +1300 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 1299c9ef..8f981746 100644 --- a/docs/api/davical/_inc---caldav-LOCK.php.html +++ b/docs/api/davical/_inc---caldav-LOCK.php.html @@ -34,7 +34,7 @@
-
+
@@ -56,7 +56,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 74223563..dfb51a6c 100644 --- a/docs/api/davical/_inc---caldav-REPORT-calquery.php.html +++ b/docs/api/davical/_inc---caldav-REPORT-calquery.php.html @@ -36,7 +36,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -100,7 +100,7 @@
-
+
@@ -132,7 +132,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
@@ -195,7 +195,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 87d8baf9..45c112ed 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,11 +90,11 @@
-
+
- SqlFilterCardDAV (line 83) + SqlFilterCardDAV (line 84)
@@ -128,7 +128,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 83485aeb..21e8abdc 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 Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 c8ad8a0a..194eed1a 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 Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 d025321b..cc233b7c 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 Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 index ac7caac6..95440716 100644 --- a/docs/api/davical/_inc---caldav-REPORT-principal-match.php.html +++ b/docs/api/davical/_inc---caldav-REPORT-principal-match.php.html @@ -28,7 +28,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 f33202cf..575b2a6e 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 Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 cc0eddb7..63888226 100644 --- a/docs/api/davical/_inc---check_UTF8.php.html +++ b/docs/api/davical/_inc---check_UTF8.php.html @@ -119,7 +119,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 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 7e20729a..0a1e7994 100644 --- a/docs/api/davical/_inc---davical_configuration_missing.php.html +++ b/docs/api/davical/_inc---davical_configuration_missing.php.html @@ -70,7 +70,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 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 77579fbf..5554f649 100644 --- a/docs/api/davical/_inc---freebusy-functions.php.html +++ b/docs/api/davical/_inc---freebusy-functions.php.html @@ -118,7 +118,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 4a187c25..e160c519 100644 --- a/docs/api/davical/_inc---interactive-page.php.html +++ b/docs/api/davical/_inc---interactive-page.php.html @@ -55,7 +55,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 e2bef83d..fb594260 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 Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 8d40c2a2..b220afc4 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 Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 15f7e4f8..e19d0e18 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 Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 16deb57b..73c19049 100644 --- a/docs/api/davical/_inc---pubsub.php.html +++ b/docs/api/davical/_inc---pubsub.php.html @@ -28,7 +28,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 3b3a0cd9..74d88c09 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 Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 1508fcd3..0f3d5264 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 Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 24d4d243..7dcdb00a 100644 --- a/docs/api/davical/_inc---ui---collection-edit.php.html +++ b/docs/api/davical/_inc---ui---collection-edit.php.html @@ -86,7 +86,7 @@
- edit_grant_row (line 395) + edit_grant_row (line 404)
@@ -111,7 +111,7 @@
- privilege_format_function (line 179) + privilege_format_function (line 188)
@@ -146,7 +146,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/davical/_inc---ui---external-browse.php.html b/docs/api/davical/_inc---ui---external-browse.php.html index 287be732..2b737bd4 100644 --- a/docs/api/davical/_inc---ui---external-browse.php.html +++ b/docs/api/davical/_inc---ui---external-browse.php.html @@ -28,7 +28,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 d88a7802..0adb6ef0 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 Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 1e4c3b8c..68f21e8f 100644 --- a/docs/api/davical/_inc---ui---principal-edit.php.html +++ b/docs/api/davical/_inc---ui---principal-edit.php.html @@ -491,7 +491,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 b7bc6c11..31daa7f8 100644 --- a/docs/api/davical/_inc---vcard.php.html +++ b/docs/api/davical/_inc---vcard.php.html @@ -101,7 +101,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 by phpDocumentor 1.4.3

\ No newline at end of file diff --git a/docs/api/davical/_inc---well-known.php.html b/docs/api/davical/_inc---well-known.php.html index a8ab3098..fe1e5dca 100644 --- a/docs/api/davical/_inc---well-known.php.html +++ b/docs/api/davical/_inc---well-known.php.html @@ -118,7 +118,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 242e8090..d853e35b 100644 --- a/docs/api/davical/authentication/_inc---auth-functions.php.html +++ b/docs/api/davical/authentication/_inc---auth-functions.php.html @@ -359,7 +359,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:16 +1300 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 54ede256..70794df6 100644 --- a/docs/api/davical/caldav/_htdocs---caldav.php.html +++ b/docs/api/davical/caldav/_htdocs---caldav.php.html @@ -498,7 +498,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 141afdf1..aa8019d8 100644 --- a/docs/api/davical/caldav/_htdocs---public.php.html +++ b/docs/api/davical/caldav/_htdocs---public.php.html @@ -188,7 +188,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 1256db2f..eb54c897 100644 --- a/docs/api/davical/caldav/_inc---caldav-ACL.php.html +++ b/docs/api/davical/caldav/_inc---caldav-ACL.php.html @@ -109,7 +109,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:16 +1300 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 6f735012..6c1fded5 100644 --- a/docs/api/davical/caldav/_inc---caldav-BIND.php.html +++ b/docs/api/davical/caldav/_inc---caldav-BIND.php.html @@ -92,7 +92,7 @@ require_once ('external-fetch.php') - (line 51) + (line 52)
@@ -106,7 +106,7 @@

- Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:16 +1300 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 e9b80244..21be6619 100644 --- a/docs/api/davical/caldav/_inc---caldav-DELETE.php.html +++ b/docs/api/davical/caldav/_inc---caldav-DELETE.php.html @@ -61,6 +61,21 @@
  • license: GNU GPL v2 or later
    • +
    + +
    + +
    + + + require_once + ('schedule-functions.php') + (line 20) + +
    + + +
    @@ -77,11 +92,11 @@
    -
    +
    - delete_collection (line 21) + delete_collection (line 22)
    @@ -105,7 +120,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 cb0353a2..7ae98510 100644 --- a/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html +++ b/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html @@ -41,7 +41,7 @@
    -
    +
    @@ -62,7 +62,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 5559afc0..dbcb2f2e 100644 --- a/docs/api/davical/caldav/_inc---caldav-GET.php.html +++ b/docs/api/davical/caldav/_inc---caldav-GET.php.html @@ -42,7 +42,7 @@
    -
    +
    @@ -57,7 +57,7 @@
    -
    +
    @@ -86,7 +86,7 @@
    -
    +
    @@ -114,7 +114,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 d05bb0b9..7d42b1a3 100644 --- a/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html +++ b/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html @@ -40,7 +40,7 @@
    -
    +
    @@ -61,7 +61,7 @@
    -
    +
    @@ -76,7 +76,7 @@
    -
    +
    @@ -97,7 +97,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 d53f2d1e..322e458c 100644 --- a/docs/api/davical/caldav/_inc---caldav-MKTICKET.php.html +++ b/docs/api/davical/caldav/_inc---caldav-MKTICKET.php.html @@ -41,7 +41,7 @@
    -
    +
    @@ -63,7 +63,7 @@
    -
    +
    @@ -84,7 +84,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 2a5635e9..5dbf460e 100644 --- a/docs/api/davical/caldav/_inc---caldav-MOVE.php.html +++ b/docs/api/davical/caldav/_inc---caldav-MOVE.php.html @@ -42,7 +42,7 @@
    -
    +
    @@ -71,7 +71,7 @@
    -
    +
    @@ -101,7 +101,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 015721cf..ccd4e095 100644 --- a/docs/api/davical/caldav/_inc---caldav-OPTIONS.php.html +++ b/docs/api/davical/caldav/_inc---caldav-OPTIONS.php.html @@ -40,7 +40,7 @@
    -
    +
    @@ -67,7 +67,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 a25308cb..d9279f7a 100644 --- a/docs/api/davical/caldav/_inc---caldav-POST.php.html +++ b/docs/api/davical/caldav/_inc---caldav-POST.php.html @@ -42,7 +42,7 @@
    -
    +
    @@ -57,7 +57,7 @@
    -
    +
    @@ -72,7 +72,7 @@
    -
    +
    @@ -107,7 +107,7 @@
    -
    +
    @@ -132,7 +132,7 @@
    -
    +
    @@ -160,7 +160,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 b724539b..a7dfe288 100644 --- a/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html +++ b/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html @@ -40,7 +40,7 @@
    -
    +
    @@ -61,7 +61,7 @@
    -
    +
    @@ -82,7 +82,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 63b246d3..7ba6010a 100644 --- a/docs/api/davical/caldav/_inc---caldav-PUT-default.php.html +++ b/docs/api/davical/caldav/_inc---caldav-PUT-default.php.html @@ -40,7 +40,7 @@
    -
    +
    @@ -61,7 +61,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 9b192457..21bef123 100644 --- a/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html +++ b/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html @@ -42,7 +42,7 @@
    -
    +
    @@ -57,7 +57,7 @@
    -
    +
    @@ -72,7 +72,7 @@
    -
    +
    @@ -87,7 +87,7 @@
    -
    +
    @@ -118,7 +118,7 @@
    -
    +
    @@ -156,7 +156,7 @@
    -
    +
    @@ -185,7 +185,7 @@
    -
    +
    @@ -220,7 +220,7 @@
    -
    +
    @@ -249,7 +249,7 @@
    -
    +
    @@ -278,7 +278,7 @@
    -
    +
    @@ -304,7 +304,7 @@
    -
    +
    @@ -342,7 +342,7 @@
    -
    +
    @@ -374,7 +374,7 @@
    -
    +
    @@ -412,11 +412,11 @@
    -
    +
    - simple_write_resource (line 1186) + simple_write_resource (line 1187)
    @@ -450,11 +450,11 @@
    -
    +
    - write_alarms (line 795) + write_alarms (line 796)
    @@ -479,11 +479,11 @@
    -
    +
    - write_attendees (line 852) + write_attendees (line 853)
    @@ -508,11 +508,11 @@
    -
    +
    - write_resource (line 901) + write_resource (line 902)
    @@ -567,7 +567,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 by phpDocumentor 1.4.3

    \ No newline at end of file diff --git a/docs/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html b/docs/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html index a0a80c2a..6e22bc92 100644 --- a/docs/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html +++ b/docs/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html @@ -40,7 +40,7 @@
    -
    +
    @@ -55,7 +55,7 @@
    -
    +
    @@ -76,7 +76,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 996e524a..08d08548 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 Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 33129a7e..fe82d57a 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 Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 3e2f9bc5..c7651d9b 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 Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 909ac102..3c596f33 100644 --- a/docs/api/davical/caldav/_inc---caldav-REPORT.php.html +++ b/docs/api/davical/caldav/_inc---caldav-REPORT.php.html @@ -41,60 +41,15 @@ | Functions
    - -
    - -
    - - - include - ("caldav-REPORT-cardquery.php") - (line 345) - -
    - - - -
    - +
    include - ("caldav-REPORT-pps-set.php") - (line 61) - -
    - - - -
    - -
    - -
    - - - include - ("caldav-REPORT-principal.php") - (line 58) - -
    - - - -
    - -
    - -
    - - - include - ("caldav-REPORT-calquery.php") - (line 331) + ("caldav-REPORT-sync-collection.php") + (line 68)
    @@ -116,9 +71,24 @@
    - +
    +
    + + + include + ("caldav-REPORT-principal.php") + (line 58) + +
    + + + +
    + +
    +
    @@ -131,30 +101,45 @@
    - -
    - -
    - - - include - ("caldav-REPORT-sync-collection.php") - (line 68) - -
    - - - -
    - +
    include - ("caldav-REPORT-multiget.php") - (line 336) + ("caldav-REPORT-pps-set.php") + (line 61) + +
    + + + +
    + +
    + +
    + + + include + ("caldav-REPORT-cardquery.php") + (line 238) + +
    + + + +
    + +
    + +
    + + + include + ("caldav-REPORT-calquery.php") + (line 224)
    @@ -184,7 +169,37 @@ include ("caldav-REPORT-multiget.php") - (line 341) + (line 229) + +
    + + + +
    + +
    + +
    + + + include + ("caldav-REPORT-multiget.php") + (line 234) + +
    + + + +
    + +
    + +
    + + + require_once + ("external-fetch.php") + (line 65)
    @@ -211,36 +226,6 @@
  • license: GNU GPL v2
    • -
    - -
    - -
    - - - require_once - ("external-fetch.php") - (line 325) - -
    - - - -
    - -
    - -
    - - - require_once - ("external-fetch.php") - (line 65) - -
    - - -
    @@ -257,9 +242,24 @@
    - +
    +
    + + + require_once + ("vCalendar.php") + (line 42) + +
    + + + +
    + +
    +
    @@ -273,7 +273,7 @@
    -
    +
    @@ -287,15 +287,15 @@
    - -
    + +
    require_once - ("iCalendar.php") - (line 42) + ("external-fetch.php") + (line 218)
    @@ -316,44 +316,12 @@ | Functions
    - -
    - -
    - - calendar_to_xml (line 91) -
    - - -

    Return XML for a single calendar (or todo) entry from the DB

    -
      -
    • return: An XML document which is the response for the calendar
      • -
    -
    - string - - calendar_to_xml - - (array $properties, string $item) -
    - -
      -
    • - array - $properties: The properties for this calendar
      • -
    • - string - $item: The calendar data for this calendar
      • -
    - - -
    - +
    - component_to_xml (line 196) + component_to_xml (line 92)
    @@ -384,7 +352,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 by phpDocumentor 1.4.3

    \ No newline at end of file diff --git a/docs/api/davical/caldav/_inc---schedule-functions.php.html b/docs/api/davical/caldav/_inc---schedule-functions.php.html new file mode 100644 index 00000000..6a327c78 --- /dev/null +++ b/docs/api/davical/caldav/_inc---schedule-functions.php.html @@ -0,0 +1,303 @@ + + + + + + Docs for page schedule-functions.php + + + + +
    +

    File/inc/schedule-functions.php

    + + +
    +
    Description
    +
    + Description | + Includes + | Functions +
    +
    + +

    Functions for handling CalDAV Scheduling.

    + + +
    +
    + + + +
    +
    Includes
    +
    + Description | + Includes + | Functions +
    +
    + +
    + +
    + + + require_once + ('RRule-v2.php') + (line 14) + +
    + + + +
    + +
    + +
    + + + require_once + ('WritableCollection.php') + (line 13) + +
    + + + +
    + +
    + +
    + + + require_once + ('vCalendar.php') + (line 12) + +
    + + +

    Functions for handling CalDAV Scheduling.

    + + +
    +
    +
    + + + + +
    +
    Functions
    +
    + Description | + Includes + | Functions +
    +
    + +
    + +
    + + deliverItipCancel (line 312) +
    + + +

    Delivers the iTIP CANCEL message to an ATTENDEE's Scheduling Inbox Collection.

    +

    This is pretty simple at present, but could be extended in the future to do the sending of e-mail to a remote attendee.

    +
    + void + + deliverItipCancel + + ( $iTIP,  $attendee, WritableCollection $attendee_inbox) +
    + +
      +
    • + vCalendar + $iTIP
      • +
    • + vProperty + $attendee
      • +
    • + WritableCollection + $attendee_inbox
      • +
    + + +
    + +
    + +
    + + doItipAttendeeReply (line 67) +
    + + +

    Do the scheduling adjustments for a REPLY when an ATTENDEE updates their status.

    +
    + void + + doItipAttendeeReply + + ( $resource,  $partstat, vCalendar $vcal, string $organizer) +
    + +
      +
    • + vCalendar + $vcal: The resource that the ATTENDEE is writing to their calendar
      • +
    • + string + $organizer: The property which is the event ORGANIZER.
      • +
    • + vCalendar + $resource
      • +
    • + + $partstat
      • +
    + + +
    + +
    + +
    + + doItipOrganizerCancel (line 207) +
    + + +

    Handles sending the iTIP CANCEL messages to each ATTENDEE by the ORGANIZER.

    +
    + void + + doItipOrganizerCancel + + ( $vcal) +
    + +
      +
    • + vCalendar + $vcal: What's being cancelled.
      • +
    + + +
    + +
    + +
    + + do_scheduling_for_delete (line 24) +
    + + +

    Entry point for scheduling on DELETE, for which there are thee outcomes:

    • We don't do scheduling (disabled, no organizer, ...)
    • We are an ATTENDEE declining the meeting.

    +

    • We are the ORGANIZER canceling the meeting.

    +
    + void + + do_scheduling_for_delete + + (DAVResource $deleted_resource) +
    + +
      +
    • + DAVResource + $deleted_resource: The resource which has already been deleted
      • +
    + + +
    + +
    + +
    + + GetItip (line 178) +
    + + +
    + void + + GetItip + + ( $vcal,  $method,  $attendee_value) +
    + +
      +
    • + VCalendar + $vcal
      • +
    • + + $method
      • +
    • + + $attendee_value
      • +
    + + +
    + +
    + +
    + + processItipCancel (line 265) +
    + + +

    Does the actual processing of the iTIP CANCEL message on behalf of an ATTENDEE, which generally means writing it into the ATTENDEE's default calendar.

    +
    + void + + processItipCancel + + ( $vcal,  $attendee, WritableCollection $attendee_calendar, Principal $attendee_principal) +
    + +
      +
    • + vCalendar + $vcal: The message.
      • +
    • + vProperty + $attendee
      • +
    • + WritableCollection + $attendee_calendar
      • +
    • + Principal + $attendee_principal
      • +
    + + +
    +
    +
    + +

    + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 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 index 71677ab2..7cc48264 100644 --- a/docs/api/davical/external-bind/_inc---external-fetch.php.html +++ b/docs/api/davical/external-bind/_inc---external-fetch.php.html @@ -136,7 +136,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 ce514d4f..b57f5cb2 100644 --- a/docs/api/davical/iSchedule/_inc---iSchedule.php.html +++ b/docs/api/davical/iSchedule/_inc---iSchedule.php.html @@ -116,7 +116,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 e9ff98e1..57d7e92e 100644 --- a/docs/api/davical/iSchedule/iSchedule.html +++ b/docs/api/davical/iSchedule/iSchedule.html @@ -511,7 +511,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 index b4ca14a8..fe8b9d04 100644 --- a/docs/api/davical/ldap/_inc---drivers_imap_pam.php.html +++ b/docs/api/davical/ldap/_inc---drivers_imap_pam.php.html @@ -141,7 +141,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 bd95ca63..28dad458 100644 --- a/docs/api/davical/ldap/_inc---drivers_ldap.php.html +++ b/docs/api/davical/ldap/_inc---drivers_ldap.php.html @@ -134,7 +134,7 @@
    - LDAP_check (line 302) + LDAP_check (line 292)
    @@ -239,7 +239,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 by phpDocumentor 1.4.3

    \ No newline at end of file diff --git a/docs/api/davical/ldap/_inc---drivers_rimap.php.html b/docs/api/davical/ldap/_inc---drivers_rimap.php.html index bfb7b224..11837aac 100644 --- a/docs/api/davical/ldap/_inc---drivers_rimap.php.html +++ b/docs/api/davical/ldap/_inc---drivers_rimap.php.html @@ -141,7 +141,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 ffe7aaba..f8e5a500 100644 --- a/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html +++ b/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html @@ -141,7 +141,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 index d6af081c..cb3063b5 100644 --- a/docs/api/davical/ldap/imapPamDrivers.html +++ b/docs/api/davical/ldap/imapPamDrivers.html @@ -133,7 +133,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 fef70e62..0420f9f0 100644 --- a/docs/api/davical/ldap/ldapDrivers.html +++ b/docs/api/davical/ldap/ldapDrivers.html @@ -211,7 +211,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 1abcedb1..68145174 100644 --- a/docs/api/davical/ldap/squidPamDrivers.html +++ b/docs/api/davical/ldap/squidPamDrivers.html @@ -100,7 +100,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 70951af3..eff6938b 100644 --- a/docs/api/davical/logging/_inc---log_caldav_action.php.html +++ b/docs/api/davical/logging/_inc---log_caldav_action.php.html @@ -88,7 +88,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 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 96ea0a32..cdc64d2f 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 @@
    -
    +
    @@ -57,7 +57,7 @@
    -
    +
    @@ -72,7 +72,7 @@
    -
    +
    @@ -88,7 +88,7 @@
    -
    +
    @@ -117,7 +117,7 @@
    -
    +
    @@ -146,7 +146,7 @@
    -
    +
    @@ -181,7 +181,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:17 +1300 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 376992b8..c6db3c96 100644 --- a/docs/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html +++ b/docs/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html @@ -145,7 +145,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 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 ac5d2c8d..742d8464 100644 --- a/docs/api/davical/pwauth/pwauthPamDrivers.html +++ b/docs/api/davical/pwauth/pwauthPamDrivers.html @@ -100,7 +100,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 by phpDocumentor 1.4.3

    \ No newline at end of file diff --git a/docs/api/davical/tzservice/_htdocs---tz.php.html b/docs/api/davical/tzservice/_htdocs---tz.php.html index 1c9f2373..0962c4c9 100644 --- a/docs/api/davical/tzservice/_htdocs---tz.php.html +++ b/docs/api/davical/tzservice/_htdocs---tz.php.html @@ -112,7 +112,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 by phpDocumentor 1.4.3

    \ No newline at end of file diff --git a/docs/api/davical/tzservice/_inc---tz---capabilities.php.html b/docs/api/davical/tzservice/_inc---tz---capabilities.php.html index 25132651..50bbea3e 100644 --- a/docs/api/davical/tzservice/_inc---tz---capabilities.php.html +++ b/docs/api/davical/tzservice/_inc---tz---capabilities.php.html @@ -34,7 +34,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:18 +1300 by phpDocumentor 1.4.3

    \ No newline at end of file diff --git a/docs/api/davical/tzservice/_inc---tz---expand.php.html b/docs/api/davical/tzservice/_inc---tz---expand.php.html index 8428c528..e74a269a 100644 --- a/docs/api/davical/tzservice/_inc---tz---expand.php.html +++ b/docs/api/davical/tzservice/_inc---tz---expand.php.html @@ -163,7 +163,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 by phpDocumentor 1.4.3

    \ No newline at end of file diff --git a/docs/api/davical/tzservice/_inc---tz---get.php.html b/docs/api/davical/tzservice/_inc---tz---get.php.html index fa2bf9ef..9da1a513 100644 --- a/docs/api/davical/tzservice/_inc---tz---get.php.html +++ b/docs/api/davical/tzservice/_inc---tz---get.php.html @@ -67,7 +67,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:19 +1300 by phpDocumentor 1.4.3

    \ No newline at end of file diff --git a/docs/api/davical/tzservice/_inc---tz---list.php.html b/docs/api/davical/tzservice/_inc---tz---list.php.html index e917ac33..ecfa9c3c 100644 --- a/docs/api/davical/tzservice/_inc---tz---list.php.html +++ b/docs/api/davical/tzservice/_inc---tz---list.php.html @@ -67,7 +67,7 @@

    - Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:20 +1300 by phpDocumentor 1.4.3

    \ No newline at end of file diff --git a/docs/api/elementindex.html b/docs/api/elementindex.html index 7dba9866..cd3b2ba1 100644 --- a/docs/api/elementindex.html +++ b/docs/api/elementindex.html @@ -59,10 +59,11 @@
    Method - addAuthor + actualDeleteCalendarMember
    -
    AtomEntry::addAuthor() in AtomFeed.php
    +
    WritableCollection::actualDeleteCalendarMember() in WritableCollection.php
    +
    Writes the data to a member in the collection and returns the segment_name of the resource in our internal namespace.
    Method @@ -73,6 +74,13 @@
    Method + addAuthor +
    +
    +
    AtomEntry::addAuthor() in AtomFeed.php
    +
    +
    + Method addCategory
    @@ -143,6 +151,14 @@ Method AllowedTo +
    +
    PublicSession::AllowedTo() in PublicSession.php
    +
    Checks whether a user is allowed to do something.
    +
    +
    + Method + AllowedTo +
    CalDAVRequest::AllowedTo() in CalDAVRequest.php
    Are we allowed to do the requested activity
    @@ -157,14 +173,6 @@
    Method - AllowedTo -
    -
    -
    PublicSession::AllowedTo() in PublicSession.php
    -
    Checks whether a user is allowed to do something.
    -
    -
    - Method ApplyBySetPos
    @@ -207,7 +215,7 @@ AssignSessionDetails
    -
    DAViCalSession::AssignSessionDetails() in DAViCalSession.php
    +
    HTTPAuthSession::AssignSessionDetails() in HTTPAuthSession.php
    Internal function used to assign the session details to a user's new session.
    @@ -215,7 +223,7 @@ AssignSessionDetails
    -
    HTTPAuthSession::AssignSessionDetails() in HTTPAuthSession.php
    +
    DAViCalSession::AssignSessionDetails() in DAViCalSession.php
    Internal function used to assign the session details to a user's new session.
    @@ -492,15 +500,15 @@ $collection_id
    -
    Principal::$collection_id in Principal.php
    +
    CalDAVRequest::$collection_id in CalDAVRequest.php
    +
    The ID of the collection containing this path, or of this path if it is a collection
    Variable $collection_id
    -
    CalDAVRequest::$collection_id in CalDAVRequest.php
    -
    The ID of the collection containing this path, or of this path if it is a collection
    +
    Principal::$collection_id in Principal.php
    Variable @@ -554,14 +562,6 @@
    Principal::cacheFlush() in Principal.php
    -
    - Class - CalDAVClient -
    -
    -
    CalDAVClient in caldav-client.php
    -
    A class for accessing DAViCal via CalDAV, as a client
    -
    Method CalDAVClient @@ -572,6 +572,14 @@
    Class + CalDAVClient +
    +
    +
    CalDAVClient in caldav-client.php
    +
    A class for accessing DAViCal via CalDAV, as a client
    +
    +
    + Class CalDAVRequest
    @@ -609,14 +617,6 @@
    DAVPrincipal::calendar_home_set() in DAVPrincipal.php
    Get the calendar_home_set, as lazily as possible
    -
    - Function - calendar_to_xml -
    -
    -
    calendar_to_xml() in caldav-REPORT.php
    -
    Return XML for a single calendar (or todo) entry from the DB
    -
    Method CheckPassword @@ -726,6 +726,13 @@
    Function + check_real_php +
    +
    +
    check_real_php() in setup.php
    +
    +
    + Function check_schema_version
    @@ -1361,20 +1368,20 @@
    Method - DaysInMonth -
    -
    -
    iCalDate::DaysInMonth() in RRule.php
    -
    No of days in a month 1(Jan) - 12(Dec)
    -
    -
    - Method daysInMonth
    RepeatRuleDateTime::daysInMonth() in RRule-v2.php
    Returns the number of days in a year/month pair
    +
    + Method + DaysInMonth +
    +
    +
    iCalDate::DaysInMonth() in RRule.php
    +
    No of days in a month 1(Jan) - 12(Dec)
    +
    Constant DEBUG_EXPAND @@ -1412,6 +1419,14 @@
    delete_collection() in caldav-DELETE.php
    +
    + Function + deliverItipCancel +
    +
    +
    deliverItipCancel() in schedule-functions.php
    +
    Delivers the iTIP CANCEL message to an ATTENDEE's Scheduling Inbox Collection.
    +
    Method DepthRegexTail @@ -1467,6 +1482,22 @@
    CalDAVClient::DoGETRequest() in caldav-client.php
    Get a single item from the server.
    +
    + Function + doItipAttendeeReply +
    +
    +
    doItipAttendeeReply() in schedule-functions.php
    +
    Do the scheduling adjustments for a REPLY when an ATTENDEE updates their status.
    +
    +
    + Function + doItipOrganizerCancel +
    +
    +
    doItipOrganizerCancel() in schedule-functions.php
    +
    Handles sending the iTIP CANCEL messages to each ATTENDEE by the ORGANIZER.
    +
    Method doNormalLine @@ -1523,6 +1554,14 @@
    Function + do_scheduling_for_delete +
    +
    +
    do_scheduling_for_delete() in schedule-functions.php
    +
    Entry point for scheduling on DELETE, for which there are thee outcomes:
    • We don't do scheduling (disabled, no organizer, ...)
    • We are an ATTENDEE declining the meeting.
    +
    +
    + Function do_scheduling_reply
    @@ -1882,7 +1921,7 @@
    DAVResource::FetchParentContainer() in DAVResource.php
    -
    Fetch the parent to this resource.
    +
    Fetch the parent to this resource. This is deprecated - use GetParentContainer() instead.
    Method @@ -2133,6 +2172,13 @@
    CalDAVClient::GetHttpResponse() in caldav-client.php
    Output http response headers
    +
    + Function + GetItip +
    +
    +
    GetItip() in schedule-functions.php
    +
    Method GetLockDetails @@ -2200,16 +2246,16 @@ GetProperty
    -
    DAVResource::GetProperty() in DAVResource.php
    -
    Return general server-related properties, in plain form
    +
    DAVPrincipal::GetProperty() in DAVPrincipal.php
    +
    Return an arbitrary property
    Method GetProperty
    -
    DAVPrincipal::GetProperty() in DAVPrincipal.php
    -
    Return an arbitrary property
    +
    DAVResource::GetProperty() in DAVResource.php
    +
    Return general server-related properties, in plain form
    Method @@ -2640,14 +2686,6 @@
    i18n() in setup.php
    todo work out something more than true/false returns for dependency checks
    -
    - Class - iCalDate -
    -
    -
    iCalDate in RRule.php
    -
    A Class for handling dates in iCalendar format. We do make the simplifying assumption that all date handling in here is normalised to GMT. One day we might provide some functions to do that, but for now it is done externally.
    -
    Method iCalDate @@ -2656,6 +2694,14 @@
    iCalDate::iCalDate() in RRule.php
    The constructor takes either an iCalendar date, a text string formatted as an iCalendar date, or epoch seconds.
    +
    + Class + iCalDate +
    +
    +
    iCalDate in RRule.php
    +
    A Class for handling dates in iCalendar format. We do make the simplifying assumption that all date handling in here is normalised to GMT. One day we might provide some functions to do that, but for now it is done externally.
    +
    Method id @@ -2759,16 +2805,16 @@ 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.
    Method 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
    Class @@ -2841,11 +2887,11 @@
    Method - IsLocked + IsInSchedulingCollection
    -
    DAVResource::IsLocked() in DAVResource.php
    -
    Checks whether the resource is locked, returning any lock token, or false
    +
    DAVResource::IsInSchedulingCollection() in DAVResource.php
    +
    Checks whether this resource is IN a scheduling inbox/outbox collection
    Method @@ -2855,6 +2901,14 @@
    CalDAVRequest::IsLocked() in CalDAVRequest.php
    Checks whether the resource is locked, returning any lock token, or false
    +
    + Method + IsLocked +
    +
    +
    DAVResource::IsLocked() in DAVResource.php
    +
    Checks whether the resource is locked, returning any lock token, or false
    +
    Function ISODateToHTTPDate @@ -2868,16 +2922,16 @@ 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 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 @@ -2892,16 +2946,24 @@ IsPublic
    -
    DAVResource::IsPublic() in DAVResource.php
    -
    Checks whether the target collection is publicly_readable
    +
    CalDAVRequest::IsPublic() in CalDAVRequest.php
    +
    Checks whether the collection is public
    Method IsPublic
    -
    CalDAVRequest::IsPublic() in CalDAVRequest.php
    -
    Checks whether the collection is public
    +
    DAVResource::IsPublic() in DAVResource.php
    +
    Checks whether the target collection is publicly_readable
    +
    +
    + Method + IsPublicOnly +
    +
    +
    DAVResource::IsPublicOnly() in DAVResource.php
    +
    Checks whether the target collection is for public events only
    Method @@ -2909,7 +2971,7 @@
    DAVResource::IsSchedulingCollection() in DAVResource.php
    -
    Checks whether this resource is a calendar
    +
    Checks whether this resource is a scheduling inbox/outbox collection
    @@ -3243,15 +3305,15 @@ $privileges
    -
    CalDAVRequest::$privileges in CalDAVRequest.php
    -
    The decimal privileges allowed by this user to the identified resource.
    +
    Principal::$privileges in Principal.php
    Variable $privileges
    -
    Principal::$privileges in Principal.php
    +
    CalDAVRequest::$privileges in CalDAVRequest.php
    +
    The decimal privileges allowed by this user to the identified resource.
    Variable @@ -3444,7 +3506,7 @@ Privileges
    -
    CalDAVRequest::Privileges() in CalDAVRequest.php
    +
    DAVResource::Privileges() in DAVResource.php
    Return the privileges bits for the current session user to this resource
    @@ -3452,7 +3514,7 @@ Privileges
    -
    DAVResource::Privileges() in DAVResource.php
    +
    CalDAVRequest::Privileges() in CalDAVRequest.php
    Return the privileges bits for the current session user to this resource
    @@ -3488,6 +3550,14 @@
    Function + processItipCancel +
    +
    +
    processItipCancel() in schedule-functions.php
    +
    Does the actual processing of the iTIP CANCEL message on behalf of an ATTENDEE, which generally means writing it into the ATTENDEE's default calendar.
    +
    +
    + Function process_ace
    @@ -3517,14 +3587,6 @@
    DAVPrincipal::ProxyFor() in DAVPrincipal.php
    Accessor for read or write proxy
    -
    - Class - PublicSession -
    -
    -
    PublicSession in PublicSession.php
    -
    A Class for handling a public (anonymous) session
    -
    Method PublicSession @@ -3533,6 +3595,14 @@
    PublicSession::PublicSession() in PublicSession.php
    The constructor, which just calls the actual type configured
    +
    + Class + PublicSession +
    +
    +
    PublicSession in PublicSession.php
    +
    A Class for handling a public (anonymous) session
    +
    Function public_events_only @@ -3598,14 +3668,14 @@ $resourcetypes
    -
    DAVResource::$resourcetypes in DAVResource.php
    +
    Principal::$resourcetypes in Principal.php
    Variable $resourcetypes
    -
    Principal::$resourcetypes in Principal.php
    +
    DAVResource::$resourcetypes in DAVResource.php
    Variable @@ -3653,13 +3723,6 @@
    Method - render -
    -
    -
    Tools::render() in tools.php
    -
    -
    - Method Render
    @@ -3675,6 +3738,13 @@
    Method + render +
    +
    +
    Tools::render() in tools.php
    +
    +
    + Method RenderAsXML
    @@ -3942,6 +4012,13 @@
    SqlToArray.php in SqlToArray.php
    +
    + Page + schedule-functions.php +
    +
    +
    schedule-functions.php in schedule-functions.php
    +
    Method second @@ -4004,14 +4081,14 @@ setDate
    -
    AtomEntry::setDate() in AtomFeed.php
    +
    RepeatRuleDateTime::setDate() in RRule-v2.php
    Method setDate
    -
    RepeatRuleDateTime::setDate() in RRule-v2.php
    +
    AtomEntry::setDate() in AtomFeed.php
    Method @@ -4025,14 +4102,14 @@ setDateModified
    -
    AtomEntry::setDateModified() in AtomFeed.php
    +
    AtomFeed::setDateModified() in AtomFeed.php
    Method setDateModified
    -
    AtomFeed::setDateModified() in AtomFeed.php
    +
    AtomEntry::setDateModified() in AtomFeed.php
    Method @@ -4053,14 +4130,14 @@ setDescription
    -
    AtomEntry::setDescription() in AtomFeed.php
    +
    AtomFeed::setDescription() in AtomFeed.php
    Method setDescription
    -
    AtomFeed::setDescription() in AtomFeed.php
    +
    AtomEntry::setDescription() in AtomFeed.php
    Method @@ -4091,14 +4168,14 @@ setId
    -
    AtomEntry::setId() in AtomFeed.php
    +
    AtomFeed::setId() in AtomFeed.php
    Method setId
    -
    AtomFeed::setId() in AtomFeed.php
    +
    AtomEntry::setId() in AtomFeed.php
    Method @@ -4727,6 +4804,22 @@
    Method + WriteCalendarAlarms +
    +
    +
    WritableCollection::WriteCalendarAlarms() in WritableCollection.php
    +
    Given a dav_id and an original vCalendar, pull out each of the VALARMs and write the values into the calendar_alarm table.
    +
    +
    + Method + WriteCalendarAttendees +
    +
    +
    WritableCollection::WriteCalendarAttendees() in WritableCollection.php
    +
    Parse out the attendee property and write a row to the calendar_attendee table for each one.
    +
    +
    + Method WriteCalendarMember
    diff --git a/docs/api/elementindex_davical.html b/docs/api/elementindex_davical.html index b16418a7..3b9f0b2e 100644 --- a/docs/api/elementindex_davical.html +++ b/docs/api/elementindex_davical.html @@ -409,6 +409,14 @@
    CalDAVRequest::AllowedTo() in CalDAVRequest.php
    Are we allowed to do the requested activity
    +
    + Method + actualDeleteCalendarMember +
    +
    +
    WritableCollection::actualDeleteCalendarMember() in WritableCollection.php
    +
    Writes the data to a member in the collection and returns the segment_name of the resource in our internal namespace.
    +
    @@ -670,6 +678,13 @@
    Function + check_real_php +
    +
    +
    check_real_php() in setup.php
    +
    +
    + Function check_schema_version
    @@ -842,14 +857,6 @@
    Function - calendar_to_xml -
    -
    -
    calendar_to_xml() in caldav-REPORT.php
    -
    Return XML for a single calendar (or todo) entry from the DB
    -
    -
    - Function component_to_xml
    @@ -1269,6 +1276,14 @@
    Function + deliverItipCancel +
    +
    +
    deliverItipCancel() in schedule-functions.php
    +
    Delivers the iTIP CANCEL message to an ATTENDEE's Scheduling Inbox Collection.
    +
    +
    + Function display_status
    @@ -1277,6 +1292,30 @@
    Function + doItipAttendeeReply +
    +
    +
    doItipAttendeeReply() in schedule-functions.php
    +
    Do the scheduling adjustments for a REPLY when an ATTENDEE updates their status.
    +
    +
    + Function + doItipOrganizerCancel +
    +
    +
    doItipOrganizerCancel() in schedule-functions.php
    +
    Handles sending the iTIP CANCEL messages to each ATTENDEE by the ORGANIZER.
    +
    +
    + Function + do_scheduling_for_delete +
    +
    +
    do_scheduling_for_delete() in schedule-functions.php
    +
    Entry point for scheduling on DELETE, for which there are thee outcomes:
    • We don't do scheduling (disabled, no organizer, ...)
    • We are an ATTENDEE declining the meeting.
    +
    +
    + Function do_scheduling_reply
    @@ -1803,7 +1842,7 @@
    DAVResource::FetchParentContainer() in DAVResource.php
    -
    Fetch the parent to this resource.
    +
    Fetch the parent to this resource. This is deprecated - use GetParentContainer() instead.
    Method @@ -2007,6 +2046,13 @@
    Function + GetItip +
    +
    +
    GetItip() in schedule-functions.php
    +
    +
    + Function GetTZID
    @@ -2534,6 +2580,14 @@
    Method + IsInSchedulingCollection +
    +
    +
    DAVResource::IsInSchedulingCollection() in DAVResource.php
    +
    Checks whether this resource is IN a scheduling inbox/outbox collection
    +
    +
    + Method IsLocked
    @@ -2558,11 +2612,19 @@
    Method + IsPublicOnly +
    +
    +
    DAVResource::IsPublicOnly() in DAVResource.php
    +
    Checks whether the target collection is for public events only
    +
    +
    + Method IsSchedulingCollection
    DAVResource::IsSchedulingCollection() in DAVResource.php
    -
    Checks whether this resource is a calendar
    +
    Checks whether this resource is a scheduling inbox/outbox collection
    @@ -2860,6 +2922,14 @@
    Function + processItipCancel +
    +
    +
    processItipCancel() in schedule-functions.php
    +
    Does the actual processing of the iTIP CANCEL message on behalf of an ATTENDEE, which generally means writing it into the ATTENDEE's default calendar.
    +
    +
    + Function process_ace
    @@ -3477,6 +3547,13 @@
    SqlToArray in SqlToArray.php
    +
    + Page + schedule-functions.php +
    +
    +
    schedule-functions.php in schedule-functions.php
    +
    Function send_dav_header @@ -3989,6 +4066,22 @@
    Method + WriteCalendarAlarms +
    +
    +
    WritableCollection::WriteCalendarAlarms() in WritableCollection.php
    +
    Given a dav_id and an original vCalendar, pull out each of the VALARMs and write the values into the calendar_alarm table.
    +
    +
    + Method + WriteCalendarAttendees +
    +
    +
    WritableCollection::WriteCalendarAttendees() in WritableCollection.php
    +
    Parse out the attendee property and write a row to the calendar_attendee table for each one.
    +
    +
    + Method WriteCalendarMember
    diff --git a/docs/api/errors.html b/docs/api/errors.html index 204a496e..f7d15bfe 100644 --- a/docs/api/errors.html +++ b/docs/api/errors.html @@ -44,6 +44,7 @@ collection-edit.php
    createdb.php
    davical_configuration_missing.php
    +DAVPrincipal.php
    DAVResource.php
    DAVTicket.php
    dbexec.php
    @@ -75,6 +76,7 @@ public.php
    pubsub.php
    RRule-v2.php
    +schedule-functions.php
    setup.php
    SqlToArray.php
    test-RRULE-v2.php
    @@ -122,9 +124,9 @@ Use an @ignore tag on the original if you want this case to be documented.

    always.php

    Warnings:


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

    Errors:


    -Error on line 28 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    +Error on line 29 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"

    AtomFeed.php

    Warnings:


    @@ -137,8 +139,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 - "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"
    +Error on line 27 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage authentication"

    autodiscover-handler.php

    Warnings:


    @@ -183,16 +185,16 @@ 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 - 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 - "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"
    +Error on line 20 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"

    caldav-MOVE.php

    Warnings:


    @@ -209,8 +211,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 "XMLDocument.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-PROPFIND.php

    Warnings:


    @@ -237,11 +239,11 @@ Use an @ignore tag on the original if you want this case to be documented.

    caldav-REPORT-calquery.php

    Warnings:


    -Warning on line 360 - 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 365 - 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:


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

    caldav-REPORT-expand-property.php

    Warnings:


    @@ -253,8 +255,8 @@ Use an @ignore tag on the original if you want this case to be documented.

    caldav-REPORT-multiget.php

    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
    +Warning on line 106 - Unknown tag "@todo:" used
    +Warning on line 124 - 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:


    @@ -268,8 +270,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 "XMLDocument.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.php

    Warnings:


    @@ -288,7 +290,7 @@ Use an @ignore tag on the original if you want this case to be documented.

    collection-edit.php

    Warnings:


    -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
    +Warning on line 547 - 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:


    @@ -297,6 +299,13 @@ Use an @ignore tag on the original if you want this case to be documented.

    davical_configuration_missing.php

    Warnings:


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

    DAVPrincipal.php

    +

    Warnings:


    +Warning on line 11 - Page-level DocBlock precedes "require_once 'Principal.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 Principal"

    DAVResource.php

    Warnings:


    @@ -331,8 +340,8 @@ Use an @ignore tag on the original if you want this case to be documented.
    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 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"
    +Error on line 13 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"

    drivers_pwauth_pam.php

    Warnings:


    @@ -344,8 +353,8 @@ Use an @ignore tag on the original if you want this case to be documented.

    drivers_rimap.php

    Warnings:


    -Warning on line 13 - package davical is already in category Documentation, will now replace with category Technical
    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 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"
    @@ -356,19 +365,19 @@ Use an @ignore tag on the original if you want this case to be documented.
    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 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"
    +Error on line 13 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage ldap"

    expand.php

    Warnings:


    Warning on line 11 - Page-level DocBlock precedes "require_once 'vCalendar.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 tzservice"
    +Error on line 11 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"

    external-browse.php

    Warnings:


    -Warning on line 26 - File "/home/karora/projects/davical/inc/ui/external-browse.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    +Warning on line 37 - File "/home/karora/projects/davical/inc/ui/external-browse.php" has no page-level DocBlock, use @package in the first DocBlock to create one

    external-fetch.php

    Warnings:


    @@ -455,15 +464,15 @@ 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 '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"
    +Error on line 11 - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage Principal"

    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:


    @@ -477,11 +486,18 @@ Use an @ignore tag on the original if you want this case to be documented.
    Warning on line 521 - no @package tag was used in a DocBlock for class RepeatRuleDateRange
    Warning on line 589 - no @package tag was used in a DocBlock for class RepeatRule
    Warning on line 1448 - Unknown tag "@todo:" used
    + +

    schedule-functions.php

    +

    Warnings:


    +Warning on line 11 - Page-level DocBlock precedes "require_once 'vCalendar.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"

    setup.php

    Warnings:


    Warning on line 7 - no @package tag was used in a DocBlock for class CheckResult
    -Warning on line 386 - File "/home/karora/projects/davical/htdocs/setup.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    +Warning on line 396 - 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:


    @@ -507,8 +523,8 @@ Use an @ignore tag on the original if you want this case to be documented.
    Warning on line 11 - Page-level DocBlock precedes "require_once "./always.php"", use another DocBlock to document the source element
    Warning on line 38 - no @package tag was used in a DocBlock for class Tools

    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 DAViCalSession"
    +Error on line 11 - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"

    tz.php

    Warnings:


    @@ -528,14 +544,14 @@ Use an @ignore tag on the original if you want this case to be documented.

    well-known.php

    Warnings:


    -Warning on line 106 - File "/home/karora/projects/davical/inc/well-known.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    +Warning on line 107 - File "/home/karora/projects/davical/inc/well-known.php" has no page-level DocBlock, use @package in the first DocBlock to create one

    WritableCollection.php

    Warnings:


    Warning on line 3 - no @package tag was used in a DocBlock for class WritableCollection
    -Warning on line 319 - 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 444 - 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 Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 by phpDocumentor 1.4.3

    \ No newline at end of file diff --git a/docs/api/index.html b/docs/api/index.html index 4e5e6708..adc406fd 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_davical.html b/docs/api/li_davical.html index cbc5118a..afb46717 100644 --- a/docs/api/li_davical.html +++ b/docs/api/li_davical.html @@ -54,6 +54,7 @@
    Functioncheck_pdo
    Functioncheck_pdo_pgsql
    Functioncheck_pgsql
    +
    Functioncheck_real_php
    Functioncheck_schema_version
    Functioncheck_string
    Functioncheck_suhosin_server_strip
    @@ -171,13 +172,17 @@
    Functions
    -
    Functioncalendar_to_xml
    Functioncomponent_to_xml
    FunctioncontrolRequestContainer
    Functiondelete_collection
    +
    FunctiondeliverItipCancel
    Functiondisplay_status
    +
    FunctiondoItipAttendeeReply
    +
    FunctiondoItipOrganizerCancel
    +
    Functiondo_scheduling_for_delete
    Functiondo_scheduling_reply
    Functiondo_scheduling_requests
    +
    FunctionGetItip
    FunctionGetTZID
    Functionhandle_cancel_request
    Functionhandle_freebusy_request
    @@ -186,6 +191,7 @@
    Functionimport_collection
    FunctionlogRequestHeaders
    Functionobfuscated_event
    +
    FunctionprocessItipCancel
    Functionprocess_ace
    Functionproperty_response
    Functionpublic_events_only
    @@ -217,6 +223,7 @@
    Filecaldav-REPORT.php
    Filecaldav.php
    Filepublic.php
    +
    Fileschedule-functions.php
    diff --git a/docs/api/todolist.html b/docs/api/todolist.html index ff9999e3..c50156cd 100644 --- a/docs/api/todolist.html +++ b/docs/api/todolist.html @@ -28,7 +28,7 @@
  • Improve this to calculate the days difference and then the clock time diff and work from there.

    • - Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by phpDocumentor 1.4.3 + Documentation generated on Wed, 04 Jan 2012 16:20:21 +1300 by phpDocumentor 1.4.3

    \ No newline at end of file diff --git a/htdocs/always.php b/htdocs/always.php index 256f0e6d..c12a69a7 100644 --- a/htdocs/always.php +++ b/htdocs/always.php @@ -175,8 +175,8 @@ init_gettext( 'davical', $c->locale_path ); * */ $c->code_version = 0; -$c->want_awl_version = '0.49'; -$c->version_string = '0.9.9.7'; // The actual version # is replaced into that during the build /release process +$c->want_awl_version = '0.50'; +$c->version_string = '1.0.0'; // 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]; From 5df8e7c0b5e0e7fb6ca505e8c944df513f28962f Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 5 Jan 2012 11:26:58 +1300 Subject: [PATCH 16/18] Fix missing braces around admin restriction. --- htdocs/tools.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/tools.php b/htdocs/tools.php index e73a31ea..58c1fe0c 100644 --- a/htdocs/tools.php +++ b/htdocs/tools.php @@ -20,9 +20,9 @@ require_once("classBrowser.php"); require_once("caldav-PUT-functions.php"); include_once('check_UTF8.php'); -if ( !$session->AllowedTo("Admin" ) ) +if ( !$session->AllowedTo("Admin" ) ) { @ob_flush(); exit(0); - +} if( function_exists("sync_LDAP") && isset($_POST['Sync_LDAP'])){ sync_LDAP(); } From c2efe47a617310dfd5f96d5978b24c987fc67501 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 5 Jan 2012 12:06:53 +1300 Subject: [PATCH 17/18] Apply latest translations from transifex. --- po/de.po | 368 ++++++++++++++--------- po/es_AR.po | 193 +++++++----- po/es_ES.po | 391 +++++++++++++++--------- po/es_MX.po | 375 ++++++++++++++--------- po/es_VE.po | 177 +++++++---- po/et.po | 176 +++++++---- po/fr.po | 438 +++++++++++++++++---------- po/hu.po | 184 +++++++----- po/it.po | 184 +++++++----- po/ja.po | 187 +++++++----- po/nb_NO.po | 313 +++++++++++-------- po/nl.po | 410 ++++++++++++++++--------- po/pl.po | 842 +++++++++++++++++++++++++++------------------------- po/pt_BR.po | 393 +++++++++++++++--------- po/pt_PT.po | 367 ++++++++++++++--------- po/ru.po | 186 +++++++----- po/sv.po | 213 ++++++++----- 17 files changed, 3305 insertions(+), 2092 deletions(-) diff --git a/po/de.po b/po/de.po index 0d1f24c3..bec23438 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Andrew McMillan , 2011. # fmms , 2011. @@ -11,22 +11,24 @@ msgid "" msgstr "" "Project-Id-Version: DAViCal\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n" "POT-Creation-Date: 2011-11-21 10:59+1300\n" -"PO-Revision-Date: 2011-10-24 21:22+0000\n" -"Last-Translator: fmms \n" +"PO-Revision-Date: 2011-11-20 22:15+0000\n" +"Last-Translator: Andrew McMillan \n" "Language-Team: German (http://www.transifex.net/projects/p/davical/team/de/)\n" -"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php +#. Translators: this is the formatting of a date with time. See +#. http://php.net/manual/en/function.strftime.php msgid "%F %T" msgstr "%F %T" -#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php +#. Translators: his is the formatting of just the time. See +#. http://php.net/manual/en/function.strftime.php msgid "%T" msgstr "%T" @@ -76,51 +78,47 @@ msgstr "- aktualisiere Gruppen: %s" msgid "- updating user records : %s" msgstr "- aktualisiere Benutzereinträge: %s" -msgid "WARNING: all events in this path will be deleted before inserting allof the ics file" +msgid "" +"WARNING: all events in this path will be deleted before inserting allof " +"the ics file" msgstr "" -"WARNUNG: Vor dem Einfügen der ICS-Kalenderdatei werden alle Termine in diesem Pfad gelöscht" +"WARNUNG: Vor dem Einfügen der ICS-Kalenderdatei werden alle Termine in " +"diesem Pfad gelöscht" #, php-format msgid "" "

    Help

    \n" -"

    For initial help you should visit the DAViCal " -"Home Page or take\n" +"

    For initial help you should visit the DAViCal Home Page or take\n" "a look at the DAViCal Wiki.

    \n" -"

    If you can't find the answers there, visit us on IRC in\n" +"

    If you can't find the answers there, visit us on IRC in\n" "the #davical channel on irc.oftc.net,\n" -"or send a question to the DAViCal Users mailing list.

    \n" -"

    The mailing list\n" +"or send a question to the DAViCal Users mailing list.

    \n" +"

    The mailing list\n" "archives can be helpful too.

    " msgstr "" "

    Hilfe

    \n" -"

    Besuchen Sie die DAViCal-Homepage oder " -"schauen Sie \n" -"in das DAViCal-Wiki um Hilfe zu erhalten." -"

    \n" -"

    Falls Sie dort nicht die gesuchten Informationen finden, können Sie uns über IRC im\n" -"Channel #davical auf irc.oftc.net " -"besuchen\n" -"oder Ihre Frage an die DAViCal-Users-Mailingliste schicken.

    \n" -"

    Das Archiv der Mailingliste\n" +"

    Besuchen Sie die DAViCal-Homepage oder schauen Sie \n" +"in das DAViCal-Wiki um Hilfe zu erhalten.

    \n" +"

    Falls Sie dort nicht die gesuchten Informationen finden, können Sie uns über IRC im\n" +"Channel #davical auf irc.oftc.net besuchen\n" +"oder Ihre Frage an die DAViCal-Users-Mailingliste schicken.

    \n" +"

    Das Archiv der Mailingliste\n" "könnte ebenfalls interessant sein.

    " #, php-format msgid "" -"

    Log On Please

    For access to the %s you should log on withthe username and password that " -"have been issued to you.

    If you would like to request access, please e-mail %s.

    " +"

    Log On Please

    For access to the %s you should log on withthe " +"username and password that have been issued to you.

    If you would like " +"to request access, please e-mail %s.

    " msgstr "" -"

    Bitte anmelden

    Um auf %s zuzugreifen, müssen Sie sich mit demBenutzernamen und dem Passwort " -"anmelden, die ihnen zugeteilt wurden.

    Um einen Zugang zu beantragen, schreiben Sie eine E-Mail " -"an %s.

    " +"

    Bitte anmelden

    Um auf %s zuzugreifen, müssen Sie sich mit " +"demBenutzernamen und dem Passwort anmelden, die ihnen zugeteilt " +"wurden.

    Um einen Zugang zu beantragen, schreiben Sie eine E-Mail an " +"%s.

    " msgid "A DAViCal principal collection may only contain collections" -msgstr "Eine DAViCal-Prinzipalen-Sammlung darf nur andere Sammlungen enthalten" +msgstr "" +"Eine DAViCal-Prinzipalen-Sammlung darf nur andere Sammlungen enthalten" msgid "A collection already exists at that location." msgstr "An diesem Ort ist bereits eine Sammlung vorhanden." @@ -164,10 +162,14 @@ msgstr "Sämtliche Daten der Sammlung werden unwiderruflich gelöscht." #, php-format msgid "All events of user \"%s\" were deleted and replaced by those from file %s" -msgstr "All Ereignisse des Benutzers \"%s\" wurden gelöscht und durch die aus der Datei %s ersetzt" +msgstr "" +"All Ereignisse des Benutzers \"%s\" wurden gelöscht und durch die aus der " +"Datei %s ersetzt" -msgid "All of the principal's calendars and events will be unrecoverably deleted." -msgstr "Alle Kalender und Termine des Prinzipals werden unwiderruflich gelöscht." +msgid "" +"All of the principal's calendars and events will be unrecoverably deleted." +msgstr "" +"Alle Kalender und Termine des Prinzipals werden unwiderruflich gelöscht." msgid "All privileges" msgstr "Alle Rechte" @@ -175,8 +177,10 @@ msgstr "Alle Rechte" msgid "All requested changes were made." msgstr "Alle gewünschten Änderungen wurden durchgeführt." -msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox" -msgstr "Erlaube Frei-/Beschäftigt-Anfragen an den Besitzer dieser Termineingangsbox " +msgid "" +"Allow free/busy enquiries targeted at the owner of this scheduling inbox" +msgstr "" +"Erlaube Frei-/Beschäftigt-Anfragen an den Besitzer dieser Termineingangsbox " msgid "An \"Administrator\" user has full rights to the whole DAViCal System" msgstr "Ein \"Administrator\" besitzt alle Rechte im DAViCal-System" @@ -185,7 +189,8 @@ msgid "Anonymous users are not allowed to modify calendars" msgstr "Nicht angemeldete Benutzer dürfen keine Kalender verändern" msgid "Anonymous users may only access public calendars" -msgstr "Nicht angemeldete Benutzer können nur auf öffentliche Kalender zugreifen" +msgstr "" +"Nicht angemeldete Benutzer können nur auf öffentliche Kalender zugreifen" msgid "Application DB User" msgstr "Anwendungsdatenbankbenutzer" @@ -260,8 +265,11 @@ msgstr "Sammlungs-ID" msgid "Collection deleted" msgstr "Sammlung gelöscht" -msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time" -msgstr "Sammlungen können nicht gleichzeitig CalDAV-Kalender und -Adressbuch sein" +msgid "" +"Collections may not be both CalDAV calendars and CardDAV addressbooks at the" +" same time" +msgstr "" +"Sammlungen können nicht gleichzeitig CalDAV-Kalender und -Adressbuch sein" msgid "Configuring Calendar Clients for DAViCal" msgstr "Konfiguration von Kalender-Clients für DAViCal" @@ -312,7 +320,9 @@ msgid "Create Principal" msgstr "Prinzipalen anlegen" msgid "Create a new principal (i.e. a new user, resource or group)" -msgstr "Einen neuen Prinzipalen (z.B. neuen Benutzer, Ressource oder Gruppe) erstellen" +msgstr "" +"Einen neuen Prinzipalen (z.B. neuen Benutzer, Ressource oder Gruppe) " +"erstellen" msgid "Create a resource or collection" msgstr "Neue Ressource oder Sammlung erstellen" @@ -324,7 +334,9 @@ msgid "Creating new Principal record." msgstr "Erstelle neuen Prinizipalen." msgid "Creating new ticket granting privileges to this Principal" -msgstr "Generiere ein neues Ticket, um diesem Prinzipalen Berechtigungen zu verleihen" +msgstr "" +"Generiere ein neues Ticket, um diesem Prinzipalen Berechtigungen zu " +"verleihen" msgid "Current DAViCal version " msgstr "aktuelle DAViCal-Version" @@ -332,8 +344,11 @@ msgstr "aktuelle DAViCal-Version" msgid "DAV Path" msgstr "DAV-Pfad" -msgid "DAV::resourcetype may only be set to a new value, it may not be removed." -msgstr "DAV::resourcetype darf nur auf einen neuen Wert gesetzt, nicht aber gelöscht werden." +msgid "" +"DAV::resourcetype may only be set to a new value, it may not be removed." +msgstr "" +"DAV::resourcetype darf nur auf einen neuen Wert gesetzt, nicht aber gelöscht" +" werden." msgid "DAViCal CalDAV Server" msgstr "DAViCal-CalDAV-Server" @@ -366,7 +381,8 @@ msgid "DKIM signature validation failed(KEY Validation ERROR)" msgstr "DKIM-Signaturvalidierung fehlgeschlagen (KEY Validation ERROR)" msgid "DKIM signature validation failed(Signature verification ERROR)" -msgstr "DKIM-Signaturvalidierung fehlgeschlagen (Signature verification ERROR)" +msgstr "" +"DKIM-Signaturvalidierung fehlgeschlagen (Signature verification ERROR)" msgid "Database Error" msgstr "Datenbankfehler" @@ -431,11 +447,16 @@ msgstr "Lösche Prinzipalen:" msgid "Deleting Ticket:" msgstr "Lösche Ticket:" -msgid "Deliver scheduling invitations from an organiser to this scheduling inbox" -msgstr "Auslieferung von Termineinladungen von einem Organisierer an diese Termineingangsbox" +msgid "" +"Deliver scheduling invitations from an organiser to this scheduling inbox" +msgstr "" +"Auslieferung von Termineinladungen von einem Organisierer an diese " +"Termineingangsbox" msgid "Deliver scheduling replies from an attendee to this scheduling inbox" -msgstr "Auslieferung von Terminantworten von einem Teilnehmer an diese Termineingangsbox" +msgstr "" +"Auslieferung von Terminantworten von einem Teilnehmer an diese " +"Termineingangsbox" msgid "Dependencies" msgstr "Abhängigkeiten" @@ -485,13 +506,17 @@ msgstr "Benutzereintrag bearbeiten" msgid "Email Address" msgstr "E-Mail-Adresse" -msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password." +msgid "" +"Enter a username, if you know it, and click here, to be e-mailed a temporary" +" password." msgstr "" -"Geben Sie Ihren Benutzernamen ein (falls bekannt) und klicken Sie hier, um ein temporäres Passwort per " -"E-Mail zu erhalten." +"Geben Sie Ihren Benutzernamen ein (falls bekannt) und klicken Sie hier, um " +"ein temporäres Passwort per E-Mail zu erhalten." msgid "Enter your username and password then click here to log in." -msgstr "Geben Sie Benutzernamen und Passwort ein und klicken Sie hier, um sich anzumelden." +msgstr "" +"Geben Sie Benutzernamen und Passwort ein und klicken Sie hier, um sich " +"anzumelden." #, php-format msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<" @@ -499,7 +524,9 @@ msgstr "Fehler NoGroupFound mit Filter >%s<, Attribute >%s< , dn >%s<" #, php-format msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<" -msgstr "Der Fehler NoUserFound ist mit dem Filter >%s<, den Attributen >%s< und dn >%s< aufgetreten" +msgstr "" +"Der Fehler NoUserFound ist mit dem Filter >%s<, den Attributen >%s< und dn " +">%s< aufgetreten" msgid "Error querying database." msgstr "Fehler bei der Datenbankabfrage" @@ -517,10 +544,13 @@ msgid "European (d/m/y)" msgstr "Europäisch (tt.mm.jjjj)" msgid "Existing resource does not match \"If-Match\" header - not accepted." -msgstr "Bestehende Ressource passt nicht zum \"If-Match\"-Header - nicht akzeptiert." +msgstr "" +"Bestehende Ressource passt nicht zum \"If-Match\"-Header - nicht akzeptiert." msgid "Existing resource matches \"If-None-Match\" header - not accepted." -msgstr "Bestehende Ressource passt nicht zum \"If-None-Match\"-Header - nicht akzeptiert." +msgstr "" +"Bestehende Ressource passt nicht zum \"If-None-Match\"-Header - nicht " +"akzeptiert." msgid "Expires" msgstr "Läuft ab" @@ -713,8 +743,12 @@ msgstr "Abmelden" msgid "Member deleted from this Group Principal" msgstr "Mitglied wurde von diesem Gruppenprinzipalen entfernt" -msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended." -msgstr "DAViCal wird größtenteils funktionieren, aber PHP 5.2 oder neuer wird dringend empfohlen. " +msgid "" +"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly " +"recommended." +msgstr "" +"DAViCal wird größtenteils funktionieren, aber PHP 5.2 oder neuer wird " +"dringend empfohlen. " msgid "Name" msgstr "Name" @@ -790,11 +824,16 @@ msgstr "PHP-iconv-Unterstützung" msgid "PHP not using Apache Filter mode" msgstr "" -msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection" +msgid "" +"PUT on a collection is only allowed for text/calendar content against a " +"calendar collection" msgstr "" -"PUT-Anfrage an eine Collection ist nur mit text/calendar-Inhalt an eine Kalender-Collection erlaubt" +"PUT-Anfrage an eine Collection ist nur mit text/calendar-Inhalt an eine " +"Kalender-Collection erlaubt" -msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection" +msgid "" +"PUT on a collection is only allowed for text/vcard content against an " +"addressbook collection" msgstr "" msgid "Passed" @@ -822,7 +861,8 @@ msgid "Please confirm deletion of the principal" msgstr "Bitte bestätigen Sie die Löschung des Prinzipalen" msgid "Please note the time and advise the administrator of your system." -msgstr "Notieren Sie bitte die Zeit und benachrichtigen Sie den Systemadministrator." +msgstr "" +"Notieren Sie bitte die Zeit und benachrichtigen Sie den Systemadministrator." msgid "Principal" msgstr "Prinzipal" @@ -888,7 +928,8 @@ msgstr "Verfügbarkeitsinformationen lesen" msgid "Read the content of a resource or collection" msgstr "Den Inhalt einer Ressource oder Sammlung lesen" -msgid "Read the details of the current user's access control to this resource." +msgid "" +"Read the details of the current user's access control to this resource." msgstr "Lesen der Details der Zugriffsberechtigungen des aktuellen Benutzers" msgid "Read the free/busy information for a calendar collection" @@ -921,7 +962,8 @@ msgstr "Feature beantragen" msgid "Request body is not valid XML data!" msgstr "Anfrage-Body enthält keine gültigen XML-Daten!" -#. Translators a thing which might be booked: a room, a carpark, a projector... +#. Translators a thing which might be booked: a room, a carpark, a +#. projector... msgid "Resource" msgstr "Ressource" @@ -976,11 +1018,19 @@ msgstr "Terminverarbeitung: Senden..." msgid "Send free/busy enquiries" msgstr "Verfügbarkeitsanfrage senden" -msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox." -msgstr "Einladungen als Organisator vom Besitzer dieser Terminausgangsbox verschicken." +msgid "" +"Send scheduling invitations as an organiser from the owner of this " +"scheduling outbox." +msgstr "" +"Einladungen als Organisator vom Besitzer dieser Terminausgangsbox " +"verschicken." -msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox." -msgstr "Einladungsantworten als Teilnehmer vom Besitzer dieser Terminausgangsbox versenden." +msgid "" +"Send scheduling replies as an attendee from the owner of this scheduling " +"outbox." +msgstr "" +"Einladungsantworten als Teilnehmer vom Besitzer dieser Terminausgangsbox " +"versenden." msgid "Set free/busy privileges" msgstr "Verfügbarkeitsrechte setzen" @@ -992,7 +1042,8 @@ msgid "Set read+write privileges" msgstr "Schreib-/Leserechte setzen" msgid "" -"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/" +"Set the path to store your ics e.g. 'calendar' will be referenced as " +"/caldav.php/username/calendar/" msgstr "" msgid "Setup" @@ -1019,8 +1070,11 @@ msgstr "Einige Eigenschaften konnten nicht gesetzt werden." msgid "Source resource does not exist." msgstr "Quellressource existiert nicht." -msgid "Special collections may not contain a calendar or other special collection." -msgstr "Spezialsammlungen dürfen keine Kalender oder andere Spezialsammlungen enthalten." +msgid "" +"Special collections may not contain a calendar or other special collection." +msgstr "" +"Spezialsammlungen dürfen keine Kalender oder andere Spezialsammlungen " +"enthalten." msgid "Specific Privileges" msgstr "Sonderrechte" @@ -1062,8 +1116,11 @@ msgstr "Die URI der BIND-Anfrage MUSS eine Sammlung bezeichnen." msgid "The BIND method is not allowed at that location." msgstr "Die BIND-Methode ist an dieser Stelle nicht erlaubt." -msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars." -msgstr "Das Attribut \"CalDAV:schedule-calendar-transp\" darf nur bei Kalendern gesetzt werden." +msgid "" +"The CalDAV:schedule-calendar-transp property may only be set on calendars." +msgstr "" +"Das Attribut \"CalDAV:schedule-calendar-transp\" darf nur bei Kalendern " +"gesetzt werden." msgid "The DAViCal Home Page" msgstr "Die DAViCal-Startseite" @@ -1071,7 +1128,8 @@ msgstr "Die DAViCal-Startseite" msgid "The access ticket will be deleted." msgstr "Das Zugriffsticket wird gelöscht." -msgid "The addressbook-query report must be run against an addressbook collection" +msgid "" +"The addressbook-query report must be run against an addressbook collection" msgstr "addressbook-query darf nur bei einem Adressbuch ausgeführt werden" msgid "The application failed to understand that request." @@ -1087,13 +1145,18 @@ msgid "The calendar path contains illegal characters." msgstr "Der Kalenderpfad enthält ungültige Zeichen." msgid "" -"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection." +"The calendar-free-busy-set is superseded by the schedule-transp property of " +"a calendar collection." msgstr "" -"Das Attribut \"calendar-free-busy-set\" ist vom Attribut \"schedule-transp\" einer Kalendersammlung " -"ersetzt worden." +"Das Attribut \"calendar-free-busy-set\" ist vom Attribut \"schedule-transp\"" +" einer Kalendersammlung ersetzt worden." -msgid "The calendar-query report must be run against a calendar or a scheduling collection" -msgstr "calendar-query darf nur bei einem Kalender oder einer Terminsammlung ausgeführt werden" +msgid "" +"The calendar-query report must be run against a calendar or a scheduling " +"collection" +msgstr "" +"calendar-query darf nur bei einem Kalender oder einer Terminsammlung " +"ausgeführt werden" msgid "The collection name may not be blank." msgstr "Der Name für die Sammlung darf nicht leer sein." @@ -1101,18 +1164,26 @@ msgstr "Der Name für die Sammlung darf nicht leer sein." msgid "The destination collection does not exist" msgstr "Die angeforderte Sammlung existiert nicht" -msgid "The displayname may only be set on collections, principals or bindings." -msgstr "Der Anzeigenname darf nur für Sammlungen, Prinzipale oder Verknüpfungen gesetzt werden." +msgid "" +"The displayname may only be set on collections, principals or bindings." +msgstr "" +"Der Anzeigenname darf nur für Sammlungen, Prinzipale oder Verknüpfungen " +"gesetzt werden." msgid "The email address really should not be blank." msgstr "Das Feld für die E-Mail-Adresse sollte auf keinen Fall leer bleiben." #, php-format msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details" -msgstr "Die Datei \"%s\" ist nicht UTF-8-kodiert; weitere Details stehen in der Fehlermeldung." +msgstr "" +"Die Datei \"%s\" ist nicht UTF-8-kodiert; weitere Details stehen in der " +"Fehlermeldung." -msgid "The file is not UTF-8 encoded, please check the error for more details." -msgstr "Die Datei ist nicht in UTF-8-kodiert, bitte Fehler überprüfen für mehr Details." +msgid "" +"The file is not UTF-8 encoded, please check the error for more details." +msgstr "" +"Die Datei ist nicht in UTF-8-kodiert, bitte Fehler überprüfen für mehr " +"Details." msgid "The full name for this person, group or other type of principal." msgstr "Der vollständige Name dieser Person, Gruppe oder anderer Prinzipale." @@ -1155,10 +1226,12 @@ msgid "There was an error writing to the database." msgstr "Beim Schreiben in die Datenbank ist ein Fehler aufgetreten." msgid "" -"This operation does the following:
    • check valid groups in LDAP directory
    • check groups " -"in DAViCal
    then
    • if a group is present in DAViCal but not in LDAP set as inactive in " -"DAViCal
    • if a group is present in LDAP but not in DAViCal create the group in DAViCal
      • " -"
    • if a group in present in LDAP and DAViCal then update information in DAViCal
    " +"This operation does the following:
    • check valid groups in LDAP " +"directory
    • check groups in DAViCal
    then
    • if a group" +" is present in DAViCal but not in LDAP set as inactive in DAViCal
      • " +"
    • if a group is present in LDAP but not in DAViCal create the group in " +"DAViCal
    • if a group in present in LDAP and DAViCal then update " +"information in DAViCal
    " msgstr "" "Diese Funktion erledigt die folgenden Aufgaben:\n" "
      \n" @@ -1166,18 +1239,18 @@ msgstr "" "
    • überprüfen der Gruppen in DAViCal
      • \n" "
    danach\n" "
      \n" -"
    • falls eine Gruppe in DAViCal vorhanden ist, nicht aber im LDAP, diese in DAViCal als inaktiv " -"markieren
      • \n" +"
    • falls eine Gruppe in DAViCal vorhanden ist, nicht aber im LDAP, diese in DAViCal als inaktiv markieren
      • \n" "
    • falls eine Gruppe im LDAP vorhanden ist, nicht aber in DAViCal, diese in DAViCal anlegen
      • \n" -"
    • falls eine Gruppe im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren\n" +"
    • falls eine Gruppe im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren
      • \n" "
    " msgid "" -"This operation does the following:
    • check valid users in LDAP directory
    • check users in " -"DAViCal
    then
    • if a user is present in DAViCal but not in LDAP set him as inactive in " -"DAViCal
    • if a user is present in LDAP but not in DAViCal create the user in DAViCal
      • " -"
    • if a user in present in LDAP and DAViCal then update information in DAViCal
    " +"This operation does the following:
    • check valid users in LDAP " +"directory
    • check users in DAViCal
    then
    • if a user " +"is present in DAViCal but not in LDAP set him as inactive in DAViCal
      • " +"
    • if a user is present in LDAP but not in DAViCal create the user in " +"DAViCal
    • if a user in present in LDAP and DAViCal then update " +"information in DAViCal
    " msgstr "" "Diese Funktion erledigt die folgenden Aufgaben:\n" "
      \n" @@ -1185,27 +1258,26 @@ msgstr "" "
    • überprüfen der Benutzer in DAViCal
      • \n" "
    danach\n" "
      \n" -"
    • falls ein Benutzer in DAViCal vorhanden ist, nicht aber im LDAP, diesen in DAViCal als inaktiv " -"markieren
      • \n" +"
    • falls ein Benutzer in DAViCal vorhanden ist, nicht aber im LDAP, diesen in DAViCal als inaktiv markieren
      • \n" "
    • falls ein Benutzer im LDAP vorhanden ist, nicht aber in DAViCal, diesen in DAViCal anlegen
      • \n" -"
    • falls ein Benutzer im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal " -"aktualisieren
      • \n" +"
    • falls ein Benutzer im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren
      • \n" "
    " msgid "" -"This page primarily checks the environment needed for DAViCal to work correctly. Suggestions or " -"patches to make it do more useful stuff will be gratefully received." +"This page primarily checks the environment needed for DAViCal to work " +"correctly. Suggestions or patches to make it do more useful stuff will be " +"gratefully received." msgstr "" -"Diese Seite überprüft in erster Linie die Umgebung, die für DAViCal für korrektes Fuktionieren " -"benötigt wird. Vorschläge oder Korrekturen, um diese Seite noch sinnvoller zu gestalten werden dankbar " -"angenommen." +"Diese Seite überprüft in erster Linie die Umgebung, die für DAViCal für " +"korrektes Fuktionieren benötigt wird. Vorschläge oder Korrekturen, um diese " +"Seite noch sinnvoller zu gestalten werden dankbar angenommen." msgid "" -"This process will import each file in a directory named \"username.ics\" and create a user and " -"calendar for each file to import." +"This process will import each file in a directory named \"username.ics\" and" +" create a user and calendar for each file to import." msgstr "" -"Dieser Prozess wird jede Datei eines Verzeichnis in der Form \"Benutzer.ics\" importieren und die " -"entsprechenden Benutzer anlegen." +"Dieser Prozess wird jede Datei eines Verzeichnis in der Form " +"\"Benutzer.ics\" importieren und die entsprechenden Benutzer anlegen." msgid "This server only supports the text/calendar format for freebusy URLs" msgstr "Der Server unterstützt nur das text/calendar-Format für FreeBusy-URLs" @@ -1267,10 +1339,12 @@ msgstr "DAViCal-Datenbankschema aktualisieren" msgid "Upgrade Database" msgstr "Datenbank aktualisieren" -msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar." +msgid "" +"Upload a .ics calendar in iCalendar format to initialise or replace this " +"calendar." msgstr "" -"Laden Sie eine .ics-Kalenderdatei im iCalendar-Format hoch, um diesen Kalender zu initialisieren oder " -"zu ersetzen." +"Laden Sie eine .ics-Kalenderdatei im iCalendar-Format hoch, um diesen " +"Kalender zu initialisieren oder zu ersetzen." msgid "User Calendar Principals" msgstr "Prinzipal des Benutzerkalenders" @@ -1313,8 +1387,8 @@ msgid "Want: %s, Currently: %s" msgstr "Erwartet: %s, erhalten: %s" msgid "" -"Warning: there are no active admin users! You should fix this before logging out. Consider using the " -"$c->do_not_sync_from_ldap configuration setting." +"Warning: there are no active admin users! You should fix this before logging" +" out. Consider using the $c->do_not_sync_from_ldap configuration setting." msgstr "" "Warnung: Es sind keine aktiven Admin-Benutzer. Sie sollten dies vor dem Abmelden beheben. \n" "\n" @@ -1366,7 +1440,8 @@ msgid "You must log in to use this system." msgstr "Sie müssen angemeldet sein um dieses System zu nutzen." msgid "Your configuration produced PHP errors which should be corrected" -msgstr "Ihre Konfiguration hat PHP-Fehler verursacht. Dies sollte korrigiert werden." +msgstr "" +"Ihre Konfiguration hat PHP-Fehler verursacht. Dies sollte korrigiert werden." msgid "calendar-timezone property is only valid for a calendar." msgstr "Die Eigenschaft \"calendar-timezone\" ist nur für einen Kalender gültig." @@ -1375,32 +1450,49 @@ msgstr "Die Eigenschaft \"calendar-timezone\" ist nur für einen Kalender gülti msgid "directory %s is not readable" msgstr "Verzeichnis %s kann nicht gelesen werden" -msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php" -msgstr "drivers_imap_pam: imap_url-Parameter wurde nicht in /etc/davical/*-conf.php konfiguriert" +msgid "" +"drivers_imap_pam : imap_url parameter not configured in " +"/etc/davical/*-conf.php" +msgstr "" +"drivers_imap_pam: imap_url-Parameter wurde nicht in /etc/davical/*-conf.php " +"konfiguriert" msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed" -msgstr "drivers_ldap: TLS konnte nicht gestartet werden: ldap_start_tls() ist fehlgeschlagen" +msgstr "" +"drivers_ldap: TLS konnte nicht gestartet werden: ldap_start_tls() ist " +"fehlgeschlagen" #, php-format -msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s" -msgstr "drivers_ldap: Verbindung (bind) zu Host %1$s auf Port %2$s mit bindDN %3$s ist fehlgeschlagen" - -msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported" -msgstr "drivers_ldap: LDAP Protokoll-Version 3 konnte nicht gesetzt werden, TLS wird nicht unterstützt" +msgid "" +"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s" +msgstr "" +"drivers_ldap: Verbindung (bind) zu Host %1$s auf Port %2$s mit bindDN %3$s " +"ist fehlgeschlagen" msgid "" -"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your " -"LDAP server is reachable" +"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not " +"supported" msgstr "" -"drivers_ldap: Verbindung (bind) zu LDAP fehlgeschlagen - bitte überprüfen, ob bindDN und passDN " -"richtig konfiguriert sind, und ob der LDAP Server erreichbar ist" +"drivers_ldap: LDAP Protokoll-Version 3 konnte nicht gesetzt werden, TLS wird" +" nicht unterstützt" + +msgid "" +"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN " +"and passDN, and that your LDAP server is reachable" +msgstr "" +"drivers_ldap: Verbindung (bind) zu LDAP fehlgeschlagen - bitte überprüfen, " +"ob bindDN und passDN richtig konfiguriert sind, und ob der LDAP Server " +"erreichbar ist" #, php-format msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s" msgstr "drivers_ldap: LDAP-Verbindung zu Port %s auf Host %s fehlgeschlagen" -msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module" -msgstr "drivers_ldap: Funktion ldap_connect nicht definiert, bitte php_ldap Modul überprüfen" +msgid "" +"drivers_ldap : function ldap_connect not defined, check your php_ldap module" +msgstr "" +"drivers_ldap: Funktion ldap_connect nicht definiert, bitte php_ldap Modul " +"überprüfen" #, php-format msgid "drivers_pwauth_pam : Unable to find %s file" @@ -1410,7 +1502,8 @@ msgstr "drivers_pwauth_pam: Kann Datei %s nicht finden" msgid "drivers_squid_pam : Unable to find %s file" msgstr "drivers_squid_pam: Kann Datei %s nicht finden" -#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future +#. Translators: this is a colloquial phrase in english (the name of a flower) +#. and is an option allowing people to log in automatically in future msgid "forget me not" msgstr "angemeldet bleiben" @@ -1423,11 +1516,10 @@ msgstr "Speicherort für .ics-Datei" msgid "unauthenticated" msgstr "Nicht angemeldet" -msgid "you should log on with the username and password that have been issued to you." -msgstr "Melden Sie sich mit dem Ihnen zugeteilten Benutzernamen und Passwort an." +msgid "" +"you should log on with the username and password that have been issued to " +"you." +msgstr "" +"Melden Sie sich mit dem Ihnen zugeteilten Benutzernamen und Passwort an." -#~ msgid "Set schedule-deliver privileges" -#~ msgstr "Terminauslieferungsberechtigungen setzen" -#~ msgid "PHP PostgreSQL available" -#~ msgstr "PHP-PostgreSQL vorhanden" diff --git a/po/es_AR.po b/po/es_AR.po index 5987037f..76a32f5f 100644 --- a/po/es_AR.po +++ b/po/es_AR.po @@ -1,28 +1,30 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Andrew McMillan , 2011. msgid "" msgstr "" "Project-Id-Version: DAViCal\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n" "POT-Creation-Date: 2011-11-21 10:59+1300\n" -"PO-Revision-Date: 2011-10-24 08:21+0000\n" -"Last-Translator: karora \n" +"PO-Revision-Date: 2011-11-20 22:15+0000\n" +"Last-Translator: Andrew McMillan \n" "Language-Team: LANGUAGE \n" -"Language: es_AR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php +#. Translators: this is the formatting of a date with time. See +#. http://php.net/manual/en/function.strftime.php msgid "%F %T" msgstr "" -#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php +#. Translators: his is the formatting of just the time. See +#. http://php.net/manual/en/function.strftime.php msgid "%T" msgstr "" @@ -72,32 +74,32 @@ msgstr "" msgid "- updating user records : %s" msgstr "" -msgid "WARNING: all events in this path will be deleted before inserting allof the ics file" +msgid "" +"WARNING: all events in this path will be deleted before inserting allof " +"the ics file" msgstr "" #, php-format msgid "" "

    Help

    \n" -"

    For initial help you should visit the DAViCal " -"Home Page or take\n" +"

    For initial help you should visit the DAViCal Home Page or take\n" "a look at the DAViCal Wiki.

    \n" -"

    If you can't find the answers there, visit us on IRC in\n" +"

    If you can't find the answers there, visit us on IRC in\n" "the #davical channel on irc.oftc.net,\n" -"or send a question to the DAViCal Users mailing list.

    \n" -"

    The mailing list\n" +"or send a question to the DAViCal Users mailing list.

    \n" +"

    The mailing list\n" "archives can be helpful too.

    " msgstr "" #, php-format msgid "" -"

    Log On Please

    For access to the %s you should log on withthe username and password that " -"have been issued to you.

    If you would like to request access, please e-mail %s.

    " +"

    Log On Please

    For access to the %s you should log on withthe " +"username and password that have been issued to you.

    If you would like " +"to request access, please e-mail %s.

    " msgstr "" -"

    Por favor, iniciar sesión

    Para acceder al %s debe conectarse con el nombre de usuario y " -"contraseña que le han sido asignado.

    Si desea solicitar el acceso, por favor, e-mail %s.

    " +"

    Por favor, iniciar sesión

    Para acceder al %s debe conectarse con " +"el nombre de usuario y contraseña que le han sido asignado.

    Si desea " +"solicitar el acceso, por favor, e-mail %s.

    " msgid "A DAViCal principal collection may only contain collections" msgstr "" @@ -146,7 +148,8 @@ msgstr "" msgid "All events of user \"%s\" were deleted and replaced by those from file %s" msgstr "" -msgid "All of the principal's calendars and events will be unrecoverably deleted." +msgid "" +"All of the principal's calendars and events will be unrecoverably deleted." msgstr "" msgid "All privileges" @@ -155,7 +158,8 @@ msgstr "" msgid "All requested changes were made." msgstr "" -msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox" +msgid "" +"Allow free/busy enquiries targeted at the owner of this scheduling inbox" msgstr "" msgid "An \"Administrator\" user has full rights to the whole DAViCal System" @@ -240,7 +244,9 @@ msgstr "" msgid "Collection deleted" msgstr "" -msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time" +msgid "" +"Collections may not be both CalDAV calendars and CardDAV addressbooks at the" +" same time" msgstr "" msgid "Configuring Calendar Clients for DAViCal" @@ -312,7 +318,8 @@ msgstr "" msgid "DAV Path" msgstr "" -msgid "DAV::resourcetype may only be set to a new value, it may not be removed." +msgid "" +"DAV::resourcetype may only be set to a new value, it may not be removed." msgstr "" msgid "DAViCal CalDAV Server" @@ -411,7 +418,8 @@ msgstr "" msgid "Deleting Ticket:" msgstr "" -msgid "Deliver scheduling invitations from an organiser to this scheduling inbox" +msgid "" +"Deliver scheduling invitations from an organiser to this scheduling inbox" msgstr "" msgid "Deliver scheduling replies from an attendee to this scheduling inbox" @@ -454,7 +462,9 @@ msgid "ERROR: The new password must match the confirmed password." msgstr "" msgid "ERROR: There was a database error writing the roles information!" -msgstr "ERROR: Hubo un error en la base de datos al grabar la información de los roles!" +msgstr "" +"ERROR: Hubo un error en la base de datos al grabar la información de los " +"roles!" msgid "Edit" msgstr "" @@ -465,7 +475,9 @@ msgstr "Mostrar el registro de éste usuario" msgid "Email Address" msgstr "" -msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password." +msgid "" +"Enter a username, if you know it, and click here, to be e-mailed a temporary" +" password." msgstr "" msgid "Enter your username and password then click here to log in." @@ -691,7 +703,9 @@ msgstr "Desconectarse" msgid "Member deleted from this Group Principal" msgstr "" -msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended." +msgid "" +"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly " +"recommended." msgstr "" msgid "Name" @@ -768,10 +782,14 @@ msgstr "" msgid "PHP not using Apache Filter mode" msgstr "" -msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection" +msgid "" +"PUT on a collection is only allowed for text/calendar content against a " +"calendar collection" msgstr "" -msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection" +msgid "" +"PUT on a collection is only allowed for text/vcard content against an " +"addressbook collection" msgstr "" msgid "Passed" @@ -799,7 +817,9 @@ msgid "Please confirm deletion of the principal" msgstr "" msgid "Please note the time and advise the administrator of your system." -msgstr "Por favor, tome nota de la fecha y hora y contacte a su administrador de sistemas." +msgstr "" +"Por favor, tome nota de la fecha y hora y contacte a su administrador de " +"sistemas." msgid "Principal" msgstr "" @@ -865,7 +885,8 @@ msgstr "" msgid "Read the content of a resource or collection" msgstr "" -msgid "Read the details of the current user's access control to this resource." +msgid "" +"Read the details of the current user's access control to this resource." msgstr "" msgid "Read the free/busy information for a calendar collection" @@ -898,7 +919,8 @@ msgstr "" msgid "Request body is not valid XML data!" msgstr "" -#. Translators a thing which might be booked: a room, a carpark, a projector... +#. Translators a thing which might be booked: a room, a carpark, a +#. projector... msgid "Resource" msgstr "Recurso" @@ -953,10 +975,14 @@ msgstr "" msgid "Send free/busy enquiries" msgstr "" -msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox." +msgid "" +"Send scheduling invitations as an organiser from the owner of this " +"scheduling outbox." msgstr "" -msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox." +msgid "" +"Send scheduling replies as an attendee from the owner of this scheduling " +"outbox." msgstr "" msgid "Set free/busy privileges" @@ -969,7 +995,8 @@ msgid "Set read+write privileges" msgstr "" msgid "" -"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/" +"Set the path to store your ics e.g. 'calendar' will be referenced as " +"/caldav.php/username/calendar/" msgstr "" msgid "Setup" @@ -996,7 +1023,8 @@ msgstr "" msgid "Source resource does not exist." msgstr "" -msgid "Special collections may not contain a calendar or other special collection." +msgid "" +"Special collections may not contain a calendar or other special collection." msgstr "" msgid "Specific Privileges" @@ -1039,7 +1067,8 @@ msgstr "" msgid "The BIND method is not allowed at that location." msgstr "" -msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars." +msgid "" +"The CalDAV:schedule-calendar-transp property may only be set on calendars." msgstr "" msgid "The DAViCal Home Page" @@ -1048,7 +1077,8 @@ msgstr "" msgid "The access ticket will be deleted." msgstr "" -msgid "The addressbook-query report must be run against an addressbook collection" +msgid "" +"The addressbook-query report must be run against an addressbook collection" msgstr "" msgid "The application failed to understand that request." @@ -1064,10 +1094,13 @@ msgid "The calendar path contains illegal characters." msgstr "" msgid "" -"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection." +"The calendar-free-busy-set is superseded by the schedule-transp property of " +"a calendar collection." msgstr "" -msgid "The calendar-query report must be run against a calendar or a scheduling collection" +msgid "" +"The calendar-query report must be run against a calendar or a scheduling " +"collection" msgstr "" msgid "The collection name may not be blank." @@ -1076,7 +1109,8 @@ msgstr "" msgid "The destination collection does not exist" msgstr "" -msgid "The displayname may only be set on collections, principals or bindings." +msgid "" +"The displayname may only be set on collections, principals or bindings." msgstr "" msgid "The email address really should not be blank." @@ -1086,7 +1120,8 @@ msgstr "" msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details" msgstr "" -msgid "The file is not UTF-8 encoded, please check the error for more details." +msgid "" +"The file is not UTF-8 encoded, please check the error for more details." msgstr "" msgid "The full name for this person, group or other type of principal." @@ -1130,27 +1165,32 @@ msgid "There was an error writing to the database." msgstr "Hubo un error al grabar en la base de datos." msgid "" -"This operation does the following:
    • check valid groups in LDAP directory
    • check groups " -"in DAViCal
    then
    • if a group is present in DAViCal but not in LDAP set as inactive in " -"DAViCal
    • if a group is present in LDAP but not in DAViCal create the group in DAViCal
      • " -"
    • if a group in present in LDAP and DAViCal then update information in DAViCal
    " +"This operation does the following:
    • check valid groups in LDAP " +"directory
    • check groups in DAViCal
    then
    • if a group" +" is present in DAViCal but not in LDAP set as inactive in DAViCal
      • " +"
    • if a group is present in LDAP but not in DAViCal create the group in " +"DAViCal
    • if a group in present in LDAP and DAViCal then update " +"information in DAViCal
    " msgstr "" msgid "" -"This operation does the following:
    • check valid users in LDAP directory
    • check users in " -"DAViCal
    then
    • if a user is present in DAViCal but not in LDAP set him as inactive in " -"DAViCal
    • if a user is present in LDAP but not in DAViCal create the user in DAViCal
      • " -"
    • if a user in present in LDAP and DAViCal then update information in DAViCal
    " +"This operation does the following:
    • check valid users in LDAP " +"directory
    • check users in DAViCal
    then
    • if a user " +"is present in DAViCal but not in LDAP set him as inactive in DAViCal
      • " +"
    • if a user is present in LDAP but not in DAViCal create the user in " +"DAViCal
    • if a user in present in LDAP and DAViCal then update " +"information in DAViCal
    " msgstr "" msgid "" -"This page primarily checks the environment needed for DAViCal to work correctly. Suggestions or " -"patches to make it do more useful stuff will be gratefully received." +"This page primarily checks the environment needed for DAViCal to work " +"correctly. Suggestions or patches to make it do more useful stuff will be " +"gratefully received." msgstr "" msgid "" -"This process will import each file in a directory named \"username.ics\" and create a user and " -"calendar for each file to import." +"This process will import each file in a directory named \"username.ics\" and" +" create a user and calendar for each file to import." msgstr "" msgid "This server only supports the text/calendar format for freebusy URLs" @@ -1213,7 +1253,9 @@ msgstr "" msgid "Upgrade Database" msgstr "" -msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar." +msgid "" +"Upload a .ics calendar in iCalendar format to initialise or replace this " +"calendar." msgstr "" msgid "User Calendar Principals" @@ -1257,8 +1299,8 @@ msgid "Want: %s, Currently: %s" msgstr "" msgid "" -"Warning: there are no active admin users! You should fix this before logging out. Consider using the " -"$c->do_not_sync_from_ldap configuration setting." +"Warning: there are no active admin users! You should fix this before logging" +" out. Consider using the $c->do_not_sync_from_ldap configuration setting." msgstr "" msgid "When the user's e-mail account was validated." @@ -1316,29 +1358,35 @@ msgstr "" msgid "directory %s is not readable" msgstr "" -msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php" +msgid "" +"drivers_imap_pam : imap_url parameter not configured in " +"/etc/davical/*-conf.php" msgstr "" msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed" msgstr "" #, php-format -msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s" -msgstr "" - -msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported" +msgid "" +"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s" msgstr "" msgid "" -"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your " -"LDAP server is reachable" +"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not " +"supported" +msgstr "" + +msgid "" +"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN " +"and passDN, and that your LDAP server is reachable" msgstr "" #, php-format msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s" msgstr "" -msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module" +msgid "" +"drivers_ldap : function ldap_connect not defined, check your php_ldap module" msgstr "" #, php-format @@ -1349,7 +1397,8 @@ msgstr "" msgid "drivers_squid_pam : Unable to find %s file" msgstr "" -#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future +#. Translators: this is a colloquial phrase in english (the name of a flower) +#. and is an option allowing people to log in automatically in future msgid "forget me not" msgstr "" @@ -1362,5 +1411,11 @@ msgstr "" msgid "unauthenticated" msgstr "" -msgid "you should log on with the username and password that have been issued to you." -msgstr "Para conectarse debe utilizar el nombre de usuario y contraseña que le ha sido asignado." +msgid "" +"you should log on with the username and password that have been issued to " +"you." +msgstr "" +"Para conectarse debe utilizar el nombre de usuario y contraseña que le ha " +"sido asignado." + + diff --git a/po/es_ES.po b/po/es_ES.po index 97e5ec48..65dd184a 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Eugene Ciurana , 2011. # Jorge López , 2011. @@ -9,22 +9,24 @@ msgid "" msgstr "" "Project-Id-Version: DAViCal\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n" "POT-Creation-Date: 2011-11-21 10:59+1300\n" -"PO-Revision-Date: 2011-10-25 12:52+0000\n" -"Last-Translator: adobo \n" +"PO-Revision-Date: 2011-11-20 22:15+0000\n" +"Last-Translator: Andrew McMillan \n" "Language-Team: Spanish (Spain) (http://www.transifex.net/projects/p/davical/team/es_ES/)\n" -"Language: es_ES\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php +#. Translators: this is the formatting of a date with time. See +#. http://php.net/manual/en/function.strftime.php msgid "%F %T" msgstr "%F %T" -#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php +#. Translators: his is the formatting of just the time. See +#. http://php.net/manual/en/function.strftime.php msgid "%T" msgstr "%T" @@ -74,47 +76,42 @@ msgstr "- actualizando los grupos: %s" msgid "- updating user records : %s" msgstr "- actualizando los registros de usuario: %s" -msgid "WARNING: all events in this path will be deleted before inserting allof the ics file" +msgid "" +"WARNING: all events in this path will be deleted before inserting allof " +"the ics file" msgstr "" -"ADVERTENCIA: todos los eventos en este contenedor serán eliminados antes de insertar el archivo " -"ics" +"ADVERTENCIA: todos los eventos en este contenedor serán eliminados antes" +" de insertar el archivo ics" #, php-format msgid "" "

    Help

    \n" -"

    For initial help you should visit the DAViCal " -"Home Page or take\n" +"

    For initial help you should visit the DAViCal Home Page or take\n" "a look at the DAViCal Wiki.

    \n" -"

    If you can't find the answers there, visit us on IRC in\n" +"

    If you can't find the answers there, visit us on IRC in\n" "the #davical channel on irc.oftc.net,\n" -"or send a question to the DAViCal Users mailing list.

    \n" -"

    The mailing list\n" +"or send a question to the DAViCal Users mailing list.

    \n" +"

    The mailing list\n" "archives can be helpful too.

    " msgstr "" "

    Ayuda\n" -"

    Visita la Página Principal de DAViCal para " -"ayuda inicial, o consultael Wiki de DAViCal.

    Si no encuentras la respuesta a tus dudas, visítanos en IRC enel canal #davical en irc.oftc.net,\n" -"o envía tus preguntas a la lista de correo de Usuarios de DAViCal.

    \n" -"

    El archivo de la lista de correotambien te será útil." +"

    Visita la Página Principal de DAViCal para ayuda inicial, o consultael Wiki de DAViCal.

    Si no encuentras la respuesta a tus dudas, visítanos en IRC enel canal #davical en irc.oftc.net,\n" +"o envía tus preguntas a la lista de correo de Usuarios de DAViCal.

    \n" +"

    El archivo de la lista de correotambien te será útil." #, php-format msgid "" -"

    Log On Please

    For access to the %s you should log on withthe username and password that " -"have been issued to you.

    If you would like to request access, please e-mail %s.

    " +"

    Log On Please

    For access to the %s you should log on withthe " +"username and password that have been issued to you.

    If you would like " +"to request access, please e-mail %s.

    " msgstr "" -"

    Por favor, autentíquese

    Para acceder a %s debe identificarse con su nombre de usuario y su " -"clave de acceso.

    Escriba a %s si desea solicitar acceso." +"

    Por favor, autentíquese

    Para acceder a %s debe identificarse con " +"su nombre de usuario y su clave de acceso.

    Escriba a %s si desea " +"solicitar acceso." msgid "A DAViCal principal collection may only contain collections" -msgstr "Una colección principal de DAViCal solo puede contener otras colecciones" +msgstr "" +"Una colección principal de DAViCal solo puede contener otras colecciones" msgid "A collection already exists at that location." msgstr "Ya existe una colección en esa ruta." @@ -159,11 +156,14 @@ msgstr "Todos los datos de esta colección serán eliminados permanentemente." #, php-format msgid "All events of user \"%s\" were deleted and replaced by those from file %s" msgstr "" -"Todos los eventos del usuario \"%s\" fueron eliminados y reemplazados por los contenidos en el fichero " -"%s" +"Todos los eventos del usuario \"%s\" fueron eliminados y reemplazados por " +"los contenidos en el fichero %s" -msgid "All of the principal's calendars and events will be unrecoverably deleted." -msgstr "Todos los calendarios y eventos de este 'principal' serán eliminados permanentemente." +msgid "" +"All of the principal's calendars and events will be unrecoverably deleted." +msgstr "" +"Todos los calendarios y eventos de este 'principal' serán eliminados " +"permanentemente." msgid "All privileges" msgstr "Todos los privilegios" @@ -171,8 +171,11 @@ msgstr "Todos los privilegios" msgid "All requested changes were made." msgstr "Todos los cambios solicitados fueron aplicados." -msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox" -msgstr "Permitir consultas libre/ocupado sobre el dueño de este buzón de planificación" +msgid "" +"Allow free/busy enquiries targeted at the owner of this scheduling inbox" +msgstr "" +"Permitir consultas libre/ocupado sobre el dueño de este buzón de " +"planificación" msgid "An \"Administrator\" user has full rights to the whole DAViCal System" msgstr "Un usuario \"Administrador\" tiene todos los permisos en DAViCal." @@ -230,7 +233,8 @@ msgid "Calendar Timezone" msgstr "Zona horaria del calendario" msgid "Can only add tickets for existing collection paths which you own" -msgstr "Solo puede agregar tickets en conexiones existentes que le pertenezcan" +msgstr "" +"Solo puede agregar tickets en conexiones existentes que le pertenezcan" msgid "Categories" msgstr "Categorías" @@ -256,8 +260,12 @@ msgstr "ID de la colección" msgid "Collection deleted" msgstr "Colección eliminada" -msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time" -msgstr "Las colecciones no pueden ser calendarios CalDAV y agendas de teléfono CardDAV al mismo tiempo" +msgid "" +"Collections may not be both CalDAV calendars and CardDAV addressbooks at the" +" same time" +msgstr "" +"Las colecciones no pueden ser calendarios CalDAV y agendas de teléfono " +"CardDAV al mismo tiempo" msgid "Configuring Calendar Clients for DAViCal" msgstr "Configurando clientes de calendario para DAViCal" @@ -328,8 +336,10 @@ msgstr "Versión actual de DAViCal" msgid "DAV Path" msgstr "Ruta DAV" -msgid "DAV::resourcetype may only be set to a new value, it may not be removed." -msgstr "DAV::resourcetype sólo puede tener un nuevo valor, no puede ser eliminado" +msgid "" +"DAV::resourcetype may only be set to a new value, it may not be removed." +msgstr "" +"DAV::resourcetype sólo puede tener un nuevo valor, no puede ser eliminado" msgid "DAViCal CalDAV Server" msgstr "Servidor CalDAV DAViCal" @@ -427,11 +437,16 @@ msgstr "Eliminando 'principal':" msgid "Deleting Ticket:" msgstr "Eliminando ticket:" -msgid "Deliver scheduling invitations from an organiser to this scheduling inbox" -msgstr "Permitir al organizador de un evento enviar una invitación a este buzón de planificación" +msgid "" +"Deliver scheduling invitations from an organiser to this scheduling inbox" +msgstr "" +"Permitir al organizador de un evento enviar una invitación a este buzón de " +"planificación" msgid "Deliver scheduling replies from an attendee to this scheduling inbox" -msgstr "Permitir a un asistente a un evento enviar una respuesta a este buzón de planificación" +msgstr "" +"Permitir a un asistente a un evento enviar una respuesta a este buzón de " +"planificación" msgid "Dependencies" msgstr "Dependencias" @@ -467,10 +482,13 @@ msgid "ERROR: The full name may not be blank." msgstr "ERROR: El nombre completo no puede estar vacío." msgid "ERROR: The new password must match the confirmed password." -msgstr "ERROR: La nueva contraseña debe coincidir con el campo de confirmación" +msgstr "" +"ERROR: La nueva contraseña debe coincidir con el campo de confirmación" msgid "ERROR: There was a database error writing the roles information!" -msgstr "ERROR: Hubo un error en la base de datos al escribir la información sobre los roles" +msgstr "" +"ERROR: Hubo un error en la base de datos al escribir la información sobre " +"los roles" msgid "Edit" msgstr "Editar" @@ -481,12 +499,17 @@ msgstr "Editar el registro de este usuario" msgid "Email Address" msgstr "Dirección de email" -msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password." +msgid "" +"Enter a username, if you know it, and click here, to be e-mailed a temporary" +" password." msgstr "" -"Proporcione un nombre de usuario, si lo sabe, y haga click aquí para enviarle una contraseña temporal." +"Proporcione un nombre de usuario, si lo sabe, y haga click aquí para " +"enviarle una contraseña temporal." msgid "Enter your username and password then click here to log in." -msgstr "Proporcione su nombre de usuario y contraseña, depues haga click aquí para acceder." +msgstr "" +"Proporcione su nombre de usuario y contraseña, depues haga click aquí para " +"acceder." #, php-format msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<" @@ -512,10 +535,13 @@ msgid "European (d/m/y)" msgstr "Europeo (d/m/y)" msgid "Existing resource does not match \"If-Match\" header - not accepted." -msgstr "El recurso existente no coincide con el encabezado \"If-Match\" - rechazado." +msgstr "" +"El recurso existente no coincide con el encabezado \"If-Match\" - rechazado." msgid "Existing resource matches \"If-None-Match\" header - not accepted." -msgstr "El recurso existente coincide con el encabezado \"If-None-Match\" - rechazado." +msgstr "" +"El recurso existente coincide con el encabezado \"If-None-Match\" - " +"rechazado." msgid "Expires" msgstr "Expira" @@ -551,7 +577,8 @@ msgid "Fullname" msgstr "Nombre" msgid "GET requests on collections are only supported for calendars." -msgstr "Las solicitudes GET en colecciones solo están disponibles para calendarios." +msgstr "" +"Las solicitudes GET en colecciones solo están disponibles para calendarios." msgid "GNU gettext support" msgstr "Soporte para GNU gettext" @@ -708,10 +735,12 @@ msgstr "Salir" msgid "Member deleted from this Group Principal" msgstr "Miembro eliminado de este grupo" -msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended." +msgid "" +"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly " +"recommended." msgstr "" -"La mayoría de las funciones de DAViCal funcionarán, pero es muy recomendable actualizar a PHP 5.2 o " -"más reciente." +"La mayoría de las funciones de DAViCal funcionarán, pero es muy recomendable" +" actualizar a PHP 5.2 o más reciente." msgid "Name" msgstr "Nombre" @@ -787,14 +816,19 @@ msgstr "Soporte PHP iconv" msgid "PHP not using Apache Filter mode" msgstr "" -msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection" +msgid "" +"PUT on a collection is only allowed for text/calendar content against a " +"calendar collection" msgstr "" -"El método PUT con contenido de tipo text/calendar sólo se permite en una colección de tipo calendario" +"El método PUT con contenido de tipo text/calendar sólo se permite en una " +"colección de tipo calendario" -msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection" +msgid "" +"PUT on a collection is only allowed for text/vcard content against an " +"addressbook collection" msgstr "" -"El método PUT con contenido de tipo text/vcard sólo se permite en una colección de tipo libreta de " -"direcciones" +"El método PUT con contenido de tipo text/vcard sólo se permite en una " +"colección de tipo libreta de direcciones" msgid "Passed" msgstr "Aceptado" @@ -809,7 +843,8 @@ msgid "Person" msgstr "Persona" msgid "Please confirm deletion of access ticket - see below" -msgstr "Por favor confirme la eliminación del ticket de acceso - véase más abajo" +msgstr "" +"Por favor confirme la eliminación del ticket de acceso - véase más abajo" msgid "Please confirm deletion of binding - see below" msgstr "Por favor confirme la eliminación del enlace - véase más abajo" @@ -887,11 +922,14 @@ msgstr "Consultar información libre/ocupado" msgid "Read the content of a resource or collection" msgstr "Leer el contenido de un recurso o colección" -msgid "Read the details of the current user's access control to this resource." -msgstr "Leer los detalles de control de acceso para el usuario actual a este recurso" +msgid "" +"Read the details of the current user's access control to this resource." +msgstr "" +"Leer los detalles de control de acceso para el usuario actual a este recurso" msgid "Read the free/busy information for a calendar collection" -msgstr "Consultar la información libre/ocupado para una colección de calendario" +msgstr "" +"Consultar la información libre/ocupado para una colección de calendario" msgid "Read/Write" msgstr "Lectura/escritura" @@ -920,7 +958,8 @@ msgstr "Solicitar una funcionalidad" msgid "Request body is not valid XML data!" msgstr "¡El cuerpo de la petición no contiene datos XML válidos!" -#. Translators a thing which might be booked: a room, a carpark, a projector... +#. Translators a thing which might be booked: a room, a carpark, a +#. projector... msgid "Resource" msgstr "Recurso" @@ -975,15 +1014,19 @@ msgstr "Planificación: envío" msgid "Send free/busy enquiries" msgstr "Enviar comprobaciones de libre/ocupado" -msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox." +msgid "" +"Send scheduling invitations as an organiser from the owner of this " +"scheduling outbox." msgstr "" -"Envío de invitaciones de planificación como organizador por parte del dueño de este buzón de " -"planificación" +"Envío de invitaciones de planificación como organizador por parte del dueño " +"de este buzón de planificación" -msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox." +msgid "" +"Send scheduling replies as an attendee from the owner of this scheduling " +"outbox." msgstr "" -"Envío de respuestas a propuestas de planificación como asistente por parte del dueño de este buzón de " -"planificación" +"Envío de respuestas a propuestas de planificación como asistente por parte " +"del dueño de este buzón de planificación" msgid "Set free/busy privileges" msgstr "Activar permisos libre/ocupado" @@ -995,10 +1038,11 @@ msgid "Set read+write privileges" msgstr "Activar permisos de lectura+escritura" msgid "" -"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/" +"Set the path to store your ics e.g. 'calendar' will be referenced as " +"/caldav.php/username/calendar/" msgstr "" -"Indique la ruta en la que se almacenarán sus ics. Por ejemplo, 'calendario' se traducirá en '/caldav." -"php/usuario/calendario/'" +"Indique la ruta en la que se almacenarán sus ics. Por ejemplo, 'calendario' " +"se traducirá en '/caldav.php/usuario/calendario/'" msgid "Setup" msgstr "Configuración" @@ -1013,7 +1057,8 @@ msgid "Site Statistics" msgstr "Estadísticas del sitio" msgid "Site Statistics require the database to be available!" -msgstr "¡Las estadísticas del sitio necesitan que la base de datos esté disponible!" +msgstr "" +"¡Las estadísticas del sitio necesitan que la base de datos esté disponible!" msgid "Some properties were not able to be changed." msgstr "No fue posible cambiar algunas propiedades." @@ -1024,8 +1069,11 @@ msgstr "No fue posible configurar algunas propiedades." msgid "Source resource does not exist." msgstr "El recurso de origen no existe." -msgid "Special collections may not contain a calendar or other special collection." -msgstr "Las colecciones especiales no pueden contener un calendario u otra colección especial." +msgid "" +"Special collections may not contain a calendar or other special collection." +msgstr "" +"Las colecciones especiales no pueden contener un calendario u otra colección" +" especial." msgid "Specific Privileges" msgstr "Privilegios concretos." @@ -1067,8 +1115,11 @@ msgstr "El URI de la solicitud BIND DEBE identificar a una colección." msgid "The BIND method is not allowed at that location." msgstr "No está permitido el método BIND en esa ruta." -msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars." -msgstr "La propiedad CalDAV:schedule-calendar-transp sólo puede ser configurada en calendarios." +msgid "" +"The CalDAV:schedule-calendar-transp property may only be set on calendars." +msgstr "" +"La propiedad CalDAV:schedule-calendar-transp sólo puede ser configurada en " +"calendarios." msgid "The DAViCal Home Page" msgstr "Página principal de DAViCal" @@ -1076,9 +1127,11 @@ msgstr "Página principal de DAViCal" msgid "The access ticket will be deleted." msgstr "El ticket de acceso será eliminado." -msgid "The addressbook-query report must be run against an addressbook collection" +msgid "" +"The addressbook-query report must be run against an addressbook collection" msgstr "" -"La solicitud addressbook-query debe ejecutarse contra una colección de tipo libreta de direcciones" +"La solicitud addressbook-query debe ejecutarse contra una colección de tipo " +"libreta de direcciones" msgid "The application failed to understand that request." msgstr "La aplicación no pudo entender la petición" @@ -1093,14 +1146,18 @@ msgid "The calendar path contains illegal characters." msgstr "La ruta al calendario contiene caracteres no permitidos." msgid "" -"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection." +"The calendar-free-busy-set is superseded by the schedule-transp property of " +"a calendar collection." msgstr "" -"La propiedad calendar-free-busy-set tiene menos prioridad que la propiedad schedule-transp en una " -"colección de tipo calendario." +"La propiedad calendar-free-busy-set tiene menos prioridad que la propiedad " +"schedule-transp en una colección de tipo calendario." -msgid "The calendar-query report must be run against a calendar or a scheduling collection" +msgid "" +"The calendar-query report must be run against a calendar or a scheduling " +"collection" msgstr "" -"La petición calendar-query debe ejecutarse contra un calendario o una colección de planificación." +"La petición calendar-query debe ejecutarse contra un calendario o una " +"colección de planificación." msgid "The collection name may not be blank." msgstr "El nombre de la colección no puede dejarse en blanco." @@ -1108,8 +1165,11 @@ msgstr "El nombre de la colección no puede dejarse en blanco." msgid "The destination collection does not exist" msgstr "La colección de destino no existe." -msgid "The displayname may only be set on collections, principals or bindings." -msgstr "El nombre mostrado puede asignarse sólo en colecciones, 'principals', o enlaces." +msgid "" +"The displayname may only be set on collections, principals or bindings." +msgstr "" +"El nombre mostrado puede asignarse sólo en colecciones, 'principals', o " +"enlaces." msgid "The email address really should not be blank." msgstr "La dirección de correo electrónico no debería estar vacía." @@ -1117,15 +1177,18 @@ msgstr "La dirección de correo electrónico no debería estar vacía." #, php-format msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details" msgstr "" -"El fichero \"%s\" no está codificado en UTF-8, por favor compruebe el log de errores para conocer más " -"detalles" +"El fichero \"%s\" no está codificado en UTF-8, por favor compruebe el log de" +" errores para conocer más detalles" -msgid "The file is not UTF-8 encoded, please check the error for more details." +msgid "" +"The file is not UTF-8 encoded, please check the error for more details." msgstr "" -"El fichero no está codificado en UTF-8, por favor compruebe el log de errores para conocer más detalles" +"El fichero no está codificado en UTF-8, por favor compruebe el log de " +"errores para conocer más detalles" msgid "The full name for this person, group or other type of principal." -msgstr "El nombre completo de esta persona, grupo, u otro tipo de 'principal'." +msgstr "" +"El nombre completo de esta persona, grupo, u otro tipo de 'principal'." msgid "The full name must not be blank." msgstr "El nombre completo no puede estar en blanco." @@ -1156,7 +1219,9 @@ msgid "The user's password for logging in." msgstr "La contraseña del usuario para acceder al sistema." msgid "The username must not be blank, and may not contain a slash" -msgstr "El nombre de usuario no puede estar vacío, y no debe contener barras inclinadas." +msgstr "" +"El nombre de usuario no puede estar vacío, y no debe contener barras " +"inclinadas." msgid "There was an error reading from the database." msgstr "Ocurrió un error al leer la base de datos." @@ -1165,43 +1230,54 @@ msgid "There was an error writing to the database." msgstr "Ocurrió un error al escribir en la base de datos." msgid "" -"This operation does the following:

    • check valid groups in LDAP directory
    • check groups " -"in DAViCal
    then
    • if a group is present in DAViCal but not in LDAP set as inactive in " -"DAViCal
    • if a group is present in LDAP but not in DAViCal create the group in DAViCal
      • " -"
    • if a group in present in LDAP and DAViCal then update information in DAViCal
    " +"This operation does the following:
    • check valid groups in LDAP " +"directory
    • check groups in DAViCal
    then
    • if a group" +" is present in DAViCal but not in LDAP set as inactive in DAViCal
      • " +"
    • if a group is present in LDAP but not in DAViCal create the group in " +"DAViCal
    • if a group in present in LDAP and DAViCal then update " +"information in DAViCal
    " msgstr "" -"Esta operación hace lo siguiente:
    • comprobar los grupos válidos en LDAP
    • comprobar los " -"grupos en DAViCal
    , tras esto: