Monotone-Parent: 8c10ce9de7820d19a0bad6bafc866e1949cd0540

Monotone-Revision: 9571c9ae651f3733c9c79a5898429b428d520a75

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-30T14:40:40
This commit is contained in:
Wolfgang Sourdeau
2011-11-30 14:40:40 +00:00
parent 82d75c2bae
commit cb0092b2ac
2 changed files with 42 additions and 2 deletions
+6
View File
@@ -1,5 +1,11 @@
2011-11-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoObject.m (-davComplianceClassesInContext:):
declare "calendar-query-extended", "extended-mkcol",
"calendarserver-principal-property-search" as additional calendar
classes, even though it's a lie.
(-davCurrentUserPrincipal): new method.
* SoObjects/Appointments/SOGoAppointmentFolder.m (-davResourceId):
new DAV getter.
+36 -2
View File
@@ -1211,14 +1211,48 @@
/* CalDAV */
if (needCalDAVClasses)
{
caldavClasses = [NSArray arrayWithObjects: @"calendar-access", @"calendar-schedule",
@"calendar-auto-schedule", @"calendar-proxy", nil];
caldavClasses = [NSArray arrayWithObjects: @"calendar-access",
@"calendar-schedule",
@"calendar-auto-schedule",
@"calendar-proxy",
// @"calendarserver-private-events",
// @"calendarserver-private-comments",
// @"calendarserver-sharing",
// @"calendarserver-sharing-no-scheduling",
@"calendar-query-extended",
@"extended-mkcol",
@"calendarserver-principal-property-search",
nil];
[classes addObjectsFromArray: caldavClasses];
}
return classes;
}
- (SOGoWebDAVValue *) davCurrentUserPrincipal
{
NSDictionary *userHREF;
NSString *login;
SOGoUser *activeUser;
SOGoWebDAVValue *davCurrentUserPrincipal;
activeUser = [[self context] activeUser];
login = [activeUser login];
if ([login isEqualToString: @"anonymous"])
davCurrentUserPrincipal = nil;
else
{
userHREF = davElementWithContent (@"href", XMLNS_WEBDAV, [self davURLAsString]);
davCurrentUserPrincipal
= [davElementWithContent (@"current-user-principal",
XMLNS_WEBDAV,
userHREF)
asWebDAVValue];
}
return davCurrentUserPrincipal;
}
/* dav acls */
- (NSString *) davRecordForUser: (NSString *) user
parameters: (NSArray *) params