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

Merge branch 'sprint/scx_userapi' into 'master'

Browse Source 
Sprint/scx userapi

See merge request easycorp/zentaopms!6203
This commit is contained in:
孙广明
2022-11-16 09:21:03 +00:00
parent 6b8fba345d 4692b3e26e
commit fb274164f6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/user.php
+6 -2
View File
@@ -408,8 +408,12 @@ class userEntry extends entry
$this->setPost('gender', $gender);
$password = $this->request('password', zget($_POST, 'password', ''));
$this->setPost('password1', md5($password));
$this->setPost('password2', md5($password));
if($password)
{
$this->setPost('password1', md5($password));
$this->setPost('password2', md5($password));
$this->setPost('passwordStrength', 2);
}
$this->setPost('verifyPassword', md5($this->app->user->password . $this->app->session->rand));
$control = $this->loadController('user', 'edit');
module/user/model.php
-2
View File
@@ -567,8 +567,6 @@ class userModel extends model
->remove('new, password1, password2, groups,verifyPassword, passwordStrength,passwordLength')
->get();
/* Fix bug for api requests using json. */
if($this->app->getViewType() == 'json') $this->post->verifyPassword = md5(md5($this->post->verifyPassword) . $this->session->rand);
if(empty($_POST['verifyPassword']) or $this->post->verifyPassword != md5($this->app->user->password . $this->session->rand))
{
dao::$errors['verifyPassword'][] = $this->lang->user->error->verifyPassword;