blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

api: do not use sql_bool_to_bool()

Browse source
This commit is contained in:
Andrew Dolgov 2017-12-03 11:06:49 +03:00
parent 96930889dd
commit 4dc3f7e779
1 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
classes/api.php
View file

@ -8,6 +8,10 @@ class API extends Handler {
private $seq; private $seq;
static function param_to_bool($p) {
return $p && ($p !== "f" && $p !== "false");
}
function before($method) { function before($method) {
if (parent::before($method)) { if (parent::before($method)) {
header("Content-Type: text/json"); header("Content-Type: text/json");
@ -113,10 +117,10 @@ class API extends Handler {
function getFeeds() { function getFeeds() {
$cat_id = $_REQUEST["cat_id"]; $cat_id = $_REQUEST["cat_id"];
$unread_only = sql_bool_to_bool($_REQUEST["unread_only"]); $unread_only = API::param_to_bool($_REQUEST["unread_only"]);
$limit = (int) $_REQUEST["limit"]; $limit = (int) $_REQUEST["limit"];
$offset = (int) $_REQUEST["offset"]; $offset = (int) $_REQUEST["offset"];
$include_nested = sql_bool_to_bool($_REQUEST["include_nested"]); $include_nested = API::param_to_bool($_REQUEST["include_nested"]);
$feeds = $this->api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested); $feeds = $this->api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested);
@ -124,9 +128,9 @@ class API extends Handler {
} }
function getCategories() { function getCategories() {
$unread_only = sql_bool_to_bool($_REQUEST["unread_only"]); $unread_only = API::param_to_bool($_REQUEST["unread_only"]);
$enable_nested = sql_bool_to_bool($_REQUEST["enable_nested"]); $enable_nested = API::param_to_bool($_REQUEST["enable_nested"]);
$include_empty = sql_bool_to_bool($_REQUEST['include_empty']); $include_empty = API::param_to_bool($_REQUEST['include_empty']);
// TODO do not return empty categories, return Uncategorized and standard virtual cats // TODO do not return empty categories, return Uncategorized and standard virtual cats
@ -192,21 +196,21 @@ class API extends Handler {
$offset = (int)$_REQUEST["skip"]; $offset = (int)$_REQUEST["skip"];
$filter = $_REQUEST["filter"]; $filter = $_REQUEST["filter"];
$is_cat = sql_bool_to_bool($_REQUEST["is_cat"]); $is_cat = API::param_to_bool($_REQUEST["is_cat"]);
$show_excerpt = sql_bool_to_bool($_REQUEST["show_excerpt"]); $show_excerpt = API::param_to_bool($_REQUEST["show_excerpt"]);
$show_content = sql_bool_to_bool($_REQUEST["show_content"]); $show_content = API::param_to_bool($_REQUEST["show_content"]);
/* all_articles, unread, adaptive, marked, updated */ /* all_articles, unread, adaptive, marked, updated */
$view_mode = $_REQUEST["view_mode"]; $view_mode = $_REQUEST["view_mode"];
$include_attachments = sql_bool_to_bool($_REQUEST["include_attachments"]); $include_attachments = API::param_to_bool($_REQUEST["include_attachments"]);
$since_id = (int)$_REQUEST["since_id"]; $since_id = (int)$_REQUEST["since_id"];
$include_nested = sql_bool_to_bool($_REQUEST["include_nested"]); $include_nested = API::param_to_bool($_REQUEST["include_nested"]);
$sanitize_content = !isset($_REQUEST["sanitize"]) || $sanitize_content = !isset($_REQUEST["sanitize"]) ||
sql_bool_to_bool($_REQUEST["sanitize"]); API::param_to_bool($_REQUEST["sanitize"]);
$force_update = sql_bool_to_bool($_REQUEST["force_update"]); $force_update = API::param_to_bool($_REQUEST["force_update"]);
$has_sandbox = sql_bool_to_bool($_REQUEST["has_sandbox"]); $has_sandbox = API::param_to_bool($_REQUEST["has_sandbox"]);
$excerpt_length = (int)$_REQUEST["excerpt_length"]; $excerpt_length = (int)$_REQUEST["excerpt_length"];
$check_first_id = (int)$_REQUEST["check_first_id"]; $check_first_id = (int)$_REQUEST["check_first_id"];
$include_header = sql_bool_to_bool($_REQUEST["include_header"]); $include_header = API::param_to_bool($_REQUEST["include_header"]);
$_SESSION['hasSandbox'] = $has_sandbox; $_SESSION['hasSandbox'] = $has_sandbox;
@ -319,7 +323,7 @@ class API extends Handler {
$article_ids = explode(",", $_REQUEST["article_id"]); $article_ids = explode(",", $_REQUEST["article_id"]);
$sanitize_content = !isset($_REQUEST["sanitize"]) || $sanitize_content = !isset($_REQUEST["sanitize"]) ||
sql_bool_to_bool($_REQUEST["sanitize"]); API::param_to_bool($_REQUEST["sanitize"]);
if ($article_ids) { if ($article_ids) {
@ -348,9 +352,9 @@ class API extends Handler {
"title" => $line["title"], "title" => $line["title"],
"link" => $line["link"], "link" => $line["link"],
"labels" => Article::get_article_labels($line['id']), "labels" => Article::get_article_labels($line['id']),
"unread" => sql_bool_to_bool($line["unread"]), "unread" => API::param_to_bool($line["unread"]),
"marked" => sql_bool_to_bool($line["marked"]), "marked" => API::param_to_bool($line["marked"]),
"published" => sql_bool_to_bool($line["published"]), "published" => API::param_to_bool($line["published"]),
"comments" => $line["comments"], "comments" => $line["comments"],
"author" => $line["author"], "author" => $line["author"],
"updated" => (int) strtotime($line["updated"]), "updated" => (int) strtotime($line["updated"]),
@ -365,7 +369,7 @@ class API extends Handler {
if ($sanitize_content) { if ($sanitize_content) {
$article["content"] = sanitize( $article["content"] = sanitize(
$line["content"], $line["content"],
sql_bool_to_bool($line['hide_images']), API::param_to_bool($line['hide_images']),
false, $line["site_url"], false, $line["id"]); false, $line["site_url"], false, $line["id"]);
} else { } else {
$article["content"] = $line["content"]; $article["content"] = $line["content"];
@ -467,7 +471,7 @@ class API extends Handler {
$article_ids = explode(",", $_REQUEST["article_ids"]); $article_ids = explode(",", $_REQUEST["article_ids"]);
$label_id = (int) $_REQUEST['label_id']; $label_id = (int) $_REQUEST['label_id'];
$assign = sql_bool_to_bool($_REQUEST['assign']); $assign = API::param_to_bool($_REQUEST['assign']);
$label = Labels::find_caption(Labels::feed_to_label_id($label_id), $_SESSION["uid"]); $label = Labels::find_caption(Labels::feed_to_label_id($label_id), $_SESSION["uid"]);
@ -672,7 +676,7 @@ class API extends Handler {
if ($row = $sth->fetch()) { if ($row = $sth->fetch()) {
$last_updated = strtotime($row["last_updated"]); $last_updated = strtotime($row["last_updated"]);
$cache_images = sql_bool_to_bool($row["cache_images"]); $cache_images = API::param_to_bool($row["cache_images"]);
if (!$cache_images && time() - $last_updated > 120) { if (!$cache_images && time() - $last_updated > 120) {
RSSUtils::update_rss_feed($feed_id, true); RSSUtils::update_rss_feed($feed_id, true);
@ -742,9 +746,9 @@ class API extends Handler {
$headline_row = array( $headline_row = array(
"id" => (int)$line["id"], "id" => (int)$line["id"],
"guid" => $line["guid"], "guid" => $line["guid"],
"unread" => sql_bool_to_bool($line["unread"]), "unread" => API::param_to_bool($line["unread"]),
"marked" => sql_bool_to_bool($line["marked"]), "marked" => API::param_to_bool($line["marked"]),
"published" => sql_bool_to_bool($line["published"]), "published" => API::param_to_bool($line["published"]),
"updated" => (int)strtotime($line["updated"]), "updated" => (int)strtotime($line["updated"]),
"is_updated" => $is_updated, "is_updated" => $is_updated,
"title" => $line["title"], "title" => $line["title"],
@ -765,7 +769,7 @@ class API extends Handler {
if ($sanitize_content) { if ($sanitize_content) {
$headline_row["content"] = sanitize( $headline_row["content"] = sanitize(
$line["content"], $line["content"],
sql_bool_to_bool($line['hide_images']), API::param_to_bool($line['hide_images']),
false, $line["site_url"], false, $line["id"]); false, $line["site_url"], false, $line["id"]);
} else { } else {
$headline_row["content"] = $line["content"]; $headline_row["content"] = $line["content"];
@ -783,7 +787,7 @@ class API extends Handler {
$headline_row["comments_count"] = (int)$line["num_comments"]; $headline_row["comments_count"] = (int)$line["num_comments"];
$headline_row["comments_link"] = $line["comments"]; $headline_row["comments_link"] = $line["comments"];
$headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]); $headline_row["always_display_attachments"] = API::param_to_bool($line["always_display_enclosures"]);
$headline_row["author"] = $line["author"]; $headline_row["author"] = $line["author"];
@ -835,7 +839,7 @@ class API extends Handler {
} }
function getFeedTree() { function getFeedTree() {
$include_empty = sql_bool_to_bool($_REQUEST['include_empty']); $include_empty = API::param_to_bool($_REQUEST['include_empty']);
$pf = new Pref_Feeds($_REQUEST); $pf = new Pref_Feeds($_REQUEST);