valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more php8 fixes mostly related to login

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
Show Stats 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();

2
include/functions.php
View File

@ -148,7 +148,7 @@
$lang = _TRANSLATION_OVERRIDE_DEFAULT;
}
if ($_SESSION["uid"] && get_schema_version() >= 120) {
if (!empty($_SESSION["uid"]) && get_schema_version() >= 120) {
$pref_lang = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
if ($pref_lang && $pref_lang != 'auto') {

6
include/login_form.php
View File

@ -99,7 +99,7 @@
<?php print_hidden("op", "login"); ?>
<?php if ($_SESSION["login_error_msg"]) { ?>
<?php if (!empty($_SESSION["login_error_msg"])) { ?>
<?php echo format_error($_SESSION["login_error_msg"]) ?>
<?php $_SESSION["login_error_msg"] = ""; ?>
<?php } ?>
@ -110,7 +110,7 @@
onchange="UtilityApp.fetchProfiles()"
onfocus="UtilityApp.fetchProfiles()"
onblur="UtilityApp.fetchProfiles()"
required="1" value="<?php echo $_SESSION["fake_login"] ?>" />
required="1" value="<?php echo $_SESSION["fake_login"] ?? "" ?>" />
</fieldset>
<fieldset>
@ -122,7 +122,7 @@
onchange="UtilityApp.fetchProfiles()"
onfocus="UtilityApp.fetchProfiles()"
onblur="UtilityApp.fetchProfiles()"
value="<?php echo $_SESSION["fake_password"] ?>"/>
value="<?php echo $_SESSION["fake_password"] ?? "" ?>"/>
</fieldset>
<?php if (strpos(PLUGINS, "auth_internal") !== false) { ?>
<fieldset class="align-right">

2
include/sessions.php
View File

@ -46,7 +46,7 @@
}
$pdo = Db::pdo();
if ($_SESSION["uid"]) {
if (!empty($_SESSION["uid"])) {
if (!defined('_SESSION_SKIP_UA_CHECKS') && $_SESSION["user_agent"] != sha1($_SERVER['HTTP_USER_AGENT'])) {
$_SESSION["login_error_msg"] = __("Session failed to validate (UA changed).");

2
plugins/auth_internal/init.php
View File

@ -22,7 +22,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
$pwd_hash1 = encrypt_password($password);
$pwd_hash2 = encrypt_password($password, $login);
$otp = (int)$_REQUEST["otp"];
$otp = (int) ($_REQUEST["otp"] ?? 0);
if (get_schema_version() > 96) {