move logout_user() to UserHelper

1 files changed, 13 insertions, 1 deletions

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();
+	}
+
 }