Monotone-Parent: 0f28c38403961b687cf6ca703e2d8b420dc03e4a

Monotone-Revision: 5290130c3ebde9c239744a110d84e615c4dbb83d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-26T21:48:52
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2007-06-26 21:48:52 +00:00
parent 5ad5ad063c
commit c68be057f6
3 changed files with 22 additions and 18 deletions

View File

@ -11,7 +11,7 @@
SOGoAppointmentFolder = {
superclass = "SOGoFolder";
defaultRoles = {
"FreeBusyLookup" = ( "Owner", "FreeBusy", "AuthorizedSubscriber" );
/* "FreeBusyLookup" = ( "Owner", "FreeBusy", "AuthorizedSubscriber" ); */
"ViewWholePublicRecords" = ( "Owner", "PublicResponder", "PublicModifier", "PublicViewer" );
"ViewDAndTOfPublicRecords" = ( "Owner", "PublicDAndTViewer" );
"ModifyPublicRecords" = ( "Owner", "PublicModifier" );
@ -29,7 +29,7 @@
};
};
SOGoGroupAppointmentFolder = {
superclass = "SOGoAppointmentFolder";
superclass = "SOGoAppointmentFolder";
};
SOGoCalendarComponent = {
superclass = "SOGoContentObject";
@ -42,14 +42,18 @@
};
};
SOGoAppointmentObject = {
superclass = "SOGoCalendarComponent";
superclass = "SOGoCalendarComponent";
};
SOGoTaskObject = {
superclass = "SOGoCalendarComponent";
};
SOGoFreeBusyObject = {
superclass = "SOGoContentObject";
protectedBy = "<public>";
superclass = "SOGoContentObject";
protectedBy = "Access Contents Information";
defaultRoles = {
"Access Contents Information" = ( "Owner", "Authenticated" );
"WebDAV Access" = ( "Owner", "Authenticated" );
};
};
};
}

View File

@ -77,9 +77,9 @@
else
accept = ([_login length] > 0);
return (accept
|| ([_login isEqualToString: @"freebusy"]
&& [_pwd isEqualToString: @"freebusy"]));
return accept;
// || ([_login isEqualToString: @"freebusy"]
// && [_pwd isEqualToString: @"freebusy"]));
}
- (NSString *) _passwordInContext: (WOContext *) context
@ -103,7 +103,7 @@
- (SOGoUser *) userInContext: (WOContext *)_ctx
{
static SOGoUser *anonymous = nil, *freebusy;
static SOGoUser *anonymous = nil;
SOGoUser *user;
NSArray *traversalPath;
NSString *login;
@ -112,10 +112,10 @@
anonymous
= [[SOGoUser alloc] initWithLogin: @"anonymous"
roles: [NSArray arrayWithObject: SoRole_Anonymous]];
if (!freebusy)
freebusy
= [[SOGoUser alloc] initWithLogin: @"freebusy"
roles: [NSArray arrayWithObject: SOGoRole_FreeBusy]];
// if (!freebusy)
// freebusy
// = [[SOGoUser alloc] initWithLogin: @"freebusy"
// roles: [NSArray arrayWithObject: SOGoRole_FreeBusy]];
login = [self checkCredentialsInContext:_ctx];
if (login)
@ -123,10 +123,10 @@
if ([login isEqualToString: @"anonymous"])
{
traversalPath = [_ctx objectForKey: @"SoRequestTraversalPath"];
if ([[traversalPath lastObject] isEqualToString: @"freebusy.ifb"])
user = freebusy;
else
user = anonymous;
// if ([[traversalPath lastObject] isEqualToString: @"freebusy.ifb"])
// user = freebusy;
// else
user = anonymous;
}
else
{

View File

@ -12,7 +12,7 @@
superclass = "SoComponent";
protectedBy = "View";
defaultRoles = {
"View" = ( "Authenticated", "FreeBusy" );
"View" = ( "Authenticated" );
};
};
SOGoObject = {