Monotone-Parent: ebba4da6ea34dfe0e2ef6576595708fef8f31a5a
Monotone-Revision: 77f1091c06783593dcf99f904ee435606622847d Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-20T14:07:32 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
dcb8b9a1bb
commit
4eb18f593b
|
@ -1,5 +1,14 @@
|
|||
2010-08-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/SOGo/SOGoDAVAuthenticator.m (-checkLogin:password:):
|
||||
same as below.
|
||||
|
||||
* SoObjects/SOGo/SOGoUser.m (-initWithLogin:roles:trust:): same as
|
||||
below.
|
||||
|
||||
* SoObjects/SOGo/SOGoGCSFolder.m (_deduceObjectNamesFromURLs:):
|
||||
accept "@" chars encoded as "%40".
|
||||
|
||||
* SoObjects/Contacts/SOGoContactFolders.m (-appendSystemSources):
|
||||
append nothing if used from an iPhone.
|
||||
|
||||
|
|
|
@ -58,11 +58,13 @@
|
|||
BOOL rc;
|
||||
|
||||
perr = PolicyNoError;
|
||||
rc = ([[SOGoUserManager sharedUserManager] checkLogin: _login
|
||||
password: _pwd
|
||||
perr: &perr
|
||||
expire: &expire
|
||||
grace: &grace]
|
||||
rc = ([[SOGoUserManager sharedUserManager]
|
||||
checkLogin: [_login stringByReplacingString: @"%40"
|
||||
withString: @"@"]
|
||||
password: _pwd
|
||||
perr: &perr
|
||||
expire: &expire
|
||||
grace: &grace]
|
||||
&& perr == PolicyNoError);
|
||||
if (!rc)
|
||||
{
|
||||
|
|
|
@ -1765,7 +1765,7 @@ static NSArray *childRecordFields = nil;
|
|||
- (NSDictionary *) _deduceObjectNamesFromURLs: (NSArray *) urls
|
||||
{
|
||||
unsigned int count, max;
|
||||
NSString *url, *componentURLPath, *cName, *baseURLString;
|
||||
NSString *url, *currentURL, *componentURLPath, *cName, *baseURLString;
|
||||
NSMutableDictionary *cNames;
|
||||
NSURL *componentURL, *baseURL;
|
||||
NSArray *urlComponents;
|
||||
|
@ -1777,9 +1777,12 @@ static NSArray *childRecordFields = nil;
|
|||
|
||||
for (count = 0; count < max; count++)
|
||||
{
|
||||
currentURL
|
||||
= [[urls objectAtIndex: count] stringByReplacingString: @"%40"
|
||||
withString: @"@"];
|
||||
url = [NSString stringWithFormat: @"%@/%@",
|
||||
[[urls objectAtIndex: count] stringByDeletingLastPathComponent],
|
||||
[[[urls objectAtIndex: count] lastPathComponent] stringByEscapingURL]];
|
||||
[currentURL stringByDeletingLastPathComponent],
|
||||
[[currentURL lastPathComponent] stringByEscapingURL]];
|
||||
componentURL = [[NSURL URLWithString: url relativeToURL: baseURL]
|
||||
standardizedURL];
|
||||
componentURLPath = [componentURL absoluteString];
|
||||
|
|
|
@ -138,6 +138,8 @@
|
|||
realUID = newLogin;
|
||||
else
|
||||
{
|
||||
newLogin = [newLogin stringByReplacingString: @"%40"
|
||||
withString: @"@"];
|
||||
if (b)
|
||||
realUID = newLogin;
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue