LDIF to vCard: inverse values of "ou" and "o"

Fixes #4278
This commit is contained in:
Francis Lachapelle 2017-09-07 13:41:51 -04:00
parent e0b0c9c2c1
commit 3189e0e13a

View file

@ -325,18 +325,18 @@ convention:
[element setValues: [ldifRecord objectForKey: @"c"] [element setValues: [ldifRecord objectForKey: @"c"]
atIndex: 6 forKey: @""]; atIndex: 6 forKey: @""];
ou = [ldifRecord objectForKey: @"ou"];
if ([ou isKindOfClass: [NSArray class]])
units = [NSMutableArray arrayWithArray: (NSArray *)ou];
else if (ou)
units = [NSMutableArray arrayWithObject: ou];
else
units = [NSMutableArray array];
o = [ldifRecord objectForKey: @"o"]; o = [ldifRecord objectForKey: @"o"];
if ([o isKindOfClass: [NSArray class]]) if ([o isKindOfClass: [NSArray class]])
[units addObjectsFromArray: (NSArray *)o]; units = [NSMutableArray arrayWithArray: (NSArray *)o];
else if (o) else if (o)
[units addObject: o]; units = [NSMutableArray arrayWithObject: o];
else
units = [NSMutableArray array];
ou = [ldifRecord objectForKey: @"ou"];
if ([ou isKindOfClass: [NSArray class]])
[units addObjectsFromArray: (NSArray *)ou];
else if (ou)
[units addObject: ou];
[self setOrganizations: units]; [self setOrganizations: units];
[self _setPhoneValues: ldifRecord]; [self _setPhoneValues: ldifRecord];