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

rollback

Browse Source 
Monotone-Parent: 2d120d90819b42e21a50956a14c0c5d130cfdf09
Monotone-Revision: 376221b991f7b0bee18cfede79614398e85e5b99

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-31T18:52:52
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-10-31 18:52:52 +00:00
parent ad4fba45dc
commit ffa6aa7ecd
8 changed files with 88 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/GNUmakefile
-1
View File
@@ -11,7 +11,6 @@ Appointments_PRINCIPAL_CLASS = SOGoAppointmentsProduct
Appointments_OBJC_FILES = \
Product.m \
NSArray+Appointments.m \
iCalEntityObject+Agenor.m \
\
SOGoAppointmentObject.m \
SOGoTaskObject.m \
SoObjects/Appointments/SOGoAppointmentObject.m
-32
View File
@@ -29,10 +29,7 @@
#import <NGMime/NGMime.h>
#import <NGMail/NGMail.h>
#import <NGMail/NGSendMail.h>
#import "SOGoAptMailNotification.h"
#import "iCalEntityObject+Agenor.h"
#import "common.h"
#import "NSArray+Appointments.h"
@@ -510,7 +507,6 @@ static NSString *mailTemplateDefaultLanguage = nil;
- (NSException *)saveContentString:(NSString *)_iCalString {
return [self saveContentString:_iCalString baseSequence:0];
}
- (NSException *)delete {
return [self deleteWithBaseSequence:0];
}
@@ -614,34 +610,6 @@ static NSString *mailTemplateDefaultLanguage = nil;
return [self serverTimeZone];
}
- (NSException *) saveContentString: (NSString *) contentString
baseVersion: (unsigned int) baseVersion
{
NSString *newContentString, *oldContentString;
iCalCalendar *eventCalendar;
iCalEvent *event;
NSArray *organizers;
oldContentString = [self iCalString];
if (oldContentString)
newContentString = contentString;
else
{
eventCalendar = [iCalCalendar parseSingleFromSource: contentString];
event = [self firstEventFromCalendar: eventCalendar];
organizers = [event childrenWithTag: @"organizer"];
if ([organizers count])
newContentString = contentString;
else
{
[event setOrganizerWithUid: [self ownerInContext: nil]];
newContentString = [eventCalendar versitString];
}
}
return [super saveContentString: newContentString
baseVersion: baseVersion];
}
- (void)sendEMailUsingTemplateNamed:(NSString *)_pageName
forOldAppointment:(iCalEvent *)_oldApt
SoObjects/SOGo/SOGoAuthenticator.m
-1
View File
@@ -73,7 +73,6 @@ static SOGoAuthenticator *auth = nil;
{
BOOL result;
return YES;
if ([authMethod isEqualToString: @"LDAP"])
result = [self LDAPCheckLogin: _login password: _pwd];
else