amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-20 19:05:25 +00:00
Code Issues Projects Releases Wiki Activity

Add missing contact fields for sorting

Browse Source 
Fixes #4799
This commit is contained in:
Francis Lachapelle
2019-10-21 15:32:13 -04:00
parent 23690cb223
commit 85e61ecc1b
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Contacts/SOGoContactSourceFolder.m
+16 -6
View File
@@ -247,6 +247,18 @@
data = @"";
[newRecord setObject: data forKey: @"c_cn"];
// sn => c_sn
data = [oldRecord objectForKey: @"sn"];
if (!data)
data = @"";
[newRecord setObject: data forKey: @"c_sn"]; // for sorting
// givenname => c_givenname
data = [oldRecord objectForKey: @"givenname"];
if (!data)
data = @"";
[newRecord setObject: data forKey: @"c_givenname"];
if ([[SOGoSystemDefaults sharedSystemDefaults] enableDomainBasedUID])
{
data = [oldRecord objectForKey: @"c_domain"];
@@ -296,7 +308,7 @@
data = [oldRecord objectForKey: @"nscpaimscreenname"];
if (![data length])
data = @"";
[newRecord setObject: data forKey: @"c_screenname"];
[newRecord setObject: data forKey: @"c_screenname"]; // for sorting
// o => org
data = [oldRecord objectForKey: @"o"];
@@ -304,9 +316,9 @@
[newRecord setObject: data forKey: @"org"];
else
data = @"";
[newRecord setObject: data forKey: @"c_o"];
[newRecord setObject: data forKey: @"c_o"]; // for sorting
// telephonenumber || cellphone || homephone => phones[]
// telephonenumber || cellphone || homephone => phones[] & c_telephonenumber
data = [oldRecord objectForKey: @"telephonenumber"];
if (![data length])
data = [oldRecord objectForKey: @"cellphone"];
@@ -320,7 +332,7 @@
}
else
data = @"";
[newRecord setObject: data forKey: @"c_telephonenumber"];
[newRecord setObject: data forKey: @"c_telephonenumber"]; // for sorting
// Custom attribute for group lookups. See LDAPSource.m.
data = [oldRecord objectForKey: @"isGroup"];
@@ -375,8 +387,6 @@
{
oldRecord = [NSMutableDictionary dictionary];
[oldRecord addEntriesFromDictionary: o];
if ([source isKindOfClass: [LDAPSource class]])
[(LDAPSource *)source applyContactMappingToResult: oldRecord];
[newRecords addObject: [self _flattenedRecord: oldRecord]];
}