From a4c89f47d654d1552756e987792379af360c10da Mon Sep 17 00:00:00 2001 From: chaideqing Date: Mon, 12 Dec 2022 15:48:55 +0800 Subject: [PATCH 1/2] * Fix feedback1714. --- module/user/control.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/user/control.php b/module/user/control.php index 8d3c27350b..b42b793f23 100755 --- a/module/user/control.php +++ b/module/user/control.php @@ -1048,10 +1048,10 @@ class user extends control public function logout($referer = 0) { if(isset($this->app->user->id)) $this->loadModel('action')->create('user', $this->app->user->id, 'logout'); + setcookie('za', false, time() - 3600, $this->config->webRoot); + setcookie('zp', false, time() - 3600, $this->config->webRoot); + setcookie('tab', false, time() - 3600, $this->config->webRoot); ; session_destroy(); - setcookie('za', false); - setcookie('zp', false); - setcookie('tab', false); if($this->app->getViewType() == 'json') return print(json_encode(array('status' => 'success'))); $vars = !empty($referer) ? "referer=$referer" : ''; From 4f5d210d1fc9ef8c53ac331b5cc287df84b16bd0 Mon Sep 17 00:00:00 2001 From: chaideqing Date: Thu, 15 Dec 2022 10:40:07 +0800 Subject: [PATCH 2/2] * Fix feedback 1657. --- module/user/model.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/user/model.php b/module/user/model.php index b03f2abb1f..d9334f9ab2 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -663,6 +663,8 @@ class userModel extends model $this->mail->syncSendCloud('sync', $user->email, $user->realname); } } + + if($_POST['account'] == $this->app->user->account and $user->role != $_SESSION['user']->role) $_SESSION['user']->role = $user->role; } /**