diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 867d1a0bf5..019eacf01d 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -2064,6 +2064,7 @@ class gitlabModel extends model $user = fixer::input('post')->remove('avatar')->get(); if(!empty($_FILES['avatar'])) $user->avatar = curl_file_create($_FILES['avatar']['tmp_name'], $_FILES['avatar']['type'], $_FILES['avatar']['name']); + if(empty($user->account)) dao::$errors['account'][] = $this->lang->gitlab->user->bind . $this->lang->gitlab->user->emptyError; if(empty($user->name)) dao::$errors['name'][] = $this->lang->gitlab->user->name . $this->lang->gitlab->user->emptyError; if(empty($user->username)) dao::$errors['username'][] = $this->lang->gitlab->user->username . $this->lang->gitlab->user->emptyError; if(empty($user->email)) dao::$errors['email'][] = $this->lang->gitlab->user->email . $this->lang->gitlab->user->emptyError; @@ -2114,9 +2115,15 @@ class gitlabModel extends model */ public function editUser($gitlabID) { - $user = fixer::input('post')->remove('username')->removeIF(!$this->post->password, 'password,password_repeat')->remove('avatar')->get(); + $user = fixer::input('post') + ->setDefault('can_create_group', 0) + ->setDefault('external', 0) + ->remove('username,avatar') + ->removeIF(!$this->post->password, 'password,password_repeat') + ->get(); if(!empty($_FILES['avatar'])) $user->avatar = curl_file_create($_FILES['avatar']['tmp_name'], $_FILES['avatar']['type'], $_FILES['avatar']['name']); + if(empty($user->account)) dao::$errors['account'][] = $this->lang->gitlab->user->bind . $this->lang->gitlab->user->emptyError; if(empty($user->name)) dao::$errors['name'][] = $this->lang->gitlab->user->name . $this->lang->gitlab->user->emptyError; if(empty($user->email)) dao::$errors['email'][] = $this->lang->gitlab->user->email . $this->lang->gitlab->user->emptyError; if(dao::isError()) return false; diff --git a/module/gitlab/view/createuser.html.php b/module/gitlab/view/createuser.html.php index 4e897a7c68..5b0219ed80 100644 --- a/module/gitlab/view/createuser.html.php +++ b/module/gitlab/view/createuser.html.php @@ -19,6 +19,10 @@