From 1f5d81b77cd9a5d5f965af0435688c1f1f229e96 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Feb 2021 15:19:42 +0300 Subject: [PATCH] use a few more control helpers for checkboxes --- classes/feeds.php | 8 ++------ classes/pref/feeds.php | 6 +----- classes/pref/filters.php | 10 +++++----- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/classes/feeds.php b/classes/feeds.php index 400c302d6..4e6fdbaf8 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -649,10 +649,6 @@ class Feeds extends Handler_Protected { print "Access denied."; return; } - - $refetch_checked = isset($_REQUEST["force_refetch"]) ? "checked" : ""; - $rehash_checked = isset($_REQUEST["force_rehash"]) ? "checked" : ""; - ?> @@ -712,11 +708,11 @@ class Feeds extends Handler_Protected {
- +
- +
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index d087d026d..636f2d69b 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -663,7 +663,7 @@ class Pref_Feeds extends Handler_Protected { print "
"; - print ""; @@ -675,10 +675,6 @@ class Pref_Feeds extends Handler_Protected { placeHolder='".__("Password")."' value=\"$auth_pass\">"; - print "
- ".__('Hint: you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')." -
"; - print "
"; print ""; diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 9b740753a..36357234b 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -775,12 +775,12 @@ class Pref_Filters extends Handler_Protected { $reg_exp = htmlspecialchars($rule["reg_exp"]); $filter_type = $rule["filter_type"]; $feed_id = $rule["feed_id"]; - $inverse_checked = isset($rule["inverse"]) ? "checked" : ""; + $inverse_checked = !empty($rule["inverse"]); } else { $reg_exp = ""; $filter_type = 1; $feed_id = ["0"]; - $inverse_checked = ""; + $inverse_checked = false; } print "
"; @@ -808,9 +808,9 @@ class Pref_Filters extends Handler_Protected { print "
"; print "
"; - print ""; + print ""; print "
"; print "
";