mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-10-08 13:27:15 +00:00
See ChangeLog
Monotone-Parent: 2c4d3e7457a36602400b6dd3bfb34b34fa47e606 Monotone-Revision: 1a11794c7fbd8ad9ba3eff5fdc2d1716a84efb62 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-02-15T19:00:40 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
1 parent
2d3b7d8bd0
commit
6a65eb359b
2 files changed
+33
-12
No files matched your search
@@ -52,6 +52,7 @@
|
||||
#import <SOGo/SOGoPermissions.h>
|
||||
#import <SOGo/SOGoUser.h>
|
||||
#import <SOGo/SOGoUserDefaults.h>
|
||||
#import <SOGo/SOGoSystemDefaults.h>
|
||||
#import <SOGo/SOGoUserManager.h>
|
||||
#import <SOGo/SOGoWebDAVAclManager.h>
|
||||
#import <SOGo/WORequest+SOGo.h>
|
||||
@@ -591,7 +592,6 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
|
||||
- (void) saveComponent: (iCalRepeatableEntityObject *) newObject
|
||||
{
|
||||
NSString *newiCalString, *newUid;
|
||||
SOGoEMailAlarmsManager *eaMgr;
|
||||
|
||||
if (!isNew
|
||||
&& [newObject isRecurrent])
|
||||
@@ -613,9 +613,14 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
|
||||
[newObject setUid: newUid];
|
||||
}
|
||||
|
||||
eaMgr = [SOGoEMailAlarmsManager sharedEMailAlarmsManager];
|
||||
[eaMgr handleAlarmsInCalendar: [newObject parent]
|
||||
fromComponent: self];
|
||||
if ([[SOGoSystemDefaults sharedSystemDefaults] enableEMailAlarms])
|
||||
{
|
||||
SOGoEMailAlarmsManager *eaMgr;
|
||||
|
||||
eaMgr = [SOGoEMailAlarmsManager sharedEMailAlarmsManager];
|
||||
[eaMgr handleAlarmsInCalendar: [newObject parent]
|
||||
fromComponent: self];
|
||||
}
|
||||
|
||||
newiCalString = [[newObject parent] versitString];
|
||||
|
||||
@@ -1170,25 +1175,33 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
|
||||
#warning alarms: we don not handle occurrences
|
||||
- (NSException *) prepareDelete
|
||||
{
|
||||
SOGoEMailAlarmsManager *eaMgr;
|
||||
|
||||
eaMgr = [SOGoEMailAlarmsManager sharedEMailAlarmsManager];
|
||||
[eaMgr deleteAlarmsFromComponent: self];
|
||||
if ([[SOGoSystemDefaults sharedSystemDefaults] enableEMailAlarms])
|
||||
{
|
||||
SOGoEMailAlarmsManager *eaMgr;
|
||||
|
||||
eaMgr = [SOGoEMailAlarmsManager sharedEMailAlarmsManager];
|
||||
[eaMgr deleteAlarmsFromComponent: self];
|
||||
}
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
- (id) PUTAction: (WOContext *) localContext
|
||||
{
|
||||
SOGoEMailAlarmsManager *eaMgr;
|
||||
WORequest *rq;
|
||||
iCalCalendar *putCalendar;
|
||||
|
||||
rq = [localContext request];
|
||||
putCalendar = [iCalCalendar parseSingleFromSource: [rq contentAsString]];
|
||||
eaMgr = [SOGoEMailAlarmsManager sharedEMailAlarmsManager];
|
||||
[eaMgr handleAlarmsInCalendar: putCalendar
|
||||
fromComponent: self];
|
||||
|
||||
if ([[SOGoSystemDefaults sharedSystemDefaults] enableEMailAlarms])
|
||||
{
|
||||
SOGoEMailAlarmsManager *eaMgr;
|
||||
|
||||
eaMgr = [SOGoEMailAlarmsManager sharedEMailAlarmsManager];
|
||||
[eaMgr handleAlarmsInCalendar: putCalendar
|
||||
fromComponent: self];
|
||||
}
|
||||
|
||||
return [super PUTAction: localContext];
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user