From 902bf2ad420146984580a5075f95788026fe9635 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 25 Dec 2010 16:15:58 +1300 Subject: [PATCH] Prepare to release 0.9.9.4 Signed-off-by: Andrew McMillan --- VERSION | 2 +- htdocs/always.php | 6 +++--- inc/always.php.in | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index eeb5e9a1..40947dc4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.9.3 +0.9.9.4 diff --git a/htdocs/always.php b/htdocs/always.php index 584ad7b1..f3a816bb 100644 --- a/htdocs/always.php +++ b/htdocs/always.php @@ -497,7 +497,7 @@ function bits_to_privilege( $raw_bits, $resourcetype = 'resource' ) { if ( ($raw_bits & 16) != 0 ) $out_priv[] = 'DAV::read-acl'; if ( ($raw_bits & 32) != 0 ) $out_priv[] = 'DAV::read-current-user-privilege-set'; if ( ($raw_bits & 256) != 0 ) $out_priv[] = 'DAV::write-acl'; - if ( ($resourcetype == 'calendar' || $resourcetype == 'proxy') && ($raw_bits & 512) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:read-free-busy'; + if ( ($resourcetype == 'calendar' || $resourcetype == 'proxy' || $resourcetype == '*') && ($raw_bits & 512) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:read-free-busy'; if ( ($raw_bits & 198) != 0 ) { if ( ($raw_bits & 198) == 198 ) $out_priv[] = 'DAV::write'; @@ -507,14 +507,14 @@ function bits_to_privilege( $raw_bits, $resourcetype = 'resource' ) { if ( ($raw_bits & 128) != 0 ) $out_priv[] = 'DAV::unbind'; } - if ( $resourcetype == 'schedule-inbox' && ($raw_bits & 7168) != 0 ) { + if ( ($resourcetype == 'schedule-inbox' || $resourcetype == '*') && ($raw_bits & 7168) != 0 ) { if ( ($raw_bits & 7168) == 7168 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver'; if ( ($raw_bits & 1024) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver-invite'; if ( ($raw_bits & 2048) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver-reply'; if ( ($raw_bits & 4096) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-query-freebusy'; } - if ( $resourcetype == 'schedule-outbox' && ($raw_bits & 57344) != 0 ) { + if ( ($resourcetype == 'schedule-outbox' || $resourcetype == '*') && ($raw_bits & 57344) != 0 ) { if ( ($raw_bits & 57344) == 57344 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send'; if ( ($raw_bits & 8192) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send-invite'; if ( ($raw_bits & 16384) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send-reply'; diff --git a/inc/always.php.in b/inc/always.php.in index be249150..bb0c9d73 100644 --- a/inc/always.php.in +++ b/inc/always.php.in @@ -497,7 +497,7 @@ function bits_to_privilege( $raw_bits, $resourcetype = 'resource' ) { if ( ($raw_bits & 16) != 0 ) $out_priv[] = 'DAV::read-acl'; if ( ($raw_bits & 32) != 0 ) $out_priv[] = 'DAV::read-current-user-privilege-set'; if ( ($raw_bits & 256) != 0 ) $out_priv[] = 'DAV::write-acl'; - if ( ($resourcetype == 'calendar' || $resourcetype == 'proxy') && ($raw_bits & 512) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:read-free-busy'; + if ( ($resourcetype == 'calendar' || $resourcetype == 'proxy' || $resourcetype == '*') && ($raw_bits & 512) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:read-free-busy'; if ( ($raw_bits & 198) != 0 ) { if ( ($raw_bits & 198) == 198 ) $out_priv[] = 'DAV::write'; @@ -507,14 +507,14 @@ function bits_to_privilege( $raw_bits, $resourcetype = 'resource' ) { if ( ($raw_bits & 128) != 0 ) $out_priv[] = 'DAV::unbind'; } - if ( $resourcetype == 'schedule-inbox' && ($raw_bits & 7168) != 0 ) { + if ( ($resourcetype == 'schedule-inbox' || $resourcetype == '*') && ($raw_bits & 7168) != 0 ) { if ( ($raw_bits & 7168) == 7168 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver'; if ( ($raw_bits & 1024) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver-invite'; if ( ($raw_bits & 2048) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-deliver-reply'; if ( ($raw_bits & 4096) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-query-freebusy'; } - if ( $resourcetype == 'schedule-outbox' && ($raw_bits & 57344) != 0 ) { + if ( ($resourcetype == 'schedule-outbox' || $resourcetype == '*') && ($raw_bits & 57344) != 0 ) { if ( ($raw_bits & 57344) == 57344 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send'; if ( ($raw_bits & 8192) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send-invite'; if ( ($raw_bits & 16384) != 0 ) $out_priv[] = 'urn:ietf:params:xml:ns:caldav:schedule-send-reply';