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

Monotone-Parent: 827d1bc635d1b6af9324b168e8af26b80c4648e0 

Monotone-Revision: 40a7f11491111f2eb805d4198decee8951ba0cf6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-02-25T21:59:25
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2008-02-25 21:59:25 +00:00
parent 0dce31942e
commit 60fad625ca
2 changed files with 69 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-02-25 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder
-davSubscribe:queryContext]): implemented subscribing users other
that the current one, if the user doing the operation is a superuser.
([SOGoGCSFolder -davUnsubscribe:queryContext]): same as above for
unsubscription.
2008-02-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder

74
SoObjects/SOGo/SOGoGCSFolder.m
View File

@ -41,6 +41,7 @@
#import <NGExtensions/NSString+misc.h>
#import <NGExtensions/NSNull+misc.h>
#import <NGExtensions/NSObject+Logs.h>
#import <DOM/DOMProtocols.h>
#import <EOControl/EOQualifier.h>
#import <GDLAccess/EOAdaptorChannel.h>
#import <GDLContentStore/GCSChannelManager.h>
@ -408,25 +409,22 @@ static BOOL sendFolderAdvisories = NO;
#warning this code should be cleaned up
#warning this code is a dup of UIxFolderActions,\
we should remove the methods there instead
- (WOResponse *) _subscribe: (BOOL) reallyDo
inContext: (WOContext *) localContext
we should remove the methods there
- (void) _subscribeUser: (SOGoUser *) subscribingUser
reallyDo: (BOOL) reallyDo
inResponse: (WOResponse *) response
{
WOResponse *response;
NSMutableArray *folderSubscription;
NSString *subscriptionPointer, *baseFolder, *folder;
SOGoUser *activeUser;
NSUserDefaults *ud;
NSArray *realFolderPath;
NSMutableDictionary *moduleSettings;
activeUser = [localContext activeUser];
ud = [activeUser userSettings];
ud = [subscribingUser userSettings];
baseFolder = [container nameInContainer];
moduleSettings = [ud objectForKey: baseFolder];
response = [localContext response];
if ([owner isEqualToString: [activeUser login]])
if ([owner isEqualToString: [subscribingUser login]])
{
[response setStatus: 403];
[response appendContentString:
@ -461,18 +459,68 @@ static BOOL sendFolderAdvisories = NO;
[response setStatus: 204];
}
}
- (WOResponse *) _subscribe: (BOOL) reallyDo
inTheNameOf: (NSString *) delegatedUser
inContext: (WOContext *) localContext
{
WOResponse *response;
SOGoUser *currentUser, *subscriptionUser;
BOOL validRequest;
response = [localContext response];
currentUser = [localContext activeUser];
if ([delegatedUser length])
{
validRequest = ([currentUser isSuperUser]);
subscriptionUser = [SOGoUser userWithLogin: delegatedUser roles: nil];
}
else
{
validRequest = YES;
subscriptionUser = currentUser;
}
if (validRequest)
[self _subscribeUser: subscriptionUser
reallyDo: reallyDo
inResponse: response];
else
{
[response setStatus: 403];
[response appendContentString:
@"You cannot subscribe another user to any folder"
@" unless you are a super-user."];
}
return response;
}
- (id <WOActionResults>) davSubscribe: (WOContext *) localContext
- (NSString *) _parseDAVDelegatedUser: (WOContext *) queryContext
{
return [self _subscribe: YES inContext: localContext];
id <DOMDocument> document;
id <DOMNamedNodeMap> attrs;
document = [[queryContext request] contentAsDOMDocument];
attrs = [[document documentElement] attributes];
return [[attrs namedItem: @"user"] nodeValue];
}
- (id <WOActionResults>) davUnsubscribe: (WOContext *) localContext
- (id <WOActionResults>) davSubscribe: (WOContext *) queryContext
{
return [self _subscribe: NO inContext: localContext];
return [self _subscribe: YES
inTheNameOf: [self _parseDAVDelegatedUser: queryContext]
inContext: queryContext];
}
- (id <WOActionResults>) davUnsubscribe: (WOContext *) queryContext
{
return [self _subscribe: NO
inTheNameOf: [self _parseDAVDelegatedUser: queryContext]
inContext: queryContext];
}
- (NSException *) davSetProperties: (NSDictionary *) setProps