Merge to 2.2.5

Fix unit test with gnustep 1.24

.gitignore

@@ -1,6 +1,8 @@
 config.make
 tags
+*._*
 */obj/
+*._*
 */*/obj/
 */*/*/obj/
 */*/*.SOGo/
@@ -9,3 +11,6 @@ tags
 *.swp
 SoObjects/SOGo/SOGo.framework/
 SoObjects/SOGo/derived_src/
+Tests/*/config.py
+*.pyc
+._*

.tx/config

@@ -1,5 +1,5 @@
 [main]
-host = https://www.transifex.net
+host = https://www.transifex.com
 
 [sogo.ui-mailerui]
 source_file = UI/MailerUI/English.lproj/Localizable.strings
@@ -235,6 +235,32 @@ trans.sk = SoObjects/Contacts/Slovak.lproj/Localizable.strings
 trans.sv = SoObjects/Contacts/Swedish.lproj/Localizable.strings
 trans.uk = SoObjects/Contacts/Ukrainian.lproj/Localizable.strings
 
+[sogo.soobjects-mailer]
+source_file = SoObjects/Mailer/English.lproj/Localizable.strings
+source_lang = en
+trans.ar = SoObjects/Mailer/Arabic.lproj/Localizable.strings
+trans.ca = SoObjects/Mailer/Catalan.lproj/Localizable.strings
+trans.cs = SoObjects/Mailer/Czech.lproj/Localizable.strings
+trans.cy = SoObjects/Mailer/Welsh.lproj/Localizable.strings
+trans.da_DK = SoObjects/Mailer/Danish.lproj/Localizable.strings
+trans.de = SoObjects/Mailer/German.lproj/Localizable.strings
+trans.es_AR = SoObjects/Mailer/SpanishArgentina.lproj/Localizable.strings
+trans.es_ES = SoObjects/Mailer/SpanishSpain.lproj/Localizable.strings
+trans.fi = SoObjects/Mailer/Finnish.lproj/Localizable.strings
+trans.fr = SoObjects/Mailer/French.lproj/Localizable.strings
+trans.hu = SoObjects/Mailer/Hungarian.lproj/Localizable.strings
+trans.is = SoObjects/Mailer/Icelandic.lproj/Localizable.strings
+trans.it = SoObjects/Mailer/Italian.lproj/Localizable.strings
+trans.nb_NO = SoObjects/Mailer/NorwegianBokmal.lproj/Localizable.strings
+trans.nl = SoObjects/Mailer/Dutch.lproj/Localizable.strings
+trans.nn_NO = SoObjects/Mailer/NorwegianNynorsk.lproj/Localizable.strings
+trans.pl = SoObjects/Mailer/Polish.lproj/Localizable.strings
+trans.pt_BR = SoObjects/Mailer/BrazilianPortuguese.lproj/Localizable.strings
+trans.ru = SoObjects/Mailer/Russian.lproj/Localizable.strings
+trans.sk = SoObjects/Mailer/Slovak.lproj/Localizable.strings
+trans.sv = SoObjects/Mailer/Swedish.lproj/Localizable.strings
+trans.uk = SoObjects/Mailer/Ukrainian.lproj/Localizable.strings
+
 [sogo.ui-mailpartviewers]
 source_file = UI/MailPartViewers/English.lproj/Localizable.strings
 source_lang = en

ActiveSync/ActiveSyncProduct.m

@@ -0,0 +1,40 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#import <Foundation/NSObject.h>
+
+@interface ActiveSyncProduct : NSObject
+{
+}
+
+@end
+
+@implementation ActiveSyncProduct
+@end /* ActiveSyncProduct */

ActiveSync/GNUmakefile

@@ -0,0 +1,42 @@
+
+# GNUstep makefile
+
+include common.make
+
+BUNDLE_NAME = ActiveSync
+
+ActiveSync_PRINCIPAL_CLASS = ActiveSyncProduct
+
+ActiveSync_OBJC_FILES =			\
+	ActiveSyncProduct.m		\
+	iCalAlarm+ActiveSync.m		\
+	iCalEvent+ActiveSync.m		\
+	iCalRecurrenceRule+ActiveSync.m \
+	iCalTimeZone+ActiveSync.m	\
+	iCalToDo+ActiveSync.m		\
+	NSCalendarDate+ActiveSync.m	\
+	NSData+ActiveSync.m		\
+	NSDate+ActiveSync.m		\
+	NGDOMElement+ActiveSync.m	\
+	NGMimeMessage+ActiveSync.m	\
+	NGVCard+ActiveSync.m		\
+	NSArray+SyncCache.m		\
+	NSString+ActiveSync.m		\
+	SOGoActiveSyncDispatcher.m	\
+	SOGoActiveSyncDispatcher+Sync.m \
+	SOGoMailObject+ActiveSync.m 	\
+	SOGoSyncCacheObject.m		\
+	SoObjectWebDAVDispatcher+ActiveSync.m
+
+ActiveSync_RESOURCE_FILES +=		\
+	product.plist
+
+ADDITIONAL_OBJCFLAGS += -Wno-deprecated-declarations
+ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ -I../SoObjects/
+ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ -L../SOPE/NGCards/obj/
+ADDITIONAL_INCLUDE_DIRS += -I/usr/include/libwbxml-1.0/
+ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -lwbxml2
+
+-include GNUmakefile.preamble
+include $(GNUSTEP_MAKEFILES)/bundle.make
+-include GNUmakefile.postamble

ActiveSync/GNUmakefile.preamble

@@ -0,0 +1 @@
+# compilation settings

ActiveSync/LICENSE

@@ -0,0 +1,25 @@
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

ActiveSync/NGDOMElement+ActiveSync.h

@@ -0,0 +1,44 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NGDOMELEMENTACTIVESYNC_H__
+#define __NGDOMELEMENTACTIVESYNC_H__
+
+#import <DOM/DOMElement.h>
+#import <DOM/DOMProtocols.h>
+
+@class NSDictionary;
+
+@interface NGDOMElement (ActiveSync)
+
+- (NSDictionary *) applicationData;
+
+@end
+
+#endif // NGDOMELEMENTACTIVESYNC

ActiveSync/NGDOMElement+ActiveSync.m

@@ -0,0 +1,190 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#include "NGDOMElement+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+
+static NSArray *asElementArray = nil;
+
+@implementation NGDOMElement (ActiveSync)
+
+- (BOOL) isTextNode
+{
+  id <DOMNodeList> children;
+  id <DOMElement> element;
+  int i;
+
+  if ([self nodeType] == DOM_TEXT_NODE)
+    return YES;
+  
+  children = [self childNodes];
+
+  for (i = 0; i < [children length]; i++)
+    {
+      element = [children objectAtIndex: i];
+
+      if ([element nodeType] != DOM_TEXT_NODE)
+        return NO;
+    }
+  
+  return YES;
+}
+
+//
+// We must handle "inner data" like this:
+// 
+// <ApplicationData>
+//  <Flag xmlns="Email:">
+//   <FlagStatus>2</FlagStatus>
+//   <FlagType>Flag for follow up</FlagType>
+//  </Flag>
+// </ApplicationData>
+//
+// and stuff like that:
+//
+// <Attendees xmlns="Calendar:">
+//  <Attendee>
+//   <Attendee_Email>sogo1@example.com</Attendee_Email>
+//   <Attendee_Name>John Doe</Attendee_Name>
+//   <Attendee_Status>5</Attendee_Status>
+//   <Attendee_Type>1</Attendee_Type>
+//  </Attendee>
+//  <Attendee>
+//   <Attendee_Email>sogo2@example.com</Attendee_Email>
+//   <Attendee_Name>Balthazar César</Attendee_Name>
+//   <Attendee_Status>5</Attendee_Status>
+//   <Attendee_Type>1</Attendee_Type>
+//  </Attendee>
+//  <Attendee>
+//   <Attendee_Email>sogo3@example.com</Attendee_Email>
+//   <Attendee_Name>Wolfgang Fritz</Attendee_Name>
+//   <Attendee_Status>5</Attendee_Status>
+//   <Attendee_Type>1</Attendee_Type>
+//  </Attendee>
+// </Attendees>
+//
+
+- (NSDictionary *) applicationData
+{
+  NSMutableDictionary *data;
+  id <DOMNodeList> children;
+  id <DOMElement> element;
+  int i, count;
+  
+  if (!asElementArray)
+    asElementArray = [[NSArray alloc] initWithObjects: @"Attendee", @"Category", nil];
+
+  data = [NSMutableDictionary dictionary];
+
+  children = [self childNodes];
+
+  for (i = 0; i < [children length]; i++)
+    {
+      element = [children objectAtIndex: i];
+
+      if ([element nodeType] == DOM_ELEMENT_NODE)
+        {
+          NSString *tag;
+          id value;
+          
+          tag = [element tagName];
+          count = [(NSArray *)[element childNodes] count];
+          
+          // We check if the node is a text one or if all its
+          // children are text nodes. This is important to avoid side-effects
+          // in SOPE where "foo & bar" would result into 3 childnodes instead
+          // of just one.
+          if ([(id)element isTextNode])
+            {
+              value = [(id)element textValue];
+            }
+          // Handle inner data - see above for samples
+          else
+            {
+              NSMutableArray *innerElements;
+              id <DOMElement> innerElement;
+              NSArray *childNodes;
+              NSString *innerTag;
+              BOOL same;
+              int j;
+              
+              childNodes = (NSArray *)[element childNodes];
+              innerElements = [NSMutableArray array];
+              innerTag = nil;
+              same = YES;
+
+              for (j = 1; j < count; j++)
+                {
+                  innerElement = [childNodes objectAtIndex: j];
+
+                  if ([innerElement nodeType] == DOM_ELEMENT_NODE)
+                    {
+                      if (!innerTag)
+                        innerTag = [innerElement tagName];
+
+                      if ([innerTag isEqualToString: [innerElement tagName]])
+                        {
+                          if ([(id)innerElement isTextNode])
+                            [innerElements addObject: [(NGDOMElement *)innerElement textValue]];
+                          else
+                            [innerElements addObject: [(NGDOMElement *)innerElement applicationData]];
+                        }
+                      else
+                        {
+                          same = NO;
+                          break;
+                        }
+                    }
+                }
+
+              if (same && [asElementArray containsObject: innerTag])
+                value = innerElements;
+              else
+                {
+                  value = [(NGDOMElement *)element applicationData];
+                  
+                  // Don't set empty values like Foo = {}
+                  if (![value count])
+                    value = nil;
+                }
+            }
+          
+          if (value && tag)
+            [data setObject: value  forKey: tag];
+          
+        } // if ([element nodeType] == DOM_ELEMENT_NODE)
+    }
+  
+  return data;
+}
+
+@end

ActiveSync/NGMimeMessage+ActiveSync.h

@@ -0,0 +1,43 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NGMIMEMESSAGEACTIVESYNC_H__
+#define __NGMIMEMESSAGEACTIVESYNC_H__
+
+#import <NGMail/NGMimeMessage.h>
+
+@class NSArray;
+
+@interface NGMimeMessage (ActiveSync)
+
+- (NSArray *) allRecipients;
+
+@end
+
+#endif

ActiveSync/NGMimeMessage+ActiveSync.m

@@ -0,0 +1,62 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NGMimeMessage+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>
+
+#import <SOGo/NSString+Utilities.h>
+
+@implementation NGMimeMessage (ActiveSync)
+
+- (NSArray *) allRecipients
+{
+  NSMutableArray *recipients;
+  NSEnumerator *enumerator;
+  NSString *s;
+
+  recipients = [NSMutableArray array];
+
+  enumerator = [[self headersForKey: @"to"] objectEnumerator];
+  while ((s = [enumerator nextObject]))
+    {
+      [recipients addObject: [s pureEMailAddress]];
+    }
+
+  enumerator = [[self headersForKey: @"cc"] objectEnumerator];
+  while ((s = [enumerator nextObject]))
+    {
+      [recipients addObject: [s pureEMailAddress]];
+    }
+
+  return recipients;
+}
+@end

ActiveSync/NGVCard+ActiveSync.h

@@ -0,0 +1,47 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NGVCARDACTIVESYNC_H__
+#define __NGVCARDACTIVESYNC_H__
+
+#import <NGCards/NGVCard.h>
+
+@class NSDictionary;
+@class NSString;
+@class WOContext;
+
+@interface NGVCard (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif

ActiveSync/NGVCard+ActiveSync.m

@@ -0,0 +1,351 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NGVCard+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NSString+misc.h>
+
+#import <NGCards/CardElement.h>
+
+#import <Contacts/NGVCard+SOGo.h>
+
+#include "NSDate+ActiveSync.h"
+#include "NSString+ActiveSync.h"
+
+@implementation NGVCard (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSArray *emails, *addresses, *categories, *elements;
+  CardElement *n, *homeAdr, *workAdr;
+  NSMutableString *s;
+  NSString *url;
+  id o;
+
+  int i;
+
+  s = [NSMutableString string];
+  n = [self n];
+  
+  if ((o = [n flattenedValueAtIndex: 0 forKey: @""]))
+    [s appendFormat: @"<LastName xmlns=\"Contacts:\">%@</LastName>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [n flattenedValueAtIndex: 1 forKey: @""]))
+    [s appendFormat: @"<FirstName xmlns=\"Contacts:\">%@</FirstName>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self workCompany]))
+    [s appendFormat: @"<CompanyName xmlns=\"Contacts:\">%@</CompanyName>", [o activeSyncRepresentationInContext: context]];
+
+  if ((o = [[self org] flattenedValueAtIndex: 1 forKey: @""]))
+    [s appendFormat: @"<Department xmlns=\"Contacts:\">%@</Department>", [o activeSyncRepresentationInContext: context]];
+
+  categories = [self categories];
+
+  if ([categories count])
+    {
+      [s appendFormat: @"<Categories xmlns=\"Contacts:\">"];
+      for (i = 0; i < [categories count]; i++)
+        {
+          [s appendFormat: @"<Category xmlns=\"Contacts:\">%@</Category>", [[categories objectAtIndex: i] activeSyncRepresentationInContext: context]];
+        }
+      [s appendFormat: @"</Categories>"];
+    }
+  
+  elements = [self childrenWithTag: @"url"
+                      andAttribute: @"type"
+                       havingValue: @"work"];
+  if ([elements count] > 0)
+    {
+      url = [[elements objectAtIndex: 0] flattenedValuesForKey: @""];
+      [s appendFormat: @"<WebPage xmlns=\"Contacts:\">%@</WebPage>", [url activeSyncRepresentationInContext: context]];
+    }
+  
+  
+  if ((o = [[self uniqueChildWithTag: @"x-aim"] flattenedValuesForKey: @""]))
+    [s appendFormat: @"<IMAddress xmlns=\"Contacts:\">%@</IMAddress>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self nickname]))
+    [s appendFormat: @"<NickName xmlns=\"Contacts:\">%@</NickName>", [o activeSyncRepresentationInContext: context]];
+  
+  
+  if ((o = [self title]))
+    [s appendFormat: @"<JobTitle xmlns=\"Contacts:\">%@</JobTitle>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self preferredEMail])) 
+    [s appendFormat: @"<Email1Address xmlns=\"Contacts:\">%@</Email1Address>", o];
+  
+  
+  // Secondary email addresses (2 and 3)
+  emails = [self secondaryEmails];
+
+  for (i = 0; i < [emails count]; i++)
+    {
+      o = [[emails objectAtIndex: i] flattenedValuesForKey: @""];
+      
+      [s appendFormat: @"<Email%dAddress xmlns=\"Contacts:\">%@</Email%dAddress>", i+2, o, i+2];
+
+      if (i == 1)
+        break;
+    }
+
+  // Telephone numbers
+  if ((o = [self workPhone]) && [o length])
+    [s appendFormat: @"<BusinessPhoneNumber xmlns=\"Contacts:\">%@</BusinessPhoneNumber>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self homePhone]) && [o length])
+    [s appendFormat: @"<HomePhoneNumber xmlns=\"Contacts:\">%@</HomePhoneNumber>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self fax]) && [o length])
+    [s appendFormat: @"<BusinessFaxNumber xmlns=\"Contacts:\">%@</BusinessFaxNumber>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self mobile]) && [o length])
+    [s appendFormat: @"<MobilePhoneNumber xmlns=\"Contacts:\">%@</MobilePhoneNumber>", [o activeSyncRepresentationInContext: context]];
+  
+  if ((o = [self pager]) && [o length])
+    [s appendFormat: @"<PagerNumber xmlns=\"Contacts:\">%@</PagerNumber>", [o activeSyncRepresentationInContext: context]];
+
+  // Home Address
+  addresses = [self childrenWithTag: @"adr"
+                       andAttribute: @"type"
+                        havingValue: @"home"];
+  
+  if ([addresses count])
+    {
+      homeAdr = [addresses objectAtIndex: 0];
+      
+      if ((o = [homeAdr flattenedValueAtIndex: 2  forKey: @""]))
+        [s appendFormat: @"<HomeStreet xmlns=\"Contacts:\">%@</HomeStreet>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [homeAdr flattenedValueAtIndex: 3  forKey: @""]))
+        [s appendFormat: @"<HomeCity xmlns=\"Contacts:\">%@</HomeCity>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [homeAdr flattenedValueAtIndex: 4  forKey: @""]))
+        [s appendFormat: @"<HomeState xmlns=\"Contacts:\">%@</HomeState>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [homeAdr flattenedValueAtIndex: 5  forKey: @""]))
+        [s appendFormat: @"<HomePostalCode xmlns=\"Contacts:\">%@</HomePostalCode>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [homeAdr flattenedValueAtIndex: 6  forKey: @""]))
+        [s appendFormat: @"<HomeCountry xmlns=\"Contacts:\">%@</HomeCountry>", [o activeSyncRepresentationInContext: context]];
+    }
+  
+  // Work Address
+  addresses = [self childrenWithTag: @"adr"
+                       andAttribute: @"type"
+                        havingValue: @"work"];
+  
+  if ([addresses count])
+    {
+      workAdr = [addresses objectAtIndex: 0];
+      
+      if ((o = [workAdr flattenedValueAtIndex: 2  forKey: @""]))
+        [s appendFormat: @"<BusinessStreet xmlns=\"Contacts:\">%@</BusinessStreet>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [workAdr flattenedValueAtIndex: 3  forKey: @""]))
+        [s appendFormat: @"<BusinessCity xmlns=\"Contacts:\">%@</BusinessCity>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [workAdr flattenedValueAtIndex: 4  forKey: @""]))
+        [s appendFormat: @"<BusinessState xmlns=\"Contacts:\">%@</BusinessState>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [workAdr flattenedValueAtIndex: 5  forKey: @""]))
+        [s appendFormat: @"<BusinessPostalCode xmlns=\"Contacts:\">%@</BusinessPostalCode>", [o activeSyncRepresentationInContext: context]];
+      
+      if ((o = [workAdr flattenedValueAtIndex: 6  forKey: @""]))
+        [s appendFormat: @"<BusinessCountry xmlns=\"Contacts:\">%@</BusinessCountry>", [o activeSyncRepresentationInContext: context]];
+    }
+
+  // Other, less important fields
+  if ((o = [self birthday]))
+    [s appendFormat: @"<Birthday xmlns=\"Contacts:\">%@</Birthday>", [o activeSyncRepresentationInContext: context]];
+
+  if ((o = [self note]))
+    {
+      o = [o activeSyncRepresentationInContext: context];
+      [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
+      [s appendFormat: @"<Type>%d</Type>", 1]; 
+      [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [o length]];
+      [s appendFormat: @"<Truncated>%d</Truncated>", 0];
+      [s appendFormat: @"<Data>%@</Data>", o];
+      [s appendString: @"</Body>"];
+    }
+  
+  return s;
+}
+
+//
+//
+//
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context
+{
+  CardElement *element;
+  id o;
+  
+  // Contact's note
+  if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
+    [self setNote: o];
+
+  // Categories
+  if ((o = [theValues objectForKey: @"Categories"]))
+    [self setCategories: o];
+
+  // Birthday
+  if ((o = [theValues objectForKey: @"Birthday"]))
+    {
+      o = [o calendarDate];
+      [self setBday: [o descriptionWithCalendarFormat: @"%Y-%m-%d"]];
+    }
+
+  //
+  // Business address information
+  //
+  // BusinessStreet
+  // BusinessCity
+  // BusinessPostalCode
+  // BusinessState
+  // BusinessCountry
+  //
+  element = [self elementWithTag: @"adr" ofType: @"work"];
+  [element setSingleValue: @""
+                  atIndex: 1 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessStreet"]
+                  atIndex: 2 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessCity"]
+                  atIndex: 3 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessState"]
+                  atIndex: 4 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessPostalCode"]
+                  atIndex: 5 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"BusinessCountry"]
+                  atIndex: 6 forKey: @""];
+
+  //
+  // Home address information
+  //
+  // HomeStreet
+  // HomeCity
+  // HomePostalCode
+  // HomeState
+  // HomeCountry
+  //
+  element = [self elementWithTag: @"adr" ofType: @"home"];
+  [element setSingleValue: @""
+                  atIndex: 1 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeStreet"]
+                  atIndex: 2 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeCity"]
+                  atIndex: 3 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeState"]
+                  atIndex: 4 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomePostalCode"]
+                  atIndex: 5 forKey: @""];
+  [element setSingleValue: [theValues objectForKey: @"HomeCountry"]
+                  atIndex: 6 forKey: @""];
+
+  // Company's name
+  if ((o = [theValues objectForKey: @"CompanyName"]))
+    [self setOrg: o  units: nil];
+  
+  // Department
+  if ((o = [theValues objectForKey: @"Department"]))
+    [self setOrg: nil  units: [NSArray arrayWithObjects:o,nil]];
+  
+  // Email addresses
+  if ((o = [theValues objectForKey: @"Email1Address"]))
+    {
+      element = [self elementWithTag: @"email" ofType: @"work"];
+      [element setSingleValue: o forKey: @""];
+    }
+  
+  if ((o = [theValues objectForKey: @"Email2Address"]))
+    {
+      element = [self elementWithTag: @"email" ofType: @"home"];
+      [element setSingleValue: o  forKey: @""];
+    }
+  
+  // SOGo currently only supports 2 email addresses ... but AS clients might send 3
+  // FIXME: revise this when the GUI revamp is done in SOGo
+  if ((o = [theValues objectForKey: @"Email3Address"]))
+    {
+      element = [self elementWithTag: @"email" ofType: @"three"];
+      [element setSingleValue: o  forKey: @""];
+    }
+  
+  // Formatted name
+  // MiddleName
+  // Suffix   (II)
+  // Title    (Mr.)
+  [self setFn: [theValues objectForKey: @"FileAs"]];
+
+  [self setNWithFamily: [theValues objectForKey: @"LastName"]
+                 given: [theValues objectForKey: @"FirstName"]
+            additional: nil prefixes: nil suffixes: nil];
+  
+  // IM information
+  [[self uniqueChildWithTag: @"x-aim"]
+    setSingleValue: [theValues objectForKey: @"IMAddress"]
+            forKey: @""];
+
+  //
+  // Phone numbrrs
+  //
+  element = [self elementWithTag: @"tel" ofType: @"work"];
+  [element setSingleValue: [theValues objectForKey: @"BusinessPhoneNumber"]  forKey: @""];
+
+  element = [self elementWithTag: @"tel" ofType: @"home"];
+  [element setSingleValue: [theValues objectForKey: @"HomePhoneNumber"]  forKey: @""];
+
+  element = [self elementWithTag: @"tel" ofType: @"cell"];
+  [element setSingleValue: [theValues objectForKey: @"MobilePhoneNumber"]  forKey: @""];
+
+  element = [self elementWithTag: @"tel" ofType: @"fax"];
+  [element setSingleValue: [theValues objectForKey: @"BusinessFaxNumber"]  forKey: @""];
+
+  element = [self elementWithTag: @"tel" ofType: @"pager"];
+  [element setSingleValue: [theValues objectForKey: @"PagerNumber"]  forKey: @""];
+  
+  // Job's title
+  if ((o = [theValues objectForKey: @"JobTitle"]))
+    [self setTitle: o];
+  
+  // WebPage (work)
+  if ((o = [theValues objectForKey: @"WebPage"]))
+    [[self elementWithTag: @"url" ofType: @"work"]
+          setSingleValue: o  forKey: @""];
+  
+  if ((o = [theValues objectForKey: @"NickName"]))
+    [self setNickname: o];
+}
+
+@end

ActiveSync/NSArray+SyncCache.h

@@ -0,0 +1,49 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NSARRAYSYNCCACHE_H__
+#define __NSARRAYSYNCCACHE_H__
+
+#import <Foundation/NSArray.h>
+
+@class NSDictionary;
+
+@interface NSMutableArray (SyncCache)
+
+- (id) initWithDictionary: (NSDictionary *) theDictionary;
+
+@end
+
+@interface NSArray (SyncCache)
+
+- (NSDictionary *) dictionaryValue;
+
+@end
+
+#endif

ActiveSync/NSArray+SyncCache.m

@@ -0,0 +1,84 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NSArray+SyncCache.h"
+
+#import <Foundation/NSDictionary.h>
+
+#include "SOGoSyncCacheObject.h"
+
+@implementation NSMutableArray (SyncCache)
+
+- (id) initWithDictionary: (NSDictionary *) theDictionary
+{
+  SOGoSyncCacheObject *o;
+  NSArray *allKeys;
+  id key;
+  int i;
+
+  self = [self initWithCapacity: [theDictionary count]];
+
+  allKeys = [theDictionary allKeys];
+  
+  for (i = 0; i < [allKeys count]; i++)
+    {
+      key = [allKeys objectAtIndex: i];
+      o = [SOGoSyncCacheObject syncCacheObjectWithUID: key
+                                             sequence: [theDictionary objectForKey: key]];
+      [self addObject: o];
+    }
+
+  return self;
+}
+
+@end
+
+//
+//
+//
+@implementation NSArray (SyncCache)
+
+- (NSDictionary *) dictionaryValue
+{
+  NSMutableDictionary *d;
+  SOGoSyncCacheObject *o;
+  int i;
+
+  d = [NSMutableDictionary dictionary];
+
+  for (i = 0; i < [self count]; i++)
+    {
+      o = [self objectAtIndex: i];
+      [d setObject: [o sequence]  forKey: [o uid]];
+    }
+
+  return d;
+}
+
+@end

ActiveSync/NSCalendarDate+ActiveSync.h

@@ -0,0 +1,43 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NSCALENDARDATEACTIVESYNC_H__
+#define __NSCALENDARDATEACTIVESYNC_H__
+
+#import <Foundation/NSCalendarDate.h>
+
+@class NSString;
+
+@interface NSCalendarDate (ActiveSync)
+
++ (NSCalendarDate *) dateFromFilterType: (NSString *) theFilterType;
+
+@end
+
+#endif

ActiveSync/NSCalendarDate+ActiveSync.m

@@ -0,0 +1,87 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NSCalendarDate+ActiveSync.h"
+
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+
+#define ONE_DAY 86400
+
+@implementation NSCalendarDate (ActiveSync)
+
+//
+// See http://msdn.microsoft.com/en-us/library/gg709713(v=exchg.80).aspx for available types
+//
++ (NSCalendarDate *) dateFromFilterType: (NSString *) theFilterType
+{
+  NSCalendarDate *d;
+
+  d = [NSCalendarDate calendarDate];
+
+  if (d)
+    {
+      int value;
+      
+      switch ([theFilterType intValue])
+        {
+        case 1:
+          value = ONE_DAY;
+          break;
+        case 2:
+          value = 3 * ONE_DAY;
+          break;
+        case 3:
+          value = 7 * ONE_DAY;
+          break;
+        case 4:
+          value = 14 * ONE_DAY;
+          break;
+        case 5:
+          value = 30 * ONE_DAY;
+          break;
+        case 6:
+          value = 90 * ONE_DAY;
+          break;
+        case 7:
+          value = 180 * ONE_DAY;
+          break;
+        case 0:
+        case 8:
+        default:
+          return nil;
+        }
+
+      return [d initWithTimeIntervalSinceNow: -value];
+    }
+
+  return d;
+}
+
+@end

ActiveSync/NSData+ActiveSync.h

@@ -0,0 +1,46 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NSDATAACTIVESYNC_H__
+#define __NSDATAACTIVESYNC_H__
+
+#import <Foundation/NSData.h>
+
+@class NSString;
+@class WOContext;
+
+@interface NSData (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (NSData *) wbxml2xml;
+- (NSData *) xml2wbxml;
+
+@end
+
+#endif

ActiveSync/NSData+ActiveSync.m

@@ -0,0 +1,152 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NSData+ActiveSync.h"
+
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NGBase64Coding.h>
+
+#include <wbxml/wbxml.h>
+#include <wbxml/wbxml_conv.h>
+#include <wbxml/wbxml_errors.h>
+
+#define WBXMLDEBUG 0
+
+@implementation NSData (ActiveSync)
+
+- (void) _dumpToFile
+{
+  NSString *path;
+
+  path = [NSString stringWithFormat: @"/tmp/%@.data", [[NSProcessInfo processInfo] globallyUniqueString]];
+  [self writeToFile: path  atomically: YES];
+  NSLog(@"Original data written to: %@", path);
+}
+
+//
+// Encodes the data in base64 and strip newline characters
+// 
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  return [[self stringByEncodingBase64] stringByReplacingString: @"\n" withString: @""];
+}
+
+- (NSData *) wbxml2xml
+{
+  WBXMLGenXMLParams params;
+  NSData *data;
+
+  unsigned int wbxml_len, xml_len, ret;
+  unsigned char *wbxml, *xml;
+
+  wbxml = (unsigned char*)[self bytes];
+  wbxml_len = [self length];
+  xml = NULL;
+  xml_len = 0;
+  
+  params.lang = WBXML_LANG_ACTIVESYNC;
+  params.gen_type = WBXML_GEN_XML_INDENT;
+  params.indent = 1;
+  params.keep_ignorable_ws = FALSE;
+    
+  ret = wbxml_conv_wbxml2xml_withlen(wbxml, wbxml_len, &xml, &xml_len, &params);
+ 
+  if (ret != WBXML_OK)
+    {
+      NSLog(@"wbxml2xmlFromContent: failed: %s\n", wbxml_errors_string(ret));
+      [self _dumpToFile];
+      return nil;
+    }
+
+  data = [[NSData alloc] initWithBytes: xml  length: xml_len];
+
+#if WBXMLDEBUG
+  [data writeToFile: @"/tmp/protocol.decoded"  atomically: YES];
+#endif
+
+  free(xml);
+
+  return AUTORELEASE(data);
+}
+
+
+- (NSData *) xml2wbxml
+{
+  WBXMLConvXML2WBXML *conv;
+  NSData *data;
+
+  unsigned int wbxml_len, xml_len, ret;
+  unsigned char *wbxml, *xml;
+
+  xml = (unsigned char*)[self bytes];
+  xml_len = [self length];
+  wbxml = NULL;
+  wbxml_len = 0;
+  conv = NULL;
+
+  ret = wbxml_conv_xml2wbxml_create(&conv);
+
+  if (ret != WBXML_OK)
+    {
+      NSLog(@"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret));
+      [self _dumpToFile];
+      return nil;
+    }
+
+  wbxml_conv_xml2wbxml_enable_preserve_whitespaces(conv);
+  
+  // From libwbxml's changelog in v0.11.0: "The public ID is set to unknown and the DTD is not included. This is required for Microsoft ActiveSync."
+  wbxml_conv_xml2wbxml_disable_public_id(conv);
+  wbxml_conv_xml2wbxml_disable_string_table(conv);
+
+  ret = wbxml_conv_xml2wbxml_run(conv, xml, xml_len, &wbxml, &wbxml_len);
+  
+  if (ret != WBXML_OK)
+    {
+      NSLog(@"xml2wbxmlFromContent: failed: %s\n", wbxml_errors_string(ret));
+      [self _dumpToFile];
+      free(wbxml);
+      wbxml_conv_xml2wbxml_destroy(conv);
+      return nil;
+    }
+
+  data = [[NSData alloc] initWithBytes: wbxml  length: wbxml_len];
+
+#if WBXMLDEBUG
+  [data writeToFile: @"/tmp/protocol.encoded"  atomically: YES];
+#endif
+
+  free(wbxml);
+  wbxml_conv_xml2wbxml_destroy(conv);
+  
+  return AUTORELEASE(data);
+}
+@end

ActiveSync/NSDate+ActiveSync.h

@@ -0,0 +1,45 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NSDATEACTIVESYNC_H__
+#define __NSDATEACTIVESYNC_H__
+
+#import <Foundation/NSDate.h>
+
+@class NSString;
+@class WOContext;
+
+@interface NSDate (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (NSString *) activeSyncRepresentationWithoutSeparatorsInContext: (WOContext *) context;
+
+@end
+
+#endif

ActiveSync/NSDate+ActiveSync.m

@@ -0,0 +1,52 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "NSDate+ActiveSync.h"
+
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+
+@implementation NSDate (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  return [self descriptionWithCalendarFormat: @"%Y-%m-%dT%H:%M:%S.%FZ"  timeZone: [NSTimeZone timeZoneWithName: @"GMT"]  locale: nil];
+}
+
+
+//
+// From [MS-ASDTYPE].pdf - section 2.3 "Dates and times in calendar items MUST NOT include punctuation separators."
+//
+- (NSString *) activeSyncRepresentationWithoutSeparatorsInContext: (WOContext *) context
+{
+  return [self descriptionWithCalendarFormat: @"%Y%m%dT%H%M%SZ"  timeZone: [NSTimeZone timeZoneWithName: @"GMT"]  locale: nil];
+}
+
+
+@end

ActiveSync/NSString+ActiveSync.h

@@ -0,0 +1,55 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __NSSTRINGACTIVESYNC_H__
+#define __NSSTRINGACTIVESYNC_H__
+
+#import <Foundation/NSString.h>
+
+#include "SOGoActiveSyncConstants.h"
+
+@class NSCalendarDate;
+@class NSData;
+@class WOContext;
+
+@interface NSString (ActiveSync)
+
+- (NSString *) sanitizedServerIdWithType: (SOGoMicrosoftActiveSyncFolderType) folderType;
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (int) activeSyncFolderType;
+- (NSString *) realCollectionIdWithFolderType: (SOGoMicrosoftActiveSyncFolderType *) folderType;
+- (NSCalendarDate *) calendarDate;
+- (NSString *) deviceId;
+- (NSString *) deviceType;
+- (NSString *) command;
+- (NSData *) convertHexStringToBytes;
+
+@end
+
+#endif

ActiveSync/NSString+ActiveSync.m

@@ -0,0 +1,300 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#include "NSString+ActiveSync.h"
+
+#include <Foundation/NSArray.h>
+#include <Foundation/NSCalendarDate.h>
+#include <Foundation/NSData.h>
+#include <Foundation/NSDate.h>
+
+#include <SOGo/NSString+Utilities.h>
+
+#include <NGExtensions/NSString+misc.h>
+
+@implementation NSString (ActiveSync)
+
+- (NSString *) sanitizedServerIdWithType: (SOGoMicrosoftActiveSyncFolderType) folderType
+{
+  if (folderType == ActiveSyncEventFolder)
+    {
+      int len;
+
+      len = [self length];
+
+      if (len > 4 && [self hasSuffix: @".ics"])
+        return [self substringToIndex: len-4];
+      else
+        return [NSString stringWithFormat: @"%@.ics", self];
+    }
+  
+  return self;
+}
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSString *s;
+
+  s = [self stringByEscapingHTMLString];
+
+  return [[s componentsSeparatedByCharactersInSet: [self safeCharacterSet]]
+                        componentsJoinedByString: @""];
+}
+
+- (int) activeSyncFolderType
+{
+  if ([self isEqualToString: @"inbox"])
+    return 2;
+  else if ([self isEqualToString: @"draft"])
+    return 3;
+  else if ([self isEqualToString: @"sent"])
+    return 5;
+  else if  ([self isEqualToString: @"trash"])
+    return 4;
+
+  return 12;
+}
+
+- (NSString *) realCollectionIdWithFolderType: (SOGoMicrosoftActiveSyncFolderType *) folderType;
+{
+  NSString *realCollectionId, *v;
+
+  *folderType = ActiveSyncGenericFolder;
+  v = [self stringByUnescapingURL];
+
+  if ([v hasPrefix: @"vevent/"])
+    {
+      realCollectionId = [v substringFromIndex: 7];
+      *folderType = ActiveSyncEventFolder;
+    }
+  else if ([v hasPrefix: @"vtodo/"])
+    {
+      realCollectionId = [v substringFromIndex: 6];
+      *folderType = ActiveSyncTaskFolder;
+    }
+  else if ([v hasPrefix: @"vcard/"])
+    {
+      realCollectionId = [v substringFromIndex: 6];
+      *folderType = ActiveSyncContactFolder;
+    }
+  else if ([v hasPrefix: @"mail/"])
+    {
+      realCollectionId = [[v stringByUnescapingURL] substringFromIndex: 5];
+      *folderType = ActiveSyncMailFolder;
+    }
+  else
+    {
+      realCollectionId = nil;
+    }
+
+  return realCollectionId;
+}
+
+//
+// 2014-01-16T05:00:00.000Z
+//
+// See http://www.gnustep.org/resources/documentation/Developer/Base/Reference/NSCalendarDate.html#method$NSCalendarDate-initWithString$calendarFormat$ for the format details.
+//
+- (NSCalendarDate *) calendarDate
+{
+  id o;
+
+  o = [NSCalendarDate dateWithString: self  calendarFormat: @"%Y%m%dT%H%M%SZ"];
+
+  if (!o)
+    o = [NSCalendarDate dateWithString: self  calendarFormat: @"%Y-%m-%dT%H:%M:%S.%FZ"];
+  
+  return o;
+}
+
+- (NSString *) _valueForParameter: (NSString *) theParameter
+{
+  NSArray *components;
+  NSString *s;
+  int i;
+
+  components = [[[self componentsSeparatedByString: @"?"] lastObject] componentsSeparatedByString: @"&"];
+  
+  for (i = 0; i < [components count]; i++)
+    {
+      s = [components objectAtIndex: i];
+      
+      if ([[s uppercaseString] hasPrefix: theParameter])
+        return [s substringFromIndex: [theParameter length]];
+    }
+  
+  return nil;
+}
+
+//
+// This method extracts the "DeviceId" from a URI:
+//
+// /SOGo/Microsoft-Server-ActiveSync?Cmd=FolderSync&User=sogo10&DeviceId=SEC17CD1A3E9E3F2&DeviceType=SAMSUNGSGHI317M
+//
+- (NSString *) deviceId
+{
+  NSString *s;
+
+  s = [self _valueForParameter: @"DEVICEID="];
+  
+  if (!s)
+    s = @"Unknown";
+
+  return s;
+}
+
+//
+// This method extracts the "DeviceType" from a URI:
+//
+// /SOGo/Microsoft-Server-ActiveSync?Cmd=FolderSync&User=sogo10&DeviceId=SEC17CD1A3E9E3F2&DeviceType=SAMSUNGSGHI317M
+//
+- (NSString *) deviceType
+{
+  NSString *s;
+
+  s = [self _valueForParameter: @"DEVICETYPE="];
+
+  if (!s)
+    s = @"Unknown";
+
+  return s;
+}
+
+//
+//
+//
+- (NSString *) command
+{
+  NSString *s;
+  
+  s = [self _valueForParameter: @"CMD="];
+  
+  if (!s)
+    s = @"Unknown";
+  
+  return s;
+}
+
+//
+// FIXME: combine with our OpenChange code.
+//
+- (char) _decodeHexByte: (char) byteChar
+{
+  char newByte;
+
+  if (byteChar >= 48 && byteChar <= 57)
+    newByte = (uint8_t) byteChar - 48;
+  else if (byteChar >= 65 && byteChar <= 70)
+    newByte = (uint8_t) byteChar - 55;
+  else if (byteChar >= 97 && byteChar <= 102)
+    newByte = (uint8_t) byteChar - 87;
+  else
+    newByte = -1;
+
+  return newByte;
+}
+
+//
+// FIXME: combine with our OpenChange code.
+//
+- (BOOL) _decodeHexByte: (uint8_t *) byte
+                  atPos: (NSUInteger) pos
+{
+  BOOL error = NO;
+  char newByte;
+  unichar byteChar;
+
+  byteChar = [self characterAtIndex: pos];
+  if (byteChar < 256)
+    {
+      newByte = [self _decodeHexByte: (char) byteChar];
+      if (newByte == -1)
+        error = YES;
+      else
+        *byte = newByte;
+    }
+  else
+    error = YES;
+
+  return error;
+}
+
+//
+// FIXME: combine with our OpenChange code.
+//
+- (BOOL) _decodeHexPair: (uint8_t *) byte
+                  atPos: (NSUInteger) pos
+{
+  BOOL error;
+  uint8_t lowValue, highValue;
+
+  error = [self _decodeHexByte: &highValue atPos: pos];
+  if (!error)
+    {
+      error = [self _decodeHexByte: &lowValue atPos: pos + 1];
+      if (!error)
+        *byte = highValue << 4 | lowValue;
+    }
+
+  return error;
+}
+
+//
+// FIXME: combine with our OpenChange code.
+//
+- (NSData *) convertHexStringToBytes
+{
+  NSUInteger count, strLen, bytesLen;
+  uint8_t *bytes, *currentByte;
+  NSData *decoded = nil;
+  BOOL error = NO;
+
+  strLen = [self length];
+  if ((strLen % 2) == 0)
+    {
+      bytesLen = strLen / 2;
+      bytes = NSZoneCalloc (NULL, bytesLen, sizeof (uint8_t));
+      currentByte = bytes;
+      for (count = 0; !error && count < strLen; count += 2)
+        {
+          error = [self _decodeHexPair: currentByte atPos: count];
+          currentByte++;
+        }
+      if (error)
+        NSZoneFree (NULL, bytes);
+      else
+        decoded = [NSData dataWithBytesNoCopy: bytes
+                                       length: bytesLen
+                                 freeWhenDone: YES];
+    }
+
+  return decoded;
+}
+
+@end

ActiveSync/README

@@ -0,0 +1,12 @@
+In order to use this software in production environments, you need to
+get a proper usage license from Microsoft. Please contact them directly
+to negotiate the fees associated to your user base.
+
+To contact Microsoft, please visit:
+
+http://www.microsoft.com/en-us/legal/intellectualproperty/IPLicensing/Programs/exchangeactivesyncprotocol.aspx
+
+and send an email to iplicreq@microsoft.com
+
+Inverse inc. provides this software for free, but is not responsible
+for anything related to its usage.

ActiveSync/SOGoActiveSyncConstants.h

@@ -0,0 +1,42 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __SOGOACTIVESYNCCONSTANTS_H__
+#define __SOGOACTIVESYNCCONSTANTS_H__
+
+typedef enum
+{
+  ActiveSyncGenericFolder = 0,
+  ActiveSyncMailFolder = 1,
+  ActiveSyncContactFolder = 2,
+  ActiveSyncEventFolder = 3,
+  ActiveSyncTaskFolder = 4,
+} SOGoMicrosoftActiveSyncFolderType;
+
+#endif

ActiveSync/SOGoActiveSyncDispatcher+Sync.h

@@ -0,0 +1,47 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __SOGOACTIVESYNCDISPATCHERSYNC_H__
+#define __SOGOACTIVESYNCDISPATCHERSYNC_H__
+
+#import "SOGoActiveSyncDispatcher.h"
+
+#import <DOM/DOMElement.h>
+#import <DOM/DOMProtocols.h>
+
+@class WOResponse;
+
+@interface SOGoActiveSyncDispatcher (Sync)
+
+- (void) processSync: (id <DOMElement>) theDocumentElement
+          inResponse: (WOResponse *) theResponse;
+
+@end
+
+#endif // SOGOACTIVESYNCDISPATCHERSYNC

ActiveSync/SOGoActiveSyncDispatcher.h

@@ -0,0 +1,56 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import <Foundation/NSObject.h>
+
+#include "SOGoActiveSyncConstants.h"
+
+@class NSException;
+@class NSURL;
+
+@interface SOGoActiveSyncDispatcher : NSObject
+{
+  NSURL *folderTableURL;
+  id context;
+}
+
+- (id) collectionFromId: (NSString *) theCollectionId
+                   type: (SOGoMicrosoftActiveSyncFolderType) theFolderType;
+
+- (id) globallyUniqueIDToIMAPFolderName: (NSString *) theIdToTranslate
+                                   type: (SOGoMicrosoftActiveSyncFolderType) theFolderType;
+
+- (NSException *) dispatchRequest: (id) theRequest
+                       inResponse: (id) theResponse
+                          context: (id) theContext;
+
+- (NSURL *) folderTableURL;
+- (void) ensureFolderTableExists;
+
+@end

ActiveSync/SOGoMailObject+ActiveSync.h

@@ -0,0 +1,48 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __SOGOMAILOBJECTACTIVESYNC_H__
+#define __SOGOMAILOBJECTACTIVESYNC_H__
+
+#import <Mailer/SOGoMailObject.h>
+
+@class iCalCalendar;
+@class NSDictionary;
+@class WOContext;
+
+@interface SOGoMailObject (ActiveSync)
+
+- (iCalCalendar *) calendarFromIMIPMessage;
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif

ActiveSync/SOGoMailObject+ActiveSync.m

@@ -0,0 +1,819 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#include "SOGoMailObject+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
+
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalPerson.h>
+#import <NGCards/iCalTimeZone.h>
+
+#import <NGExtensions/NGBase64Coding.h>
+#import <NGExtensions/NGQuotedPrintableCoding.h>
+#import <NGExtensions/NSString+misc.h>
+#import <NGExtensions/NSString+Encoding.h>
+#import <NGImap4/NGImap4Envelope.h>
+#import <NGImap4/NGImap4EnvelopeAddress.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <NGMime/NGMimeBodyPart.h>
+#import <NGMime/NGMimeFileData.h>
+#import <NGMime/NGMimeMultipartBody.h>
+#import <NGMime/NGMimeType.h>
+#import <NGMail/NGMimeMessageParser.h>
+#import <NGMail/NGMimeMessage.h>
+#import <NGMail/NGMimeMessageGenerator.h>
+
+#include "iCalTimeZone+ActiveSync.h"
+#include "NSData+ActiveSync.h"
+#include "NSDate+ActiveSync.h"
+#include "NSString+ActiveSync.h"
+
+#include <Appointments/iCalEntityObject+SOGo.h>
+#include <Appointments/iCalPerson+SOGo.h>
+#include <Mailer/NSString+Mail.h>
+#include <Mailer/SOGoMailBodyPart.h>
+
+#include <SOGo/SOGoUser.h>
+
+typedef struct {
+  uint32_t dwLowDateTime;
+  uint32_t dwHighDateTime;
+} FILETIME;
+
+struct GlobalObjectId {
+  uint8_t                   ByteArrayID[16];
+  uint8_t                   YH;
+  uint8_t                   YL;
+  uint8_t                   Month;
+  uint8_t                   D;
+  FILETIME                  CreationTime;
+  uint8_t                   X[8];
+  uint32_t                  Size;
+  uint8_t*                  Data;
+};
+
+@implementation SOGoMailObject (ActiveSync)
+
+//
+//
+//
+- (void) _setInstanceDate: (struct GlobalObjectId *) newGlobalId
+                 fromDate: (NSCalendarDate *) instanceDate
+{
+  uint16_t year;
+
+  if (instanceDate)
+    {
+      //[instanceDate setTimeZone: timeZone];
+      year = [instanceDate yearOfCommonEra];
+      newGlobalId->YH = year >> 8;
+      newGlobalId->YL = year & 0xff;
+      newGlobalId->Month = [instanceDate monthOfYear];
+      newGlobalId->D = [instanceDate dayOfMonth];
+    }
+}
+
+//
+// The GlobalObjId is documented here: http://msdn.microsoft.com/en-us/library/ee160198(v=EXCHG.80).aspx
+//
+- (NSData *) _computeGlobalObjectIdFromEvent: (iCalEvent *) event
+{
+  NSData *binPrefix, *globalObjectId, *uidAsASCII;
+  NSString *prefix, *uid;
+
+  struct GlobalObjectId newGlobalId;
+  const char *bytes;
+  
+  prefix = @"040000008200e00074c5b7101a82e008";
+
+  // dataPrefix is "vCal-Uid %x01 %x00 %x00 %x00"
+  uint8_t dataPrefix[] = { 0x76, 0x43, 0x61, 0x6c, 0x2d, 0x55, 0x69, 0x64, 0x01, 0x00, 0x00, 0x00 };
+  uid = [event uid];
+
+  binPrefix = [prefix convertHexStringToBytes];
+  [binPrefix getBytes: &newGlobalId.ByteArrayID];
+  [self _setInstanceDate: &newGlobalId
+                fromDate: [event recurrenceId]];
+  uidAsASCII = [uid dataUsingEncoding: NSASCIIStringEncoding];
+  bytes = [uidAsASCII bytes];
+
+  // 0x0c is the size of our dataPrefix
+  newGlobalId.Size = 0x0c + [uidAsASCII length];
+  newGlobalId.Data = malloc(newGlobalId.Size * sizeof(uint8_t));
+  memcpy(newGlobalId.Data, dataPrefix, 0x0c);
+  memcpy(newGlobalId.Data + 0x0c, bytes, newGlobalId.Size - 0x0c);
+
+  globalObjectId = [[NSData alloc] initWithBytes: &newGlobalId  length: 40 + newGlobalId.Size*sizeof(uint8_t)];
+  free(newGlobalId.Data);
+  
+  return [globalObjectId autorelease];
+}
+
+//
+// For debugging purposes...
+//
+- (NSString *) _uidFromGlobalObjectId: (NSData *) objectId
+{
+  NSString *uid;
+
+  struct GlobalObjectId *newGlobalId;
+  NSUInteger length;
+  uint8_t *bytes;
+
+  length = [objectId length];
+  uid = nil;
+
+  bytes = malloc(length*sizeof(uint8_t));
+  [objectId getBytes: bytes  length: length];
+
+  newGlobalId = (struct GlobalObjectId *)bytes;
+
+  // We must take the offset (dataPrefix) into account
+  uid = [[NSString alloc] initWithBytes: newGlobalId->Data+12  length: newGlobalId->Size-12 encoding: NSASCIIStringEncoding];
+  free(bytes);
+
+  return AUTORELEASE(uid);
+}
+
+//
+//
+//
+- (NSString *) _emailAddressesFrom: (NSArray *) enveloppeAddresses
+{
+  NGImap4EnvelopeAddress *address;
+  NSString *email, *rc, *name;
+  NSMutableArray *addresses;
+  int i, max;
+
+  rc = nil;
+  max = [enveloppeAddresses count];
+
+  if (max > 0)
+    {
+      addresses = [NSMutableArray array];
+      for (i = 0; i < max; i++)
+        {
+          address = [enveloppeAddresses objectAtIndex: i];
+          name = [address personalName];
+          email = [NSString stringWithFormat: @"\"%@\" <%@>", (name ? name : [address baseEMail]), [address baseEMail]];
+          
+          if (email)
+            [addresses addObject: email];
+        }
+      rc = [addresses componentsJoinedByString: @", "];
+    }
+
+  return rc;
+}
+
+//
+//
+//
+- (NSData *) _preferredBodyDataInMultipartUsingType: (int) theType
+{
+  NSString *encoding, *key, *plainKey, *htmlKey, *type, *subtype;
+  NSDictionary *textParts, *part;
+  NSEnumerator *e;
+  NSData *d;
+
+  textParts = [self fetchPlainTextParts];
+  e = [textParts keyEnumerator];
+  plainKey = nil;
+  htmlKey = nil;
+  d = nil;
+
+  while ((key = [e nextObject]))
+    {
+      part = [self lookupInfoForBodyPart: key];
+      type = [part valueForKey: @"type"];
+      subtype = [part valueForKey: @"subtype"];
+      
+      if ([type isEqualToString: @"text"] && [subtype isEqualToString: @"html"])
+        htmlKey = key;
+      else if ([type isEqualToString: @"text"] && [subtype isEqualToString: @"plain"])
+        plainKey = key;
+    }
+
+  key = nil;
+
+  if (theType == 2)
+    key = htmlKey;
+  else if (theType == 1)
+    key = plainKey;
+
+  if (key)
+    {
+      d = [[self fetchPlainTextParts] objectForKey: key];
+
+      encoding = [[self lookupInfoForBodyPart: key] objectForKey: @"encoding"];
+      
+      if ([encoding caseInsensitiveCompare: @"base64"] == NSOrderedSame)
+        d = [d dataByDecodingBase64];
+      else if ([encoding caseInsensitiveCompare: @"quoted-printable"] == NSOrderedSame)
+        d = [d dataByDecodingQuotedPrintableTransferEncoding];
+    }
+
+  return d;
+}
+
+//
+//
+//
+- (void) _sanitizedMIMEPart: (id) thePart
+                  performed: (BOOL *) b
+{
+  if ([thePart isKindOfClass: [NGMimeMultipartBody class]])
+    {
+      NGMimeBodyPart *part;
+      NSArray *parts;
+      int i;
+
+      parts = [thePart parts];
+      
+      for (i = 0; i < [parts count]; i++)
+        {
+          part = [parts objectAtIndex: i];
+
+          [self _sanitizedMIMEPart: part
+                         performed: b];
+        }
+    }
+  else if ([thePart isKindOfClass: [NGMimeBodyPart class]])
+    {
+      NGMimeFileData *fdata;
+      id body;
+
+      body = [thePart body];
+
+      if ([body isKindOfClass: [NGMimeMultipartBody class]])
+        {
+          [self _sanitizedMIMEPart: body
+                         performed: b];
+        }
+      else if (([body isKindOfClass: [NSData class]] || [body isKindOfClass: [NSString class]]) &&
+               [[[thePart contentType] type] isEqualToString: @"text"] &&
+               ([[[thePart contentType] subType] isEqualToString: @"plain"] || [[[thePart contentType] subType] isEqualToString: @"html"]))
+        {
+          // We make sure everything is encoded in UTF-8
+          NGMimeType *mimeType;
+          NSString *s;
+
+          if ([body isKindOfClass: [NSData class]])
+            {
+              NSString *charset;
+              int encoding;
+
+              charset = [[thePart contentType] valueOfParameter: @"charset"];
+              encoding = [NGMimeType stringEncodingForCharset: charset];
+              
+              s = [[NSString alloc] initWithData: body  encoding: encoding];
+              AUTORELEASE(s);
+            }
+          else
+            {
+              // Handle situations when SOPE stupidly returns us a NSString
+              // This can happen for Content-Type: text/plain, Content-Transfer-Encoding: 8bit
+              s = body;
+            }
+
+          if (s)
+            {
+              body = [s dataUsingEncoding: NSUTF8StringEncoding];
+            }
+
+          mimeType = [NGMimeType mimeType: [[thePart contentType] type]
+                                  subType: [[thePart contentType] subType]
+                               parameters: [NSDictionary dictionaryWithObject: @"utf-8"  forKey: @"charset"]];
+          [thePart setHeader: mimeType  forKey: @"content-type"];
+          
+          fdata = [[NGMimeFileData alloc] initWithBytes: [body bytes]
+                                                 length: [body length]];
+          
+          [thePart setBody: fdata];                  
+          RELEASE(fdata);
+          *b = YES;
+        }
+    }
+}
+
+//
+//
+//
+- (NSData *) _sanitizedMIMEMessage
+{
+  NGMimeMessageParser *parser;
+  NGMimeMessage *message;
+  NSData *d;
+  
+  BOOL b;
+  
+  d = [self content];
+
+  parser = [[NGMimeMessageParser alloc] init];
+  AUTORELEASE(parser);
+  
+  message = [parser parsePartFromData: d];
+  b = NO;
+
+  if (message)
+    {
+      [self _sanitizedMIMEPart: [message body]
+                     performed: &b];
+
+      if (b)
+        {
+          NGMimeMessageGenerator *generator;
+          
+          generator = [[NGMimeMessageGenerator alloc] init];
+          AUTORELEASE(generator);
+          
+          d = [generator generateMimeFromPart: message];
+        }
+    }
+  
+  return d;
+}
+
+//
+//
+//
+- (NSData *) _preferredBodyDataUsingType: (int) theType
+                              nativeType: (int *) theNativeType
+{
+  NSString *type, *subtype, *encoding;
+  NSData *d;
+  
+  type = [[[self bodyStructure] valueForKey: @"type"] lowercaseString];
+  subtype = [[[self bodyStructure] valueForKey: @"subtype"] lowercaseString];
+
+  d = nil;
+  
+  // We determine the native type
+  if ([type isEqualToString: @"text"] && [subtype isEqualToString: @"plain"])
+    *theNativeType = 1;
+  else if ([type isEqualToString: @"text"] && [subtype isEqualToString: @"html"])
+    *theNativeType = 2;
+  else if ([type isEqualToString: @"multipart"])
+    *theNativeType = 4;
+
+  // We get the right part based on the preference
+  if (theType == 1 || theType == 2)
+    {
+      if ([type isEqualToString: @"text"])
+        {
+          d = [[self fetchPlainTextParts] objectForKey: @""];
+          
+          // We check if we have base64 encoded parts. If so, we just
+          // un-encode them before using them
+          encoding = [[self lookupInfoForBodyPart: @""] objectForKey: @"encoding"];
+
+          if ([encoding caseInsensitiveCompare: @"base64"] == NSOrderedSame)
+            d = [d dataByDecodingBase64];
+          else if ([encoding caseInsensitiveCompare: @"quoted-printable"] == NSOrderedSame)
+            d = [d dataByDecodingQuotedPrintableTransferEncoding];
+
+          // Check if we must convert html->plain
+          if (theType == 1 && [subtype isEqualToString: @"html"])
+            {
+              NSString *s;
+              
+              s = [[NSString alloc] initWithData: d  encoding: NSUTF8StringEncoding];
+              AUTORELEASE(s);
+
+              s = [s htmlToText];
+              d = [s dataUsingEncoding: NSUTF8StringEncoding];
+            }
+        }
+      else if ([type isEqualToString: @"multipart"])
+        {
+          d = [self _preferredBodyDataInMultipartUsingType: theType];
+        }
+    }
+  else if (theType == 4)
+    {
+      // We sanitize the content *ONLY* for Outlook clients. Outlook has strange issues
+      // with quoted-printable/base64 encoded text parts. It just doesn't decode them.
+      if ([[context objectForKey: @"DeviceType"] isEqualToString: @"WindowsOutlook15"])
+        d = [self _sanitizedMIMEMessage];
+      else
+        d = [self content];
+    }
+
+  return d;
+}
+
+//
+//
+//
+- (iCalCalendar *) calendarFromIMIPMessage
+{
+  NSDictionary *part;
+  NSArray *parts;
+  int i;
+
+  // We check if we have at least 2 parts and if one of them is a text/calendar
+  parts = [[self bodyStructure] objectForKey: @"parts"];
+
+  if ([parts count] > 1)
+    {
+      for (i = 0; i < [parts count]; i++)
+        {
+          part = [parts objectAtIndex: i];
+          
+          if ([[part objectForKey: @"type"] isEqualToString: @"text"] &&
+              [[part objectForKey: @"subtype"] isEqualToString: @"calendar"])
+            {
+              id bodyPart;
+
+              bodyPart = [self lookupImap4BodyPartKey: [NSString stringWithFormat: @"%d", i+1]
+                                            inContext: self->context];
+
+              if (bodyPart)
+                {
+                  iCalCalendar *calendar;
+                  NSData *calendarData;
+                  
+                  calendarData = [bodyPart fetchBLOB];
+                  calendar = nil;
+
+                  NS_DURING
+                    calendar = [iCalCalendar parseSingleFromSource: calendarData];
+                  NS_HANDLER
+                    calendar = nil;
+                  NS_ENDHANDLER
+
+                  return calendar;
+                }
+            }
+        }
+    }
+
+  return nil;
+}
+
+//
+//
+//
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) _context
+{
+  NSAutoreleasePool *pool;
+  NSData *d, *globalObjId;
+  NSArray *attachmentKeys;
+  NSMutableString *s;
+  id value;
+
+  iCalCalendar *calendar;
+      
+  int preferredBodyType, nativeBodyType;
+
+  s = [NSMutableString string];
+
+  // To - "The value of this element contains one or more e-mail addresses.
+  // If there are multiple e-mail addresses, they are separated by commas."
+  value = [self _emailAddressesFrom: [[self envelope] to]];
+  if (value)
+    [s appendFormat: @"<To xmlns=\"Email:\">%@</To>", [value activeSyncRepresentationInContext: context]];
+
+  // From
+  value = [self _emailAddressesFrom: [[self envelope] from]];
+  if (value)
+    [s appendFormat: @"<From xmlns=\"Email:\">%@</From>", [value activeSyncRepresentationInContext: context]];
+  
+  // Subject
+  value = [self decodedSubject];
+  if (value)
+    {
+      [s appendFormat: @"<Subject xmlns=\"Email:\">%@</Subject>", [value activeSyncRepresentationInContext: context]];
+      [s appendFormat: @"<ThreadTopic xmlns=\"Email:\">%@</ThreadTopic>", [value activeSyncRepresentationInContext: context]];
+    }
+
+  // DateReceived
+  value = [self date];
+  if (value)
+    [s appendFormat: @"<DateReceived xmlns=\"Email:\">%@</DateReceived>", [value activeSyncRepresentationInContext: context]];
+
+  // DisplayTo
+  [s appendFormat: @"<DisplayTo xmlns=\"Email:\">%@</DisplayTo>", [[context activeUser] login]];
+  
+  // Cc - same syntax as the To field
+  value = [self _emailAddressesFrom: [[self envelope] cc]];
+  if (value)
+    [s appendFormat: @"<Cc xmlns=\"Email:\">%@</Cc>", [value activeSyncRepresentationInContext: context]];
+    
+  // Importance - FIXME
+  [s appendFormat: @"<Importance xmlns=\"Email:\">%@</Importance>", @"1"];
+  
+  // Read
+  [s appendFormat: @"<Read xmlns=\"Email:\">%d</Read>", ([self read] ? 1 : 0)];
+  
+  // We handle MeetingRequest
+  calendar = [self calendarFromIMIPMessage];
+ 
+  if (calendar)
+    {
+      NSString *method, *className;
+      iCalPerson *attendee;
+      iCalTimeZone *tz;
+      iCalEvent *event;
+
+      iCalPersonPartStat partstat;
+      int v;
+
+      event = [[calendar events] lastObject];
+      method = [[event parent] method];
+
+      // If we are the organizer, let's pick the attendee based on the From address
+      if ([event userIsOrganizer: [context activeUser]])
+        attendee = [event findAttendeeWithEmail: [[[[self envelope] from] lastObject] baseEMail]];
+      else
+        attendee = [event findAttendeeWithEmail: [[[context activeUser] allEmails] objectAtIndex: 0]];
+
+      partstat = [attendee participationStatus];
+
+      // We generate the correct MessageClass
+      if ([method isEqualToString: @"REQUEST"])
+        className = @"IPM.Schedule.Meeting.Request";
+      else if ([method isEqualToString: @"REPLY"])
+        {
+          switch (partstat)
+            {
+            case iCalPersonPartStatAccepted:
+              className = @"IPM.Schedule.Meeting.Resp.Pos";
+              break;
+            case iCalPersonPartStatDeclined:
+              className = @"IPM.Schedule.Meeting.Resp.Neg";
+              break;
+            case iCalPersonPartStatTentative:
+            case iCalPersonPartStatNeedsAction:
+              className = @"IPM.Schedule.Meeting.Resp.Tent";
+              break;
+            default:
+              className = @"IPM.Appointment";
+              NSLog(@"unhandled part stat");
+            }
+        }
+      else if ([method isEqualToString: @"COUNTER"])
+        className = @"IPM.Schedule.Meeting.Resp.Tent";
+      else if ([method isEqualToString: @"CANCEL"])
+        className = @"IPM.Schedule.Meeting.Cancelled";
+      else
+        className = @"IPM.Appointment";
+      
+      [s appendFormat: @"<MessageClass xmlns=\"Email:\">%@</MessageClass>", className];
+      
+      [s appendString: @"<MeetingRequest xmlns=\"Email:\">"];
+
+      [s appendFormat: @"<AllDayEvent xmlns=\"Email:\">%d</AllDayEvent>", ([event isAllDay] ? 1 : 0)];
+
+      // StartTime -- http://msdn.microsoft.com/en-us/library/ee157132(v=exchg.80).aspx
+      if ([event startDate])
+        [s appendFormat: @"<StartTime xmlns=\"Email:\">%@</StartTime>", [[event startDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      
+      if ([event timeStampAsDate])
+        [s appendFormat: @"<DTStamp xmlns=\"Email:\">%@</DTStamp>", [[event timeStampAsDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      else if ([event created])
+        [s appendFormat: @"<DTStamp xmlns=\"Email:\">%@</DTStamp>", [[event created] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      
+      // EndTime -- http://msdn.microsoft.com/en-us/library/ee157945(v=exchg.80).aspx
+      if ([event endDate])
+        [s appendFormat: @"<EndTime xmlns=\"Email:\">%@</EndTime>", [[event endDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      
+      // FIXME: Single appointment - others are not supported right now
+      [s appendFormat: @"<InstanceType xmlns=\"Email:\">%d</InstanceType>", 0];
+
+      // Location
+      if ([[event location] length])
+        [s appendFormat: @"<Location xmlns=\"Email:\">%@</Location>", [[event location] activeSyncRepresentationInContext: context]];
+
+      [s appendFormat: @"<Organizer xmlns=\"Email:\">%@</Organizer>", [[[event organizer] mailAddress] activeSyncRepresentationInContext: context]];
+
+      // This will trigger the SendMail command. We set it to no for email invitations as
+      // SOGo will send emails when MeetingResponse is called.
+      [s appendFormat: @"<ResponseRequested xmlns=\"Email:\">%d</ResponseRequested>", 0];
+
+      // Sensitivity
+      if ([[event accessClass] isEqualToString: @"PRIVATE"])
+        v = 2;
+      if ([[event accessClass] isEqualToString: @"CONFIDENTIAL"])
+        v = 3;
+      else
+        v = 0;
+
+      [s appendFormat: @"<Sensitivity xmlns=\"Email:\">%d</Sensitivity>", v];
+      
+      [s appendFormat: @"<BusyStatus xmlns=\"Email:\">%d</BusyStatus>", 2];
+
+      // Timezone
+      tz = [(iCalDateTime *)[event firstChildWithTag: @"dtstart"] timeZone];
+      
+      if (!tz)
+        tz = [iCalTimeZone timeZoneForName: @"Europe/London"];
+      
+      [s appendFormat: @"<TimeZone xmlns=\"Email:\">%@</TimeZone>", [tz activeSyncRepresentationInContext: context]];
+      
+
+      // We disallow new time proposals
+      [s appendFormat: @"<DisallowNewTimeProposal xmlns=\"Email:\">%d</DisallowNewTimeProposal>", 1];
+      
+      // From http://blogs.msdn.com/b/exchangedev/archive/2011/07/22/working-with-meeting-requests-in-exchange-activesync.aspx:
+      //
+      // "Clients that need to determine whether the GlobalObjId  element for a meeting request corresponds to an existing Calendar
+      // object in the Calendar folder have to convert the GlobalObjId element value to a UID element value to make the comparison."
+      //
+      globalObjId = [self _computeGlobalObjectIdFromEvent: event];
+      [s appendFormat: @"<GlobalObjId xmlns=\"Email:\">%@</GlobalObjId>", [globalObjId activeSyncRepresentationInContext: context]];
+
+      // We set the right message type - we must set AS version to 14.1 for this
+      [s appendFormat: @"<MeetingMessageType xmlns=\"Email2:\">%d</MeetingMessageType>", 1];
+      [s appendString: @"</MeetingRequest>"];
+
+      // ContentClass
+      [s appendFormat: @"<ContentClass xmlns=\"Email:\">%@</ContentClass>", @"urn:content-classes:calendarmessage"];
+    }
+  else
+    {
+      // MesssageClass and ContentClass
+      [s appendFormat: @"<MessageClass xmlns=\"Email:\">%@</MessageClass>", @"IPM.Note"];
+      [s appendFormat: @"<ContentClass xmlns=\"Email:\">%@</ContentClass>", @"urn:content-classes:message"];
+    }
+
+  // Reply-To - FIXME
+  //NSArray *replyTo = [[message objectForKey: @"envelope"] replyTo];
+  //if ([replyTo count])
+  //  [s appendFormat: @"<Reply-To xmlns=\"Email:\">%@</Reply-To>", [addressFormatter stringForArray: replyTo]];
+  
+  // InternetCPID - 65001 == UTF-8, we use this all the time for now.
+  //              - 20127 == US-ASCII
+  [s appendFormat: @"<InternetCPID xmlns=\"Email:\">%@</InternetCPID>", @"65001"];
+          
+  // Body - namespace 17
+  preferredBodyType = [[context objectForKey: @"BodyPreferenceType"] intValue];
+
+  // Make use of a local pool here as _preferredBodyDataUsingType:nativeType: will consume
+  // a significant amout of RAM and file descriptors
+  pool = [[NSAutoreleasePool alloc] init];
+
+  nativeBodyType = 1;
+  d = [self _preferredBodyDataUsingType: preferredBodyType  nativeType: &nativeBodyType];
+  
+  if (d)
+    {
+      NSString *content;
+      int len, truncated;
+      
+      content = [[NSString alloc] initWithData: d  encoding: NSUTF8StringEncoding];
+
+      // FIXME: This is a hack. We should normally avoid doing this as we might get
+      // broken encodings. We should rather tell that the data was truncated and expect
+      // a ItemOperations call to download the whole base64 encoding multipart.
+      //
+      // See http://social.msdn.microsoft.com/Forums/en-US/b9944e49-9bc9-4ab8-ba33-a9fc08557c5b/mime-raw-data-in-eas-sync-response?forum=os_exchangeprotocols
+      // for an "interesting" discussion around this.
+      //
+      if (!content)
+        content = [[NSString alloc] initWithData: d  encoding: NSISOLatin1StringEncoding];
+      
+      AUTORELEASE(content);
+      
+      content = [content activeSyncRepresentationInContext: context];
+      truncated = 0;
+    
+      len = [content length];
+      
+      [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
+      [s appendFormat: @"<Type>%d</Type>", preferredBodyType];
+      [s appendFormat: @"<Truncated>%d</Truncated>", truncated];
+      [s appendFormat: @"<Preview></Preview>"];
+
+      if (!truncated)
+        {
+          [s appendFormat: @"<Data>%@</Data>", content];
+          [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", len];
+        }
+      [s appendString: @"</Body>"];
+    }
+
+  DESTROY(pool);
+
+  // Attachments -namespace 16
+  attachmentKeys = [self fetchFileAttachmentKeys];
+  if ([attachmentKeys count])
+    {
+      int i;
+      
+      [s appendString: @"<Attachments xmlns=\"AirSyncBase:\">"];
+      
+      for (i = 0; i < [attachmentKeys count]; i++)
+        {
+          value = [attachmentKeys objectAtIndex: i];
+
+          [s appendString: @"<Attachment>"];
+          [s appendFormat: @"<DisplayName>%@</DisplayName>", [[value objectForKey: @"filename"] activeSyncRepresentationInContext: context]];
+
+          // FileReference must be a unique identifier across the whole store. We use the following structure:
+          // mail/<foldername>/<message UID/<pathofpart>
+          // mail/INBOX/2          
+          [s appendFormat: @"<FileReference>mail/%@/%@/%@</FileReference>", [[[self container] relativeImap4Name] stringByEscapingURL], [self nameInContainer], [value objectForKey: @"path"]];
+
+          [s appendFormat: @"<Method>%d</Method>", 1]; // See: http://msdn.microsoft.com/en-us/library/ee160322(v=exchg.80).aspx
+          [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [[value objectForKey: @"size"] intValue]];
+          //[s appendFormat: @"<IsInline>%d</IsInline>", 1];
+          [s appendString: @"</Attachment>"];
+        }
+
+      [s appendString: @"</Attachments>"];
+    }
+  
+  // Flags
+  [s appendString: @"<Flag xmlns=\"Email:\">"];
+  [s appendFormat: @"<FlagStatus>%d</FlagStatus>", 0];
+  [s appendString: @"</Flag>"];
+  
+  // FIXME - support these in the future
+  //[s appendString: @"<ConversationId xmlns=\"Email2:\">foobar</ConversationId>"];
+  //[s appendString: @"<ConversationIndex xmlns=\"Email2:\">zot=</ConversationIndex>"];
+  
+  // NativeBodyType -- http://msdn.microsoft.com/en-us/library/ee218276(v=exchg.80).aspx
+  // This is a required child element.
+  // 1 -> plain/text, 2 -> HTML and 3 -> RTF
+  if (nativeBodyType == 4)
+    nativeBodyType = 1;
+
+  [s appendFormat: @"<NativeBodyType xmlns=\"AirSyncBase:\">%d</NativeBodyType>", nativeBodyType];
+  
+  return s;
+}
+
+//
+//
+//
+// Exemple for a message being marked as read:
+//
+//  <Change>
+//   <ServerId>607</ServerId>
+//   <ApplicationData>
+//    <Read xmlns="Email:">1</Read>
+//   </ApplicationData>
+//  </Change>
+// </Commands>
+//
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) _context
+{
+  id o;
+
+  if ((o = [theValues objectForKey: @"Flag"]))
+    {
+      o = [o objectForKey: @"FlagStatus"];
+      
+      if ([o intValue])
+        [self addFlags: @"\\Flagged"];
+      else
+        [self removeFlags: @"\\Flagged"]; 
+    }
+  
+  if ((o = [theValues objectForKey: @"Read"]))
+    {
+      if ([o intValue])
+        [self addFlags: @"seen"];
+      else
+        [self removeFlags: @"seen"];;
+    }
+}
+
+@end

ActiveSync/SOGoSyncCacheObject.h

@@ -0,0 +1,55 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef __SOGOSYNCCACHEOBJECT_H__
+#define __SOGOSYNCCACHEOBJECT_H__
+
+#import <Foundation/NSObject.h>
+
+@class NSNull;
+
+@interface SOGoSyncCacheObject : NSObject
+{
+  id _uid;
+  id _sequence;
+}
+
++ (id) syncCacheObjectWithUID: (id) theUID  sequence: (id) theSequence;
+- (id) uid;
+- (void) setUID: (id) theUID;
+- (id) sequence;
+- (void) setSequence: (id) theSequence;
+
+- (NSComparisonResult) compareUID: (SOGoSyncCacheObject *) theSyncCacheObject;
+- (NSComparisonResult) compareSequence: (SOGoSyncCacheObject *) theSyncCacheObject;
+
+@end
+
+#endif

ActiveSync/SOGoSyncCacheObject.m

@@ -0,0 +1,122 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "SOGoSyncCacheObject.h"
+
+#import <Foundation/NSNull.h>
+#import <Foundation/NSString.h>
+
+@implementation SOGoSyncCacheObject
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      _uid = nil;
+      _sequence = nil;
+    }
+
+  return self;
+}
+
++ (id) syncCacheObjectWithUID: (id) theUID  sequence:  (id) theSequence;
+{
+  id o;
+
+  o = [[self alloc] init];
+ 
+  [o setUID: theUID];
+  [o setSequence: theSequence];
+  
+  return o;
+}
+
+- (void) dealloc
+{
+  RELEASE(_uid);
+  RELEASE(_sequence);
+  [super dealloc];
+}
+
+- (id) uid
+{
+  return _uid;
+}
+
+- (void) setUID: (id) theUID
+{
+  ASSIGN(_uid, theUID);
+}
+
+- (id) sequence
+{
+  return _sequence;
+}
+
+- (void) setSequence: (id) theSequence
+{
+  ASSIGN(_sequence, theSequence);
+}
+
+
+- (NSComparisonResult) compareUID: (SOGoSyncCacheObject *) theSyncCacheObject
+{
+  return [[self uid] compare: [theSyncCacheObject uid]];
+}
+
+//
+// We might get NSNull values here, so if both are NSNull instances,
+// we sort by UID. If both sequences are equal, we also sort by UID.
+//
+- (NSComparisonResult) compareSequence: (SOGoSyncCacheObject *) theSyncCacheObject
+{
+  if ([[self sequence] isEqual: [NSNull null]] &&
+      [[theSyncCacheObject sequence] isEqual: [NSNull null]])
+    return [self compareUID: theSyncCacheObject];
+  
+  if (![[self sequence] isEqual: [NSNull null]] && [[theSyncCacheObject sequence] isEqual: [NSNull null]])
+    return NSOrderedDescending;
+  
+  if ([[self sequence] isEqual: [NSNull null]] && ![[theSyncCacheObject sequence] isEqual: [NSNull null]])
+    return NSOrderedAscending;
+  
+  // Must check this here, to avoid comparing NSNull objects
+  if ([[self sequence] compare: [theSyncCacheObject sequence]] == NSOrderedSame)
+    return [self compareUID: theSyncCacheObject];
+  
+  return [[self sequence] compare: [theSyncCacheObject sequence]];
+}
+
+- (NSString *) description
+{
+  return [NSString stringWithFormat: @"%@-%@", _uid, _sequence];
+}
+
+@end

ActiveSync/SoObjectWebDAVDispatcher+ActiveSync.m

@@ -0,0 +1,101 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import <NGObjWeb/SoObjectWebDAVDispatcher.h>
+
+#include <NGObjWeb/SoObject+SoDAV.h>
+#include <NGObjWeb/WEClientCapabilities.h>
+#include <NGObjWeb/WOContext.h>
+#include <NGObjWeb/WORequest.h>
+#include <NGObjWeb/WOResponse.h>
+
+#import <Foundation/NSArray.h>
+
+@interface SoObjectWebDAVDispatcher (ActiveSync)
+
+- (id)_callObjectMethod:(NSString *)_method inContext:(WOContext *)_ctx;
+- (id) doOPTIONS:(WOContext *)_ctx;
+
+@end
+
+@implementation SoObjectWebDAVDispatcher (ActiveSync)
+
+- (id) doOPTIONS:(WOContext *)_ctx 
+{
+  WOResponse *response;
+  
+  /*
+    See example: http://msdn.microsoft.com/en-us/library/ee204257(v=exchg.80).aspx
+  */
+  if ([[[_ctx request] requestHandlerKey] isEqualToString: @"Microsoft-Server-ActiveSync"])
+    {
+      response = [_ctx response];
+      [response setStatus: 200];
+      
+      [response setHeader: @"private"  forKey: @"Cache-Control"];
+      [response setHeader: @"OPTIONS, POST"  forKey: @"Allow"];
+      [response setHeader: @"14.1"  forKey: @"MS-Server-ActiveSync"];
+      [response setHeader: @"2.0,2.1,2.5,12.0,12.1,14.0,14.1"  forKey: @"MS-ASProtocolVersions"];
+      [response setHeader: @"Sync,SendMail,SmartForward,SmartReply,GetAttachment,GetHierarchy,CreateCollection,DeleteCollection,MoveCollection,FolderSync,FolderCreate,FolderDelete,FolderUpdate,MoveItems,GetItemEstimate,MeetingResponse,Search,Settings,Ping,ItemOperations,ResolveRecipients,ValidateCert"  forKey: @"MS-ASProtocolCommands"];
+      [response setHeader: @"OPTIONS, POST"  forKey: @"Public"];
+    }
+  else
+    {
+      NSArray    *tmp;
+      id         result;
+      
+      /* this checks whether the object provides a specific OPTIONS method */
+      if ((result = [self _callObjectMethod:@"OPTIONS" inContext:_ctx]) != nil)
+        return result;
+      
+      response = [_ctx response];
+      [response setStatus:200 /* OK */];
+      
+      if ((tmp = [self->object davAllowedMethodsInContext:_ctx]) != nil) 
+        [response setHeader:[tmp componentsJoinedByString:@", "] forKey:@"allow"];
+      
+      if ([[[_ctx request] clientCapabilities] isWebFolder]) {
+        /*
+          As described over here:
+          http://teyc.editthispage.com/2005/06/02
+          
+          This page also says that: "MS-Auth-Via header is not required to work
+       with Web Folders".
+        */
+        [response setHeader:[tmp componentsJoinedByString:@", "] forKey:@"public"];
+      }
+      
+      if ((tmp = [self->object davComplianceClassesInContext:_ctx]) != nil) 
+        [response setHeader:[tmp componentsJoinedByString:@", "] forKey:@"dav"];
+    }
+  
+  return response;
+}
+
+@end

ActiveSync/common.make

@@ -0,0 +1,34 @@
+include ../config.make
+include $(GNUSTEP_MAKEFILES)/common.make
+include ../Version
+
+NEEDS_GUI=no
+BUNDLE_EXTENSION     = .SOGo
+BUNDLE_INSTALL_DIR   = $(SOGO_LIBDIR)
+WOBUNDLE_EXTENSION   = $(BUNDLE_EXTENSION)
+WOBUNDLE_INSTALL_DIR = $(BUNDLE_INSTALL_DIR)
+
+# SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
+ADDITIONAL_INCLUDE_DIRS += \
+	-I.. \
+	-I../.. \
+        -I../../SOPE
+
+ADDITIONAL_LIB_DIRS += \
+        -L../SoObjects/SOGo/SOGo.framework/ \
+	-L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
+	-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
+	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
+        -L/usr/local/lib
+
+BUNDLE_LIBS += \
+	-lSOGo					\
+	-lGDLContentStore			\
+	-lGDLAccess				\
+	-lNGObjWeb				\
+	-lNGCards -lNGMime -lNGLdap		\
+	-lNGStreams -lNGExtensions -lEOControl	\
+	-lDOM -lSaxObjC -lSBJson
+
+ADDITIONAL_BUNDLE_LIBS += $(BUNDLE_LIBS)

ActiveSync/iCalAlarm+ActiveSync.h

@@ -0,0 +1,46 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __ICALALARMACTIVESYNC_H__
+#define __ICALALARMACTIVESYNC_H__
+
+#import <NGCards/iCalAlarm.h>
+
+@class NSString;
+@class WOContext;
+
+@interface iCalAlarm (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif

ActiveSync/iCalAlarm+ActiveSync.m

@@ -0,0 +1,106 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "iCalAlarm+ActiveSync.h"
+
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NSString+misc.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <NGCards/iCalAlarm.h>
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalTrigger.h>
+
+@implementation iCalAlarm (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSMutableString *s;
+
+  s = [NSMutableString string];
+  
+  if ([[self action] caseInsensitiveCompare: @"DISPLAY"] == NSOrderedSame)
+    {
+      NSCalendarDate *nextAlarmDate;
+      NSInteger delta;
+      
+      nextAlarmDate = [self nextAlarmDate];
+      delta = (int)(([[(iCalEvent *)parent startDate] timeIntervalSince1970] - [nextAlarmDate timeIntervalSince1970])/60);
+      
+      // don't send negative reminder - not supported
+      if (delta > 0)
+        [s appendFormat: @"<Reminder xmlns=\"Calendar:\">%d</Reminder>", delta];
+    }
+  
+  return s;
+}
+
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context
+{
+  iCalTrigger *trigger;
+  id o;
+
+  o = [theValues objectForKey: @"Reminder"];
+
+  // Outlook: if reminder is set to 0 minutes before start save it as 1 minute since -> 0 minutes in not accepted by SOGo
+  if ([o isEqualToString: @"0"]) 
+    o = @"1";
+  
+  trigger = [iCalTrigger elementWithTag: @"TRIGGER"];
+  [trigger setValueType: @"DURATION"];
+  [self setTrigger: trigger];
+  [self setAction: @"DISPLAY"];
+
+  // SOGo web ui only supports 1w but not 2w (custom reminder only supports min/hours/days)
+  // 1week = -P1W
+  // 2weeks > -PxD
+  // xdays > -PxD
+  // xhours -> -PTxH
+  // xmin -> -PTxM
+  if  ([o intValue] == 10080)
+    [trigger setSingleValue: [NSString stringWithFormat: @"-P1W" ] forKey: @""];
+  else
+    {
+      if (([o intValue] % 1440) == 0)
+        [trigger setSingleValue: [NSString stringWithFormat: @"-P%dD", ([o intValue] / 1440)]  forKey: @""];
+      else
+        {
+          if (([o intValue] % 60) == 0)
+            [trigger setSingleValue: [NSString stringWithFormat: @"-PT%dH", ([o intValue] / 60)]  forKey: @""];
+          else
+            [trigger setSingleValue: [NSString stringWithFormat: @"-PT%@M", o]  forKey: @""];
+        }
+    }
+}
+
+@end

ActiveSync/iCalEvent+ActiveSync.h

@@ -0,0 +1,47 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef __ICALEVENTACTIVESYNC_H__
+#define __ICALEVENTACTIVESYNC_H__
+
+#import <NGCards/iCalEvent.h>
+
+@class NSString;
+@class WOContext;
+
+@interface iCalEvent (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif

ActiveSync/iCalEvent+ActiveSync.m

@@ -0,0 +1,537 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#import "iCalEvent+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+
+#import <NGExtensions/NSString+misc.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalPerson.h>
+
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
+
+#import <Appointments/iCalEntityObject+SOGo.h>
+
+#include "iCalAlarm+ActiveSync.h"
+#include "iCalRecurrenceRule+ActiveSync.h"
+#include "iCalTimeZone+ActiveSync.h"
+#include "NSDate+ActiveSync.h"
+#include "NSString+ActiveSync.h"
+
+@implementation iCalEvent (ActiveSync)
+
+- (int) _attendeeStatus: (iCalPerson *) attendee
+{
+  int  attendee_status;
+  
+  attendee_status = 5;
+  if ([[attendee partStat] caseInsensitiveCompare: @"ACCEPTED"] == NSOrderedSame)
+    attendee_status = 3;
+  else if ([[attendee partStat] caseInsensitiveCompare: @"DECLINED"] == NSOrderedSame)
+    attendee_status = 4;
+  else if ([[attendee partStat] caseInsensitiveCompare: @"TENTATIVE"] == NSOrderedSame)
+    attendee_status = 2;
+
+  return attendee_status;
+}
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSMutableString *s;
+  NSArray *attendees;
+
+  iCalPerson *organizer, *attendee;
+  iCalTimeZone *tz;
+  id o;
+
+  int v;
+
+  NSTimeZone *userTimeZone;
+  userTimeZone = [[[context activeUser] userDefaults] timeZone];
+
+  s = [NSMutableString string];
+  
+  [s appendFormat: @"<AllDayEvent xmlns=\"Calendar:\">%d</AllDayEvent>", ([self isAllDay] ? 1 : 0)];
+
+  // DTStamp -- http://msdn.microsoft.com/en-us/library/ee219470(v=exchg.80).aspx
+  if ([self timeStampAsDate])
+    [s appendFormat: @"<DTStamp xmlns=\"Calendar:\">%@</DTStamp>", [[self timeStampAsDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+  else if ([self created])
+    [s appendFormat: @"<DTStamp xmlns=\"Calendar:\">%@</DTStamp>", [[self created] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+  
+  // StartTime -- http://msdn.microsoft.com/en-us/library/ee157132(v=exchg.80).aspx
+  if ([self startDate])
+    {
+      if ([self isAllDay])
+        [s appendFormat: @"<StartTime xmlns=\"Calendar:\">%@</StartTime>",
+           [[[self startDate] dateByAddingYears: 0 months: 0 days: 0
+                                          hours: 0 minutes: 0
+                                        seconds: ([userTimeZone secondsFromGMTForDate: [self startDate]])*-1]
+             activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      else
+        [s appendFormat: @"<StartTime xmlns=\"Calendar:\">%@</StartTime>", [[self startDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+    }
+
+  // EndTime -- http://msdn.microsoft.com/en-us/library/ee157945(v=exchg.80).aspx
+  if ([self endDate])
+    {
+      if ([self isAllDay])
+        [s appendFormat: @"<EndTime xmlns=\"Calendar:\">%@</EndTime>",
+           [[[self endDate] dateByAddingYears: 0 months: 0 days: 0
+                                        hours: 0 minutes: 0
+                                      seconds: ([userTimeZone secondsFromGMTForDate: [self endDate]])*-1]
+             activeSyncRepresentationWithoutSeparatorsInContext: context]];
+      else
+        [s appendFormat: @"<EndTime xmlns=\"Calendar:\">%@</EndTime>", [[self endDate] activeSyncRepresentationWithoutSeparatorsInContext: context]];
+    }
+
+  // Timezone
+  tz = [(iCalDateTime *)[self firstChildWithTag: @"dtstart"] timeZone];
+
+  if (!tz)
+    tz = [iCalTimeZone timeZoneForName: @"Europe/London"];
+
+  [s appendFormat: @"<TimeZone xmlns=\"Calendar:\">%@</TimeZone>", [tz activeSyncRepresentationInContext: context]];
+  
+  // Organizer and other invitations related properties
+  if ((organizer = [self organizer]))
+    {
+      o = [organizer rfc822Email];
+      if ([o length])
+        {
+          [s appendFormat: @"<Organizer_Email xmlns=\"Calendar:\">%@</Organizer_Email>", o];
+          
+          o = [organizer cn];
+          if ([o length])
+            [s appendFormat: @"<Organizer_Name xmlns=\"Calendar:\">%@</Organizer_Name>", o];
+        }
+    }
+  
+  // Attendees
+  attendees = [self attendees];
+  
+  if ([attendees count])
+    {
+      int i, attendee_status, attendee_type;
+      
+      [s appendString: @"<Attendees xmlns=\"Calendar:\">"];
+
+      for (i = 0; i < [attendees count]; i++)
+        {
+          [s appendString: @"<Attendee xmlns=\"Calendar:\">"];
+
+          attendee = [attendees objectAtIndex: i];
+          [s appendFormat: @"<Attendee_Email xmlns=\"Calendar:\">%@</Attendee_Email>", [attendee rfc822Email]];
+          [s appendFormat: @"<Attendee_Name xmlns=\"Calendar:\">%@</Attendee_Name>", [[attendee cn] activeSyncRepresentationInContext: context]];
+          
+          attendee_status = [self _attendeeStatus: attendee];
+            
+          [s appendFormat: @"<Attendee_Status xmlns=\"Calendar:\">%d</Attendee_Status>", attendee_status];
+
+          // FIXME: handle resource
+          if ([[attendee role] caseInsensitiveCompare: @"REQ-PARTICIPANT"] == NSOrderedSame)
+            attendee_type = 1;
+          else
+            attendee_type = 2;
+          
+          [s appendFormat: @"<Attendee_Type xmlns=\"Calendar:\">%d</Attendee_Type>", attendee_type];
+          [s appendString: @"</Attendee>"];
+        }
+      [s appendString: @"</Attendees>"];
+    }
+  
+  // This depends on the 'NEEDS-ACTION' parameter.
+  // This will trigger the SendMail command
+  if ([self userIsAttendee: [context activeUser]])
+    {
+      iCalPerson *attendee;
+      
+      int attendee_status;
+
+      attendee = [self userAsAttendee: [context activeUser]];
+      attendee_status = [self _attendeeStatus: attendee];
+  
+      [s appendFormat: @"<ResponseRequested xmlns=\"Calendar:\">%d</ResponseRequested>", 1];
+      [s appendFormat: @"<ResponseType xmlns=\"Calendar:\">%d</ResponseType>", attendee_status];
+      [s appendFormat: @"<MeetingStatus xmlns=\"Calendar:\">%d</MeetingStatus>", 3];
+      [s appendFormat: @"<DisallowNewTimeProposal xmlns=\"Calendar:\">%d</DisallowNewTimeProposal>", 1];
+      
+      // BusyStatus -- http://msdn.microsoft.com/en-us/library/ee202290(v=exchg.80).aspx
+      [s appendFormat: @"<BusyStatus xmlns=\"Calendar:\">%d</BusyStatus>", 2];
+    }
+
+  // Subject -- http://msdn.microsoft.com/en-us/library/ee157192(v=exchg.80).aspx
+  if ([[self summary] length])
+    [s appendFormat: @"<Subject xmlns=\"Calendar:\">%@</Subject>", [[self summary] activeSyncRepresentationInContext: context]];
+  
+  // Location
+  if ([[self location] length])
+    [s appendFormat: @"<Location xmlns=\"Calendar:\">%@</Location>", [[self location] activeSyncRepresentationInContext: context]];
+  
+  // Importance - NOT SUPPORTED - DO NOT ENABLE
+  //o = [self priority];
+  //if ([o isEqualToString: @"9"])
+  //  v = 0;
+  //else if ([o isEqualToString: @"1"])
+  //  v = 2;
+  //else
+  //  v = 1;
+  //[s appendFormat: @"<Importance xmlns=\"Calendar:\">%d</Importance>", v];
+
+  // UID -- http://msdn.microsoft.com/en-us/library/ee159919(v=exchg.80).aspx
+  if ([[self uid] length])
+    [s appendFormat: @"<UID xmlns=\"Calendar:\">%@</UID>", [self uid]];
+  
+  // Sensitivity
+  if ([[self accessClass] isEqualToString: @"PRIVATE"])
+    v = 2;
+  if ([[self accessClass] isEqualToString: @"CONFIDENTIAL"])
+    v = 3;
+  else
+    v = 0;
+
+  [s appendFormat: @"<Sensitivity xmlns=\"Calendar:\">%d</Sensitivity>", v];
+  
+  // Reminder -- http://msdn.microsoft.com/en-us/library/ee219691(v=exchg.80).aspx
+  // TODO: improve this to handle more alarm types
+  if ([self hasAlarms]) 
+    {
+      iCalAlarm *alarm;
+      
+      alarm = [[self alarms] objectAtIndex: 0];
+      [s appendString: [alarm activeSyncRepresentationInContext: context]];
+    }
+
+  // Recurrence rules
+  if ([self isRecurrent])
+    {
+      [s appendString: [[[self recurrenceRules] lastObject] activeSyncRepresentationInContext: context]];
+    }
+
+  // Comment
+  o = [self comment];
+  if ([o length])
+    {
+      o = [o activeSyncRepresentationInContext: context];
+      [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
+      [s appendFormat: @"<Type>%d</Type>", 1];
+      [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [o length]];
+      [s appendFormat: @"<Truncated>%d</Truncated>", 0];
+      [s appendFormat: @"<Data>%@</Data>", o];
+      [s appendString: @"</Body>"];
+    }
+
+  [s appendFormat: @"<NativeBodyType xmlns=\"AirSyncBase:\">%d</NativeBodyType>", 1];
+
+  return s;
+}
+
+//
+// To understand meeting requests/responses, see:
+//
+// http://blogs.msdn.com/b/exchangedev/archive/2011/07/22/working-with-meeting-requests-in-exchange-activesync.aspx
+// http://blogs.msdn.com/b/exchangedev/archive/2011/07/29/working-with-meeting-responses-in-exchange-activesync.aspx
+//
+//
+// Here is an example of a Sync call when sogo10 accepts an invitation from sogo3:
+//
+// <Change>
+//  <ServerId>2978-52EA9D00-1-A253E70.ics</ServerId>
+//  <ApplicationData>
+//   <TimeZone xmlns="Calendar:">LAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsAAAABAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAACAAIAAAAAAAAAxP///w==</TimeZone>
+//   <AllDayEvent xmlns="Calendar:">0</AllDayEvent>
+//   <StartTime xmlns="Calendar:">20140207T130000Z</StartTime>
+//   <EndTime xmlns="Calendar:">20140207T140000Z</EndTime>
+//   <DTStamp xmlns="Calendar:">20140130T185245Z</DTStamp>
+//   <Subject xmlns="Calendar:">test 8</Subject>
+//   <Sensitivity xmlns="Calendar:">0</Sensitivity>
+//   <Body xmlns="AirSyncBase:">
+//    <Type>1</Type>
+//    <Data/>
+//   </Body>
+//   <Organizer_Email xmlns="Calendar:">sogo3@example.com</Organizer_Email>
+//   <UID xmlns="Calendar:">2978-52EA9D00-1-A253E70</UID>
+//   <Attendees xmlns="Calendar:">
+//    <Attendee>
+//     <Attendee_Name>sogo10</Attendee_Name>
+//     <Attendee_Email>sogo10@example.com</Attendee_Email>
+//     <Attendee_Type>1</Attendee_Type>
+//    </Attendee>
+//   </Attendees>
+//   <BusyStatus xmlns="Calendar:">2</BusyStatus>
+//   <MeetingStatus xmlns="Calendar:">3</MeetingStatus>
+//   <Organizer_Name xmlns="Calendar:">Wolfgang Fritz</Organizer_Name>
+//  </ApplicationData>
+// </Change>
+//
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context
+{
+  iCalDateTime *start, *end;
+  NSTimeZone *userTimeZone;
+  iCalTimeZone *tz;
+  id o;
+
+  NSInteger tzOffset;
+  BOOL isAllDay;
+  
+  if ((o = [theValues objectForKey: @"UID"]))
+    [self setUid: o];
+    
+  // FIXME: merge with iCalToDo
+  if ((o = [theValues objectForKey: @"Subject"]))
+    [self setSummary: o];
+
+  isAllDay = NO;
+  if ([[theValues objectForKey: @"AllDayEvent"] intValue])
+    {
+      isAllDay = YES;
+    }
+
+  //
+  // 0- free, 1- tentative, 2- busy and 3- out of office
+  //
+  if ((o = [theValues objectForKey: @"BusyStatus"]))
+    {
+      [o intValue];
+    }
+
+  //
+  //
+  //
+  if ((o = [theValues objectForKey: @"MeetingStatus"]))
+    {
+      [o intValue];
+    }
+
+  //
+  // 0- normal, 1- personal, 2- private and 3-confidential
+  //
+  if ((o = [theValues objectForKey: @"Sensitivy"]))
+    {
+      switch ([o intValue])
+        {
+        case 2:
+          [self setAccessClass: @"PRIVATE"];
+          break;
+        case 3:
+          [self setAccessClass: @"CONFIDENTIAL"];
+          break;
+        case 0:
+        case 1:
+        default:
+          [self setAccessClass: @"PUBLIC"];
+        }
+    }
+
+  if ((o = [theValues objectForKey: @"TimeZone"]))
+    {
+      // Ugh, we ignore it for now.
+      userTimeZone = [[[context activeUser] userDefaults] timeZone];
+      tz = [iCalTimeZone timeZoneForName: [userTimeZone name]];
+      [(iCalCalendar *) parent addTimeZone: tz];
+    }
+  
+  // FIXME: merge with iCalToDo
+  if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
+    [self setComment: o];
+  
+  if ((o = [theValues objectForKey: @"Location"]))
+    [self setLocation: o];
+
+  if ((o = [theValues objectForKey: @"StartTime"]))
+    {
+      o = [o calendarDate];
+      start = (iCalDateTime *) [self uniqueChildWithTag: @"dtstart"];
+      [start setTimeZone: tz];
+
+      if (isAllDay)
+        {
+          tzOffset = [userTimeZone secondsFromGMTForDate: o];
+          o = [o dateByAddingYears: 0 months: 0 days: 0
+                             hours: 0 minutes: 0
+                           seconds: tzOffset];
+          [start setDate: o];
+          [start setTimeZone: nil];
+        }
+      else
+        {
+          tzOffset = [userTimeZone secondsFromGMTForDate: o];
+          o = [o dateByAddingYears: 0 months: 0 days: 0
+                             hours: 0 minutes: 0
+                           seconds: tzOffset];
+          [start setDateTime: o];
+        }
+    }
+
+  if ((o = [theValues objectForKey: @"EndTime"]))
+    {
+      o = [o calendarDate];
+      end = (iCalDateTime *) [self uniqueChildWithTag: @"dtend"];
+      [end setTimeZone: tz];
+
+      if (isAllDay)
+        {
+          tzOffset = [userTimeZone secondsFromGMTForDate: o];
+          o = [o dateByAddingYears: 0 months: 0 days: 0
+                             hours: 0 minutes: 0
+                           seconds: tzOffset];
+          [end setDate: o];
+          [end setTimeZone: nil];
+        }
+      else
+        {
+          tzOffset = [userTimeZone secondsFromGMTForDate: o];
+          o = [o dateByAddingYears: 0 months: 0 days: 0
+                             hours: 0 minutes: 0
+                           seconds: tzOffset];
+          [end setDateTime: o];
+        }
+    }
+
+  //
+  // If an alarm is deinfed with an action != DISPLAY, we ignore the alarm - don't want to overwrite. 
+  //
+  if ([self hasAlarms] && [[[[self alarms] objectAtIndex: 0] action] caseInsensitiveCompare: @"DISPLAY"] != NSOrderedSame)
+    {
+      // Ignore the alarm for now
+    }
+  else if ((o = [theValues objectForKey: @"Reminder"]))
+    {           
+      // NOTE: Outlook sends a 15 min reminder (18 hour for allday) if no reminder is specified  
+      // although no default reminder is defined (File -> Options -> Clendar -> Calendar Options - > Default Reminders)
+      //
+      // http://answers.microsoft.com/en-us/office/forum/office_2013_release-outlook/desktop-outlook-calendar-creates-entries-with/9aef72d8-81bb-4a32-a6ab-bf7d216fb811?page=5&tm=1395690285088 
+      //
+      iCalAlarm *alarm;
+      
+      alarm = [[iCalAlarm alloc] init];
+      [alarm takeActiveSyncValues: theValues  inContext: context];
+
+      [self removeAllAlarms];
+      [self addToAlarms: alarm];
+      RELEASE(alarm);
+    }
+  else
+    {
+      // We remove existing alarm since no reminder in the ActiveSync payload
+      [self removeAllAlarms];
+    }
+  
+  // Recurrence
+  if ((o = [theValues objectForKey: @"Recurrence"]))
+    {
+      iCalRecurrenceRule *rule;
+      
+      rule = [[iCalRecurrenceRule alloc] init];
+      [self setRecurrenceRules: [NSArray arrayWithObject: rule]];
+      RELEASE(rule);
+      
+      [rule takeActiveSyncValues: o  inContext: context];
+    }
+
+  // Organizer - we don't touch the value unless we're the organizer
+  if ((o = [theValues objectForKey: @"Organizer_Email"]) &&
+      ([self userIsOrganizer: [context activeUser]] || [[context activeUser] hasEmail: o]))
+    {
+      iCalPerson *person;
+      
+      person = [iCalPerson elementWithTag: @"organizer"];
+      [person setEmail: o];
+      [person setCn: [theValues objectForKey: @"Organizer_Name"]];
+      [person setPartStat: @"ACCEPTED"];
+      [self setOrganizer: person];
+    }
+
+  // Attendees - we don't touch the values if we're an attendee. This is gonna
+  // be done automatically by the ActiveSync client when invoking MeetingResponse.
+  if (![self userIsAttendee: [context activeUser]])
+    {
+      if ((o = [theValues objectForKey: @"Attendees"]))
+        {
+          NSMutableArray *attendees;
+          NSDictionary *attendee;
+          iCalPerson *person;
+          int status, i;
+          
+          attendees = [NSMutableArray array];
+          
+          for (i = 0; i < [o count]; i++)
+            {
+              // Each attendee has is a dictionary similar to this:
+              // { "Attendee_Email" = "sogo3@example.com"; "Attendee_Name" = "Wolfgang Fritz"; "Attendee_Status" = 5; "Attendee_Type" = 1; }
+              attendee = [o objectAtIndex: i];
+              
+              person = [iCalPerson elementWithTag: @"attendee"];
+              [person setCn: [attendee objectForKey: @"Attendee_Name"]];
+              [person setEmail: [attendee objectForKey: @"Attendee_Email"]];
+              
+              status = [[attendee objectForKey: @"Attendee_Status"] intValue];
+              
+              switch (status)
+                {
+                case 2:
+                  [person setPartStat: @"TENTATIVE"];
+                  break;
+                case 3:
+                  [person setPartStat: @"ACCEPTED"];
+                  break;
+                case 4:
+                  [person setPartStat: @"DECLINED"];
+                  break;
+                case 0:
+                case 5:
+                default:
+                  [person setPartStat: @"NEEDS-ACTION"];
+                  break;
+                }
+              
+              // FIXME: handle Attendee_Type
+              
+              [attendees addObject: person];
+            }
+          
+          [self setAttendees: attendees];
+        }
+    }
+}
+
+@end

ActiveSync/iCalRecurrenceRule+ActiveSync.h

@@ -0,0 +1,48 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef __ICALRECURRENCERULEACTIVESYNC_H__
+#define __ICALRECURRENCERULEACTIVESYNC_H__
+
+#import <NGCards/iCalRecurrenceRule.h>
+
+@class NSDictionary;
+@class NSString;
+@class WOContext;
+
+@interface iCalRecurrenceRule (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext:(WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif

ActiveSync/iCalRecurrenceRule+ActiveSync.m

@@ -0,0 +1,372 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#import "iCalRecurrenceRule+ActiveSync.h"
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalByDayMask.h>
+
+#import "NSCalendarDate+ActiveSync.h"
+#import "NSDate+ActiveSync.h"
+
+@implementation iCalRecurrenceRule (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSMutableString *s;
+  int type;
+
+  s = [NSMutableString string];
+  
+  [s appendString: @"<Recurrence xmlns=\"Calendar:\">"];
+
+  // 0 -> daily, 1 -> weekly, 2 -> montly, 5 -> yearly
+  type = 0;
+
+  if ([self frequency] == iCalRecurrenceFrequenceDaily)
+    {
+      type = 0;
+
+      // 1 -> sunday, 2 -> monday, 4 -> tuesday, 8 -> wednesday, 16 -> thursday, 32 -> friday, 64 -> saturday, 127 -> last day of month (montly or yearl recurrences only)
+      if ([[self byDayMask] isWeekDays])
+        {
+          [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (2|4|8|16|32)];
+        }
+      else
+        {
+          [s appendFormat: @"<Recurrence_Interval xmlns=\"Calendar:\">%d</Recurrence_Interval>", [self repeatInterval]]; 
+        }
+    }
+  else if ([self frequency] == iCalRecurrenceFrequenceWeekly)
+    {
+      iCalWeekOccurrences *occurrences;
+      int i, v;
+
+      type = 1;
+
+      occurrences = [[self byDayMask] weekDayOccurrences];
+      v = 0;
+
+      if (occurrences)
+        {
+          for (i = 0; i < 7; i++)
+            {
+              if (occurrences[0][i])
+                v += (1 << i);
+            }
+        }
+      else
+        {
+          // No byDayMask, we take the event's start date to compute the DayOfWeek
+          // 0 == Sunday, 6 == Saturday
+          v = (1 << [[[self parent] startDate] dayOfWeek]);
+        }
+
+      [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", v];
+      [s appendFormat: @"<Recurrence_Interval xmlns=\"Calendar:\">%d</Recurrence_Interval>", [self repeatInterval]]; 
+    }
+  else if ([self frequency] == iCalRecurrenceFrequenceMonthly)
+    {
+      if ([[self byDay] length])
+        {
+          int firstOccurrence;
+          iCalByDayMask *dm;
+          
+          type = 3; // recurs monthly on the nth day
+          dm = [self byDayMask];
+          firstOccurrence = [dayMask firstOccurrence];
+
+          // Handle the case for "Last day of the month"
+          if (firstOccurrence < 0)
+            firstOccurrence = 5;
+
+          [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (1 << [dm firstDay])];          
+          [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"Calendar:\">%d</Recurrence_WeekOfMonth>", firstOccurrence];
+        }
+      else if ([[self byMonthDay] count])
+        {
+          NSArray *days;
+          
+          type = 2; // recurs monthly
+          days = [self byMonthDay];
+          if ([days count] > 0 && [[days objectAtIndex: 0] intValue] < 0)
+            {
+              // Last day of the month
+              iCalByDayMask *dm;
+          
+              dm = [self byDayMask];
+              [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (1 << [dm firstDay])];
+              [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"Calendar:\">%d</Recurrence_WeekOfMonth>", 5];
+            }
+          else
+            {
+              // Unsupported rule in ActiveSync/Outlook. Rule that says "Repeat on the 7th and 8th of each month".
+              // FIXME
+            }
+        }
+      else
+        {
+          // Simple reccurrence rule of type "Monthly"
+          type = 2;
+          [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%d</Recurrence_DayOfMonth>",
+             [[[self parent] startDate] dayOfMonth]];
+        }
+    }
+  else if ([self frequency] == iCalRecurrenceFrequenceYearly)
+    {
+      type = 6; // Yearly on the nth day
+      
+      if ([[self flattenedValuesForKey: @"bymonth"] length])
+        {
+          if ([[self byDay] length])
+            {
+              int firstOccurrence;
+              iCalByDayMask *dm;
+              
+              dm = [self byDayMask];
+              firstOccurrence = [dm firstOccurrence];
+              if (firstOccurrence < 0)
+                firstOccurrence = 5;
+              
+              [s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", (1 << [dm firstDay])];
+              [s appendFormat: @"<Recurrence_WeekOfMonth xmlns=\"Calendar:\">%d</Recurrence_WeekOfMonth>", firstOccurrence];
+              [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"Calendar:\">%@</Recurrence_MonthOfYear>",
+                 [self flattenedValuesForKey: @"bymonth"]];
+            }
+          else
+            {
+              type = 5; // Yearly
+              
+              [s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%@</Recurrence_DayOfMonth>",
+                 [self flattenedValuesForKey: @"bymonthday"]];
+              
+              [s appendFormat: @"<Recurrence_MonthOfYear xmlns=\"Calendar:\">%@</Recurrence_MonthOfYear>",
+                 [self flattenedValuesForKey: @"bymonth"]];
+            }
+        }
+      else
+        type = 5;
+    }
+  
+  [s appendFormat: @"<Recurrence_Type xmlns=\"Calendar:\">%d</Recurrence_Type>", type];
+
+  // Occurrences / Until
+  //[s appendFormat: @"<Recurrence_Occurrences xmlns=\"Calendar:\">%d</Recurrence_Occurrences>", 5];
+  if ([self repeatCount])
+    {
+      [s appendFormat: @"<Recurrence_Occurrences xmlns=\"Calendar:\">%@</Recurrence_Occurrences>",
+         [self flattenedValuesForKey: @"count"]];
+    }
+  else if ([self untilDate])
+    {
+      NSCalendarDate *date;
+      
+      date = [self untilDate];
+      //ud = [[context activeUser] userDefaults];
+      //[date setTimeZone: [ud timeZone]];
+      
+      [s appendFormat: @"<Recurrence_Until xmlns=\"Calendar:\">%@</Recurrence_Until>",
+         [date activeSyncRepresentationWithoutSeparatorsInContext: context]];
+    }  
+
+
+  [s appendString: @"</Recurrence>"];
+
+  return s;
+}
+
+//
+//
+//
+- (void) _setByDayFromValues: (NSDictionary *) theValues
+{
+  NSString *day;
+  id o;
+  
+  unsigned int day_of_week;
+  int i, week_of_month;
+  
+  o = [theValues objectForKey: @"Recurrence_DayOfWeek"];
+  
+  // The documentation says WeekOfMonth must be between 1 and 5. The value
+  // 5 means "last week of month"
+  week_of_month = [[theValues objectForKey: @"Recurrence_WeekOfMonth"] intValue];
+  
+  if (week_of_month > 4)
+    week_of_month = -1;
+  
+  // We find the correct day of the week
+  day_of_week = [o intValue];
+  
+  for (i = 0; i < 7; i++)
+    {
+      if ((1<<i) == day_of_week)
+        {
+          day_of_week = i;
+          break;
+        }
+    }
+  
+  day = [self iCalRepresentationForWeekDay: i];
+  
+  [self setSingleValue: [NSString stringWithFormat: @"%d%@",
+                                  week_of_month, day]
+                forKey: @"byday"];
+}
+
+- (void) _setByMonthFromValues: (NSDictionary *) theValues
+{
+  unsigned int month_of_year;
+  
+  month_of_year = [[theValues objectForKey: @"Recurrence_MonthOfYear"] intValue];
+  
+  [self setSingleValue: [NSString stringWithFormat: @"%d", month_of_year]
+                forKey: @"bymonth"];
+}
+
+//
+//
+//
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context
+{
+  id o;
+
+  int recurrenceType;
+
+  recurrenceType = [[theValues objectForKey: @"Recurrence_Type"] intValue];
+
+  if ((o = [theValues objectForKey: @"Recurrence_Interval"]))
+    {
+      [self setRepeatInterval: [o intValue]];
+    }
+  else
+    [self setRepeatInterval: 1];
+  
+  switch (recurrenceType)
+    {                                          
+      //
+      // Daily
+      //
+    case 0:
+      [self setFrequency: iCalRecurrenceFrequenceDaily];
+
+      
+      // Every weekday
+      if ((o = [theValues objectForKey: @"Recurrence_DayOfWeek"]))
+        {
+          [self setByDayMask: [iCalByDayMask byDayMaskWithWeekDays]];
+        }
+      break;
+      //
+      // Weekly
+      //
+    case 1:
+      [self setFrequency: iCalRecurrenceFrequenceWeekly];
+
+      // 42 == Every Monday, Wednesday and Friday, for example 
+      if ((o = [theValues objectForKey: @"Recurrence_DayOfWeek"]))
+        {
+          iCalWeekOccurrences days;
+          unsigned int i, v;
+          
+          memset(days, 0, 7 * sizeof(iCalWeekOccurrence));
+          v = [o intValue];
+          
+          for (i = 0; i < 7; i++)
+            {
+              if (v & (1<<i))
+                days[i] = iCalWeekOccurrenceAll;
+            }
+
+          [self setByDayMask: [iCalByDayMask byDayMaskWithDays: days]];
+        }
+      break;
+      //
+      // Montly
+      //
+    case 2:
+    case 3:
+      [self setFrequency: iCalRecurrenceFrequenceMonthly];
+      
+      // The 5th of every X month(s)
+      if ((o = [theValues objectForKey: @"Recurrence_DayOfMonth"]))
+        {
+          [self setValues: [NSArray arrayWithObject: o]
+                  atIndex: 0 forKey: @"bymonthday"];
+        }
+      // The 3rd Thursay every X month(s)
+      else if ((o = [theValues objectForKey: @"Recurrence_DayOfWeek"]))
+        {
+          [self _setByDayFromValues: theValues];
+        }
+
+      break;
+      //
+      // Yearly
+      //
+    case 5:
+    case 6:
+    default:
+      [self setFrequency: iCalRecurrenceFrequenceYearly];
+
+      // On April 19th 
+      if ((o = [theValues objectForKey: @"Recurrence_DayOfMonth"]))
+        {
+          [self setValues: [NSArray arrayWithObject: o] atIndex: 0
+                   forKey: @"bymonthday"];
+          
+          [self _setByMonthFromValues: theValues];
+        }
+      else
+        {
+          // On the Second Wednesday of April
+          [self _setByDayFromValues: theValues];
+          [self _setByMonthFromValues: theValues];
+        }
+
+      break;
+    }
+
+  if ((o = [theValues objectForKey: @"Recurrence_Occurrences"]))
+    {
+      [self setRepeatCount: [o intValue]];
+    }
+  else if ((o = [theValues objectForKey: @"Recurrence_Until"]))
+    {
+      [self setUntilDate: [o calendarDate]];
+    }
+}
+
+@end

ActiveSync/iCalTimeZone+ActiveSync.h

@@ -0,0 +1,44 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __ICALTIMEZONEACTIVESYNC_H__
+#define __ICALTIMEZONEACTIVESYNC_H__
+
+#import <NGCards/iCalTimeZone.h>
+
+@class NSString;
+@class WOContext;
+
+@interface iCalTimeZone (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+
+@end
+
+#endif

ActiveSync/iCalTimeZone+ActiveSync.m

@@ -0,0 +1,165 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "iCalTimeZone+ActiveSync.h"
+
+#include <Foundation/NSArray.h>
+#include <Foundation/NSCalendarDate.h>
+#include <Foundation/NSData.h>
+#include <Foundation/NSDate.h>
+#include <Foundation/NSString.h>
+
+#import <NGCards/iCalByDayMask.h>
+#import <NGCards/iCalTimeZonePeriod.h>
+#import <NGCards/iCalRecurrenceRule.h>
+
+#import <NGExtensions/NGBase64Coding.h>
+
+#include "NSData+ActiveSync.h"
+
+struct SYSTEMTIME {
+  uint16_t wYear;
+  uint16_t wMonth;
+  uint16_t wDayOfWeek;
+  uint16_t wDay;
+  uint16_t wHour;
+  uint16_t wMinute;
+  uint16_t wSecond;
+  uint16_t wMilliseconds;
+};
+
+@interface iCalTimeZonePeriod (ActiveSync)
+
+- (void) _fillTZDate: (struct SYSTEMTIME *) tzData;
+
+@end
+
+@implementation iCalTimeZonePeriod (ActiveSync)
+
+//
+// FIXME - combine with iCalTimeZone+MAPIStore.m
+//
+- (void) _fillTZDate: (struct SYSTEMTIME *) tzData
+{
+  iCalRecurrenceRule *rrule;
+  NSArray *byMonth;
+  iCalByDayMask *mask;
+  NSCalendarDate *dateValue;
+
+  rrule = [self recurrenceRule];
+  byMonth = [rrule byMonth];
+  if ([byMonth count] > 0)
+    {
+      tzData->wMonth = [[byMonth objectAtIndex: 0] intValue];
+      mask = [rrule byDayMask];
+      tzData->wDayOfWeek = [mask firstDay];
+      tzData->wDay = [mask firstOccurrence];
+
+      dateValue = [self startDate];
+      tzData->wHour = [dateValue hourOfDay];
+      tzData->wMinute = [dateValue minuteOfHour];
+      tzData->wSecond = [dateValue secondOfMinute];
+    }
+}
+
+@end
+
+@implementation iCalTimeZone (ActiveSync)
+
+//
+// FIXME - combine with iCalTimeZone+MAPIStore.m
+//
+- (iCalTimeZonePeriod *) _mostRecentPeriodWithName: (NSString *) periodName
+{
+  NSArray *periods;
+  iCalTimeZonePeriod *period;
+  NSUInteger max;
+
+  periods = [self childrenWithTag: periodName];
+  max = [periods count];
+  if (max > 0)
+    {
+      periods = [periods sortedArrayUsingSelector: @selector (compare:)];
+      period = (iCalTimeZonePeriod *) [periods objectAtIndex: (max - 1)];
+    }
+  else
+    period = nil;
+
+  return period;
+}
+
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  iCalTimeZonePeriod *period;
+  NSMutableData *bytes;
+
+  uint32_t lBias;
+  uint32_t lStandardBias;
+  uint32_t lDaylightBias;
+  //uint16_t wStandardYear;
+  struct SYSTEMTIME stStandardDate;
+  //uint16_t wDaylightYear;
+  struct SYSTEMTIME stDaylightDate;
+
+  char standardName[64], daylightName[64];
+
+  bytes = [NSMutableData data];
+  
+  memset(standardName, 0, 64);
+  memset(daylightName, 0, 64);
+  lStandardBias = 0;
+
+  period = [self _mostRecentPeriodWithName: @"STANDARD"];
+  lBias = -[period secondsOffsetFromGMT] / 60;
+  [period _fillTZDate: &stStandardDate];
+
+  period = [self _mostRecentPeriodWithName: @"DAYLIGHT"];  
+  if (!period)
+    stStandardDate.wMonth = 0;
+
+  lDaylightBias = (uint32_t) -([period secondsOffsetFromGMT] / 60) - lBias;
+  [period _fillTZDate: &stDaylightDate];
+  //wStandardYear = stStandardDate.wYear;
+  //wDaylightYear = stDaylightDate.wYear;
+
+
+  // We build the timezone
+  [bytes appendBytes: &lBias  length: 4];
+  [bytes appendBytes: standardName  length: 64];
+  [bytes appendBytes: &stStandardDate  length: 16];
+  [bytes appendBytes: &lStandardBias  length: 4];
+  [bytes appendBytes: daylightName  length: 64];
+  [bytes appendBytes: &stDaylightDate  length: 16];
+  [bytes appendBytes: &lDaylightBias  length: 4];
+  
+  return [bytes activeSyncRepresentationInContext: context];
+}
+
+@end

ActiveSync/iCalToDo+ActiveSync.h

@@ -0,0 +1,46 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#ifndef __ICALTODOACTIVESYNC_H__
+#define __ICALTODOACTIVESYNC_H__
+
+#import <NGCards/iCalToDo.h>
+
+@class NSString;
+@class WOContext;
+
+@interface iCalToDo (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context;
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context;
+
+@end
+
+#endif

ActiveSync/iCalToDo+ActiveSync.m

@@ -0,0 +1,192 @@
+/*
+
+Copyright (c) 2014, Inverse inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Inverse inc. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+#import "iCalToDo+ActiveSync.h"
+
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+
+#import <NGExtensions/NSString+misc.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
+
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalTimeZone.h>
+
+#include "NSDate+ActiveSync.h"
+#include "NSString+ActiveSync.h"
+
+@implementation iCalToDo (ActiveSync)
+
+- (NSString *) activeSyncRepresentationInContext: (WOContext *) context
+{
+  NSMutableString *s;
+  id o;
+
+  int v;
+
+  s = [NSMutableString string];
+
+  // Complete
+  o = [self completed];
+  [s appendFormat: @"<Complete xmlns=\"Tasks:\">%d</Complete>", (o ? 1 : 0)];
+  
+  // DateCompleted
+  if (o)
+    [s appendFormat: @"<DateCompleted xmlns=\"Tasks:\">%@</DateCompleted>", [o activeSyncRepresentationInContext: context]];
+  
+  // Start date
+  if ((o = [self startDate]))
+    {
+      [s appendFormat: @"<StartDate xmlns=\"Tasks:\">%@</StartDate>", [o activeSyncRepresentationInContext: context]];
+      [s appendFormat: @"<UTCStartDate xmlns=\"Tasks:\">%@</UTCStartDate>", [o activeSyncRepresentationInContext: context]];
+    }
+
+  
+  // Due date
+  if ((o = [self due]))
+    {
+      [s appendFormat: @"<DueDate xmlns=\"Tasks:\">%@</DueDate>", [o activeSyncRepresentationInContext: context]];
+      [s appendFormat: @"<UTCDueDate xmlns=\"Tasks:\">%@</UTCDueDate>", [o activeSyncRepresentationInContext: context]];
+    }
+  
+  // Importance
+  o = [self priority];
+  if ([o isEqualToString: @"9"])
+    v = 0;
+  else if ([o isEqualToString: @"1"])
+    v = 2;
+  else
+    v = 1;
+  [s appendFormat: @"<Importance xmlns=\"Tasks:\">%d</Importance>", v];
+                    
+  // Reminder - FIXME
+  [s appendFormat: @"<ReminderSet xmlns=\"Tasks:\">%d</ReminderSet>", 0];
+  
+  // Sensitivity - FIXME
+  [s appendFormat: @"<Sensitivity xmlns=\"Tasks:\">%d</Sensitivity>", 0];
+  
+  // Subject
+  o = [self summary];
+  if ([o length])
+    [s appendFormat: @"<Subject xmlns=\"Tasks:\">%@</Subject>", [[self summary] activeSyncRepresentationInContext: context]];
+
+  if ((o = [self comment]))
+    {
+      o = [o activeSyncRepresentationInContext: context];
+      [s appendString: @"<Body xmlns=\"AirSyncBase:\">"];
+      [s appendFormat: @"<Type>%d</Type>", 1]; 
+      [s appendFormat: @"<EstimatedDataSize>%d</EstimatedDataSize>", [o length]];
+      [s appendFormat: @"<Truncated>%d</Truncated>", 0];
+      [s appendFormat: @"<Data>%@</Data>", o];
+      [s appendString: @"</Body>"];
+    }
+  
+  return s;
+}
+
+- (void) takeActiveSyncValues: (NSDictionary *) theValues
+                    inContext: (WOContext *) context
+{
+  NSTimeZone *userTimeZone;
+  iCalTimeZone *tz;
+  id o;
+
+  NSInteger tzOffset;
+
+  userTimeZone = [[[context activeUser] userDefaults] timeZone];
+  tz = [iCalTimeZone timeZoneForName: [userTimeZone name]];
+  [(iCalCalendar *) parent addTimeZone: tz];
+  
+  // FIXME: merge with iCalEvent
+  if ((o = [theValues objectForKey: @"Subject"]))
+    [self setSummary: o];
+
+  // FIXME: merge with iCalEvent
+  if ((o = [[theValues objectForKey: @"Body"] objectForKey: @"Data"]))
+    [self setComment: o];
+  
+  
+  if ([[theValues objectForKey: @"Complete"] intValue] &&
+      ((o = [theValues objectForKey: @"DateCompleted"])) )
+    {
+      iCalDateTime *completed;
+      
+      o = [o calendarDate];
+      completed = (iCalDateTime *) [self uniqueChildWithTag: @"completed"];
+      //tzOffset = [[o timeZone] secondsFromGMTForDate: o];
+      //o = [o dateByAddingYears: 0 months: 0 days: 0
+      //                   hours: 0 minutes: 0
+      //                 seconds: -tzOffset];
+      [completed setDate: o];
+      [self setStatus: @"COMPLETED"];
+    }
+
+  if ((o = [theValues objectForKey: @"DueDate"]))
+    {
+      iCalDateTime *due;
+     
+
+      o = [o calendarDate];
+      due = (iCalDateTime *) [self uniqueChildWithTag: @"due"];
+      [due setTimeZone: tz];
+      
+      tzOffset = [userTimeZone secondsFromGMTForDate: o];
+      o = [o dateByAddingYears: 0 months: 0 days: 0
+                         hours: 0 minutes: 0
+                       seconds: tzOffset];
+      [due setDateTime: o];
+    }
+
+  // 2 == high, 1 == normal, 0 == low
+  if ((o = [theValues objectForKey: @"Importance"]))
+    {
+      if ([o intValue] == 2)
+        [self setPriority: @"1"];
+      else if ([o intValue] == 1)
+        [self setPriority: @"5"];
+      else
+        [self setPriority: @"9"];
+    }
+
+
+  if ((o = [theValues objectForKey: @"ReminderTime"]))
+    {
+
+    }
+}
+
+@end

ActiveSync/product.plist

@@ -0,0 +1,3 @@
+{
+  requires = ( MAIN, Appointments, Contacts, Mailer );
+}

Apache/SOGo-apple-ab.conf

@@ -1,4 +1,52 @@
-# use *:8843 for SSL
+#
+#
+#   Keep only one of those vhost definition, comment out the other one
+#
+#
+
+# for https
+# don't forget to add a Listen parameter for port 8843:
+# Listen 8843
+<VirtualHost *:8843>
+  ServerName YOUR.SERVER.NAME
+
+  SSLEngine on
+
+  SSLProtocol -ALL +SSLv3 +TLSv1
+  SSLHonorCipherOrder On
+  SSLCipherSuite HIGH:MEDIUM:!ADH:!aNULL:!eNULL:!NULL
+  SSLCertificateFile    /path/to/your/cert/cert.pem
+  SSLCertificateChainFile /path/to/your/cert/cert-chain-file.pem
+  SSLCertificateKeyFile /path/to/your/key/file.key
+
+  RewriteEngine Off
+  ProxyRequests Off
+  SetEnv proxy-nokeepalive 1
+  ProxyPreserveHost On
+  ProxyPassInterpolateEnv On
+  ProxyPass /principals http://127.0.0.1:20000/SOGo/dav/ interpolate
+  ProxyPass /SOGo http://127.0.0.1:20000/SOGo interpolate
+  ProxyPass / http://127.0.0.1:20000/SOGo/dav/ interpolate
+  <Location />
+    Order allow,deny
+    Allow from all
+  </Location>
+
+  <Proxy http://127.0.0.1:20000>
+    RequestHeader set "x-webobjects-server-port" "8843"
+    RequestHeader set "x-webobjects-server-name" "CHANGETHIS:8843"
+    RequestHeader set "x-webobjects-server-url" "http://CHANGETHIS:8843"
+    RequestHeader set "x-webobjects-server-protocol" "HTTP/1.0"
+    AddDefaultCharset UTF-8
+  </Proxy>
+
+  ErrorLog /var/log/apache2/ab-error.log
+  CustomLog /var/log/apache2/ab-access.log combined
+</VirtualHost>
+
+# plain http
+# Same here, don't forget to add a Listen parameter for port 8800:
+# Listen 8800
 <VirtualHost *:8800>
   RewriteEngine Off
   ProxyRequests Off

Apache/SOGo.conf

@@ -2,8 +2,6 @@ Alias /SOGo.woa/WebServerResources/ \
       /usr/lib/GNUstep/SOGo/WebServerResources/
 Alias /SOGo/WebServerResources/ \
       /usr/lib/GNUstep/SOGo/WebServerResources/
-AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
-           /usr/lib/GNUstep/SOGo/$1.SOGo/Resources/$2
 
 <Directory /usr/lib/GNUstep/SOGo/>
     AllowOverride None
@@ -18,10 +16,6 @@ AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
     </IfModule>
 </Directory>
 
-<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*\.(jpg|png|gif|css|js)">
-  SetHandler default-handler
-</LocationMatch>
-
 ## Uncomment the following to enable proxy-side authentication, you will then
 ## need to set the "SOGoTrustProxyAuthentication" SOGo user default to YES and
 ## adjust the "x-webobjects-remote-user" proxy header in the "Proxy" section
@@ -48,6 +42,14 @@ ProxyPreserveHost On
 
 ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
 
+# Enable to use Microsoft ActiveSync support
+# Note that you MUST have many sogod workers to use ActiveSync.
+# See the SOGo Installation and Configuration guide for more details.
+#
+#ProxyPass /Microsoft-Server-ActiveSync \
+# http://127.0.0.1:20000/SOGo/Microsoft-Server-ActiveSync \
+# retry=60 connectiontimeout=5 timeout=360
+
 <Proxy http://127.0.0.1:20000/SOGo>
 ## adjust the following to your configuration
   RequestHeader set "x-webobjects-server-port" "443"
@@ -66,3 +68,9 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
   Allow from all
 </Proxy>
 
+# For Apple autoconfiguration
+<IfModule rewrite_module>
+  RewriteEngine On
+  RewriteRule ^/.well-known/caldav/?$ /SOGo/dav [R=301]
+</IfModule>
+

Main/SOGo+DAV.m

@@ -1,8 +1,6 @@
 /* SOGo+DAV.m - this file is part of SOGo
  *
- * Copyright (C) 2010 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2010-2013 Inverse inc.
  *
  * 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

Main/SOGo.m

@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2005-2011 Inverse inc.
+  Copyright (C) 2005-2014 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
   This file is part of SOGo

NEWS

@@ -1,16 +1,290 @@
+2.2.5 (2014-06-05)
+------------------
+
+Enhancements
+ - new meta tag to tell IE to use the highest mode available
+ - updated Dutch, Finnish, German, and Polish translations
+
+Bug fixes
+ - avoid crashing when we forward an email with no Subject header
+ - we no longer try to include attachments when replying to a mail
+ - fixed ActiveSync repetitive events issues with "Weekly" and "Monthly" ones 
+ - fixed ActiveSync text/plain parts re-encoding issues for Outlook
+
+2.2.4 (2014-05-29)
+------------------
+
+New features
+ - new print option in Calendar module
+ - now able to save unknown recipient emails to address book on send (#1496)
+
+Enhancements
+ - Sieve folder encoding is now configurable (#2622)
+ - SOGo version is now displayed in preferences window (#2612)
+ - report Sieve error when saving preferences (#1046)
+ - added the SOGoMaximumSyncWindowSize system default to overwrite the
+   maximum number of items returned during an ActiveSync sync operation
+ - updated datepicker
+ - addressbooks properties are now accessible from a popup window
+ - extended events and tasks searches
+ - updated Czech, French, Hungarian, Polish, Russian, Slovak, Spanish (Argentina), and Spanish (Spain) translations
+ - added more sycned contact properties when using ActiveSync (#2775)
+ - now possible to configure the default subscribed resource name using SOGoSubscriptionFolderFormat
+ - now handle server-side folder updates using ActiveSync (#2688)
+ - updated CKEditor to version 4.4.1
+
+Bug fixes
+ - fixed saved HTML content of draft when attaching a file
+ - fixed text nodes of HTML content handler by encoding HTML entities
+ - fixed iCal7 delegation issue with the "inbox" folder (#2489)
+ - fixed birth date validity checks (#1636)
+ - fixed URL handling (#2616)
+ - improved folder rename operations using ActiveSync (#2700)
+ - fixed SmartReply/Forward when ReplaceMime was omitted (#2680)
+ - fixed wrong generation of weekly repetitive events with ActiveSync (#2654)
+ - fixed incorrect XML data conversion with ActiveSync (#2695)
+ - fixed display of events having a category with HTML entities (#2703)
+ - fixed display of images in CSS background (#2437)
+ - fixed limitation of Sieve script size (#2745)
+ - fixed sync-token generation when no change was returned (#2492)
+ - fixed the IMAP copy/move operation between subfolders in different accounts
+ - fixed synchronization of seen/unseen status of msgs in Webmail (#2715)
+ - fixed focus of popup windows open through a contextual menu with Firefox on Windows 7
+ - fixed missing characters in shared folder names over ActiveSync (#2709)
+ - fixed reply and forward mail templates for Brazilian Portuguese (#2738)
+ - fixed newline in signature when forwarding a message as attachment in HTML mode (#2787)
+ - fixed restoration of options (priority & return receipt) when editing a draft (#193)
+ - fixed update of participation status via CalDAV (#2786)
+
+2.2.3 (2014-04-03)
+------------------
+
+Enhancements
+ - updated Dutch, Hungarian, Russian and Spanish (Argentina) translations
+ - initial support for ActiveSync event reminders support (#2681)
+ - updated CKEditor to version 4.3.4
+
+Bug fixes
+ - fixed possible exception when retrieving the default event reminder value on 64bit architectures (#2678)
+ - fixed calling unescapeHTML on null variables to avoid JavaScript exceptions in Contacts module
+ - fixed detection of IMAP flags support on the client side (#2664)
+ - fixed the ActiveSync issue marking all mails as read when downloading them
+ - fixed ActiveSync's move operations not working for multiple selections (#2691)
+ - fixed email validation regexp to allow gTLDs
+ - improved all-day events support for ActiveSync (#2686)
+
+2.2.2 (2014-03-21)
+------------------
+
+Enhancements
+ - updated French, Finnish, German and Spanish (Spain) translations
+ - added sanitization support for Outlook/ActiveSync to circumvent Outlook bugs (#2667)
+ - updated CKEditor to version 4.3.3
+ - updated jQuery File Upload to version 9.5.7
+
+Bug fixes
+ - fixed possible exception when retrieving the default event reminder value on 64bit architectures (#2647, #2648)
+ - disable file paste support in mail editor (#2641)
+ - fixed copying/moving messages to a mail folder begining with a digit (#2658)
+ - fixed unseen count for folders beginning with a digit and used in Sieve filters (#2652)
+ - fixed decoding of HTML entities in reminder alerts (#2659)
+ - fixed check for resource conflict when creating an event in the resource's calendar (#2541)
+ - fixed construction of mail folders tree
+ - fixed parsing of ORG attribute in cards (#2662)
+ - disabled ActiveSync provisioning for now (#2663)
+ - fixed messages move in Outlook which would create duplicates (#2650)
+ - fixed translations for OtherUsersFolderName and SharedFoldersName folders (#2657)
+ - fixed handling of accentuated characters when filtering contacts (#2656)
+ - fixed classification icon of events (#2651)
+ - fixed ActiveSync's SendMail with client version <= 12.1 (#2669)
+
+2.2.1 (2014-03-07)
+------------------
+
+Enhancements
+ - updated Czech, Dutch, Finnish, and Hungarian translations
+ - show current folder name in prompt dialog when renaming a mail folder
+
+Bug fixes
+ - fixed an issue with ActiveSync when the number of messages in the mailbox was greater than the window-size specified by the client
+ - fixed sogo-tool operations on Sieve script (#2617)
+ - fixed unsubscription when renaming an IMAP folder (#2630)
+ - fixed sorting of events list by calendar name (#2629)
+ - fixed wrong date format leading to Android email syncing issues (#2609)
+ - fixed possible exception when retrieving the default event reminder value (#2624)
+ - fixed encoding of mail folder name when creating a subfolder (#2637)
+ - fixed returned date format for email messages in ActiveSync
+ - fixed missing 'name part' in address for email messages in ActiveSync
+ - fixed race condition when syncing huge amount of deleted messages over ActiveSync
+ - fixed encoding of string as CSS identifier when the string starts with a digit
+ - fixed auto-completion popupmenu when UID is a digit
+
+2.2.0 (2014-02-24)
+------------------
+
+New features
+ - initial implementation of Microsoft ActiveSync protocol
+ - it's now possible to set a default reminder for calendar components
+   using SOGoCalendarDefaultReminder
+ - select multiple files to attach to a message or drag'n'drop files onto the
+   mail editor; will also now display progress of uploads
+ - new popup menu to download all attachments of a mail
+ - move & copy messages between different accounts
+ - support for the Sieve 'body' extension (mail filter based on the body content)
+
+Enhancements
+ - we now automatically convert <img src=data...> into file attachments
+   using CIDs to prevent Outlook issues
+ - updated French, Finnish, Polish, German, Russian, and Spanish (Spain) translations
+ - XMLHttpRequest.js is now loaded conditionaly (< IE9)
+ - format time in attendees invitation window according to the user's locale
+ - improved IE11 support
+ - respect signature placement when forwarding a message
+ - respect Sieve server capabilities
+ - encode messages in quoted-printable when content is bigger than 72 bytes
+ - we now use binary encoding in memcached (#2587)
+ - warn user when overbooking a resource by creating an event in its calendar (#2541)
+ - converted JavaScript alerts to inline CSS dialogs in appointment editor
+ - visually identify users with no freebusy information in autocompletion widget of attendees editor (#2565)
+ - respect occurences of recurrent events when deleting selected events (#1950)
+ - improved confirmation dialog box when deleting events and tasks
+ - moved the DN cache to SOGoCache - avoiding sogod restarts after RDN operations
+ - don't use the HTML editor with Internet Explorer 7
+ - add message-id header to appointment notifications (#2535)
+ - detect URLs in popup of events
+ - improved display of a contact (#2350)
+
+Bug fixes
+ - don't load 'background' attribute (#2437)
+ - fixed validation of subscribed folders (#2583)
+ - fixed display of folder names in messages filter editor (#2569)
+ - fixed contextual menu of the current calendar view (#2557)
+ - fixed handling of the '=' character in cards/events/tasks (#2505)
+ - simplify searches in the address book (#2187)
+ - warn user when dnd failed because of a resource conflict (#1613)
+ - respect the maximum number of bookings when viewing the freebusy information of a resource (#2560)
+ - encode HTML entities when forwarding an HTML message inline in plain text composition mode (#2411)
+ - encode HTML entities in JSON data (#2598)
+ - fixed handling of ACLs on shared calendars with multiple groups (#1854)
+ - fixed HTML formatting of appointment notifications for Outlook (#2233)
+ - replace slashes by dashes in filenames of attachments to avoid a 404 return code (#2537)
+ - avoid over-using LDAP connections when decomposing groups
+ - fixed display of a contact's birthday when not defined (#2503)
+ - fixed JavaScript error when switching views in calendar module (#2613)
+
+2.1.1b (2013-12-04)
+-------------------
+
+Enhancements
+ - updated CKEditor to version 4.3.0 and added tab module
+
+Bug fixes
+ - HTML formatting is now retained when forwarding/replying to a mail using the HTML editor
+ - put the text part before the HTML part when composing mail to fix a display issue with Thunderbird (#2512)
+
+2.1.1a (2013-11-22)
+-------------------
+
+Bug fixes
+ - fixed Sieve filters editor (#2504)
+ - moved missing translation to UI/Common (#2499)
+ - fixed potential crasher in OpenChange
+
+2.1.1 (2013-11-19)
+------------------
+
+New features
+ - creation and modification of mail labels
+
+Enhancements
+ - the color picker is no longer a popup window
+
+Bug fixes
+ - fixed utf8 character handling in special folder names
+   Special folder names can now be set as UTF8 or modified UTF7 in sogo.conf
+ - fixed reply-to header not being set for auxiliary IMAP accounts
+ - fixed handling of broken/invalid email addresses
+
+2.1.0 (2013-11-07)
+------------------
+
+Enhancements
+ - improved order of user rights in calendar module (#1431)
+ - increased height of alarm editor when email alarms are enabled
+ - added SMTP AUTH support for sogo-ealarms-notify
+ - added support for LDAP password change against AD/Samba4
+ - added Apache configuration for Apple autoconfiguration (#2248)
+ - the init scripts now start 3 sogod processes by default instead of 1
+ - SOGo now also sends a plain/text parts when sending HTML mails (#2217)
+ - SOGo now listens on 127.0.0.1:20000 by default (instead of *:20000)
+ - SOGo new uses the latest WebDAV sync response type (#1275)
+ - updated CKEditor to version 4.2.2 and added the tables-related modules (#2410)
+ - improved display of vEvents in messages
+
+Bug fixes
+ - fixed handling of an incomplete attachment filename (#2385)
+ - fixed Finnish mail reply/forward templates (#2401)
+ - fixed position of red line of current time (#2373)
+ - fixed crontab error (#2372)
+ - avoid using too many LDAP connections while looping through LDAP results
+ - don't encode HTML entities in mail subject of notification (#2402)
+ - fixed crash of Samba when sending an invitation (#2398)
+ - fixed selection of destination calendar when saving a task or an event (#2353)
+ - fixed "display remote images" preference for message in a popup (#2417)
+ - avoid crash when handling malformed or non-ASCII HTTP credentials (#2358)
+ - fixed crash in DAV free-busy lookups when using SQL addressbooks (#2418)
+ - disabled verbose logging of SMTP sessions by default
+ - fixed high CPU usage when there are no available child processes and added logging when such a condition occurs
+ - fixed memory consumption issues when doing dav lookups with huge result set
+ - fixed S/MIME verification issues with certain OpenSSL versions
+ - worked around an issue with chunked encoding of CAS replies (#2408)
+ - fixed OpenChange corruption issue regarding predecessors change list (#2405)
+ - avoid unnecessary UTF-7 conversions (#2318)
+ - improved RTF parser to fix vCards (#2354)
+ - fixed definition of the COMPLETED attribute of vTODO (#2240)
+ - fixed DAV:resource-id property when sharing calendars (#2399)
+ - fixed reload of multiple external web calendars (#2221)
+ - fixed display of PDF files sent from Thunderbird (#2270)
+ - fixed TLS support for IMAP (#2386)
+ - fixed creation of web calendar when added using sogo-tool (#2007)
+ - avoid crash when parsing HTML tags of a message (#2434)
+ - fixed handling of LDAP groups with no email address (#1328)
+ - fixed encoding of messages with non-ASCII characters (#2459)
+ - fixed compilation with clang 3.2 (#2235)
+ - truncated long fields of quick records to avoid an SQL error (#2461)
+ - fixed IMAP ACLs (#2433)
+ - removed inline JavaScript when viewing HTML messages (#2468)
+
+2.0.7 (2013-07-19)
+------------------
+
+New features
+ - print gridlines of calendar in 15-minute intervals
+ - allow the events/tasks lists to be collapsable
+ 
+Enhancements
+ - bubble box of events no longer overlaps the current event
+ - now pass the x-originating-ip using the IMAP ID extension (#2366)
+ - updated BrazilianPortuguese, Czech, Dutch, German, Polish and Russian translations
+
+Bug fixes
+ - properly handle RFC2231 everywhere
+ - fixed minor XSS issues 
+ - fixed jquery-ui not bluring the active element when clicking on a draggable
+
 2.0.6b (2013-06-27)
 ------------------
 
 Bug fixes
- - Properly escape the foldername to avoid XSS issues
- - Fix loading of MSExchangeFreeBusySOAPResponseMap
+ - properly escape the foldername to avoid XSS issues
+ - fixed loading of MSExchangeFreeBusySOAPResponseMap
 
 2.0.6a (2013-06-25)
 ------------------
 
 Bug fixes
- - Documentation fixes
- - Added missing file for CAS single logout
+ - documentation fixes
+ - added missing file for CAS single logout
 
 2.0.6 (2013-06-21)
 ------------------
@@ -41,8 +315,8 @@ Bug fixes
 ------------------
 
 Bug fixes
- - Fixed an issue when parsing user CN with leading or trailing spaces (#2287)
- - Fixed a crash that occured when saving contacts or tasks via Outlook
+ - fixed an issue when parsing user CN with leading or trailing spaces (#2287)
+ - fixed a crash that occured when saving contacts or tasks via Outlook
 
 2.0.5 (2013-04-11)
 ------------------

OGoContentStore/appointment.ocs

@@ -76,7 +76,7 @@
     },
     {
       columnName = c_participants;
-      sqlType    = "VARCHAR(1000000)";
+      sqlType    = "TEXT";
       allowsNull = YES;
     },
     {
@@ -91,7 +91,7 @@
     },
     {
       columnName = c_cycleinfo;
-      sqlType    = "VARCHAR(1000000)";
+      sqlType    = "TEXT";
       allowsNull = YES;
     },
     {
@@ -126,7 +126,7 @@
     },
     {
       columnName = c_partmails;
-      sqlType    = "VARCHAR(100000)";
+      sqlType    = "TEXT";
       allowsNull = YES;
     },
     {

OpenChange/GNUmakefile

@@ -46,11 +46,8 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	MAPIStoreSamDBUtils.m \
 	MAPIStoreUserContext.m \
 	\
-	SOGoMAPIObject.m \
-	\
-	SOGoMAPIDBObject.m \
 	SOGoMAPIDBMessage.m \
-	SOGoMAPIDBFolder.m \
+	SOGoCacheGCSObject+MAPIStore.m \
 	\
 	MAPIStoreAppointmentWrapper.m \
 	MAPIStoreAttachment.m \
@@ -123,13 +120,6 @@ $(SOGOBACKEND)_OBJC_FILES += \
 	iCalEvent+MAPIStore.m \
 	iCalTimeZone+MAPIStore.m \
 	\
-	GCSSpecialQueries+OpenChange.m\
-	\
-	EOQualifier+MAPI.m \
-	\
-	EOBitmaskQualifier.m \
-	\
-	BSONCodec.m \
 	RTFHandler.m
 
 

OpenChange/GNUmakefile.preamble

@@ -3,3 +3,6 @@ all:: MAPIStorePropertySelectors.m MAPIStorePropertySelectors.h
 MAPIStorePropertySelectors.m MAPIStorePropertySelectors.h: gen-property-selectors.py code-MAPIStorePropertySelectors.m code-MAPIStorePropertySelectors.h
 	@echo " Auto-generating MAPIStorePropertySelectors.[hm]..."
 	@$(PYTHON) ./gen-property-selectors.py -o MAPIStorePropertySelectors $(LIBMAPISTORE_CFLAGS)
+
+distclean clean::
+	-rm -f MAPIStorePropertySelectors.m MAPIStorePropertySelectors.h

OpenChange/MAPIStoreDBBaseContext.m

@@ -1,8 +1,6 @@
 /* MAPIStoreDBBaseContext.m - this file is part of SOGo
  *
- * Copyright (C) 2012 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2012-2014 Inverse inc.
  *
  * 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
@@ -32,7 +30,7 @@
 #import "MAPIStoreDBFolder.h"
 #import "MAPIStoreMapping.h"
 #import "MAPIStoreUserContext.h"
-#import "SOGoMAPIDBFolder.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
 
 #import "MAPIStoreDBBaseContext.h"
 
@@ -60,7 +58,7 @@ static Class MAPIStoreDBFolderK;
 
 - (void) ensureContextFolder
 {
-  SOGoMAPIDBFolder *currentFolder;
+  SOGoCacheGCSFolder *currentFolder;
   NSArray *parts;
   NSMutableArray *folders;
   NSString *folderName;
@@ -78,7 +76,7 @@ static Class MAPIStoreDBFolderK;
       folderName = [parts objectAtIndex: count];
       if ([folderName length] > 0)
         {
-          currentFolder = [SOGoMAPIDBFolder objectWithName: folderName
+          currentFolder = [SOGoCacheGCSFolder objectWithName: folderName
                                                inContainer: currentFolder];
           [folders addObject: currentFolder];
         }
@@ -98,11 +96,11 @@ static Class MAPIStoreDBFolderK;
 
 - (id) rootSOGoFolder
 {
-  SOGoMAPIDBFolder *folder;
+  SOGoCacheGCSFolder *folder;
 
   [userContext ensureFolderTableExists];
 
-  folder = [SOGoMAPIDBFolder objectWithName: [isa MAPIModuleName]
+  folder = [SOGoCacheGCSFolder objectWithName: [isa MAPIModuleName]
                                 inContainer: nil];
   [folder setTableUrl: [userContext folderTableURL]];
   // [folder reloadIfNeeded];

OpenChange/MAPIStoreDBFolder.m

@@ -32,7 +32,7 @@
 #import <EOControl/EOQualifier.h>
 #import <SOGo/SOGoFolder.h>
 #import <SOGo/SOGoUser.h>
-#import "EOQualifier+MAPI.h"
+#import <SOGo/EOQualifier+SOGoCacheObject.h>
 #import "MAPIStoreContext.h"
 #import "MAPIStoreDBFolderTable.h"
 #import "MAPIStoreDBMessage.h"
@@ -40,7 +40,7 @@
 #import "MAPIStoreMapping.h"
 #import "MAPIStoreTypes.h"
 #import "MAPIStoreUserContext.h"
-#import "SOGoMAPIDBFolder.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
 #import "SOGoMAPIDBMessage.h"
 
 #import "MAPIStoreDBFolder.h"
@@ -49,7 +49,7 @@
 #include <mapistore/mapistore.h>
 #include <mapistore/mapistore_errors.h>
 
-static Class EOKeyValueQualifierK, SOGoMAPIDBFolderK, MAPIStoreDBFolderK;
+static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
 
 static NSString *MAPIStoreRightReadItems = @"RightsReadItems";
 static NSString *MAPIStoreRightCreateItems = @"RightsCreateItems";
@@ -66,7 +66,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
 + (void) initialize
 {
   EOKeyValueQualifierK = [EOKeyValueQualifier class];
-  SOGoMAPIDBFolderK = [SOGoMAPIDBFolder class];
+  SOGoCacheGCSFolderK = [SOGoCacheGCSFolder class];
   MAPIStoreDBFolderK = [MAPIStoreDBFolder class];
 }
 
@@ -92,7 +92,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
 {
   enum mapistore_error rc;
   NSString *folderName, *nameInContainer;
-  SOGoMAPIDBFolder *newFolder;
+  SOGoCacheGCSFolder *newFolder;
   struct SPropValue *value;
 
   value = get_SPropValue_SRow (aRow, PidTagDisplayName);
@@ -111,7 +111,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
     {
       nameInContainer = [NSString stringWithFormat: @"0x%.16"PRIx64,
                                   (unsigned long long) newFID];
-      newFolder = [SOGoMAPIDBFolderK objectWithName: nameInContainer
+      newFolder = [SOGoCacheGCSFolderK objectWithName: nameInContainer
                                         inContainer: sogoObject];
       [newFolder reloadIfNeeded];
       [[newFolder properties] setObject: folderName
@@ -181,7 +181,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
                      [SOGoObject globallyUniqueObjectId]];
   fsObject = [SOGoMAPIDBMessage objectWithName: newKey
                                    inContainer: sogoObject];
-  [fsObject setObjectType: MAPIDBObjectTypeMessage];
+  [fsObject setObjectType: MAPIMessageCacheObject];
   [fsObject reloadIfNeeded];
   newMessage = [MAPIStoreDBMessage mapiStoreObjectWithSOGoObject: fsObject
                                                      inContainer: self];
@@ -198,7 +198,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
   ownerUser = [[self userContext] sogoUser];
   if ([[context activeUser] isEqual: ownerUser]
       || [self subscriberCanReadMessages])
-    keys = [(SOGoMAPIDBFolder *) sogoObject childKeysOfType: MAPIDBObjectTypeMessage
+    keys = [(SOGoCacheGCSFolder *) sogoObject childKeysOfType: MAPIMessageCacheObject
                                              includeDeleted: NO
                                           matchingQualifier: qualifier
                                            andSortOrderings: sortOrderings];
@@ -211,7 +211,7 @@ static NSString *MAPIStoreRightFolderContact = @"RightsFolderContact";
 - (NSArray *) folderKeysMatchingQualifier: (EOQualifier *) qualifier
                          andSortOrderings: (NSArray *) sortOrderings
 {
-  return [dbFolder childKeysOfType: MAPIDBObjectTypeFolder
+  return [dbFolder childKeysOfType: MAPIFolderCacheObject
                     includeDeleted: NO
                  matchingQualifier: qualifier
                   andSortOrderings: sortOrderings];

OpenChange/MAPIStoreDBMessage.m

@@ -23,6 +23,7 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 #import <NGExtensions/NSObject+Logs.h>
 
@@ -34,6 +35,7 @@
 #import "MAPIStoreDBMessage.h"
 #import "MAPIStoreTypes.h"
 #import "NSObject+MAPIStore.h"
+#import "NSString+MAPIStore.h"
 
 #undef DEBUG
 #include <mapistore/mapistore.h>
@@ -99,6 +101,21 @@
   return objectVersion;
 }
 
+//
+// FIXME: how this can happen?
+//
+// We might get there if for some reasons, all classes weren't able
+// to tell us the message class.
+//
+- (int) getPidTagMessageClass: (void **) data inMemCtx: (TALLOC_CTX *) memCtx
+{
+  *data = [@"IPM.Note" asUnicodeInMemCtx: memCtx];
+
+  [self logWithFormat: @"METHOD '%s' - unable to determine message class. Falling back to IPM.Note", __FUNCTION__];
+
+  return MAPISTORE_SUCCESS;
+}
+
 - (int) getProperties: (struct mapistore_property_data *) data
              withTags: (enum MAPITAGS *) tags
              andCount: (uint16_t) columnCount

OpenChange/MAPIStoreFallbackContext.m

@@ -1,8 +1,6 @@
 /* MAPIStoreFallbackContext.m - this file is part of SOGo
  *
- * Copyright (C) 2011-2012 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2011-2014 Inverse inc.
  *
  * 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
@@ -26,7 +24,7 @@
 
 #import "MAPIStoreUserContext.h"
 #import "NSString+MAPIStore.h"
-#import "SOGoMAPIDBFolder.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
 
 #import "MAPIStoreFallbackContext.h"
 
@@ -51,7 +49,7 @@
                                                 inMemCtx: (TALLOC_CTX *) memCtx
 {
   struct mapistore_contexts_list *firstContext = NULL, *context;
-  SOGoMAPIDBFolder *root;
+  SOGoCacheGCSFolder *root;
   NSArray *names;
   NSUInteger count, max;
   NSString *baseURL, *url, *name;
@@ -70,7 +68,7 @@
 
   /* Maybe emsmdbp_provisioning should be fixed in order to only take the uri
      returned above to avoid deleting its entries... */
-  root = [SOGoMAPIDBFolder objectWithName: [self MAPIModuleName]
+  root = [SOGoCacheGCSFolder objectWithName: [self MAPIModuleName]
                               inContainer: nil];
   [root setOwner: userName];
   userContext = [MAPIStoreUserContext userContextWithUsername: userName

OpenChange/MAPIStoreFolder.h

@@ -1,8 +1,6 @@
 /* MAPIStoreFolder.h - this file is part of SOGo
  *
- * Copyright (C) 2011-2012 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2011-2014 Inverse inc
  *
  * 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
@@ -38,7 +36,7 @@
 @class MAPIStoreMessageTable;
 @class MAPIStorePermissionsTable;
 @class SOGoFolder;
-@class SOGoMAPIDBFolder;
+@class SOGoCacheGCSFolder;
 @class SOGoMAPIDBMessage;
 
 #import "MAPIStoreSOGoObject.h"
@@ -50,7 +48,7 @@
   // NSArray *faiMessageKeys;
   // NSArray *folderKeys;
 
-  SOGoMAPIDBFolder *dbFolder;
+  SOGoCacheGCSFolder *dbFolder;
   // SOGoMAPIDBFolder *faiFolder;
   // SOGoMAPIDBFolder *propsFolder;
   // SOGoMAPIDBMessage *propsMessage;
@@ -60,7 +58,7 @@
 
 - (void) setupAuxiliaryObjects;
 
-- (SOGoMAPIDBFolder *) dbFolder;
+- (SOGoCacheGCSFolder *) dbFolder;
 
 - (NSArray *) activeMessageTables;
 - (NSArray *) activeFAIMessageTables;

OpenChange/MAPIStoreFolder.m

@@ -1,8 +1,6 @@
 /* MAPIStoreFolder.m - this file is part of SOGo
  *
- * Copyright (C) 2011-2012 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2011-2014 Inverse inc
  *
  * 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
@@ -51,8 +49,9 @@
 #import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
-#import "SOGoMAPIDBFolder.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
 #import "SOGoMAPIDBMessage.h"
+#import "SOGoCacheGCSObject+MAPIStore.h"
 
 #include <gen_ndr/exchange.h>
 
@@ -120,7 +119,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   [userContext ensureFolderTableExists];
 
   ASSIGN (dbFolder,
-          [SOGoMAPIDBFolder objectWithName: folderName
+          [SOGoCacheGCSFolder objectWithName: folderName
                                inContainer: [container dbFolder]]);
   [dbFolder setTableUrl: [userContext folderTableURL]];
   if (!container && [path length] > 0)
@@ -138,7 +137,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   // ASSIGN (propsMessage,
   //         [SOGoMAPIDBMessage objectWithName: @"properties.plist"
   //                               inContainer: dbFolder]);
-  // [propsMessage setObjectType: MAPIDBObjectTypeInternal];
+  // [propsMessage setObjectType: MAPIInternalCacheObject];
   // [propsMessage reloadIfNeeded];
   [properties release];
   properties = [dbFolder properties];
@@ -192,7 +191,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   [super dealloc];
 }
 
-- (SOGoMAPIDBFolder *) dbFolder
+- (SOGoCacheGCSFolder *) dbFolder
 {
   return dbFolder;
 }
@@ -1221,7 +1220,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
 - (NSArray *) faiMessageKeysMatchingQualifier: (EOQualifier *) qualifier
                              andSortOrderings: (NSArray *) sortOrderings
 {
-  return [dbFolder childKeysOfType: MAPIDBObjectTypeFAI
+  return [dbFolder childKeysOfType: MAPIFAICacheObject
                     includeDeleted: NO
                  matchingQualifier: qualifier
                   andSortOrderings: sortOrderings];
@@ -1531,7 +1530,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
   newKey = [NSString stringWithFormat: @"%@.plist",
                      [SOGoObject globallyUniqueObjectId]];
   dbObject = [SOGoMAPIDBMessage objectWithName: newKey inContainer: dbFolder];
-  [dbObject setObjectType: MAPIDBObjectTypeFAI];
+  [dbObject setObjectType: MAPIFAICacheObject];
   [dbObject setIsNew: YES];
   newMessage = [MAPIStoreFAIMessageK mapiStoreObjectWithSOGoObject: dbObject
                                                        inContainer: self];

OpenChange/MAPIStoreGCSBaseContext.m

@@ -122,6 +122,8 @@
   [MAPIApp setUserContext: userContext];
   moduleName = [self MAPIModuleName];
   parentFolder = [[userContext rootFolders] objectForKey: moduleName];
+  nameInContainer = nil;
+
   if (![parentFolder newFolderWithName: folderName
                        nameInContainer: &nameInContainer])
     mapistoreURI = [NSString stringWithFormat: @"sogo://%@@%@/%@/",

OpenChange/MAPIStoreGCSFolder.m

@@ -74,7 +74,7 @@ static Class NSNumberK;
   ASSIGN (versionsMessage,
           [SOGoMAPIDBMessage objectWithName: @"versions.plist"
                                 inContainer: dbFolder]);
-  [versionsMessage setObjectType: MAPIDBObjectTypeInternal];
+  [versionsMessage setObjectType: MAPIInternalCacheObject];
 }
 
 - (void) dealloc
@@ -259,7 +259,6 @@ static Class NSNumberK;
   }
 }
  */
-
 - (void) _setChangeKey: (NSData *) changeKey
        forMessageEntry: (NSMutableDictionary *) messageEntry
       inChangeListOnly: (BOOL) inChangeListOnly
@@ -462,6 +461,9 @@ static Class NSNumberK;
               [messageEntry setObject: changeNumber forKey: @"version"];
 
               newChangeNum = [changeNumber unsignedLongLongValue];
+	      
+	      // A GLOBCNT structure is a 6-byte global namespace counter,
+	      // we strip the first 2 bytes. The first two bytes is the ReplicaId
               changeKey = [self getReplicaKeyFromGlobCnt: newChangeNum >> 16];
               [self _setChangeKey: changeKey forMessageEntry: messageEntry
                  inChangeListOnly: NO];

OpenChange/MAPIStoreMailContext.m

@@ -24,6 +24,7 @@
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
+#import <NGImap4/NSString+Imap4.h>
 #import <NGExtensions/NSString+misc.h>
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailFolder.h>
@@ -156,7 +157,7 @@ MakeDisplayFolderName (NSString *folderName)
       stringData = [NSString stringWithFormat: @"%@%@",
                              urlBase, [currentName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
       context->url = [stringData asUnicodeInMemCtx: context];
-      stringData = [[currentName substringFromIndex: 6] fromCSSIdentifier];
+      stringData = [[[currentName substringFromIndex: 6] fromCSSIdentifier] stringByDecodingImap4FolderName];
       context->name = [stringData asUnicodeInMemCtx: context];
       context->main_folder = false;
       context->role = MAPISTORE_MAIL_ROLE;
@@ -188,7 +189,7 @@ MakeDisplayFolderName (NSString *folderName)
   if ([newFolder create])
     mapistoreURI = [NSString stringWithFormat: @"sogo://%@:%@@mail/%@/",
                              userName, userName,
-                             [folderName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
+                             [[folderName stringByEncodingImap4FolderName] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
   else
     mapistoreURI = nil;
   [MAPIApp setUserContext: nil];

OpenChange/MAPIStoreMailFolder.m

@@ -1,8 +1,6 @@
 /* MAPIStoreMailFolder.m - this file is part of SOGo
  *
- * Copyright (C) 2011-2012 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2011-2013 Inverse inc
  *
  * 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
@@ -36,6 +34,7 @@
 #import <NGExtensions/NSString+misc.h>
 #import <NGImap4/NGImap4Connection.h>
 #import <NGImap4/NGImap4Client.h>
+#import <NGImap4/NSString+Imap4.h>
 #import <Mailer/SOGoDraftsFolder.h>
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailAccounts.h>
@@ -60,7 +59,7 @@
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 #import "SOGoMAPIDBMessage.h"
-#import "SOGoMAPIDBFolder.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
 
 #import "MAPIStoreMailVolatileMessage.h"
 
@@ -107,7 +106,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
   ASSIGN (versionsMessage,
           [SOGoMAPIDBMessage objectWithName: @"versions.plist"
                                 inContainer: dbFolder]);
-  [versionsMessage setObjectType: MAPIDBObjectTypeInternal];
+  [versionsMessage setObjectType: MAPIInternalCacheObject];
 }
 
 - (BOOL) ensureFolderExists
@@ -177,7 +176,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
   if (folderName)
     {
       nameInContainer = [NSString stringWithFormat: @"folder%@",
-                                  [folderName asCSSIdentifier]];
+                                  [[folderName stringByEncodingImap4FolderName] asCSSIdentifier]];
       newFolder = [SOGoMailFolderK objectWithName: nameInContainer
                                       inContainer: sogoObject];
       if ([newFolder create])
@@ -315,7 +314,7 @@ static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
 
   if (![subfolderName hasPrefix: @"folder"])
     abort ();
-  strippedName = [subfolderName substringFromIndex: 6];
+  strippedName = [[subfolderName substringFromIndex: 6] stringByDecodingImap4FolderName];
   [representation appendFormat: @"/%@", strippedName];
 
   return representation;
@@ -1173,9 +1172,9 @@ _parseCOPYUID (NSString *line, NSArray **destUIDsP)
 
 - (MAPIStoreMessage *) createMessage
 {
-  SOGoMAPIObject *childObject;
+  SOGoCacheObject *childObject;
 
-  childObject = [SOGoMAPIObject objectWithName: [SOGoMAPIObject
+  childObject = [SOGoCacheObject objectWithName: [SOGoCacheObject
                                                   globallyUniqueObjectId]
                                    inContainer: sogoObject];
   return [MAPIStoreMailVolatileMessage

OpenChange/MAPIStoreMailVolatileMessage.m

@@ -62,7 +62,7 @@
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
-#import "SOGoMAPIObject.h"
+#import <SOGo/SOGoCacheObject.h>
 
 #import "MAPIStoreMailVolatileMessage.h"
 
@@ -543,6 +543,7 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
   NSDictionary *recipients;
   NSUInteger type, bccLimit;
   SOGoUser *activeUser;
+  NSNumber *priority;
 
   activeUser
     = [SOGoUser
@@ -596,6 +597,21 @@ FillMessageHeadersFromProperties (NGMutableHashMap *headers,
       [headers addObject: [date rfc822DateString] forKey: @"date"];
     }
   [headers addObject: @"1.0" forKey: @"MIME-Version"];
+
+  priority = [mailProperties objectForKey: MAPIPropertyKey (PidTagImportance)];
+  
+  if ([priority intValue] == 2)
+    {
+      [headers addObject: @"1 (Highest)"  forKey: @"X-Priority"];
+    }
+  else if ([priority intValue] == 1)
+    {
+      [headers removeAllObjectsForKey: @"X-Priority"];
+    }
+  else
+    {
+      [headers addObject: @"5 (Lowest)"  forKey: @"X-Priority"];
+    }
 }
 
 static NSArray *

OpenChange/MAPIStoreObject.m

@@ -284,6 +284,9 @@ static Class NSExceptionK, MAPIStoreFolderK;
   return MAPISTORE_SUCCESS;
 }
 
+//
+// The GlobCnt is 6 bytes long.
+//
 - (NSData *) getReplicaKeyFromGlobCnt: (uint64_t) objectCnt
 {
   struct mapistore_connection_info *connInfo;

OpenChange/MAPIStoreTable.m

@@ -25,7 +25,7 @@
 #import <NGExtensions/NSObject+Logs.h>
 #import <EOControl/EOQualifier.h>
 
-#import "EOBitmaskQualifier.h"
+#import <SOGo/EOBitmaskQualifier.h>
 #import "MAPIStoreActiveTables.h"
 #import "MAPIStoreObject.h"
 #import "MAPIStoreTypes.h"

OpenChange/MAPIStoreUserContext.m

@@ -42,7 +42,7 @@
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailAccounts.h>
 
-#import "GCSSpecialQueries+OpenChange.h"
+#import <SOGo/GCSSpecialQueries+SOGoCacheObject.h>
 #import "MAPIApplication.h"
 #import "MAPIStoreAuthenticator.h"
 #import "MAPIStoreMapping.h"
@@ -295,7 +295,7 @@ static NSMapTable *contextsTable = nil;
         {
           /* If "OCSFolderInfoURL" is properly configured, we must have 5
              parts in this url. */
-          ocFSTableName = [NSString stringWithFormat: @"socfs_%@",
+          ocFSTableName = [NSString stringWithFormat: @"sogo_cache_folder_%@",
                                     [username asCSSIdentifier]];
           [parts replaceObjectAtIndex: 4 withObject: ocFSTableName];
           folderTableURL
@@ -329,7 +329,7 @@ static NSMapTable *contextsTable = nil;
                   tableName]])
     {
       queries = [channel specialQueries];
-      query = [queries createOpenChangeFSTableWithName: tableName];
+      query = [queries createSOGoCacheGCSFolderTableWithName: tableName];
       if ([channel evaluateExpressionX: query])
         [NSException raise: @"MAPIStoreIOException"
                     format: @"could not create special table '%@'", tableName];

OpenChange/NSData+MAPIStore.m

@@ -148,6 +148,7 @@ static void _fillFlatUIDWithGUID (struct FlatUID_r *flatUID, const struct GUID *
 - (struct XID *) asXIDInMemCtx: (void *) memCtx
 {
   struct XID *xid;
+  uint8_t *bytes;
   NSUInteger max;
 
   max = [self length];
@@ -158,7 +159,9 @@ static void _fillFlatUIDWithGUID (struct FlatUID_r *flatUID, const struct GUID *
       [self _extractGUID: &xid->GUID];
 
       xid->Size = max - 16;
-      xid->Data = talloc_memdup (xid, [self bytes] + 16, xid->Size);
+
+      bytes = (uint8_t *) [self bytes];
+      xid->Data = talloc_memdup (xid, (bytes+16), xid->Size);
     }
   else
     {

OpenChange/NSObject+PropertyList.m

@@ -1,8 +1,6 @@
 /* dbmsgdump.m - this file is part of SOGo
  *
- * Copyright (C) 2011-2012 Inverse inc
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2011-2014 Inverse inc
  *
  * 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
@@ -33,7 +31,7 @@
 #import <Foundation/NSValue.h>
 #import <NGExtensions/NSNull+misc.h>
 
-#import "BSONCodec.h"
+#import <SOGo/BSONCodec.h>
 
 const char *indentationStep = "  ";
 

OpenChange/RTFHandler.m

@@ -694,10 +694,18 @@ const unsigned short ansicpg874[256] = {
             }
           else if (*(_bytes+1) == '*')
             {
-              while (*_bytes != '}')
+	      int cc = 1;
+	      
+	      do
                 {
+                  if (*_bytes == '{')
+                    cc++;
+                  if (*_bytes == '}')
+                    cc--;
+                  
                   ADVANCE;
                 }
+              while (cc != 0);
 
               continue;
             }
@@ -793,6 +801,10 @@ const unsigned short ansicpg874[256] = {
             {
               // ignore
             }
+         else if ([s hasPrefix: @"fromtext"])
+            {
+              // ignore
+            }
           else if ([s hasPrefix: @"f"] && [s length] > 1)
             {
               RTFFontInfo *fontInfo;

OpenChange/SOGoCacheGCSObject+MAPIStore.h

@@ -0,0 +1,32 @@
+/* SOGoCacheGCSObject+MAPIStore.h - this file is part of SOGo
+ *
+ * Copyright (C) 2014 Inverse inc.
+ *
+ * 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 3, 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.
+ */
+
+#ifndef SOGOCACHEGCSOBJECTMAPISTORE
+#define SOGOCACHEGCSOBJECTMAPISTORE
+
+#include <SOGo/SOGoCacheGCSObject.h>
+
+@interface SOGoCacheGCSObject (MAPIStore)
+
+- (Class) mapistoreMessageClass;
+
+@end
+
+#endif // SOGOCACHEGCSOBJECTMAPISTORE

OpenChange/SOGoCacheGCSObject+MAPIStore.m

@@ -0,0 +1,68 @@
+/* SOGoCacheGCSObject+MAPIStore.m - this file is part of SOGo
+ *
+ * Copyright (C) 2014 Inverse inc.
+ *
+ * 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 3, 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 <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
+
+#include "MAPIStoreTypes.h"
+
+#include "SOGoCacheGCSObject+MAPIStore.h"
+
+@implementation SOGoCacheGCSObject (MAPIStore)
+
+- (Class) mapistoreMessageClass
+{
+  NSString *className, *mapiMsgClass;
+
+  switch (objectType)
+    {
+    case MAPIMessageCacheObject:
+      mapiMsgClass = [properties
+                       objectForKey: MAPIPropertyKey (PidTagMessageClass)];
+      if (mapiMsgClass)
+        {
+          if ([mapiMsgClass isEqualToString: @"IPM.StickyNote"])
+            className = @"MAPIStoreNotesMessage";
+          else
+            className = @"MAPIStoreDBMessage";
+          //[self logWithFormat: @"PidTagMessageClass = '%@', returning '%@'",
+          //      mapiMsgClass, className];
+        }
+      else
+        {
+          //[self warnWithFormat: @"PidTagMessageClass is not set, falling back"
+          //      @" to 'MAPIStoreDBMessage'"];
+          className = @"MAPIStoreDBMessage";
+        }
+      break;
+    case MAPIFAICacheObject:
+      className = @"MAPIStoreFAIMessage";
+      break;
+    default:
+      [NSException raise: @"MAPIStoreIOException"
+                  format: @"message class should not be queried for objects"
+                   @" of type '%d'", objectType];
+    }
+
+  return NSClassFromString (className);
+}
+
+@end

OpenChange/SOGoMAPIDBMessage.h

@@ -1,8 +1,6 @@
 /* SOGoMAPIDBMessage.h - this file is part of SOGo
  *
- * Copyright (C) 2012 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2012-2014 Inverse inc.
  *
  * 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
@@ -23,12 +21,12 @@
 #ifndef SOGOMAPIDBMESSAGE_H
 #define SOGOMAPIDBMESSAGE_H
 
-#import "SOGoMAPIDBObject.h"
+#import <SOGo/SOGoCacheGCSObject.h>
 
 @class NSDate;
 @class NSString;
 
-@interface SOGoMAPIDBMessage : SOGoMAPIDBObject
+@interface SOGoMAPIDBMessage : SOGoCacheGCSObject
 @end
 
 #endif /* SOGOMAPIDBMESSAGE_H */

OpenChange/SOGoMAPIDBMessage.m

@@ -30,7 +30,7 @@
 
 #import <NGExtensions/NSObject+Logs.h>
 
-#import "SOGoMAPIDBFolder.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
 
 #import "SOGoMAPIDBMessage.h"
 

OpenChange/dbmsgreader.m

@@ -34,7 +34,7 @@
 #import <SOGo/SOGoSystemDefaults.h>
 
 #import "MAPIStoreUserContext.h"
-#import "SOGoMAPIDBObject.h"
+#import <SOGo/SOGoCacheGCSObject.h>
 
 #import "NSObject+PropertyList.m"
 

SOPE/GDLContentStore/EOQualifier+GCS.m

@@ -27,7 +27,7 @@
 
 #import "EOQualifier+GCS.h"
 
-#if __GNU_LIBOBJC__ >= 20100911
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
 #  define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
 #endif
 

SOPE/GDLContentStore/GCSFolder.m

@@ -44,7 +44,7 @@
 #import "EOQualifier+GCS.h"
 #import "GCSStringFormatter.h"
 
-#if __GNU_LIBOBJC__ >= 20100911
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
 #  define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
 #endif
 

SOPE/NGCards/NGCardsSaxHandler.m

@@ -35,6 +35,8 @@
      @"http://www.ietf.org/internet-drafts/draft-dawson-vcard-xml-dtd-03.txt"
 #endif
 
+static NSArray *privilegedTagNames = nil;
+
 @implementation NGCardsSaxHandler
 
 - (id) init
@@ -42,6 +44,12 @@
   if ((self = [super init]))
     topGroupClass = nil;
 
+  if (!privilegedTagNames)
+    {
+      privilegedTagNames = [NSArray arrayWithObjects: @"ADR", @"N", @"RRULE", @"ORG", nil];
+      RETAIN(privilegedTagNames);
+    }
+
   return self;
 }
 
@@ -210,8 +218,12 @@
                     length: contentLength];
       free (content);
       content = NULL;
-//       NSLog (@"content: '%@'", s);
-      contentValues = [s vCardSubvalues];
+      //NSLog(@"content: '%@'", s);
+      if ([privilegedTagNames containsObject: [currentElement tag]])
+        contentValues = [s vCardSubvalues];
+      else
+        contentValues = [NSMutableDictionary dictionaryWithObject: [NSMutableArray arrayWithObject: [s asCardAttributeValues]]
+                                                           forKey: @""];
     }
   else
     contentValues = nil;

SOPE/NGCards/iCalToDo.m

@@ -72,7 +72,7 @@
 - (void) setCompleted: (NSCalendarDate *) newCompletedDate
 {
   [(iCalDateTime *) [self uniqueChildWithTag: @"completed"]
-		    setDate: newCompletedDate];
+		    setDateTime: newCompletedDate];
   if (newCompletedDate)
     [self setStatus: @"COMPLETED"];
   else

Scripts/openchange_user_cleanup

@@ -22,7 +22,7 @@ sogoUserDefaultsFile = os.path.expanduser("~sogo/GNUstep/Defaults/.GNUstepDefaul
 #  - removes the entry in samba's ldap tree via ldbedit (NOTYET)
 #  - remove the user's directory under mapistore/ and mapistore/SOGo
 #  - cleanup Junk Folders and Sync Issues imap folders
-#  - Delete the socfs_ table for the username.
+#  - Delete the sogo_cache_folder_ table for the username.
 
 def usage():
     print """
@@ -210,7 +210,7 @@ On RHEL, install it using 'yum install MySQL-python'"""
 
     conn = MySQLdb.connect(host=dbhost, port=int(dbport), user=dbuser, passwd=dbpass, db=dbname)
     c=conn.cursor()
-    tablename="socfs_%s" % (username)
+    tablename="sogo_cache_folder_%s" % (username)
     c.execute("TRUNCATE TABLE %s" % tablename)
     print "Table %s emptied"
 
@@ -225,7 +225,7 @@ On RHEL, install it using 'yum install python-pgsql'"""
         raise Exception(msg)
 
     conn = pg.connect(host=dbhost, port=int(dbport), user=dbuser, passwd=dbpass, dbname=dbname) 
-    tablename = "socfs_%s" % username
+    tablename = "sogo_cache_folder_%s" % username
     conn.query("DELETE FROM %s" % tablename)
     print "Table '%s' emptied" % tablename
 
@@ -278,7 +278,7 @@ def sqlCleanup(username):
     print "Starting SQL cleanup"
     OCSFolderInfoURL = getOCSFolderInfoURL()
     if OCSFolderInfoURL is None:
-        raise Exception("Couldn't fetch OCSFolderInfoURL or it is not set. the socfs_%s table should be truncated manually" % (username))
+        raise Exception("Couldn't fetch OCSFolderInfoURL or it is not set. the sogo_cache_folder_%s table should be truncated manually" % (username))
     
     # postgresql://sogo:sogo@127.0.0.1:5432/sogo/sogo_folder_info
     m = re.search("(.+)://(.+):(.+)@(.+):(\d+)/(.+)/(.+)", OCSFolderInfoURL)

Scripts/sogo-backup.sh

@@ -4,7 +4,7 @@ set -o pipefail
 #set -x
 PROGNAME="$(basename $0)"
 
-BACKUP_DIR=/home/sogo/backups
+BACKUP_DIR=~sogo/backups
 SOGO_TOOL=/usr/sbin/sogo-tool
 DAYS_TO_KEEP="30"
 

Scripts/sogo-default

@@ -1,5 +1,5 @@
-# The amount of processes that should be spawned (Default: 1)
-# PREFORK=1
+# The amount of processes that should be spawned (Default: 3)
+# PREFORK=3
 
 # The name of the account under which SOGo will be running (Default: sogo)
 # USER=sogo

Scripts/sogo-init.d-redhat

@@ -34,7 +34,7 @@ DAEMON=/usr/sbin/sogod
 DESC="SOGo"
 
 USER=$NAME
-PREFORK=1
+PREFORK=3
 
 PIDFILE=/var/run/$NAME/$NAME.pid
 LOGFILE=/var/log/$NAME/$NAME.log

Scripts/sogo-init.d-sles

@@ -37,7 +37,7 @@ DAEMON=/usr/sbin/sogod
 DESC="SOGo"
 
 USER=$NAME
-PREFORK=1
+PREFORK=3
 
 PIDFILE=/var/run/$NAME/$NAME.pid
 LOGFILE=/var/log/$NAME/$NAME.log

Scripts/sogo.conf

@@ -33,8 +33,10 @@
   //SOGoMailSpoolPath = /var/spool/sogo;
   //NGImap4ConnectionStringSeparator = "/";
 
+  /* Notifications */
   //SOGoAppointmentSendEMailNotifications = NO;
   //SOGoACLsSendEMailNotifications = NO;
+  //SOGoFoldersSendEMailNotifications = NO;
 
   /* Authentication */
   //SOGoPasswordChangeEnabled = YES;
@@ -58,13 +60,33 @@
   //  }
   //);
 
+  /* LDAP AD/Samba4 example */
+  //SOGoUserSources = (
+  //  {
+  //    type = ldap;
+  //    CNFieldName = cn;
+  //    UIDFieldName = sAMAccountName;
+  //    baseDN = "CN=users,dc=domain,dc=tld";
+  //    bindDN = "CN=sogo,CN=users,DC=domain,DC=tld";
+  //    bindFields = (sAMAccountName, mail);
+  //    bindPassword = password;
+  //    canAuthenticate = YES;
+  //    displayName = "Public";
+  //    hostname = ldap://127.0.0.1:389;
+  //    filter = "mail = '*'";
+  //    id = directory;
+  //    isAddressBook = YES;
+  //  }
+  //);
+
+
   /* SQL authentication example */
   /*  These database columns MUST be present in the view/table:
    *    c_uid - will be used for authentication -  it's the username or username@domain.tld)
    *    c_name - which can be identical to c_uid -  will be used to uniquely identify entries
    *    c_password - password of the user, plain-text, md5 or sha encoded for now
    *    c_cn - the user's common name - such as "John Doe"
-   *    mail -  the user's mail address 
+   *    mail - the user's mail address
    *  See the installation guide for more details
    */
   //SOGoUserSources =
@@ -84,6 +106,8 @@
   //SOGoVacationEnabled = YES;
   //SOGoForwardEnabled = YES;
   //SOGoSieveScriptsEnabled = YES;
+  //SOGoMailAuxiliaryUserAccountsEnabled = YES;
+  //SOGoTrustProxyAuthentication = NO;
 
   /* General */
   //SOGoLanguage = English;
@@ -92,13 +116,16 @@
   //  PublicDAndTViewer,
   //  ConfidentialDAndTViewer
   //);
-  //SOGoSuperUsernames = (sogo1, sogo2); //This is an array - keep the parens!
+  //SOGoSuperUsernames = (sogo1, sogo2); // This is an array - keep the parens!
+  //SxVMemLimit = 384;
+  //WOPidFile = "/var/run/sogo/sogo.pid";
+  //SOGoMemcachedHost = "/var/run/memcached.sock";
   
   /* Debug */
+  //SOGoDebugRequests = YES;
   //SoDebugBaseURL = YES;
   //ImapDebugEnabled = YES;
   //LDAPDebugEnabled = YES;
-  //SOGoDebugRequests = YES;
   //PGDebugEnabled = YES;
   //MySQL4DebugEnabled = YES;
   //SOGoUIxDebugEnabled = YES;

Scripts/sogo.cron

@@ -10,10 +10,12 @@
 #* * * * *      sogo	/usr/sbin/sogo-tool expire-sessions 60
 
 # Email alarms - runs every minutes
+# If you need to use SMTP AUTH for outgoing mails, specify credentials to use
+# with '-p /path/to/credentialsFile' (same format as the sieve credentials)
 #* * * * *      sogo	/usr/sbin/sogo-ealarms-notify
 
 # Daily backups
-#   - writes to /home/sogo/backups/ by default
+#   - writes to ~sogo/backups/ by default
 #   - will keep 31 days worth of backups by default
 #   - runs once a day by default, but can run more frequently
 #   - make sure to set the path to sogo-backup.sh correctly

Scripts/tmpwatch

@@ -4,4 +4,4 @@
 SOGOSPOOL=/var/spool/sogo
 
 /usr/sbin/tmpwatch 24 "$SOGOSPOOL"
-find "$SOGOSPOOL" -depth -mindepth 1 -type d -empty -exec /bin/rmdir {} \; 2> /dev/null
+find "$SOGOSPOOL" -mindepth 1 -type d -user sogo -empty -delete > /dev/null

Scripts/updates.php

@@ -28,22 +28,22 @@ $plugins
 = array(
         "sogo-connector@inverse.ca"
          => array( "application" => "thunderbird",
-                   "version" => "17.0.3",
-                   "filename" => "sogo-connector-17.0.3.xpi" ),
+                   "version" => "24.0.4",
+                   "filename" => "sogo-connector-24.0.4.xpi" ),
         "sogo-integrator@inverse.ca"
          => array( "application" => "thunderbird",
-                   "version" => "17.0.3",
-                   "filename" => "sogo-integrator-17.0.3.xpi" ),
+                   "version" => "24.0.4",
+                   "filename" => "sogo-integrator-24.0.4.xpi" ),
 	"{e2fda1a4-762b-4020-b5ad-a41df1933103}"
 	=> array( "application" => "thunderbird",
-		   "version" => "1.9",
-		   "filename" => "lightning-1.9.xpi" )
+		   "version" => "2.6.4",
+		   "filename" => "lightning-2.6.4.xpi" )
 );
 
 $applications
 = array( "thunderbird" => "<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-                <em:minVersion>17.0</em:minVersion>
-                <em:maxVersion>17.*</em:maxVersion>" );
+                <em:minVersion>24.0</em:minVersion>
+                <em:maxVersion>24.*</em:maxVersion>" );
 
 $pluginname = $_GET["plugin"];
 $plugin =& $plugins[$pluginname];

SoObjects/Appointments/German.lproj/Localizable.strings

@@ -27,13 +27,13 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
 /* Invitation */
 "Event Invitation: \"%{Summary}\"" = "Termineinladung: \"%{Summary}\"";
 "(sent by %{SentBy}) " = "(gesendet von %{SentBy}) ";
-"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "%{Organizer} %{SentByText} Hat Sie eingeladen zu %{Summary}.\n\nBeginn: %{StartDate}\nEnde: %{EndDate}\nBeschreibung: %{Description}";
+"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "%{Organizer} %{SentByText} Hat Sie eingeladen zu \"%{Summary}\".\n\nBeginn: %{StartDate}\nEnde: %{EndDate}\nBeschreibung: %{Description}";
 "%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText} hat Sie eingeladen zu \"%{Summary}\".\n\nBeginn: %{StartDate} um %{StartTime}\nEnde: %{EndDate} um %{EndTime}\nBeschreibung: %{Description}";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Termin abgesagt: \"%{Summary}\"";
 "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}"
-= "%{Organizer} %{SentByText} hat den folgenden Termin abgesagt: %{Summary}.\n\nBeginn: %{StartDate}\nEnde: %{EndDate}\nBeschreibung: %{Description}";
+= "%{Organizer} %{SentByText} hat den folgenden Termin abgesagt: \"%{Summary}\".\n\nBeginn: %{StartDate}\nEnde: %{EndDate}\nBeschreibung: %{Description}";
 "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
 = "%{Organizer} %{SentByText} hat diesen Termin abgesagt: \"%{Summary}\".\n\nBeginn: %{StartDate} um %{StartTime}\nEnde: %{EndDate} um %{EndTime}\nBeschreibung: %{Description}";
 
@@ -45,7 +45,7 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
 "The following parameters have changed in the \"%{Summary}\" meeting:"
 = "Folgendes wurde am Termin \"%{Summary}\" geändert:";
 "Please accept or decline those changes."
-= "Bitte akzeptieren Sie diese Änderung oder lehnen Sie ab.";
+= "Bitte akzeptieren Sie diese Änderung oder lehnen Sie diese ab.";
 
 /* Reply */
 "Accepted invitation: \"%{Summary}\"" = "Einladung zugestimmt: \"%{Summary}\"";

SoObjects/Appointments/MSExchangeFreeBusy.m

@@ -1,8 +1,6 @@
 /* MSExchangeFreeBusy.m - this file is part of SOGo
  *
- * Copyright (C) 2012 Inverse inc.
- *
- * Author: Francis Lachapelle <flachapelle@inverse.ca>
+ * Copyright (C) 2012-2014 Inverse inc.
  *
  * 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

SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings

@@ -8,23 +8,15 @@ vtodo_class1 = "(Privat oppgave)";
 vtodo_class2 = "(Konfidensiell oppgave)";
 
 /* Receipts */
-"Title:" = "Tittel:";
-"Start:" = "Start:";
-"End:" = "Slutt:";
-
-"Receipt: users invited to a meeting" = "Kvittering: brukere invitert til et møte";
-"You have invited the following attendees(s):" = "Du har invitert følende deltagere:";
-"... to attend the following event:" = "... til å delta i følgende hendelse:";
-
-"Receipt: invitation updated" = "Kvittering: invitasjon oppdatert";
-"The following attendees(s):" = "Følgende deltager(e):";
-"... have been notified of the changes to the following event:" = "... har blitt informert om endringene i følgende hendelse:";
-
-"Receipt: attendees removed from an event" = "Kvittering: deltagere fjernet fra en hendelse";
-"You have removed the following attendees(s):" = "Du har tatt bort følgende deltagere:";
-"... from the following event:" = "... fra følgende hendelse:";
+"The event \"%{Summary}\" was created" = "Hendelsen \"%{Summary}\" ble opprettet";
+"The event \"%{Summary}\" was deleted" = "Hendelsen \"%{Summary}\" ble slettet";
+"The event \"%{Summary}\" was updated" = "Hendelsen \"%{Summary}\" ble oppdatert";
+"The following attendees(s) were notified:" = "Følgende deltaker(e) ble varslet:";
+"The following attendees(s) were added:" = "Følgende deltaker(e) ble lagt til:";
+"The following attendees(s) were removed:" = "Følgende deltaker(e) ble fjernet:";
 
 /* IMIP messages */
+"calendar_label" = "Kalender:";
 "startDate_label" = "Start:";
 "endDate_label" = "Slutt:";
 "due_label" = "Forfallsdato:";
@@ -35,27 +27,31 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 /* Invitation */
 "Event Invitation: \"%{Summary}\"" = "Hendelseinvitasjon: \"%{Summary}\"";
 "(sent by %{SentBy}) " = "(sendt av %{SentBy})";
-"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "";
-"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText} har invitert deg til %{Summary}.\n\nStart: %{StartDate} %{StartTime}\nSlutt: %{EndDate} %{EndTime}\nBeskrivelse: %{Description}";
+"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}" = "%{Organizer} %{SentByText} har invitert deg til %{Summary}.⏎ ⏎ Start: %{StartDate}⏎ Slutt: %{EndDate}⏎ Beskrivelse: %{Description}";
+"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText} har invitert deg til %{Summary}.\n\nStart: %{StartDate} klokken %{StartTime}\nSlutt: %{EndDate} klokken %{EndTime}\nBeskrivelse: %{Description}";
 
 /* Deletion */
 "Event Cancelled: \"%{Summary}\"" = "Hendelse avlyst: \"%{Summary}\"";
 "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate}\nEnd: %{EndDate}\nDescription: %{Description}"
-= "";
+= "%{Organizer} %{SentByText} har avlyst hendelsen: %{Summary}.⏎ ⏎ Start: %{StartDate}⏎ Slutt: %{EndDate}⏎ Beskrivelse: %{Description}";
 "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
-= "%{Organizer} %{SentByText} har avlyst : %{Summary}.\n\nStart: %{StartDate} %{StartTime}\nEnd: %{EndDate} %{EndTime}\nBeskrivelse: %{Description}";
+= "%{Organizer} %{SentByText} har avlyst : %{Summary}.\n\nStart: %{StartDate} klokken %{StartTime}\nEnd: %{EndDate} klokken %{EndTime}\nBeskrivelse: %{Description}";
 
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} has changed"
-= "";
+= "Avtalen \"%{Summary}\", %{OldStartDate} er endret";
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
 = "Avtalen \"%{Summary}\" for %{OldStartDate} klokken %{OldStartTime} er endret.";
 "The following parameters have changed in the \"%{Summary}\" meeting:"
-= "Følgende parametre er endret for \"%{Summary}\" møtet:";
+= "Følgende parametre er endret for \"%{Summary}\"-møtet:";
 "Please accept or decline those changes."
 = "Vennligst godta eller avvis endringene.";
 
 /* Reply */
+"Accepted invitation: \"%{Summary}\"" = "Aksepterte invitasjonen: \"%{Summary}\"";
+"Declined invitation: \"%{Summary}\"" = "Avviste invitasjonen: \"%{Summary}\"";
+"Delegated invitation: \"%{Summary}\"" = "Delegerte invitasjonen: \"%{Summary}\"";
+"Not yet decided on invitation: \"%{Summary}\"" = "Fortsatt ikke svart på invitasjonen: \"%{Summary}";
 "%{Attendee} %{SentByText}has accepted your event invitation."
 = "%{Attendee} %{SentByText} har godtatt invitasjonen.";
 "%{Attendee} %{SentByText}has declined your event invitation."
@@ -63,7 +59,8 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}."
 = "%{Attendee} %{SentByText} har delegert invitasjonen til %{Delegate}.";
 "%{Attendee} %{SentByText}has not yet decided upon your event invitation."
-= "%{Attendee} %{SentByText} had ends ikke var på invitasjonen.";
+= "%{Attendee} %{SentByText} har ikke svart på invitasjonen.";
 
 /* Resources */
-"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maksimalt antall samtidige bookinger  (%{NumberOfSimultaneousBookings}) er nåd for ressurs \"%{Cn} %{SystemEmail}\".";
+"Cannot access resource: \"%{Cn} %{SystemEmail}\"" = "Kan ikke få tilgang til ressurs: \"%{Cn} %{SystemEmail}\"";
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "Maksimum antall samtidige reservasjoner (%{NumberOfSimultaneousBookings}) er nådd for ressursen \"%{Cn} %{SystemEmail}\". Kolliderende hendelse er \"%{EventTitle}\", som starter %{StartDate}.";

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007-2013 Inverse inc.
+  Copyright (C) 2007-2014 Inverse inc.
   Copyright (C) 2004-2005 SKYRIX Software AG
 
   This file is part of SOGo.
@@ -573,17 +573,27 @@ static iCalEvent *iCalEventK = nil;
     }
   grantedCount = [grantedClasses count];
   if (grantedCount == 3)
-    filter = @"";
+    {
+      // User have access to all three classifications
+      filter = @"";
+    }
   else if (grantedCount == 2)
-    filter
-      = [NSString stringWithFormat: @"c_classification != %@",
-                  [deniedClasses objectAtIndex: 0]];
+    {
+      // User has access to all but one of the classifications
+      filter = [NSString stringWithFormat: @"c_classification != %@",
+                         [deniedClasses objectAtIndex: 0]];
+    }
   else if (grantedCount == 1)
-    filter
-      = [NSString stringWithFormat: @"c_classification = %@",
-                  [grantedClasses objectAtIndex: 0]];
+    {
+      // User has access to only one classification
+      filter = [NSString stringWithFormat: @"c_classification = %@",
+                         [grantedClasses objectAtIndex: 0]];
+    }
   else
-    filter = nil;
+    {
+      // User has access to no classification
+      filter = nil;
+    }
 
   return filter;
 }
@@ -676,7 +686,6 @@ static iCalEvent *iCalEventK = nil;
         qualifier = nil;
 
       /* fetch non-recurrent apts first */
-
       records = [folder fetchFields: fields matchingQualifier: qualifier];
     }
   else
@@ -871,7 +880,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 {
   NSCalendarDate *recurrenceId;
   NSMutableDictionary *newRecord;
-  NSDictionary *oldRecord;
   NGCalendarDateRange *newRecordRange;
   NSComparisonResult compare;
   int recordIndex, secondsOffsetFromGMT;
@@ -1272,13 +1280,20 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
         [baseWhere addObject: privacySQLString];
 
       if ([title length])
-        [baseWhere
-          addObject: [NSString stringWithFormat: @"c_title isCaseInsensitiveLike: '%%%@%%'",
+        if ([filters length])
+        {
+          if ([filters isEqualToString:@"title_Category_Location"] || [filters isEqualToString:@"entireContent"])
+          {
+            [baseWhere addObject: [NSString stringWithFormat: @"(c_title isCaseInsensitiveLike: '%%%@%%' OR c_category isCaseInsensitiveLike: '%%%@%%' OR c_location isCaseInsensitiveLike: '%%%@%%')",
+                                   [title stringByReplacingString: @"'"  withString: @"\\'\\'"],
+                                   [title stringByReplacingString: @"'"  withString: @"\\'\\'"],
+                                   [title stringByReplacingString: @"'"  withString: @"\\'\\'"]]];
+          }
+        }
+      else
+        [baseWhere addObject: [NSString stringWithFormat: @"c_title isCaseInsensitiveLike: '%%%@%%'",
                                [title stringByReplacingString: @"'"  withString: @"\\'\\'"]]];
 
-      if ([filters length])
-        [baseWhere addObject: [NSString stringWithFormat: @"(%@)", filters]];
-
       /* prepare mandatory fields */
 
       fields = [NSMutableArray arrayWithArray: _fields];
@@ -2236,10 +2251,39 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   return @"";
 }
 
+/*
+  RFC5842 states:
+
+  3.1.  DAV:resource-id Property
+
+   The DAV:resource-id property is a REQUIRED property that enables
+   clients to determine whether two bindings are to the same resource.
+   The value of DAV:resource-id is a URI, and may use any registered URI
+   scheme that guarantees the uniqueness of the value across all
+   resources for all time (e.g., the urn:uuid: URN namespace defined in
+   [RFC4122] or the opaquelocktoken: URI scheme defined in [RFC4918]).
+
+   <!ELEMENT resource-id (href)>
+
+   ...
+
+   so we must STRIP any username prefix, to make the ID global.
+   
+*/
 - (NSString *) davResourceId
 {
+  NSString *name, *prefix;
+
+  prefix = [NSString stringWithFormat: @"%@_", [self ownerInContext: context]];
+  name = [self nameInContainer];
+  
+  if ([name hasPrefix: prefix])
+    {
+      name = [name substringFromIndex: [prefix length]];
+    }
+  
   return [NSString stringWithFormat: @"urn:uuid:%@:calendars:%@",
-                   [self ownerInContext: context], [self nameInContainer]];
+                   [self ownerInContext: context], name];
 }
 
 - (NSArray *) davScheduleCalendarTransparency
@@ -2504,7 +2548,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   unsigned int permStrIndex;
 
   [super initializeQuickTablesAclsInContext: localContext];
-  /* We assume "userIsOwner" will be set after calling the super method. */
+  /* We assume "userCanAccessAllObjects" will be set after calling the super method. */
   if (!userCanAccessAllObjects)
     {
       login = [[localContext activeUser] login];
@@ -3094,6 +3138,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 {
   NSMutableArray *aclsForUser;
   NSArray *superAcls;
+  static NSArray *rolesClassifications = nil;
 
   superAcls = [super aclsForUser: uid forObjectAtPath: objectPathArray];
   if ([uid isEqualToString: [self defaultUserID]])
@@ -3108,14 +3153,52 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
       [aclsForUser addObject: SoRole_Authenticated];
     }
   else
-    aclsForUser = (NSMutableArray *) superAcls;
+    {
+      aclsForUser = [NSMutableArray array];
+      if (!rolesClassifications)
+        {
+          rolesClassifications =
+            [NSArray arrayWithObjects:
+                     [NSArray arrayWithObjects:
+                              SOGoCalendarRole_PublicModifier,
+                              SOGoCalendarRole_PublicResponder,
+                              SOGoCalendarRole_PublicViewer,
+                              SOGoCalendarRole_PublicDAndTViewer,
+                              nil],
+                     [NSArray arrayWithObjects:
+                              SOGoCalendarRole_ConfidentialModifier,
+                              SOGoCalendarRole_ConfidentialResponder,
+                              SOGoCalendarRole_ConfidentialViewer,
+                              SOGoCalendarRole_ConfidentialDAndTViewer,
+                              nil],
+                     [NSArray arrayWithObjects:
+                              SOGoCalendarRole_PrivateModifier,
+                              SOGoCalendarRole_PrivateResponder,
+                              SOGoCalendarRole_PrivateViewer,
+                              SOGoCalendarRole_PrivateDAndTViewer,
+                              nil],
+                     [NSArray arrayWithObject: SOGoRole_ObjectCreator],
+                     [NSArray arrayWithObject: SOGoRole_ObjectEraser],
+                     nil];
+          [rolesClassifications retain];
+        }
+      // When a user is a member of many groups for which there are access rights, multiple access rights
+      // can be returned for each classification. In this case, we only keep the highest access right.
+      int i, count = [rolesClassifications count];
+      NSString *role;
+      for (i = 0; i < count; i++)
+        {
+          role = [[rolesClassifications objectAtIndex: i] firstObjectCommonWithArray: superAcls];
+          if (role)
+            [aclsForUser addObject: role];
+        }
+    }
 
   return aclsForUser;
 }
 
 /* caldav-proxy */
-- (SOGoAppointmentProxyPermission)
-     proxyPermissionForUserWithLogin: (NSString *) login
+- (SOGoAppointmentProxyPermission) proxyPermissionForUserWithLogin: (NSString *) login
 {
   SOGoAppointmentProxyPermission permission;
   NSArray *roles;

SoObjects/Appointments/SOGoAppointmentFolders.h

@@ -1,8 +1,6 @@
 /* SOGoAppointmentFolders.h - this file is part of SOGo
  *
- * Copyright (C) 2007 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2007-2013 Inverse inc.
  *
  * 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
@@ -35,8 +33,8 @@
   NSMutableArray *folderObjectKeys;
 }
 
-- (SOGoWebAppointmentFolder *) newWebCalendarWithName: (NSString *) folderDisplayName
-                                                atURL: (NSString *) url;
+- (SOGoWebAppointmentFolder *) newWebCalendarWithURL: (NSString *) urlString
+				     nameInContainer: (NSString *) name;
 
 - (void) reloadWebCalendars: (BOOL) forceReload;