LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 611626379a1312fbf65d92dbd94e483f8b8e7c0f 

Monotone-Revision: b7d3eaea12c9e01c01c45ba3d8c25121b4cb4e39

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-29T16:36:16
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2008-07-29 16:36:16 +00:00
parent 13f09cd2b6
commit 24fa92b64e
15 changed files with 240 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SOPE/GDLContentStore/GCSFolder.m
View File

@ -990,14 +990,17 @@ static NSArray *contentFieldNames = nil;
} }
if (ofFlags.sameTableForQuick) if (ofFlags.sameTableForQuick)
quickChannel = nil; quickChannel = nil;
else { else
if ((quickChannel = [self acquireQuickChannel]) == nil) { {
[self errorWithFormat:@"could not open quick channel!"]; quickChannel = [self acquireQuickChannel];
[self releaseChannel:storeChannel]; if (!quickChannel)
return nil; {
[self errorWithFormat:@"could not open quick channel!"];
[self releaseChannel:storeChannel];
return nil;
}
} }
}
/* delete rows */ /* delete rows */
nowDate = [NSCalendarDate calendarDate]; nowDate = [NSCalendarDate calendarDate];

224
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@ -132,133 +132,133 @@ static Class sogoAppointmentFolderKlass = Nil;
+ (SOGoWebDAVAclManager *) webdavAclManager + (SOGoWebDAVAclManager *) webdavAclManager
{ {
SOGoWebDAVAclManager *webdavAclManager = nil; SOGoWebDAVAclManager *aclManager = nil;
NSString *nsI; NSString *nsI;
if (!webdavAclManager) if (!aclManager)
{ {
nsI = @"urn:inverse:params:xml:ns:inverse-dav"; nsI = @"urn:inverse:params:xml:ns:inverse-dav";
webdavAclManager = [SOGoWebDAVAclManager new]; aclManager = [SOGoWebDAVAclManager new];
[webdavAclManager registerDAVPermission: davElement (@"read", XMLNS_WEBDAV) [aclManager registerDAVPermission: davElement (@"read", XMLNS_WEBDAV)
abstract: YES abstract: YES
withEquivalent: SoPerm_WebDAVAccess withEquivalent: SoPerm_WebDAVAccess
asChildOf: davElement (@"all", XMLNS_WEBDAV)]; asChildOf: davElement (@"all", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", XMLNS_WEBDAV) [aclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", XMLNS_WEBDAV)
abstract: YES abstract: YES
withEquivalent: SoPerm_WebDAVAccess withEquivalent: SoPerm_WebDAVAccess
asChildOf: davElement (@"read", XMLNS_WEBDAV)]; asChildOf: davElement (@"read", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: davElement (@"read-free-busy", XMLNS_WEBDAV) [aclManager registerDAVPermission: davElement (@"read-free-busy", XMLNS_WEBDAV)
abstract: NO abstract: NO
withEquivalent: SoPerm_AccessContentsInformation withEquivalent: SoPerm_AccessContentsInformation
asChildOf: davElement (@"read", XMLNS_WEBDAV)]; asChildOf: davElement (@"read", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: davElement (@"write", XMLNS_WEBDAV) [aclManager registerDAVPermission: davElement (@"write", XMLNS_WEBDAV)
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"all", XMLNS_WEBDAV)]; asChildOf: davElement (@"all", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: davElement (@"bind", XMLNS_WEBDAV) [aclManager registerDAVPermission: davElement (@"bind", XMLNS_WEBDAV)
abstract: NO abstract: NO
withEquivalent: SoPerm_AddDocumentsImagesAndFiles withEquivalent: SoPerm_AddDocumentsImagesAndFiles
asChildOf: davElement (@"write", XMLNS_WEBDAV)]; asChildOf: davElement (@"write", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: davElement (@"schedule", [aclManager registerDAVPermission: davElement (@"schedule",
XMLNS_CALDAV) XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"bind", XMLNS_WEBDAV)]; asChildOf: davElement (@"bind", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: davElement (@"schedule-post", [aclManager registerDAVPermission: davElement (@"schedule-post",
XMLNS_CALDAV) XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: [aclManager registerDAVPermission:
davElement (@"schedule-post-vevent", XMLNS_CALDAV) davElement (@"schedule-post-vevent", XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: [aclManager registerDAVPermission:
davElement (@"schedule-post-vtodo", XMLNS_CALDAV) davElement (@"schedule-post-vtodo", XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: [aclManager registerDAVPermission:
davElement (@"schedule-post-vjournal", XMLNS_CALDAV) davElement (@"schedule-post-vjournal", XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: [aclManager registerDAVPermission:
davElement (@"schedule-post-vfreebusy", XMLNS_CALDAV) davElement (@"schedule-post-vfreebusy", XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule-post", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: davElement (@"schedule-deliver", [aclManager registerDAVPermission: davElement (@"schedule-deliver",
XMLNS_CALDAV) XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: [aclManager registerDAVPermission:
davElement (@"schedule-deliver-vevent", XMLNS_CALDAV) davElement (@"schedule-deliver-vevent", XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: [aclManager registerDAVPermission:
davElement (@"schedule-deliver-vtodo", XMLNS_CALDAV) davElement (@"schedule-deliver-vtodo", XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: [aclManager registerDAVPermission:
davElement (@"schedule-deliver-vjournal", XMLNS_CALDAV) davElement (@"schedule-deliver-vjournal", XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: [aclManager registerDAVPermission:
davElement (@"schedule-deliver-vfreebusy", XMLNS_CALDAV) davElement (@"schedule-deliver-vfreebusy", XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule-deliver", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: davElement (@"schedule-respond", [aclManager registerDAVPermission: davElement (@"schedule-respond",
XMLNS_CALDAV) XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: [aclManager registerDAVPermission:
davElement (@"schedule-respond-vevent", XMLNS_CALDAV) davElement (@"schedule-respond-vevent", XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: [aclManager registerDAVPermission:
davElement (@"schedule-respond-vtodo", XMLNS_CALDAV) davElement (@"schedule-respond-vtodo", XMLNS_CALDAV)
abstract: NO abstract: NO
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)]; asChildOf: davElement (@"schedule-respond", XMLNS_CALDAV)];
[webdavAclManager registerDAVPermission: davElement (@"unbind", XMLNS_WEBDAV) [aclManager registerDAVPermission: davElement (@"unbind", XMLNS_WEBDAV)
abstract: NO abstract: NO
withEquivalent: SoPerm_DeleteObjects withEquivalent: SoPerm_DeleteObjects
asChildOf: davElement (@"write", XMLNS_WEBDAV)]; asChildOf: davElement (@"write", XMLNS_WEBDAV)];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"write-properties", XMLNS_WEBDAV) registerDAVPermission: davElement (@"write-properties", XMLNS_WEBDAV)
abstract: YES abstract: YES
withEquivalent: SoPerm_ChangePermissions /* hackish */ withEquivalent: SoPerm_ChangePermissions /* hackish */
asChildOf: davElement (@"write", XMLNS_WEBDAV)]; asChildOf: davElement (@"write", XMLNS_WEBDAV)];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"write-content", XMLNS_WEBDAV) registerDAVPermission: davElement (@"write-content", XMLNS_WEBDAV)
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"write", XMLNS_WEBDAV)]; asChildOf: davElement (@"write", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: davElement (@"admin", nsI) [aclManager registerDAVPermission: davElement (@"admin", nsI)
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"all", XMLNS_WEBDAV)]; asChildOf: davElement (@"all", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: davElement (@"read-acl", XMLNS_WEBDAV) [aclManager registerDAVPermission: davElement (@"read-acl", XMLNS_WEBDAV)
abstract: YES abstract: YES
withEquivalent: SOGoPerm_ReadAcls withEquivalent: SOGoPerm_ReadAcls
asChildOf: davElement (@"admin", nsI)]; asChildOf: davElement (@"admin", nsI)];
[webdavAclManager registerDAVPermission: davElement (@"write-acl", XMLNS_WEBDAV) [aclManager registerDAVPermission: davElement (@"write-acl", XMLNS_WEBDAV)
abstract: YES abstract: YES
withEquivalent: SoPerm_ChangePermissions withEquivalent: SoPerm_ChangePermissions
asChildOf: davElement (@"admin", nsI)]; asChildOf: davElement (@"admin", nsI)];
} }
return webdavAclManager; return aclManager;
} }
- (id) initWithName: (NSString *) name - (id) initWithName: (NSString *) name

71
SoObjects/Appointments/SOGoAppointmentObject.m
View File

@ -57,72 +57,67 @@
+ (SOGoWebDAVAclManager *) webdavAclManager + (SOGoWebDAVAclManager *) webdavAclManager
{ {
SOGoWebDAVAclManager *webdavAclManager = nil; SOGoWebDAVAclManager *aclManager = nil;
NSString *nsD, *nsI; NSString *nsD, *nsI;
if (!webdavAclManager) if (!aclManager)
{ {
nsD = @"DAV:"; nsD = @"DAV:";
nsI = @"urn:inverse:params:xml:ns:inverse-dav"; nsI = @"urn:inverse:params:xml:ns:inverse-dav";
// extern NSString *SOGoCalendarPerm_ViewAllComponent; aclManager = [SOGoWebDAVAclManager new];
// extern NSString *SOGoCalendarPerm_ViewDAndT; [aclManager registerDAVPermission: davElement (@"read", nsD)
// extern NSString *SOGoCalendarPerm_ModifyComponent; abstract: YES
// extern NSString *SOGoCalendarPerm_RespondToComponent; withEquivalent: nil
asChildOf: davElement (@"all", nsD)];
webdavAclManager = [SOGoWebDAVAclManager new]; [aclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", nsD)
[webdavAclManager registerDAVPermission: davElement (@"read", nsD) abstract: YES
abstract: YES withEquivalent: SoPerm_WebDAVAccess
withEquivalent: nil asChildOf: davElement (@"read", nsD)];
asChildOf: davElement (@"all", nsD)]; [aclManager registerDAVPermission: davElement (@"view-whole-component", nsI)
[webdavAclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", nsD) abstract: NO
abstract: YES withEquivalent: SOGoCalendarPerm_ViewAllComponent
withEquivalent: SoPerm_WebDAVAccess asChildOf: davElement (@"read", nsD)];
asChildOf: davElement (@"read", nsD)]; [aclManager registerDAVPermission: davElement (@"view-date-and-time", nsI)
[webdavAclManager registerDAVPermission: davElement (@"view-whole-component", nsI) abstract: NO
abstract: NO withEquivalent: SOGoCalendarPerm_ViewDAndT
withEquivalent: SOGoCalendarPerm_ViewAllComponent asChildOf: davElement (@"view-whole-component", nsI)];
asChildOf: davElement (@"read", nsD)]; [aclManager registerDAVPermission: davElement (@"write", nsD)
[webdavAclManager registerDAVPermission: davElement (@"view-date-and-time", nsI) abstract: YES
abstract: NO withEquivalent: nil
withEquivalent: SOGoCalendarPerm_ViewDAndT asChildOf: davElement (@"all", nsD)];
asChildOf: davElement (@"view-whole-component", nsI)]; [aclManager
[webdavAclManager registerDAVPermission: davElement (@"write", nsD)
abstract: YES
withEquivalent: nil
asChildOf: davElement (@"all", nsD)];
[webdavAclManager
registerDAVPermission: davElement (@"write-properties", nsD) registerDAVPermission: davElement (@"write-properties", nsD)
abstract: YES abstract: YES
withEquivalent: SoPerm_ChangePermissions /* hackish */ withEquivalent: SoPerm_ChangePermissions /* hackish */
asChildOf: davElement (@"write", nsD)]; asChildOf: davElement (@"write", nsD)];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"write-content", nsD) registerDAVPermission: davElement (@"write-content", nsD)
abstract: YES abstract: YES
withEquivalent: SOGoCalendarPerm_ModifyComponent withEquivalent: SOGoCalendarPerm_ModifyComponent
asChildOf: davElement (@"write", nsD)]; asChildOf: davElement (@"write", nsD)];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"respond-to-component", nsI) registerDAVPermission: davElement (@"respond-to-component", nsI)
abstract: YES abstract: YES
withEquivalent: SOGoCalendarPerm_RespondToComponent withEquivalent: SOGoCalendarPerm_RespondToComponent
asChildOf: davElement (@"write-content", nsD)]; asChildOf: davElement (@"write-content", nsD)];
[webdavAclManager registerDAVPermission: davElement (@"admin", nsI) [aclManager registerDAVPermission: davElement (@"admin", nsI)
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"all", nsD)]; asChildOf: davElement (@"all", nsD)];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"read-acl", nsD) registerDAVPermission: davElement (@"read-acl", nsD)
abstract: YES abstract: YES
withEquivalent: SOGoPerm_ReadAcls withEquivalent: SOGoPerm_ReadAcls
asChildOf: davElement (@"admin", nsI)]; asChildOf: davElement (@"admin", nsI)];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"write-acl", nsD) registerDAVPermission: davElement (@"write-acl", nsD)
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"admin", nsI)]; asChildOf: davElement (@"admin", nsI)];
} }
return webdavAclManager; return aclManager;
} }
- (NSString *) componentTag - (NSString *) componentTag

2
SoObjects/Appointments/SOGoAptMailICalReply.m
View File

@ -25,7 +25,7 @@
#import <Foundation/NSTimeZone.h> #import <Foundation/NSTimeZone.h>
#import <NGObjWeb/WOActionResults.h> #import <NGObjWeb/WOActionResults.h>
#import <NGObjWeb/WOMessage.h> #import <NGObjWeb/WOResponse.h>
#import <NGObjWeb/WOContext+SoObjects.h> #import <NGObjWeb/WOContext+SoObjects.h>
#import <NGExtensions/NSObject+Logs.h> #import <NGExtensions/NSObject+Logs.h>

2
SoObjects/Appointments/SOGoAptMailNotification.m
View File

@ -24,7 +24,7 @@
#import <Foundation/NSTimeZone.h> #import <Foundation/NSTimeZone.h>
#import <NGObjWeb/WOActionResults.h> #import <NGObjWeb/WOActionResults.h>
#import <NGObjWeb/WOMessage.h> #import <NGObjWeb/WOResponse.h>
#import <NGExtensions/NSObject+Logs.h> #import <NGExtensions/NSObject+Logs.h>
#import <NGCards/iCalEntityObject.h> #import <NGCards/iCalEntityObject.h>

1
SoObjects/SOGo/NSDictionary+DAV.m
View File

@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#import <Foundation/NSArray.h>
#import <Foundation/NSEnumerator.h> #import <Foundation/NSEnumerator.h>
#import <Foundation/NSString.h> #import <Foundation/NSString.h>

14
SoObjects/SOGo/NSScanner+BSJSONAdditions.m
View File

@ -276,37 +276,37 @@ NSString *jsonNullString = @"null";
- (BOOL)scanJSONKeyValueSeparator - (BOOL)scanJSONKeyValueSeparator
{ {
return [self scanString:jsonKeyValueSeparatorString intoString:nil]; return [self scanString:jsonKeyValueSeparatorString intoString:NULL];
} }
- (BOOL)scanJSONValueSeparator - (BOOL)scanJSONValueSeparator
{ {
return [self scanString:jsonValueSeparatorString intoString:nil]; return [self scanString:jsonValueSeparatorString intoString:NULL];
} }
- (BOOL)scanJSONObjectStartString - (BOOL)scanJSONObjectStartString
{ {
return [self scanString:jsonObjectStartString intoString:nil]; return [self scanString:jsonObjectStartString intoString:NULL];
} }
- (BOOL)scanJSONObjectEndString - (BOOL)scanJSONObjectEndString
{ {
return [self scanString:jsonObjectEndString intoString:nil]; return [self scanString:jsonObjectEndString intoString:NULL];
} }
- (BOOL)scanJSONArrayStartString - (BOOL)scanJSONArrayStartString
{ {
return [self scanString:jsonArrayStartString intoString:nil]; return [self scanString:jsonArrayStartString intoString:NULL];
} }
- (BOOL)scanJSONArrayEndString - (BOOL)scanJSONArrayEndString
{ {
return [self scanString:jsonArrayEndString intoString:nil]; return [self scanString:jsonArrayEndString intoString:NULL];
} }
- (BOOL)scanJSONStringDelimiterString; - (BOOL)scanJSONStringDelimiterString;
{ {
return [self scanString:jsonStringDelimiterString intoString:nil]; return [self scanString:jsonStringDelimiterString intoString:NULL];
} }
@end @end

2
SoObjects/SOGo/SOGoCache.m
View File

@ -26,7 +26,9 @@
#import <NGObjWeb/SoObject.h> #import <NGObjWeb/SoObject.h>
#import "SOGoObject.h"
#import "SOGoUser.h" #import "SOGoUser.h"
#import "SOGoCache.h" #import "SOGoCache.h"
static SOGoCache *sharedCache = nil; static SOGoCache *sharedCache = nil;

1
SoObjects/SOGo/SOGoContentObject.m
View File

@ -26,6 +26,7 @@
#import <NGObjWeb/NSException+HTTP.h> #import <NGObjWeb/NSException+HTTP.h>
#import <NGObjWeb/WOContext.h> #import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WOResponse.h> #import <NGObjWeb/WOResponse.h>
#import <NGObjWeb/WORequest.h>
#import <NGExtensions/NSObject+Logs.h> #import <NGExtensions/NSObject+Logs.h>
#import <GDLContentStore/GCSFolder.h> #import <GDLContentStore/GCSFolder.h>

1
SoObjects/SOGo/SOGoDAVAuthenticator.m
View File

@ -24,6 +24,7 @@
#import <Foundation/NSUserDefaults.h> #import <Foundation/NSUserDefaults.h>
#import <NGObjWeb/WOContext.h> #import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WORequest.h>
#import <NGObjWeb/WOResponse.h> #import <NGObjWeb/WOResponse.h>
#import <NGExtensions/NSObject+Logs.h> #import <NGExtensions/NSObject+Logs.h>
#import <NGLdap/NGLdapConnection.h> #import <NGLdap/NGLdapConnection.h>

64
SoObjects/SOGo/SOGoGCSFolder.m
View File

@ -73,58 +73,58 @@ static NSArray *childRecordFields = nil;
+ (SOGoWebDAVAclManager *) webdavAclManager + (SOGoWebDAVAclManager *) webdavAclManager
{ {
SOGoWebDAVAclManager *webdavAclManager = nil; SOGoWebDAVAclManager *aclManager = nil;
if (!webdavAclManager) if (!aclManager)
{ {
webdavAclManager = [SOGoWebDAVAclManager new]; aclManager = [SOGoWebDAVAclManager new];
[webdavAclManager registerDAVPermission: davElement (@"read", @"DAV:") [aclManager registerDAVPermission: davElement (@"read", @"DAV:")
abstract: YES abstract: YES
withEquivalent: SoPerm_WebDAVAccess withEquivalent: SoPerm_WebDAVAccess
asChildOf: davElement (@"all", @"DAV:")]; asChildOf: davElement (@"all", @"DAV:")];
[webdavAclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", @"DAV:") [aclManager registerDAVPermission: davElement (@"read-current-user-privilege-set", @"DAV:")
abstract: YES abstract: YES
withEquivalent: SoPerm_WebDAVAccess withEquivalent: SoPerm_WebDAVAccess
asChildOf: davElement (@"read", @"DAV:")]; asChildOf: davElement (@"read", @"DAV:")];
[webdavAclManager registerDAVPermission: davElement (@"write", @"DAV:") [aclManager registerDAVPermission: davElement (@"write", @"DAV:")
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"all", @"DAV:")]; asChildOf: davElement (@"all", @"DAV:")];
[webdavAclManager registerDAVPermission: davElement (@"bind", @"DAV:") [aclManager registerDAVPermission: davElement (@"bind", @"DAV:")
abstract: NO abstract: NO
withEquivalent: SoPerm_AddDocumentsImagesAndFiles withEquivalent: SoPerm_AddDocumentsImagesAndFiles
asChildOf: davElement (@"write", @"DAV:")]; asChildOf: davElement (@"write", @"DAV:")];
[webdavAclManager registerDAVPermission: davElement (@"unbind", @"DAV:") [aclManager registerDAVPermission: davElement (@"unbind", @"DAV:")
abstract: NO abstract: NO
withEquivalent: SoPerm_DeleteObjects withEquivalent: SoPerm_DeleteObjects
asChildOf: davElement (@"write", @"DAV:")]; asChildOf: davElement (@"write", @"DAV:")];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"write-properties", @"DAV:") registerDAVPermission: davElement (@"write-properties", @"DAV:")
abstract: YES abstract: YES
withEquivalent: SoPerm_ChangePermissions /* hackish */ withEquivalent: SoPerm_ChangePermissions /* hackish */
asChildOf: davElement (@"write", @"DAV:")]; asChildOf: davElement (@"write", @"DAV:")];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"write-content", @"DAV:") registerDAVPermission: davElement (@"write-content", @"DAV:")
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"write", @"DAV:")]; asChildOf: davElement (@"write", @"DAV:")];
[webdavAclManager registerDAVPermission: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav") [aclManager registerDAVPermission: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"all", @"DAV:")]; asChildOf: davElement (@"all", @"DAV:")];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"read-acl", @"DAV:") registerDAVPermission: davElement (@"read-acl", @"DAV:")
abstract: YES abstract: YES
withEquivalent: SOGoPerm_ReadAcls withEquivalent: SOGoPerm_ReadAcls
asChildOf: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")]; asChildOf: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"write-acl", @"DAV:") registerDAVPermission: davElement (@"write-acl", @"DAV:")
abstract: YES abstract: YES
withEquivalent: SoPerm_ChangePermissions withEquivalent: SoPerm_ChangePermissions
asChildOf: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")]; asChildOf: davElement (@"admin", @"urn:inverse:params:xml:ns:inverse-dav")];
} }
return webdavAclManager; return aclManager;
} }
+ (void) initialize + (void) initialize

8
SoObjects/SOGo/SOGoObject.m
View File

@ -134,12 +134,12 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
+ (SOGoWebDAVAclManager *) webdavAclManager + (SOGoWebDAVAclManager *) webdavAclManager
{ {
SOGoWebDAVAclManager *webdavAclManager = nil; SOGoWebDAVAclManager *aclManager = nil;
if (!webdavAclManager) if (!aclManager)
webdavAclManager = [SOGoWebDAVAclManager new]; aclManager = [SOGoWebDAVAclManager new];
return webdavAclManager; return aclManager;
} }
/* /*

64
SoObjects/SOGo/SOGoParentFolder.m
View File

@ -54,50 +54,50 @@ static SoSecurityManager *sm = nil;
+ (SOGoWebDAVAclManager *) webdavAclManager + (SOGoWebDAVAclManager *) webdavAclManager
{ {
SOGoWebDAVAclManager *webdavAclManager = nil; SOGoWebDAVAclManager *aclManager = nil;
if (!webdavAclManager) if (!aclManager)
{ {
webdavAclManager = [SOGoWebDAVAclManager new]; aclManager = [SOGoWebDAVAclManager new];
[webdavAclManager registerDAVPermission: davElement (@"read", [aclManager registerDAVPermission: davElement (@"read",
XMLNS_WEBDAV) XMLNS_WEBDAV)
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"all", XMLNS_WEBDAV)]; asChildOf: davElement (@"all", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: [aclManager registerDAVPermission:
davElement (@"read-current-user-privilege-set", davElement (@"read-current-user-privilege-set",
XMLNS_WEBDAV) XMLNS_WEBDAV)
abstract: NO abstract: NO
withEquivalent: SoPerm_WebDAVAccess withEquivalent: SoPerm_WebDAVAccess
asChildOf: davElement (@"read", XMLNS_WEBDAV)]; asChildOf: davElement (@"read", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: davElement (@"write", [aclManager registerDAVPermission: davElement (@"write",
XMLNS_WEBDAV) XMLNS_WEBDAV)
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"all", XMLNS_WEBDAV)]; asChildOf: davElement (@"all", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: davElement (@"bind", [aclManager registerDAVPermission: davElement (@"bind",
XMLNS_WEBDAV) XMLNS_WEBDAV)
abstract: NO abstract: NO
withEquivalent: SoPerm_AddFolders withEquivalent: SoPerm_AddFolders
asChildOf: davElement (@"write", XMLNS_WEBDAV)]; asChildOf: davElement (@"write", XMLNS_WEBDAV)];
[webdavAclManager registerDAVPermission: davElement (@"unbind", [aclManager registerDAVPermission: davElement (@"unbind",
XMLNS_WEBDAV) XMLNS_WEBDAV)
abstract: NO abstract: NO
withEquivalent: SoPerm_DeleteObjects withEquivalent: SoPerm_DeleteObjects
asChildOf: davElement (@"write", XMLNS_WEBDAV)]; asChildOf: davElement (@"write", XMLNS_WEBDAV)];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"write-properties", XMLNS_WEBDAV) registerDAVPermission: davElement (@"write-properties", XMLNS_WEBDAV)
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"write", XMLNS_WEBDAV)]; asChildOf: davElement (@"write", XMLNS_WEBDAV)];
[webdavAclManager [aclManager
registerDAVPermission: davElement (@"write-content", XMLNS_WEBDAV) registerDAVPermission: davElement (@"write-content", XMLNS_WEBDAV)
abstract: YES abstract: YES
withEquivalent: nil withEquivalent: nil
asChildOf: davElement (@"write", XMLNS_WEBDAV)]; asChildOf: davElement (@"write", XMLNS_WEBDAV)];
} }
return webdavAclManager; return aclManager;
} }
- (id) init - (id) init

3
SoObjects/SOGo/SOGoUser.m
View File

@ -35,13 +35,14 @@
#import <NGExtensions/NSNull+misc.h> #import <NGExtensions/NSNull+misc.h>
#import <NGExtensions/NSObject+Logs.h> #import <NGExtensions/NSObject+Logs.h>
#import "SOGoUserDefaults.h"
#import "LDAPUserManager.h" #import "LDAPUserManager.h"
#import "NSArray+Utilities.h" #import "NSArray+Utilities.h"
#import "SOGoCache.h" #import "SOGoCache.h"
#import "SOGoDateFormatter.h" #import "SOGoDateFormatter.h"
#import "SOGoObject.h" #import "SOGoObject.h"
#import "SOGoPermissions.h" #import "SOGoPermissions.h"
#import "SOGoUserDefaults.h"
#import "SOGoUserFolder.h"
#import "SOGoUser.h" #import "SOGoUser.h"

1
UI/Contacts/UIxContactsListViewContainer.m
View File

@ -23,6 +23,7 @@
#import <Foundation/NSArray.h> #import <Foundation/NSArray.h>
#import <Foundation/NSDictionary.h> #import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h> #import <Foundation/NSString.h>
#import <Foundation/NSUserDefaults.h>
#import <NGObjWeb/SoObjects.h> #import <NGObjWeb/SoObjects.h>
#import <NGExtensions/NSObject+Values.h> #import <NGExtensions/NSObject+Values.h>