Merge branch 'sprint/scx_userapi' into 'master'

Sprint/scx userapi See merge request easycorp/zentaopms!6203
2022-11-16 09:21:03 +00:00
parent 6b8fba345d 4692b3e26e
commit fb274164f6
2 changed files with 6 additions and 4 deletions
@@ -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;