Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #20588.

Browse Source
This commit is contained in:
caoyanyi
2022-03-18 14:26:57 +08:00
parent 307c410724
commit 5865f3ab34
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/install/config.php
+3
View File
@@ -0,0 +1,3 @@
<?php
$config->install = new stdclass();
$config->install->step5RequiredFields = 'company,account,password';
module/install/lang/en.php
+4 -1
View File
@@ -157,7 +157,10 @@ $lang->install->getPriv = 'Set Admin';
$lang->install->company = 'Company Name';
$lang->install->account = 'Admin Account';
$lang->install->password = 'Admin Password';
$lang->install->errorEmptyPassword = 'Password should not be blank.';
$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.";
$lang->install->processList['11'] = 'Project management';
$lang->install->processList['12'] = 'Project planning';
module/install/lang/zh-cn.php
+4 -1
View File
@@ -157,7 +157,10 @@ $lang->install->getPriv = '设置帐号';
$lang->install->company = '公司名称';
$lang->install->account = '管理员帐号';
$lang->install->password = '管理员密码';
$lang->install->errorEmptyPassword = '密码不能为空';
$lang->install->errorEmpty['company'] = "{$lang->install->company}不能为空";
$lang->install->errorEmpty['account'] = "{$lang->install->account}不能为空";
$lang->install->errorEmpty['password'] = "{$lang->install->password}不能为空";
$lang->install->processList['11'] = '立项管理';
$lang->install->processList['12'] = '项目规划';
module/install/model.php
+11 -3
View File
@@ -502,13 +502,21 @@ class installModel extends model
*/
public function grantPriv()
{
if($this->post->password == '') return print(js::error($this->lang->install->errorEmptyPassword));
$requiredFields = explode(',', $this->config->install->step5RequiredFields);
foreach($requiredFields as $field)
{
if(empty($this->post->{$field}))
{
dao::$errors[] = $this->lang->install->errorEmpty[$field];
return false;
}
}
/* Insert a company. */
$company = new stdclass();
$company->name = $this->post->company;
$company->admins = ",{$this->post->account},";
$this->dao->insert(TABLE_COMPANY)->data($company)->autoCheck()->batchCheck('name', 'notempty')->exec();
$this->dao->insert(TABLE_COMPANY)->data($company)->autoCheck()->exec();
if(!dao::isError())
{
/* Set admin. */
@@ -518,7 +526,7 @@ class installModel extends model
$admin->password = md5($this->post->password);
$admin->gender = 'f';
$admin->visions = 'rnd,lite';
$this->dao->replace(TABLE_USER)->data($admin)->check('account', 'notempty')->exec();
$this->dao->replace(TABLE_USER)->data($admin)->exec();
}
}