From 6811d0bde220d7632b9d6a7fa4f4931cc96324c8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 22 Sep 2020 14:54:15 +0300 Subject: use self:: in some places to invoke static methods from the same class --- classes/api.php | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'classes/api.php') diff --git a/classes/api.php b/classes/api.php index ce046e66a..928148b5e 100755 --- a/classes/api.php +++ b/classes/api.php @@ -117,10 +117,10 @@ class API extends Handler { function getFeeds() { $cat_id = clean($_REQUEST["cat_id"]); - $unread_only = API::param_to_bool(clean($_REQUEST["unread_only"])); + $unread_only = self::param_to_bool(clean($_REQUEST["unread_only"])); $limit = (int) clean($_REQUEST["limit"]); $offset = (int) clean($_REQUEST["offset"]); - $include_nested = API::param_to_bool(clean($_REQUEST["include_nested"])); + $include_nested = self::param_to_bool(clean($_REQUEST["include_nested"])); $feeds = $this->api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested); @@ -128,9 +128,9 @@ class API extends Handler { } function getCategories() { - $unread_only = API::param_to_bool(clean($_REQUEST["unread_only"])); - $enable_nested = API::param_to_bool(clean($_REQUEST["enable_nested"])); - $include_empty = API::param_to_bool(clean($_REQUEST['include_empty'])); + $unread_only = self::param_to_bool(clean($_REQUEST["unread_only"])); + $enable_nested = self::param_to_bool(clean($_REQUEST["enable_nested"])); + $include_empty = self::param_to_bool(clean($_REQUEST['include_empty'])); // TODO do not return empty categories, return Uncategorized and standard virtual cats @@ -196,21 +196,21 @@ class API extends Handler { $offset = (int)clean($_REQUEST["skip"]); $filter = clean($_REQUEST["filter"]); - $is_cat = API::param_to_bool(clean($_REQUEST["is_cat"])); - $show_excerpt = API::param_to_bool(clean($_REQUEST["show_excerpt"])); - $show_content = API::param_to_bool(clean($_REQUEST["show_content"])); + $is_cat = self::param_to_bool(clean($_REQUEST["is_cat"])); + $show_excerpt = self::param_to_bool(clean($_REQUEST["show_excerpt"])); + $show_content = self::param_to_bool(clean($_REQUEST["show_content"])); /* all_articles, unread, adaptive, marked, updated */ $view_mode = clean($_REQUEST["view_mode"]); - $include_attachments = API::param_to_bool(clean($_REQUEST["include_attachments"])); + $include_attachments = self::param_to_bool(clean($_REQUEST["include_attachments"])); $since_id = (int)clean($_REQUEST["since_id"]); - $include_nested = API::param_to_bool(clean($_REQUEST["include_nested"])); + $include_nested = self::param_to_bool(clean($_REQUEST["include_nested"])); $sanitize_content = !isset($_REQUEST["sanitize"]) || - API::param_to_bool($_REQUEST["sanitize"]); - $force_update = API::param_to_bool(clean($_REQUEST["force_update"])); - $has_sandbox = API::param_to_bool(clean($_REQUEST["has_sandbox"])); + self::param_to_bool($_REQUEST["sanitize"]); + $force_update = self::param_to_bool(clean($_REQUEST["force_update"])); + $has_sandbox = self::param_to_bool(clean($_REQUEST["has_sandbox"])); $excerpt_length = (int)clean($_REQUEST["excerpt_length"]); $check_first_id = (int)clean($_REQUEST["check_first_id"]); - $include_header = API::param_to_bool(clean($_REQUEST["include_header"])); + $include_header = self::param_to_bool(clean($_REQUEST["include_header"])); $_SESSION['hasSandbox'] = $has_sandbox; @@ -299,7 +299,7 @@ class API extends Handler { $article_ids = explode(",", clean($_REQUEST["article_id"])); $sanitize_content = !isset($_REQUEST["sanitize"]) || - API::param_to_bool($_REQUEST["sanitize"]); + self::param_to_bool($_REQUEST["sanitize"]); if ($article_ids) { @@ -328,9 +328,9 @@ class API extends Handler { "title" => $line["title"], "link" => $line["link"], "labels" => Article::get_article_labels($line['id']), - "unread" => API::param_to_bool($line["unread"]), - "marked" => API::param_to_bool($line["marked"]), - "published" => API::param_to_bool($line["published"]), + "unread" => self::param_to_bool($line["unread"]), + "marked" => self::param_to_bool($line["marked"]), + "published" => self::param_to_bool($line["published"]), "comments" => $line["comments"], "author" => $line["author"], "updated" => (int) strtotime($line["updated"]), @@ -345,7 +345,7 @@ class API extends Handler { if ($sanitize_content) { $article["content"] = Sanitizer::sanitize( $line["content"], - API::param_to_bool($line['hide_images']), + self::param_to_bool($line['hide_images']), false, $line["site_url"], false, $line["id"]); } else { $article["content"] = $line["content"]; @@ -449,7 +449,7 @@ class API extends Handler { $article_ids = explode(",", clean($_REQUEST["article_ids"])); $label_id = (int) clean($_REQUEST['label_id']); - $assign = API::param_to_bool(clean($_REQUEST['assign'])); + $assign = self::param_to_bool(clean($_REQUEST['assign'])); $label = Labels::find_caption(Labels::feed_to_label_id($label_id), $_SESSION["uid"]); @@ -656,7 +656,7 @@ class API extends Handler { if ($row = $sth->fetch()) { $last_updated = strtotime($row["last_updated"]); - $cache_images = API::param_to_bool($row["cache_images"]); + $cache_images = self::param_to_bool($row["cache_images"]); if (!$cache_images && time() - $last_updated > 120) { RSSUtils::update_rss_feed($feed_id, true); @@ -726,9 +726,9 @@ class API extends Handler { $headline_row = array( "id" => (int)$line["id"], "guid" => $line["guid"], - "unread" => API::param_to_bool($line["unread"]), - "marked" => API::param_to_bool($line["marked"]), - "published" => API::param_to_bool($line["published"]), + "unread" => self::param_to_bool($line["unread"]), + "marked" => self::param_to_bool($line["marked"]), + "published" => self::param_to_bool($line["published"]), "updated" => (int)strtotime($line["updated"]), "is_updated" => $is_updated, "title" => $line["title"], @@ -750,7 +750,7 @@ class API extends Handler { if ($sanitize_content) { $headline_row["content"] = Sanitizer::sanitize( $line["content"], - API::param_to_bool($line['hide_images']), + self::param_to_bool($line['hide_images']), false, $line["site_url"], false, $line["id"]); } else { $headline_row["content"] = $line["content"]; @@ -768,7 +768,7 @@ class API extends Handler { $headline_row["comments_count"] = (int)$line["num_comments"]; $headline_row["comments_link"] = $line["comments"]; - $headline_row["always_display_attachments"] = API::param_to_bool($line["always_display_enclosures"]); + $headline_row["always_display_attachments"] = self::param_to_bool($line["always_display_enclosures"]); $headline_row["author"] = $line["author"]; @@ -827,7 +827,7 @@ class API extends Handler { } function getFeedTree() { - $include_empty = API::param_to_bool(clean($_REQUEST['include_empty'])); + $include_empty = self::param_to_bool(clean($_REQUEST['include_empty'])); $pf = new Pref_Feeds($_REQUEST); -- cgit v1.2.3