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

Monotone-Parent: 611626379a1312fbf65d92dbd94e483f8b8e7c0f

Browse Source 
Monotone-Revision: b7d3eaea12c9e01c01c45ba3d8c25121b4cb4e39

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-07-29T16:36:16
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2008-07-29 16:36:16 +00:00
1 parent 13f09cd2b6
commit 24fa92b64e
15 files changed
+240 -235
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SoObjects/SOGo/NSDictionary+DAV.m
+1
View File
@@ -20,6 +20,7 @@
* Boston, MA 02111-1307, USA.
*/
#import <Foundation/NSArray.h>
#import <Foundation/NSEnumerator.h>
#import <Foundation/NSString.h>
SoObjects/SOGo/NSScanner+BSJSONAdditions.m
+7 -7
View File
@@ -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
SoObjects/SOGo/SOGoCache.m
+2
View File
@@ -26,7 +26,9 @@
#import <NGObjWeb/SoObject.h>
#import "SOGoObject.h"
#import "SOGoUser.h"
#import "SOGoCache.h"
static SOGoCache *sharedCache = nil;
SoObjects/SOGo/SOGoContentObject.m
+1
View File
@@ -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>
SoObjects/SOGo/SOGoDAVAuthenticator.m
+1
View File
@@ -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>
SoObjects/SOGo/SOGoGCSFolder.m
+32 -32
View File
@@ -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
SoObjects/SOGo/SOGoObject.m
+4 -4
View File
@@ -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;
}
/*
SoObjects/SOGo/SOGoParentFolder.m
+32 -32
View File
@@ -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
SoObjects/SOGo/SOGoUser.m
+2 -1
View File
@@ -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"