From b761aa029bcb07d6f4f35b3ab9670aa7bbe431f7 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Tue, 21 Jun 2022 02:50:55 +0000
Subject: [PATCH] * Finish task #57907

---
 module/install/model.php           | 10 ++++++++++
 module/install/view/step5.html.php |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/module/install/model.php b/module/install/model.php
index 794df3de6d..8d4b8d65c3 100644
--- a/module/install/model.php
+++ b/module/install/model.php
@@ -516,6 +516,16 @@ class installModel extends model
             }
         }
 
+        /* Check password. */
+        if(!validater::checkReg($this->post->password, '|(.){6,}|')) dao::$errors['password'][] = $this->lang->error->passwordrule;
+        if(isset($this->config->safe->mode) and (strlen($this->post->password) < $this->config->safe->mode)) dao::$errors['password'][] = $this->lang->user->weakPassword;
+        if(!empty($this->config->safe->changeWeak))
+        {
+            if(!isset($this->config->safe->weak)) $this->app->loadConfig('admin');
+            if(strpos(",{$this->config->safe->weak},", ",{$this->post->password},") !== false) dao::$errors['password'][] = sprintf($this->lang->user->errorWeak, $this->config->safe->weak);
+        }
+        if(dao::isError()) return false;
+
         /* Insert a company. */
         $company = new stdclass();
         $company->name   = $data->company;
diff --git a/module/install/view/step5.html.php b/module/install/view/step5.html.php
index 91ab940ac3..71af2e7ba8 100644
--- a/module/install/view/step5.html.php
+++ b/module/install/view/step5.html.php
@@ -46,7 +46,7 @@
     </div>
     <div class='modal-body'>
       <form method='post'>
-        <table class='table table-form mw-400px' style='margin: 0 auto'>
+        <table class='table table-form mw-500px' style='margin: 0 auto'>
           <tr>
             <th class='c-company'><?php echo $lang->install->company;?></th>
             <td class='c-company-value'><?php echo html::input('company', '', "class='form-control'");?></td>
@@ -61,7 +61,8 @@
           </tr>
           <tr>
             <th><?php echo $lang->install->password;?></th>
-            <td><?php echo html::input('password', '', "class='form-control'");?></td>
+            <td><?php echo html::input('password', '', "class='form-control' oninput=\"this.value = this.value.replace(/[\u4e00-\u9fa5d]/g, '');\"");?></td>
+            <td><?php echo $lang->user->placeholder->password1;?></td>
           </tr>
           <tr>
             <th></th><td><?php echo html::checkBox('importDemoData', $lang->install->importDemoData);?></td>