LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See ChangeLog 

Monotone-Parent: 2f97890bbf7aff0d55eb80775c6c96e7bf5a6343
Monotone-Revision: 534c405827d51663a4ee6b759bfafb2d71b6daed

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-10-27T18:46:17
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Ludovic Marcotte 2009-10-27 18:46:17 +00:00
parent df66723d57
commit 63583757ae
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -10,6 +10,9 @@
* Documentation/SOGo Installation Guide.odt
Updated to set WOUseRelativeURLs to YES instead
of NO by default.
* We now correctly lowercase the SOGoLDAPContactInfoAttribute
attribute everywhere.
2009-10-26 Francis Lachapelle <flachapelle@inverse.ca>

2
SoObjects/Contacts/SOGoContactLDIFEntry.m
View File

@ -162,7 +162,7 @@ static NSString *sogoContactInfoAttribute = nil;
/* If SOGoLDAPContactInfoAttribute is defined, we set as the NOTE value
in order for Thunderbird (or any other CardDAV client) to display it. */
if (sogoContactInfoAttribute)
key = sogoContactInfoAttribute;
key = [sogoContactInfoAttribute lowercaseString];
else
key = @"description";
info = [ldifEntry objectForKey: key];

2
SoObjects/Contacts/SOGoContactSourceFolder.m
View File

@ -257,7 +257,7 @@
if (data)
[newRecord setObject: data forKey: @"isGroup"];
contactInfo = [ud stringForKey: @"SOGoLDAPContactInfoAttribute"];
contactInfo = [[ud stringForKey: @"SOGoLDAPContactInfoAttribute"] lowercaseString];
if ([contactInfo length] > 0) {
data = [oldRecord objectForKey: contactInfo];
if ([data length] > 0)

2
SoObjects/SOGo/SOGoUserFolder.m
View File

@ -71,7 +71,7 @@ static NSString *LDAPContactInfoAttribute = nil;
{
ud = [NSUserDefaults standardUserDefaults];
LDAPContactInfoAttribute
= [ud stringForKey: @"SOGoLDAPContactInfoAttribute"];
= [[ud stringForKey: @"SOGoLDAPContactInfoAttribute"] lowercaseString];
[LDAPContactInfoAttribute retain];
}
}

2
SoObjects/SOGo/SOGoUserManager.m
View File

@ -68,7 +68,7 @@ static NSLock *lock = nil;
defaultMailDomain = @"localhost";
}
LDAPContactInfoAttribute = [ud stringForKey: @"SOGoLDAPContactInfoAttribute"];
LDAPContactInfoAttribute = [[ud stringForKey: @"SOGoLDAPContactInfoAttribute"] lowercaseString];
[LDAPContactInfoAttribute retain];
}
if (!forceImapLoginWithEmail)

2
UI/Contacts/UIxContactFoldersView.m
View File

@ -150,7 +150,7 @@
if ([results count] > 0)
{
sud = [NSUserDefaults standardUserDefaults];
infoKey = [sud stringForKey: @"SOGoLDAPContactInfoAttribute"];
infoKey = [[sud stringForKey: @"SOGoLDAPContactInfoAttribute"] lowercaseString];
contacts = [results objectEnumerator];
contact = [contacts nextObject];
while (contact)

2
UI/MainUI/SOGoUserHomePage.m
View File

@ -340,7 +340,7 @@ static NSString *LDAPContactInfoAttribute = nil;
{
if ([LDAPContactInfoAttribute length])
{
contactInfo = [contact objectForKey: LDAPContactInfoAttribute];
contactInfo = [contact objectForKey: [LDAPContactInfoAttribute lowercaseString]];
if (!contactInfo)
contactInfo = @"";
}