amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-12 17:08:02 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: c69f7f8d6e6f9e8f9e94f61cae6ed7a39e26e747

Browse Source 
Monotone-Revision: b3c4fef061776cff263262f03c363766fa58d479

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-27T21:06:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-11-27 21:06:11 +00:00
parent 733267f6c5
commit 84b93929c2
12 changed files with 119 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/SOGoMailFolder.m
+5 -6
View File
@@ -454,10 +454,8 @@ static NSString *defaultUserID = @"anyone";
switch ([imapAcls characterAtIndex: count])
{
case 'l':
[SOGoAcls addObjectUniquely: SOGoRole_ObjectViewer];
break;
case 'r':
[SOGoAcls addObjectUniquely: SOGoRole_ObjectReader];
[SOGoAcls addObjectUniquely: SOGoRole_ObjectViewer];
break;
case 's':
[SOGoAcls addObjectUniquely: SOGoMailRole_SeenKeeper];
@@ -505,9 +503,10 @@ static NSString *defaultUserID = @"anyone";
while (currentAcl)
{
if ([currentAcl isEqualToString: SOGoRole_ObjectViewer])
character = 'l';
else if ([currentAcl isEqualToString: SOGoRole_ObjectReader])
character = 'r';
{
[imapAcls appendFormat: @"lr"];
character = 0;
}
else if ([currentAcl isEqualToString: SOGoMailRole_SeenKeeper])
character = 's';
else if ([currentAcl isEqualToString: SOGoMailRole_Writer])
SoObjects/Mailer/product.plist
+1 -1
View File
@@ -42,7 +42,7 @@
superclass = "SOGoMailBaseObject";
defaultRoles = {
"View" = ( "Owner", "ObjectViewer" );
"Access Contents Information" = ( "Owner", "ObjectReader" );
"Access Contents Information" = ( "Owner", "ObjectViewer" );
"Add Documents, Images, and Files" = ( "Owner", "ObjectCreator" );
"Delete Objects" = ( "Owner", "ObjectEraser" );
"WebDAV Access" = ( "Owner", "ObjectViewer" );
SoObjects/SOGo/SOGoContentObject.m
+5 -7
View File
@@ -374,16 +374,14 @@
containerAcls = [container aclsForUser: uid];
if ([containerAcls count] > 0)
{
if ([containerAcls containsObject: SOGoRole_ObjectCreator])
[acls addObjectsFromArray: containerAcls];
if (isNew)
{
[acls addObject: SOGoRole_ObjectCreator];
if (isNew)
if ([containerAcls containsObject: SOGoRole_ObjectCreator])
[acls addObject: SOGoRole_ObjectEditor];
else
[acls removeObject: SOGoRole_ObjectEditor];
}
if ([containerAcls containsObject: SOGoRole_ObjectReader])
[acls addObject: SOGoRole_ObjectViewer];
if ([containerAcls containsObject: SOGoRole_ObjectEditor])
[acls addObject: SOGoRole_ObjectEditor];
}
return acls;
SoObjects/SOGo/SOGoGCSFolder.m
-2
View File
@@ -596,8 +596,6 @@ static NSString *defaultUserID = @"<default>";
containerAcls = [container aclsForUser: uid];
if ([containerAcls count] > 0)
{
if ([containerAcls containsObject: SOGoRole_ObjectReader])
[acls addObject: SOGoRole_ObjectViewer];
#warning this should be checked
if ([containerAcls containsObject: SOGoRole_ObjectEraser])
[acls addObject: SOGoRole_ObjectEraser];
SoObjects/SOGo/SOGoPermissions.m
-1
View File
@@ -26,7 +26,6 @@
NSString *SOGoRole_ObjectCreator = @"ObjectCreator";
NSString *SOGoRole_ObjectEraser = @"ObjectEraser";
NSString *SOGoRole_ObjectViewer = @"ObjectViewer";
NSString *SOGoRole_ObjectReader = @"ObjectReader";
NSString *SOGoRole_ObjectEditor = @"ObjectEditor";
NSString *SOGoRole_FolderCreator = @"FolderCreator";