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

whitespace fixes. tabkill

pull/12/head
Jean Raby 2013-06-12 02:36:50 -04:00
parent afb7bc309c
commit f24e3a0a31
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SoObjects/SOGo/SOGoDAVAuthenticator.m
View File

@ -51,7 +51,7 @@
} }
- (BOOL) checkLogin: (NSString *) _login - (BOOL) checkLogin: (NSString *) _login
password: (NSString *) _pwd password: (NSString *) _pwd
{ {
NSString *domain; NSString *domain;
SOGoSystemDefaults *sd; SOGoSystemDefaults *sd;
@ -66,7 +66,7 @@
checkLogin: [_login stringByReplacingString: @"%40" checkLogin: [_login stringByReplacingString: @"%40"
withString: @"@"] withString: @"@"]
password: _pwd password: _pwd
domain: &domain domain: &domain
perr: &perr perr: &perr
expire: &expire expire: &expire
grace: &grace] grace: &grace]
@ -99,7 +99,7 @@
{ {
creds = [self parseCredentials: auth]; creds = [self parseCredentials: auth];
if ([creds count] > 1) if ([creds count] > 1)
password = [creds objectAtIndex: 1]; password = [creds objectAtIndex: 1];
} }
return password; return password;
@ -122,17 +122,19 @@
session = [SOGoCASSession CASSessionWithTicket: password session = [SOGoCASSession CASSessionWithTicket: password
fromProxy: YES]; fromProxy: YES];
// We must NOT assume the scheme exists // We must NOT assume the scheme exists
scheme = [server scheme]; scheme = [server scheme];
if (!scheme) if (!scheme)
scheme = @"imap"; scheme = @"imap";
service = [NSString stringWithFormat: @"%@://%@", scheme, [server host]]; service = [NSString stringWithFormat: @"%@://%@", scheme, [server host]];
if (renew) if (renew)
[session invalidateTicketForService: service]; [session invalidateTicketForService: service];
password = [session ticketForService: service]; password = [session ticketForService: service];
if ([password length] || renew) if ([password length] || renew)
[session updateCache]; [session updateCache];
} }

2
SoObjects/SOGo/SOGoProxyAuthenticator.m
View File

@ -49,7 +49,7 @@
} }
- (BOOL) checkLogin: (NSString *) _login - (BOOL) checkLogin: (NSString *) _login
password: (NSString *) _pwd password: (NSString *) _pwd
{ {
return YES; return YES;
} }

26
SoObjects/SOGo/SOGoWebAuthenticator.m
View File

@ -74,7 +74,7 @@
} }
- (BOOL) checkLogin: (NSString *) _login - (BOOL) checkLogin: (NSString *) _login
password: (NSString *) _pwd password: (NSString *) _pwd
{ {
NSString *username, *password, *domain, *value; NSString *username, *password, *domain, *value;
SOGoPasswordPolicyError perr; SOGoPasswordPolicyError perr;
@ -168,7 +168,7 @@
perr: _perr perr: _perr
expire: _expire expire: _expire
grace: _grace grace: _grace
useCache: _useCache]; useCache: _useCache];
//[self logWithFormat: @"Checked login with ppolicy enabled: %d %d %d", *_perr, *_expire, *_grace]; //[self logWithFormat: @"Checked login with ppolicy enabled: %d %d %d", *_perr, *_expire, *_grace];
@ -283,17 +283,19 @@
session = [SOGoCASSession CASSessionWithIdentifier: password session = [SOGoCASSession CASSessionWithIdentifier: password
fromProxy: NO]; fromProxy: NO];
// We must NOT assume the scheme exists // We must NOT assume the scheme exists
scheme = [server scheme]; scheme = [server scheme];
if (!scheme) if (!scheme)
scheme = @"imap"; scheme = @"imap";
service = [NSString stringWithFormat: @"%@://%@", scheme, [server host]]; service = [NSString stringWithFormat: @"%@://%@", scheme, [server host]];
if (renew) if (renew)
[session invalidateTicketForService: service]; [session invalidateTicketForService: service];
password = [session ticketForService: service]; password = [session ticketForService: service];
if ([password length] || renew) if ([password length] || renew)
[session updateCache]; [session updateCache];
} }
@ -322,8 +324,8 @@
/* create SOGoUser */ /* create SOGoUser */
- (SOGoUser *) userWithLogin: (NSString *) login - (SOGoUser *) userWithLogin: (NSString *) login
andRoles: (NSArray *) roles andRoles: (NSArray *) roles
inContext: (WOContext *) ctx inContext: (WOContext *) ctx
{ {
/* the actual factory method */ /* the actual factory method */
return [SOGoUser userWithLogin: login roles: roles]; return [SOGoUser userWithLogin: login roles: roles];
@ -339,7 +341,7 @@
NSString *auth; NSString *auth;
auth = [[context request] auth = [[context request]
cookieValueForKey: [self cookieNameInContext:context]]; cookieValueForKey: [self cookieNameInContext:context]];
if ([auth isEqualToString: @"discard"]) if ([auth isEqualToString: @"discard"])
{ {
[context setObject: [NSArray arrayWithObject: SoRole_Anonymous] [context setObject: [NSArray arrayWithObject: SoRole_Anonymous]
@ -353,8 +355,8 @@
} }
- (void) setupAuthFailResponse: (WOResponse *) response - (void) setupAuthFailResponse: (WOResponse *) response
withReason: (NSString *) reason withReason: (NSString *) reason
inContext: (WOContext *) context inContext: (WOContext *) context
{ {
WOComponent *page; WOComponent *page;
WORequest *request; WORequest *request;