From 7f1029c349825872f3e152b4dadeaac199bce2e1 Mon Sep 17 00:00:00 2001 From: guanxiying Date: Mon, 2 Nov 2020 16:31:10 +0800 Subject: [PATCH] * Add usermodel::login function --- module/user/control.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/module/user/control.php b/module/user/control.php index a05d0f7485..fe108126b1 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -731,17 +731,8 @@ class user extends control if($user) { - $this->user->cleanLocked($user->account); - /* Authorize him and save to session. */ - $user->rights = $this->user->authorize($user->account); - $user->groups = $this->user->getGroups($user->account); - $user->view = $this->user->grantUserView($user->account, $user->rights['acls']); - $this->session->set('user', $user); - $this->app->user = $this->session->user; - $this->loadModel('action')->create('user', $user->id, 'login'); - $this->loadModel('score')->create('user', 'login'); - /* Keep login. */ - if($this->post->keepLogin) $this->user->keepLogin($user); + /* Set user group, rights, view and aword login score. */ + $user = $this->user->login($user); /* Go to the referer. */ if($this->post->referer and strpos($this->post->referer, $loginLink) === false and strpos($this->post->referer, $denyLink) === false and strpos($this->post->referer, 'block') === false) @@ -1117,4 +1108,5 @@ class user extends control die(json_encode($newUsers)); } + }