fix(addressbook): Removed SOGoGlobalAddressBookFirstEntries (use listRequiresDot instead) and move SOGoGlobalAddressBookFirstEntriesCount to globalAddressBookFirstEntriesCount in source scope. This fixed the broken listRequiresDot in 5.10

SoObjects/SOGo/LDAPSource.h

@@ -64,6 +64,7 @@
   NSArray *_bindFields;
 
   BOOL _listRequiresDot;
+  int _globalAddressBookFirstEntriesCount;
 
   NSString *_domain;
   NSString *_contactInfoAttribute;

SoObjects/SOGo/LDAPSource.m

@@ -106,6 +106,7 @@ static Class NSStringK;
       _filter = nil;
       _userPasswordAlgorithm = nil;
       _listRequiresDot = YES;
+      _globalAddressBookFirstEntriesCount = -1;
 
       _passwordPolicy = NO;
       _updateSambaNTLMPasswords = NO;
@@ -200,10 +201,15 @@ static Class NSStringK;
             andMultipleBookingsField: [udSource objectForKey: @"MultipleBookingsFieldName"]];
 
       dotValue = [udSource objectForKey: @"listRequiresDot"];
-      if (dotValue)
+      if (dotValue) {
         [self setListRequiresDot: [dotValue boolValue]];
+        if ([udSource objectForKey: @"globalAddressBookFirstEntriesCount"])
+          [self setGlobalAddressBookFirstEntriesCount: [[udSource objectForKey: @"globalAddressBookFirstEntriesCount"] intValue]];
+      }
+
       [self setContactMapping: [udSource objectForKey: @"mapping"]
              andObjectClasses: [udSource objectForKey: @"objectClasses"]];
+             
 
       [self setModifiers: [udSource objectForKey: @"modifiers"]];
       ASSIGN(_abOU, [udSource objectForKey: @"abOU"]);
@@ -400,6 +406,16 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
   return _listRequiresDot;
 }
 
+- (void) setGlobalAddressBookFirstEntriesCount: (int)value
+{
+  _globalAddressBookFirstEntriesCount = value;
+}
+
+- (int) globalAddressBookFirstEntriesCount
+{
+  return _globalAddressBookFirstEntriesCount;
+}
+
 - (NSArray *) searchFields
 {
   return _searchFields;

SoObjects/SOGo/SOGoSource.h

@@ -49,6 +49,8 @@
 /* requires a "." to obtain the full list of contacts */
 - (void) setListRequiresDot: (BOOL) aBool;
 - (BOOL) listRequiresDot;
+- (void) setGlobalAddressBookFirstEntriesCount: (int)value;
+- (int) globalAddressBookFirstEntriesCount;
 
 - (BOOL) checkLogin: (NSString *) _login
 	   password: (NSString *) _pwd

SoObjects/SOGo/SOGoSystemDefaults.h

@@ -135,9 +135,6 @@ NSComparisonResult languageSort(id el1, id el2, void *context);
 - (NSArray *) disableSharingAnyAuthUser;
 - (NSArray *) disableExport;
 
-- (BOOL) enableGlobalAddressBookFirstEntries;
-- (int) globalAddressBookFirstEntriesCount;
-
 - (BOOL)isURLEncryptionEnabled;
 - (NSString *)urlEncryptionPassphrase;
 

SoObjects/SOGo/SOGoSystemDefaults.m

@@ -917,21 +917,4 @@ NSComparisonResult languageSort(id el1, id el2, void *context)
   return disableExport;
 }
 
-- (BOOL) globalAddressBookFirstEntriesEnabled
-{
-  return [self boolForKey: @"SOGoGlobalAddressBookFirstEntries"];
-}
-
-- (int) globalAddressBookFirstEntriesCount
-{
-  int v;
-
-  v = [self integerForKey: @"SOGoGlobalAddressBookFirstEntriesCount"];
-
-  if (!v)
-    v = 100;
-
-  return v;
-}
-
 @end

SoObjects/SOGo/SQLSource.h

@@ -52,6 +52,7 @@
   NSString *_multipleBookingsField;
 
   BOOL _listRequiresDot;
+  int _globalAddressBookFirstEntriesCount;
 
   NSDictionary *_modulesConstraints;
 }

SoObjects/SOGo/SQLSource.m

@@ -108,6 +108,7 @@
       _imapHostField = nil;
       _sieveHostField = nil;
       _listRequiresDot = YES;
+      _globalAddressBookFirstEntriesCount = -1;
       _modulesConstraints = nil;
     }
 
@@ -170,8 +171,12 @@
     _viewURL = [[NSURL alloc] initWithString: [udSource objectForKey: @"viewURL"]];
 
   dotValue = [udSource objectForKey: @"listRequiresDot"];
-  if (dotValue)
+  if (dotValue) {
     [self setListRequiresDot: [dotValue boolValue]];
+    if ([udSource objectForKey: @"globalAddressBookFirstEntriesCount"])
+      [self setGlobalAddressBookFirstEntriesCount: [[udSource objectForKey: @"globalAddressBookFirstEntriesCount"] intValue]];
+  }
+
 
 #warning this domain code has no effect yet
   if ([sourceDomain length])
@@ -1156,6 +1161,16 @@
   return _listRequiresDot;
 }
 
+- (void) setGlobalAddressBookFirstEntriesCount: (int)value
+{
+  _globalAddressBookFirstEntriesCount = value;
+}
+
+- (int) globalAddressBookFirstEntriesCount
+{
+  return _globalAddressBookFirstEntriesCount;
+}
+
 /* card editing */
 - (void) setModifiers: (NSArray *) newModifiers
 {