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

more php8 fixes mostly related to login

Browse Source
This commit is contained in:
Andrew Dolgov
2021-02-06 00:12:15 +03:00
parent 403dca154c
commit 6e774a58fe
9 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/handler/public.php
View File

@@ -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"])) {

5
classes/pref/users.php
View File

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

2
classes/rpc.php
View File

@@ -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;

2
classes/timehelper.php
View File

@@ -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;

4
classes/userhelper.php
View File

@@ -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();