From 189813854d5528a30bd7bde82d8decb11638b31a Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Mon, 11 Dec 2006 14:48:39 +1300
Subject: [PATCH] Working towards a more complete privileges model.

---
 inc/CalDAVRequest.php | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/inc/CalDAVRequest.php b/inc/CalDAVRequest.php
index b9bf3d1f..8cd33f7b 100644
--- a/inc/CalDAVRequest.php
+++ b/inc/CalDAVRequest.php
@@ -358,28 +358,41 @@ class CalDAVRequest
   /**
   * Are we allowed to do the requested activity
   *
+  * +------------+------------------------------------------------------+
+  * | METHOD     | PRIVILEGES                                           |
+  * +------------+------------------------------------------------------+
+  * | MKCALENDAR | DAV:bind                                             |
+  * | REPORT     | DAV:read or CALDAV:read-free-busy (on all referenced |
+  * |            | resources)                                           |
+  * +------------+------------------------------------------------------+
+  *
   * @param string $activity The activity we want to do.
   */
   function AllowedTo( $activity ) {
     if ( isset($this->permissions['all']) ) return true;
     switch( $activity ) {
-      case 'read':
-        return isset($this->permissions['read']) || isset($this->permissions['write']);
+      case 'freebusy':
+        return isset($this->permissions['read']) || isset($this->permissions['freebusy']);
         break;
       case 'delete':
-        return isset($this->permissions['write']) || isset($this->permissions['unbind']);
+        return isset($this->permissions['unbind']);
         break;
-      case 'create':
-        return isset($this->permissions['write']) || isset($this->permissions['bind']);
+      case 'proppatch':
+        return isset($this->permissions['write']) || isset($this->permissions['write-properties']);
         break;
       case 'modify':
         return isset($this->permissions['write']) || isset($this->permissions['write-content']);
         break;
+
+      case 'create':
       case 'mkcalendar':
       case 'mkcol':
-        /** FIXME: Really this should only be 'bind' alone, I think. */
-        return isset($this->permissions['write']) || isset($this->permissions['bind']);
+        return isset($this->permissions['bind']);
         break;
+
+      case 'read':
+      case 'lock':
+      case 'unlock':
       default:
         return isset($this->permissions[$activity]);
         break;