From d532eb773bc460fe01a10e980fecbb1fdc53497c Mon Sep 17 00:00:00 2001 From: wn_ Date: Thu, 18 Nov 2021 18:23:44 +0000 Subject: Switch from null to false as the default for missing bool params. --- classes/api.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'classes/api.php') diff --git a/classes/api.php b/classes/api.php index f911cd591..c6a6a69a4 100755 --- a/classes/api.php +++ b/classes/api.php @@ -103,7 +103,7 @@ class API extends Handler { function getUnread(): bool { $feed_id = clean($_REQUEST["feed_id"] ?? ""); - $is_cat = self::_param_to_bool($_REQUEST["is_cat"] ?? null); + $is_cat = self::_param_to_bool($_REQUEST["is_cat"] ?? false); if ($feed_id) { return $this->_wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat))); @@ -119,10 +119,10 @@ class API extends Handler { function getFeeds(): bool { $cat_id = (int) clean($_REQUEST["cat_id"]); - $unread_only = self::_param_to_bool($_REQUEST["unread_only"] ?? null); + $unread_only = self::_param_to_bool($_REQUEST["unread_only"] ?? false); $limit = (int) clean($_REQUEST["limit"] ?? 0); $offset = (int) clean($_REQUEST["offset"] ?? 0); - $include_nested = self::_param_to_bool($_REQUEST["include_nested"] ?? null); + $include_nested = self::_param_to_bool($_REQUEST["include_nested"] ?? false); $feeds = $this->_api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested); @@ -130,9 +130,9 @@ class API extends Handler { } function getCategories(): bool { - $unread_only = self::_param_to_bool($_REQUEST["unread_only"] ?? null); - $enable_nested = self::_param_to_bool($_REQUEST["enable_nested"] ?? null); - $include_empty = self::_param_to_bool($_REQUEST["include_empty"] ?? null); + $unread_only = self::_param_to_bool($_REQUEST["unread_only"] ?? false); + $enable_nested = self::_param_to_bool($_REQUEST["enable_nested"] ?? false); + $include_empty = self::_param_to_bool($_REQUEST["include_empty"] ?? false); // TODO do not return empty categories, return Uncategorized and standard virtual cats @@ -197,20 +197,20 @@ class API extends Handler { $offset = (int)clean($_REQUEST["skip"] ?? 0); $filter = clean($_REQUEST["filter"] ?? ""); - $is_cat = self::_param_to_bool($_REQUEST["is_cat"] ?? null); - $show_excerpt = self::_param_to_bool($_REQUEST["show_excerpt"] ?? null); - $show_content = self::_param_to_bool($_REQUEST["show_content"] ?? null); + $is_cat = self::_param_to_bool($_REQUEST["is_cat"] ?? false); + $show_excerpt = self::_param_to_bool($_REQUEST["show_excerpt"] ?? false); + $show_content = self::_param_to_bool($_REQUEST["show_content"] ?? false); /* all_articles, unread, adaptive, marked, updated */ - $view_mode = clean($_REQUEST["view_mode"] ?? null); - $include_attachments = self::_param_to_bool($_REQUEST["include_attachments"] ?? null); + $view_mode = clean($_REQUEST["view_mode"] ?? false); + $include_attachments = self::_param_to_bool($_REQUEST["include_attachments"] ?? false); $since_id = (int)clean($_REQUEST["since_id"] ?? 0); - $include_nested = self::_param_to_bool($_REQUEST["include_nested"] ?? null); + $include_nested = self::_param_to_bool($_REQUEST["include_nested"] ?? false); $sanitize_content = self::_param_to_bool($_REQUEST["sanitize"] ?? true); - $force_update = self::_param_to_bool($_REQUEST["force_update"] ?? null); - $has_sandbox = self::_param_to_bool($_REQUEST["has_sandbox"] ?? null); + $force_update = self::_param_to_bool($_REQUEST["force_update"] ?? false); + $has_sandbox = self::_param_to_bool($_REQUEST["has_sandbox"] ?? false); $excerpt_length = (int)clean($_REQUEST["excerpt_length"] ?? 0); $check_first_id = (int)clean($_REQUEST["check_first_id"] ?? 0); - $include_header = self::_param_to_bool($_REQUEST["include_header"] ?? null); + $include_header = self::_param_to_bool($_REQUEST["include_header"] ?? false); $_SESSION['hasSandbox'] = $has_sandbox; @@ -409,7 +409,7 @@ class API extends Handler { function catchupFeed(): bool { $feed_id = clean($_REQUEST["feed_id"]); - $is_cat = self::_param_to_bool($_REQUEST["is_cat"] ?? null); + $is_cat = self::_param_to_bool($_REQUEST["is_cat"] ?? false); $mode = clean($_REQUEST["mode"] ?? ""); if (!in_array($mode, ["all", "1day", "1week", "2week"])) -- cgit v1.2.3