Monotone-Parent: e93fdeaa76b1e9c3f341133f6683d32e2788bdab

Monotone-Revision: d57b28ddb577f7427c911380927e7e77ebd829aa

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-06-13T20:22:51
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2008-06-13 20:22:51 +00:00
1 parent a7bd1a9511
commit 5d40be582d
4 files changed
+913 -714

No files matched your search

+17
View File
@@ -1,5 +1,22 @@
2008-06-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
([-fetchContentObjectNames]): removed useless method.
([-fetchAllSOGoAppointments]): removed useless method.
([SOGoAppointmentFolder
-fetchCoreInfosFrom:_startDateto:_endDatetitle:titlecomponent:_componentadditionalFilters:filters]):
retrieve the fields required for object instantiation and cache
the resulting records.
([SOGoAppointmentFolder
-bareFetchFields:fieldsfrom:startDateto:endDatetitle:titlecomponent:componentadditionalFilters:filters]):
new method based on the non-bare part but simpler and without the
handling of cyclic records.
([SOGoAppointmentFolder -davCalendarQuery:queryContext])
([SOGoAppointmentFolder -davCalendarMultiget:queryContext]):
optimized those methods by replacing often-used NSArray instances
with arrays of ptr** and by removing utility submethods when
useful.
* SoObjects/Contacts/SOGoContactGCSEntry.m ([SOGoContactGCSEntry
-vCard]): use the new "content" ivar.
@@ -68,7 +68,6 @@
/* vevent UID handling */
- (NSString *) resourceNameForEventUID: (NSString *) _uid;
- (Class) objectClassForResourceNamed: (NSString *) c_name;
/* fetching */
@@ -119,8 +118,6 @@
/* bulk fetches */
- (NSArray *) fetchAllSOGoAppointments;
- (NSString *) roleForComponentsWithAccessClass: (iCalAccessClass) accessClass
forUser: (NSString *) uid;
File diff suppressed because it is too large. Load diff
@@ -101,7 +101,6 @@ static BOOL sendEMailNotifications = NO;
iCalCalendar *tmpCalendar;
iCalRepeatableEntityObject *tmpComponent;
// NSArray *roles;
// NSString *uid;
SoSecurityManager *sm;
NSString *iCalString;
@@ -124,9 +123,11 @@ static BOOL sendEMailNotifications = NO;
// calContent = nil;
sm = [SoSecurityManager sharedSecurityManager];
if (![sm validatePermission: SOGoCalendarPerm_ViewAllComponent
onObject: self inContext: context])
iCalString = [record objectForKey: @"c_content"];
if (activeUserIsOwner
|| [[self ownerInContext: context] isEqualToString: [[context activeUser] login]]
|| ![sm validatePermission: SOGoCalendarPerm_ViewAllComponent
onObject: self inContext: context])
iCalString = content;
else if (![sm validatePermission: SOGoCalendarPerm_ViewDAndT
onObject: self inContext: context])
{
@@ -170,7 +171,7 @@ static BOOL sendEMailNotifications = NO;
if (secure)
iCalString = [self secureContentAsString];
else
iCalString = [record objectForKey: @"c_content"];
iCalString = content;
if ([iCalString length] > 0)
calendar = [iCalCalendar parseSingleFromSource: iCalString];