mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-09-28 00:20:32 +00:00
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:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user