Monotone-Parent: 611626379a1312fbf65d92dbd94e483f8b8e7c0f
Monotone-Revision: b7d3eaea12c9e01c01c45ba3d8c25121b4cb4e39 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-29T16:36:16 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
13f09cd2b6
commit
24fa92b64e
|
@ -990,13 +990,16 @@ static NSArray *contentFieldNames = nil;
|
|||
}
|
||||
if (ofFlags.sameTableForQuick)
|
||||
quickChannel = nil;
|
||||
else {
|
||||
if ((quickChannel = [self acquireQuickChannel]) == nil) {
|
||||
[self errorWithFormat:@"could not open quick channel!"];
|
||||
[self releaseChannel:storeChannel];
|
||||
return nil;
|
||||
else
|
||||
{
|
||||
quickChannel = [self acquireQuickChannel];
|
||||
if (!quickChannel)
|
||||
{
|
||||
[self errorWithFormat:@"could not open quick channel!"];
|
||||
[self releaseChannel:storeChannel];
|
||||
return nil;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* delete rows */
|
||||
nowDate = [NSCalendarDate calendarDate];
|
||||
|
|
|
@ -132,133 +132,133 @@ static Class sogoAppointmentFolderKlass = Nil;
|
|||
|
||||
+ (SOGoWebDAVAclManager *) webdavAclManager
|
||||
{
|
||||
SOGoWebDAVAclManager *webdavAclManager = nil;
|
||||
SOGoWebDAVAclManager *aclManager = nil;
|
||||
NSString *nsI;
|
||||
|
||||
if (!webdavAclManager)
|
||||
if (!aclManager)
|
||||
{
|
||||
nsI = @"urn:inverse:params:xml:ns:inverse-dav";
|
||||
|
||||
webdavAclManager = [SOGoWebDAVAclManager new];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"read", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"all", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"read", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"read-free-busy", XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_AccessContentsInformation
|
||||
asChildOf: davElement (@"read", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"write", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"bind", XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_AddDocumentsImagesAndFiles
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"schedule",
|
||||
XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"bind", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"schedule-post",
|
||||
XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission:
|
||||
davElement (@"schedule-post-vevent", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission:
|
||||
davElement (@"schedule-post-vtodo", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission:
|
||||
davElement (@"schedule-post-vjournal", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission:
|
||||
davElement (@"schedule-post-vfreebusy", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"schedule-deliver",
|
||||
XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission:
|
||||
davElement (@"schedule-deliver-vevent", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission:
|
||||
davElement (@"schedule-deliver-vtodo", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission:
|
||||
davElement (@"schedule-deliver-vjournal", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission:
|
||||
davElement (@"schedule-deliver-vfreebusy", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"schedule-respond",
|
||||
XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission:
|
||||
davElement (@"schedule-respond-vevent", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission:
|
||||
davElement (@"schedule-respond-vtodo", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"unbind", XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_DeleteObjects
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
[webdavAclManager
|
||||
aclManager = [SOGoWebDAVAclManager new];
|
||||
[aclManager registerDAVPermission: davElement (@"read", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"all", XMLNS_WEBDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"read", XMLNS_WEBDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"read-free-busy", XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_AccessContentsInformation
|
||||
asChildOf: davElement (@"read", XMLNS_WEBDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"write", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", XMLNS_WEBDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"bind", XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_AddDocumentsImagesAndFiles
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"schedule",
|
||||
XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"bind", XMLNS_WEBDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"schedule-post",
|
||||
XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission:
|
||||
davElement (@"schedule-post-vevent", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission:
|
||||
davElement (@"schedule-post-vtodo", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission:
|
||||
davElement (@"schedule-post-vjournal", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission:
|
||||
davElement (@"schedule-post-vfreebusy", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"schedule-deliver",
|
||||
XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission:
|
||||
davElement (@"schedule-deliver-vevent", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission:
|
||||
davElement (@"schedule-deliver-vtodo", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission:
|
||||
davElement (@"schedule-deliver-vjournal", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission:
|
||||
davElement (@"schedule-deliver-vfreebusy", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"schedule-respond",
|
||||
XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission:
|
||||
davElement (@"schedule-respond-vevent", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission:
|
||||
davElement (@"schedule-respond-vtodo", XMLNS_CALDAV)
|
||||
abstract: NO
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"unbind", XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_DeleteObjects
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"write-properties", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_ChangePermissions /* hackish */
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
[webdavAclManager
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"write-content", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"admin", nsI)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"read-acl", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: SOGoPerm_ReadAcls
|
||||
asChildOf: davElement (@"admin", nsI)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"write-acl", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_ChangePermissions
|
||||
asChildOf: davElement (@"admin", nsI)];
|
||||
[aclManager registerDAVPermission: davElement (@"admin", nsI)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", XMLNS_WEBDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"read-acl", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: SOGoPerm_ReadAcls
|
||||
asChildOf: davElement (@"admin", nsI)];
|
||||
[aclManager registerDAVPermission: davElement (@"write-acl", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_ChangePermissions
|
||||
asChildOf: davElement (@"admin", nsI)];
|
||||
}
|
||||
|
||||
return webdavAclManager;
|
||||
return aclManager;
|
||||
}
|
||||
|
||||
- (id) initWithName: (NSString *) name
|
||||
|
|
|
@ -57,72 +57,67 @@
|
|||
|
||||
+ (SOGoWebDAVAclManager *) webdavAclManager
|
||||
{
|
||||
SOGoWebDAVAclManager *webdavAclManager = nil;
|
||||
SOGoWebDAVAclManager *aclManager = nil;
|
||||
NSString *nsD, *nsI;
|
||||
|
||||
if (!webdavAclManager)
|
||||
if (!aclManager)
|
||||
{
|
||||
nsD = @"DAV:";
|
||||
nsI = @"urn:inverse:params:xml:ns:inverse-dav";
|
||||
|
||||
// extern NSString *SOGoCalendarPerm_ViewAllComponent;
|
||||
// extern NSString *SOGoCalendarPerm_ViewDAndT;
|
||||
// extern NSString *SOGoCalendarPerm_ModifyComponent;
|
||||
// extern NSString *SOGoCalendarPerm_RespondToComponent;
|
||||
|
||||
webdavAclManager = [SOGoWebDAVAclManager new];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"read", nsD)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", nsD)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", nsD)
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"read", nsD)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"view-whole-component", nsI)
|
||||
abstract: NO
|
||||
withEquivalent: SOGoCalendarPerm_ViewAllComponent
|
||||
asChildOf: davElement (@"read", nsD)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"view-date-and-time", nsI)
|
||||
abstract: NO
|
||||
withEquivalent: SOGoCalendarPerm_ViewDAndT
|
||||
asChildOf: davElement (@"view-whole-component", nsI)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"write", nsD)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", nsD)];
|
||||
[webdavAclManager
|
||||
aclManager = [SOGoWebDAVAclManager new];
|
||||
[aclManager registerDAVPermission: davElement (@"read", nsD)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", nsD)];
|
||||
[aclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", nsD)
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"read", nsD)];
|
||||
[aclManager registerDAVPermission: davElement (@"view-whole-component", nsI)
|
||||
abstract: NO
|
||||
withEquivalent: SOGoCalendarPerm_ViewAllComponent
|
||||
asChildOf: davElement (@"read", nsD)];
|
||||
[aclManager registerDAVPermission: davElement (@"view-date-and-time", nsI)
|
||||
abstract: NO
|
||||
withEquivalent: SOGoCalendarPerm_ViewDAndT
|
||||
asChildOf: davElement (@"view-whole-component", nsI)];
|
||||
[aclManager registerDAVPermission: davElement (@"write", nsD)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", nsD)];
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"write-properties", nsD)
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_ChangePermissions /* hackish */
|
||||
asChildOf: davElement (@"write", nsD)];
|
||||
[webdavAclManager
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"write-content", nsD)
|
||||
abstract: YES
|
||||
withEquivalent: SOGoCalendarPerm_ModifyComponent
|
||||
asChildOf: davElement (@"write", nsD)];
|
||||
[webdavAclManager
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"respond-to-component", nsI)
|
||||
abstract: YES
|
||||
withEquivalent: SOGoCalendarPerm_RespondToComponent
|
||||
asChildOf: davElement (@"write-content", nsD)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"admin", nsI)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", nsD)];
|
||||
[webdavAclManager
|
||||
[aclManager registerDAVPermission: davElement (@"admin", nsI)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", nsD)];
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"read-acl", nsD)
|
||||
abstract: YES
|
||||
withEquivalent: SOGoPerm_ReadAcls
|
||||
asChildOf: davElement (@"admin", nsI)];
|
||||
[webdavAclManager
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"write-acl", nsD)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"admin", nsI)];
|
||||
}
|
||||
|
||||
return webdavAclManager;
|
||||
return aclManager;
|
||||
}
|
||||
|
||||
- (NSString *) componentTag
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#import <Foundation/NSTimeZone.h>
|
||||
|
||||
#import <NGObjWeb/WOActionResults.h>
|
||||
#import <NGObjWeb/WOMessage.h>
|
||||
#import <NGObjWeb/WOResponse.h>
|
||||
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#import <Foundation/NSTimeZone.h>
|
||||
|
||||
#import <NGObjWeb/WOActionResults.h>
|
||||
#import <NGObjWeb/WOMessage.h>
|
||||
#import <NGObjWeb/WOResponse.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
#import <NGCards/iCalEntityObject.h>
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSArray.h>
|
||||
#import <Foundation/NSEnumerator.h>
|
||||
#import <Foundation/NSString.h>
|
||||
|
||||
|
|
|
@ -276,37 +276,37 @@ NSString *jsonNullString = @"null";
|
|||
|
||||
- (BOOL)scanJSONKeyValueSeparator
|
||||
{
|
||||
return [self scanString:jsonKeyValueSeparatorString intoString:nil];
|
||||
return [self scanString:jsonKeyValueSeparatorString intoString:NULL];
|
||||
}
|
||||
|
||||
- (BOOL)scanJSONValueSeparator
|
||||
{
|
||||
return [self scanString:jsonValueSeparatorString intoString:nil];
|
||||
return [self scanString:jsonValueSeparatorString intoString:NULL];
|
||||
}
|
||||
|
||||
- (BOOL)scanJSONObjectStartString
|
||||
{
|
||||
return [self scanString:jsonObjectStartString intoString:nil];
|
||||
return [self scanString:jsonObjectStartString intoString:NULL];
|
||||
}
|
||||
|
||||
- (BOOL)scanJSONObjectEndString
|
||||
{
|
||||
return [self scanString:jsonObjectEndString intoString:nil];
|
||||
return [self scanString:jsonObjectEndString intoString:NULL];
|
||||
}
|
||||
|
||||
- (BOOL)scanJSONArrayStartString
|
||||
{
|
||||
return [self scanString:jsonArrayStartString intoString:nil];
|
||||
return [self scanString:jsonArrayStartString intoString:NULL];
|
||||
}
|
||||
|
||||
- (BOOL)scanJSONArrayEndString
|
||||
{
|
||||
return [self scanString:jsonArrayEndString intoString:nil];
|
||||
return [self scanString:jsonArrayEndString intoString:NULL];
|
||||
}
|
||||
|
||||
- (BOOL)scanJSONStringDelimiterString;
|
||||
{
|
||||
return [self scanString:jsonStringDelimiterString intoString:nil];
|
||||
return [self scanString:jsonStringDelimiterString intoString:NULL];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
@ -26,7 +26,9 @@
|
|||
|
||||
#import <NGObjWeb/SoObject.h>
|
||||
|
||||
#import "SOGoObject.h"
|
||||
#import "SOGoUser.h"
|
||||
|
||||
#import "SOGoCache.h"
|
||||
|
||||
static SOGoCache *sharedCache = nil;
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#import <NGObjWeb/NSException+HTTP.h>
|
||||
#import <NGObjWeb/WOContext.h>
|
||||
#import <NGObjWeb/WOResponse.h>
|
||||
#import <NGObjWeb/WORequest.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
#import <GDLContentStore/GCSFolder.h>
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#import <Foundation/NSUserDefaults.h>
|
||||
|
||||
#import <NGObjWeb/WOContext.h>
|
||||
#import <NGObjWeb/WORequest.h>
|
||||
#import <NGObjWeb/WOResponse.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
#import <NGLdap/NGLdapConnection.h>
|
||||
|
|
|
@ -73,58 +73,58 @@ static NSArray *childRecordFields = nil;
|
|||
|
||||
+ (SOGoWebDAVAclManager *) webdavAclManager
|
||||
{
|
||||
SOGoWebDAVAclManager *webdavAclManager = nil;
|
||||
SOGoWebDAVAclManager *aclManager = nil;
|
||||
|
||||
if (!webdavAclManager)
|
||||
if (!aclManager)
|
||||
{
|
||||
webdavAclManager = [SOGoWebDAVAclManager new];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"read", @"DAV:")
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"all", @"DAV:")];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", @"DAV:")
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"read", @"DAV:")];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"write", @"DAV:")
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", @"DAV:")];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"bind", @"DAV:")
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_AddDocumentsImagesAndFiles
|
||||
asChildOf: davElement (@"write", @"DAV:")];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"unbind", @"DAV:")
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_DeleteObjects
|
||||
asChildOf: davElement (@"write", @"DAV:")];
|
||||
[webdavAclManager
|
||||
aclManager = [SOGoWebDAVAclManager new];
|
||||
[aclManager registerDAVPermission: davElement (@"read", @"DAV:")
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"all", @"DAV:")];
|
||||
[aclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", @"DAV:")
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"read", @"DAV:")];
|
||||
[aclManager registerDAVPermission: davElement (@"write", @"DAV:")
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", @"DAV:")];
|
||||
[aclManager registerDAVPermission: davElement (@"bind", @"DAV:")
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_AddDocumentsImagesAndFiles
|
||||
asChildOf: davElement (@"write", @"DAV:")];
|
||||
[aclManager registerDAVPermission: davElement (@"unbind", @"DAV:")
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_DeleteObjects
|
||||
asChildOf: davElement (@"write", @"DAV:")];
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"write-properties", @"DAV:")
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_ChangePermissions /* hackish */
|
||||
asChildOf: davElement (@"write", @"DAV:")];
|
||||
[webdavAclManager
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"write-content", @"DAV:")
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"write", @"DAV:")];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", @"DAV:")];
|
||||
[webdavAclManager
|
||||
[aclManager registerDAVPermission: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", @"DAV:")];
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"read-acl", @"DAV:")
|
||||
abstract: YES
|
||||
withEquivalent: SOGoPerm_ReadAcls
|
||||
asChildOf: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")];
|
||||
[webdavAclManager
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"write-acl", @"DAV:")
|
||||
abstract: YES
|
||||
withEquivalent: SoPerm_ChangePermissions
|
||||
asChildOf: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")];
|
||||
}
|
||||
|
||||
return webdavAclManager;
|
||||
return aclManager;
|
||||
}
|
||||
|
||||
+ (void) initialize
|
||||
|
|
|
@ -134,12 +134,12 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
|
|||
|
||||
+ (SOGoWebDAVAclManager *) webdavAclManager
|
||||
{
|
||||
SOGoWebDAVAclManager *webdavAclManager = nil;
|
||||
SOGoWebDAVAclManager *aclManager = nil;
|
||||
|
||||
if (!webdavAclManager)
|
||||
webdavAclManager = [SOGoWebDAVAclManager new];
|
||||
if (!aclManager)
|
||||
aclManager = [SOGoWebDAVAclManager new];
|
||||
|
||||
return webdavAclManager;
|
||||
return aclManager;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -54,50 +54,50 @@ static SoSecurityManager *sm = nil;
|
|||
|
||||
+ (SOGoWebDAVAclManager *) webdavAclManager
|
||||
{
|
||||
SOGoWebDAVAclManager *webdavAclManager = nil;
|
||||
SOGoWebDAVAclManager *aclManager = nil;
|
||||
|
||||
if (!webdavAclManager)
|
||||
if (!aclManager)
|
||||
{
|
||||
webdavAclManager = [SOGoWebDAVAclManager new];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"read",
|
||||
XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission:
|
||||
davElement (@"read-current-user-privilege-set",
|
||||
XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"read", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"write",
|
||||
XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"bind",
|
||||
XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_AddFolders
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
[webdavAclManager registerDAVPermission: davElement (@"unbind",
|
||||
XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_DeleteObjects
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
[webdavAclManager
|
||||
aclManager = [SOGoWebDAVAclManager new];
|
||||
[aclManager registerDAVPermission: davElement (@"read",
|
||||
XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", XMLNS_WEBDAV)];
|
||||
[aclManager registerDAVPermission:
|
||||
davElement (@"read-current-user-privilege-set",
|
||||
XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_WebDAVAccess
|
||||
asChildOf: davElement (@"read", XMLNS_WEBDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"write",
|
||||
XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"all", XMLNS_WEBDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"bind",
|
||||
XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_AddFolders
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
[aclManager registerDAVPermission: davElement (@"unbind",
|
||||
XMLNS_WEBDAV)
|
||||
abstract: NO
|
||||
withEquivalent: SoPerm_DeleteObjects
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"write-properties", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
[webdavAclManager
|
||||
[aclManager
|
||||
registerDAVPermission: davElement (@"write-content", XMLNS_WEBDAV)
|
||||
abstract: YES
|
||||
withEquivalent: nil
|
||||
asChildOf: davElement (@"write", XMLNS_WEBDAV)];
|
||||
}
|
||||
|
||||
return webdavAclManager;
|
||||
return aclManager;
|
||||
}
|
||||
|
||||
- (id) init
|
||||
|
|
|
@ -35,13 +35,14 @@
|
|||
#import <NGExtensions/NSNull+misc.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
|
||||
#import "SOGoUserDefaults.h"
|
||||
#import "LDAPUserManager.h"
|
||||
#import "NSArray+Utilities.h"
|
||||
#import "SOGoCache.h"
|
||||
#import "SOGoDateFormatter.h"
|
||||
#import "SOGoObject.h"
|
||||
#import "SOGoPermissions.h"
|
||||
#import "SOGoUserDefaults.h"
|
||||
#import "SOGoUserFolder.h"
|
||||
|
||||
#import "SOGoUser.h"
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#import <Foundation/NSArray.h>
|
||||
#import <Foundation/NSDictionary.h>
|
||||
#import <Foundation/NSString.h>
|
||||
#import <Foundation/NSUserDefaults.h>
|
||||
|
||||
#import <NGObjWeb/SoObjects.h>
|
||||
#import <NGExtensions/NSObject+Values.h>
|
||||
|
|
Loading…
Reference in New Issue