From c26f58d8a54a431ccce06bc6367af77f4a56ee02 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 8 Mar 2021 11:16:32 +0300
Subject: [PATCH] fix some php8 warnings
---
classes/pref/feeds.php | 2 +-
classes/pref/filters.php | 4 ++--
classes/rpc.php | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index ed64dba52..788104d38 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -690,7 +690,7 @@ class Pref_Feeds extends Handler_Protected {
$purge_intl = (int) clean($_POST["purge_interval"] ?? 0);
$feed_id = (int) clean($_POST["id"] ?? 0); /* editSave */
$feed_ids = explode(",", clean($_POST["ids"] ?? "")); /* batchEditSave */
- $cat_id = (int) clean($_POST["cat_id"]);
+ $cat_id = (int) clean($_POST["cat_id"] ?? 0);
$auth_login = clean($_POST["auth_login"]);
$auth_pass = clean($_POST["auth_pass"]);
$private = checkbox_to_sql_bool(clean($_POST["private"] ?? ""));
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index a6ea9f982..29d309dbb 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -51,8 +51,8 @@ class Pref_Filters extends Handler_Protected {
$filter = array();
$filter["enabled"] = true;
- $filter["match_any_rule"] = checkbox_to_sql_bool(clean($_REQUEST["match_any_rule"]));
- $filter["inverse"] = checkbox_to_sql_bool(clean($_REQUEST["inverse"]));
+ $filter["match_any_rule"] = checkbox_to_sql_bool(clean($_REQUEST["match_any_rule"] ?? false));
+ $filter["inverse"] = checkbox_to_sql_bool(clean($_REQUEST["inverse"] ?? false));
$filter["rules"] = array();
$filter["actions"] = array("dummy-action");
diff --git a/classes/rpc.php b/classes/rpc.php
index c14a5df00..35125ae04 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -382,10 +382,10 @@ class RPC extends Handler_Protected {
}
function log() {
- $msg = clean($_REQUEST['msg']);
- $file = basename(clean($_REQUEST['file']));
- $line = (int) clean($_REQUEST['line']);
- $context = clean($_REQUEST['context']);
+ $msg = clean($_REQUEST['msg'] ?? "");
+ $file = basename(clean($_REQUEST['file'] ?? ""));
+ $line = (int) clean($_REQUEST['line'] ?? 0);
+ $context = clean($_REQUEST['context'] ?? "");
if ($msg) {
Logger::log_error(E_USER_WARNING,
--
GitLab