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

Merge branch 'sugon' of https://gitlab.zcorp.cc/easycorp/zentaopms into sugon

Browse Source
This commit is contained in:
liyuchun
2021-11-25 14:14:37 +08:00
parent 2aec31c5e0 1d8099d5ff
commit fd3a7312dc
3 changed files with 19 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/gitlab/model.php
View File

@@ -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;