support disabling of e-mail digests entirely

[tt-rss.git] / classes / pref / feeds.php

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 2d68f66b40644ec79fb26691e02a7edfcd344a6c..8249f756a75726cb46d2b71a4389e1b9cd4adf23 100755 (executable)
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -660,6 +660,7 @@ class Pref_Feeds extends Handler_Protected {
                        print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"private\" id=\"private\"
                        $checked>&nbsp;<label for=\"private\">".__('Hide from Popular feeds')."</label>";
 
+               if (DIGEST_SUBJECT !== false) {
                        $include_in_digest = $row["include_in_digest"];
 
                        if ($include_in_digest) {
@@ -671,6 +672,7 @@ class Pref_Feeds extends Handler_Protected {
                        print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
                        name=\"include_in_digest\"
                        $checked>&nbsp;<label for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
+               }
 
 
                        $always_display_enclosures = $row["always_display_enclosures"];
@@ -1711,11 +1713,11 @@ class Pref_Feeds extends Handler_Protected {
 
        function regenFeedKey() {
                $feed_id = clean($_REQUEST['id']);
-               $is_cat = clean($_REQUEST['is_cat']) == "true";
+               $is_cat = clean($_REQUEST['is_cat']);
 
                $new_key = $this->update_feed_access_key($feed_id, $is_cat);
 
-               print json_encode(array("link" => $new_key));
+               print json_encode(["link" => $new_key]);
        }
 
 
@@ -1725,7 +1727,7 @@ class Pref_Feeds extends Handler_Protected {
                // clear old value and generate new one
                $sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys
                        WHERE feed_id = ? AND is_cat = ? AND owner_uid = ?");
-               $sth->execute([$feed_id, $is_cat, $owner_uid]);
+               $sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]);
 
                return get_feed_access_key($feed_id, $is_cat, $owner_uid);
        }