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

This commit is contained in:
smizrahi
2024-02-26 15:40:49 +01:00
parent 776a798e17
commit 4dba56f70d
9 changed files with 67 additions and 62 deletions
+17 -1
View File
@@ -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;