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

Monotone-Parent: 3d26091bec393e3abf8d2b6033e0737e09c207b9 

Monotone-Revision: c110b42afb9f73f9a8ea6c766ec8e46b798c7316

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-22T18:37:58
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2012-02-22 18:37:58 +00:00
parent 8cef32c611
commit 68e8a28846
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,6 +3,10 @@
* SoObjects/SOGo/SQLSource.m (_lookupContactEntry:considerEmail:):
make sure the value of column pointer to by _kindField is not nil,
nor an NSNull instance before treating it like a string.
Use the value of "_imapHostField", when available, to map the
"c_imaphostname" value of the contact/user record.
(-init): new "_imapHostField" ivar, holder of the value of
IMAPHostFieldName of the source configuration dictionary.
2012-02-21 Wolfgang Sourdeau <wsourdeau@inverse.ca>

1
SoObjects/SOGo/SQLSource.h
View File

@ -41,6 +41,7 @@
NSArray *_loginFields;
NSArray *_mailFields;
NSString *_imapLoginField;
NSString *_imapHostField;
NSString *_userPasswordAlgorithm;
NSURL *_viewURL;

9
SoObjects/SOGo/SQLSource.m
View File

@ -88,6 +88,7 @@
_viewURL = nil;
_kindField = nil;
_multipleBookingsField = nil;
_imapHostField = nil;
}
return self;
@ -103,6 +104,7 @@
[_viewURL release];
[_kindField release];
[_multipleBookingsField release];
[_imapHostField release];
[super dealloc];
}
@ -118,6 +120,7 @@
ASSIGN(_mailFields, [udSource objectForKey: @"MailFieldNames"]);
ASSIGN(_userPasswordAlgorithm, [udSource objectForKey: @"userPasswordAlgorithm"]);
ASSIGN(_imapLoginField, [udSource objectForKey: @"IMAPLoginFieldName"]);
ASSIGN(_imapHostField, [udSource objectForKey: @"IMAPHostFieldName"]);
ASSIGN(_kindField, [udSource objectForKey: @"KindFieldName"]);
ASSIGN(_multipleBookingsField, [udSource objectForKey: @"MultipleBookingsFieldName"]);
@ -505,6 +508,12 @@
}
[response setObject: emails forKey: @"c_emails"];
if (_imapHostField)
{
value = [response objectForKey: _imapHostField];
if ([value isNotNull])
[response setObject: value forKey: @"c_imaphostname"];
}
// We check if the user can authenticate
if (_authenticationFilter)