Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #6502.

Browse Source
This commit is contained in:
Yagami
2019-11-18 14:57:23 +08:00
parent 029c22e0ac
commit 800bc78722
5 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/js/changepassword.js
+8 -2
View File
@@ -10,8 +10,14 @@ $(document).ready(function()
$('#submit').click(function()
{
var password = $('input#originalPassword').val();
var rand = $('input#verifyRand').val();
var password = $('input#originalPassword').val();
var password1 = $('input#password1').val();
var passwordStrength = computePasswordStrength(password1);
var rand = $('input#verifyRand').val();
if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
$("form input[name=passwordStrength]").val(passwordStrength);
if(!originalEncrypted && password) $('input#originalPassword').val(md5(md5(password) + rand));
originalEncrypted = true;
module/my/js/editprofile.js
+8 -2
View File
@@ -8,9 +8,15 @@ $(document).ready(function()
$('#password1').change(function(){password1Encrypted = false});
$('#password2').change(function(){password2Encrypted = false});
$('#dataform').submit(function()
$('#submit').click(function()
{
var password = $('input#verifyPassword').val();
var password = $('input#verifyPassword').val();
var password1 = $('input#password1').val();
var passwordStrength = computePasswordStrength(password1);
if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
$("form input[name=passwordStrength]").val(passwordStrength);
var rand = $('input#verifyRand').val();
if(!verifyEncrypted && password) $('input#verifyPassword').val(md5(md5(password) + rand));
verifyEncrypted = true;
module/user/js/create.js
+7 -2
View File
@@ -19,8 +19,13 @@ $(function()
$('#password2').change(function(){password2Encrypted = false});
$('#submit').click(function()
{
var password1 = $('#password1').val();
var password2 = $('#password2').val();
var password1 = $('#password1').val();
var password2 = $('#password2').val();
var passwordStrength = computePasswordStrength(password1);
if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
$("form input[name=passwordStrength]").val(passwordStrength);
var rand = $('input#verifyRand').val();
if(password1 && !password1Encrypted) $('#password1').val(md5(password1) + rand);
if(password2 && !password2Encrypted) $('#password2').val(md5(password2) + rand);
module/user/js/edit.js
+5
View File
@@ -8,6 +8,11 @@ $(function()
{
var password1 = $('#password1').val();
var password2 = $('#password2').val();
var passwordStrength = computePasswordStrength(password1);
if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
$("form input[name=passwordStrength]").val(passwordStrength);
var rand = $('input#verifyRand').val();
if(password1 && !password1Encrypted) $('#password1').val(md5(password1) + rand);
if(password2 && !password2Encrypted) $('#password2').val(md5(password2) + rand);
module/user/model.php
+4 -4
View File
@@ -217,7 +217,7 @@ class userModel extends model
->setIF($this->post->password1 != false, 'password', substr($this->post->password1, 0, 32))
->setIF($this->post->password1 == false, 'password', '')
->setIF($this->post->email != false, 'email', trim($this->post->email))
->remove('group, password1, password2, verifyPassword')
->remove('group, password1, password2, verifyPassword, passwordStrength')
->get();
if(empty($_POST['verifyPassword']) or $this->post->verifyPassword != md5($this->app->user->password . $this->session->rand))
@@ -376,7 +376,7 @@ class userModel extends model
->setDefault('join', '0000-00-00')
->setIF($this->post->password1 != false, 'password', substr($this->post->password1, 0, 32))
->setIF($this->post->email != false, 'email', trim($this->post->email))
->remove('password1, password2, groups,verifyPassword')
->remove('password1, password2, groups,verifyPassword, passwordStrength')
->get();
if(empty($_POST['verifyPassword']) or $this->post->verifyPassword != md5($this->app->user->password . $this->session->rand))
@@ -553,7 +553,7 @@ class userModel extends model
$user = fixer::input('post')
->setIF($this->post->password1 != false, 'password', substr($this->post->password1, 0, 32))
->remove('account, password1, password2, originalPassword')
->remove('account, password1, password2, originalPassword, passwordStrength')
->get();
if(empty($_POST['originalPassword']) or $this->post->originalPassword != md5($this->app->user->password . $this->session->rand))
@@ -606,7 +606,7 @@ class userModel extends model
if($this->post->password1 != $this->post->password2) dao::$errors['password'][] = $this->lang->error->passwordsame;
if(!validater::checkReg($this->post->password1, '|(.){6,}|')) dao::$errors['password'][] = $this->lang->error->passwordrule;
if(isset($this->config->safe->mode) and $this->computePasswordStrength($this->post->password1) < $this->config->safe->mode) dao::$errors['password1'][] = $this->lang->user->weakPassword;
if(isset($this->config->safe->mode) and ($this->post->passwordStrength < $this->config->safe->mode)) dao::$errors['password1'][] = $this->lang->user->weakPassword;
if(!empty($this->config->safe->changeWeak))
{
if(!isset($this->config->safe->weak)) $this->app->loadConfig('admin');