From a8cc43a0ff1cf6297577fae8536408287518baf4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 14 Feb 2021 15:31:03 +0300
Subject: move logout_user() to UserHelper

---
 classes/userhelper.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'classes/userhelper.php')

diff --git a/classes/userhelper.php b/classes/userhelper.php
index c9c4dd102..8eb97f5d0 100644
--- a/classes/userhelper.php
+++ b/classes/userhelper.php
@@ -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();
+	}
+
 }
-- 
cgit v1.2.3-54-g00ecf