From 76078d93de0c92a6f7724f1be8a8da950184b7f2 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 1 Jun 2007 20:35:20 +0000
Subject: [PATCH] Monotone-Parent: d5f8c52180a18aefe5556a8cc5be91ebecf23c37
 Monotone-Revision: 13eeb49749c2fffd30ec7595581aa47c40de5671

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-01T20:35:20
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/Appointments/product.plist | 10 ++++---
 SoObjects/Contacts/product.plist     | 29 ++++++++++---------
 UI/Contacts/product.plist            |  2 +-
 UI/MainUI/product.plist              | 42 ++++++++++++++++++++--------
 4 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/SoObjects/Appointments/product.plist b/SoObjects/Appointments/product.plist
index ff9831d06..0d2bab48b 100644
--- a/SoObjects/Appointments/product.plist
+++ b/SoObjects/Appointments/product.plist
@@ -24,18 +24,20 @@
 	"ViewDAndTOfConfidentialRecords" = ( "Owner", "ConfidentialDAndTViewer" );
 	"ModifyConfidentialRecords" = ( "Owner", "ConfidentialModifier" );
 	"RespondToConfidentialRecords" = ( "Owner", "ConfidentialModifier", "ConfidentialResponder" );
+	"Access Contents Information" = ( "Owner", "AuthorizedSubscriber" );
       };
     };
     SOGoGroupAppointmentFolder = {
       superclass    = "SOGoAppointmentFolder";
     };
     SOGoCalendarComponent = {
-      superclass    = "SOGoContentObject";
+      superclass = "SOGoContentObject";
       defaultRoles = {
-	"ViewAllComponent" = ( "Owner", "Organizer", "Participant", "ComponentViewer", "ComponentModifier" );
+	"ViewAllComponent" = ( "Owner", "Organizer", "Participant", "ComponentModifier", "ComponentResponder", "ComponentViewer" );
 	"ViewDAndT" = ( "Organizer", "Participant", "ComponentDAndTViewer" );
-	"ModifyComponent" = ( "Owner", "ComponentModifier" );
-	"RespondToComponent" = ( "Participant", "ComponentResponder" );
+	"ModifyComponent" = ( "Owner", "Organizer" );
+	"RespondToComponent" = ( "Participant" );
+	"Access Object" = ( "Owner", "Organizer", "Participant", "ComponentModifier", "ComponentResponder", "ComponentViewer", "ComponentDAndTViewer" );
       };
     };
     SOGoAppointmentObject = {
diff --git a/SoObjects/Contacts/product.plist b/SoObjects/Contacts/product.plist
index 843eda8b9..cb6b5124d 100644
--- a/SoObjects/Contacts/product.plist
+++ b/SoObjects/Contacts/product.plist
@@ -10,34 +10,33 @@
   classes = {
     SOGoContactFolders = {
       superclass  = "SOGoFolder";
-      protectedBy = "<public>";
-      defaultAccess = "allow";
+      protectedBy = "Access Contents Information";
       defaultRoles = {
-        "View" = ( "Owner" );
+	"Access Contents Information" = ( "Authenticated" );
+        "WebDAV Access" = ( "Authenticated" );
       };
     };
-
     SOGoContactGCSFolder = {
       superclass = "SOGoFolder";
     };
-
     SOGoContactGCSEntry = {
       superclass = "SOGoContentObject";
-      defaultRoles = {
-        "View" = ( "Owner", "Delegate", "Organizer", "Authenticated" );
-      };
     };
-
     SOGoContactLDAPFolder = {
       superclass = "SOGoFolder";
-      defaultAccess = "allow";
-      protectedBy = "<public>";
+      protectedBy = "Access Contents Information";
+      defaultRoles = {
+	"Access Contents Information" = ( "Authenticated" );
+        "WebDAV Access" = ( "Authenticated" );
+      };
     };
-
     SOGoContactLDIFEntry = {
-      superclass    = "SOGoContentObject";
-      defaultAccess = "allow";
-      protectedBy = "<public>";
+      superclass = "SOGoContentObject";
+      protectedBy = "Access Content Information";
+      defaultRoles = {
+	"Access Content Information" = ( "Authenticated" );
+        "WebDAV Access" = ( "Authenticated" );
+      };
     };
   };
 }
diff --git a/UI/Contacts/product.plist b/UI/Contacts/product.plist
index 48d2d3c27..cff8e800d 100644
--- a/UI/Contacts/product.plist
+++ b/UI/Contacts/product.plist
@@ -128,7 +128,7 @@
            };
 	   canAccessContent = {
 	      protectedBy = "<public>";
-              pageName    = "UIxContactsListView";
+	      actionClass = "UIxFolderActions";
 	      actionName = "canAccessContent";
 	   };
         };
diff --git a/UI/MainUI/product.plist b/UI/MainUI/product.plist
index 2ce04921d..dd5f0245b 100644
--- a/UI/MainUI/product.plist
+++ b/UI/MainUI/product.plist
@@ -15,21 +15,45 @@
         "View" = ( "Authenticated", "FreeBusy" );
       };
     };
-    SOGoFolder = {
-      superclass = "SOGoObject";
+    SOGoObject = {
       protectedBy = "<public>";
       defaultAccess = "allow";
       defaultRoles = {
-        "Add Documents, Images, and Files" = ( "Owner", "ObjectCreator" );
-        "View" = ( "Owner", "AuthorizedSubscriber" );
-        "Access Contents Information" = ( "Owner", "ObjectViewer", "AuthorizedSubscriber" );
+	"View" = ( "Owner", "ObjectViewer" );
 	"Change Images And Files"  = ( "Owner", "ObjectEditor" );
-        "WebDAV Access" = ( "Owner", "AuthorizedSubscriber" );
+	"Access Contents Information" = ( "Owner", "ObjectReader" );
+        "Add Documents, Images, and Files" = ( "Owner", "ObjectCreator" );
+	"Add Folders" = ( "Owner", "FolderCreator" );
         "ReadAcls" = ( "Owner", "AuthorizedSubscriber" );
         "SaveAcls" = ( "Owner" );
         "Delete Objects" = ( "Owner", "ObjectEraser" );
       };
     };
+    SOGoContentObject = {
+      superclass = "SOGoObject";
+      protectedBy = "Access Object";
+      defaultRoles = {
+	"Access Object" = ( "Owner", "AuthorizedSubscriber" );
+      };
+    };
+    SOGoFolder = {
+      superclass = "SOGoObject";
+      protectedBy = "Access Object";
+      defaultRoles = {
+	"Change Images And Files"  = ( "Owner", "ObjectEditor" );
+        "WebDAV Access" = ( "Owner", "AuthorizedSubscriber" );
+	"Access Object" = ( "Owner", "AuthorizedSubscriber" );
+	"Access Contents Information" = ( "Owner", "ObjectViewer" );
+      };
+    };
+    SOGoUserFolder = {
+      superclass = "SOGoFolder";
+      protectedBy = "Access Contents Information";
+      defaultRoles = {
+	"Access Contents Information" = ( "Authenticated" );
+        "WebDAV Access" = ( "Authenticated" );
+      };
+    };
   };
 
   categories = {
@@ -48,12 +72,6 @@
     SOGoRootPage = {
     };
     SOGoUserFolder = {
-      methods = {
-        view = {
-          protectedBy = "View";
-          pageName    = "SOGoUserHomePage";
-        };
-      };
     };
     SOGoGroupsFolder = {
       methods = {