amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-21 22:32:45 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: d7098152cae36121388c0a0b60a86132b83eb7d6
Monotone-Revision: b3a500aa833d95b94e57f01645279aeda5ad3587

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2009-03-02T17:45:32
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2009-03-02 17:45:32 +00:00
parent 1caf5a0a9e
commit 2b685ae05c
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2009-03-02 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/SOGo/SOGoObject.m
([SOGoObject -davRecordForUser:parameters:]):
Don't initialize the SOGoUser variable of
nocn AND noemail are passed.
2009-02-23 Ludovic Marcotte <lmarcotte@inverse.ca>
* Updated German translation. Patch from

9
SoObjects/SOGo/SOGoObject.m
View File

@@ -1356,19 +1356,19 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
parameters: (NSArray *) params
{
NSMutableString *userRecord;
SOGoUser *sogoUser;
userRecord = [NSMutableString string];
[userRecord appendFormat: @"<id>%@</id>",
[user stringByEscapingXMLString]];
sogoUser = [SOGoUser userWithLogin: user roles: nil];
// Make sure to not call [SOGoUser userWithLogin...] here if nocn AND noemail
// is specified. We'll avoid generating LDAP calls by doing so.
if (![params containsObject: @"nocn"])
{
NSString *cn;
cn = [sogoUser cn];
cn = [[SOGoUser userWithLogin: user roles: nil] cn];
if (!cn)
cn = user;
[userRecord appendFormat: @"<displayName>%@</displayName>",
@@ -1379,7 +1379,8 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
{
NSString *email;
email = [[sogoUser allEmails] objectAtIndex: 0];
email = [[[SOGoUser userWithLogin: user roles: nil]
allEmails] objectAtIndex: 0];
if (email)
[userRecord appendFormat: @"<email>%@</email>",
[email stringByEscapingXMLString]];