From f711e0984e6214a24158f6cb8ae50f263634fb55 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 12 Jul 2022 17:10:11 +0800
Subject: [PATCH] * Fix bug #24991.

---
 module/user/css/resetpassword.css       | 2 ++
 module/user/js/resetpassword.js         | 8 ++++++++
 module/user/view/resetpassword.html.php | 7 ++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/module/user/css/resetpassword.css b/module/user/css/resetpassword.css
index 6b4f07ad45..8320dcbfb1 100644
--- a/module/user/css/resetpassword.css
+++ b/module/user/css/resetpassword.css
@@ -9,3 +9,5 @@ body {background: #1183fb linear-gradient(-90deg, #0a48d1 0%, #1183fb 100%); bac
 #resetForm .form-control:focus {border-color: #2272eb; background: #fff;}
 #resetForm .form-actions {padding-bottom: 20px;}
 .required:after {top: 32px; right: -15px;}
+#resetPanel .form-group .input-group {width: 100%}
+#resetPanel .form-group .input-group.required:after {top: 6px;}
diff --git a/module/user/js/resetpassword.js b/module/user/js/resetpassword.js
index f555d709c3..f691afa07c 100644
--- a/module/user/js/resetpassword.js
+++ b/module/user/js/resetpassword.js
@@ -11,4 +11,12 @@ $(function()
     }
 
     $('#password1').attr('id', 'password');
+
+    $('#submit').click(function()
+    {
+        var password1        = $('#password').val();
+        var passwordStrength = computePasswordStrength(password1);
+
+        $("form input[id=passwordStrength]").val(passwordStrength);
+    })
 })
diff --git a/module/user/view/resetpassword.html.php b/module/user/view/resetpassword.html.php
index 1508c17b37..ef1bcdc341 100644
--- a/module/user/view/resetpassword.html.php
+++ b/module/user/view/resetpassword.html.php
@@ -27,7 +27,10 @@ include '../../common/view/header.lite.html.php';
             <tbody>
               <div class='form-group'>
                 <label for='password1'><?php echo $lang->user->password;?></label>
-                <?php echo html::password('password1', '', "class='form-control' required placeholder='{$lang->user->placeholder->loginPassword}'");?>
+                <span class='input-group'>
+                  <?php echo html::password('password1', '', "class='form-control' required placeholder='{$lang->user->placeholder->loginPassword}' onmouseup='checkPassword(this.value)' onkeyup='checkPassword(this.value)'");?>
+                  <span class='input-group-addon' id='passwordStrength'></span>
+                </span>
               </div>
               <div class='form-group'>
                 <label for='password2'><?php echo $lang->user->password2AB;?></label>
@@ -37,6 +40,7 @@ include '../../common/view/header.lite.html.php';
                 <td colspan='2' class="form-actions text-center">
                   <?php
                   echo html::hidden('account', $user->account);
+                  echo html::hidden('passwordStrength', '');
                   echo html::submitButton($lang->user->submit);
                   echo html::a(inlink('login'), $lang->goback, '', 'class="btn btn-wide"');
                   ?>
@@ -50,4 +54,5 @@ include '../../common/view/header.lite.html.php';
   </div>
 </div>
 <?php endif;?>
+<?php js::set('passwordStrengthList', $lang->user->passwordStrengthList)?>
 <?php include '../../common/view/footer.lite.html.php';?>