From: wolfgang Date: Mon, 17 Dec 2007 15:29:43 +0000 (+0000) Subject: git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1304 d1b88da0-ebda-0310... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5c4b590c916219c6bb984c0c903f122a9d3bad3;p=scalable-opengroupware.org git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1304 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/ChangeLog b/ChangeLog index 4757ac4a..b3aaf1aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-17 Wolfgang Sourdeau + + * UI/Scheduler/NSArray+Scheduler.m ([NSMutableArray + -reverseArray]): new category method. + 2007-12-14 Ludovic Marcotte * SoObjects/Appointments/SOGoCalendarComponent.m diff --git a/SOPE/GDLContentStore/EOQualifier+GCS.m b/SOPE/GDLContentStore/EOQualifier+GCS.m index 88343350..965ea77e 100644 --- a/SOPE/GDLContentStore/EOQualifier+GCS.m +++ b/SOPE/GDLContentStore/EOQualifier+GCS.m @@ -96,6 +96,7 @@ else { [self errorWithFormat:@"%s: unsupported operation for null: %@", __PRETTY_FUNCTION__, NSStringFromSelector(op)]; + qOperator = @"="; } if ([val isKindOfClass:[NSNumber class]]) @@ -109,6 +110,7 @@ } } else { + isCI = NO; if (sel_eq(op, EOQualifierOperatorEqual)) { qOperator = @"IS"; qValue = @"NULL"; @@ -118,6 +120,8 @@ qValue = @"NULL"; } else { + qOperator = @"IS"; + qValue = @"NULL"; [self errorWithFormat:@"%s: invalid operation for null: %@", __PRETTY_FUNCTION__, NSStringFromSelector(op)]; } diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m index 23cbbdec..73b60ebd 100644 --- a/SOPE/GDLContentStore/GCSFolder.m +++ b/SOPE/GDLContentStore/GCSFolder.m @@ -757,7 +757,9 @@ static GCSStringFormatter *stringFormatter = nil; [self errorWithFormat:@"could not open storage channel!"]; return nil; } - if (!self->ofFlags.sameTableForQuick) { + if (!self->ofFlags.sameTableForQuick) + quickChannel = nil; + else { if ((quickChannel = [self acquireQuickChannel]) == nil) { [self errorWithFormat:@"could not open quick channel!"]; [self releaseChannel:storeChannel]; @@ -1103,25 +1105,25 @@ static GCSStringFormatter *stringFormatter = nil; [sql appendString:[self aclTableName]]; [sql appendString:@" WHERE "]; [sql appendString:[self generateSQLForQualifier:qualifier]]; - } - /* open channel */ + /* open channel */ - if ((channel = [self acquireAclChannel]) == nil) { - [self errorWithFormat:@"could not open acl channel!"]; - return; - } + if ((channel = [self acquireAclChannel]) == nil) { + [self errorWithFormat:@"could not open acl channel!"]; + return; + } - /* run SQL */ - - if ((error = [channel evaluateExpressionX:sql]) != nil) { - [self errorWithFormat:@"%s: cannot execute acl-fetch SQL '%@': %@", + /* run SQL */ + + if ((error = [channel evaluateExpressionX:sql]) != nil) { + [self errorWithFormat:@"%s: cannot execute acl-fetch SQL '%@': %@", __PRETTY_FUNCTION__, sql, error]; + [self releaseChannel:channel]; + return; + } + [self releaseChannel:channel]; - return; } - - [self releaseChannel:channel]; } /* description */ diff --git a/SOPE/NGCards/iCalDateTime.m b/SOPE/NGCards/iCalDateTime.m index 159545e8..fe88452e 100644 --- a/SOPE/NGCards/iCalDateTime.m +++ b/SOPE/NGCards/iCalDateTime.m @@ -68,6 +68,9 @@ [calendar addTimeZone: iTZ]; newTZId = [iTZ tzId]; } + else + newTZId = nil; + [self setValue: 0 ofAttribute: @"tzid" to: newTZId]; [self setDateTime: dateTime]; } diff --git a/SoObjects/Mailer/SOGoMailBodyPart.h b/SoObjects/Mailer/SOGoMailBodyPart.h index 0effd14c..4234074d 100644 --- a/SoObjects/Mailer/SOGoMailBodyPart.h +++ b/SoObjects/Mailer/SOGoMailBodyPart.h @@ -59,7 +59,6 @@ - (id) partInfo; - (NSData *) fetchBLOB; - (void) setAsAttachment; -- (BOOL) asAttachment; /* factory */ diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m index 3ee2c8f6..737e17d2 100644 --- a/UI/MailPartViewers/UIxMailPartICalViewer.m +++ b/UI/MailPartViewers/UIxMailPartICalViewer.m @@ -92,7 +92,7 @@ - (BOOL) couldParseCalendar { - return (([self inCalendar])); + return ([self inCalendar] != nil); } - (iCalEvent *) inEvent @@ -246,7 +246,7 @@ - (BOOL) isEventStoredInCalendar { - return (([self storedEventObject])); + return ([self storedEventObject] != nil); } - (iCalEvent *) storedEvent @@ -376,7 +376,7 @@ - (BOOL) isReplySenderAnAttendee { - return (([self storedReplyAttendee])); + return ([self storedReplyAttendee] != nil); } - (iCalPerson *) _emailParticipantWithEvent: (iCalEvent *) event diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index b0967759..400e3280 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -20,8 +20,10 @@ */ #import + #import #import +#import #import #import diff --git a/UI/SOGoUI/SOGoACLAdvisory.h b/UI/SOGoUI/SOGoACLAdvisory.h index d991dbad..7f200d81 100644 --- a/UI/SOGoUI/SOGoACLAdvisory.h +++ b/UI/SOGoUI/SOGoACLAdvisory.h @@ -59,6 +59,12 @@ @end +@interface SOGoACLModificationAdvisory : SOGoACLAdvisory + +- (NSString *) aclMethod; + +@end + @interface SOGoACLEnglishAdditionAdvisory : SOGoACLAdditionAdvisory @end @@ -68,13 +74,13 @@ @interface SOGoACLGermanAdditionAdvisory : SOGoACLAdditionAdvisory @end -@interface SOGoACLEnglishModificationAdvisory : SOGoACLAdditionAdvisory +@interface SOGoACLEnglishModificationAdvisory : SOGoACLModificationAdvisory @end -@interface SOGoACLFrenchModificationAdvisory : SOGoACLAdditionAdvisory +@interface SOGoACLFrenchModificationAdvisory : SOGoACLModificationAdvisory @end -@interface SOGoACLGermanModificationAdvisory : SOGoACLAdditionAdvisory +@interface SOGoACLGermanModificationAdvisory : SOGoACLModificationAdvisory @end @interface SOGoACLEnglishRemovalAdvisory : SOGoACLRemovalAdvisory diff --git a/UI/SOGoUI/SOGoACLAdvisory.m b/UI/SOGoUI/SOGoACLAdvisory.m index 97994ae3..ffefbd0b 100644 --- a/UI/SOGoUI/SOGoACLAdvisory.m +++ b/UI/SOGoUI/SOGoACLAdvisory.m @@ -20,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#import + #import #import #import diff --git a/UI/Scheduler/NSArray+Scheduler.h b/UI/Scheduler/NSArray+Scheduler.h index b9da8dc3..316a9675 100644 --- a/UI/Scheduler/NSArray+Scheduler.h +++ b/UI/Scheduler/NSArray+Scheduler.h @@ -36,4 +36,10 @@ @end +@interface NSMutableArray (SOGoEventComparison) + +- (void) reverseArray; + +@end + #endif /* NSARRAY_SCHEDULER_H */ diff --git a/UI/Scheduler/NSArray+Scheduler.m b/UI/Scheduler/NSArray+Scheduler.m index eaf7f0d4..5f24b7e2 100644 --- a/UI/Scheduler/NSArray+Scheduler.m +++ b/UI/Scheduler/NSArray+Scheduler.m @@ -139,3 +139,12 @@ } @end + +@implementation NSMutableArray (SOGoEventComparison) + +- (void) reverseArray +{ + [self setArray: [self reversedArray]]; +} + +@end diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m index cd5331e3..382ff96d 100644 --- a/UI/Scheduler/UIxAppointmentEditor.m +++ b/UI/Scheduler/UIxAppointmentEditor.m @@ -24,6 +24,7 @@ #import #import +#import #import #import diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index e41f23e0..a44c818f 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -344,7 +344,8 @@ [newEvent addObject: [self _formattedDateForSeconds: interval forAllDay: isAllDay]]; - participants = state = nil; + participants = nil; + state = nil; if ([[oldEvent objectAtIndex: 9] length] > 0 && [[oldEvent objectAtIndex: 10] length] > 0) { participants = [[oldEvent objectAtIndex: 9] componentsSeparatedByString: @"\n"]; @@ -389,7 +390,7 @@ ascending = [[context request] formValueForKey: @"asc"]; if (![ascending boolValue]) - newEvents = [newEvents reversedArray]; + [newEvents reverseArray]; return [self _responseWithData: newEvents]; } diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m index 62fb66fe..f48cb163 100644 --- a/UI/Scheduler/UIxCalView.m +++ b/UI/Scheduler/UIxCalView.m @@ -1,8 +1,30 @@ +/* UIxCalMainView.m - this file is part of SOGo + * + * Copyright (C) 2006, 2007 Inverse groupe conseil + * + * Author: Wolfgang Sourdeau + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ //#import #import #import +#import #import #import #import diff --git a/UI/Scheduler/UIxTaskEditor.m b/UI/Scheduler/UIxTaskEditor.m index 7ec0b0d4..295bbcc7 100644 --- a/UI/Scheduler/UIxTaskEditor.m +++ b/UI/Scheduler/UIxTaskEditor.m @@ -22,6 +22,7 @@ #import #import +#import #import #import