Merge branch 'master' of github.com:easysoft/zentaopms

module/admin/lang/en.php

@@ -57,6 +57,10 @@ $lang->admin->safe->modeList[0] = 'N/A';
 $lang->admin->safe->modeList[1] = 'Medium';
 $lang->admin->safe->modeList[2] = 'Strong';
 
+$lang->admin->safe->modeRuleList[1] = 'Should be contain letters and numbers, at lease six characters.';
+$lang->admin->safe->modeRuleList[2] = 'Should be contain letters, numbers and special characters, at lease 10 characters.';
+
+
 $lang->admin->safe->reasonList['weak']     = 'Common Weak Password';
 $lang->admin->safe->reasonList['account']  = 'Same as your account';
 $lang->admin->safe->reasonList['mobile']   = 'Same as your mobile number';

module/admin/lang/zh-cn.php

@@ -57,6 +57,9 @@ $lang->admin->safe->modeList[0] = '不检查';
 $lang->admin->safe->modeList[1] = '中';
 $lang->admin->safe->modeList[2] = '强';
 
+$lang->admin->safe->modeRuleList[1] = '6位以上，包含大小写字母，数字。';
+$lang->admin->safe->modeRuleList[2] = '10位以上，包含字母，数字，特殊字符。';
+
 $lang->admin->safe->reasonList['weak']     = '常用弱口令';
 $lang->admin->safe->reasonList['account']  = '与帐号相同';
 $lang->admin->safe->reasonList['mobile']   = '与手机相同';
@@ -67,4 +70,4 @@ $lang->admin->safe->modifyPasswordList[1] = '必须修改';
 $lang->admin->safe->modifyPasswordList[0] = '不强制';
 
 $lang->admin->safe->noticeMode   = '系统会在登录、创建和修改用户、修改密码的时候检查用户口令。';
-$lang->admin->safe->noticeStrong = '密码长度越长，含有大写字母或数字或特殊符合越多，密码字母越不重复，安全度越强！';
+$lang->admin->safe->noticeStrong = '密码长度越长，含有大写字母或数字或特殊符号越多，密码字母越不重复，安全度越强！';

module/admin/view/safe.html.php

@@ -22,12 +22,16 @@
     <table class='table table-form'>
       <tr>
         <th class='w-130px'><?php echo $lang->admin->safe->password?></th>
-        <td><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0)?></td>
+        <td><?php echo html::radio('mode', $lang->admin->safe->modeList, isset($config->safe->mode) ? $config->safe->mode : 0, "onclick=showModeRule(this.value)")?></td>
         <td><?php echo $lang->admin->safe->noticeMode?></td>
       </tr>
-      <tr>
+      <tr id='mode1Rule' class='hidden'>
         <th></th>
-        <td colspan='2'><span style='color:#03b8cf;font-weight:bold;'><?php echo $lang->admin->safe->noticeStrong;?></span></td>
+        <td colspan='2'><span style='color:#03b8cf;font-weight:bold;'><?php echo $lang->admin->safe->modeRuleList[1] . $lang->admin->safe->noticeStrong;?></span></td>
+      </tr>
+      <tr id='mode2Rule' class='hidden'>
+        <th></th>
+        <td colspan='2'><span style='color:#03b8cf;font-weight:bold;'><?php echo $lang->admin->safe->modeRuleList[2] . $lang->admin->safe->noticeStrong;?></span></td>
       </tr>
       <tr>
         <th><?php echo $lang->admin->safe->weak?></th>
@@ -44,4 +48,24 @@
     </table>
   </form>
 </div>
+<script>
+$(function()
+{
+    var mode = $("input[name='mode']:checked").val();
+    showModeRule(mode);
+});
+function showModeRule(mode)
+{
+    if(mode == 0)
+    {
+        $('#mode1Rule').addClass('hidden');
+        $('#mode2Rule').addClass('hidden');
+    }
+    else
+    {
+        mode == 1 ? $('#mode1Rule').removeClass('hidden') : $('#mode1Rule').addClass('hidden');
+        mode == 2 ? $('#mode2Rule').removeClass('hidden') : $('#mode2Rule').addClass('hidden');
+    }
+}
+</script>
 <?php include '../../common/view/footer.html.php';?>

module/user/lang/zh-cn.php

@@ -129,8 +129,8 @@ $lang->user->placeholder->group     = '分组决定用户的权限列表。';
 $lang->user->placeholder->commiter  = '版本控制系统(subversion)中的帐号';
 $lang->user->placeholder->verify    = '需要输入你的密码加以验证';
 
-$lang->user->placeholder->passwordStrength[1] = '强度必须为中，6位以上，包含大小写字母，数字。';
-$lang->user->placeholder->passwordStrength[2] = '强度必须为强，10位以上，包含字母，数字，特殊字符。';
+$lang->user->placeholder->passwordStrength[1] = '6位以上，包含大小写字母，数字。';
+$lang->user->placeholder->passwordStrength[2] = '10位以上，包含大小写字母，数字，特殊字符。';
 
 $lang->user->error = new stdclass();
 $lang->user->error->account       = "ID %s，英文、数字和下划线的组合，三位以上";