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

* adjust for check password.

Browse Source
This commit is contained in:
wangyidong
2015-05-20 13:45:54 +08:00
parent 0cfdc19e15
commit 061815355a
9 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/changepassword.html.php
+3 -3
View File
@@ -29,7 +29,7 @@
<th><?php echo $lang->user->password;?></th>
<td>
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onkeyup='checkPwd(this.value)'");?>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>
@@ -48,9 +48,9 @@
<?php js::set('passwordStrengthList', $lang->user->passwordStrengthList)?>
<script>
function checkPwd(password)
function checkPassword(password)
{
$('#passwordStrength').html(passwordStrengthList[computePasswordStrength(password)]);
$('#passwordStrength').html(password == '' ? '' : passwordStrengthList[computePasswordStrength(password)]);
}
</script>
<?php include '../../common/view/footer.html.php';?>
module/my/view/editprofile.html.php
+3 -3
View File
@@ -55,7 +55,7 @@
<th><?php echo $lang->user->password;?></th>
<td>
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onkeyup='checkPwd(this.value)'");?>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>
@@ -112,9 +112,9 @@
</div>
<?php js::set('passwordStrengthList', $lang->user->passwordStrengthList)?>
<script>
function checkPwd(password)
function checkPassword(password)
{
$('#passwordStrength').html(passwordStrengthList[computePasswordStrength(password)]);
$('#passwordStrength').html(password == '' ? '' : passwordStrengthList[computePasswordStrength(password)]);
}
</script>
<?php include '../../common/view/footer.html.php';?>
module/user/js/common.js
+2 -2
View File
@@ -40,7 +40,7 @@ function changeEmail(num)
account[num] = $('.account_' + num).val();
}
function checkPwd(password)
function checkPassword(password)
{
$('#passwordStrength').html(passwordStrengthList[computePasswordStrength(password)]);
$('#passwordStrength').html(password == '' ? '' : passwordStrengthList[computePasswordStrength(password)]);
}
module/user/lang/en.php
+3 -3
View File
@@ -122,9 +122,9 @@ $lang->user->roleList['others'] = 'Others';
$lang->user->genderList['m'] = 'Male';
$lang->user->genderList['f'] = 'Female';
$lang->user->passwordStrengthList[0] = 'Weak';
$lang->user->passwordStrengthList[1] = 'Good';
$lang->user->passwordStrengthList[2] = 'Strong';
$lang->user->passwordStrengthList[0] = "<span style='color:red'>Weak</span>";
$lang->user->passwordStrengthList[1] = "<span style='color:#000'>Good</span>";
$lang->user->passwordStrengthList[2] = "<span style='color:green'>Strong</span>";
$lang->user->statusList['active'] = 'Activate';
$lang->user->statusList['delete'] = 'Deleted';
module/user/lang/zh-cn.php
+3 -3
View File
@@ -122,9 +122,9 @@ $lang->user->roleList['others'] = '其他';
$lang->user->genderList['m'] = '男';
$lang->user->genderList['f'] = '女';
$lang->user->passwordStrengthList[0] = '弱';
$lang->user->passwordStrengthList[1] = '中';
$lang->user->passwordStrengthList[2] = '强';
$lang->user->passwordStrengthList[0] = "<span style='color:red'>弱</span>";
$lang->user->passwordStrengthList[1] = "<span style='color:#000'>中</span>";
$lang->user->passwordStrengthList[2] = "<span style='color:green'>强</span>";
$lang->user->statusList['active'] = '正常';
$lang->user->statusList['delete'] = '删除';
module/user/model.php
+2 -1
View File
@@ -509,6 +509,7 @@ class userModel extends model
$hash = sha1($record->account . $record->password . $record->last);
$user = $password == $hash ? $record : '';
}
if(!$user and md5($password) == $record->password) $user = $record;
}
if($user)
@@ -970,7 +971,7 @@ class userModel extends model
}
$strength += strlen($uniqueChars) * 2;
$strength = $strength > 99 ? 99 : $strength;
$strength = $strength > 89 ? 89 : $strength;
$strength = floor($strength / 10);
$strength = floor($strength / 3);
module/user/view/create.html.php
+1 -1
View File
@@ -39,7 +39,7 @@
<th><?php echo $lang->user->password;?></th>
<td>
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onkeyup='checkPwd(this.value)'");?>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>
module/user/view/edit.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
<th><?php echo $lang->user->password;?></th>
<td>
<span class='input-group'>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onkeyup='checkPwd(this.value)'");?>
<?php echo html::password('password1', '', "class='form-control' autocomplete='off' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)'");?>
<span class='input-group-addon' id='passwordStrength'></span>
</span>
</td>
www/js/my.full.js
+1 -1
View File
@@ -1310,7 +1310,7 @@ function computePasswordStrength(password)
strength += uniqueChars.length * 2;
strength = strength > 99 ? 99 : strength;
strength = strength > 89 ? 89 : strength;
strength = Math.floor(strength / 10);
strength = Math.floor(strength / 3);