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

Monotone-Parent: 85c52cbdb1ccbb6556dcc53a586a3b4ef57c1bdd

Browse Source 
Monotone-Revision: 7ef3fc5a5aa4f023c3500caf206aaf3c7267592c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-11-17T22:27:07
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-11-17 22:27:07 +00:00
parent ed1302df85
commit 66e31fc8d4
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoAppointmentObject.m
+7 -11
View File
@@ -22,6 +22,7 @@
#import "SOGoAppointmentObject.h"
#import <SOGo/AgenorUserManager.h>
#import <SOGo/SOGoObject.h>
#import <SaxObjC/SaxObjC.h>
#import <NGCards/NGCards.h>
#import <NGCards/iCalCalendar.h>
@@ -38,8 +39,7 @@
#import "NSArray+Appointments.h"
@interface SOGoAppointmentObject (PrivateAPI)
- (NSString *)homePageURLForPerson:(iCalPerson *)_person;
- (NSTimeZone *)viewTimeZoneForPerson:(iCalPerson *)_person;
- (NSString *) homePageURLForPerson: (iCalPerson *) _person;
- (void)sendEMailUsingTemplateNamed:(NSString *)_pageName
forOldAppointment:(iCalEvent *)_newApt
@@ -230,6 +230,10 @@ static NSString *mailTemplateDefaultLanguage = nil;
[self nameInContainer], folder];
continue;
}
if ([apt isKindOfClass: [NSException class]]) {
[self logWithFormat:@"Exception: %@", [(NSException *) apt reason]];
continue;
}
if ((error = [apt primarySaveContentString:_iCal]) != nil) {
[self logWithFormat:@"Note: failed to save iCal in folder: %@", folder];
@@ -619,14 +623,6 @@ static NSString *mailTemplateDefaultLanguage = nil;
return [NSString stringWithFormat:@"%@%@", baseURL, uid];
}
- (NSTimeZone *) viewTimeZoneForPerson: (iCalPerson *) _person
{
/* TODO: get this from user config as soon as this is available and only
* fall back to default timeZone if config data is not available
*/
return [self serverTimeZone];
}
- (NSException *) saveContentString: (NSString *) contentString
baseVersion: (unsigned int) baseVersion
{
@@ -728,7 +724,7 @@ static NSString *mailTemplateDefaultLanguage = nil;
[p setNewApt:_newApt];
[p setOldApt:_oldApt];
[p setHomePageURL:[self homePageURLForPerson:attendee]];
[p setViewTZ:[self viewTimeZoneForPerson:attendee]];
[p setViewTZ: [self userTimeZone: cn]];
subject = [p getSubject];
text = [p getBody];
SoObjects/Appointments/SOGoTaskObject.m
+5 -11
View File
@@ -36,7 +36,6 @@
@interface SOGoTaskObject (PrivateAPI)
- (NSString *)homePageURLForPerson:(iCalPerson *)_person;
- (NSTimeZone *)viewTimeZoneForPerson:(iCalPerson *)_person;
- (void)sendEMailUsingTemplateNamed:(NSString *)_pageName
forOldTask:(iCalToDo *)_newApt
@@ -258,6 +257,10 @@ static NSString *mailTemplateDefaultLanguage = nil;
[self nameInContainer], folder];
continue;
}
if ([task isKindOfClass: [NSException class]]) {
[self logWithFormat:@"Exception: %@", [(NSException *) task reason]];
continue;
}
if ((error = [task primaryDelete]) != nil) {
[self logWithFormat:@"Note: failed to delete in folder: %@", folder];
@@ -619,15 +622,6 @@ static NSString *mailTemplateDefaultLanguage = nil;
return [NSString stringWithFormat:@"%@%@", baseURL, uid];
}
- (NSTimeZone *) viewTimeZoneForPerson: (iCalPerson *) _person
{
/* TODO: get this from user config as soon as this is available and only
* fall back to default timeZone if config data is not available
*/
return [self serverTimeZone];
}
- (void)sendEMailUsingTemplateNamed:(NSString *)_pageName
forOldTask:(iCalToDo *)_oldApt
andNewTask:(iCalToDo *)_newApt
@@ -700,7 +694,7 @@ static NSString *mailTemplateDefaultLanguage = nil;
[p setNewApt: _newApt];
[p setOldApt: _oldApt];
[p setHomePageURL:[self homePageURLForPerson:attendee]];
[p setViewTZ:[self viewTimeZoneForPerson:attendee]];
[p setViewTZ: [self userTimeZone: cn]];
subject = [p getSubject];
text = [p getBody];