amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 08:34:30 +00:00
Code Issues Projects Releases Wiki Activity

See ChangeLog

Browse Source 
Monotone-Parent: 32b84d9dc2715067c885c49bfc26087eac4dcd2b
Monotone-Revision: fb2d19f2d09037cb11414b10bc8c3bb8beb37bd9

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-07-25T14:28:15
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-07-25 14:28:15 +00:00
parent b10d7500d0
commit c404a10153
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MainUI/SOGoRootPage.m
+18 -8
View File
@@ -148,6 +148,7 @@
SOGoWebAuthenticator *auth;
SOGoAppointmentFolders *calendars;
SOGoUserDefaults *ud;
SOGoSystemDefaults *sd;
SOGoUser *loggedInUser;
NSString *username, *password, *language, *domain;
NSArray *supportedLanguages;
@@ -186,7 +187,11 @@
andJSONRepresentation: json];
if ([domain isNotNull])
username = [NSString stringWithFormat: @"%@@%@", username, domain];
{
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([sd enableDomainBasedUID])
username = [NSString stringWithFormat: @"%@@%@", username, domain];
}
authCookie = [self _cookieWithUsername: username
andPassword: password
@@ -428,14 +433,15 @@
- (WOResponse *) changePasswordAction
{
NSString *username, *domain, *password, *newPassword, *value;
SOGoUserManager *um;
SOGoPasswordPolicyError error;
WOResponse *response;
WORequest *request;
NSDictionary *message;
SOGoWebAuthenticator *auth;
WOCookie *authCookie;
NSArray *creds;
SOGoUserManager *um;
SOGoPasswordPolicyError error;
SOGoSystemDefaults *sd;
SOGoWebAuthenticator *auth;
WOResponse *response;
WORequest *request;
request = [context request];
message = [[request contentAsString] objectFromJSONString];
@@ -467,8 +473,12 @@
[SOGoSession deleteValueForSessionKey: [creds objectAtIndex: 1]];
if ([domain isNotNull])
username = [NSString stringWithFormat: @"%@@%@", username, domain];
{
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([sd enableDomainBasedUID])
username = [NSString stringWithFormat: @"%@@%@", username, domain];
}
response = [self responseWith204];
authCookie = [self _cookieWithUsername: username
andPassword: newPassword