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

merge of 'c34c0300a1f39388ab0115f21ccd4e9ac36b52ae' 

and 'c6b8e3c75a4449f576bab78576b6ea03f5d7d891'

Monotone-Parent: c34c0300a1f39388ab0115f21ccd4e9ac36b52ae
Monotone-Parent: c6b8e3c75a4449f576bab78576b6ea03f5d7d891
Monotone-Revision: 03c23ddd42cc8c0dc879455acf6c14cc491d7f12

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-03-09T14:22:15
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-03-09 14:22:15 +00:00
parent f26856a8a1 493989e954
commit abeac067fd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/MainUI/SOGoRootPage.m
View File

@ -153,7 +153,7 @@
if ((b = [auth checkLogin: username password: password
perr: &err expire: &expire grace: &grace])
&& (err == PolicyNoError || err == PolicyChangeAfterReset))
&& (err == PolicyNoError))
{
[self logWithFormat: @"successful login for user '%@'", username];
response = [self responseWith204];

10
UI/WebServerResources/SOGoRootPage.js
View File

@ -217,16 +217,16 @@ function passwordDialogOK(event) {
var field = $("newPassword");
var confirmationField = $("newPassword2");
if (field && confirmationField) {
var password = field.value;
if (password == confirmationField.value) {
if (password.length > 0) {
var newPassword = field.value;
if (newPassword == confirmationField.value) {
if (newPassword.length > 0) {
var userName = $("userName");
var password = $("password");
var policy = new PasswordPolicy(userName.value,
password.value);
policy.setCallbacks(onPasswordChangeSuccess,
onPasswordChangeFailure);
policy.changePassword(password);
policy.changePassword(newPassword);
}
else
SetLogMessage("passwordError",
@ -247,7 +247,7 @@ function onPasswordChangeSuccess() {
redirectToUserPage();
}
function onPasswordChangeFailre(code, message) {
function onPasswordChangeFailure(code, message) {
SetLogMessage("passwordError", message);
}