mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-21 15:02:40 +00:00
Monotone-Parent: 16b846dd0fb3a63bdd80cb7ed360972da407527b
Monotone-Revision: bb276eea8dc76b5c71f49df1d23424ab19015233 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-01-04T15:26:30 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
1 parent
cba23f9993
commit
15e606341e
18 files changed
+859
-110
No files matched your search
@@ -27,6 +27,10 @@
|
||||
|
||||
@interface SOGoContactFolders : SOGoParentFolder
|
||||
|
||||
- (NSException *) renameLDAPAddressBook: (NSString *) sourceID
|
||||
withDisplayName: (NSString *) newDisplayName;
|
||||
- (NSException *) removeLDAPAddressBook: (NSString *) sourceID;
|
||||
|
||||
@end
|
||||
|
||||
#endif /* SOGOCONTACTFOLDERS_H */
|
||||
@@ -33,10 +33,12 @@
|
||||
#import <Foundation/NSEnumerator.h>
|
||||
|
||||
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||
#import <NGObjWeb/NSException+HTTP.h>
|
||||
#import <DOM/DOMElement.h>
|
||||
#import <DOM/DOMProtocols.h>
|
||||
|
||||
#import <SOGo/NSObject+DAV.h>
|
||||
#import <SOGo/SOGoLDAPAddressBook.h>
|
||||
#import <SOGo/SOGoUser.h>
|
||||
#import <SOGo/SOGoUserDefaults.h>
|
||||
#import <SOGo/SOGoUserManager.h>
|
||||
@@ -45,6 +47,7 @@
|
||||
|
||||
#import "SOGoContactGCSFolder.h"
|
||||
#import "SOGoContactSourceFolder.h"
|
||||
|
||||
#import "SOGoContactFolders.h"
|
||||
|
||||
#define XMLNS_INVERSEDAV @"urn:inverse:params:xml:ns:inverse-dav"
|
||||
@@ -60,6 +63,62 @@
|
||||
return [SOGoContactGCSFolder class];
|
||||
}
|
||||
|
||||
- (void) _fetchLDAPAddressBooks: (id <SOGoSource>) source
|
||||
{
|
||||
id <SOGoSource> abSource;
|
||||
SOGoContactSourceFolder *folder;
|
||||
NSArray *abSources;
|
||||
NSUInteger count, max;
|
||||
NSString *name;
|
||||
|
||||
abSources = [source addressBookSourcesForUser: owner];
|
||||
max = [abSources count];
|
||||
for (count = 0; count < max; count++)
|
||||
{
|
||||
abSource = [abSources objectAtIndex: count];
|
||||
name = [abSource sourceID];
|
||||
folder = [SOGoContactSourceFolder folderWithName: name
|
||||
andDisplayName: [abSource displayName]
|
||||
inContainer: self];
|
||||
[folder setSource: abSource];
|
||||
[folder setIsPersonalSource: YES];
|
||||
[subFolders setObject: folder forKey: name];
|
||||
}
|
||||
}
|
||||
|
||||
- (NSException *) appendPersonalSources
|
||||
{
|
||||
SOGoUser *currentUser;
|
||||
NSException *result;
|
||||
id <SOGoSource> source;
|
||||
|
||||
currentUser = [context activeUser];
|
||||
source = [currentUser authenticationSource];
|
||||
if ([source hasUserAddressBooks])
|
||||
{
|
||||
result = nil;
|
||||
/* We don't handle ACLs for user LDAP addressbooks yet, therefore only
|
||||
the owner has access to his addressbooks. */
|
||||
if (activeUserIsOwner
|
||||
|| [[currentUser login] isEqualToString: owner])
|
||||
{
|
||||
[self _fetchLDAPAddressBooks: source];
|
||||
if (![subFolders objectForKey: @"personal"])
|
||||
{
|
||||
result = [source addAddressBookSource: @"personal"
|
||||
withDisplayName: [self defaultFolderName]
|
||||
forUser: owner];
|
||||
if (!result)
|
||||
[self _fetchLDAPAddressBooks: source];
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
result = [super appendPersonalSources];
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
- (NSException *) appendSystemSources
|
||||
{
|
||||
SOGoUserManager *um;
|
||||
@@ -101,6 +160,88 @@
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
- (NSException *) newFolderWithName: (NSString *) name
|
||||
andNameInContainer: (NSString *) newNameInContainer
|
||||
{
|
||||
SOGoUser *currentUser;
|
||||
NSException *result;
|
||||
id <SOGoSource> source;
|
||||
|
||||
currentUser = [context activeUser];
|
||||
source = [currentUser authenticationSource];
|
||||
if ([source hasUserAddressBooks])
|
||||
{
|
||||
result = nil;
|
||||
/* We don't handle ACLs for user LDAP addressbooks yet, therefore only
|
||||
the owner has access to his addressbooks. */
|
||||
if (activeUserIsOwner
|
||||
|| [[currentUser login] isEqualToString: owner])
|
||||
{
|
||||
result = [source addAddressBookSource: newNameInContainer
|
||||
withDisplayName: name
|
||||
forUser: owner];
|
||||
if (!result)
|
||||
[self _fetchLDAPAddressBooks: source];
|
||||
}
|
||||
}
|
||||
else
|
||||
result = [super newFolderWithName: name
|
||||
andNameInContainer: newNameInContainer];
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
- (NSException *) renameLDAPAddressBook: (NSString *) sourceID
|
||||
withDisplayName: (NSString *) newDisplayName
|
||||
{
|
||||
NSException *result;
|
||||
SOGoUser *currentUser;
|
||||
id <SOGoSource> source;
|
||||
|
||||
currentUser = [context activeUser];
|
||||
source = [currentUser authenticationSource];
|
||||
/* We don't handle ACLs for user LDAP addressbooks yet, therefore only
|
||||
the owner has access to his addressbooks. */
|
||||
if (activeUserIsOwner
|
||||
|| [[currentUser login] isEqualToString: owner])
|
||||
result = [source renameAddressBookSource: sourceID
|
||||
withDisplayName: newDisplayName
|
||||
forUser: owner];
|
||||
else
|
||||
result = [NSException exceptionWithHTTPStatus: 403
|
||||
reason: @"operation denied"];
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
- (NSException *) removeLDAPAddressBook: (NSString *) sourceID
|
||||
{
|
||||
NSException *result;
|
||||
SOGoUser *currentUser;
|
||||
id <SOGoSource> source;
|
||||
|
||||
if ([sourceID isEqualToString: @"personal"])
|
||||
result = [NSException exceptionWithHTTPStatus: 403
|
||||
reason: @"folder 'personal' cannot be deleted"];
|
||||
else
|
||||
{
|
||||
result = nil;
|
||||
currentUser = [context activeUser];
|
||||
source = [currentUser authenticationSource];
|
||||
/* We don't handle ACLs for user LDAP addressbooks yet, therefore only
|
||||
the owner has access to his addressbooks. */
|
||||
if (activeUserIsOwner
|
||||
|| [[currentUser login] isEqualToString: owner])
|
||||
result = [source removeAddressBookSource: sourceID
|
||||
forUser: owner];
|
||||
else
|
||||
result = [NSException exceptionWithHTTPStatus: 403
|
||||
reason: @"operation denied"];
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
- (NSString *) defaultFolderName
|
||||
{
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
{
|
||||
id <SOGoSource> source;
|
||||
NSMutableDictionary *childRecords;
|
||||
BOOL isPersonalSource;
|
||||
}
|
||||
|
||||
+ (id) folderWithName: (NSString *) aName
|
||||
@@ -48,6 +49,9 @@
|
||||
- (NSException *) saveLDIFEntry: (SOGoContactLDIFEntry *) ldifEntry;
|
||||
- (NSException *) deleteLDIFEntry: (SOGoContactLDIFEntry *) ldifEntry;
|
||||
|
||||
- (void) setIsPersonalSource: (BOOL) isPersonal;
|
||||
- (BOOL) isPersonalSource;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
|
||||
@@ -37,12 +37,16 @@
|
||||
#import <EOControl/EOSortOrdering.h>
|
||||
#import <SaxObjC/XMLNamespaces.h>
|
||||
|
||||
#import <SOGo/SOGoPermissions.h>
|
||||
#import <SOGo/SOGoSource.h>
|
||||
#import <SOGo/NSArray+Utilities.h>
|
||||
#import <SOGo/NSDictionary+Utilities.h>
|
||||
#import <SOGo/NSString+Utilities.h>
|
||||
#import <SOGo/SOGoPermissions.h>
|
||||
#import <SOGo/SOGoSource.h>
|
||||
#import <SOGo/SOGoUserSettings.h>
|
||||
#import <SOGo/WORequest+SOGo.h>
|
||||
|
||||
#import "SOGoContactFolders.h"
|
||||
#import "SOGoContactGCSFolder.h"
|
||||
#import "SOGoContactLDIFEntry.h"
|
||||
#import "SOGoContactSourceFolder.h"
|
||||
|
||||
@@ -107,6 +111,16 @@
|
||||
return source;
|
||||
}
|
||||
|
||||
- (void) setIsPersonalSource: (BOOL) isPersonal
|
||||
{
|
||||
isPersonalSource = isPersonal;
|
||||
}
|
||||
|
||||
- (BOOL) isPersonalSource
|
||||
{
|
||||
return isPersonalSource;
|
||||
}
|
||||
|
||||
- (NSString *) groupDavResourceType
|
||||
{
|
||||
return @"vcard-collection";
|
||||
@@ -135,6 +149,7 @@
|
||||
SOGoContactLDIFEntry *obj;
|
||||
NSString *url;
|
||||
BOOL isNew = NO;
|
||||
NSArray *baseClasses;
|
||||
|
||||
/* first check attributes directly bound to the application */
|
||||
obj = [super lookupName: objectName inContext: lookupContext acquire: NO];
|
||||
@@ -152,7 +167,11 @@
|
||||
url = [[[lookupContext request] uri] urlWithoutParameters];
|
||||
if ([url hasSuffix: @"AsContact"])
|
||||
{
|
||||
ldifEntry = [NSMutableDictionary dictionary];
|
||||
baseClasses = [NSArray arrayWithObjects: @"inetorgperson",
|
||||
@"mozillaabpersonalpha", nil];
|
||||
ldifEntry = [NSMutableDictionary
|
||||
dictionaryWithObject: baseClasses
|
||||
forKey: @"objectclass"];
|
||||
isNew = YES;
|
||||
}
|
||||
}
|
||||
@@ -294,7 +313,8 @@
|
||||
|
||||
result = nil;
|
||||
|
||||
if ([filter length] > 0 && [criteria isEqualToString: @"name_or_address"])
|
||||
if (([filter length] > 0 && [criteria isEqualToString: @"name_or_address"])
|
||||
|| ![source listRequiresDot])
|
||||
{
|
||||
records = [source fetchContactsMatching: filter];
|
||||
[childRecords setObjects: records
|
||||
@@ -335,22 +355,88 @@
|
||||
- (NSComparisonResult) compare: (id) otherFolder
|
||||
{
|
||||
NSComparisonResult comparison;
|
||||
BOOL otherIsPersonal;
|
||||
|
||||
if ([NSStringFromClass([otherFolder class])
|
||||
isEqualToString: @"SOGoContactGCSFolder"])
|
||||
comparison = NSOrderedDescending;
|
||||
otherIsPersonal = ([otherFolder isKindOfClass: [SOGoContactGCSFolder class]]
|
||||
|| ([otherFolder isKindOfClass: isa] && [otherFolder isPersonalSource]));
|
||||
|
||||
if (isPersonalSource)
|
||||
{
|
||||
if (otherIsPersonal && ![nameInContainer isEqualToString: @"personal"])
|
||||
{
|
||||
if ([[otherFolder nameInContainer] isEqualToString: @"personal"])
|
||||
comparison = NSOrderedDescending;
|
||||
else
|
||||
comparison
|
||||
= [[self displayName]
|
||||
localizedCaseInsensitiveCompare: [otherFolder displayName]];
|
||||
}
|
||||
else
|
||||
comparison = NSOrderedAscending;
|
||||
}
|
||||
else
|
||||
comparison
|
||||
= [[self displayName]
|
||||
localizedCaseInsensitiveCompare: [otherFolder displayName]];
|
||||
{
|
||||
if (otherIsPersonal)
|
||||
comparison = NSOrderedDescending;
|
||||
else
|
||||
comparison
|
||||
= [[self displayName]
|
||||
localizedCaseInsensitiveCompare: [otherFolder displayName]];
|
||||
}
|
||||
|
||||
return comparison;
|
||||
}
|
||||
|
||||
/* common methods */
|
||||
|
||||
- (NSException *) delete
|
||||
{
|
||||
NSException *error;
|
||||
|
||||
if (isPersonalSource)
|
||||
{
|
||||
error = [(SOGoContactFolders *) container
|
||||
removeLDAPAddressBook: nameInContainer];
|
||||
if (!error && [[context request] handledByDefaultHandler])
|
||||
[self sendFolderAdvisoryTemplate: @"Removal"];
|
||||
}
|
||||
else
|
||||
error = [NSException exceptionWithHTTPStatus: 501 /* not implemented */
|
||||
reason: @"delete not available on system sources"];
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
- (void) renameTo: (NSString *) newName
|
||||
{
|
||||
NSException *error;
|
||||
|
||||
if (isPersonalSource)
|
||||
{
|
||||
if (![[source displayName] isEqualToString: newName])
|
||||
{
|
||||
error = [(SOGoContactFolders *) container
|
||||
renameLDAPAddressBook: nameInContainer
|
||||
withDisplayName: newName];
|
||||
if (!error)
|
||||
[self setDisplayName: newName];
|
||||
}
|
||||
}
|
||||
/* If public source then method is ignored, maybe we should return an
|
||||
NSException instead... */
|
||||
}
|
||||
|
||||
/* acls */
|
||||
- (NSString *) ownerInContext: (WOContext *) noContext
|
||||
{
|
||||
return @"nobody";
|
||||
NSString *sourceOwner;
|
||||
|
||||
if (isPersonalSource)
|
||||
sourceOwner = [[source modifiers] objectAtIndex: 0];
|
||||
else
|
||||
sourceOwner = @"nobody";
|
||||
|
||||
return sourceOwner;
|
||||
}
|
||||
|
||||
- (NSArray *) subscriptionRoles
|
||||
|
||||
Reference in new issue
Block a user