Merge branch 'master' into feature/addMissingStrings2

Conflicts:
	UI/AdministrationUI/English.lproj/Localizable.strings
	UI/PreferencesUI/English.lproj/Localizable.strings
	UI/Templates/PreferencesUI/UIxFilterEditor.wox

SoObjects/Appointments/MSExchangeFreeBusy.m

@@ -344,7 +344,7 @@ size_t curl_body_function_freebusy(void *ptr, size_t size, size_t nmemb, void *i
   NSMutableString *s;
 
   s = [NSMutableString stringWithCapacity: 64];
-  [s appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+  [s appendFormat:@"<0x%08X[%@]:", (unsigned int)self, NSStringFromClass([self class])];
   if (freeBusyViewType)
     [s appendFormat:@" freeBusyViewType='%@'", freeBusyViewType];
   if (mergedFreeBusy)

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -84,7 +84,7 @@
 #import "SOGoAppointmentFolders.h"
 #import "SOGoFreeBusyObject.h"
 #import "SOGoTaskObject.h"
-#import "SOGoWebAppointmentFolder.h";
+#import "SOGoWebAppointmentFolder.h"
 
 #import "SOGoAppointmentFolder.h"
 
@@ -1013,7 +1013,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 	{
           if ([dateRange containsDate: [component startDate]])
             {
-              // We must pass nill to :container here in order to avoid re-entrancy issues.
+              // We must pass nil to :container here in order to avoid re-entrancy issues.
               newRecord = [self _fixupRecord: [component quickRecordFromContent: nil  container: nil]];
               [ma replaceObjectAtIndex: recordIndex withObject: newRecord];
             }
@@ -1030,15 +1030,20 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
     {
       // The recurrence id of the exception is outside the date range;
       // simply add the exception to the records array.
-      // We must pass nill to :container here in order to avoid re-entrancy issues.
+      // We must pass nil to :container here in order to avoid re-entrancy issues.
       newRecord = [self _fixupRecord: [component quickRecordFromContent: nil  container: nil]];
-      newRecordRange = [NGCalendarDateRange 
-			 calendarDateRangeWithStartDate: [newRecord objectForKey: @"startDate"]
-			 endDate: [newRecord objectForKey: @"endDate"]];
-      if ([dateRange doesIntersectWithDateRange: newRecordRange])
+      if ([newRecord objectForKey: @"startDate"] && [newRecord objectForKey: @"endDate"]) {
+        newRecordRange = [NGCalendarDateRange
+                           calendarDateRangeWithStartDate: [newRecord objectForKey: @"startDate"]
+                                                  endDate: [newRecord objectForKey: @"endDate"]];
+        if ([dateRange doesIntersectWithDateRange: newRecordRange])
           [ma addObject: newRecord];
-      else
+        else
+          newRecord = nil;
+      } else {
+        [self warnWithFormat: @"Recurrence %@ without dtstart or dtend. Ignoring", recurrenceId];
         newRecord = nil;
+      }
     }
 
   if (newRecord)
@@ -2337,7 +2342,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   request = [context request];
   if (!([request isIPhone] || [request isICal4]))
     {
-      gdRT = [self groupDavResourceType];
+      gdRT = (NSArray *) [self groupDavResourceType];
       gdVEventCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 0],
                   XMLNS_GROUPDAV, nil];
       [colType addObject: gdVEventCol];
@@ -2988,7 +2993,10 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 
   theUser = [SOGoUser userWithLogin: theUID];
   aParent = [theUser calendarsFolderInContext: context];
-  
+
+  if ([aParent isKindOfClass: [NSException class]])
+    return nil;
+
   aFolders = [aParent subFolders];
   e = [aFolders objectEnumerator];
   while ((aFolder = [e nextObject]))
@@ -3152,19 +3160,29 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   NSMutableString *content;
   NSString *uid;
 
-  // We first look if there's an event with the same UID in our calendar. If not,
-  // let's reuse what is in the event, otherwise generate a new GUID and use it.
+  // We first look if the event has any / or + in its UID. If that's the case
+  // we generate a new UID based on a GUID
   uid = [event uid];
 
-  object = [self lookupName: uid
-                  inContext: context
-                    acquire: NO];
- 
-  if (object && ![object isKindOfClass: [NSException class]])
+  if ([uid rangeOfCharacterFromSet: [NSCharacterSet characterSetWithCharactersInString: @"+/"]].location != NSNotFound)
     {
       uid = [self globallyUniqueObjectId];
       [event setUid: uid];
     }
+  else
+    {
+      // We also look if there's an event with the same UID in our calendar. If not,
+      // let's reuse what is in the event, otherwise generate a new GUID and use it.
+      object = [self lookupName: uid
+                      inContext: context
+                        acquire: NO];
+
+      if (object && ![object isKindOfClass: [NSException class]])
+        {
+          uid = [self globallyUniqueObjectId];
+          [event setUid: uid];
+        }
+    }
 
   object = [SOGoAppointmentObject objectWithName: uid
                                     inContainer: self];

SoObjects/Appointments/SOGoAppointmentObject.m

@@ -46,6 +46,7 @@
 #import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalTimeZone.h>
 #import <NGCards/iCalTimeZonePeriod.h>
+#import <NGCards/iCalToDo.h>
 #import <NGCards/NSString+NGCards.h>
 
 #import <SOGo/SOGoConstants.h>
@@ -748,11 +749,14 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
     {
       e = [events objectAtIndex: i];
       if ([e recurrenceId])
-        for (j = 0; j < [theAttendees count]; j++)
-          if (shouldAdd)
+        for (j = 0; j < [theAttendees count]; j++) {
+          if (shouldAdd) {
             [e addToAttendees: [theAttendees objectAtIndex: j]];
-          else
+          }
+          else {
             [e removeFromAttendees: [theAttendees objectAtIndex: j]];
+          }
+        }
     }
 }
 
@@ -1038,7 +1042,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
           if ([delegateEmail length])
             otherDelegate = [event findAttendeeWithEmail: delegateEmail];
           else
-            otherDelegate = NO;
+            otherDelegate = nil;
           
           /* we handle the addition/deletion of delegate users */
           addDelegate = NO;
@@ -1076,7 +1080,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
                   if ([delegateEmail length])
                     otherDelegate = [event findAttendeeWithEmail: delegateEmail];
                   else
-                    otherDelegate = NO;
+                    otherDelegate = nil;
                 }
             }
           if (addDelegate)
@@ -1233,7 +1237,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
               if ([delegateEmail length])
                 otherDelegate = [event findAttendeeWithEmail: delegateEmail];
               else
-                otherDelegate = NO;
+                otherDelegate = nil;
             }
           
           [self sendEMailUsingTemplateNamed: @"Deletion"
@@ -1992,7 +1996,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
       if ([container resourceNameForEventUID: eventUID])
         {
           return [NSException exceptionWithHTTPStatus: 403
-                                               reason: [NSString stringWithFormat: @"Event UID already in use. (%s)", eventUID]];
+                                               reason: [NSString stringWithFormat: @"Event UID already in use. (%@)", eventUID]];
         }
      
       //

SoObjects/Appointments/SOGoCalendarComponent.m

@@ -140,6 +140,14 @@
   return aclManager;
 }
 
+- (NSException *) changeParticipationStatus: (NSString *) newPartStat
+                               withDelegate: (iCalPerson *) delegate
+                                      alarm: (iCalAlarm *) alarm
+{
+  // Required for protocol <SOGoComponentOccurence>
+  return nil;
+}
+
 - (id) init
 {
   if ((self = [super init]))
@@ -171,7 +179,7 @@
 
 - (Class *) parsingClass
 {
-  return [iCalCalendar class];
+  return (Class *)[iCalCalendar class];
 }
 
 - (NSString *) davContentType

SoObjects/Appointments/iCalAlarm+SOGo.m

@@ -102,9 +102,9 @@
         }
       
       if ([reminderReference caseInsensitiveCompare: @"BEFORE"] == NSOrderedSame)
-        aValue = [NSString stringWithString: @"-P"];
+        aValue = (NSString *) @"-P";
       else
-        aValue = [NSString stringWithString: @"P"];
+        aValue = (NSString *) @"P";
       
       if ([reminderUnit caseInsensitiveCompare: @"MINUTES"] == NSOrderedSame ||
           [reminderUnit caseInsensitiveCompare: @"HOURS"] == NSOrderedSame)

SoObjects/Appointments/iCalEvent+SOGo.m

@@ -267,7 +267,7 @@
 
 - (NSTimeInterval) occurenceInterval
 {
-  return [[self endDate] timeIntervalSinceDate: [self startDate]];
+  return (NSTimeInterval) [[self endDate] timeIntervalSinceDate: [self startDate]];
 }
 
 /**
@@ -328,30 +328,10 @@
  */
 - (NSDictionary *) attributesInContext: (WOContext *) context
 {
-  BOOL isAllDay;
-  NSCalendarDate *eventStartDate, *eventEndDate;
   NSMutableDictionary *data;
-  NSTimeZone *timeZone;
-  SOGoUserDefaults *ud;
-
-  isAllDay = [self isAllDay];
-  ud = [[context activeUser] userDefaults];
-  timeZone = [ud timeZone];
-  eventStartDate = [self startDate];
-  eventEndDate = [self endDate];
-
-  if (!isAllDay)
-    {
-      [eventStartDate setTimeZone: timeZone];
-      [eventEndDate setTimeZone: timeZone];
-    }
 
   data = [NSMutableDictionary dictionaryWithDictionary: [super attributesInContext: context]];
 
-  [data setObject: [eventStartDate iso8601DateString] forKey: @"startDate"];
-  [data setObject: [eventEndDate iso8601DateString] forKey: @"endDate"];
-
-  [data setObject: [NSNumber numberWithBool: isAllDay] forKey: @"isAllDay"];
   [data setObject: [NSNumber numberWithBool: ![self isOpaque]] forKey: @"isTransparent"];
 
   return data;
@@ -383,18 +363,10 @@
   if ([o isKindOfClass: [NSString class]] && [o length])
     aptStartDate = [self dateFromString: o inContext: context];
 
-  o = [data objectForKey: @"startTime"];
-  if ([o isKindOfClass: [NSString class]] && [o length])
-    [self adjustDate: &aptStartDate withTimeString: o inContext: context];
-
   o = [data objectForKey: @"endDate"];
   if ([o isKindOfClass: [NSString class]] && [o length])
     aptEndDate = [self dateFromString: o inContext: context];
 
-  o = [data objectForKey: @"endTime"];
-  if ([o isKindOfClass: [NSString class]] && [o length])
-    [self adjustDate: &aptEndDate withTimeString: o inContext: context];
-
   o = [data objectForKey: @"isTransparent"];
   if ([o isKindOfClass: [NSNumber class]])
     [self setTransparency: ([o boolValue]? @"TRANSPARENT" : @"OPAQUE")];
@@ -418,6 +390,14 @@
         }
       else
         {
+          o = [data objectForKey: @"startTime"];
+          if ([o isKindOfClass: [NSString class]] && [o length])
+            [self adjustDate: &aptStartDate withTimeString: o inContext: context];
+
+          o = [data objectForKey: @"endTime"];
+          if ([o isKindOfClass: [NSString class]] && [o length])
+            [self adjustDate: &aptEndDate withTimeString: o inContext: context];
+
           [self setStartDate: aptStartDate];
           [self setEndDate: aptEndDate];
         }

SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m

@@ -44,6 +44,7 @@
 #import <SOGo/NSCalendarDate+SOGo.h>
 
 #import "iCalRepeatableEntityObject+SOGo.h"
+#import "iCalCalendar+SOGo.h"
 
 @implementation iCalRepeatableEntityObject (SOGoExtensions)
 
@@ -162,7 +163,7 @@
       rule = [iCalRecurrenceRule new];
       [rule setInterval: @"1"];
 
-      frequency = NSNotFound;
+      frequency = (int)NSNotFound;
       o = [repeat objectForKey: @"frequency"];
       if ([o isKindOfClass: [NSString class]])
         {

SoObjects/Appointments/iCalToDo+SOGo.m

@@ -214,7 +214,7 @@
     {
       percent = [o intValue];
       if (percent >= 0 && percent <= 100)
-        [self setPercentComplete: [NSString stringWithFormat: @"%i", percent]];
+        [self setPercentComplete: [NSString stringWithFormat: @"%i", (int)percent]];
     }
   else
     [self setPercentComplete: @""];