valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move logout_user() to UserHelper

This commit is contained in:
Andrew Dolgov 2021-02-14 15:31:03 +03:00
parent 2547ece0ca
commit a8cc43a0ff
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/api.php
View File

@ -81,7 +81,7 @@ class API extends Handler {
}
function logout() {
Pref_Users::logout_user();
UserHelper::logout();
$this->wrap(self::STATUS_OK, array("status" => "OK"));
}

2
classes/handler/public.php
View File

@ -286,7 +286,7 @@ class Handler_Public extends Handler {
function logout() {
if (validate_csrf($_POST["csrf_token"])) {
Pref_Users::logout_user();
UserHelper::logout();
header("Location: index.php");
} else {
header("Content-Type: text/json");

11
classes/pref/users.php
View File

@ -418,15 +418,4 @@ class Pref_Users extends Handler_Protected {
return $default;
}
static function logout_user() {
if (session_status() === PHP_SESSION_ACTIVE)
session_destroy();
if (isset($_COOKIE[session_name()])) {
setcookie(session_name(), '', time()-42000, '/');
}
session_commit();
}
}

14
classes/userhelper.php
View File

@ -105,7 +105,7 @@ class UserHelper {
}
if (empty($_SESSION["uid"])) {
Pref_Users::logout_user();
UserHelper::logout();
Handler_Public::render_login_form();
exit;
@ -157,4 +157,16 @@ class UserHelper {
return false;
}
static function logout() {
if (session_status() === PHP_SESSION_ACTIVE)
session_destroy();
if (isset($_COOKIE[session_name()])) {
setcookie(session_name(), '', time()-42000, '/');
}
session_commit();
}
}