X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fpref%2Ffeeds.php;h=d6abe2328809482ee20edb182043431a367c0acc;hb=fbff72e081e812926f89e608cf7af1b7d8c841cb;hp=5127b19c33a35e048990cde558463f2cb4d445ca;hpb=3a0292303e453f38204279b5d1c978a4b9c367e9;p=tt-rss.git
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 5127b19c..d6abe232 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -328,13 +328,12 @@ class Pref_Feeds extends Handler_Protected {
}
private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
- $debug = isset($_REQUEST["debug"]);
$prefix = "";
for ($i = 0; $i < $nest_level; $i++)
$prefix .= " ";
- if ($debug) _debug("$prefix C: $item_id P: $parent_id");
+ Debug::log("$prefix C: $item_id P: $parent_id");
$bare_item_id = substr($item_id, strpos($item_id, ':')+1);
@@ -361,7 +360,7 @@ class Pref_Feeds extends Handler_Protected {
$id = $item['_reference'];
$bare_id = substr($id, strpos($id, ':')+1);
- if ($debug) _debug("$prefix [$order_id] $id/$bare_id");
+ Debug::log("$prefix [$order_id] $id/$bare_id");
if ($item['_reference']) {
@@ -601,6 +600,7 @@ class Pref_Feeds extends Handler_Protected {
/* Purge intl */
+ if (FORCE_ARTICLE_PURGE == 0) {
$purge_interval = $row["purge_interval"];
print "
";
@@ -609,6 +609,7 @@ class Pref_Feeds extends Handler_Protected {
print_select_hash("purge_interval", $purge_interval, $purge_intervals,
'dojoType="dijit.form.Select" ' .
((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
+ }
print "";
@@ -661,6 +662,7 @@ class Pref_Feeds extends Handler_Protected {
print " ";
+ if (DIGEST_SUBJECT !== false) {
$include_in_digest = $row["include_in_digest"];
if ($include_in_digest) {
@@ -672,6 +674,7 @@ class Pref_Feeds extends Handler_Protected {
print "
";
+ }
$always_display_enclosures = $row["always_display_enclosures"];
@@ -1545,12 +1548,10 @@ class Pref_Feeds extends Handler_Protected {
}
static function remove_feed($id, $owner_uid) {
- $debug = isset($_REQUEST["debug"]);
-
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
- if( ! $p->hook_unsubscribe_feed($id, $owner_uid)){
- if($debug) _debug("Feed not removed due to Error in Plugin. (HOOK_UNSUBSCRIBE_FEED)");
- return;
+ if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
+ user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
+ return;
}
}
@@ -1714,11 +1715,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]);
}
@@ -1728,7 +1729,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);
}