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

Merge branch 'sprint/237_liumengyi_67702' into 'master'

Browse Source 
* Fix bug #26193.

See merge request easycorp/zentaopms!5276
This commit is contained in:
王怡栋
2022-09-06 07:52:27 +00:00
parent 358e54302d b7fa4bd754
commit e5bd16f5b6
12 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+2 -3
View File
@@ -1212,9 +1212,8 @@ EOF;
$_POST['account'] = $this->app->user->account;
$_POST['groups'] = $this->dao->select('`group`')->from(TABLE_USERGROUP)->where('account')->eq($this->post->account)->fetchPairs('group', 'group');
$this->user->update($this->app->user->id);
if(dao::isError()) helper::end(js::error(dao::getError()));
echo js::locate($this->createLink('my', 'profile'), 'parent');
return;
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('my', 'profile'), 'closeModal' => true));
}
$this->app->loadConfig('user');
module/my/js/changepassword.js
+9 -5
View File
@@ -8,13 +8,17 @@ $(document).ready(function()
$('#password1').change(function(){password1Encrypted = false});
$('#password2').change(function(){password2Encrypted = false});
var passwordStrength = 0;
$('#submit').click(function()
{
var password = $('input#originalPassword').val().trim();
var password1 = $('input#password1').val().trim();
var passwordStrength = computePasswordStrength(password1);
var rand = $('input#verifyRand').val();
if(!password1Encrypted) $("#passwordLength").val(password1.length);
var password = $('input#originalPassword').val().trim();
var password1 = $('input#password1').val().trim();
var rand = $('input#verifyRand').val();
if(!password1Encrypted)
{
passwordStrength = computePasswordStrength(password1);
$("#passwordLength").val(password1.length);
}
if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
$("form input[name=passwordStrength]").val(passwordStrength);
module/my/js/editprofile.js
+8 -4
View File
@@ -8,12 +8,16 @@ $(document).ready(function()
$('#password1').change(function(){password1Encrypted = false});
$('#password2').change(function(){password2Encrypted = false});
var passwordStrength = 0;
$('#submit').click(function()
{
var password = $('input#verifyPassword').val();
var password1 = $('input#password1').val();
var passwordStrength = computePasswordStrength(password1);
if(!password1Encrypted) $("#passwordLength").val(password1.length);
var password = $('input#verifyPassword').val();
var password1 = $('input#password1').val();
if(!password1Encrypted)
{
passwordStrength = computePasswordStrength(password1);
$("#passwordLength").val(password1.length);
}
if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
$("form input[name=passwordStrength]").val(passwordStrength);
module/my/view/changepassword.html.php
+1 -1
View File
@@ -35,7 +35,7 @@
<th><?php echo $lang->user->newPassword;?></th>
<td>
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)' placeholder='" . zget($lang->user->placeholder->passwordStrength, $config->safe->mode, '') . "'");?>
<?php echo html::password('password1', '', "class='form-control' onkeyup='checkPassword(this.value)' placeholder='" . zget($lang->user->placeholder->passwordStrength, $config->safe->mode, '') . "'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>
module/my/view/editprofile.html.php
+2 -2
View File
@@ -17,7 +17,7 @@
<div class='main-header'>
<h2><i class='icon-pencil'></i> <?php echo $lang->my->editProfile;?></h2>
</div>
<form method='post' target='hiddenwin' id='dataform'>
<form method='post' class='form-ajax' id='dataform'>
<table class='table table-form'>
<caption><?php echo $lang->my->form->lblBasic;?></caption>
<tr>
@@ -46,7 +46,7 @@
<td>
<input type='password' style="display:none"> <!-- Disable input password by browser automatically. -->
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control disabled-ie-placeholder' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)' placeholder='" . (!empty($config->safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?>
<?php echo html::password('password1', '', "class='form-control disabled-ie-placeholder' onkeyup='checkPassword(this.value)' placeholder='" . (!empty($config->safe->mode) ? $lang->user->placeholder->passwordStrength[$config->safe->mode] : '') . "'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>
module/user/js/create.js
+9 -4
View File
@@ -90,14 +90,19 @@ $(function()
var password2Encrypted = false
$('#password1').change(function(){password1Encrypted = false});
$('#password2').change(function(){password2Encrypted = false});
var passwordStrength = 0;
$('#submit').click(function()
{
if(!password1Encrypted || !password2Encrypted)
{
var password1 = $('#password1').val();
var password2 = $('#password2').val();
var passwordStrength = computePasswordStrength(password1);
if(!password1Encrypted) $("#passwordLength").val(password1.length);
var password1 = $('#password1').val();
var password2 = $('#password2').val();
if(!password1Encrypted)
{
passwordStrength = computePasswordStrength(password1);
$("#passwordLength").val(password1.length);
}
if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
$("form input[name=passwordStrength]").val(passwordStrength);
module/user/js/edit.js
+7 -2
View File
@@ -4,14 +4,19 @@ $(function()
var password2Encrypted = false
$('#password1').change(function(){password1Encrypted = false});
$('#password2').change(function(){password2Encrypted = false});
var passwordStrength = 0;
$('#submit').click(function()
{
if(!password1Encrypted || !password2Encrypted)
{
var password1 = $('#password1').val().trim();
var password2 = $('#password2').val().trim();
var passwordStrength = computePasswordStrength(password1);
if(!password1Encrypted) $("#passwordLength").val(password1.length);
if(!password1Encrypted)
{
passwordStrength = computePasswordStrength(password1);
$("#passwordLength").val(password1.length);
}
if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
$("form input[name=passwordStrength]").val(passwordStrength);
module/user/js/reset.js
+3 -1
View File
@@ -4,13 +4,15 @@ $(document).ready(function()
var password2Encrypted = false
$('#password1').change(function(){password1Encrypted = false});
$('#password2').change(function(){password2Encrypted = false});
var passwordStrength = 0;
$('form #submit').click(function()
{
if(!password1Encrypted || !password2Encrypted)
{
var password1 = $('#password1').val().trim();
var password2 = $('#password2').val().trim();
var passwordStrength = computePasswordStrength(password1);
if(!password1Encrypted) 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);
module/user/js/resetpassword.js
+7 -2
View File
@@ -14,14 +14,19 @@ $(function()
var password2Encrypted = false
$('#password1').change(function(){password1Encrypted = false});
$('#password2').change(function(){password2Encrypted = false});
var passwordStrength = 0;
$('#submit').click(function()
{
if(!password1Encrypted || !password2Encrypted)
{
var password1 = $('#password1').val().trim();
var password2 = $('#password2').val().trim();
var passwordStrength = computePasswordStrength(password1);
if(!password1Encrypted) $("#passwordLength").val(password1.length);
if(!password1Encrypted)
{
passwordStrength = computePasswordStrength(password1);
$("#passwordLength").val(password1.length);
}
if($("form input[name=passwordStrength]").length == 0) $('#submit').after("<input type='hidden' name='passwordStrength' value='0' />");
$("form input[name=passwordStrength]").val(passwordStrength);
module/user/view/create.html.php
+1 -1
View File
@@ -54,7 +54,7 @@ $showVisionList = count($visionList) > 1;
<td>
<input type='password' style="display:none"> <!-- for disable autocomplete all browser -->
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)'");?>
<?php echo html::password('password1', '', "class='form-control' onkeyup='checkPassword(this.value)'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>
module/user/view/edit.html.php
+1 -1
View File
@@ -71,7 +71,7 @@
<td>
<input type='password' style="display:none"> <!-- Disable input password by browser automatically. -->
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control disabled-ie-placeholder' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)' placeholder='" . zget($lang->user->placeholder->passwordStrength, $config->safe->mode, '') . "'");?>
<?php echo html::password('password1', '', "class='form-control disabled-ie-placeholder' onkeyup='checkPassword(this.value)' placeholder='" . zget($lang->user->placeholder->passwordStrength, $config->safe->mode, '') . "'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>
module/user/view/resetpassword.html.php
+1 -1
View File
@@ -29,7 +29,7 @@ include '../../common/view/header.lite.html.php';
<div class='form-group'>
<label for='password1'><?php echo $lang->user->password;?></label>
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control' required placeholder='" . zget($lang->user->placeholder->loginPassword, $config->safe->mode, '') . "' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)'");?>
<?php echo html::password('password1', '', "class='form-control' required placeholder='" . zget($lang->user->placeholder->loginPassword, $config->safe->mode, '') . "' onkeyup='checkPassword(this.value)'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</div>