* adjust for password safe.

module/user/lang/zh-cn.php

@@ -141,6 +141,9 @@ $lang->user->placeholder->join      = '入职日期';
 $lang->user->placeholder->commiter  = '版本控制系统(subversion)中的帐号';
 $lang->user->placeholder->verify    = '需要输入你的密码加以验证';
 
+$lang->user->placeholder->passwordStrength[1] = '强度必须为中，尽量多包含数字，大写字母';
+$lang->user->placeholder->passwordStrength[2] = '强度必须为强，15位以上，密码尽量复杂';
+
 $lang->user->error = new stdclass();
 $lang->user->error->account       = "ID %s，英文、数字和下划线的组合，三位以上";
 $lang->user->error->accountDupl   = "ID %s，该用户名已经存在";

module/user/model.php

@@ -1003,18 +1003,23 @@ class userModel extends model
         $chars = str_split($password);
         foreach($chars as $letter)
         {
-            if($letter >= 48 && $letter <= 57)
-            {
-                $strength += 1;
-            }
-            elseif($letter >= 65 && $letter <= 90)
-            {
-                $strength += 1;
-            }
-            elseif(!($letter >= 97 && $letter <= 122))
+            $asc = ord($letter);
+            if($asc >= 48 && $asc <= 57)
             {
                 $strength += 2;
             }
+            elseif($asc >= 65 && $asc <= 90)
+            {
+                $strength += 2;
+            }
+            elseif($asc >= 97 && $asc <= 122)
+            {
+                $strength += 1;
+            }
+            else
+            {
+                $strength += 3;
+            }
             if(strpos($uniqueChars, $letter) === false) $uniqueChars .= $letter;
         }
         $strength += strlen($uniqueChars) * 2;

module/user/view/create.html.php

@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
+<?php if(!empty($config->safe->mode)) $lang->user->placeholder->password1 = $lang->user->placeholder->passwordStrength[$config->safe->mode]?>
 <?php js::set('holders', $lang->user->placeholder);?>
 <?php js::set('roleGroup', $roleGroup);?>
 <div class='container mw-700px'>

module/user/view/edit.html.php

@@ -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' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)'");?>
+            <?php echo html::password('password1', '', "class='form-control' autocomplete='off' onmouseup='checkPassword(this.value)' 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>