more php8 fixes mostly related to login

5 files changed, 11 insertions, 8 deletions

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 86262326b..0ddf61e80 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -669,8 +669,8 @@ class Handler_Public extends Handler {
 
 			$login = clean($_POST["login"]);
 			$password = clean($_POST["password"]);
-			$remember_me = clean($_POST["remember_me"]);
-			$safe_mode = checkbox_to_sql_bool(clean($_POST["safe_mode"]));
+			$remember_me = clean($_POST["remember_me"] ?? false);
+			$safe_mode = checkbox_to_sql_bool(clean($_POST["safe_mode"] ?? false));
 
 			if ($remember_me) {
 				@session_set_cookie_params(SESSION_COOKIE_LIFETIME);
@@ -686,7 +686,7 @@ class Handler_Public extends Handler {
 				}
 
 				$_SESSION["ref_schema_version"] = get_schema_version(true);
-				$_SESSION["bw_limit"] = !!clean($_POST["bw_limit"]);
+				$_SESSION["bw_limit"] = !!clean($_POST["bw_limit"] ?? false);
 				$_SESSION["safe_mode"] = $safe_mode;
 
 				if (clean($_POST["profile"])) {
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 187a7c525..1a948958e 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -457,9 +457,12 @@ class Pref_Users extends Handler_Protected {
 	}
 
 	static function logout_user() {
-		@session_destroy();
+		if (session_status() === PHP_SESSION_ACTIVE)
+			session_destroy();
+
 		if (isset($_COOKIE[session_name()])) {
 		   setcookie(session_name(), '', time()-42000, '/');
+
 		}
 		session_commit();
 	}
diff --git a/classes/rpc.php b/classes/rpc.php
index fc108478f..57bea0bbe 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -488,7 +488,7 @@ class RPC extends Handler_Protected {
 
 		$params["hotkeys"] = $this->get_hotkeys_map();
 
-		$params["widescreen"] = (int) $_COOKIE["ttrss_widescreen"];
+		$params["widescreen"] = (int) ($_COOKIE["ttrss_widescreen"] ?? 0);
 
 		$params['simple_update'] = defined('SIMPLE_UPDATE_MODE') && SIMPLE_UPDATE_MODE;
 
diff --git a/classes/timehelper.php b/classes/timehelper.php
index ce9e35f3e..e9bd36cad 100644
--- a/classes/timehelper.php
+++ b/classes/timehelper.php
@@ -49,7 +49,7 @@ class TimeHelper {
 
 			$tz_offset = $user_tz->getOffset($dt);
 		} else {
-			$tz_offset = (int) -$_SESSION["clientTzOffset"];
+			$tz_offset = (int) -($_SESSION["clientTzOffset"] ?? 0);
 		}
 
 		$user_timestamp = $dt->format('U') + $tz_offset;
diff --git a/classes/userhelper.php b/classes/userhelper.php
index b81ae87c8..b0a9dc598 100644
--- a/classes/userhelper.php
+++ b/classes/userhelper.php
@@ -97,7 +97,7 @@ class UserHelper {
 		} else {
 			if (!validate_session()) $_SESSION["uid"] = false;
 
-			if (!$_SESSION["uid"]) {
+			if (empty($_SESSION["uid"])) {
 
 				if (AUTH_AUTO_LOGIN && self::authenticate(null, null)) {
 					$_SESSION["ref_schema_version"] = get_schema_version(true);
@@ -105,7 +105,7 @@ class UserHelper {
 					 self::authenticate(null, null, true);
 				}
 
-				if (!$_SESSION["uid"]) {
+				if (empty($_SESSION["uid"])) {
 					Pref_Users::logout_user();
 
 					Handler_Public::render_login_form();