projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xorg/master' into xorg/f/geocoding
[platal.git]
/
htdocs
/
javascript
/
xorg.js
diff --git
a/htdocs/javascript/xorg.js
b/htdocs/javascript/xorg.js
index
4837da9
..
47bf78b
100644
(file)
--- a/
htdocs/javascript/xorg.js
+++ b/
htdocs/javascript/xorg.js
@@
-179,7
+179,7
@@
function auto_links() {
}
if ((!href.contains(fqdn) && !this.className.contains('popup')) || node.hasClass('popup')) {
node.click(function () {
}
if ((!href.contains(fqdn) && !this.className.contains('popup')) || node.hasClass('popup')) {
node.click(function () {
- window.open(href);
+ window.open(
this.
href);
return false;
});
}
return false;
});
}
@@
-566,7
+566,7
@@
function checkPassword(box, okLabel) {
}
}
}
}
-function hashResponse(password1, password2, hasConfirmation) {
+function hashResponse(password1, password2, hasConfirmation
, doAuth
) {
var pw1 = $('[name=' + password1 + ']').val();
var pw2;
var pw1 = $('[name=' + password1 + ']').val();
var pw2;
@@
-590,9
+590,15
@@
function hashResponse(password1, password2, hasConfirmation) {
return false;
}
return false;
}
- alert("Le mot de passe
que tu as rentré
va être chiffré avant de nous parvenir par Internet ! Ainsi il ne circulera pas en clair.");
+ alert("Le mot de passe va être chiffré avant de nous parvenir par Internet ! Ainsi il ne circulera pas en clair.");
$('[name=' + password1 + ']').val('');
$('[name=pwhash]').val(hash_encrypt(pw1));
$('[name=' + password1 + ']').val('');
$('[name=pwhash]').val(hash_encrypt(pw1));
+
+ if (doAuth) {
+ $('[name=password]').val(pw1);
+ doChallengeResponse();
+ }
+
return true;
}
return true;
}
@@
-685,7
+691,7
@@
function sendTestEmail(token, hruid)
} else {
msg += " sur ton addresse.";
}
} else {
msg += " sur ton addresse.";
}
- $('#mail_sent').successMessage(
$
url + '?token=' + token, msg);
+ $('#mail_sent').successMessage(url + '?token=' + token, msg);
return false;
}
return false;
}
@@
-1043,7
+1049,7
@@
function sendTestEmail(token, hruid)
queryParams: {
offset: 0,
count: 10,
queryParams: {
offset: 0,
count: 10,
- allow_special: true
,
+ allow_special: true
},
loadingClassLeft: 'ac_loading',
loadingClassRight: 'ac_loading_left',
},
loadingClassLeft: 'ac_loading',
loadingClassRight: 'ac_loading_left',