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

Monotone-Parent: 18464c2d77d4979f1c50fac4f095dcf6dcb967c1

Browse Source 
Monotone-Revision: 47be4cd66ca07d4558d608a37376c91af1d0b863

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-10T18:45:35
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-06-10 18:45:35 +00:00
parent 6bc3b47bf4
commit 3f43e0b56e
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,8 @@
2010-06-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoDAVAuthenticator.m (-userInContext:):
reorganized method.
* SoObjects/SOGo/NSString+Utilities.m
(-composeURLWithAction:parameters:andHash:): don't attempt to add
parameters if the parameters argument is empty.

31
SoObjects/SOGo/SOGoDAVAuthenticator.m
View File

@@ -97,28 +97,23 @@
{
static SOGoUser *anonymous = nil;
SOGoUser *user;
NSArray *traversalPath;
NSString *login;
if (!anonymous)
anonymous
= [[SOGoUser alloc] initWithLogin: @"anonymous"
roles: [NSArray arrayWithObject: SoRole_Anonymous]];
login = [self checkCredentialsInContext:_ctx];
if (login)
if ([login isEqualToString: @"anonymous"])
{
if ([login isEqualToString: @"anonymous"])
{
traversalPath = [_ctx objectForKey: @"SoRequestTraversalPath"];
user = anonymous;
}
else
{
user = [SOGoUser userWithLogin: login
roles: [self rolesForLogin: login]];
[user setCurrentPassword: [self passwordInContext: _ctx]];
}
if (!anonymous)
anonymous
= [[SOGoUser alloc]
initWithLogin: @"anonymous"
roles: [NSArray arrayWithObject: SoRole_Anonymous]];
user = anonymous;
}
else if ([login length])
{
user = [SOGoUser userWithLogin: login
roles: [self rolesForLogin: login]];
[user setCurrentPassword: [self passwordInContext: _ctx]];
}
else
user = nil;