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

Monotone-Parent: 9872ae08d0e84f59ec67ccfa772caf1a9d1c613f

Browse Source 
Monotone-Revision: f0f12cec0b288caae2086872cad9e044311da3b9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-04-01T17:54:23
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-04-01 17:54:23 +00:00
parent 5bdbc63603
commit 64d1eeab3b
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,5 +1,9 @@
2011-04-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoCalendarComponent.m
(-contentAsString): strip alarms from component if the alarms are
disabled on the containing calendar.
* SoObjects/SOGo/SOGoObject.m (-davComplianceClassesInContext:):
added "calendar-auto-schedule", "calendar-proxy" and "calenderserver-principal-property
SoObjects/Appointments/SOGoCalendarComponent.m
+25 -1
View File
@@ -408,12 +408,36 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
return obj;
}
- (NSString *) _secureContentWithoutAlarms
{
iCalCalendar *calendar;
NSArray *allComponents;
iCalEntityObject *currentComponent;
NSUInteger count, max;
calendar = [self calendar: NO secure: YES];
allComponents = [calendar childrenWithTag: [self componentTag]];
max = [allComponents count];
for (count = 0; count < max; count++)
{
currentComponent = [allComponents objectAtIndex: count];
[currentComponent removeAllAlarms];
}
return [calendar versitString];
}
- (NSString *) contentAsString
{
NSString *secureContent;
if ([[context request] isSoWebDAVRequest])
secureContent = [self secureContentAsString];
{
if ([container showCalendarAlarms])
secureContent = [self secureContentAsString];
else
secureContent = [self _secureContentWithoutAlarms];
}
else
secureContent = [super contentAsString];