* code for task #6337.

module/install/lang/zh-cn.php

@@ -95,6 +95,7 @@ $lang->install->defaultLang    = '默认语言';
 $lang->install->dbHost         = '数据库服务器';
 $lang->install->dbHostNote     = '如果127.0.0.1无法访问，尝试使用localhost';
 $lang->install->dbPort         = '服务器端口';
+$lang->install->dbEncoding     = '数据库编码';
 $lang->install->dbUser         = '数据库用户名';
 $lang->install->dbPassword     = '数据库密码';
 $lang->install->dbName         = 'PMS使用的库';

module/install/model.php

@@ -354,10 +354,10 @@ class installModel extends model
         $this->config->db->host     = $this->post->dbHost;
         $this->config->db->name     = $this->post->dbName;
         $this->config->db->user     = $this->post->dbUser;
+        $this->config->db->encoding = $this->post->dbEncoding;
         $this->config->db->password = $this->post->dbPassword;
         $this->config->db->port     = $this->post->dbPort;
         $this->config->db->prefix   = $this->post->dbPrefix;
-
     }
 
     /**

module/install/view/step2.html.php

@@ -40,6 +40,10 @@
             <th><?php echo $lang->install->dbPort;?></th>
             <td><?php echo html::input('dbPort', '3306', "class='form-control'");?></td><td></td>
           </tr>
+          <tr>
+            <th><?php echo $lang->install->dbEncoding;?></th>
+            <td><?php echo html::input('dbEncoding', $this->config->db->encoding, "class='form-control'");?></td><td></td>
+          </tr>
           <tr>
             <th><?php echo $lang->install->dbUser;?></th>
             <td><?php echo html::input('dbUser', 'root', "class='form-control'");?></td><td></td>

module/install/view/step3.html.php

@@ -23,6 +23,7 @@ if(!isset($error))
 \$config->db->port        = '$dbPort';
 \$config->db->name        = '$dbName';
 \$config->db->user        = '$dbUser';
+\$config->db->encoding    = '$dbEncoding';
 \$config->db->password    = '$dbPassword';
 \$config->db->prefix      = '$dbPrefix';
 \$config->webRoot         = getWebRoot();