git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1304 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index 4757ac4a2ddb9fa5dda723c3f2ec5b2c7f284b06..b3aaf1aa315df099497da8dd71070401dee0402d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * UI/Scheduler/NSArray+Scheduler.m ([NSMutableArray
+       -reverseArray]): new category method.
+
 2007-12-14  Ludovic Marcotte <ludovic@inverse.ca>
 
        * SoObjects/Appointments/SOGoCalendarComponent.m

diff --git a/SOPE/GDLContentStore/EOQualifier+GCS.m b/SOPE/GDLContentStore/EOQualifier+GCS.m
index 88343350e50536baafc9bd578b1fdaf9eb0c34be..965ea77e69a89d0a655815a92b771b3e706d88f8 100644 (file)
--- 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 23cbbdec04d6af947ca21037f93e262cd9428fdb..73b60ebda083ed31eec38af4894d808f437c5327 100644 (file)
--- 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 159545e81a1243321a7b15c6781f8723c7b6ead8..fe88452e18b30495fd8f69b664b76083bfa2824d 100644 (file)
--- 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 0effd14cf429e9b8d0782c547da1b707366ab6d3..4234074d0ee0e251c10c273cc88bcf43d45540dd 100644 (file)
--- 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 3ee2c8f61cb5dcde1c1ec35acf1b53b218f502ba..737e17d27b5a0e8f9ed7872f784ba1b8c7298eb0 100644 (file)
--- 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 b0967759a1c1f9452891dc049b4b93aa871df6ea..400e3280208d056f1058313365f14d8748187457 100644 (file)
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -20,8 +20,10 @@
 */
 
 #import <Foundation/NSUserDefaults.h>
+
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/SoComponent.h>
 #import <NGExtensions/NSString+misc.h>
 

diff --git a/UI/SOGoUI/SOGoACLAdvisory.h b/UI/SOGoUI/SOGoACLAdvisory.h
index d991dbad03c205d9513f644c8d3a2e9fdcdc1fef..7f200d813a60010f3426665aaa31489b2420542d 100644 (file)
--- 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 97994ae3c7de013cb6e7eab29f98bc52d4f8c107..ffefbd0bcf0045dd0d4701be450c838ae168573a 100644 (file)
--- a/UI/SOGoUI/SOGoACLAdvisory.m
+++ b/UI/SOGoUI/SOGoACLAdvisory.m
@@ -20,6 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSURL.h>
+
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NGHashMap.h>
 #import <NGMail/NGMimeMessage.h>

diff --git a/UI/Scheduler/NSArray+Scheduler.h b/UI/Scheduler/NSArray+Scheduler.h
index b9da8dc3f0c1ce2d9cbaf1a434596f32141d0f8e..316a9675aac383f74bbca15323d1558b3819d3b1 100644 (file)
--- 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 eaf7f0d44b377d6409653c07d63a38d09d3f17b7..5f24b7e2f6df72f7c93cc0d83fe49eb10328c694 100644 (file)
--- 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 cd5331e3279ccfeff52fa087f615d6f0bf3e9f41..382ff96d17a9c2dc19a05cef005f4730a5acf462 100644 (file)
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -24,6 +24,7 @@
 
 #import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 

diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index e41f23e0a8ed57530933218edbe6ce530ed43162..a44c818f8c8f314b2b92865d9edef666d29f2cf7 100644 (file)
--- 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 62fb66fe12b92e3e0c5a74e7b0502a484f184373..f48cb1639b6d6afcd97a451bd1cef1aec878b130 100644 (file)
--- 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 <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 <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/SoUser.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NGCalendarDateRange.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSNull+misc.h>

diff --git a/UI/Scheduler/UIxTaskEditor.m b/UI/Scheduler/UIxTaskEditor.m
index 7ec0b0d4067beb7dcdf8e14d48fffd57bef18729..295bbcc753ba1f3af561b435617c0c04d9829e3b 100644 (file)
--- a/UI/Scheduler/UIxTaskEditor.m
+++ b/UI/Scheduler/UIxTaskEditor.m
@@ -22,6 +22,7 @@
 
 #import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGExtensions/NSCalendarDate+misc.h>