From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 2 Dec 2017 11:07:48 +0000 (+0300)
Subject: checkbox to sql bool related changes, some more boolean fixes
X-Git-Tag: 17.12~48
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=da9ea57d1c1602899111df615639d9f013f7226f;p=tt-rss.git

checkbox to sql bool related changes, some more boolean fixes
---

diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 76259d73..4cd52487 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -696,7 +696,7 @@ class Pref_Filters extends Handler_Protected {
 				if ($rule) {
 
 					$reg_exp = trim($rule["reg_exp"]);
-					$inverse = isset($rule["inverse"]) ? "true" : "false";
+					$inverse = isset($rule["inverse"]) ? true : false;
 
 					$filter_type = (int)trim($rule["filter_type"]);
 					$match_on = json_encode($rule["feed_id"]);
diff --git a/include/functions.php b/include/functions.php
index 0b301b82..887de1c8 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1057,7 +1057,7 @@
 	}
 
 	function checkbox_to_sql_bool($val) {
-		return ($val == "on") ? "true" : "false";
+		return ($val == "on") ? true : false;
 	}
 
 	function uniqid_short() {
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 175176e0..7ce385f2 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -12,7 +12,7 @@ class Af_Psql_Trgm extends Plugin {
 	function save() {
 		$similarity = (float) db_escape_string($_POST["similarity"]);
 		$min_title_length = (int) db_escape_string($_POST["min_title_length"]);
-		$enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]) == "true";
+		$enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]);
 
 		if ($similarity < 0) $similarity = 0;
 		if ($similarity > 1) $similarity = 1;
@@ -226,7 +226,7 @@ class Af_Psql_Trgm extends Plugin {
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
 		if (!is_array($enabled_feeds)) $enabled_feeds = array();
 
-		$enable = checkbox_to_sql_bool($_POST["trgm_similarity_enabled"]) == 'true';
+		$enable = checkbox_to_sql_bool($_POST["trgm_similarity_enabled"]);
 		$key = array_search($feed_id, $enabled_feeds);
 
 		if ($enable) {
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index 192ad90b..873eba1b 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -14,7 +14,7 @@ class Af_Readability extends Plugin {
 	}
 
 	function save() {
-		$enable_share_anything = checkbox_to_sql_bool($_POST["enable_share_anything"]) == "true";
+		$enable_share_anything = checkbox_to_sql_bool($_POST["enable_share_anything"]);
 
 		$this->host->set($this, "enable_share_anything", $enable_share_anything);
 
@@ -112,7 +112,7 @@ class Af_Readability extends Plugin {
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
 		if (!is_array($enabled_feeds)) $enabled_feeds = array();
 
-		$enable = checkbox_to_sql_bool($_POST["af_readability_enabled"]) == 'true';
+		$enable = checkbox_to_sql_bool($_POST["af_readability_enabled"]);
 		$key = array_search($feed_id, $enabled_feeds);
 
 		if ($enable) {
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 8074894f..82e3226a 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -64,8 +64,8 @@ class Af_RedditImgur extends Plugin {
 	}
 
 	function save() {
-		$enable_readability = checkbox_to_sql_bool($_POST["enable_readability"]) == "true";
-		$enable_content_dupcheck = checkbox_to_sql_bool($_POST["enable_content_dupcheck"]) == "true";
+		$enable_readability = checkbox_to_sql_bool($_POST["enable_readability"]);
+		$enable_content_dupcheck = checkbox_to_sql_bool($_POST["enable_content_dupcheck"]);
 
 		$this->host->set($this, "enable_readability", $enable_readability, false);
 		$this->host->set($this, "enable_content_dupcheck", $enable_content_dupcheck);
diff --git a/plugins/af_zz_imgproxy/init.php b/plugins/af_zz_imgproxy/init.php
index 4cfca418..a6f00832 100644
--- a/plugins/af_zz_imgproxy/init.php
+++ b/plugins/af_zz_imgproxy/init.php
@@ -241,8 +241,8 @@ class Af_Zz_ImgProxy extends Plugin {
 	}
 
 	function save() {
-		$proxy_all = checkbox_to_sql_bool($_POST["proxy_all"]) == "true";
-		$disable_cache = checkbox_to_sql_bool($_POST["disable_cache"]) == "true";
+		$proxy_all = checkbox_to_sql_bool($_POST["proxy_all"]);
+		$disable_cache = checkbox_to_sql_bool($_POST["disable_cache"]);
 
 		$this->host->set($this, "proxy_all", $proxy_all, false);
 		$this->host->set($this, "disable_cache", $disable_cache);