public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 10:45:56 +00:00
Code Issues Releases Wiki Activity

move logout_user() to UserHelper

Browse Source
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
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() { function logout() {
Pref_Users::logout_user(); UserHelper::logout();
$this->wrap(self::STATUS_OK, array("status" => "OK")); $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() { function logout() {
if (validate_csrf($_POST["csrf_token"])) { if (validate_csrf($_POST["csrf_token"])) {
Pref_Users::logout_user(); UserHelper::logout();
header("Location: index.php"); header("Location: index.php");
} else { } else {
header("Content-Type: text/json"); header("Content-Type: text/json");

11
classes/pref/users.php
View File

@@ -418,15 +418,4 @@ class Pref_Users extends Handler_Protected {
return $default; 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"])) { if (empty($_SESSION["uid"])) {
Pref_Users::logout_user(); UserHelper::logout();
Handler_Public::render_login_form(); Handler_Public::render_login_form();
exit; exit;
@@ -157,4 +157,16 @@ class UserHelper {
return false; 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();
}
} }