amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 11:55:24 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 9471b58db3d1d35edb1f29028618d989019b7fa6

Browse Source 
Monotone-Revision: ee1bf6730d133028cc507c71b8b7c02a85158b92

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-01T20:59:47
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-06-01 20:59:47 +00:00
parent c9fa0c296c
commit 9b19492cc4
3 changed files with 95 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+8
View File
@@ -1,5 +1,13 @@
2007-06-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoContentObject.m ([SOGoContentObject
-initWithName:newNameinContainer:newContainer]): read the content
directly from here. That way we can determine whether the object
is being created.
([SOGoContentObject -aclsForUser:uid]): if the object is new and
the ObjectCreator role is enabled, we also grant the ObjectEditor
role to the current user.
* UI/Common/UIxFolderActions.m ([-canAccessContentAction]):
changed the method paradigm to only return HTTP code 204. Not test
is done whatsoever since the security manager does it for us.
SoObjects/SOGo/SOGoContentObject.h
+2
View File
@@ -33,6 +33,7 @@
{
NSString *ocsPath;
NSString *content;
BOOL isNew;
}
/* accessors */
@@ -47,6 +48,7 @@
/* content */
- (BOOL) isNew;
- (NSString *) contentAsString;
- (NSException *) saveContentString: (NSString *) _str
baseVersion: (unsigned int) _baseVersion;
SoObjects/SOGo/SOGoContentObject.m
+85 -50
View File
@@ -35,7 +35,22 @@
// TODO: check superclass version
- (void)dealloc {
- (id) initWithName: (NSString *) newName
inContainer: (id) newContainer
{
if ((self = [super initWithName: newName inContainer: newContainer]))
{
ocsPath = nil;
content = [[self ocsFolder] fetchContentWithName: newName];
[content retain];
isNew = (!content);
}
return self;
}
- (void) dealloc
{
[content release];
[ocsPath release];
[super dealloc];
@@ -43,51 +58,60 @@
/* notifications */
- (void)sleep {
- (void) sleep
{
[content release]; content = nil;
[super sleep];
}
/* accessors */
- (BOOL)isFolderish {
- (BOOL) isFolderish
{
return NO;
}
- (void)setOCSPath:(NSString *)_path {
if ([ocsPath isEqualToString:_path])
return;
- (void) setOCSPath: (NSString *) newOCSPath
{
if (![ocsPath isEqualToString: newOCSPath])
{
if (ocsPath)
[self warnWithFormat:@"GCS path is already set! '%@'", newOCSPath];
if (ocsPath)
[self warnWithFormat:@"GCS path is already set! '%@'", _path];
ASSIGNCOPY(ocsPath, _path);
ASSIGNCOPY (ocsPath, newOCSPath);
}
}
- (NSString *) ocsPath
{
NSString *p;
NSMutableString *newOCSPath;
if (!ocsPath)
{
p = [self ocsPathOfContainer];
if (p)
newOCSPath = [NSMutableString new];
[newOCSPath appendString: [self ocsPathOfContainer]];
if ([newOCSPath length] > 0)
{
if (![p hasSuffix:@"/"])
p = [p stringByAppendingString: @"/"];
ocsPath = [p stringByAppendingString: [self nameInContainer]];
[ocsPath retain];
if (![newOCSPath hasSuffix:@"/"])
[newOCSPath appendString: @"/"];
[newOCSPath appendString: nameInContainer];
ocsPath = newOCSPath;
}
}
return ocsPath;
}
- (NSString *)ocsPathOfContainer {
if (![[self container] respondsToSelector:@selector(ocsPath)])
return nil;
- (NSString *) ocsPathOfContainer
{
NSString *ocsPathOfContainer;
return [[self container] ocsPath];
if ([container respondsToSelector: @selector (ocsPath)])
ocsPathOfContainer = [container ocsPath];
else
ocsPathOfContainer = nil;
return ocsPath;
}
- (GCSFolder *) ocsFolder
@@ -97,42 +121,48 @@
/* content */
- (BOOL) isNew
{
return isNew;
}
- (NSString *) contentAsString
{
if (!content)
{
content = [[self ocsFolder] fetchContentWithName: nameInContainer];
[content retain];
}
return content;
}
- (NSException *) saveContentString: (NSString *) _str
baseVersion: (unsigned int) _baseVersion
- (NSException *) saveContentString: (NSString *) newContent
baseVersion: (unsigned int) newBaseVersion
{
/* Note: "iCal multifolder saves" are implemented in the apt subclass! */
GCSFolder *folder;
NSException *ex;
if ((folder = [self ocsFolder]) == nil) {
ex = nil;
ASSIGN (content, newContent);
folder = [container ocsFolder];
if (folder)
{
ex = [folder writeContent: newContent
toName: nameInContainer
baseVersion: newBaseVersion];
if (ex)
[self errorWithFormat:@"write failed: %@", ex];
}
else
[self errorWithFormat:@"Did not find folder of content object."];
return nil;
}
ex = [folder writeContent:_str toName:[self nameInContainer]
baseVersion:_baseVersion];
if (ex != nil) {
[self errorWithFormat:@"write failed: %@", ex];
return ex;
}
return nil;
}
- (NSException *)saveContentString:(NSString *)_str {
return [self saveContentString:_str baseVersion:0 /* don't check */];
return ex;
}
- (NSException *)delete {
- (NSException *) saveContentString: (NSString *) newContent
{
return [self saveContentString: newContent baseVersion: 0];
}
- (NSException *) delete
{
/* Note: "iCal multifolder saves" are implemented in the apt subclass! */
GCSFolder *folder;
NSException *ex;
@@ -153,7 +183,8 @@
/* actions */
- (id)PUTAction:(WOContext *)_ctx {
- (id) PUTAction: (WOContext *) _ctx
{
WORequest *rq;
NSException *error;
unsigned int baseVersion;
@@ -226,7 +257,7 @@
/* setup response */
// TODO: this should be automatic in the SoDispatcher if we return nil?
[[_ctx response] setStatus:201 /* Created */];
[[_ctx response] setStatus: 201 /* Created */];
if ((etag = [self davEntityTag]) != nil)
[[_ctx response] setHeader:etag forKey:@"etag"];
@@ -321,9 +352,13 @@
if ([containerAcls count] > 0)
{
if ([containerAcls containsObject: SOGoRole_ObjectCreator])
[acls addObject: SOGoRole_ObjectCreator];
if ([containerAcls containsObject: SOGoRole_ObjectEraser])
[acls addObject: SOGoRole_ObjectEraser];
{
[acls addObject: SOGoRole_ObjectCreator];
if (isNew)
[acls addObject: SOGoRole_ObjectEditor];
}
if ([containerAcls containsObject: SOGoRole_ObjectReader])
[acls addObject: SOGoRole_ObjectViewer];
}
return acls;