Monotone-Parent: 46747edd0dcb4ecc9b939b9c8be25185efe65144
Monotone-Revision: 772069a4679fa8b05adc4dc49b2087230a05669c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-12-17T15:29:06 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
76c907fc65
commit
0f74a8d504
|
@ -96,6 +96,7 @@
|
||||||
else {
|
else {
|
||||||
[self errorWithFormat:@"%s: unsupported operation for null: %@",
|
[self errorWithFormat:@"%s: unsupported operation for null: %@",
|
||||||
__PRETTY_FUNCTION__, NSStringFromSelector(op)];
|
__PRETTY_FUNCTION__, NSStringFromSelector(op)];
|
||||||
|
qOperator = @"=";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ([val isKindOfClass:[NSNumber class]])
|
if ([val isKindOfClass:[NSNumber class]])
|
||||||
|
@ -109,6 +110,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
isCI = NO;
|
||||||
if (sel_eq(op, EOQualifierOperatorEqual)) {
|
if (sel_eq(op, EOQualifierOperatorEqual)) {
|
||||||
qOperator = @"IS";
|
qOperator = @"IS";
|
||||||
qValue = @"NULL";
|
qValue = @"NULL";
|
||||||
|
@ -118,6 +120,8 @@
|
||||||
qValue = @"NULL";
|
qValue = @"NULL";
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
qOperator = @"IS";
|
||||||
|
qValue = @"NULL";
|
||||||
[self errorWithFormat:@"%s: invalid operation for null: %@",
|
[self errorWithFormat:@"%s: invalid operation for null: %@",
|
||||||
__PRETTY_FUNCTION__, NSStringFromSelector(op)];
|
__PRETTY_FUNCTION__, NSStringFromSelector(op)];
|
||||||
}
|
}
|
||||||
|
|
|
@ -757,7 +757,9 @@ static GCSStringFormatter *stringFormatter = nil;
|
||||||
[self errorWithFormat:@"could not open storage channel!"];
|
[self errorWithFormat:@"could not open storage channel!"];
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
if (!self->ofFlags.sameTableForQuick) {
|
if (!self->ofFlags.sameTableForQuick)
|
||||||
|
quickChannel = nil;
|
||||||
|
else {
|
||||||
if ((quickChannel = [self acquireQuickChannel]) == nil) {
|
if ((quickChannel = [self acquireQuickChannel]) == nil) {
|
||||||
[self errorWithFormat:@"could not open quick channel!"];
|
[self errorWithFormat:@"could not open quick channel!"];
|
||||||
[self releaseChannel:storeChannel];
|
[self releaseChannel:storeChannel];
|
||||||
|
@ -1103,25 +1105,25 @@ static GCSStringFormatter *stringFormatter = nil;
|
||||||
[sql appendString:[self aclTableName]];
|
[sql appendString:[self aclTableName]];
|
||||||
[sql appendString:@" WHERE "];
|
[sql appendString:@" WHERE "];
|
||||||
[sql appendString:[self generateSQLForQualifier:qualifier]];
|
[sql appendString:[self generateSQLForQualifier:qualifier]];
|
||||||
}
|
|
||||||
|
|
||||||
/* open channel */
|
/* open channel */
|
||||||
|
|
||||||
if ((channel = [self acquireAclChannel]) == nil) {
|
if ((channel = [self acquireAclChannel]) == nil) {
|
||||||
[self errorWithFormat:@"could not open acl channel!"];
|
[self errorWithFormat:@"could not open acl channel!"];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* run SQL */
|
/* run SQL */
|
||||||
|
|
||||||
if ((error = [channel evaluateExpressionX:sql]) != nil) {
|
if ((error = [channel evaluateExpressionX:sql]) != nil) {
|
||||||
[self errorWithFormat:@"%s: cannot execute acl-fetch SQL '%@': %@",
|
[self errorWithFormat:@"%s: cannot execute acl-fetch SQL '%@': %@",
|
||||||
__PRETTY_FUNCTION__, sql, error];
|
__PRETTY_FUNCTION__, sql, error];
|
||||||
[self releaseChannel:channel];
|
[self releaseChannel:channel];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
[self releaseChannel:channel];
|
[self releaseChannel:channel];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* description */
|
/* description */
|
||||||
|
|
|
@ -68,6 +68,9 @@
|
||||||
[calendar addTimeZone: iTZ];
|
[calendar addTimeZone: iTZ];
|
||||||
newTZId = [iTZ tzId];
|
newTZId = [iTZ tzId];
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
newTZId = nil;
|
||||||
|
|
||||||
[self setValue: 0 ofAttribute: @"tzid" to: newTZId];
|
[self setValue: 0 ofAttribute: @"tzid" to: newTZId];
|
||||||
[self setDateTime: dateTime];
|
[self setDateTime: dateTime];
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,6 @@
|
||||||
- (id) partInfo;
|
- (id) partInfo;
|
||||||
- (NSData *) fetchBLOB;
|
- (NSData *) fetchBLOB;
|
||||||
- (void) setAsAttachment;
|
- (void) setAsAttachment;
|
||||||
- (BOOL) asAttachment;
|
|
||||||
|
|
||||||
/* factory */
|
/* factory */
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,7 @@
|
||||||
|
|
||||||
- (BOOL) couldParseCalendar
|
- (BOOL) couldParseCalendar
|
||||||
{
|
{
|
||||||
return (([self inCalendar]));
|
return ([self inCalendar] != nil);
|
||||||
}
|
}
|
||||||
|
|
||||||
- (iCalEvent *) inEvent
|
- (iCalEvent *) inEvent
|
||||||
|
@ -246,7 +246,7 @@
|
||||||
|
|
||||||
- (BOOL) isEventStoredInCalendar
|
- (BOOL) isEventStoredInCalendar
|
||||||
{
|
{
|
||||||
return (([self storedEventObject]));
|
return ([self storedEventObject] != nil);
|
||||||
}
|
}
|
||||||
|
|
||||||
- (iCalEvent *) storedEvent
|
- (iCalEvent *) storedEvent
|
||||||
|
@ -376,7 +376,7 @@
|
||||||
|
|
||||||
- (BOOL) isReplySenderAnAttendee
|
- (BOOL) isReplySenderAnAttendee
|
||||||
{
|
{
|
||||||
return (([self storedReplyAttendee]));
|
return ([self storedReplyAttendee] != nil);
|
||||||
}
|
}
|
||||||
|
|
||||||
- (iCalPerson *) _emailParticipantWithEvent: (iCalEvent *) event
|
- (iCalPerson *) _emailParticipantWithEvent: (iCalEvent *) event
|
||||||
|
|
|
@ -20,8 +20,10 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#import <Foundation/NSUserDefaults.h>
|
#import <Foundation/NSUserDefaults.h>
|
||||||
|
|
||||||
#import <NGObjWeb/WOContext.h>
|
#import <NGObjWeb/WOContext.h>
|
||||||
#import <NGObjWeb/WORequest.h>
|
#import <NGObjWeb/WORequest.h>
|
||||||
|
#import <NGObjWeb/WOResponse.h>
|
||||||
#import <NGObjWeb/SoComponent.h>
|
#import <NGObjWeb/SoComponent.h>
|
||||||
#import <NGExtensions/NSString+misc.h>
|
#import <NGExtensions/NSString+misc.h>
|
||||||
|
|
||||||
|
|
|
@ -59,6 +59,12 @@
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
@interface SOGoACLModificationAdvisory : SOGoACLAdvisory
|
||||||
|
|
||||||
|
- (NSString *) aclMethod;
|
||||||
|
|
||||||
|
@end
|
||||||
|
|
||||||
@interface SOGoACLEnglishAdditionAdvisory : SOGoACLAdditionAdvisory
|
@interface SOGoACLEnglishAdditionAdvisory : SOGoACLAdditionAdvisory
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
@ -68,13 +74,13 @@
|
||||||
@interface SOGoACLGermanAdditionAdvisory : SOGoACLAdditionAdvisory
|
@interface SOGoACLGermanAdditionAdvisory : SOGoACLAdditionAdvisory
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface SOGoACLEnglishModificationAdvisory : SOGoACLAdditionAdvisory
|
@interface SOGoACLEnglishModificationAdvisory : SOGoACLModificationAdvisory
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface SOGoACLFrenchModificationAdvisory : SOGoACLAdditionAdvisory
|
@interface SOGoACLFrenchModificationAdvisory : SOGoACLModificationAdvisory
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface SOGoACLGermanModificationAdvisory : SOGoACLAdditionAdvisory
|
@interface SOGoACLGermanModificationAdvisory : SOGoACLModificationAdvisory
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@interface SOGoACLEnglishRemovalAdvisory : SOGoACLRemovalAdvisory
|
@interface SOGoACLEnglishRemovalAdvisory : SOGoACLRemovalAdvisory
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
* Boston, MA 02111-1307, USA.
|
* Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#import <Foundation/NSURL.h>
|
||||||
|
|
||||||
#import <NGObjWeb/WOResponse.h>
|
#import <NGObjWeb/WOResponse.h>
|
||||||
#import <NGExtensions/NGHashMap.h>
|
#import <NGExtensions/NGHashMap.h>
|
||||||
#import <NGMail/NGMimeMessage.h>
|
#import <NGMail/NGMimeMessage.h>
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
#import <NGObjWeb/SoObject.h>
|
#import <NGObjWeb/SoObject.h>
|
||||||
#import <NGObjWeb/WORequest.h>
|
#import <NGObjWeb/WORequest.h>
|
||||||
|
#import <NGObjWeb/WOResponse.h>
|
||||||
#import <NGObjWeb/NSException+HTTP.h>
|
#import <NGObjWeb/NSException+HTTP.h>
|
||||||
#import <NGExtensions/NSCalendarDate+misc.h>
|
#import <NGExtensions/NSCalendarDate+misc.h>
|
||||||
|
|
||||||
|
|
|
@ -344,7 +344,8 @@
|
||||||
[newEvent addObject: [self _formattedDateForSeconds: interval
|
[newEvent addObject: [self _formattedDateForSeconds: interval
|
||||||
forAllDay: isAllDay]];
|
forAllDay: isAllDay]];
|
||||||
|
|
||||||
participants = state = nil;
|
participants = nil;
|
||||||
|
state = nil;
|
||||||
if ([[oldEvent objectAtIndex: 9] length] > 0 &&
|
if ([[oldEvent objectAtIndex: 9] length] > 0 &&
|
||||||
[[oldEvent objectAtIndex: 10] length] > 0) {
|
[[oldEvent objectAtIndex: 10] length] > 0) {
|
||||||
participants = [[oldEvent objectAtIndex: 9] componentsSeparatedByString: @"\n"];
|
participants = [[oldEvent objectAtIndex: 9] componentsSeparatedByString: @"\n"];
|
||||||
|
@ -389,7 +390,7 @@
|
||||||
|
|
||||||
ascending = [[context request] formValueForKey: @"asc"];
|
ascending = [[context request] formValueForKey: @"asc"];
|
||||||
if (![ascending boolValue])
|
if (![ascending boolValue])
|
||||||
newEvents = [newEvents reversedArray];
|
[newEvents reverseArray];
|
||||||
|
|
||||||
return [self _responseWithData: newEvents];
|
return [self _responseWithData: newEvents];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,30 @@
|
||||||
|
/* UIxCalMainView.m - this file is part of SOGo
|
||||||
|
*
|
||||||
|
* Copyright (C) 2006, 2007 Inverse groupe conseil
|
||||||
|
*
|
||||||
|
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
*
|
||||||
|
* 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 <OGoContentStore/OCSFolder.h>
|
//#import <OGoContentStore/OCSFolder.h>
|
||||||
|
|
||||||
#import <NGObjWeb/SoSecurityManager.h>
|
#import <NGObjWeb/SoSecurityManager.h>
|
||||||
#import <NGObjWeb/SoUser.h>
|
#import <NGObjWeb/SoUser.h>
|
||||||
|
#import <NGObjWeb/WOResponse.h>
|
||||||
#import <NGExtensions/NGCalendarDateRange.h>
|
#import <NGExtensions/NGCalendarDateRange.h>
|
||||||
#import <NGExtensions/NSCalendarDate+misc.h>
|
#import <NGExtensions/NSCalendarDate+misc.h>
|
||||||
#import <NGExtensions/NSNull+misc.h>
|
#import <NGExtensions/NSNull+misc.h>
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#import <NGObjWeb/SoObject.h>
|
#import <NGObjWeb/SoObject.h>
|
||||||
#import <NGObjWeb/WORequest.h>
|
#import <NGObjWeb/WORequest.h>
|
||||||
|
#import <NGObjWeb/WOResponse.h>
|
||||||
#import <NGObjWeb/NSException+HTTP.h>
|
#import <NGObjWeb/NSException+HTTP.h>
|
||||||
#import <NGExtensions/NSCalendarDate+misc.h>
|
#import <NGExtensions/NSCalendarDate+misc.h>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue