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
This commit is contained in:
commit
abeac067fd
|
@ -153,7 +153,7 @@
|
||||||
|
|
||||||
if ((b = [auth checkLogin: username password: password
|
if ((b = [auth checkLogin: username password: password
|
||||||
perr: &err expire: &expire grace: &grace])
|
perr: &err expire: &expire grace: &grace])
|
||||||
&& (err == PolicyNoError || err == PolicyChangeAfterReset))
|
&& (err == PolicyNoError))
|
||||||
{
|
{
|
||||||
[self logWithFormat: @"successful login for user '%@'", username];
|
[self logWithFormat: @"successful login for user '%@'", username];
|
||||||
response = [self responseWith204];
|
response = [self responseWith204];
|
||||||
|
|
|
@ -217,16 +217,16 @@ function passwordDialogOK(event) {
|
||||||
var field = $("newPassword");
|
var field = $("newPassword");
|
||||||
var confirmationField = $("newPassword2");
|
var confirmationField = $("newPassword2");
|
||||||
if (field && confirmationField) {
|
if (field && confirmationField) {
|
||||||
var password = field.value;
|
var newPassword = field.value;
|
||||||
if (password == confirmationField.value) {
|
if (newPassword == confirmationField.value) {
|
||||||
if (password.length > 0) {
|
if (newPassword.length > 0) {
|
||||||
var userName = $("userName");
|
var userName = $("userName");
|
||||||
var password = $("password");
|
var password = $("password");
|
||||||
var policy = new PasswordPolicy(userName.value,
|
var policy = new PasswordPolicy(userName.value,
|
||||||
password.value);
|
password.value);
|
||||||
policy.setCallbacks(onPasswordChangeSuccess,
|
policy.setCallbacks(onPasswordChangeSuccess,
|
||||||
onPasswordChangeFailure);
|
onPasswordChangeFailure);
|
||||||
policy.changePassword(password);
|
policy.changePassword(newPassword);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
SetLogMessage("passwordError",
|
SetLogMessage("passwordError",
|
||||||
|
@ -247,7 +247,7 @@ function onPasswordChangeSuccess() {
|
||||||
redirectToUserPage();
|
redirectToUserPage();
|
||||||
}
|
}
|
||||||
|
|
||||||
function onPasswordChangeFailre(code, message) {
|
function onPasswordChangeFailure(code, message) {
|
||||||
SetLogMessage("passwordError", message);
|
SetLogMessage("passwordError", message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue