From 5bad1b316797aa08dcf405d2bbea22b82ef2c4f6 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 22 Jun 2022 01:26:42 +0000
Subject: [PATCH] * Code for task #57907

---
 module/install/control.php         | 6 +++---
 module/install/css/step5.css       | 2 ++
 module/install/css/step5.en.css    | 2 ++
 module/install/lang/en.php         | 3 +++
 module/install/lang/zh-cn.php      | 3 +++
 module/install/view/step5.html.php | 6 +++---
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/module/install/control.php b/module/install/control.php
index 6bff548f45..9c50c5b46a 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -233,13 +233,13 @@ class install extends control
         if(!empty($_POST))
         {
             $this->install->grantPriv();
-            if(dao::isError()) return print(js::error(dao::getError()) . js::locate('back'));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             $this->install->updateLang();
-            if(dao::isError()) return print(js::error(dao::getError()) . js::locate('back'));
+            if(dao::isError()) return print(js::error(dao::getError()));
 
             if($this->post->importDemoData) $this->install->importDemoData();
-            if(dao::isError()) return print(js::alert($this->lang->install->errorImportDemoData) . js::locate('back'));
+            if(dao::isError()) return print(js::alert($this->lang->install->errorImportDemoData));
 
             $this->loadModel('setting');
             $this->setting->updateVersion($this->config->version);
diff --git a/module/install/css/step5.css b/module/install/css/step5.css
index 5526a07669..77c4b08ec7 100644
--- a/module/install/css/step5.css
+++ b/module/install/css/step5.css
@@ -1,2 +1,4 @@
 .c-company {width: 80px !important;}
 .c-company-value {width: 300px !important;}
+
+.mw-table {max-width: 650px !important;}
diff --git a/module/install/css/step5.en.css b/module/install/css/step5.en.css
index bb3ccf4590..a5323b8c54 100644
--- a/module/install/css/step5.en.css
+++ b/module/install/css/step5.en.css
@@ -1,2 +1,4 @@
 .c-company {width: 150px !important;}
 .c-company-value {width: 350px !important;}
+
+.mw-table {max-width: 950px !important;}
diff --git a/module/install/lang/en.php b/module/install/lang/en.php
index 652947b614..8e164c8c99 100644
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -161,6 +161,9 @@ $lang->install->company            = 'Company Name';
 $lang->install->account            = 'Admin Account';
 $lang->install->password           = 'Admin Password';
 
+$lang->install->placeholder = new stdclass();
+$lang->install->placeholder->password = 'Combination of letters, numbers and special symbols, at least 6 characters';
+
 $lang->install->errorEmpty['company']  = "{$lang->install->company} should not be blank.";
 $lang->install->errorEmpty['account']  = "{$lang->install->account} should not be blank.";
 $lang->install->errorEmpty['password'] = "{$lang->install->password} should not be blank.";
diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php
index c4447245d2..dd588228df 100644
--- a/module/install/lang/zh-cn.php
+++ b/module/install/lang/zh-cn.php
@@ -161,6 +161,9 @@ $lang->install->company            = '公司名称';
 $lang->install->account            = '管理员帐号';
 $lang->install->password           = '管理员密码';
 
+$lang->install->placeholder = new stdclass();
+$lang->install->placeholder->password = '六位及以上，包含数字、字母和特殊字符';
+
 $lang->install->errorEmpty['company']  = "{$lang->install->company}不能为空";
 $lang->install->errorEmpty['account']  = "{$lang->install->account}不能为空";
 $lang->install->errorEmpty['password'] = "{$lang->install->password}不能为空";
diff --git a/module/install/view/step5.html.php b/module/install/view/step5.html.php
index 71af2e7ba8..3747b57c69 100644
--- a/module/install/view/step5.html.php
+++ b/module/install/view/step5.html.php
@@ -45,8 +45,8 @@
       <strong><?php echo $lang->install->getPriv;?></strong>
     </div>
     <div class='modal-body'>
-      <form method='post'>
-        <table class='table table-form mw-500px' style='margin: 0 auto'>
+      <form method='post' target='hiddenwin'>
+        <table class='table table-form mw-table' 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>
@@ -62,7 +62,7 @@
           <tr>
             <th><?php echo $lang->install->password;?></th>
             <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>
+            <td><?php echo $lang->install->placeholder->password;?></td>
           </tr>
           <tr>
             <th></th><td><?php echo html::checkBox('importDemoData', $lang->install->importDemoData);?></td>