diff --git a/module/user/config.php b/module/user/config.php new file mode 100644 index 0000000000..ac33415cb8 --- /dev/null +++ b/module/user/config.php @@ -0,0 +1,3 @@ +user->create->requiredFields = 'account,realname,password,password1,password2'; +$config->user->edit->requiredFields = 'account,realname'; diff --git a/module/user/model.php b/module/user/model.php index c6374b4e11..c2832cbf06 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -96,7 +96,7 @@ class userModel extends model $this->dao->insert(TABLE_USER)->data($user) ->autoCheck() - ->batchCheck('account, realname, password', 'notempty') + ->batchCheck($this->config->user->create->requiredFields, 'notempty') ->check('account', 'unique') ->check('account', 'account') ->checkIF($this->post->email != false, 'email', 'email') @@ -119,7 +119,7 @@ class userModel extends model $this->dao->update(TABLE_USER)->data($user) ->autoCheck() - ->batchCheck('account, realname', 'notempty') + ->batchCheck($this->config->user->edit->requiredFields, 'notempty') ->check('account', 'unique', "id != '$userID'") ->check('account', 'account') ->checkIF($this->post->email != false, 'email', 'email') diff --git a/module/user/view/create.html.php b/module/user/view/create.html.php index ec6bffeb30..d789822d56 100644 --- a/module/user/view/create.html.php +++ b/module/user/view/create.html.php @@ -30,23 +30,23 @@