From 7241e3e30e8ffdc9a03c6709783d0f800a754a75 Mon Sep 17 00:00:00 2001
From: Jean Raby <jraby@inverse.ca>
Date: Thu, 12 Sep 2013 10:14:47 -0400
Subject: [PATCH 1/8] Added rewrite rule for apple autoconfiguration url

Rewrite rules are no inherited by virtualhosts when they are declared in conf.d
This means that you'll have to explicitly include SOGo.conf from 000-default
on debian/ubuntu for this redirection to work properly.
---
 Apache/SOGo.conf | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Apache/SOGo.conf b/Apache/SOGo.conf
index 853b5ae0e..e065c3240 100644
--- a/Apache/SOGo.conf
+++ b/Apache/SOGo.conf
@@ -66,3 +66,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>
+

From 24c0fb1cc458b54bdc7f40bb3b0efdc8f15e0300 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 12 Sep 2013 16:24:14 -0400
Subject: [PATCH 2/8] Fix change listener on calendar list select input

Fixes #2353
---
 UI/WebServerResources/UIxComponentEditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index 09b040c7c..bee362407 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -192,7 +192,7 @@ function onComponentEditorLoad(event) {
     initializeClassificationMenu();
     var list = $("calendarList");
     if (list) {
-        list.on("change", onChangeCalendar, false);
+        list.on("change", onChangeCalendar);
         list.fire("mousedown");
     }
     

From 72a4b075d6201baa438462937420fcef4c677f23 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 12 Sep 2013 17:08:02 -0400
Subject: [PATCH 3/8] Mail popup: respect "remote inline images" prefs

Fixes #2417
---
 UI/Templates/MailerUI/UIxMailPopupView.wox | 1 +
 UI/WebServerResources/UIxMailPopupView.js  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/UI/Templates/MailerUI/UIxMailPopupView.wox b/UI/Templates/MailerUI/UIxMailPopupView.wox
index 1b77d6622..1ae438566 100644
--- a/UI/Templates/MailerUI/UIxMailPopupView.wox
+++ b/UI/Templates/MailerUI/UIxMailPopupView.wox
@@ -7,6 +7,7 @@
     className="UIxPageFrame"
     title="title"
     const:jsFiles="SOGoAutoCompletion.js"
+    const:userDefaultsKeys="SOGoMailDisplayRemoteInlineImages"
     const:popup="YES">
   <script type="text/javascript">
     var messageName = '<var:string value="clientObject.relativeImap4Name"/>';
diff --git a/UI/WebServerResources/UIxMailPopupView.js b/UI/WebServerResources/UIxMailPopupView.js
index d92fc0bf3..e5b619375 100644
--- a/UI/WebServerResources/UIxMailPopupView.js
+++ b/UI/WebServerResources/UIxMailPopupView.js
@@ -13,6 +13,9 @@ function initPopupMailer(event) {
     configureLoadImagesButton();
     configureSignatureFlagImage();
 
+    if (UserDefaults["SOGoMailDisplayRemoteInlineImages"] == 'always')
+        loadRemoteImages();
+
     window.messageUID = mailboxName + "/" + messageName;
 
     handleReturnReceipt();

From 3c6c90d4346ce19e3245466d22ee3f659c1ac8e9 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 13 Sep 2013 09:33:28 -0400
Subject: [PATCH 4/8] Reload webmail when changing "remote images" pref

---
 UI/WebServerResources/UIxPreferences.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index 7c902f6e5..ffbe2ec1e 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -115,7 +115,7 @@ function prototypeIfyFilters() {
 function _setupEvents() {
     var widgets = [ "timezone", "shortDateFormat", "longDateFormat",
                     "timeFormat", "weekStartDay", "dayStartTime", "dayEndTime",
-                    "firstWeek", "messageCheck", "sortByThreads",
+                    "firstWeek", "messageCheck", "sortByThreads", "displayRemoteInlineImages",
                     "subscribedFoldersOnly", "language", "defaultCalendar",
                     "enableVacation" ];
     for (var i = 0; i < widgets.length; i++) {

From 0c38a9e5551c39a0483192bfc4f5cb6511261fae Mon Sep 17 00:00:00 2001
From: Jean Raby <jraby@inverse.ca>
Date: Fri, 13 Sep 2013 11:13:02 -0400
Subject: [PATCH 5/8] whitespace tabkill

---
 SoObjects/Contacts/SOGoFolder+CardDAV.m | 28 ++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m
index 3466e940e..ab6bee2da 100644
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.m
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m
@@ -65,7 +65,7 @@
                         @"<D:href>"];
       [r appendContentString: baseURL];
       if (![baseURL hasSuffix: @"/"])
-	[r appendContentString: @"/"];
+        [r appendContentString: @"/"];
       [r appendContentString: name];
       [r appendContentString: @"</D:href>"
                         @"<D:propstat>"
@@ -89,7 +89,7 @@
 
 - (void) _appendComponentsMatchingFilters: (NSArray *) filters
                                toResponse: (WOResponse *) response
-				  context: (id) localContext
+                                  context: (id) localContext
 {
   unsigned int count, max;
   NSDictionary *currentFilter, *contact;
@@ -123,10 +123,10 @@
   newString = [theString lowercaseString];
 
   return ([newString isEqualToString: @"sn"]
-	  || [newString isEqualToString: @"givenname"]
-	  || [newString isEqualToString: @"email"]
-	  || [newString isEqualToString: @"mail"]
-	  || [newString isEqualToString: @"telephonenumber"]);
+          || [newString isEqualToString: @"givenname"]
+          || [newString isEqualToString: @"email"]
+          || [newString isEqualToString: @"mail"]
+          || [newString isEqualToString: @"telephonenumber"]);
 }
 
 - (NSDictionary *) _parseContactFilter: (id <DOMElement>) filterElement
@@ -145,12 +145,12 @@
       ranges = [filterElement getElementsByTagName: @"text-match"];
 
       if ([(NSArray *) ranges count]
-	  && [(NSArray *) [[ranges objectAtIndex: 0] childNodes] count])
-	{
-	  filterData = [NSMutableDictionary dictionary];
-	  [filterData setObject: [(NGDOMNode *)[ranges objectAtIndex: 0] textValue]
-			 forKey: [filterElement attribute: @"name"]];
-	}
+          && [(NSArray *) [[ranges objectAtIndex: 0] childNodes] count])
+        {
+          filterData = [NSMutableDictionary dictionary];
+          [filterData setObject: [(NGDOMNode *)[ranges objectAtIndex: 0] textValue]
+            forKey: [filterElement attribute: @"name"]];
+        }
     }
 
   return filterData;
@@ -166,7 +166,7 @@
   filters = [NSMutableArray array];
 
   children = [(NSArray *)[parentNode getElementsByTagName: @"prop-filter"]
-			 objectEnumerator];
+               objectEnumerator];
   while ((node = [children nextObject]))
     {
       filter = [self _parseContactFilter: node];
@@ -193,7 +193,7 @@
 
   [self _appendComponentsMatchingFilters: filters
         toResponse: r
-	context: queryContext];
+           context: queryContext];
   [r appendContentString: @"</D:multistatus>"];
 
   return r;

From de8bf64c70ca5f0b3cc9741d2bb933c0aef1e833 Mon Sep 17 00:00:00 2001
From: Jean Raby <jraby@inverse.ca>
Date: Fri, 13 Sep 2013 11:16:28 -0400
Subject: [PATCH 6/8] Local pool when appending contacts to response

Avoids using too much memory when doing a contact lookup with many matches
---
 SoObjects/Contacts/SOGoFolder+CardDAV.m | 33 +++++++++++++++++--------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m
index ab6bee2da..2644e228f 100644
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.m
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m
@@ -21,6 +21,7 @@
  */
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 
@@ -91,7 +92,8 @@
                                toResponse: (WOResponse *) response
                                   context: (id) localContext
 {
-  unsigned int count, max;
+  unsigned int count,i , max;
+  NSAutoreleasePool *pool;
   NSDictionary *currentFilter, *contact;
   NSEnumerator *contacts;
   NSString *baseURL, *domain;
@@ -103,16 +105,27 @@
   for (count = 0; count < max; count++)
     {
       currentFilter = [filters objectAtIndex: count];
-      contacts = [[(id<SOGoContactFolder>)self lookupContactsWithFilter: [[currentFilter allValues] lastObject]
-                                                             onCriteria: @"name_or_address"
-                                                                 sortBy: @"c_givenname"
-                                                               ordering: NSOrderedDescending
-                                                               inDomain: domain]
-		   objectEnumerator];
-      
+      contacts =
+        [[(id<SOGoContactFolder>)self lookupContactsWithFilter: [[currentFilter allValues] lastObject]
+                                                    onCriteria: @"name_or_address"
+                                                        sortBy: @"c_givenname"
+                                                      ordering: NSOrderedDescending
+                                                      inDomain: domain] objectEnumerator];
+
+      pool = [[NSAutoreleasePool alloc] init];
+      i = 0;
       while ((contact = [contacts nextObject]))
-	[self _appendObject: contact withBaseURL: baseURL
-           toREPORTResponse: response];
+        {
+          [self _appendObject: contact withBaseURL: baseURL
+            toREPORTResponse: response];
+          if (i % 10 == 0)
+            {
+              RELEASE(pool);
+              pool = [[NSAutoreleasePool alloc] init];
+            }
+          i++;
+        }
+      RELEASE(pool);
     }
 }
 

From 906985c1f3ea9ee59a346a153d2f570aad684b80 Mon Sep 17 00:00:00 2001
From: Jean Raby <jraby@inverse.ca>
Date: Fri, 13 Sep 2013 11:19:44 -0400
Subject: [PATCH 7/8] Call MSExchangeHostname on SOGoDNSource only

Fixes #2418
---
 SoObjects/Appointments/SOGoFreeBusyObject.m | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index 13622ae4f..18f08e10b 100644
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -294,7 +294,9 @@
           contact = [contacts lastObject];
           email = [contact valueForKey: @"c_email"];
           source = [contact objectForKey: @"source"];
-          if ([email length] && [source MSExchangeHostname])
+          if ([email length]
+              && [source conformsToProtocol: @protocol (SOGoDNSource)]
+              && [source MSExchangeHostname])
             {
               exchangeFreeBusy = [[MSExchangeFreeBusy alloc] init];
               [exchangeFreeBusy autorelease];

From ca4d89fb086a52fa57d3b0f6ff784258bdef79c7 Mon Sep 17 00:00:00 2001
From: Jean Raby <jraby@inverse.ca>
Date: Fri, 13 Sep 2013 11:24:16 -0400
Subject: [PATCH 8/8] update with latest fixes

---
 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index 550acb8cb..aa6aa5119 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ Bug fixes
  - fixed position of red line of current time
  - disabled verbose logging of smtp sessions by default
  - fixed high CPU usage when there are no available child processes
+ - fixed crash in dav f/b lookups when using SQL addressbooks (#2418)
+ - fixed memory consumption issues when doing dav lookups with huge result set
 
 2.0.7 (2013-07-19)
 ------------------