Feed Debugger: getFeedTitle($feed_id) ?>

- + - +

@@ -856,11 +856,11 @@ class Feeds extends Handler_Protected {

- > Force refetch + > Force refetch

- > Force rehash + > Force rehash

diff --git a/classes/handler/public.php b/classes/handler/public.php index db8a924ad..481145606 100755 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -519,7 +519,7 @@ class Handler_Public extends Handler { - <?php echo __("Share with Tiny Tiny RSS") ?> + <?= __("Share with Tiny Tiny RSS") ?>

- - + +

- +

- - - + + +

@@ -635,24 +635,24 @@ class Handler_Public extends Handler { - @@ -781,7 +781,7 @@ class Handler_Public extends Handler { };

Feed or site URL: - +

- + Database Updater - +

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 72a8344ad..6b5df0289 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1223,52 +1223,52 @@ class Pref_Feeds extends Handler_Protected {

+ value=""> +

- +

+ dojoType="dijit.MenuItem">

- +

+ dojoType="dijit.MenuItem">

- +

+ dojoType="dijit.MenuItem">

Feed Debugger: _get_title($feed_id) ?>

@@ -731,7 +731,7 @@ class Feeds extends Handler_Protected { } - static function catchup_feed($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) { + static function _catchup($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) { if (!$owner_uid) $owner_uid = $_SESSION['uid']; @@ -751,7 +751,7 @@ class Feeds extends Handler_Protected { // fall back in case of no plugins if (empty($search_qpart)) { - list($search_qpart, $search_words) = self::search_to_sql($search[0], $search[1], $owner_uid); + list($search_qpart, $search_words) = self::_search_to_sql($search[0], $search[1], $owner_uid); } } else { $search_qpart = "true"; @@ -791,7 +791,7 @@ class Feeds extends Handler_Protected { if ($feed >= 0) { if ($feed > 0) { - $children = self::getChildCategories($feed, $owner_uid); + $children = self::_get_child_cats($feed, $owner_uid); array_push($children, $feed); $children = array_map("intval", $children); @@ -902,7 +902,7 @@ class Feeds extends Handler_Protected { } } - static function getFeedArticles($feed, $is_cat = false, $unread_only = false, + static function _get_counters($feed, $is_cat = false, $unread_only = false, $owner_uid = false) { $n_feed = (int) $feed; @@ -921,7 +921,7 @@ class Feeds extends Handler_Protected { $match_part = ""; if ($is_cat) { - return self::getCategoryUnread($n_feed, $owner_uid); + return self::_get_cat_unread($n_feed, $owner_uid); } else if ($n_feed == -6) { return 0; } else if ($feed != "0" && $n_feed == 0) { @@ -967,7 +967,7 @@ class Feeds extends Handler_Protected { $label_id = Labels::feed_to_label_id($feed); - return self::getLabelUnread($label_id, $owner_uid); + return self::_get_label_unread($label_id, $owner_uid); } if ($match_part) { @@ -1009,7 +1009,7 @@ class Feeds extends Handler_Protected { $login = $need_auth ? clean($_REQUEST['login']) : ''; $pass = $need_auth ? clean($_REQUEST['pass']) : ''; - $rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass); + $rc = Feeds::_subscribe($feed, $cat, $login, $pass); print json_encode(array("result" => $rc)); } @@ -1027,7 +1027,7 @@ class Feeds extends Handler_Protected { * 5 - Couldn't download the URL content. * 6 - Content is an invalid XML. */ - static function subscribe_to_feed($url, $cat_id = 0, + static function _subscribe($url, $cat_id = 0, $auth_login = '', $auth_pass = '') { global $fetch_last_error; @@ -1056,8 +1056,8 @@ class Feeds extends Handler_Protected { return array("code" => 5, "message" => $fetch_last_error); } - if (mb_strpos($fetch_last_content_type, "html") !== false && self::is_html($contents)) { - $feedUrls = self::get_feeds_from_html($url, $contents); + if (mb_strpos($fetch_last_content_type, "html") !== false && self::_is_html($contents)) { + $feedUrls = self::_get_feeds_from_html($url, $contents); if (count($feedUrls) == 0) { return array("code" => 3); @@ -1100,15 +1100,15 @@ class Feeds extends Handler_Protected { } } - static function getIconFile($feed_id) { + static function _get_icon_file($feed_id) { return ICONS_DIR . "/$feed_id.ico"; } - static function feedHasIcon($id) { + static function _has_icon($id) { return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0; } - static function getFeedIcon($id) { + static function _get_icon($id) { switch ($id) { case 0: return "archive"; @@ -1132,7 +1132,7 @@ class Feeds extends Handler_Protected { if ($id < LABEL_BASE_INDEX) { return "label"; } else { - $icon = self::getIconFile($id); + $icon = self::_get_icon_file($id); if ($icon && file_exists($icon)) { return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon); @@ -1144,11 +1144,11 @@ class Feeds extends Handler_Protected { return false; } - static function getFeedTitle($id, $cat = false) { + static function _get_title($id, $cat = false) { $pdo = Db::pdo(); if ($cat) { - return self::getCategoryTitle($id); + return self::_get_cat_title($id); } else if ($id == -1) { return __("Starred articles"); } else if ($id == -2) { @@ -1191,7 +1191,7 @@ class Feeds extends Handler_Protected { } // only real cats - static function getCategoryMarked($cat, $owner_uid = false) { + static function _get_cat_marked($cat, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; @@ -1214,7 +1214,7 @@ class Feeds extends Handler_Protected { } } - static function getCategoryUnread($cat, $owner_uid = false) { + static function _get_cat_unread($cat, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; @@ -1248,7 +1248,7 @@ class Feeds extends Handler_Protected { } // only accepts real cats (>= 0) - static function getCategoryChildrenUnread($cat, $owner_uid = false) { + static function _get_cat_children_unread($cat, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; $pdo = Db::pdo(); @@ -1260,14 +1260,14 @@ class Feeds extends Handler_Protected { $unread = 0; while ($line = $sth->fetch()) { - $unread += self::getCategoryUnread($line["id"], $owner_uid); - $unread += self::getCategoryChildrenUnread($line["id"], $owner_uid); + $unread += self::_get_cat_unread($line["id"], $owner_uid); + $unread += self::_get_cat_children_unread($line["id"], $owner_uid); } return $unread; } - static function getGlobalUnread($user_id = false) { + static function _get_global_unread($user_id = false) { if (!$user_id) $user_id = $_SESSION["uid"]; @@ -1283,7 +1283,7 @@ class Feeds extends Handler_Protected { return $row["count"]; } - static function getCategoryTitle($cat_id) { + static function _get_cat_title($cat_id) { if ($cat_id == -1) { return __("Special"); @@ -1305,7 +1305,7 @@ class Feeds extends Handler_Protected { } } - static function getLabelUnread($label_id, $owner_uid = false) { + private static function _get_label_unread($label_id, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; $pdo = Db::pdo(); @@ -1322,7 +1322,7 @@ class Feeds extends Handler_Protected { } } - static function queryFeedHeadlines($params) { + static function _get_headlines($params) { $pdo = Db::pdo(); @@ -1368,7 +1368,7 @@ class Feeds extends Handler_Protected { // fall back in case of no plugins if (!$search_query_part) { - list($search_query_part, $search_words) = self::search_to_sql($search, $search_language, $owner_uid); + list($search_query_part, $search_words) = self::_search_to_sql($search, $search_language, $owner_uid); } if (DB_TYPE == "pgsql") { @@ -1406,7 +1406,7 @@ class Feeds extends Handler_Protected { $unread = getFeedUnread($feed, $cat_view); if ($cat_view && $feed > 0 && $include_children) - $unread += self::getCategoryChildrenUnread($feed); + $unread += self::_get_cat_children_unread($feed); if ($unread > 0) { $view_query_part = " unread = true AND "; @@ -1450,7 +1450,7 @@ class Feeds extends Handler_Protected { if ($feed > 0) { if ($include_children) { # sub-cats - $subcats = self::getChildCategories($feed, $owner_uid); + $subcats = self::_get_child_cats($feed, $owner_uid); array_push($subcats, $feed); $subcats = array_map("intval", $subcats); @@ -1574,7 +1574,7 @@ class Feeds extends Handler_Protected { $feed_title = T_sprintf("Search results: %s", $search); } else { if ($cat_view) { - $feed_title = self::getCategoryTitle($feed); + $feed_title = self::_get_cat_title($feed); } else { if (is_numeric($feed) && $feed > 0) { $ssth = $pdo->prepare("SELECT title,site_url,last_error,last_updated @@ -1587,7 +1587,7 @@ class Feeds extends Handler_Protected { $last_error = $row["last_error"]; $last_updated = $row["last_updated"]; } else { - $feed_title = self::getFeedTitle($feed); + $feed_title = self::_get_title($feed); } } } @@ -1802,7 +1802,7 @@ class Feeds extends Handler_Protected { } - static function getParentCategories($cat, $owner_uid) { + static function _get_parent_cats($cat, $owner_uid) { $rv = array(); $pdo = Db::pdo(); @@ -1813,13 +1813,13 @@ class Feeds extends Handler_Protected { while ($line = $sth->fetch()) { array_push($rv, $line["parent_cat"]); - $rv = array_merge($rv, self::getParentCategories($line["parent_cat"], $owner_uid)); + $rv = array_merge($rv, self::_get_parent_cats($line["parent_cat"], $owner_uid)); } return $rv; } - static function getChildCategories($cat, $owner_uid) { + static function _get_child_cats($cat, $owner_uid) { $rv = array(); $pdo = Db::pdo(); @@ -1830,13 +1830,13 @@ class Feeds extends Handler_Protected { while ($line = $sth->fetch()) { array_push($rv, $line["id"]); - $rv = array_merge($rv, self::getChildCategories($line["id"], $owner_uid)); + $rv = array_merge($rv, self::_get_child_cats($line["id"], $owner_uid)); } return $rv; } - static function getFeedCategory($feed) { + static function _cat_of_feed($feed) { $pdo = Db::pdo(); $sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds @@ -1851,7 +1851,7 @@ class Feeds extends Handler_Protected { } - function color_of($name) { + private function _color_of($name) { $colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b", "#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416", "#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ]; @@ -1867,7 +1867,7 @@ class Feeds extends Handler_Protected { return $colormap[$sum]; } - static function get_feeds_from_html($url, $content) { + private static function _get_feeds_from_html($url, $content) { $url = UrlHelper::validate($url); $baseUrl = substr($url, 0, strrpos($url, '/') + 1); @@ -1895,11 +1895,11 @@ class Feeds extends Handler_Protected { return $feedUrls; } - static function is_html($content) { + static function _is_html($content) { return preg_match("/

".__('OPML Utility')."

"; - Feeds::add_feed_category("Imported feeds"); + Feeds::_add_cat("Imported feeds"); $this->opml_notice(__("Importing OPML...")); @@ -205,7 +205,7 @@ class OPML extends Handler_Protected { if (!$tmp_line["match_on"]) { if ($cat_filter && $tmp_line["cat_id"] || $tmp_line["feed_id"]) { - $tmp_line["feed"] = Feeds::getFeedTitle( + $tmp_line["feed"] = Feeds::_get_title( $cat_filter ? $tmp_line["cat_id"] : $tmp_line["feed_id"], $cat_filter); } else { @@ -218,13 +218,13 @@ class OPML extends Handler_Protected { if (strpos($feed_id, "CAT:") === 0) { $feed_id = (int)substr($feed_id, 4); if ($feed_id) { - array_push($match, [Feeds::getCategoryTitle($feed_id), true, false]); + array_push($match, [Feeds::_get_cat_title($feed_id), true, false]); } else { array_push($match, [0, true, true]); } } else { if ($feed_id) { - array_push($match, [Feeds::getFeedTitle((int)$feed_id), false, false]); + array_push($match, [Feeds::_get_title((int)$feed_id), false, false]); } else { array_push($match, [0, false, true]); } @@ -523,7 +523,7 @@ class OPML extends Handler_Protected { $order_id = (int) $root_node->attributes->getNamedItem('ttrssSortOrder')->nodeValue; if (!$order_id) $order_id = 0; - Feeds::add_feed_category($cat_title, $parent_id, $order_id); + Feeds::_add_cat($cat_title, $parent_id, $order_id); $cat_id = $this->get_feed_category($cat_title, $parent_id); } @@ -638,7 +638,7 @@ class OPML extends Handler_Protected { $url_path = get_self_url_prefix(); $url_path .= "/opml.php?op=publish&key=" . - Feeds::get_feed_access_key('OPML:Publish', false, $_SESSION["uid"]); + Feeds::_get_access_key('OPML:Publish', false, $_SESSION["uid"]); return $url_path; } diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index af3877159..edba71c5c 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -98,7 +98,7 @@ class Pref_Feeds extends Handler_Protected { $feed['checkbox'] = false; $feed['unread'] = -1; $feed['error'] = $feed_line['last_error']; - $feed['icon'] = Feeds::getFeedIcon($feed_line['id']); + $feed['icon'] = Feeds::_get_icon($feed_line['id']); $feed['param'] = TimeHelper::make_local_datetime( $feed_line['last_updated'], true); $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); @@ -266,7 +266,7 @@ class Pref_Feeds extends Handler_Protected { $feed['name'] = $feed_line['title']; $feed['checkbox'] = false; $feed['error'] = $feed_line['last_error']; - $feed['icon'] = Feeds::getFeedIcon($feed_line['id']); + $feed['icon'] = Feeds::_get_icon($feed_line['id']); $feed['param'] = TimeHelper::make_local_datetime( $feed_line['last_updated'], true); $feed['unread'] = -1; @@ -301,7 +301,7 @@ class Pref_Feeds extends Handler_Protected { $feed['name'] = $feed_line['title']; $feed['checkbox'] = false; $feed['error'] = $feed_line['last_error']; - $feed['icon'] = Feeds::getFeedIcon($feed_line['id']); + $feed['icon'] = Feeds::_get_icon($feed_line['id']); $feed['param'] = TimeHelper::make_local_datetime( $feed_line['last_updated'], true); $feed['unread'] = -1; @@ -777,7 +777,7 @@ class Pref_Feeds extends Handler_Protected { /* Icon */ - print "

"; + print "

"; print " @@ -1189,7 +1189,7 @@ class Pref_Feeds extends Handler_Protected { function addCat() { $feed_cat = clean($_REQUEST["cat"]); - Feeds::add_feed_category($feed_cat); + Feeds::_add_cat($feed_cat); } function importOpml() { @@ -1420,9 +1420,9 @@ class Pref_Feeds extends Handler_Protected { $obj['id'] = 'CAT:' . $cat_id; $obj['items'] = array(); - $obj['name'] = Feeds::getCategoryTitle($cat_id); + $obj['name'] = Feeds::_get_cat_title($cat_id); $obj['type'] = 'category'; - $obj['unread'] = -1; //(int) Feeds::getCategoryUnread($cat_id); + $obj['unread'] = -1; //(int) Feeds::_get_cat_unread($cat_id); $obj['bare_id'] = $cat_id; return $obj; @@ -1433,7 +1433,7 @@ class Pref_Feeds extends Handler_Protected { $feed_id = (int) $feed_id; if (!$title) - $title = Feeds::getFeedTitle($feed_id, false); + $title = Feeds::_get_title($feed_id, false); if ($unread === false) $unread = getFeedUnread($feed_id, false); @@ -1444,7 +1444,7 @@ class Pref_Feeds extends Handler_Protected { $obj['type'] = 'feed'; $obj['error'] = $error; $obj['updated'] = $updated; - $obj['icon'] = Feeds::getFeedIcon($feed_id); + $obj['icon'] = Feeds::_get_icon($feed_id); $obj['bare_id'] = $feed_id; $obj['auxcounter'] = 0; @@ -1611,11 +1611,11 @@ class Pref_Feeds extends Handler_Protected { 'id' => $feed_id, 'is_cat' => (int)$is_cat, 'q' => $search, - 'key' => Feeds::get_feed_access_key($feed_id, $is_cat, $_SESSION["uid"]) + 'key' => Feeds::_get_access_key($feed_id, $is_cat, $_SESSION["uid"]) ]); print json_encode([ - "title" => Feeds::getFeedTitle($feed_id, $is_cat), + "title" => Feeds::_get_title($feed_id, $is_cat), "link" => $link ]); } @@ -1627,7 +1627,7 @@ class Pref_Feeds extends Handler_Protected { WHERE feed_id = ? AND is_cat = ? AND owner_uid = ?"); $sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]); - return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid); + return Feeds::_get_access_key($feed_id, $is_cat, $owner_uid); } // Silent diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 1c264f642..62bcb8f59 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -189,10 +189,10 @@ class Pref_Filters extends Handler_Protected { if (strpos($feed_id, "CAT:") === 0) { $feed_id = (int)substr($feed_id, 4); - array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id)); + array_push($feeds_fmt, Feeds::_get_cat_title($feed_id)); } else { if ($feed_id) - array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id)); + array_push($feeds_fmt, Feeds::_get_title((int)$feed_id)); else array_push($feeds_fmt, __("All feeds")); } @@ -203,9 +203,9 @@ class Pref_Filters extends Handler_Protected { } else { $where = $line["cat_filter"] ? - Feeds::getCategoryTitle($line["cat_id"]) : + Feeds::_get_cat_title($line["cat_id"]) : ($line["feed_id"] ? - Feeds::getFeedTitle($line["feed_id"]) : __("All feeds")); + Feeds::_get_title($line["feed_id"]) : __("All feeds")); } # $where = $line["cat_id"] . "/" . $line["feed_id"]; @@ -494,10 +494,10 @@ class Pref_Filters extends Handler_Protected { if (strpos($feed_id, "CAT:") === 0) { $feed_id = (int)substr($feed_id, 4); - array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id)); + array_push($feeds_fmt, Feeds::_get_cat_title($feed_id)); } else { if ($feed_id) - array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id)); + array_push($feeds_fmt, Feeds::_get_title((int)$feed_id)); else array_push($feeds_fmt, __("All feeds")); } diff --git a/classes/rpc.php b/classes/rpc.php index 2bbaf4135..206a93d60 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -219,7 +219,7 @@ class RPC extends Handler_Protected { $search_query = clean($_REQUEST['search_query']); $search_lang = clean($_REQUEST['search_lang']); - Feeds::catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]); + Feeds::_catchup($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]); // return counters here synchronously so that frontend can figure out next unread feed properly print json_encode(['counters' => Counters::getAllCounters()]); diff --git a/classes/rssutils.php b/classes/rssutils.php index 9dd7c4ab1..0e90d8fe4 100755 --- a/classes/rssutils.php +++ b/classes/rssutils.php @@ -1239,7 +1239,7 @@ class RSSUtils { Debug::log("purging feed...", Debug::$LOG_VERBOSE); - Feeds::purge_feed($feed, 0); + Feeds::_purge($feed, 0); $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_updated = NOW(), @@ -1706,7 +1706,7 @@ class RSSUtils { $filters = array(); $feed_id = (int) $feed_id; - $cat_id = (int)Feeds::getFeedCategory($feed_id); + $cat_id = (int)Feeds::_cat_of_feed($feed_id); if ($cat_id == 0) $null_cat_qpart = "cat_id IS NULL OR"; @@ -1720,7 +1720,7 @@ class RSSUtils { $sth->execute([$owner_uid]); $check_cats = array_merge( - Feeds::getParentCategories($cat_id, $owner_uid), + Feeds::_get_parent_cats($cat_id, $owner_uid), [$cat_id]); $check_cats_str = join(",", $check_cats); diff --git a/include/functions.php b/include/functions.php index eaf7d8243..4557c0411 100644 --- a/include/functions.php +++ b/include/functions.php @@ -217,7 +217,7 @@ // @deprecated function getFeedUnread($feed, $is_cat = false) { - return Feeds::getFeedArticles($feed, $is_cat, true, $_SESSION["uid"]); + return Feeds::_get_counters($feed, $is_cat, true, $_SESSION["uid"]); } // @deprecated diff --git a/js/Feeds.js b/js/Feeds.js index 986936285..73f1bc338 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -501,7 +501,7 @@ const Feeds = { const tree = dijit.byId("feedTree"); if (tree && tree.model) - return tree.getFeedCategory(feed); + return tree._cat_of_feed(feed); } catch (e) { // diff --git a/plugins/af_comics/filters/af_comics_gocomics.php b/plugins/af_comics/filters/af_comics_gocomics.php index 949b7a235..6c5c7c0d3 100644 --- a/plugins/af_comics/filters/af_comics_gocomics.php +++ b/plugins/af_comics/filters/af_comics_gocomics.php @@ -11,7 +11,7 @@ class Af_Comics_Gocomics extends Af_ComicFilter { public function on_subscribe($url) { if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $url)) - return ''; // Get is_html() to return false. + return ''; // Get _is_html() to return false. else return false; } diff --git a/plugins/af_comics/filters/af_comics_gocomics_farside.php b/plugins/af_comics/filters/af_comics_gocomics_farside.php index 9663da8f9..89322209d 100644 --- a/plugins/af_comics/filters/af_comics_gocomics_farside.php +++ b/plugins/af_comics/filters/af_comics_gocomics_farside.php @@ -11,7 +11,7 @@ class Af_Comics_Gocomics_FarSide extends Af_ComicFilter { public function on_subscribe($url) { if (preg_match("#^https?://www\.thefarside\.com#", $url)) - return ''; // Get is_html() to return false. + return ''; // Get _is_html() to return false. else return false; } diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 163b0ec38..47ff98fc2 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -209,7 +209,7 @@ class Af_Psql_Trgm extends Plugin { print "

" . " " . - Feeds::getFeedTitle($f) . "

"; + Feeds::_get_title($f) . ""; } print ""; } diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php index a76c98380..4d21a831c 100755 --- a/plugins/af_readability/init.php +++ b/plugins/af_readability/init.php @@ -122,7 +122,7 @@ class Af_Readability extends Plugin { print "

". - Feeds::getFeedTitle($f) . " " . ($is_append ? __("(append)") : "") . "

"; + Feeds::_get_title($f) . " " . ($is_append ? __("(append)") : "") . ""; } print ""; } diff --git a/plugins/vf_shared/init.php b/plugins/vf_shared/init.php index 8c38cbf32..1112f6f2f 100644 --- a/plugins/vf_shared/init.php +++ b/plugins/vf_shared/init.php @@ -60,7 +60,7 @@ class VF_Shared extends Plugin { "override_vfeed" => "ttrss_feeds.title AS feed_title," ); - $qfh_ret = Feeds::queryFeedHeadlines($params); + $qfh_ret = Feeds::_get_headlines($params); $qfh_ret[1] = __("Shared articles"); return $qfh_ret; -- cgit v1.2.3-54-g00ecf From 91285e3868fadcfb907cd57a90bb3e5c263c0979 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 15 Feb 2021 16:34:44 +0300 Subject: router: add additional logging for refused requests; reject requests for methods starting with _ --- backend.php | 12 ++++++++++++ classes/pref/feeds.php | 4 ++++ public.php | 10 +++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) (limited to 'classes/pref/feeds.php') diff --git a/backend.php b/backend.php index 030676dcb..e72d97ca4 100644 --- a/backend.php +++ b/backend.php @@ -30,6 +30,9 @@ require_once "db.php"; require_once "db-prefs.php"; + $op = (string)clean($op); + $method = (string)clean($method); + startup_gettext(); $script_started = microtime(true); @@ -92,6 +95,13 @@ if (class_exists($op) || $override) { + if (strpos($method, "_") === 0) { + user_error("Refusing to invoke method $method of handler $op which starts with underscore.", E_USER_WARNING); + header("Content-Type: text/json"); + print error_json(6); + return; + } + if ($override) { $handler = $override; } else { @@ -110,6 +120,7 @@ if ($reflection->getNumberOfRequiredParameters() == 0) { $handler->$method(); } else { + user_error("Refusing to invoke method $method of handler $op which has required parameters.", E_USER_WARNING); header("Content-Type: text/json"); print error_json(6); } @@ -126,6 +137,7 @@ return; } } else { + user_error("Refusing to invoke method $method of handler $op with invalid CSRF token.", E_USER_WARNING); header("Content-Type: text/json"); print error_json(6); return; diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index edba71c5c..4c865e9f0 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -109,6 +109,10 @@ class Pref_Feeds extends Handler_Protected { return $items; } + function _getfeedtree() { + print "OK"; + } + function getfeedtree() { print json_encode($this->makefeedtree()); } diff --git a/public.php b/public.php index 3e4a9e023..dcfc4056e 100644 --- a/public.php +++ b/public.php @@ -16,7 +16,7 @@ if (!init_plugins()) return; - $method = $_REQUEST["op"]; + $method = (string)clean($_REQUEST["op"]); $override = PluginHost::getInstance()->lookup_handler("public", $method); @@ -26,6 +26,13 @@ $handler = new Handler_Public($_REQUEST); } + if (strpos($method, "_") === 0) { + user_error("Refusing to invoke method $method which starts with underscore.", E_USER_WARNING); + header("Content-Type: text/json"); + print error_json(6); + return; + } + if (implements_interface($handler, "IHandler") && $handler->before($method)) { if ($method && method_exists($handler, $method)) { $reflection = new ReflectionMethod($handler, $method); @@ -33,6 +40,7 @@ if ($reflection->getNumberOfRequiredParameters() == 0) { $handler->$method(); } else { + user_error("Refusing to invoke method $method which has required parameters.", E_USER_WARNING); header("Content-Type: text/json"); print error_json(6); } -- cgit v1.2.3-54-g00ecf From bd3c38de849330b3ed28df05c1220c631c103628 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 15 Feb 2021 16:41:52 +0300 Subject: move bookmarklet-related subscribe_to_feed_url to bookmarklet plugin --- classes/pref/feeds.php | 6 ------ plugins/bookmarklets/init.php | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'classes/pref/feeds.php') diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 4c865e9f0..cb6ff94fc 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1655,10 +1655,4 @@ class Pref_Feeds extends Handler_Protected { return $c; } - static function subscribe_to_feed_url() { - $url_path = get_self_url_prefix() . - "/public.php?op=subscribe&feed_url=%s"; - return $url_path; - } - } diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php index fa1bb8cf6..9e0f8f348 100644 --- a/plugins/bookmarklets/init.php +++ b/plugins/bookmarklets/init.php @@ -16,6 +16,12 @@ class Bookmarklets extends Plugin { $host->add_hook($host::HOOK_PREFS_TAB, $this); } + private function subscribe_to_feed_url() { + $url_path = get_self_url_prefix() . + "/public.php?op=subscribe&feed_url=%s"; + return $url_path; + } + function hook_prefs_tab($args) { if ($args == "prefFeeds") { @@ -24,7 +30,7 @@ class Bookmarklets extends Plugin { print "

" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "

"; - $bm_subscribe_url = str_replace('%s', '', Pref_Feeds::subscribe_to_feed_url()); + $bm_subscribe_url = str_replace('%s', '', $this->subscribe_to_feed_url()); $confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?')); -- cgit v1.2.3-54-g00ecf From 26d6b84a572b5cbd99acffc5ae727ea6d1be543a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Feb 2021 14:23:00 +0300 Subject: add namespaced controls with unified naming; deprecated old-style control shortcuts --- classes/feeds.php | 22 ++- classes/handler/public.php | 4 +- classes/pref/feeds.php | 27 ++-- classes/pref/filters.php | 21 +-- classes/pref/prefs.php | 41 +++-- classes/pref/system.php | 4 +- include/controls.php | 383 +++++++++++--------------------------------- include/controls_compat.php | 312 ++++++++++++++++++++++++++++++++++++ include/functions.php | 1 + include/login_form.php | 2 +- plugins/mail/init.php | 2 +- 11 files changed, 470 insertions(+), 349 deletions(-) create mode 100644 include/controls_compat.php (limited to 'classes/pref/feeds.php') diff --git a/classes/feeds.php b/classes/feeds.php index f3ce1e48b..aa1f889e0 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -583,7 +583,7 @@ class Feeds extends Handler_Protected { function subscribeToFeed() { print json_encode([ - "cat_select" => format_feed_cat_select("cat", false, 'dojoType="fox.form.Select"') + "cat_select" => \Controls\select_feeds_cats("cat") ]); } @@ -607,8 +607,8 @@ class Feeds extends Handler_Protected { if (DB_TYPE == "pgsql") { print "

"; print "" . __("Language:") . ""; - print_select("search_language", get_pref('DEFAULT_SEARCH_LANGUAGE'), Pref_Feeds::get_ts_languages(), - "dojoType='fox.form.Select' title=\"".__('Used for word stemming')."\""); + print \Controls\select_tag("search_language", get_pref('DEFAULT_SEARCH_LANGUAGE'), Pref_Feeds::get_ts_languages(), + "title=\"".__('Used for word stemming')."\""); print "

"; } @@ -668,6 +668,15 @@ class Feeds extends Handler_Protected { display : none; } + - - + +

diff --git a/classes/pref/system.php b/classes/pref/system.php index f0a5f7b7f..d3b733364 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -90,12 +90,12 @@ class Pref_System extends Handler_Administrative {

- __("Errors"), E_USER_WARNING => __("Warnings"), E_USER_NOTICE => __("Everything") - ], 'dojoType="fox.form.Select" onchange="Helpers.EventLog.refresh()"') ?> + ], 'onchange="Helpers.EventLog.refresh()"', "severity") ?>

diff --git a/include/controls.php b/include/controls.php index f706931db..34a4af1f2 100755 --- a/include/controls.php +++ b/include/controls.php @@ -1,326 +1,133 @@ "; - foreach ($values as $v) { - if ($v == $default) - $sel = "selected=\"1\""; - else - $sel = ""; + $rv = ""; -} + $rv .= ""; + } -function print_select_hash($id, $default, $values, $attributes = "", $name = "") { - if (!$name) $name = $id; + $rv .= ""; - print ""; -} + $values = []; -function format_hidden($name, $value) { - return ""; -} + while ($row = $sth->fetch()) { + array_push($values, $row["caption"]); + } -function print_hidden($name, $value) { - print format_hidden($name, $value); -} + return select_tag($name, $value, $values, $attributes, $id); + } -function format_checkbox($id, $checked, $value = "", $attributes = "") { - $checked_str = $checked ? "checked" : ""; - $value_str = $value ? "value=\"$value\"" : ""; + function select_hash(string $name, $value, array $values, string $attributes = "", string $id = "") { + $dojo_type = strpos($attributes, "dojoType") === false ? "dojoType='fox.form.Select'" : ""; - return ""; -} + $rv = ""; - if ($v == $default) - $sel = "checked"; - else - $sel = ""; + return $rv; + } - if ($v == $true_is) { - $sel .= " value=\"1\""; - } else { - $sel .= " value=\"0\""; - } + function hidden_tag(string $name, string $value) { + return ""; + } - print " $v "; + function checkbox_tag(string $name, bool $checked, string $value = "", string $attributes = "", string $id = "") { + $is_checked = $checked ? "checked" : ""; + $value_str = $value ? "value=\"".htmlspecialchars($value)."\"" : ""; - } -} + return ""; + } -function print_feed_multi_select($id, $default_ids = [], - $attributes = "", $include_all_feeds = true, - $root_id = null, $nest_level = 0) { + function select_feeds_cats(string $name, int $default_id = null, string $attributes = "", + bool $include_all_cats = true, string $root_id = null, int $nest_level = 0, string $id = "") { - $pdo = Db::pdo(); + $ret = ""; - print_r(in_array("CAT:6",$default_ids)); + if (!$root_id) { + $ret .= ""; - if ($include_all_feeds) { - $is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : ""; - print ""; - } - } + $pdo = \Db::pdo(); - if (get_pref('ENABLE_FEED_CATS')) { + if (!$root_id) $root_id = null; - if (!$root_id) $root_id = null; + $sth = $pdo->prepare("SELECT id,title, + (SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE + c2.parent_cat = ttrss_feed_categories.id) AS num_children + FROM ttrss_feed_categories + WHERE owner_uid = :uid AND + (parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title"); + $sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]); - $sth = $pdo->prepare("SELECT id,title, - (SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE - c2.parent_cat = ttrss_feed_categories.id) AS num_children - FROM ttrss_feed_categories - WHERE owner_uid = :uid AND - (parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title"); + $found = 0; - $sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]); + while ($line = $sth->fetch()) { + ++$found; - while ($line = $sth->fetch()) { + if ($line["id"] == $default_id) { + $is_selected = "selected=\"1\""; + } else { + $is_selected = ""; + } - for ($i = 0; $i < $nest_level; $i++) - $line["title"] = " " . $line["title"]; + for ($i = 0; $i < $nest_level; $i++) + $line["title"] = " " . $line["title"]; - $is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : ""; + if ($line["title"]) + $ret .= sprintf("", + $line["id"], htmlspecialchars($line["title"])); - printf("", - $line["id"], htmlspecialchars($line["title"])); + if ($line["num_children"] > 0) + $ret .= select_feeds_cats($id, $default_id, $attributes, + $include_all_cats, $line["id"], $nest_level+1, $id); + } - if ($line["num_children"] > 0) - print_feed_multi_select($id, $default_ids, $attributes, - $include_all_feeds, $line["id"], $nest_level+1); + if (!$root_id) { + if ($include_all_cats) { + if ($found > 0) { + $ret .= ""; + } - $f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds - WHERE cat_id = ? AND owner_uid = ? ORDER BY title"); + if ($default_id == 0) { + $is_selected = "selected=\"1\""; + } else { + $is_selected = ""; + } - $f_sth->execute([$line['id'], $_SESSION['uid']]); + $ret .= ""; + } + $ret .= ""; + } - while ($fline = $f_sth->fetch()) { - $is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : ""; + return $ret; + } - $fline["title"] = " " . $fline["title"]; - - for ($i = 0; $i < $nest_level; $i++) - $fline["title"] = " " . $fline["title"]; - - printf("", - $fline["id"], htmlspecialchars($fline["title"])); - } - } - - if (!$root_id) { - $is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : ""; - - printf("", - __("Uncategorized")); - - $f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds - WHERE cat_id IS NULL AND owner_uid = ? ORDER BY title"); - $f_sth->execute([$_SESSION['uid']]); - - while ($fline = $f_sth->fetch()) { - $is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : ""; - - $fline["title"] = " " . $fline["title"]; - - for ($i = 0; $i < $nest_level; $i++) - $fline["title"] = " " . $fline["title"]; - - printf("", - $fline["id"], htmlspecialchars($fline["title"])); - } - } - - } else { - $sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds - WHERE owner_uid = ? ORDER BY title"); - $sth->execute([$_SESSION['uid']]); - - while ($line = $sth->fetch()) { - - $is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : ""; - - printf("", - $line["id"], htmlspecialchars($line["title"])); - } - } - - if (!$root_id) { - print ""; - } -} - -function print_feed_cat_select($id, $default_id, $attributes, $include_all_cats = true, - $root_id = null, $nest_level = 0) { - - print format_feed_cat_select($id, $default_id, $attributes, $include_all_cats, $root_id, $nest_level); -} - -function format_feed_cat_select($id, $default_id, $attributes, $include_all_cats = true, - $root_id = null, $nest_level = 0) { - - $ret = ""; - - if (!$root_id) { - $ret .= ""; - } - - return $ret; -} - -function stylesheet_tag($filename, $id = false) { - $timestamp = filemtime($filename); - - $id_part = $id ? "id=\"$id\"" : ""; - - return "\n"; -} - -function javascript_tag($filename) { - $query = ""; - - if (!(strpos($filename, "?") === false)) { - $query = substr($filename, strpos($filename, "?")+1); - $filename = substr($filename, 0, strpos($filename, "?")); - } - - $timestamp = filemtime($filename); - - if ($query) $timestamp .= "&$query"; - - return "\n"; -} - -function format_warning($msg, $id = "") { - return "

$msg

"; -} - -function format_notice($msg, $id = "") { - return "

$msg

"; -} - -function format_error($msg, $id = "") { - return "

$msg

"; -} - -function print_notice($msg) { - return print format_notice($msg); -} - -function print_warning($msg) { - return print format_warning($msg); -} - -function print_error($msg) { - return print format_error($msg); -} - -function print_label_select($name, $value, $attributes = "") { - - $pdo = Db::pdo(); - - $sth = $pdo->prepare("SELECT caption FROM ttrss_labels2 - WHERE owner_uid = ? ORDER BY caption"); - $sth->execute([$_SESSION['uid']]); - - print ""; - - -} diff --git a/include/controls_compat.php b/include/controls_compat.php new file mode 100644 index 000000000..3d2779b08 --- /dev/null +++ b/include/controls_compat.php @@ -0,0 +1,312 @@ +"; + foreach ($values as $v) { + if ($v == $default) + $sel = "selected=\"1\""; + else + $sel = ""; + + $v = trim($v); + + print ""; + } + print ""; +} + +function print_select_hash($id, $default, $values, $attributes = "", $name = "") { + if (!$name) $name = $id; + + print ""; +} + +function format_hidden($name, $value) { + return ""; +} + +function print_hidden($name, $value) { + print format_hidden($name, $value); +} + +function format_checkbox($id, $checked, $value = "", $attributes = "") { + $checked_str = $checked ? "checked" : ""; + $value_str = $value ? "value=\"$value\"" : ""; + + return ""; +} + +function print_checkbox($id, $checked, $value = "", $attributes = "") { + print format_checkbox($id, $checked, $value, $attributes); +} + +function format_button($type, $value, $attributes = "") { + return ""; +} + +function print_button($type, $value, $attributes = "") { + print format_button($type, $value, $attributes); +} + +function print_feed_multi_select($id, $default_ids = [], + $attributes = "", $include_all_feeds = true, + $root_id = null, $nest_level = 0) { + + $pdo = Db::pdo(); + + print_r(in_array("CAT:6",$default_ids)); + + if (!$root_id) { + print ""; + } +} + +function print_feed_cat_select($id, $default_id, $attributes, $include_all_cats = true, + $root_id = null, $nest_level = 0) { + + print format_feed_cat_select($id, $default_id, $attributes, $include_all_cats, $root_id, $nest_level); +} + +function format_feed_cat_select($id, $default_id, $attributes, $include_all_cats = true, + $root_id = null, $nest_level = 0) { + + $ret = ""; + + if (!$root_id) { + $ret .= ""; + } + + return $ret; +} + +function stylesheet_tag($filename, $id = false) { + $timestamp = filemtime($filename); + + $id_part = $id ? "id=\"$id\"" : ""; + + return "\n"; +} + +function javascript_tag($filename) { + $query = ""; + + if (!(strpos($filename, "?") === false)) { + $query = substr($filename, strpos($filename, "?")+1); + $filename = substr($filename, 0, strpos($filename, "?")); + } + + $timestamp = filemtime($filename); + + if ($query) $timestamp .= "&$query"; + + return "\n"; +} + +function format_warning($msg, $id = "") { + return "

$msg

"; +} + +function format_notice($msg, $id = "") { + return "

$msg

"; +} + +function format_error($msg, $id = "") { + return "

$msg

"; +} + +function print_notice($msg) { + return print format_notice($msg); +} + +function print_warning($msg) { + return print format_warning($msg); +} + +function print_error($msg) { + return print format_error($msg); +} + +function print_label_select($name, $value, $attributes = "") { + + $pdo = Db::pdo(); + + $sth = $pdo->prepare("SELECT caption FROM ttrss_labels2 + WHERE owner_uid = ? ORDER BY caption"); + $sth->execute([$_SESSION['uid']]); + + print ""; + + +} diff --git a/include/functions.php b/include/functions.php index 4557c0411..174ef39f0 100644 --- a/include/functions.php +++ b/include/functions.php @@ -203,6 +203,7 @@ require_once 'db-prefs.php'; require_once 'controls.php'; + require_once 'controls_compat.php'; define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . get_version() . ' (http://tt-rss.org/)'); ini_set('user_agent', SELF_USER_AGENT); diff --git a/include/login_form.php b/include/login_form.php index aa6a72260..798efa624 100755 --- a/include/login_form.php +++ b/include/login_form.php @@ -97,7 +97,7 @@ - + diff --git a/plugins/mail/init.php b/plugins/mail/init.php index 829620ebc..b1263ece5 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -160,7 +160,7 @@ class Mail extends Plugin { style=\"width : 30em;\" name=\"destination\" id=\"emailArticleDlg_destination\">"; */ - print_select("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.ComboBox"'); + print \Controls\select_tag("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.ComboBox"'); /* print "

"; */ -- cgit v1.2.3-54-g00ecf From 1f43d7916cda16e9680b9087bda1f52934e8f25b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Feb 2021 14:32:06 +0300 Subject: replace print_hidden with hidden_tag --- classes/pref/feeds.php | 12 ++++++------ classes/pref/filters.php | 10 +++++----- plugins/af_proxy_http/init.php | 6 +++--- plugins/af_psql_trgm/init.php | 6 +++--- plugins/af_readability/init.php | 6 +++--- plugins/af_redditimgur/init.php | 6 +++--- plugins/mail/init.php | 16 ++++++++-------- plugins/note/init.php | 8 ++++---- plugins/nsfw/init.php | 6 +++--- 9 files changed, 38 insertions(+), 38 deletions(-) (limited to 'classes/pref/feeds.php') diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index d97081293..d087d026d 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -524,9 +524,9 @@ class Pref_Feeds extends Handler_Protected { $title = htmlspecialchars($row["title"]); - print_hidden("id", "$feed_id"); - print_hidden("op", "pref-feeds"); - print_hidden("method", "editSave"); + print \Controls\hidden_tag("id", "$feed_id"); + print \Controls\hidden_tag("op", "pref-feeds"); + print \Controls\hidden_tag("method", "editSave"); print "

".__("Feed")."

"; print "

"; @@ -821,9 +821,9 @@ class Pref_Feeds extends Handler_Protected { print "

"; - print_hidden("ids", "$feed_ids"); - print_hidden("op", "pref-feeds"); - print_hidden("method", "batchEditSave"); + print \Controls\hidden_tag("ids", "$feed_ids"); + print \Controls\hidden_tag("op", "pref-feeds"); + print \Controls\hidden_tag("method", "batchEditSave"); print "

".__("Feed")."

"; print "

"; diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 23275a1d6..9b740753a 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -327,16 +327,16 @@ class Pref_Filters extends Handler_Protected { print ""; - print_hidden("op", "pref-filters"); + print \Controls\hidden_tag("op", "pref-filters"); if ($filter_id) { - print_hidden("id", "$filter_id"); - print_hidden("method", "editSave"); + print \Controls\hidden_tag("id", "$filter_id"); + print \Controls\hidden_tag("method", "editSave"); } else { - print_hidden("method", "add"); + print \Controls\hidden_tag("method", "add"); } - print_hidden("csrf_token", $_SESSION['csrf_token']); + print \Controls\hidden_tag("csrf_token", $_SESSION['csrf_token']); print "

".__("Caption")."

diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php index 3f26ca900..b82999281 100644 --- a/plugins/af_proxy_http/init.php +++ b/plugins/af_proxy_http/init.php @@ -218,9 +218,9 @@ class Af_Proxy_Http extends Plugin { } "; - print_hidden("op", "pluginhandler"); - print_hidden("method", "save"); - print_hidden("plugin", "af_proxy_http"); + print \Controls\hidden_tag("op", "pluginhandler"); + print \Controls\hidden_tag("method", "save"); + print \Controls\hidden_tag("plugin", "af_proxy_http"); $proxy_all = $this->host->get($this, "proxy_all"); print_checkbox("proxy_all", $proxy_all); diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 47ff98fc2..715e63927 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -157,9 +157,9 @@ class Af_Psql_Trgm extends Plugin { } "; - print_hidden("op", "pluginhandler"); - print_hidden("method", "save"); - print_hidden("plugin", "af_psql_trgm"); + print \Controls\hidden_tag("op", "pluginhandler"); + print \Controls\hidden_tag("method", "save"); + print \Controls\hidden_tag("plugin", "af_psql_trgm"); print "

" . __("Global settings") . "

"; diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php index 4d21a831c..435864c21 100755 --- a/plugins/af_readability/init.php +++ b/plugins/af_readability/init.php @@ -87,9 +87,9 @@ class Af_Readability extends Plugin { } "; - print_hidden("op", "pluginhandler"); - print_hidden("method", "save"); - print_hidden("plugin", "af_readability"); + print \Controls\hidden_tag("op", "pluginhandler"); + print \Controls\hidden_tag("method", "save"); + print \Controls\hidden_tag("plugin", "af_readability"); $enable_share_anything = $this->host->get($this, "enable_share_anything"); diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php index b9a2db68d..b9891ea03 100755 --- a/plugins/af_redditimgur/init.php +++ b/plugins/af_redditimgur/init.php @@ -58,9 +58,9 @@ class Af_RedditImgur extends Plugin { } "; - print_hidden("op", "pluginhandler"); - print_hidden("method", "save"); - print_hidden("plugin", "af_redditimgur"); + print \Controls\hidden_tag("op", "pluginhandler"); + print \Controls\hidden_tag("method", "save"); + print \Controls\hidden_tag("plugin", "af_redditimgur"); print "

"; print ""; diff --git a/plugins/mail/init.php b/plugins/mail/init.php index b1263ece5..ffd0397e0 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -58,9 +58,9 @@ class Mail extends Plugin { } "; - print_hidden("op", "pluginhandler"); - print_hidden("method", "save"); - print_hidden("plugin", "mail"); + print \Controls\hidden_tag("op", "pluginhandler"); + print \Controls\hidden_tag("method", "save"); + print \Controls\hidden_tag("plugin", "mail"); $addresslist = $this->host->get($this, "addresslist"); @@ -86,9 +86,9 @@ class Mail extends Plugin { $ids = explode(",", $_REQUEST['param']); $ids_qmarks = arr_qmarks($ids); - print_hidden("op", "pluginhandler"); - print_hidden("plugin", "mail"); - print_hidden("method", "sendEmail"); + print \Controls\hidden_tag("op", "pluginhandler"); + print \Controls\hidden_tag("plugin", "mail"); + print \Controls\hidden_tag("method", "sendEmail"); $sth = $this->pdo->prepare("SELECT email, full_name FROM ttrss_users WHERE id = ?"); @@ -105,8 +105,8 @@ class Mail extends Plugin { if (!$user_name) $user_name = $_SESSION['name']; - print_hidden("from_email", "$user_email"); - print_hidden("from_name", "$user_name"); + print \Controls\hidden_tag("from_email", "$user_email"); + print \Controls\hidden_tag("from_name", "$user_name"); $tpl = new Templator(); diff --git a/plugins/note/init.php b/plugins/note/init.php index d5b231190..0634d4c57 100644 --- a/plugins/note/init.php +++ b/plugins/note/init.php @@ -37,10 +37,10 @@ class Note extends Plugin { $note = $row['note']; - print_hidden("id", "$param"); - print_hidden("op", "pluginhandler"); - print_hidden("method", "setNote"); - print_hidden("plugin", "note"); + print \Controls\hidden_tag("id", "$param"); + print \Controls\hidden_tag("op", "pluginhandler"); + print \Controls\hidden_tag("method", "setNote"); + print \Controls\hidden_tag("plugin", "note"); print "

";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "nsfw");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "save");
+			print \Controls\hidden_tag("plugin", "nsfw");
 
 			print "<table width=\"100%\" class=\"prefPrefsList\">";
 
-- 
cgit v1.2.3-54-g00ecf

From 1f5d81b77cd9a5d5f965af0435688c1f1f229e96 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 15:19:42 +0300
Subject: use a few more control helpers for checkboxes

---
 classes/feeds.php        |  8 ++------
 classes/pref/feeds.php   |  6 +-----
 classes/pref/filters.php | 10 +++++-----
 3 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'classes/pref/feeds.php')

diff --git a/classes/feeds.php b/classes/feeds.php
index 400c302d6..4e6fdbaf8 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -649,10 +649,6 @@ class Feeds extends Handler_Protected {
 		    print "Access denied.";
 		    return;
         }
-
-		$refetch_checked = isset($_REQUEST["force_refetch"]) ? "checked" : "";
-		$rehash_checked = isset($_REQUEST["force_rehash"]) ? "checked" : "";
-
 		?>
 		<!DOCTYPE html>
 		<html>
@@ -712,11 +708,11 @@ class Feeds extends Handler_Protected {
 						</fieldset>
 
 						<fieldset>
-							<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_refetch" value="1" <?= $refetch_checked ?>> Force refetch</label>
+							<label class="checkbox"><?= \Controls\checkbox_tag("force_refetch", isset($_REQUEST["force_refetch"])) ?> Force refetch</label>
 						</fieldset>
 
 						<fieldset class="narrow">
-							<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_rehash" value="1" <?= $rehash_checked ?>> Force rehash</label>
+							<label class="checkbox"><?= \Controls\checkbox_tag("force_rehash", isset($_REQUEST["force_rehash"])) ?> Force rehash</label>
 						</fieldset>
 
 						<?= \Controls\submit_tag("Continue") ?>
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index d087d026d..636f2d69b 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -663,7 +663,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<fieldset>";
 
-			print "<input dojoType='dijit.form.TextBox' id='feedEditDlg_login'
+			print "<input dojoType='dijit.form.TextBox'
 				placeHolder='".__("Login")."'
 				autocomplete='new-password'
 				name='auth_login' value=\"$auth_login\">";
@@ -675,10 +675,6 @@ class Pref_Feeds extends Handler_Protected {
 				placeHolder='".__("Password")."'
 				value=\"$auth_pass\">";
 
-			print "<div dojoType='dijit.Tooltip' connectId='feedEditDlg_login' position='below'>
-				".__('<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')."
-				</div>";
-
 			print "</fieldset>";
 
 			print "</section></div>";
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 9b740753a..36357234b 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -775,12 +775,12 @@ class Pref_Filters extends Handler_Protected {
 			$reg_exp = htmlspecialchars($rule["reg_exp"]);
 			$filter_type = $rule["filter_type"];
 			$feed_id = $rule["feed_id"];
-			$inverse_checked = isset($rule["inverse"]) ? "checked" : "";
+			$inverse_checked = !empty($rule["inverse"]);
 		} else {
 			$reg_exp = "";
 			$filter_type = 1;
 			$feed_id = ["0"];
-			$inverse_checked = "";
+			$inverse_checked = false;
 		}
 
 		print "<form name='filter_new_rule_form' id='filter_new_rule_form' onsubmit='return false;'>";
@@ -808,9 +808,9 @@ class Pref_Filters extends Handler_Protected {
 		print "<div dojoType='dijit.Tooltip' id='filterDlg_regExp_tip' connectId='filterDlg_regExp' position='below'></div>";
 
 		print "<fieldset>";
-		print "<label class='checkbox'><input id='filterDlg_inverse' dojoType='dijit.form.CheckBox'
-			 name='inverse' $inverse_checked/> ".
-		 	__("Inverse regular expression matching")."</label>";
+		print "<label class='checkbox'>".
+		 	\Controls\checkbox_tag("inverse", $inverse_checked) .
+			 __("Inverse regular expression matching")."</label>";
 		print "</fieldset>";
 
 		print "<fieldset>";
-- 
cgit v1.2.3-54-g00ecf

From bdbbdbb0eddd125bec167da5f42bbd95c770151f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 16:59:21 +0300
Subject: rework controls to accept parameters as array

(limited to 'classes/pref/feeds.php')

diff --git a/classes/feeds.php b/classes/feeds.php
index 4e6fdbaf8..43c8bf584 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -608,7 +608,7 @@ class Feeds extends Handler_Protected {
 			print "<fieldset>";
 			print "<label class='inline'>" . __("Language:") . "</label>";
 			print \Controls\select_tag("search_language", get_pref('DEFAULT_SEARCH_LANGUAGE'), Pref_Feeds::get_ts_languages(),
-				"title=\"".__('Used for word stemming')."\"");
+										["title" => __('Used for word stemming')]);
 			print "</fieldset>";
 		}
 
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 636f2d69b..ce2d321bd 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -644,8 +644,10 @@ class Pref_Feeds extends Handler_Protected {
 				$local_purge_intervals = [ T_nsprintf('%d day', '%d days', $purge_interval, $purge_interval) ];
 			}
 
-			print \Controls\select_hash("purge_interval", $purge_interval, $local_purge_intervals,
-				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
+			print \Controls\select_hash("purge_interval",
+										$purge_interval,
+										$local_purge_intervals,
+										(FORCE_ARTICLE_PURGE == 0) ? [] : ["disabled" => 1]);
 
 			print "</fieldset>";
 
@@ -815,8 +817,6 @@ class Pref_Feeds extends Handler_Protected {
 
 		print_notice("Enable the options you wish to apply using checkboxes on the right:");
 
-		print "<p>";
-
 		print \Controls\hidden_tag("ids", "$feed_ids");
 		print \Controls\hidden_tag("op", "pref-feeds");
 		print \Controls\hidden_tag("method", "batchEditSave");
@@ -846,8 +846,7 @@ class Pref_Feeds extends Handler_Protected {
 			print "<fieldset>";
 
 			print "<label>" . __('Language:') . "</label> ";
-			print \Controls\select_tag("feed_language", "", $this::get_ts_languages(),
-				'disabled="1"');
+			print \Controls\select_tag("feed_language", "", $this::get_ts_languages(), ["disabled"=> 1]);
 
 			$this->batch_edit_cbox("feed_language");
 
@@ -868,7 +867,7 @@ class Pref_Feeds extends Handler_Protected {
 		$local_update_intervals = $update_intervals;
 		$local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref("DEFAULT_UPDATE_INTERVAL")]);
 
-		print \Controls\select_hash("update_interval", "", $local_update_intervals, 'disabled="1"');
+		print \Controls\select_hash("update_interval", "", $local_update_intervals, ["disabled" => 1]);
 
 		$this->batch_edit_cbox("update_interval");
 
@@ -890,7 +889,7 @@ class Pref_Feeds extends Handler_Protected {
 			else
 				$local_purge_intervals[0] .= " " . sprintf("(%s)", __("Disabled"));
 
-			print \Controls\select_hash("purge_interval", "", $local_purge_intervals, 'disabled="1"');
+			print \Controls\select_hash("purge_interval", "", $local_purge_intervals, ["disabled" => 1]);
 
 			$this->batch_edit_cbox("purge_interval");
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index caefb1ea7..e9c58cc3e 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -894,7 +894,7 @@ class Pref_Filters extends Handler_Protected {
 			dojoType='fox.form.Select'");*/
 
 		print \Controls\select_labels("action_param_label", $action_param,
-			"style=\"$label_param_hidden\"",
+			["style" => $label_param_hidden],
 			"filterDlg_actionParamLabel");
 
 		$filter_actions = PluginHost::getInstance()->get_filter_actions();
@@ -909,16 +909,16 @@ class Pref_Filters extends Handler_Protected {
 		}
 
 		if (count($filter_action_hash) == 0) {
-			$filter_plugin_disabled = "disabled";
+			$filter_plugin_disabled = ["disabled" => "1"];
 
 			$filter_action_hash["no-data"] = __("No actions available");
 
 		} else {
-			$filter_plugin_disabled = "";
+			$filter_plugin_disabled = [];
 		}
 
 		print \Controls\select_hash("action_param_plugin", $action_param, $filter_action_hash,
-			"style=\"$plugin_param_hidden\" $filter_plugin_disabled",
+			array_merge(["style" => $plugin_param_hidden], $filter_plugin_disabled),
 			"filterDlg_actionParamPlugin");
 
 		print "</span>";
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index d8491995d..3bc8a9a9c 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -664,13 +664,13 @@ class Pref_Prefs extends Handler_Protected {
 
 					if ($pref_name == "USER_LANGUAGE") {
 						print \Controls\select_hash($pref_name, $value, get_translations(),
-							"style='width : 220px; margin : 0px'");
+							["style" => 'width : 220px; margin : 0px']);
 
 					} else if ($pref_name == "USER_TIMEZONE") {
 
 						$timezones = explode("\n", file_get_contents("lib/timezones.txt"));
 
-						print \Controls\select_tag($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"');
+						print \Controls\select_tag($pref_name, $value, $timezones, ["dojoType" => "dijit.form.FilteringSelect"]);
 
 					} else if ($pref_name == "BLACKLISTED_TAGS") { # TODO: other possible <textarea> prefs go here
 
diff --git a/classes/pref/system.php b/classes/pref/system.php
index d3b733364..a4a072ea9 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -95,7 +95,7 @@ class Pref_System extends Handler_Administrative {
 							E_USER_ERROR => __("Errors"),
 							E_USER_WARNING => __("Warnings"),
 							E_USER_NOTICE => __("Everything")
-						], 'onchange="Helpers.EventLog.refresh()"', "severity") ?>
+						], ["onchange"=> "Helpers.EventLog.refresh()"], "severity") ?>
 				</div>
 			</div>
 
diff --git a/include/controls.php b/include/controls.php
index b351a9449..78ff75572 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -1,19 +1,30 @@
 <?php
    namespace Controls;
 
-   function button_tag(string $value, string $type, $attributes = "") {
-      return "<button dojoType=\"dijit.form.Button\" $attributes type=\"$type\">".htmlspecialchars($value)."</button>";
+   function attributes_to_string(array $attributes) {
+      $rv = "";
+
+      foreach ($attributes as $k => $v) {
+         $rv .= "$k=\"" . htmlspecialchars($v) . "\"";
+      }
+
+      return $rv;
+   }
+
+   function button_tag(string $value, string $type, array $attributes = []) {
+      return "<button dojoType=\"dijit.form.Button\" ".attributes_to_string($attributes)." type=\"$type\">".htmlspecialchars($value)."</button>";
    }
 
-   function submit_tag(string $value, $attributes = "") {
-      return button_tag($value, "submit", "class=\"alt-primary\" $attributes");
+   function submit_tag(string $value, array $attributes = []) {
+      return button_tag($value, "submit", array_merge(["class" => "alt-primary"], $attributes));
    }
 
-   function select_tag(string $name, $value, array $values, string $attributes = "", string $id = "") {
-      $dojo_type = strpos($attributes, "dojoType") === false ? "dojoType='fox.form.Select'" : "";
+   function select_tag(string $name, $value, array $values, array $attributes = [], string $id = "") {
+      $attributes_str = attributes_to_string($attributes);
+      $dojo_type = strpos($attributes_str, "dojoType") === false ? "dojoType='fox.form.Select'" : "";
 
       $rv = "<select $dojo_type name=\"".htmlspecialchars($name)."\"
-         id=\"".htmlspecialchars($id)."\" name=\"".htmlspecialchars($name)."\" $attributes>";
+         id=\"".htmlspecialchars($id)."\" name=\"".htmlspecialchars($name)."\" $attributes_str>";
 
       foreach ($values as $v) {
          $is_sel = ($v == $value) ? "selected=\"selected\"" : "";
@@ -26,7 +37,7 @@
       return $rv;
    }
 
-   function select_labels(string $name, string $value, string $attributes = "", string $id = "") {
+   function select_labels(string $name, string $value, array $attributes = [], string $id = "") {
       $pdo = \Db::pdo();
 
       $sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
@@ -42,11 +53,12 @@
       return select_tag($name, $value, $values, $attributes, $id);
    }
 
-   function select_hash(string $name, $value, array $values, string $attributes = "", string $id = "") {
-      $dojo_type = strpos($attributes, "dojoType") === false ? "dojoType='fox.form.Select'" : "";
+   function select_hash(string $name, $value, array $values, array $attributes = [], string $id = "") {
+      $attributes_str = attributes_to_string($attributes);
+      $dojo_type = strpos($attributes_str, "dojoType") === false ? "dojoType='fox.form.Select'" : "";
 
       $rv = "<select $dojo_type name=\"".htmlspecialchars($name)."\"
-         id=\"".htmlspecialchars($id)."\" name=\"".htmlspecialchars($name)."\" $attributes>";
+         id=\"".htmlspecialchars($id)."\" name=\"".htmlspecialchars($name)."\" $attributes_str>";
 
       foreach ($values as $k => $v) {
          $is_sel = ($k == $value) ? "selected=\"selected\"" : "";
@@ -59,20 +71,21 @@
       return $rv;
    }
 
-   function hidden_tag(string $name, string $value) {
+   function hidden_tag(string $name, string $value, array $attributes = []) {
       return "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"
-         name=\"".htmlspecialchars($name)."\" value=\"".htmlspecialchars($value)."\">";
+               ".attributes_to_string($attributes)." name=\"".htmlspecialchars($name)."\"
+               value=\"".htmlspecialchars($value)."\">";
    }
 
-   function checkbox_tag(string $name, bool $checked = false, string $value = "", string $attributes = "", string $id = "") {
+   function checkbox_tag(string $name, bool $checked = false, string $value = "", array $attributes = [], string $id = "") {
       $is_checked = $checked ? "checked" : "";
       $value_str = $value ? "value=\"".htmlspecialchars($value)."\"" : "";
 
       return "<input dojoType='dijit.form.CheckBox' name=\"".htmlspecialchars($name)."\"
-                  $value_str $is_checked $attributes id=\"".htmlspecialchars($id)."\">";
+                  $value_str $is_checked ".attributes_to_string($attributes)." id=\"".htmlspecialchars($id)."\">";
    }
 
-   function select_feeds_cats(string $name, int $default_id = null, string $attributes = "",
+   function select_feeds_cats(string $name, int $default_id = null, array $attributes = [],
                   bool $include_all_cats = true, string $root_id = null, int $nest_level = 0, string $id = "") {
 
       $ret = "";
@@ -81,7 +94,7 @@
          $ret .= "<select name=\"".htmlspecialchars($name)."\"
                         id=\"".htmlspecialchars($id)."\"
                         default=\"".((string)$default_id)."\"
-                        dojoType=\"fox.form.Select\" $attributes>";
+                        dojoType=\"fox.form.Select\" ".attributes_to_string($attributes).">";
       }
 
       $pdo = \Db::pdo();
diff --git a/include/login_form.php b/include/login_form.php
index e4eb52a51..c3660bced 100755
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -142,7 +142,8 @@
 				<label> </label>
 
 				<label id="bw_limit_label">
-					<?= \Controls\checkbox_tag("safe_mode", false, "", "onchange='UtilityApp.bwLimitChange(this)'", 'bw_limit') ?>
+					<?= \Controls\checkbox_tag("bw_limit", false, "",
+									["onchange" => 'UtilityApp.bwLimitChange(this)'], 'bw_limit') ?>
 					<?= __("Use less traffic") ?></label>
 			</fieldset>
 
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index ffd0397e0..c054196df 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -160,7 +160,8 @@ class Mail extends Plugin {
 				style=\"width : 30em;\"
 				name=\"destination\" id=\"emailArticleDlg_destination\">"; */
 
-		print \Controls\select_tag("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.ComboBox"');
+		print \Controls\select_tag("destination", "", $addresslist,
+									["style" => "width: 30em", "dojoType" => "dijit.form.ComboBox"]);
 
 /*		print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
 	style=\"z-index: 30; display : none\"></div>"; */
-- 
cgit v1.2.3-54-g00ecf

From f58c49beaa5e2e0bf924f0ea844ede18abd0bc27 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 18:50:18 +0300
Subject: replace a few more controls to new style

---
 classes/pref/feeds.php          |   2 +-
 classes/pref/filters.php        | 105 +++++++++++++++++++++++++++++++++++++++-
 plugins/af_proxy_http/init.php  |  10 ++--
 plugins/af_psql_trgm/init.php   |   8 +--
 plugins/af_readability/init.php |  16 +++---
 plugins/af_redditimgur/init.php |  15 +++---
 6 files changed, 131 insertions(+), 25 deletions(-)

(limited to 'classes/pref/feeds.php')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index ce2d321bd..3d633a378 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1325,7 +1325,7 @@ class Pref_Feeds extends Handler_Protected {
 			</button>
 
 			<label class='checkbox'>
-				<?php print_checkbox("include_settings", true, "1", "") ?>
+				<?= \Controls\checkbox_tag("include_settings", true, "1") ?>
 				<?= __("Include settings") ?>
 			</label>
 		</form>
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index e9c58cc3e..bc3099e77 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -818,7 +818,7 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<fieldset>";
 		print "<span id='filterDlg_feeds'>";
-		print_feed_multi_select("feed_id",
+		$this->feed_multi_select("feed_id",
 			$feed_id,
 			'style="width : 500px; height : 300px" dojoType="dijit.form.MultiSelect"');
 		print "</span>";
@@ -1070,4 +1070,107 @@ class Pref_Filters extends Handler_Protected {
 
 		$this->pdo->commit();
 	}
+
+	private function feed_multi_select($id, $default_ids = [],
+						   $attributes = "", $include_all_feeds = true,
+						   $root_id = null, $nest_level = 0) {
+
+	$pdo = Db::pdo();
+
+	//	print_r(in_array("CAT:6",$default_ids));
+
+	if (!$root_id) {
+		print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
+		if ($include_all_feeds) {
+			$is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : "";
+			print "<option $is_selected value=\"0\">".__('All feeds')."</option>";
+		}
+	}
+
+	if (get_pref('ENABLE_FEED_CATS')) {
+
+		if (!$root_id) $root_id = null;
+
+		$sth = $pdo->prepare("SELECT id,title,
+				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
+					c2.parent_cat = ttrss_feed_categories.id) AS num_children
+				FROM ttrss_feed_categories
+				WHERE owner_uid = :uid AND
+				(parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
+
+		$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
+
+		while ($line = $sth->fetch()) {
+
+			for ($i = 0; $i < $nest_level; $i++)
+				$line["title"] = " " . $line["title"];
+
+			$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
+
+			printf("<option $is_selected value='CAT:%d'>%s</option>",
+				$line["id"], htmlspecialchars($line["title"]));
+
+			if ($line["num_children"] > 0)
+				$this->feed_multi_select($id, $default_ids, $attributes,
+					$include_all_feeds, $line["id"], $nest_level+1);
+
+			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+					WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
+
+			$f_sth->execute([$line['id'], $_SESSION['uid']]);
+
+			while ($fline = $f_sth->fetch()) {
+				$is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
+
+				$fline["title"] = " " . $fline["title"];
+
+				for ($i = 0; $i < $nest_level; $i++)
+					$fline["title"] = " " . $fline["title"];
+
+				printf("<option $is_selected value='%d'>%s</option>",
+					$fline["id"], htmlspecialchars($fline["title"]));
+			}
+		}
+
+		if (!$root_id) {
+			$is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : "";
+
+			printf("<option $is_selected value='CAT:0'>%s</option>",
+				__("Uncategorized"));
+
+			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+					WHERE cat_id IS NULL AND owner_uid = ? ORDER BY title");
+			$f_sth->execute([$_SESSION['uid']]);
+
+			while ($fline = $f_sth->fetch()) {
+				$is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
+
+				$fline["title"] = " " . $fline["title"];
+
+				for ($i = 0; $i < $nest_level; $i++)
+					$fline["title"] = " " . $fline["title"];
+
+				printf("<option $is_selected value='%d'>%s</option>",
+					$fline["id"], htmlspecialchars($fline["title"]));
+			}
+		}
+
+	} else {
+		$sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+				WHERE owner_uid = ? ORDER BY title");
+		$sth->execute([$_SESSION['uid']]);
+
+		while ($line = $sth->fetch()) {
+
+			$is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : "";
+
+			printf("<option $is_selected value='%d'>%s</option>",
+				$line["id"], htmlspecialchars($line["title"]));
+		}
+	}
+
+	if (!$root_id) {
+		print "</select>";
+	}
+}
 }
diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php
index b82999281..79d2f5294 100644
--- a/plugins/af_proxy_http/init.php
+++ b/plugins/af_proxy_http/init.php
@@ -222,11 +222,13 @@ class Af_Proxy_Http extends Plugin {
 		print \Controls\hidden_tag("method", "save");
 		print \Controls\hidden_tag("plugin", "af_proxy_http");
 
-		$proxy_all = $this->host->get($this, "proxy_all");
-		print_checkbox("proxy_all", $proxy_all);
+		$proxy_all = sql_bool_to_bool($this->host->get($this, "proxy_all"));
+		print \Controls\checkbox_tag("proxy_all", $proxy_all);
 		print " <label for=\"proxy_all\">" . __("Enable proxy for all remote images.") . "</label><br/>";
 
-		print "<p>"; print_button("submit", __("Save"));
+		print "<hr/>";
+
+		print \Controls\submit_tag(__("Save"));
 
 		print "</form>";
 
@@ -234,7 +236,7 @@ class Af_Proxy_Http extends Plugin {
 	}
 
 	function save() {
-		$proxy_all = checkbox_to_sql_bool($_POST["proxy_all"]);
+		$proxy_all = checkbox_to_sql_bool($_POST["proxy_all"] ?? "");
 
 		$this->host->set($this, "proxy_all", $proxy_all);
 
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 715e63927..3662e490a 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -139,7 +139,7 @@ class Af_Psql_Trgm extends Plugin {
 
 			$similarity = $this->host->get($this, "similarity", $this->default_similarity);
 			$min_title_length = $this->host->get($this, "min_title_length", $this->default_min_length);
-			$enable_globally = $this->host->get($this, "enable_globally");
+			$enable_globally = sql_bool_to_bool($this->host->get($this, "enable_globally"));
 
 			print "<form dojoType=\"dijit.form.Form\">";
 
@@ -186,13 +186,14 @@ class Af_Psql_Trgm extends Plugin {
 			print "</fieldset><fieldset>";
 
 			print "<label class='checkbox'>";
-			print_checkbox("enable_globally", $enable_globally);
+			print \Controls\checkbox_tag("enable_globally", $enable_globally);
 			print " " . __("Enable for all feeds:");
 			print "</label>";
 
 			print "</fieldset>";
 
-			print_button("submit", __("Save"), "class='alt-primary'");
+			print "<hr/>";
+			print \Controls\submit_tag(__("Save"));
 			print "</form>";
 
 			/* cleanup */
@@ -202,6 +203,7 @@ class Af_Psql_Trgm extends Plugin {
 			$this->host->set($this, "enabled_feeds", $enabled_feeds);
 
 			if (count($enabled_feeds) > 0) {
+				print "<hr/>";
 				print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
 
 				print "<ul class=\"panel panel-scrollable list list-unstyled\">";
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index 435864c21..b9c4e252e 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -18,7 +18,7 @@ class Af_Readability extends Plugin {
 	}
 
 	function save() {
-		$enable_share_anything = checkbox_to_sql_bool($_POST["enable_share_anything"]);
+		$enable_share_anything = checkbox_to_sql_bool($_POST["enable_share_anything"] ?? "");
 
 		$this->host->set($this, "enable_share_anything", $enable_share_anything);
 
@@ -29,11 +29,6 @@ class Af_Readability extends Plugin {
 	{
 		$this->host = $host;
 
-		if (version_compare(PHP_VERSION, '7.0.0', '<')) {
-			user_error("af_readability requires PHP 7.0", E_USER_WARNING);
-			return;
-		}
-
 		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
 		$host->add_hook($host::HOOK_PREFS_TAB, $this);
 		$host->add_hook($host::HOOK_PREFS_EDIT_FEED, $this);
@@ -91,16 +86,18 @@ class Af_Readability extends Plugin {
 			print \Controls\hidden_tag("method", "save");
 			print \Controls\hidden_tag("plugin", "af_readability");
 
-			$enable_share_anything = $this->host->get($this, "enable_share_anything");
+			$enable_share_anything = sql_bool_to_bool($this->host->get($this, "enable_share_anything"));
 
 			print "<fieldset>";
 			print "<label class='checkbox'> ";
-			print_checkbox("enable_share_anything", $enable_share_anything);
+			print \Controls\checkbox_tag("enable_share_anything", $enable_share_anything);
 			print " " . __("Provide full-text services to core code (bookmarklets) and other plugins");
 			print "</label>";
 			print "</fieldset>";
 
-			print_button("submit", __("Save"), "class='alt-primary'");
+			print "<hr/>";
+
+			print \Controls\submit_tag(__("Save"));
 			print "</form>";
 
 			/* cleanup */
@@ -114,6 +111,7 @@ class Af_Readability extends Plugin {
 			$this->host->set($this, "append_feeds", $append_feeds);
 
 			if (count($enabled_feeds) > 0) {
+				print "<hr/>";
 				print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
 
 				print "<ul class='panel panel-scrollable list list-unstyled'>";
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index b9891ea03..1c520b7ed 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -64,32 +64,33 @@ class Af_RedditImgur extends Plugin {
 
 		print "<fieldset class='narrow'>";
 		print "<label class='checkbox'>";
-		print_checkbox("enable_readability", $enable_readability);
+		print \Controls\checkbox_tag("enable_readability", $enable_readability);
 		print " " . __("Extract missing content using Readability (requires af_readability)") . "</label>";
 		print "</fieldset>";
 
 		print "<fieldset class='narrow'>";
 		print "<label class='checkbox'>";
-		print_checkbox("enable_content_dupcheck", $enable_content_dupcheck);
+		print \Controls\checkbox_tag("enable_content_dupcheck", $enable_content_dupcheck);
 		print " " . __("Enable additional duplicate checking") . "</label>";
 		print "</fieldset>";
 
 		print "<fieldset class='narrow'>";
 		print "<label class='checkbox'>";
-		print_checkbox("reddit_to_teddit", $reddit_to_teddit);
+		print \Controls\checkbox_tag("reddit_to_teddit", $reddit_to_teddit);
 		print " " . T_sprintf("Rewrite Reddit URLs to %s",
 			"<a target=\"_blank\" href=\"https://teddit.net/about\">Teddit</a>") . "</label>";
 
-		print_button("submit", __("Save"), 'class="alt-primary"');
+		print "<hr/>";
+		print \Controls\submit_tag(__("Save"));
 		print "</form>";
 
 		print "</div>";
 	}
 
 	function save() {
-		$enable_readability = checkbox_to_sql_bool($_POST["enable_readability"]);
-		$enable_content_dupcheck = checkbox_to_sql_bool($_POST["enable_content_dupcheck"]);
-		$reddit_to_teddit = checkbox_to_sql_bool($_POST["reddit_to_teddit"]);
+		$enable_readability = checkbox_to_sql_bool($_POST["enable_readability"] ?? "");
+		$enable_content_dupcheck = checkbox_to_sql_bool($_POST["enable_content_dupcheck"] ?? "");
+		$reddit_to_teddit = checkbox_to_sql_bool($_POST["reddit_to_teddit"] ?? "");
 
 		$this->host->set($this, "enable_readability", $enable_readability, false);
 		$this->host->set($this, "reddit_to_teddit", $reddit_to_teddit, false);
-- 
cgit v1.2.3-54-g00ecf

From dcfea9baacc41984f683342e6a3e4949243b7324 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 06:51:15 +0300
Subject: properly validate feed editor dialog

---
 classes/pref/feeds.php | 2 +-
 js/CommonDialogs.js    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'classes/pref/feeds.php')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 3d633a378..761a0a087 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -803,7 +803,7 @@ class Pref_Feeds extends Handler_Protected {
 				<button style='float : left' class='alt-danger' dojoType='dijit.form.Button'
 					onclick='App.dialogOf(this).unsubscribeFeed($feed_id, \"$title\")'>".
 					__('Unsubscribe')."</button>
-				<button dojoType='dijit.form.Button' class='alt-primary' type='submit'>".__('Save')."</button>
+				<button dojoType='dijit.form.Button' class='alt-primary' onclick='return App.dialogOf(this).execute()' type='submit'>".__('Save')."</button>
 				<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'>".__('Cancel')."</button>
 				</footer>";
 		}
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index 40313d34f..c62e6893e 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -425,7 +425,9 @@ const	CommonDialogs = {
 								Feeds.reload();
 
 						});
+						return true;
 					}
+					return false;
 				},
 				content: __("Loading, please wait...")
 			});
-- 
cgit v1.2.3-54-g00ecf

From 660a1bbe011fef5f0fa6bb0af43521fed7598cc7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 13:44:56 +0300
Subject:  * switch to xhr.post() almost everywhere  * call App.handlerpcjson()
 automatically on json request (if possible)  * show net/log indicators in
 prefs

(limited to 'classes/pref/feeds.php')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 761a0a087..97c529d07 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -832,8 +832,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<label>" . __('Place in category:') . "</label> ";
 
-			print_feed_cat_select("cat_id", false,
-				'disabled="1" dojoType="fox.form.Select"');
+			print \Controls\select_feeds_cats("cat_id", null, ['disabled' => '1']);
 
 			$this->batch_edit_cbox("cat_id");
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index fecec6d91..2ea2e9f01 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -295,8 +295,8 @@ class Pref_Prefs extends Handler_Protected {
 					evt.preventDefault();
 					if (this.validate()) {
 						Notify.progress('Saving data...', true);
-						xhrPost("backend.php", this.getValues(), (transport) => {
-							Notify.info(transport.responseText);
+						xhr.post("backend.php", this.getValues(), (reply) => {
+							Notify.info(reply);
 						})
 					}
 			</script>
@@ -351,16 +351,16 @@ class Pref_Prefs extends Handler_Protected {
 					evt.preventDefault();
 					if (this.validate()) {
 						Notify.progress('Saving data...', true);
-						xhrPost("backend.php", this.getValues(), (transport) => {
+						xhr.post("backend.php", this.getValues(), (reply) => {
 							Notify.close();
-							if (transport.responseText.indexOf('ERROR: ') == 0) {
+							if (reply.indexOf('ERROR: ') == 0) {
 
 								App.byId('pwd_change_infobox').innerHTML =
-									transport.responseText.replace('ERROR: ', '');
+								reply.replace('ERROR: ', '');
 
 							} else {
 								App.byId('pwd_change_infobox').innerHTML =
-									transport.responseText.replace('ERROR: ', '');
+								reply.replace('ERROR: ', '');
 
 								const warn = App.byId('default_pass_warning');
 								if (warn) Element.hide(warn);
@@ -456,11 +456,11 @@ class Pref_Prefs extends Handler_Protected {
 						evt.preventDefault();
 						if (this.validate()) {
 							Notify.progress('Saving data...', true);
-							xhrPost("backend.php", this.getValues(), (transport) => {
+							xhr.post("backend.php", this.getValues(), (reply) => {
 								Notify.close();
 
-								if (transport.responseText.indexOf('ERROR: ') == 0) {
-									Notify.error(transport.responseText.replace('ERROR: ', ''));
+								if (reply.indexOf('ERROR: ') == 0) {
+									Notify.error(reply.replace('ERROR: ', ''));
 								} else {
 									window.location.reload();
 								}
@@ -515,11 +515,11 @@ class Pref_Prefs extends Handler_Protected {
 						evt.preventDefault();
 						if (this.validate()) {
 							Notify.progress('Saving data...', true);
-							xhrPost("backend.php", this.getValues(), (transport) => {
+							xhr.post("backend.php", this.getValues(), (reply) => {
 								Notify.close();
 
-								if (transport.responseText.indexOf('ERROR:') == 0) {
-									Notify.error(transport.responseText.replace('ERROR:', ''));
+								if (reply.indexOf('ERROR:') == 0) {
+									Notify.error(reply.replace('ERROR:', ''));
 								} else {
 									window.location.reload();
 								}
@@ -797,16 +797,14 @@ class Pref_Prefs extends Handler_Protected {
 			<script type="dojo/method" event="onSubmit" args="evt, quit">
 				if (evt) evt.preventDefault();
 				if (this.validate()) {
-					xhrPost("backend.php", this.getValues(), (transport) => {
+					xhr.post("backend.php", this.getValues(), (reply) => {
 						if (quit) {
 							document.location.href = 'index.php';
 						} else {
-							const msg = transport.responseText;
-
-							if (msg == 'PREFS_NEED_RELOAD') {
+							if (reply == 'PREFS_NEED_RELOAD') {
 								window.location.reload();
 							} else {
-								Notify.info(msg);
+								Notify.info(reply);
 							}
 						}
 					})
@@ -942,7 +940,7 @@ class Pref_Prefs extends Handler_Protected {
 			<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						xhrPost("backend.php", this.getValues(), (transport) => {
+						xhr.post("backend.php", this.getValues(), () => {
 							Notify.close();
 							if (confirm(__('Selected plugins have been enabled. Reload?'))) {
 								window.location.reload();
@@ -1009,8 +1007,8 @@ class Pref_Prefs extends Handler_Protected {
 					<script type='dojo/method' event='onSelected' args='evt'>
 						if (this.domNode.querySelector('.loading'))
 							window.setTimeout(() => {
-								xhrPost("backend.php", {op: 'pref-prefs', method: 'index_auth'}, (transport) => {
-									this.attr('content', transport.responseText);
+								xhr.post("backend.php", {op: 'pref-prefs', method: 'index_auth'}, (reply) => {
+									this.attr('content', reply);
 								});
 							}, 100);
 					</script>
@@ -1023,8 +1021,8 @@ class Pref_Prefs extends Handler_Protected {
 					<script type='dojo/method' event='onSelected' args='evt'>
 						if (this.domNode.querySelector('.loading'))
 							window.setTimeout(() => {
-								xhrPost("backend.php", {op: 'pref-prefs', method: 'index_plugins'}, (transport) => {
-									this.attr('content', transport.responseText);
+								xhr.post("backend.php", {op: 'pref-prefs', method: 'index_plugins'}, (reply) => {
+									this.attr('content', reply);
 								});
 							}, 200);
 					</script>
diff --git a/classes/rpc.php b/classes/rpc.php
index 0fd06da4d..c4a1887c7 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -64,6 +64,14 @@ class RPC extends Handler_Protected {
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
+	function getRuntimeInfo() {
+		$reply = [
+			'runtime-info' => $this->make_runtime_info()
+		];
+
+		print json_encode($reply);
+	}
+
 	function getAllCounters() {
 		@$seq = (int) $_REQUEST['seq'];
 
diff --git a/js/App.js b/js/App.js
index 1b0fa7c65..544057101 100644
--- a/js/App.js
+++ b/js/App.js
@@ -2,7 +2,7 @@
 
 /* eslint-disable new-cap */
 /* global __, Article, Headlines, Filters, fox */
-/* global xhrPost, xhr, dojo, dijit, PluginHost, Notify, Feeds, Cookie */
+/* global xhr, dojo, dijit, PluginHost, Notify, Feeds, Cookie */
 /* global CommonDialogs, Plugins */
 
 const App = {
@@ -371,72 +371,57 @@ const App = {
          dialog.show();
       });
    },
-	handleRpcJson: function(transport) {
+	handleRpcJson: function(reply) {
 
-		const netalert = App.findAll("#toolbar .net-alert")[0];
+		const netalert = App.find(".net-alert");
 
-		try {
-			const reply = JSON.parse(transport.responseText);
-
-			if (reply) {
-				const error = reply['error'];
-
-				if (error) {
-					const code = error['code'];
-					const msg = error['message'];
-
-					console.warn("[handleRpcJson] received fatal error ", code, msg);
-
-					if (code != 0) {
-						/* global ERRORS */
-						this.Error.fatal(ERRORS[code], {info: msg, code: code});
-						return false;
-					}
-				}
+      if (reply) {
+         const error = reply['error'];
+         const seq = reply['seq'];
+         const message = reply['message'];
+         const counters = reply['counters'];
+         const runtime_info = reply['runtime-info'];
 
-				const seq = reply['seq'];
+         if (error) {
+            const code = error['code'];
 
-				if (seq && this.get_seq() != seq) {
-					console.log("[handleRpcJson] sequence mismatch: ", seq, '!=', this.get_seq());
-					return true;
-				}
-
-				const message = reply['message'];
-
-				if (message == "UPDATE_COUNTERS") {
-					console.log("need to refresh counters...");
-					Feeds.requestCounters(true);
-				}
+            if (code && code != 0) {
+               const msg = error['message'];
 
-				const counters = reply['counters'];
+               console.warn("[handleRpcJson] received fatal error ", code, msg);
 
-				if (counters)
-					Feeds.parseCounters(counters);
-
-				const runtime_info = reply['runtime-info'];
-
-				if (runtime_info)
-					this.parseRuntimeInfo(runtime_info);
+               /* global ERRORS */
+               this.Error.fatal(ERRORS[code], {info: msg, code: code});
+               return false;
+            }
+         }
 
-				if (netalert) netalert.hide();
+         if (seq && this.get_seq() != seq) {
+            console.warn("[handleRpcJson] sequence mismatch: ", seq, '!=', this.get_seq());
+            return;
+         }
 
-				return reply;
+         // not in preferences
+         if (typeof Feeds != "undefined") {
+            if (message == "UPDATE_COUNTERS") {
+               console.log("need to refresh counters...");
+               Feeds.requestCounters(true);
+            }
 
-			} else {
-				if (netalert) netalert.show();
+            if (counters)
+               Feeds.parseCounters(counters);
+         }
 
-				Notify.error("Communication problem with server.");
-			}
+         if (runtime_info)
+            this.parseRuntimeInfo(runtime_info);
 
-		} catch (e) {
-			if (netalert) netalert.show();
+         if (netalert) netalert.hide();
 
-			Notify.error("Communication problem with server.");
+      } else {
+         if (netalert) netalert.show();
 
-			console.error(e);
+         Notify.error("Communication problem with server.");
 		}
-
-		return false;
 	},
 	parseRuntimeInfo: function(data) {
 		Object.keys(data).forEach((k) => {
@@ -450,7 +435,7 @@ const App = {
          }
 
          if (k == "recent_log_events") {
-            const alert = App.findAll(".log-alert")[0];
+            const alert = App.find(".log-alert");
 
             if (alert) {
                v > 0 ? alert.show() : alert.hide();
@@ -462,10 +447,12 @@ const App = {
             return;
          }
 
-         if (k == "max_feed_id" || k == "num_feeds") {
-            if (this.getInitParam(k) != v) {
-               console.log("feed count changed, need to reload feedlist.");
-               Feeds.reload();
+         if (typeof Feeds != "undefined") {
+            if (k == "max_feed_id" || k == "num_feeds") {
+               if (this.getInitParam(k) && this.getInitParam(k) != v) {
+                  console.log("feed count changed, need to reload feedlist:", this.getInitParam(k), v);
+                  Feeds.reload();
+               }
             }
          }
 
@@ -668,6 +655,11 @@ const App = {
 
       return errorMsg == "";
    },
+   updateRuntimeInfo: function() {
+      xhr.json("backend.php", {op: "rpc", method: "getruntimeinfo"}, () => {
+         // handled by xhr.json()
+      });
+   },
    initSecondStage: function() {
 
       document.onkeydown = (event) => this.hotkeyHandler(event);
@@ -685,14 +677,18 @@ const App = {
             if (tab) {
                dijit.byId("pref-tabs").selectChild(tab);
 
-               switch (this.urlParam('method')) {
-                  case "editfeed":
-                     window.setTimeout(() => {
-                        CommonDialogs.editFeed(this.urlParam('methodparam'))
-                     }, 100);
-                     break;
-                  default:
-                     console.warn("initSecondStage, unknown method:", this.urlParam("method"));
+               const method = this.urlParam("method");
+
+               if (method) {
+                  switch (method) {
+                     case "editfeed":
+                        window.setTimeout(() => {
+                           CommonDialogs.editFeed(this.urlParam('methodparam'))
+                        }, 100);
+                        break;
+                     default:
+                        console.warn("initSecondStage, unknown method:", method);
+                  }
                }
             }
          } else {
@@ -708,8 +704,14 @@ const App = {
 
          dojo.connect(dijit.byId("pref-tabs"), "selectChild", function (elem) {
             localStorage.setItem("ttrss:prefs-tab", elem.id);
+            App.updateRuntimeInfo();
          });
 
+         if (!this.getInitParam("bw_limit"))
+            window.setInterval(() => {
+               App.updateRuntimeInfo();
+            }, 60 * 1000)
+
       } else {
 
          Feeds.reload();
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index 516da5c98..a75b36ed8 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -430,8 +430,8 @@ const	CommonDialogs = {
 			const tmph = dojo.connect(dialog, 'onShow', function () {
 				dojo.disconnect(tmph);
 
-				xhrPost("backend.php", {op: "pref-feeds", method: "editfeed", id: feed}, (transport) => {
-					dialog.attr('content', transport.responseText);
+				xhr.post("backend.php", {op: "pref-feeds", method: "editfeed", id: feed}, (reply) => {
+					dialog.attr('content', reply);
 				})
 			});
 
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index 9cc93d7b8..0fc8f87ae 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -39,12 +39,12 @@ const	Filters = {
 	createNewRuleElement: function(parentNode, replaceNode) {
 		const rule = dojo.formToJson("filter_new_rule_form");
 
-		xhrPost("backend.php", {op: "pref-filters", method: "printrulename", rule: rule}, (transport) => {
+		xhr.post("backend.php", {op: "pref-filters", method: "printrulename", rule: rule}, (reply) => {
 			try {
 				const li = document.createElement('li');
 
 				li.innerHTML = `<input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
-						<span onclick='App.dialogOf(this).editRule(this)'>${transport.responseText}</span>
+						<span onclick='App.dialogOf(this).editRule(this)'>${reply}</span>
 					${App.FormFields.hidden_tag("rule[]", rule)}`;
 
 				dojo.parser.parse(li);
@@ -70,12 +70,12 @@ const	Filters = {
 
 		const action = dojo.formToJson(form);
 
-		xhrPost("backend.php", { op: "pref-filters", method: "printactionname", action: action }, (transport) => {
+		xhr.post("backend.php", { op: "pref-filters", method: "printactionname", action: action }, (reply) => {
 			try {
 				const li = document.createElement('li');
 
 				li.innerHTML = `<input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
-						<span onclick='App.dialogOf(this).editAction(this)'>${transport.responseText}</span>
+						<span onclick='App.dialogOf(this).editAction(this)'>${reply}</span>
 					${App.FormFields.hidden_tag("action[]", action)}`;
 
 				dojo.parser.parse(li);
@@ -107,8 +107,8 @@ const	Filters = {
 		const tmph = dojo.connect(dialog, "onShow", null, function (/* e */) {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", {op: 'pref-filters', method: 'newrule', rule: ruleStr}, (transport) => {
-				dialog.attr('content', transport.responseText);
+			xhr.post("backend.php", {op: 'pref-filters', method: 'newrule', rule: ruleStr}, (reply) => {
+				dialog.attr('content', reply);
 			});
 		});
 
@@ -128,8 +128,8 @@ const	Filters = {
 		const tmph = dojo.connect(dialog, "onShow", null, function (/* e */) {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", {op: 'pref-filters', method: 'newaction', action: actionStr}, (transport) => {
-				dialog.attr('content', transport.responseText);
+			xhr.post("backend.php", {op: 'pref-filters', method: 'newaction', action: actionStr}, (reply) => {
+				dialog.attr('content', reply);
 			});
 		});
 
@@ -149,10 +149,8 @@ const	Filters = {
 
 				console.log("getTestResults:" + offset);
 
-				xhrPost("backend.php", params, (transport) => {
+				xhr.json("backend.php", params, (result) => {
 					try {
-						const result = JSON.parse(transport.responseText);
-
 						if (result && dialog && dialog.open) {
 							dialog.results += result.length;
 
@@ -239,7 +237,7 @@ const	Filters = {
 
 		console.log('Filters.edit', query);
 
-		xhrPost("backend.php", query, function (transport) {
+		xhr.post("backend.php", query, function (reply) {
 			try {
 				const dialog = new fox.SingleUseDialog({
 					id: "filterEditDlg",
@@ -311,7 +309,7 @@ const	Filters = {
 							});
 						}
 					},
-					content: transport.responseText
+					content: reply
 				});
 
 				if (!App.isPrefs()) {
@@ -334,9 +332,7 @@ const	Filters = {
 
 							const query = {op: "article", method: "getmetadatabyid", id: Article.getActive()};
 
-							xhrPost("backend.php", query, (transport) => {
-								const reply = JSON.parse(transport.responseText);
-
+							xhr.json("backend.php", query, (reply) => {
 								let title = false;
 
 								if (reply && reply.title) title = reply.title;
diff --git a/js/Feeds.js b/js/Feeds.js
index e9681953e..01d31f3c1 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -130,8 +130,8 @@ const	Feeds = {
 		this.reloadCurrent();
 	},
 	requestCounters: function() {
-		xhrPost("backend.php", {op: "rpc", method: "getAllCounters", seq: App.next_seq()}, (transport) => {
-			App.handleRpcJson(transport);
+		xhr.json("backend.php", {op: "rpc", method: "getAllCounters", seq: App.next_seq()}, () => {
+			//
 		});
 	},
 	reload: function() {
@@ -260,7 +260,7 @@ const	Feeds = {
 
 		// bw_limit disables timeout() so we request initial counters separately
 		if (App.getInitParam("bw_limit")) {
-			this.requestCounters(true);
+			App.requestCounters(true);
 		} else {
 			setTimeout(() => {
 				this.requestCounters(true);
@@ -361,8 +361,6 @@ const	Feeds = {
 			query.m = "ForceUpdate";
 		}
 
-		//Form.enable("toolbar-main");
-
 		if (!delayed)
 			if (!this.setExpando(feed, is_cat,
 				(is_cat) ? 'images/indicator_tiny.gif' : 'images/indicator_white.gif'))
@@ -374,11 +372,11 @@ const	Feeds = {
 
 		window.clearTimeout(this._viewfeed_wait_timeout);
 		this._viewfeed_wait_timeout = window.setTimeout(() => {
-			xhrPost("backend.php", query, (transport) => {
+			xhr.json("backend.php", query, (reply) => {
 				try {
 					window.clearTimeout(this._infscroll_timeout);
 					this.setExpando(feed, is_cat, 'images/blank_icon.gif');
-					Headlines.onLoaded(transport, offset, append);
+					Headlines.onLoaded(reply, offset, append);
 					PluginHost.run(PluginHost.HOOK_FEED_LOADED, [feed, is_cat]);
 				} catch (e) {
 					App.Error.report(e);
@@ -439,9 +437,7 @@ const	Feeds = {
 
 		Notify.progress("Loading, please wait...", true);
 
-		xhrPost("backend.php", catchup_query, (transport) => {
-			App.handleRpcJson(transport);
-
+		xhr.json("backend.php", catchup_query, () => {
 			const show_next_feed = App.getInitParam("on_catchup_show_next_feed");
 
 			// only select next unread feed if catching up entirely (as opposed to last week etc)
@@ -633,8 +629,8 @@ const	Feeds = {
 	updateRandom: function() {
 		console.log("in update_random_feed");
 
-		xhrPost("backend.php", {op: "rpc", method: "updaterandomfeed"}, (transport) => {
-			App.handleRpcJson(transport, true);
+		xhr.json("backend.php", {op: "rpc", method: "updaterandomfeed"}, () => {
+			//
 		});
 	},
 };
diff --git a/js/Headlines.js b/js/Headlines.js
index 34dc9385e..18e0a3687 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -1,7 +1,7 @@
 'use strict';
 
 /* global __, ngettext, Article, App */
-/* global xhrPost, dojo, dijit, PluginHost, Notify, $$, Feeds */
+/* global dojo, dijit, PluginHost, Notify, xhr, Feeds */
 /* global CommonDialogs */
 
 const Headlines = {
@@ -149,26 +149,26 @@ const Headlines = {
 		const promises = [];
 
 		if (ops.tmark.length != 0)
-			promises.push(xhrPost("backend.php",
+			promises.push(xhr.post("backend.php",
 				{op: "rpc", method: "markSelected", ids: ops.tmark.toString(), cmode: 2}));
 
 		if (ops.tpub.length != 0)
-			promises.push(xhrPost("backend.php",
+			promises.push(xhr.post("backend.php",
 				{op: "rpc", method: "publishSelected", ids: ops.tpub.toString(), cmode: 2}));
 
 		if (ops.read.length != 0)
-			promises.push(xhrPost("backend.php",
+			promises.push(xhr.post("backend.php",
 				{op: "rpc", method: "catchupSelected", ids: ops.read.toString(), cmode: 0}));
 
 		if (ops.unread.length != 0)
-			promises.push(xhrPost("backend.php",
+			promises.push(xhr.post("backend.php",
 				{op: "rpc", method: "catchupSelected", ids: ops.unread.toString(), cmode: 1}));
 
 		const scores = Object.keys(ops.rescore);
 
 		if (scores.length != 0) {
 			scores.forEach((score) => {
-				promises.push(xhrPost("backend.php",
+				promises.push(xhr.post("backend.php",
 					{op: "article", method: "setScore", id: ops.rescore[score].toString(), score: score}));
 			});
 		}
@@ -622,9 +622,7 @@ const Headlines = {
 
 		dojo.parser.parse(target.domNode);
 	},
-	onLoaded: function (transport, offset, append) {
-		const reply = App.handleRpcJson(transport);
-
+	onLoaded: function (reply, offset, append) {
 		console.log("Headlines.onLoaded: offset=", offset, "append=", append);
 
 		let is_cat = false;
@@ -785,7 +783,6 @@ const Headlines = {
 				});
 
 		} else {
-			console.error("Invalid object received: " + transport.responseText);
 			dijit.byId("headlines-frame").attr('content', "<div class='whiteBox'>" +
 				__('Could not update headlines (invalid object received - see error console for details)') +
 				"</div>");
@@ -1011,9 +1008,8 @@ const Headlines = {
 			ids: ids.toString(), lid: id
 		};
 
-		xhrPost("backend.php", query, (transport) => {
-			App.handleRpcJson(transport);
-			this.onLabelsUpdated(transport);
+		xhr.json("backend.php", query, (reply) => {
+			this.onLabelsUpdated(reply);
 		});
 	},
 	selectionAssignLabel: function (id, ids) {
@@ -1029,9 +1025,8 @@ const Headlines = {
 			ids: ids.toString(), lid: id
 		};
 
-		xhrPost("backend.php", query, (transport) => {
-			App.handleRpcJson(transport);
-			this.onLabelsUpdated(transport);
+		xhr.json("backend.php", query, (reply) => {
+			this.onLabelsUpdated(reply);
 		});
 	},
 	deleteSelection: function () {
@@ -1060,8 +1055,7 @@ const Headlines = {
 
 		const query = {op: "rpc", method: "delete", ids: rows.toString()};
 
-		xhrPost("backend.php", query, (transport) => {
-			App.handleRpcJson(transport);
+		xhr.json("backend.php", query, () => {
 			Feeds.reloadCurrent();
 		});
 	},
@@ -1246,9 +1240,7 @@ const Headlines = {
 			}
 		}
 	},
-	onLabelsUpdated: function (transport) {
-		const data = JSON.parse(transport.responseText);
-
+	onLabelsUpdated: function (data) {
 		if (data) {
 			data['info-for-headlines'].forEach(function (elem) {
 				App.findAll(".HLLCTR-" + elem.id).forEach(function (ctr) {
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index d3a4cd33d..a2a7f9141 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -129,8 +129,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 			const searchElem = App.byId("feed_search");
 			const search = (searchElem) ? searchElem.value : "";
 
-			xhrPost("backend.php", { op: "pref-feeds", search: search }, (transport) => {
-				dijit.byId('feedsTab').attr('content', transport.responseText);
+			xhr.post("backend.php", { op: "pref-feeds", search: search }, (reply) => {
+				dijit.byId('feedsTab').attr('content', reply);
 				Notify.close();
 			});
 		},
@@ -295,7 +295,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 
 			Notify.progress("Loading, please wait...");
 
-			xhrPost("backend.php", {op: "pref-feeds", method: "editfeeds", ids: rows.toString()}, (transport) => {
+			xhr.post("backend.php", {op: "pref-feeds", method: "editfeeds", ids: rows.toString()}, (reply) => {
 				Notify.close();
 
 				try {
@@ -347,7 +347,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 								});
 							}
 						},
-						content: transport.responseText
+						content: reply
 					});
 
 					dialog.show();
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index cc37808be..fff58ff1a 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -1,5 +1,5 @@
 /* eslint-disable prefer-rest-params */
-/* global __, define, lib, dijit, dojo, xhr, Notify */
+/* global __, define, lib, dijit, dojo, xhr, App, Notify */
 
 define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], function (declare, domConstruct) {
 
@@ -91,8 +91,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			let search = "";
 			if (user_search) { search = user_search.value; }
 
-			xhrPost("backend.php", { op: "pref-filters", search: search }, (transport) => {
-				dijit.byId('filtersTab').attr('content', transport.responseText);
+			xhr.post("backend.php", { op: "pref-filters", search: search }, (reply) => {
+				dijit.byId('filtersTab').attr('content', reply);
 				Notify.close();
 			});
 		},
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index abf5fff51..d27e0e071 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -19,8 +19,8 @@ const	Helpers = {
 				alert("No passwords selected.");
 			} else if (confirm(__("Remove selected app passwords?"))) {
 
-				xhrPost("backend.php", {op: "pref-prefs", method: "deleteAppPassword", ids: rows.toString()}, (transport) => {
-					this.updateContent(transport.responseText);
+				xhr.post("backend.php", {op: "pref-prefs", method: "deleteAppPassword", ids: rows.toString()}, (reply) => {
+					this.updateContent(reply);
 					Notify.close();
 				});
 
@@ -31,8 +31,8 @@ const	Helpers = {
 			const title = prompt("Password description:")
 
 			if (title) {
-				xhrPost("backend.php", {op: "pref-prefs", method: "generateAppPassword", title: title}, (transport) => {
-					this.updateContent(transport.responseText);
+				xhr.post("backend.php", {op: "pref-prefs", method: "generateAppPassword", title: title}, (reply) => {
+					this.updateContent(reply);
 					Notify.close();
 				});
 
@@ -63,8 +63,13 @@ const	Helpers = {
 			this.update();
 		},
 		update: function() {
-			xhrPost("backend.php", { op: "pref-system", severity: dijit.byId("severity").attr('value'), page: Helpers.EventLog.log_page }, (transport) => {
-				dijit.byId('systemTab').attr('content', transport.responseText);
+			xhr.post("backend.php", {
+						op: "pref-system",
+						severity: dijit.byId("severity").attr('value'),
+						page: Helpers.EventLog.log_page
+					}, (reply) => {
+
+				dijit.byId('systemTab').attr('content', reply);
 				Notify.close();
 			});
 		},
@@ -164,8 +169,8 @@ const	Helpers = {
 														`<span dojoType='dijit.InlineEditBox' width='300px' autoSave='false'
 															profile-id='${profile.id}'>${profile.title}
 																<script type='dojo/method' event='onChange' args='value'>
-																	xhrPost("backend.php",
-																		{op: 'pref-prefs', method: 'saveprofile', value: value, id: this.attr('profile-id')}, (transport) => {
+																	xhr.post("backend.php",
+																		{op: 'pref-prefs', method: 'saveprofile', value: value, id: this.attr('profile-id')}, () => {
 																			//
 																		});
 																</script>
@@ -267,9 +272,9 @@ const	Helpers = {
 		},
 		confirmReset: function() {
 			if (confirm(__("Reset to defaults?"))) {
-				xhrPost("backend.php", {op: "pref-prefs", method: "resetconfig"}, (transport) => {
+				xhr.post("backend.php", {op: "pref-prefs", method: "resetconfig"}, (reply) => {
 					Helpers.Prefs.refresh();
-					Notify.info(transport.responseText);
+					Notify.info(reply);
 				});
 			}
 		},
@@ -283,8 +288,8 @@ const	Helpers = {
 			}
 		},
 		refresh: function() {
-			xhrPost("backend.php", { op: "pref-prefs" }, (transport) => {
-				dijit.byId('prefsTab').attr('content', transport.responseText);
+			xhr.post("backend.php", { op: "pref-prefs" }, (reply) => {
+				dijit.byId('prefsTab').attr('content', reply);
 				Notify.close();
 			});
 		},
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 5e024afde..627b2cfbe 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -55,8 +55,8 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 			return rv;
 		},
 		reload: function() {
-			xhrPost("backend.php", { op: "pref-labels" }, (transport) => {
-				dijit.byId('labelsTab').attr('content', transport.responseText);
+			xhr.post("backend.php", { op: "pref-labels" }, (reply) => {
+				dijit.byId('labelsTab').attr('content', reply);
 				Notify.close();
 			});
 		},
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index 9b9c1deaf..3eb83b02a 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -8,8 +8,8 @@ const	Users = {
 		const user_search = App.byId("user_search");
 		const search = user_search ? user_search.value : "";
 
-		xhrPost("backend.php", { op: "pref-users", sort: sort, search: search }, (transport) => {
-			dijit.byId('usersTab').attr('content', transport.responseText);
+		xhr.post("backend.php", { op: "pref-users", sort: sort, search: search }, (reply) => {
+			dijit.byId('usersTab').attr('content', reply);
 			Notify.close();
 		});
 	},
@@ -19,8 +19,8 @@ const	Users = {
 		if (login) {
 			Notify.progress("Adding user...");
 
-			xhrPost("backend.php", {op: "pref-users", method: "add", login: login}, (transport) => {
-				alert(transport.responseText);
+			xhr.post("backend.php", {op: "pref-users", method: "add", login: login}, (reply) => {
+				alert(reply);
 				Users.reload();
 			});
 
@@ -99,8 +99,8 @@ const	Users = {
 							<div dojoType="dijit.layout.ContentPane" title="${__('User details')}">
 								<script type='dojo/method' event='onShow' args='evt'>
 									if (this.domNode.querySelector('.loading')) {
-										xhrPost("backend.php", {op: 'pref-users', method: 'userdetails', id: ${user.id}}, (transport) => {
-											this.attr('content', transport.responseText);
+										xhr.post("backend.php", {op: 'pref-users', method: 'userdetails', id: ${user.id}}, (reply) => {
+											this.attr('content', reply);
 										});
 									}
 								</script>
@@ -141,9 +141,9 @@ const	Users = {
 
 			const id = rows[0];
 
-			xhrPost("backend.php", {op: "pref-users", method: "resetPass", id: id}, (transport) => {
+			xhr.post("backend.php", {op: "pref-users", method: "resetPass", id: id}, (reply) => {
 				Notify.close();
-				Notify.info(transport.responseText, true);
+				Notify.info(reply, true);
 			});
 
 		}
diff --git a/js/common.js b/js/common.js
index 1c9a0453c..e88b62602 100755
--- a/js/common.js
+++ b/js/common.js
@@ -155,7 +155,7 @@ const xhr = {
 					reject(error);
 				},
 				load: function(data, ioargs) {
-					//console.log('xhr.post', '<<<', data, ioargs);
+					console.log('xhr.post', '<<<', ioargs.xhr);
 
 					if (complete != undefined)
 						complete(data, ioargs.xhr);
@@ -179,6 +179,9 @@ const xhr = {
 
 				console.log('xhr.json', '<<<', obj);
 
+				if (obj && typeof App != "undefined")
+					App.handleRpcJson(obj);
+
 				if (complete != undefined) complete(obj);
 
 				resolve(obj);
diff --git a/js/prefs.js b/js/prefs.js
index 803a7edf3..a23a74856 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -41,6 +41,7 @@ require(["dojo/_base/kernel",
 	"dojo/data/ItemFileWriteStore",
 	"lib/CheckBoxStoreModel",
 	"lib/CheckBoxTree",
+	"fox/PluginHost",
 	"fox/CommonDialogs",
 	"fox/CommonFilters",
 	"fox/PrefUsers",
diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php
index 2c472a32d..a5ba1d62d 100644
--- a/plugins/af_proxy_http/init.php
+++ b/plugins/af_proxy_http/init.php
@@ -221,8 +221,8 @@ class Af_Proxy_Http extends Plugin {
 				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						xhrPost("backend.php", this.getValues(), (transport) => {
-							Notify.info(transport.responseText);
+						xhr.post("backend.php", this.getValues(), (reply) => {
+							Notify.info(reply);
 						})
 					}
 				</script>
diff --git a/plugins/af_psql_trgm/init.js b/plugins/af_psql_trgm/init.js
index e5bc21885..921272c4b 100644
--- a/plugins/af_psql_trgm/init.js
+++ b/plugins/af_psql_trgm/init.js
@@ -1,4 +1,4 @@
-/* global dijit, dojo, Plugins, xhrPost, __ */
+/* global dijit, dojo, Plugins, xhr, __ */
 
 Plugins.Psql_Trgm = {
 	showRelated: function (id) {
@@ -10,8 +10,8 @@ Plugins.Psql_Trgm = {
 		const tmph = dojo.connect(dialog, "onShow", null, function (/* e */) {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", {op: 'pluginhandler', plugin: 'af_psql_trgm', method: 'showrelated', id: id}, (transport) => {
-				dialog.attr('content', transport.responseText);
+			xhr.post("backend.php", {op: 'pluginhandler', plugin: 'af_psql_trgm', method: 'showrelated', id: id}, (reply) => {
+				dialog.attr('content', reply);
 			});
 		});
 
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 4ecfe0cd5..3b7ed6b14 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -152,8 +152,8 @@ class Af_Psql_Trgm extends Plugin {
 					evt.preventDefault();
 					if (this.validate()) {
 						Notify.progress('Saving data...', true);
-						xhrPost("backend.php", this.getValues(), (transport) => {
-							Notify.info(transport.responseText);
+						xhr.post("backend.php", this.getValues(), (reply) => {
+							Notify.info(reply);
 						})
 					}
 				</script>
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index 4cd72904a..be9220cda 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -71,8 +71,8 @@ class Af_Readability extends Plugin {
 					evt.preventDefault();
 					if (this.validate()) {
 						Notify.progress('Saving data...', true);
-						xhrPost("backend.php", this.getValues(), (transport) => {
-							Notify.info(transport.responseText);
+						xhr.post("backend.php", this.getValues(), (reply) => {
+							Notify.info(reply);
 						})
 					}
 				</script>
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 827a4c310..2677fdd90 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -47,8 +47,8 @@ class Af_RedditImgur extends Plugin {
 					evt.preventDefault();
 					if (this.validate()) {
 						Notify.progress('Saving data...', true);
-						xhrPost("backend.php", this.getValues(), (transport) => {
-							Notify.info(transport.responseText);
+						xhr.post("backend.php", this.getValues(), (reply) => {
+							Notify.info(reply);
 						})
 					}
 				</script>
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 16e22f342..467f8294a 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -51,8 +51,8 @@ class Mail extends Plugin {
 					evt.preventDefault();
 					if (this.validate()) {
 						Notify.progress('Saving data...', true);
-						xhrPost("backend.php", this.getValues(), (transport) => {
-							Notify.info(transport.responseText);
+						xhr.post("backend.php", this.getValues(), (reply) => {
+							Notify.info(reply);
 						})
 					}
 				</script>
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index fc0898085..d2bafe0e9 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -1,4 +1,4 @@
-/* global Plugins, Headlines, dojo, xhrPost, xhrJson, Notify, fox, __ */
+/* global Plugins, Headlines, dojo, App, xhr, Notify, fox, __ */
 
 Plugins.Mail = {
 	send: function(id) {
@@ -38,8 +38,8 @@ Plugins.Mail = {
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", App.getPhArgs("mail", "emailArticle", {ids: id}), (transport) => {
-				dialog.attr('content', transport.responseText);
+			xhr.post("backend.php", App.getPhArgs("mail", "emailArticle", {ids: id}), (reply) => {
+				dialog.attr('content', reply);
 			});
 		});
 
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index b5e68680b..4a9557249 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -1,4 +1,4 @@
-/* global Plugins, Headlines, xhrPost, dojo, fox, __ */
+/* global Plugins, Headlines, xhr, dojo, fox, __ */
 
 Plugins.Mailto = {
 	send: function (id) {
@@ -21,8 +21,8 @@ Plugins.Mailto = {
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", App.getPhArgs("mailto", "emailArticle", {ids: id}), (transport) => {
-				dialog.attr('content', transport.responseText);
+			xhr.post("backend.php", App.getPhArgs("mailto", "emailArticle", {ids: id}), (reply) => {
+				dialog.attr('content', reply);
 			});
 		});
 
diff --git a/plugins/note/note.js b/plugins/note/note.js
index 36bc426cd..d42fca2c1 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -1,4 +1,4 @@
-/* global dojo, xhrPost, Plugins, xhrJson, Notify, fox, __ */
+/* global dojo, Plugins, xhr, App, Notify, fox, __ */
 
 Plugins.Note = {
 	edit: function(id) {
@@ -33,8 +33,8 @@ Plugins.Note = {
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", App.getPhArgs("note", "edit", {id: id}), (transport) => {
-				dialog.attr('content', transport.responseText);
+			xhr.post("backend.php", App.getPhArgs("note", "edit", {id: id}), (reply) => {
+				dialog.attr('content', reply);
 			});
 		});
 
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index fdc6a3974..3205b436b 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -56,8 +56,8 @@ class NSFW extends Plugin {
 					evt.preventDefault();
 					if (this.validate()) {
 						Notify.progress('Saving data...', true);
-						xhrPost("backend.php", this.getValues(), (transport) => {
-							Notify.info(transport.responseText);
+						xhr.post("backend.php", this.getValues(), (reply) => {
+							Notify.info(reply);
 						})
 					}
 				</script>
diff --git a/plugins/share/share.js b/plugins/share/share.js
index d7b8cd1f9..1be9db682 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -1,4 +1,4 @@
-/* global dojo, Effect, Plugins, xhrJson, Notify, fox, xhrPost, __ */
+/* global dojo, Plugins, App, Notify, fox, xhr, __ */
 
 Plugins.Share = {
 	shareArticle: function(id) {
@@ -40,8 +40,8 @@ Plugins.Share = {
 			},
 			unshare: function () {
 				if (confirm(__("Remove sharing for this article?"))) {
-					xhrPost("backend.php", App.getPhArgs("share", "unshare", {id: id}), (transport) => {
-						Notify.info(transport.responseText);
+					xhr.post("backend.php", App.getPhArgs("share", "unshare", {id: id}), (reply) => {
+						Notify.info(reply);
 
 						const icon = document.querySelector(".share-icon-" + id);
 
@@ -59,8 +59,8 @@ Plugins.Share = {
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", App.getPhArgs("share", "shareDialog", {id: id}), (transport) => {
-				dialog.attr('content', transport.responseText)
+			xhr.post("backend.php", App.getPhArgs("share", "shareDialog", {id: id}), (reply) => {
+				dialog.attr('content', reply)
 
 				const icon = document.querySelector(".share-icon-" + id);
 
diff --git a/plugins/share/share_prefs.js b/plugins/share/share_prefs.js
index 91f979daf..d974af618 100644
--- a/plugins/share/share_prefs.js
+++ b/plugins/share/share_prefs.js
@@ -1,12 +1,12 @@
-/* global Plugins, Notify, xhrPost */
+/* global Plugins, Notify, xhr, App */
 
 Plugins.Share = {
 	clearKeys: function() {
 		if (confirm(__("This will invalidate all previously shared article URLs. Continue?"))) {
 			Notify.progress("Clearing URLs...");
 
-			xhrPost("backend.php", App.getPhArgs("share", "clearArticleKeys"), (transport) => {
-				Notify.info(transport.responseText);
+			xhr.post("backend.php", App.getPhArgs("share", "clearArticleKeys"), (reply) => {
+				Notify.info(reply);
 			});
 		}
 
diff --git a/prefs.php b/prefs.php
index 2b2af8452..d11c6281e 100644
--- a/prefs.php
+++ b/prefs.php
@@ -124,7 +124,10 @@
 </div>
 
 <div id="header">
-	
+	<i class="material-icons net-alert" style="display : none"
+   	title="<?= __("Communication problem with server.") ?>">error_outline</i>
+	<i class="material-icons log-alert" style="display : none" onclick="App.openPreferences('system')"
+		title="<?= __("Recent entries found in event log.") ?>">warning</i>
 	<a href="#" onclick="document.location.href = 'index.php'"><?= __('Exit preferences') ?></a>
 </div>
 
diff --git a/themes/compact.css b/themes/compact.css
index 0116fa45b..e92db1659 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -754,6 +754,17 @@ body.ttrss_main #header {
   top: 0px;
   z-index: 5;
 }
+body.ttrss_main #header i.net-alert,
+body.ttrss_main #header .left i.icon-error {
+  color: red;
+}
+body.ttrss_main #header i.log-alert {
+  color: #ddba1c;
+  cursor: pointer;
+}
+body.ttrss_main #header i {
+  margin: 0 4px;
+}
 body.ttrss_main #content-insert {
   padding: 0px;
   border-color: #ddd;
diff --git a/themes/compact_night.css b/themes/compact_night.css
index 2709cf196..42b850536 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -754,6 +754,17 @@ body.ttrss_main #header {
   top: 0px;
   z-index: 5;
 }
+body.ttrss_main #header i.net-alert,
+body.ttrss_main #header .left i.icon-error {
+  color: red;
+}
+body.ttrss_main #header i.log-alert {
+  color: #ddba1c;
+  cursor: pointer;
+}
+body.ttrss_main #header i {
+  margin: 0 4px;
+}
 body.ttrss_main #content-insert {
   padding: 0px;
   border-color: #222;
diff --git a/themes/light.css b/themes/light.css
index 492daf08f..0b69ef84b 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -754,6 +754,17 @@ body.ttrss_main #header {
   top: 0px;
   z-index: 5;
 }
+body.ttrss_main #header i.net-alert,
+body.ttrss_main #header .left i.icon-error {
+  color: red;
+}
+body.ttrss_main #header i.log-alert {
+  color: #ddba1c;
+  cursor: pointer;
+}
+body.ttrss_main #header i {
+  margin: 0 4px;
+}
 body.ttrss_main #content-insert {
   padding: 0px;
   border-color: #ddd;
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 3cf1a2d5e..b1895f318 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -877,6 +877,19 @@ body.ttrss_main {
 		right : 0px;
 		top : 0px;
 		z-index : 5;
+
+		i.net-alert, .left i.icon-error {
+			color : red;
+		}
+
+		i.log-alert {
+			color : #ddba1c;
+			cursor : pointer;
+		}
+
+		i {
+			margin : 0 4px;
+		}
 	}
 
 	#content-insert {
diff --git a/themes/night.css b/themes/night.css
index a52ef701d..65484b82b 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -755,6 +755,17 @@ body.ttrss_main #header {
   top: 0px;
   z-index: 5;
 }
+body.ttrss_main #header i.net-alert,
+body.ttrss_main #header .left i.icon-error {
+  color: red;
+}
+body.ttrss_main #header i.log-alert {
+  color: #ddba1c;
+  cursor: pointer;
+}
+body.ttrss_main #header i {
+  margin: 0 4px;
+}
 body.ttrss_main #content-insert {
   padding: 0px;
   border-color: #222;
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 2a7debf35..1c16a6f22 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -755,6 +755,17 @@ body.ttrss_main #header {
   top: 0px;
   z-index: 5;
 }
+body.ttrss_main #header i.net-alert,
+body.ttrss_main #header .left i.icon-error {
+  color: red;
+}
+body.ttrss_main #header i.log-alert {
+  color: #ddba1c;
+  cursor: pointer;
+}
+body.ttrss_main #header i {
+  margin: 0 4px;
+}
 body.ttrss_main #content-insert {
   padding: 0px;
   border-color: #222;
-- 
cgit v1.2.3-54-g00ecf

From 9586c72a17dabd907becebffc938add10c4a8626 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 20 Feb 2021 10:26:09 +0300
Subject: wip: feed editor client-side

---
 classes/pref/feeds.php |  72 ++++++++++++++--
 js/App.js              |  24 +++---
 js/CommonDialogs.js    | 219 +++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 291 insertions(+), 24 deletions(-)

(limited to 'classes/pref/feeds.php')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 97c529d07..2c275349b 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -464,8 +464,10 @@ class Pref_Feeds extends Handler_Protected {
 		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
 			$tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
 
-			$result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
-				$tmp_file);
+			if (!$tmp_file)
+				return;
+
+			$result = move_uploaded_file($_FILES['icon_file']['tmp_name'], $tmp_file);
 
 			if (!$result) {
 				return;
@@ -478,7 +480,7 @@ class Pref_Feeds extends Handler_Protected {
 		$feed_id = clean($_REQUEST["feed_id"]);
 		$rc = 2; // failed
 
-		if (is_file($icon_file) && $feed_id) {
+		if ($icon_file && is_file($icon_file) && $feed_id) {
 			if (filesize($icon_file) < 65535) {
 
 				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
@@ -486,8 +488,12 @@ class Pref_Feeds extends Handler_Protected {
 				$sth->execute([$feed_id, $_SESSION['uid']]);
 
 				if ($row = $sth->fetch()) {
-					@unlink(ICONS_DIR . "/$feed_id.ico");
-					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
+					$new_filename = ICONS_DIR . "/$feed_id.ico";
+
+					if (file_exists($new_filename)) unlink($new_filename);
+
+					if (rename($icon_file, $new_filename)) {
+						chmod($new_filename, 644);
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET
 							favicon_avg_color = ''
@@ -502,7 +508,9 @@ class Pref_Feeds extends Handler_Protected {
 			}
 		}
 
-		if (is_file($icon_file)) @unlink($icon_file);
+		if ($icon_file && is_file($icon_file)) {
+			unlink($icon_file);
+		}
 
 		print $rc;
 		return;
@@ -512,12 +520,62 @@ class Pref_Feeds extends Handler_Protected {
 		global $purge_intervals;
 		global $update_intervals;
 
-		$feed_id = clean($_REQUEST["id"]);
+		$feed_id = (int)clean($_REQUEST["id"]);
 
 		$sth = $this->pdo->prepare("SELECT * FROM ttrss_feeds WHERE id = ? AND
 				owner_uid = ?");
 		$sth->execute([$feed_id, $_SESSION['uid']]);
 
+		if ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
+
+			ob_start();
+			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED, $feed_id);
+			$plugin_data = trim((string)ob_get_contents());
+			ob_end_clean();
+
+			$row["icon"] = Feeds::_get_icon($feed_id);
+
+			$local_update_intervals = $update_intervals;
+			$local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref("DEFAULT_UPDATE_INTERVAL")]);
+
+			if (FORCE_ARTICLE_PURGE == 0) {
+				$local_purge_intervals = $purge_intervals;
+				$default_purge_interval = get_pref("PURGE_OLD_DAYS");
+
+				if ($default_purge_interval > 0)
+				$local_purge_intervals[0] .= " " . T_nsprintf('(%d day)', '(%d days)', $default_purge_interval, $default_purge_interval);
+			else
+				$local_purge_intervals[0] .= " " . sprintf("(%s)", __("Disabled"));
+
+			} else {
+				$purge_interval = FORCE_ARTICLE_PURGE;
+				$local_purge_intervals = [ T_nsprintf('%d day', '%d days', $purge_interval, $purge_interval) ];
+			}
+
+			print json_encode([
+				"feed" => $row,
+				"cats" => [
+					"enabled" => get_pref('ENABLE_FEED_CATS'),
+					"select" => \Controls\select_feeds_cats("cat_id", $row["cat_id"]),
+				],
+				"plugin_data" => $plugin_data,
+				"force_purge" => (int)FORCE_ARTICLE_PURGE,
+				"intervals" => [
+					"update" => $local_update_intervals,
+					"purge" => $local_purge_intervals,
+				],
+				"lang" => [
+					"enabled" => DB_TYPE == "pgsql",
+					"default" => get_pref('DEFAULT_SEARCH_LANGUAGE'),
+					"all" => $this::get_ts_languages(),
+					]
+				]);
+		} else {
+			print json_encode(["error" => "FEED_NOT_FOUND"]);
+		}
+
+		return;
+
 		if ($row = $sth->fetch()) {
 			print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
         		<div dojoType="dijit.layout.ContentPane" title="'.__('General').'">';
diff --git a/js/App.js b/js/App.js
index 764003ca9..a3618409a 100644
--- a/js/App.js
+++ b/js/App.js
@@ -343,16 +343,20 @@ const App = {
 		});
    },
    // htmlspecialchars()-alike for headlines data-content attribute
-   escapeHtml: function(text) {
-      const map = {
-         '&': '&',
-         '<': '<',
-         '>': '>',
-         '"': '"',
-         "'": '''
-      };
-
-      return text.replace(/[&<>"']/g, function(m) { return map[m]; });
+   escapeHtml: function(p) {
+      if (typeof p == "string") {
+         const map = {
+            '&': '&',
+            '<': '<',
+            '>': '>',
+            '"': '"',
+            "'": '''
+         };
+
+         return p.replace(/[&<>"']/g, function(m) { return map[m]; });
+      } else {
+         return p;
+      }
    },
    displayIfChecked: function(checkbox, elemId) {
       if (checkbox.checked) {
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index a75b36ed8..5477e9ecd 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -389,19 +389,20 @@ const	CommonDialogs = {
 
 			return false;
 		},
-		editFeed: function (feed) {
-			if (feed <= 0)
+		editFeed: function (feed_id) {
+			if (feed_id <= 0)
 				return alert(__("You can't edit this kind of feed."));
 
-			const query = {op: "pref-feeds", method: "editfeed", id: feed};
+			const query = {op: "pref-feeds", method: "editfeed", id: feed_id};
 
 			console.log("editFeed", query);
 
 			const dialog = new fox.SingleUseDialog({
 				id: "feedEditDlg",
 				title: __("Edit Feed"),
-				unsubscribeFeed: function(feed_id, title) {
-					if (confirm(__("Unsubscribe from %s?").replace("%s", title))) {
+				feed_title: "",
+				unsubscribe: function() {
+					if (confirm(__("Unsubscribe from %s?").replace("%s", this.feed_title))) {
 						dialog.hide();
 						CommonDialogs.unsubscribeFeed(feed_id);
                }
@@ -430,8 +431,212 @@ const	CommonDialogs = {
 			const tmph = dojo.connect(dialog, 'onShow', function () {
 				dojo.disconnect(tmph);
 
-				xhr.post("backend.php", {op: "pref-feeds", method: "editfeed", id: feed}, (reply) => {
-					dialog.attr('content', reply);
+				xhr.json("backend.php", {op: "pref-feeds", method: "editfeed", id: feed_id}, (reply) => {
+					const feed = reply.feed;
+
+					// for unsub prompt
+					dialog.feed_title = feed.title;
+
+					dialog.attr('content',
+					`
+					<div dojoType="dijit.layout.TabContainer" style="height : 450px">
+						<div dojoType="dijit.layout.ContentPane" title="${__('General')}">
+
+							${App.FormFields.hidden_tag("id", feed_id)}
+							${App.FormFields.hidden_tag("op", "pref-feeds")}
+							${App.FormFields.hidden_tag("method", "editSave")}
+
+							<section>
+								<fieldset>
+									<input dojoType='dijit.form.ValidationTextBox' required='1'
+										placeHolder="${__("Feed Title")}"
+										style='font-size : 16px; width: 500px' name='title' value="${App.escapeHtml(feed.title)}">
+								</fieldset>
+
+								<fieldset>
+									<label>${__('URL:')}</label>
+									<input dojoType='dijit.form.ValidationTextBox' required='1'
+										placeHolder="${__("Feed URL")}"
+										regExp='^(http|https)://.*' style='width : 300px'
+										name='feed_url' value="${App.escapeHtml(feed.feed_url)}">
+
+									${feed.last_error ?
+										`<i class="material-icons"
+											title="${App.escapeHtml(feed.last_error)}">error</i>
+										` : ""}
+								</fieldset>
+
+								${reply.cats.enabled ?
+									`
+									<fieldset>
+										<label>${__('Place in category:')}</label>
+										${reply.cats.select}
+									</fieldset>
+									` : ""}
+
+								<fieldset>
+									<label>${__('Site URL:')}</label>
+									<input dojoType='dijit.form.ValidationTextBox' required='1'
+										placeHolder="${__("Site URL")}"
+										regExp='^(http|https)://.*' style='width : 300px'
+										name='site_url' value="${App.escapeHtml(feed.site_url)}">
+								</fieldset>
+
+								${reply.lang.enabled ?
+									`
+									<fieldset>
+										<label>${__('Language:')}</label>
+										${App.FormFields.select_tag("feed_language", feed.feed_language, reply.lang.all)}
+									</fieldset>
+									` : ""}
+
+								<hr/>
+
+								<fieldset>
+									<label>${__("Update interval:")}</label>
+									${App.FormFields.select_hash("update_interval", feed.update_interval, reply.intervals.update)}
+								</fieldset>
+								<fieldset>
+									<label>${__('Article purging:')}</label>
+
+									${App.FormFields.select_hash("purge_interval",
+																feed.purge_interval,
+																reply.intervals.purge,
+																reply.force_purge ? {disabled: 1} : {})}
+
+								</fieldset>
+							</section>
+						</div>
+						<div dojoType="dijit.layout.ContentPane" title="${__('Authentication')}">
+							<section>
+								<fieldset>
+									<label>${__("Login:")}</label>
+									<input dojoType='dijit.form.TextBox'
+										autocomplete='new-password'
+										name='auth_login' value="${App.escapeHtml(feed.auth_login)}">
+								</fieldset>
+								<fieldset>
+								<label>${__("Password:")}</label>
+									<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
+										autocomplete='new-password'
+										value="${App.escapeHtml(feed.auth_pass)}">
+								</fieldset>
+							</section>
+						</div>
+						<div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">
+
+						<section class='narrow'>
+
+						$include_in_digest = $row["include_in_digest"];
+
+						if ($include_in_digest) {
+							$checked = "checked="1"
+						} else {
+							$checked = "
+						}
+
+						<fieldset class='narrow'>
+
+						<label class='checkbox'><input dojoType="dijit.form.CheckBox" type="checkbox" id="include_in_digest"
+							name="include_in_digest"
+							$checked> ".__('Include in e-mail digest')."</label>
+
+						</fieldset>
+
+						$always_display_enclosures = $row["always_display_enclosures"];
+
+						if ($always_display_enclosures) {
+							$checked = "checked
+						} else {
+							$checked = "
+						}
+
+						<fieldset class='narrow'>
+
+						<label class='checkbox'><input dojoType="dijit.form.CheckBox" type="checkbox" id="always_display_enclosures"
+							name="always_display_enclosures"
+							$checked> ".__('Always display image attachments')."</label>
+
+						</fieldset>
+
+						$hide_images = $row["hide_images"];
+
+						if ($hide_images) {
+							$checked = "checked="1"
+						} else {
+							$checked = "
+						}
+
+						<fieldset class='narrow'>
+
+						<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images'
+							name='hide_images' $checked> ".__('Do not embed media')."</label>
+
+						</fieldset>
+
+						$cache_images = $row["cache_images"];
+
+						if ($cache_images) {
+							$checked = "checked="1"
+						} else {
+							$checked = "
+						}
+
+						<fieldset class='narrow'>
+
+						<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
+							name='cache_images' $checked> ". __('Cache media')."</label>
+
+						</fieldset>
+
+						$mark_unread_on_update = $row["mark_unread_on_update"];
+
+						if ($mark_unread_on_update) {
+							$checked = "checked
+						} else {
+							$checked = "
+						}
+
+						<fieldset class='narrow'>
+
+						<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update'
+							name='mark_unread_on_update' $checked> ".__('Mark updated articles as unread')."</label>
+
+						</fieldset>
+
+						</div>
+
+						<div dojoType="dijit.layout.ContentPane" title="${__('Icon')}">
+
+							<img class='feedIcon feed-editor-icon' src="${feed.icon ? App.escapeHtml(feed.icon) : ""}">
+
+							<form onsubmit="return false" id="feed_icon_upload_form" enctype="multipart/form-data" method="post">
+								<label class="dijitButton">${__("Choose file...")}
+									<input style="display: none" id="icon_file" size="10" name="icon_file" type="file">
+								</label>
+
+								${App.FormFields.hidden_tag("op", "pref-feeds")}
+								${App.FormFields.hidden_tag("feed_id", feed_id)}
+								${App.FormFields.hidden_tag("method", "uploadIcon")}
+								${App.FormFields.hidden_tag("csrf_token", App.getInitParam("csrf_token"))}
+
+								${App.FormFields.submit_tag(__("Replace"), {onclick: "return CommonDialogs.uploadFeedIcon()"})}
+								${App.FormFields.submit_tag(__("Remove"), {class: "alt-danger", onclick: "return CommonDialogs.removeFeedIcon("+feed_id+")"})}
+							</form>
+						</div>
+
+						<div dojoType="dijit.layout.ContentPane" title="${__('Plugins')}">
+							${reply.plugin_data}
+						</div>
+
+						</div>
+
+					<footer>
+						${App.FormFields.button_tag(__("Unsubscribe"), "", {class: "pull-left alt-danger", onclick: "App.dialogOf(this).unsubscribe()"})}
+						${App.FormFields.submit_tag(__("Save"), {onclick: "return App.dialogOf(this).execute()"})}
+						${App.FormFields.cancel_dialog_tag(__("Cancel"))}
+					</footer>
+					`);
 				})
 			});
 
-- 
cgit v1.2.3-54-g00ecf

From 22fe9b54d2150e543338dbc7541f134c0a7c61f6 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 20 Feb 2021 13:32:09 +0300
Subject: feed editor: use client dialog

---
 classes/api.php        |   2 +-
 classes/pref/feeds.php | 310 +----------------------------------
 js/CommonDialogs.js    | 437 +++++++++++++++++++++----------------------------
 3 files changed, 197 insertions(+), 552 deletions(-)

(limited to 'classes/pref/feeds.php')

diff --git a/classes/api.php b/classes/api.php
index 8c32967a2..03eea1927 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -843,7 +843,7 @@ class API extends Handler {
 		$_REQUEST['force_show_empty'] = $include_empty;
 
 		$this->_wrap(self::STATUS_OK,
-			array("categories" => $pf->makefeedtree()));
+			array("categories" => $pf->_makefeedtree()));
 	}
 
 	// only works for labels or uncategorized for the time being
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 2c275349b..cf9e7c95e 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1,7 +1,7 @@
 <?php
 class Pref_Feeds extends Handler_Protected {
 	function csrf_ignore($method) {
-		$csrf_ignored = array("index", "getfeedtree", "savefeedorder", "uploadicon");
+		$csrf_ignored = array("index", "getfeedtree", "savefeedorder");
 
 		return array_search($method, $csrf_ignored) !== false;
 	}
@@ -109,15 +109,11 @@ class Pref_Feeds extends Handler_Protected {
 		return $items;
 	}
 
-	function _getfeedtree() {
-		print "OK";
-	}
-
 	function getfeedtree() {
-		print json_encode($this->makefeedtree());
+		print json_encode($this->_makefeedtree());
 	}
 
-	function makefeedtree() {
+	function _makefeedtree() {
 
 		if (clean($_REQUEST['mode'] ?? 0) != 2)
 			$search = $_SESSION["prefs_feed_search"] ?? "";
@@ -500,7 +496,7 @@ class Pref_Feeds extends Handler_Protected {
 							WHERE id = ?");
 						$sth->execute([$feed_id]);
 
-						$rc = 0;
+						$rc = Feeds::_get_icon($feed_id);
 					}
 				}
 			} else {
@@ -573,298 +569,6 @@ class Pref_Feeds extends Handler_Protected {
 		} else {
 			print json_encode(["error" => "FEED_NOT_FOUND"]);
 		}
-
-		return;
-
-		if ($row = $sth->fetch()) {
-			print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
-        		<div dojoType="dijit.layout.ContentPane" title="'.__('General').'">';
-
-			$title = htmlspecialchars($row["title"]);
-
-			print \Controls\hidden_tag("id", "$feed_id");
-			print \Controls\hidden_tag("op", "pref-feeds");
-			print \Controls\hidden_tag("method", "editSave");
-
-			print "<header>".__("Feed")."</header>";
-			print "<section>";
-
-			/* Title */
-
-			print "<fieldset>";
-
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
-				placeHolder=\"".__("Feed Title")."\"
-				style='font-size : 16px; width: 500px' name='title' value=\"$title\">";
-
-			print "</fieldset>";
-
-			/* Feed URL */
-
-			$feed_url = htmlspecialchars($row["feed_url"]);
-
-			print "<fieldset>";
-
-			print "<label>" . __('URL:') . "</label> ";
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
-				placeHolder=\"".__("Feed URL")."\"
-				regExp='^(http|https)://.*' style='width : 300px'
-				name='feed_url' value=\"$feed_url\">";
-
-			if (!empty($row["last_error"])) {
-				print " <i class=\"material-icons\"
-					title=\"".htmlspecialchars($row["last_error"])."\">error</i>";
-			}
-
-			print "</fieldset>";
-
-			/* Category */
-
-			if (get_pref('ENABLE_FEED_CATS')) {
-				print "<fieldset>";
-
-				print "<label>" . __('Place in category:') . "</label> ";
-
-				print \Controls\select_feeds_cats("cat_id", $row["cat_id"]);
-
-				print "</fieldset>";
-			}
-
-			/* Site URL  */
-
-			$site_url = htmlspecialchars($row["site_url"]);
-
-			print "<fieldset>";
-
-			print "<label>" . __('Site URL:') . "</label> ";
-			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
-				placeHolder=\"".__("Site URL")."\"
-				regExp='^(http|https)://.*' style='width : 300px'
-				name='site_url' value=\"$site_url\">";
-
-			print "</fieldset>";
-
-			/* FTS Stemming Language */
-
-			if (DB_TYPE == "pgsql") {
-				$feed_language = $row["feed_language"];
-
-				if (!$feed_language)
-					$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
-
-				print "<fieldset>";
-
-				print "<label>" . __('Language:') . "</label> ";
-				print \Controls\select_tag("feed_language", $feed_language, $this::get_ts_languages());
-
-				print "</fieldset>";
-			}
-
-			print "</section>";
-
-			print "<header>".__("Update")."</header>";
-			print "<section>";
-
-			/* Update Interval */
-
-			$update_interval = $row["update_interval"];
-
-			print "<fieldset>";
-
-			print "<label>".__("Interval:")."</label> ";
-
-			$local_update_intervals = $update_intervals;
-			$local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref("DEFAULT_UPDATE_INTERVAL")]);
-
-			print \Controls\select_hash("update_interval", $update_interval, $local_update_intervals);
-
-			print "</fieldset>";
-
-			/* Purge intl */
-
-			$purge_interval = $row["purge_interval"];
-
-			print "<fieldset>";
-
-			print "<label>" . __('Article purging:') . "</label> ";
-
-			if (FORCE_ARTICLE_PURGE == 0) {
-				$local_purge_intervals = $purge_intervals;
-				$default_purge_interval = get_pref("PURGE_OLD_DAYS");
-
-				if ($default_purge_interval > 0)
-				$local_purge_intervals[0] .= " " . T_nsprintf('(%d day)', '(%d days)', $default_purge_interval, $default_purge_interval);
-			else
-				$local_purge_intervals[0] .= " " . sprintf("(%s)", __("Disabled"));
-
-			} else {
-				$purge_interval = FORCE_ARTICLE_PURGE;
-				$local_purge_intervals = [ T_nsprintf('%d day', '%d days', $purge_interval, $purge_interval) ];
-			}
-
-			print \Controls\select_hash("purge_interval",
-										$purge_interval,
-										$local_purge_intervals,
-										(FORCE_ARTICLE_PURGE == 0) ? [] : ["disabled" => 1]);
-
-			print "</fieldset>";
-
-			print "</section>";
-
-			$auth_login = htmlspecialchars($row["auth_login"]);
-			$auth_pass = htmlspecialchars($row["auth_pass"]);
-
-			$auth_enabled = $auth_login !== '' || $auth_pass !== '';
-
-			$auth_style = $auth_enabled ? '' : 'display: none';
-			print "<div id='feedEditDlg_loginContainer' style='$auth_style'>";
-			print "<header>".__("Authentication")."</header>";
-			print "<section>";
-
-			print "<fieldset>";
-
-			print "<input dojoType='dijit.form.TextBox'
-				placeHolder='".__("Login")."'
-				autocomplete='new-password'
-				name='auth_login' value=\"$auth_login\">";
-
-			print "</fieldset><fieldset>";
-
-			print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
-				autocomplete='new-password'
-				placeHolder='".__("Password")."'
-				value=\"$auth_pass\">";
-
-			print "</fieldset>";
-
-			print "</section></div>";
-
-			$auth_checked = $auth_enabled ? 'checked' : '';
-			print "<label class='checkbox'>
-				<input type='checkbox' $auth_checked name='need_auth' dojoType='dijit.form.CheckBox' id='feedEditDlg_loginCheck'
-						onclick='App.displayIfChecked(this, \"feedEditDlg_loginContainer\")'>
-					".__('This feed requires authentication.')."</label>";
-
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">';
-
-			print "<section class='narrow'>";
-
-			$include_in_digest = $row["include_in_digest"];
-
-			if ($include_in_digest) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
-
-			print "<fieldset class='narrow'>";
-
-			print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
-				name=\"include_in_digest\"
-				$checked> ".__('Include in e-mail digest')."</label>";
-
-			print "</fieldset>";
-
-			$always_display_enclosures = $row["always_display_enclosures"];
-
-			if ($always_display_enclosures) {
-				$checked = "checked";
-			} else {
-				$checked = "";
-			}
-
-			print "<fieldset class='narrow'>";
-
-			print "<label class='checkbox'><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
-				name=\"always_display_enclosures\"
-				$checked> ".__('Always display image attachments')."</label>";
-
-			print "</fieldset>";
-
-			$hide_images = $row["hide_images"];
-
-			if ($hide_images) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
-
-			print "<fieldset class='narrow'>";
-
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images'
-				name='hide_images' $checked> ".__('Do not embed media')."</label>";
-
-			print "</fieldset>";
-
-			$cache_images = $row["cache_images"];
-
-			if ($cache_images) {
-				$checked = "checked=\"1\"";
-			} else {
-				$checked = "";
-			}
-
-			print "<fieldset class='narrow'>";
-
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
-				name='cache_images' $checked> ". __('Cache media')."</label>";
-
-			print "</fieldset>";
-
-			$mark_unread_on_update = $row["mark_unread_on_update"];
-
-			if ($mark_unread_on_update) {
-				$checked = "checked";
-			} else {
-				$checked = "";
-			}
-
-			print "<fieldset class='narrow'>";
-
-			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update'
-				name='mark_unread_on_update' $checked> ".__('Mark updated articles as unread')."</label>";
-
-			print "</fieldset>";
-
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">';
-
-			/* Icon */
-
-			print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::_get_icon($feed_id)."\">";
-
-			print "<form onsubmit='return false;' id='feed_icon_upload_form'
-				enctype='multipart/form-data' method='POST'>
-			<label class='dijitButton'>".__("Choose file...")."
-				<input style='display: none' id='icon_file' size='10' name='icon_file' type='file'>
-			</label>
-			<input type='hidden' name='op' value='pref-feeds'>
-			<input type='hidden' name='csrf_token' value='".$_SESSION['csrf_token']."'>
-			<input type='hidden' name='feed_id' value='$feed_id'>
-			<input type='hidden' name='method' value='uploadicon'>
-			<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.uploadFeedIcon();\"
-				type='submit'>".__('Replace')."</button>
-			<button class='alt-danger' dojoType='dijit.form.Button' onclick=\"return CommonDialogs.removeFeedIcon($feed_id);\"
-				type='submit'>".__('Remove')."</button>
-			</form>";
-
-			print "</section>";
-
-			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">';
-
-			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED, $feed_id);
-
-			print "</div></div>";
-
-			$title = htmlspecialchars($title, ENT_QUOTES);
-
-			print "<footer>
-				<button style='float : left' class='alt-danger' dojoType='dijit.form.Button'
-					onclick='App.dialogOf(this).unsubscribeFeed($feed_id, \"$title\")'>".
-					__('Unsubscribe')."</button>
-				<button dojoType='dijit.form.Button' class='alt-primary' onclick='return App.dialogOf(this).execute()' type='submit'>".__('Save')."</button>
-				<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'>".__('Cancel')."</button>
-				</footer>";
-		}
 	}
 
 	function editfeeds() {
@@ -1036,7 +740,7 @@ class Pref_Feeds extends Handler_Protected {
 		return $this->editsaveops(false);
 	}
 
-	function editsaveops($batch) {
+	private function editsaveops($batch) {
 
 		$feed_title = clean($_POST["title"]);
 		$feed_url = clean($_POST["feed_url"]);
@@ -1064,10 +768,6 @@ class Pref_Feeds extends Handler_Protected {
 		$feed_language = clean($_POST["feed_language"]);
 
 		if (!$batch) {
-			if (clean($_POST["need_auth"] ?? "") !== 'on') {
-				$auth_login = '';
-				$auth_pass = '';
-			}
 
 			/* $sth = $this->pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?");
 			$sth->execute([$feed_id]);
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index 5477e9ecd..704e797d3 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -11,72 +11,6 @@ const	CommonDialogs = {
 			const dialog = dijit.byId("infoBox");
 			if (dialog)	dialog.hide();
 		},
-		removeFeedIcon: function(id) {
-			if (confirm(__("Remove stored feed icon?"))) {
-				Notify.progress("Removing feed icon...", true);
-
-				const query = {op: "pref-feeds", method: "removeicon", feed_id: id};
-
-				xhr.post("backend.php", query, () => {
-					Notify.info("Feed icon removed.");
-
-					if (App.isPrefs())
-						dijit.byId("feedTree").reload();
-					else
-						Feeds.reload();
-
-					const icon = App.findAll(".feed-editor-icon")[0];
-
-					if (icon)
-						icon.src = icon.src.replace(/\?[0-9]+$/, "?" + new Date().getTime());
-
-				});
-			}
-
-			return false;
-		},
-		uploadFeedIcon: function() {
-			const file = App.byId("icon_file");
-
-			if (file.value.length == 0) {
-				alert(__("Please select an image file to upload."));
-			} else if (confirm(__("Upload new icon for this feed?"))) {
-				Notify.progress("Uploading, please wait...", true);
-
-				const xhr = new XMLHttpRequest();
-
-				xhr.open( 'POST', 'backend.php', true );
-				xhr.onload = function () {
-					switch (parseInt(this.responseText)) {
-						case 0:
-							{
-								Notify.info("Upload complete.");
-
-								if (App.isPrefs())
-									dijit.byId("feedTree").reload();
-								else
-									Feeds.reload();
-
-								const icon = App.findAll(".feed-editor-icon")[0];
-
-								if (icon)
-									icon.src = icon.src.replace(/\?[0-9]+$/, "?" + new Date().getTime());
-
-							}
-							break;
-						case 1:
-							Notify.error("Upload failed: icon is too big.");
-							break;
-						case 2:
-							Notify.error("Upload failed.");
-							break;
-					}
-				};
-				xhr.send(new FormData(App.byId("feed_icon_upload_form")));
-			}
-
-			return false;
-		},
 		subscribeToFeed: function() {
 			xhr.json("backend.php",
 					{op: "feeds", method: "subscribeToFeed"},
@@ -407,6 +341,86 @@ const	CommonDialogs = {
 						CommonDialogs.unsubscribeFeed(feed_id);
                }
 				},
+				uploadIcon: function(input) {
+					if (input.files.length != 0) {
+						const icon_file = input.files[0];
+
+						if (icon_file.type.indexOf("image/") == -1) {
+							alert(__("Please select an image file."));
+							return;
+						}
+
+						const fd = new FormData();
+						fd.append('icon_file', icon_file)
+						fd.append('feed_id', feed_id);
+						fd.append('op', 'pref-feeds');
+						fd.append('method', 'uploadIcon');
+						fd.append('csrf_token', App.getInitParam("csrf_token"));
+
+						const xhr = new XMLHttpRequest();
+
+						xhr.open( 'POST', 'backend.php', true );
+						xhr.onload = function () {
+							console.log(this.responseText);
+
+							// TODO: make a notice box within panel content
+							switch (parseInt(this.responseText)) {
+								case 1:
+									Notify.error("Upload failed: icon is too big.");
+									break;
+								case 2:
+									Notify.error("Upload failed.");
+									break;
+								default:
+									{
+										Notify.info("Upload complete.");
+
+										if (App.isPrefs())
+											dijit.byId("feedTree").reload();
+										else
+											Feeds.reload();
+
+										const icon = dialog.domNode.querySelector(".feedIcon");
+
+										if (icon) {
+											icon.src = this.responseText;
+											icon.show();
+										}
+
+										input.value = "";
+									}
+							}
+						};
+
+						xhr.send(fd);
+
+					}
+				},
+				removeIcon: function(id) {
+					if (confirm(__("Remove stored feed icon?"))) {
+						Notify.progress("Removing feed icon...", true);
+
+						const query = {op: "pref-feeds", method: "removeicon", feed_id: id};
+
+						xhr.post("backend.php", query, () => {
+							Notify.info("Feed icon removed.");
+
+							if (App.isPrefs())
+								dijit.byId("feedTree").reload();
+							else
+								Feeds.reload();
+
+							const icon = dialog.domNode.querySelector(".feedIcon");
+
+							if (icon) {
+								icon.src = "";
+								icon.hide();
+							}
+						});
+					}
+
+					return false;
+				},
 				execute: function () {
 					if (this.validate()) {
 						Notify.progress("Saving data...", true);
@@ -437,205 +451,136 @@ const	CommonDialogs = {
 					// for unsub prompt
 					dialog.feed_title = feed.title;
 
+					// options tab
+					const options = {
+						include_in_digest: [ feed.include_in_digest, __('Include in e-mail digest') ],
+						always_display_enclosures: [ feed.always_display_enclosures, __('Always display image attachments') ],
+						hide_images: [ feed.hide_images, __('Do not embed media') ],
+						cache_images: [ feed.cache_images, __('Cache media') ],
+						mark_unread_on_update: [ feed.mark_unread_on_update, __('Mark updated articles as unread') ]
+					};
+
 					dialog.attr('content',
 					`
-					<div dojoType="dijit.layout.TabContainer" style="height : 450px">
-						<div dojoType="dijit.layout.ContentPane" title="${__('General')}">
+					<form onsubmit="return false">
+						<div dojoType="dijit.layout.TabContainer" style="height : 450px">
+							<div dojoType="dijit.layout.ContentPane" title="${__('General')}">
 
-							${App.FormFields.hidden_tag("id", feed_id)}
-							${App.FormFields.hidden_tag("op", "pref-feeds")}
-							${App.FormFields.hidden_tag("method", "editSave")}
-
-							<section>
-								<fieldset>
-									<input dojoType='dijit.form.ValidationTextBox' required='1'
-										placeHolder="${__("Feed Title")}"
-										style='font-size : 16px; width: 500px' name='title' value="${App.escapeHtml(feed.title)}">
-								</fieldset>
-
-								<fieldset>
-									<label>${__('URL:')}</label>
-									<input dojoType='dijit.form.ValidationTextBox' required='1'
-										placeHolder="${__("Feed URL")}"
-										regExp='^(http|https)://.*' style='width : 300px'
-										name='feed_url' value="${App.escapeHtml(feed.feed_url)}">
-
-									${feed.last_error ?
-										`<i class="material-icons"
-											title="${App.escapeHtml(feed.last_error)}">error</i>
-										` : ""}
-								</fieldset>
+								${App.FormFields.hidden_tag("id", feed_id)}
+								${App.FormFields.hidden_tag("op", "pref-feeds")}
+								${App.FormFields.hidden_tag("method", "editSave")}
 
-								${reply.cats.enabled ?
-									`
+								<section>
 									<fieldset>
-										<label>${__('Place in category:')}</label>
-										${reply.cats.select}
+										<input dojoType='dijit.form.ValidationTextBox' required='1'
+											placeHolder="${__("Feed Title")}"
+											style='font-size : 16px; width: 500px' name='title' value="${App.escapeHtml(feed.title)}">
 									</fieldset>
-									` : ""}
-
-								<fieldset>
-									<label>${__('Site URL:')}</label>
-									<input dojoType='dijit.form.ValidationTextBox' required='1'
-										placeHolder="${__("Site URL")}"
-										regExp='^(http|https)://.*' style='width : 300px'
-										name='site_url' value="${App.escapeHtml(feed.site_url)}">
-								</fieldset>
-
-								${reply.lang.enabled ?
-									`
+
 									<fieldset>
-										<label>${__('Language:')}</label>
-										${App.FormFields.select_tag("feed_language", feed.feed_language, reply.lang.all)}
+										<label>${__('URL:')}</label>
+										<input dojoType='dijit.form.ValidationTextBox' required='1'
+											placeHolder="${__("Feed URL")}"
+											regExp='^(http|https)://.*' style='width : 300px'
+											name='feed_url' value="${App.escapeHtml(feed.feed_url)}">
+
+										${feed.last_error ?
+											`<i class="material-icons"
+												title="${App.escapeHtml(feed.last_error)}">error</i>
+											` : ""}
 									</fieldset>
-									` : ""}
-
-								<hr/>
-
-								<fieldset>
-									<label>${__("Update interval:")}</label>
-									${App.FormFields.select_hash("update_interval", feed.update_interval, reply.intervals.update)}
-								</fieldset>
-								<fieldset>
-									<label>${__('Article purging:')}</label>
-
-									${App.FormFields.select_hash("purge_interval",
-																feed.purge_interval,
-																reply.intervals.purge,
-																reply.force_purge ? {disabled: 1} : {})}
-
-								</fieldset>
-							</section>
-						</div>
-						<div dojoType="dijit.layout.ContentPane" title="${__('Authentication')}">
-							<section>
-								<fieldset>
-									<label>${__("Login:")}</label>
-									<input dojoType='dijit.form.TextBox'
-										autocomplete='new-password'
-										name='auth_login' value="${App.escapeHtml(feed.auth_login)}">
-								</fieldset>
-								<fieldset>
-								<label>${__("Password:")}</label>
-									<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
-										autocomplete='new-password'
-										value="${App.escapeHtml(feed.auth_pass)}">
-								</fieldset>
-							</section>
-						</div>
-						<div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">
 
-						<section class='narrow'>
-
-						$include_in_digest = $row["include_in_digest"];
-
-						if ($include_in_digest) {
-							$checked = "checked="1"
-						} else {
-							$checked = "
-						}
-
-						<fieldset class='narrow'>
-
-						<label class='checkbox'><input dojoType="dijit.form.CheckBox" type="checkbox" id="include_in_digest"
-							name="include_in_digest"
-							$checked> ".__('Include in e-mail digest')."</label>
-
-						</fieldset>
-
-						$always_display_enclosures = $row["always_display_enclosures"];
-
-						if ($always_display_enclosures) {
-							$checked = "checked
-						} else {
-							$checked = "
-						}
-
-						<fieldset class='narrow'>
-
-						<label class='checkbox'><input dojoType="dijit.form.CheckBox" type="checkbox" id="always_display_enclosures"
-							name="always_display_enclosures"
-							$checked> ".__('Always display image attachments')."</label>
-
-						</fieldset>
-
-						$hide_images = $row["hide_images"];
-
-						if ($hide_images) {
-							$checked = "checked="1"
-						} else {
-							$checked = "
-						}
-
-						<fieldset class='narrow'>
-
-						<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='hide_images'
-							name='hide_images' $checked> ".__('Do not embed media')."</label>
-
-						</fieldset>
-
-						$cache_images = $row["cache_images"];
-
-						if ($cache_images) {
-							$checked = "checked="1"
-						} else {
-							$checked = "
-						}
-
-						<fieldset class='narrow'>
-
-						<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
-							name='cache_images' $checked> ". __('Cache media')."</label>
-
-						</fieldset>
-
-						$mark_unread_on_update = $row["mark_unread_on_update"];
-
-						if ($mark_unread_on_update) {
-							$checked = "checked
-						} else {
-							$checked = "
-						}
+									${reply.cats.enabled ?
+										`
+										<fieldset>
+											<label>${__('Place in category:')}</label>
+											${reply.cats.select}
+										</fieldset>
+										` : ""}
 
-						<fieldset class='narrow'>
+									<fieldset>
+										<label>${__('Site URL:')}</label>
+										<input dojoType='dijit.form.ValidationTextBox' required='1'
+											placeHolder="${__("Site URL")}"
+											regExp='^(http|https)://.*' style='width : 300px'
+											name='site_url' value="${App.escapeHtml(feed.site_url)}">
+									</fieldset>
 
-						<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='mark_unread_on_update'
-							name='mark_unread_on_update' $checked> ".__('Mark updated articles as unread')."</label>
+									${reply.lang.enabled ?
+										`
+										<fieldset>
+											<label>${__('Language:')}</label>
+											${App.FormFields.select_tag("feed_language",
+												feed.feed_language ? feed.feed_language : reply.lang.default,
+												reply.lang.all)}
+										</fieldset>
+										` : ""}
 
-						</fieldset>
+									<hr/>
 
-						</div>
+									<fieldset>
+										<label>${__("Update interval:")}</label>
+										${App.FormFields.select_hash("update_interval", feed.update_interval, reply.intervals.update)}
+									</fieldset>
+									<fieldset>
+										<label>${__('Article purging:')}</label>
 
-						<div dojoType="dijit.layout.ContentPane" title="${__('Icon')}">
+										${App.FormFields.select_hash("purge_interval",
+																	feed.purge_interval,
+																	reply.intervals.purge,
+																	reply.force_purge ? {disabled: 1} : {})}
 
-							<img class='feedIcon feed-editor-icon' src="${feed.icon ? App.escapeHtml(feed.icon) : ""}">
+									</fieldset>
+								</section>
+							</div>
+							<div dojoType="dijit.layout.ContentPane" title="${__('Authentication')}">
+								<section>
+									<fieldset>
+										<label>${__("Login:")}</label>
+										<input dojoType='dijit.form.TextBox'
+											autocomplete='new-password'
+											name='auth_login' value="${App.escapeHtml(feed.auth_login)}">
+									</fieldset>
+									<fieldset>
+									<label>${__("Password:")}</label>
+										<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
+											autocomplete='new-password'
+											value="${App.escapeHtml(feed.auth_pass)}">
+									</fieldset>
+								</section>
+							</div>
+							<div dojoType="dijit.layout.ContentPane" title="${__('Options')}">
+								<section class="narrow">
+									${Object.keys(options).map((name) =>
+										`
+											<fieldset class='narrow'>
+												<label class="checkbox">
+													${App.FormFields.checkbox_tag(name, options[name][0])}
+													${options[name][1]}
+												</label>
+											</fieldset>
+										`).join("")}
+								</section>
+							</div>
+							<div dojoType="dijit.layout.ContentPane" title="${__('Icon')}">
+								<div><img class='feedIcon' style="${feed.icon ? "" : "display : none"}" src="${feed.icon ? App.escapeHtml(feed.icon) : ""}"></div>
 
-							<form onsubmit="return false" id="feed_icon_upload_form" enctype="multipart/form-data" method="post">
-								<label class="dijitButton">${__("Choose file...")}
-									<input style="display: none" id="icon_file" size="10" name="icon_file" type="file">
+								<label class="dijitButton">${__("Upload new icon...")}
+									<input style="display: none" type="file" onchange="App.dialogOf(this).uploadIcon(this)">
 								</label>
 
-								${App.FormFields.hidden_tag("op", "pref-feeds")}
-								${App.FormFields.hidden_tag("feed_id", feed_id)}
-								${App.FormFields.hidden_tag("method", "uploadIcon")}
-								${App.FormFields.hidden_tag("csrf_token", App.getInitParam("csrf_token"))}
-
-								${App.FormFields.submit_tag(__("Replace"), {onclick: "return CommonDialogs.uploadFeedIcon()"})}
-								${App.FormFields.submit_tag(__("Remove"), {class: "alt-danger", onclick: "return CommonDialogs.removeFeedIcon("+feed_id+")"})}
-							</form>
-						</div>
-
-						<div dojoType="dijit.layout.ContentPane" title="${__('Plugins')}">
-							${reply.plugin_data}
-						</div>
-
+								${App.FormFields.submit_tag(__("Remove"), {class: "alt-danger", onclick: "App.dialogOf(this).removeIcon("+feed_id+")"})}
+							</div>
+							<div dojoType="dijit.layout.ContentPane" title="${__('Plugins')}">
+								${reply.plugin_data}
+							</div>
 						</div>
-
-					<footer>
-						${App.FormFields.button_tag(__("Unsubscribe"), "", {class: "pull-left alt-danger", onclick: "App.dialogOf(this).unsubscribe()"})}
-						${App.FormFields.submit_tag(__("Save"), {onclick: "return App.dialogOf(this).execute()"})}
-						${App.FormFields.cancel_dialog_tag(__("Cancel"))}
-					</footer>
+						<footer>
+							${App.FormFields.button_tag(__("Unsubscribe"), "", {class: "pull-left alt-danger", onclick: "App.dialogOf(this).unsubscribe()"})}
+							${App.FormFields.submit_tag(__("Save"), {onclick: "App.dialogOf(this).execute()"})}
+							${App.FormFields.cancel_dialog_tag(__("Cancel"))}
+						</footer>
+					</form>
 					`);
 				})
 			});
-- 
cgit v1.2.3-54-g00ecf

From d1328321bebadcf8a530d3c05f52a8f3c58bb969 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 21 Feb 2021 15:16:39 +0300
Subject: move published OPML endpoint to public.php

---
 classes/handler/public.php | 21 +++++++++++++++++++++
 classes/opml.php           |  9 +++------
 classes/pref/feeds.php     |  4 ++--
 classes/rpc.php            | 13 +++++--------
 opml.php                   | 36 ------------------------------------
 themes/compact.css         | 26 +++++++++++++++-----------
 themes/compact_night.css   | 26 +++++++++++++++-----------
 themes/light.css           | 26 +++++++++++++++-----------
 themes/light/prefs.less    |  4 ++--
 themes/light/tt-rss.less   |  4 ++--
 themes/night.css           | 26 +++++++++++++++-----------
 themes/night_blue.css      | 26 +++++++++++++++-----------
 12 files changed, 110 insertions(+), 111 deletions(-)
 delete mode 100644 opml.php

(limited to 'classes/pref/feeds.php')

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 8076bb303..b0ce2306d 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -737,6 +737,27 @@ class Handler_Public extends Handler {
 		<?php
 	}
 
+	function publishOpml() {
+		$key = clean($_REQUEST["key"]);
+		$pdo = Db::pdo();
+
+		$sth = $pdo->prepare( "SELECT owner_uid
+				FROM ttrss_access_keys WHERE
+				access_key = ? AND feed_id = 'OPML:Publish'");
+		$sth->execute([$key]);
+
+		if ($row = $sth->fetch()) {
+			$owner_uid = $row['owner_uid'];
+
+			$opml = new OPML($_REQUEST);
+			$opml->opml_export("published.opml", $owner_uid, true, false);
+
+		} else {
+			header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+			echo "File not found.";
+		}
+	}
+
 	function cached() {
 		list ($cache_dir, $filename) = explode("/", $_GET["file"], 2);
 
diff --git a/classes/opml.php b/classes/opml.php
index 78ddb2842..04d287125 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -634,13 +634,10 @@ class OPML extends Handler_Protected {
 		print "$msg<br/>";
 	}
 
-	static function opml_publish_url(){
-
-		$url_path = get_self_url_prefix();
-		$url_path .= "/opml.php?op=publish&key=" .
+	static function get_publish_url(){
+		return get_self_url_prefix() .
+			"/public.php?op=publishOpml&key=" .
 			Feeds::_get_access_key('OPML:Publish', false, $_SESSION["uid"]);
-
-		return $url_path;
 	}
 
 	function get_feed_category($feed_cat, $parent_cat_id = false) {
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index cf9e7c95e..8d3f84a03 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1329,14 +1329,14 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function getOPMLKey() {
-		print json_encode(["link" => OPML::opml_publish_url()]);
+		print json_encode(["link" => OPML::get_publish_url()]);
 	}
 
 	function regenOPMLKey() {
 		$this->update_feed_access_key('OPML:Publish',
 			false, $_SESSION["uid"]);
 
-		print json_encode(["link" => OPML::opml_publish_url()]);
+		print json_encode(["link" => OPML::get_publish_url()]);
 	}
 
 	function regenFeedKey() {
diff --git a/classes/rpc.php b/classes/rpc.php
index 20a11b994..95fd0f5ae 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -656,12 +656,10 @@ class RPC extends Handler_Protected {
 		<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>
 		<?php
 
-		$cur_section = "";
 		foreach ($info as $section => $hotkeys) {
-
-			if ($cur_section) print "<li> </li>";
-			print "<li><h3>" . $section . "</h3></li>";
-			$cur_section = $section;
+			?>
+			<li><h3><?= $section ?></h3></li>
+			<?php
 
 			foreach ($hotkeys as $action => $description) {
 
@@ -705,9 +703,8 @@ class RPC extends Handler_Protected {
 				}
 			}
 		}
-		print "</ul>";
-
-	?>
+		?>
+		</ul>
 	<footer class='text-center'>
 		<?= \Controls\submit_tag(__('Close this window')) ?>
 	</footer>
diff --git a/opml.php b/opml.php
deleted file mode 100644
index 6f13a6f3c..000000000
--- a/opml.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	require_once "autoload.php";
-	require_once "functions.php";
-	require_once "sessions.php";
-	require_once "sanity_check.php";
-	require_once "config.php";
-	require_once "db-prefs.php";
-
-	if (!init_plugins()) return;
-
-	$op = $_REQUEST['op'];
-
-	if ($op == "publish"){
-		$key = $_REQUEST["key"];
-		$pdo = Db::pdo();
-
-		$sth = $pdo->prepare( "SELECT owner_uid
-				FROM ttrss_access_keys WHERE
-				access_key = ? AND feed_id = 'OPML:Publish'");
-		$sth->execute([$key]);
-
-		if ($row = $sth->fetch()) {
-			$owner_uid = $row['owner_uid'];
-
-			$opml = new OPML($_REQUEST);
-			$opml->opml_export("", $owner_uid, true, false);
-
-		} else {
-			print "<error>User not found</error>";
-		}
-	}
-
-?>
diff --git a/themes/compact.css b/themes/compact.css
index 9baf14227..64f60641c 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -898,12 +898,14 @@ body.ttrss_main .dijitTooltipBelow .dijitTooltipConnector {
 body.ttrss_main .dijitTooltipAbove .dijitTooltipConnector {
   border-top-color: #1c5c7d;
 }
-body.ttrss_main .dijitDialog h1:first-of-type,
-body.ttrss_main .dijitDialog h2:first-of-type,
-body.ttrss_main .dijitDialog h3:first-of-type,
-body.ttrss_main .dijitDialog h4:first-of-type {
-  margin-top: 0px;
-}
+/*body.ttrss_main .dijitDialog {
+	h1:first-of-type,
+	h2:first-of-type,
+	h3:first-of-type,
+	h4:first-of-type {
+		margin-top: 0px;
+	}
+}*/
 body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree .dijitTreeRow.Has_Marked .dijitTreeLabel {
   color: #257aa7;
 }
@@ -1413,6 +1415,13 @@ body.ttrss_prefs {
   background-color: #f5f5f5;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
+  /*.dijitContentPane {
+		h1:first-of-type,
+		h2:first-of-type,
+		h3:first-of-type {
+			margin-top: 0px;
+		}
+	}*/
 }
 body.ttrss_prefs h1,
 body.ttrss_prefs h2,
@@ -1422,11 +1431,6 @@ body.ttrss_prefs h4 {
   font-weight: 600;
   color: #555;
 }
-body.ttrss_prefs .dijitContentPane h1:first-of-type,
-body.ttrss_prefs .dijitContentPane h2:first-of-type,
-body.ttrss_prefs .dijitContentPane h3:first-of-type {
-  margin-top: 0px;
-}
 body.ttrss_prefs #footer,
 body.ttrss_prefs #header {
   padding: 8px;
diff --git a/themes/compact_night.css b/themes/compact_night.css
index 4d57208d0..a5acb9c86 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -898,12 +898,14 @@ body.ttrss_main .dijitTooltipBelow .dijitTooltipConnector {
 body.ttrss_main .dijitTooltipAbove .dijitTooltipConnector {
   border-top-color: #d29745;
 }
-body.ttrss_main .dijitDialog h1:first-of-type,
-body.ttrss_main .dijitDialog h2:first-of-type,
-body.ttrss_main .dijitDialog h3:first-of-type,
-body.ttrss_main .dijitDialog h4:first-of-type {
-  margin-top: 0px;
-}
+/*body.ttrss_main .dijitDialog {
+	h1:first-of-type,
+	h2:first-of-type,
+	h3:first-of-type,
+	h4:first-of-type {
+		margin-top: 0px;
+	}
+}*/
 body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree .dijitTreeRow.Has_Marked .dijitTreeLabel {
   color: #b87d2c;
 }
@@ -1413,6 +1415,13 @@ body.ttrss_prefs {
   background-color: #222;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
+  /*.dijitContentPane {
+		h1:first-of-type,
+		h2:first-of-type,
+		h3:first-of-type {
+			margin-top: 0px;
+		}
+	}*/
 }
 body.ttrss_prefs h1,
 body.ttrss_prefs h2,
@@ -1422,11 +1431,6 @@ body.ttrss_prefs h4 {
   font-weight: 600;
   color: #ccc;
 }
-body.ttrss_prefs .dijitContentPane h1:first-of-type,
-body.ttrss_prefs .dijitContentPane h2:first-of-type,
-body.ttrss_prefs .dijitContentPane h3:first-of-type {
-  margin-top: 0px;
-}
 body.ttrss_prefs #footer,
 body.ttrss_prefs #header {
   padding: 8px;
diff --git a/themes/light.css b/themes/light.css
index e47ee5adf..7030e5182 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -898,12 +898,14 @@ body.ttrss_main .dijitTooltipBelow .dijitTooltipConnector {
 body.ttrss_main .dijitTooltipAbove .dijitTooltipConnector {
   border-top-color: #1c5c7d;
 }
-body.ttrss_main .dijitDialog h1:first-of-type,
-body.ttrss_main .dijitDialog h2:first-of-type,
-body.ttrss_main .dijitDialog h3:first-of-type,
-body.ttrss_main .dijitDialog h4:first-of-type {
-  margin-top: 0px;
-}
+/*body.ttrss_main .dijitDialog {
+	h1:first-of-type,
+	h2:first-of-type,
+	h3:first-of-type,
+	h4:first-of-type {
+		margin-top: 0px;
+	}
+}*/
 body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree .dijitTreeRow.Has_Marked .dijitTreeLabel {
   color: #257aa7;
 }
@@ -1413,6 +1415,13 @@ body.ttrss_prefs {
   background-color: #f5f5f5;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
+  /*.dijitContentPane {
+		h1:first-of-type,
+		h2:first-of-type,
+		h3:first-of-type {
+			margin-top: 0px;
+		}
+	}*/
 }
 body.ttrss_prefs h1,
 body.ttrss_prefs h2,
@@ -1422,11 +1431,6 @@ body.ttrss_prefs h4 {
   font-weight: 600;
   color: #555;
 }
-body.ttrss_prefs .dijitContentPane h1:first-of-type,
-body.ttrss_prefs .dijitContentPane h2:first-of-type,
-body.ttrss_prefs .dijitContentPane h3:first-of-type {
-  margin-top: 0px;
-}
 body.ttrss_prefs #footer,
 body.ttrss_prefs #header {
   padding: 8px;
diff --git a/themes/light/prefs.less b/themes/light/prefs.less
index ec3006ce5..510388391 100644
--- a/themes/light/prefs.less
+++ b/themes/light/prefs.less
@@ -9,13 +9,13 @@ body.ttrss_prefs {
 		color : @default-text;
 	}
 
-	.dijitContentPane {
+	/*.dijitContentPane {
 		h1:first-of-type,
 		h2:first-of-type,
 		h3:first-of-type {
 			margin-top: 0px;
 		}
-	}
+	}*/
 
 	#footer, #header {
 		padding : 8px;
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index 7b24c7701..35eec3e48 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -1049,14 +1049,14 @@ body.ttrss_main {
 	}
 }
 
-body.ttrss_main .dijitDialog {
+/*body.ttrss_main .dijitDialog {
 	h1:first-of-type,
 	h2:first-of-type,
 	h3:first-of-type,
 	h4:first-of-type {
 		margin-top: 0px;
 	}
-}
+}*/
 
 body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree {
 	.dijitTreeRow.Has_Marked .dijitTreeLabel {
diff --git a/themes/night.css b/themes/night.css
index 8ca622d8d..73f1ec96d 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -899,12 +899,14 @@ body.ttrss_main .dijitTooltipBelow .dijitTooltipConnector {
 body.ttrss_main .dijitTooltipAbove .dijitTooltipConnector {
   border-top-color: #d29745;
 }
-body.ttrss_main .dijitDialog h1:first-of-type,
-body.ttrss_main .dijitDialog h2:first-of-type,
-body.ttrss_main .dijitDialog h3:first-of-type,
-body.ttrss_main .dijitDialog h4:first-of-type {
-  margin-top: 0px;
-}
+/*body.ttrss_main .dijitDialog {
+	h1:first-of-type,
+	h2:first-of-type,
+	h3:first-of-type,
+	h4:first-of-type {
+		margin-top: 0px;
+	}
+}*/
 body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree .dijitTreeRow.Has_Marked .dijitTreeLabel {
   color: #b87d2c;
 }
@@ -1414,6 +1416,13 @@ body.ttrss_prefs {
   background-color: #222;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
+  /*.dijitContentPane {
+		h1:first-of-type,
+		h2:first-of-type,
+		h3:first-of-type {
+			margin-top: 0px;
+		}
+	}*/
 }
 body.ttrss_prefs h1,
 body.ttrss_prefs h2,
@@ -1423,11 +1432,6 @@ body.ttrss_prefs h4 {
   font-weight: 600;
   color: #ccc;
 }
-body.ttrss_prefs .dijitContentPane h1:first-of-type,
-body.ttrss_prefs .dijitContentPane h2:first-of-type,
-body.ttrss_prefs .dijitContentPane h3:first-of-type {
-  margin-top: 0px;
-}
 body.ttrss_prefs #footer,
 body.ttrss_prefs #header {
   padding: 8px;
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 6d98bbb26..aa3ead557 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -899,12 +899,14 @@ body.ttrss_main .dijitTooltipBelow .dijitTooltipConnector {
 body.ttrss_main .dijitTooltipAbove .dijitTooltipConnector {
   border-top-color: #2e99d1;
 }
-body.ttrss_main .dijitDialog h1:first-of-type,
-body.ttrss_main .dijitDialog h2:first-of-type,
-body.ttrss_main .dijitDialog h3:first-of-type,
-body.ttrss_main .dijitDialog h4:first-of-type {
-  margin-top: 0px;
-}
+/*body.ttrss_main .dijitDialog {
+	h1:first-of-type,
+	h2:first-of-type,
+	h3:first-of-type,
+	h4:first-of-type {
+		margin-top: 0px;
+	}
+}*/
 body.ttrss_main[view-mode="marked"] #feeds-holder #feedTree .dijitTreeRow.Has_Marked .dijitTreeLabel {
   color: #257aa7;
 }
@@ -1414,6 +1416,13 @@ body.ttrss_prefs {
   background-color: #222;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
+  /*.dijitContentPane {
+		h1:first-of-type,
+		h2:first-of-type,
+		h3:first-of-type {
+			margin-top: 0px;
+		}
+	}*/
 }
 body.ttrss_prefs h1,
 body.ttrss_prefs h2,
@@ -1423,11 +1432,6 @@ body.ttrss_prefs h4 {
   font-weight: 600;
   color: #ccc;
 }
-body.ttrss_prefs .dijitContentPane h1:first-of-type,
-body.ttrss_prefs .dijitContentPane h2:first-of-type,
-body.ttrss_prefs .dijitContentPane h3:first-of-type {
-  margin-top: 0px;
-}
 body.ttrss_prefs #footer,
 body.ttrss_prefs #header {
   padding: 8px;
-- 
cgit v1.2.3-54-g00ecf

From 521d0b65c73f90d6e86c1a38dcab492b5a23982b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 21 Feb 2021 16:02:57 +0300
Subject: batch feed editor: use tab layout, cleanup

---
 classes/pref/feeds.php | 243 +++++++++++++++++++------------------------------
 js/PrefFeedTree.js     |  21 +++--
 2 files changed, 108 insertions(+), 156 deletions(-)

(limited to 'classes/pref/feeds.php')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 8d3f84a03..c901bc96e 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -22,11 +22,6 @@ class Pref_Feeds extends Handler_Protected {
 		return $rv;
 	}
 
-	function batch_edit_cbox($elem, $label = false) {
-		print "<input type=\"checkbox\" title=\"".__("Check to enable field")."\"
-			onchange=\"App.dialogOf(this).toggleField(this, '$elem', '$label')\">";
-	}
-
 	function renamecat() {
 		$title = clean($_REQUEST['title']);
 		$id = clean($_REQUEST['id']);
@@ -571,165 +566,117 @@ class Pref_Feeds extends Handler_Protected {
 		}
 	}
 
+	private function _batch_toggle_checkbox($name) {
+		return \Controls\checkbox_tag("", false, "",
+					["data-control-for" => $name, "title" => __("Check to enable field"), "onchange" => "App.dialogOf(this).toggleField(this)"]);
+	}
+
 	function editfeeds() {
 		global $purge_intervals;
 		global $update_intervals;
 
 		$feed_ids = clean($_REQUEST["ids"]);
 
-		print_notice("Enable the options you wish to apply using checkboxes on the right:");
-
-		print \Controls\hidden_tag("ids", "$feed_ids");
-		print \Controls\hidden_tag("op", "pref-feeds");
-		print \Controls\hidden_tag("method", "batchEditSave");
-
-		print "<header>".__("Feed")."</header>";
-		print "<section>";
-
-		/* Category */
-
-		if (get_pref('ENABLE_FEED_CATS')) {
-
-			print "<fieldset>";
-
-			print "<label>" . __('Place in category:') . "</label> ";
-
-			print \Controls\select_feeds_cats("cat_id", null, ['disabled' => '1']);
-
-			$this->batch_edit_cbox("cat_id");
-
-			print "</fieldset>";
-		}
-
-		/* FTS Stemming Language */
-
-		if (DB_TYPE == "pgsql") {
-			print "<fieldset>";
-
-			print "<label>" . __('Language:') . "</label> ";
-			print \Controls\select_tag("feed_language", "", $this::get_ts_languages(), ["disabled"=> 1]);
-
-			$this->batch_edit_cbox("feed_language");
-
-			print "</fieldset>";
-		}
-
-		print "</section>";
-
-		print "<header>".__("Update")."</header>";
-		print "<section>";
-
-		/* Update Interval */
-
-		print "<fieldset>";
-
-		print "<label>".__("Interval:")."</label> ";
-
 		$local_update_intervals = $update_intervals;
 		$local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref("DEFAULT_UPDATE_INTERVAL")]);
 
-		print \Controls\select_hash("update_interval", "", $local_update_intervals, ["disabled" => 1]);
-
-		$this->batch_edit_cbox("update_interval");
-
-		print "</fieldset>";
-
-		/* Purge intl */
-
-		if (FORCE_ARTICLE_PURGE == 0) {
-
-			print "<fieldset>";
-
-			print "<label>" . __('Article purging:') . "</label> ";
-
-			$local_purge_intervals = $purge_intervals;
-			$default_purge_interval = get_pref("PURGE_OLD_DAYS");
-
-			if ($default_purge_interval > 0)
-				$local_purge_intervals[0] .= " " . T_sprintf("(%d days)", $default_purge_interval);
-			else
-				$local_purge_intervals[0] .= " " . sprintf("(%s)", __("Disabled"));
+		$local_purge_intervals = $purge_intervals;
+		$default_purge_interval = get_pref("PURGE_OLD_DAYS");
 
-			print \Controls\select_hash("purge_interval", "", $local_purge_intervals, ["disabled" => 1]);
-
-			$this->batch_edit_cbox("purge_interval");
-
-			print "</fieldset>";
-		}
-
-		print "</section>";
-		print "<header>".__("Authentication")."</header>";
-		print "<section>";
-
-		print "<fieldset>";
-
-		print "<input dojoType='dijit.form.TextBox'
-			placeHolder=\"".__("Login")."\" disabled='1'
-			autocomplete='new-password'
-			name='auth_login' value=''>";
-
-		$this->batch_edit_cbox("auth_login");
-
-		print "<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
-			autocomplete='new-password'
-			placeHolder=\"".__("Password")."\" disabled='1'
-			value=''>";
-
-		$this->batch_edit_cbox("auth_pass");
-
-		print "</fieldset>";
-
-		print "</section>";
-		print "<header>".__("Options")."</header>";
-		print "<section>";
-
-		print "<fieldset class='narrow'>";
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='include_in_digest'
-			name='include_in_digest' dojoType='dijit.form.CheckBox'> ".__('Include in e-mail digest')."</label>";
-
-		print " "; $this->batch_edit_cbox("include_in_digest", "include_in_digest_l");
-
-		print "</fieldset><fieldset class='narrow'>";
-
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='always_display_enclosures'
-			name='always_display_enclosures' dojoType='dijit.form.CheckBox'> ".__('Always display image attachments')."</label>";
-
-		print " "; $this->batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l");
-
-		print "</fieldset><fieldset class='narrow'>";
-
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='hide_images'
-			name='hide_images' dojoType='dijit.form.CheckBox'> ". __('Do not embed media')."</label>";
-
-		print " "; $this->batch_edit_cbox("hide_images", "hide_images_l");
-
-		print "</fieldset><fieldset class='narrow'>";
-
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='cache_images'
-			name='cache_images' dojoType='dijit.form.CheckBox'> ".__('Cache media')."</label>";
-
-		print " "; $this->batch_edit_cbox("cache_images", "cache_images_l");
-
-		print "</fieldset><fieldset class='narrow'>";
+		if ($default_purge_interval > 0)
+			$local_purge_intervals[0] .= " " . T_sprintf("(%d days)", $default_purge_interval);
+		else
+			$local_purge_intervals[0] .= " " . sprintf("(%s)", __("Disabled"));
 
-		print "<label class='checkbox'><input disabled='1' type='checkbox' id='mark_unread_on_update'
-			name='mark_unread_on_update' dojoType='dijit.form.CheckBox'> ".__('Mark updated articles as unread')."</label>";
+		$options = [
+			"include_in_digest" => __('Include in e-mail digest'),
+			"always_display_enclosures" => __('Always display image attachments'),
+			"hide_images" => __('Do not embed media'),
+			"cache_images" => __('Cache media'),
+			"mark_unread_on_update" => __('Mark updated articles as unread')
+		];
 
-		print " "; $this->batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l");
+		print_notice("Enable the options you wish to apply using checkboxes on the right.");
+		?>
 
-		print "</fieldset>";
+		<?= \Controls\hidden_tag("ids", $feed_ids) ?>
+		<?= \Controls\hidden_tag("op", "pref-feeds") ?>
+		<?= \Controls\hidden_tag("method", "batchEditSave") ?>
 
-		print "</section>";
+		<div dojoType="dijit.layout.TabContainer" style="height : 450px">
+			<div dojoType="dijit.layout.ContentPane" title="<?= __('General') ?>">
+				<section>
+				<?php if (get_pref('ENABLE_FEED_CATS')) { ?>
+					<fieldset>
+						<label><?= __('Place in category:') ?></label>
+						<?= \Controls\select_feeds_cats("cat_id", null, ['disabled' => '1']) ?>
+						<?= $this->_batch_toggle_checkbox("cat_id") ?>
+					</fieldset>
+				<?php } ?>
 
-		print "<footer>
-			<button dojoType='dijit.form.Button' type='submit' class='alt-primary' type='submit'>".
-				__('Save')."</button>
-			<button dojoType='dijit.form.Button'
-			onclick='App.dialogOf(this).hide()'>".
-				__('Cancel')."</button>
-			</footer>";
+				<?php	if (DB_TYPE == "pgsql") { ?>
+					<fieldset>
+						<label><?= __('Language:') ?></label>
+						<?= \Controls\select_tag("feed_language", "", $this::get_ts_languages(), ["disabled"=> 1]) ?>
+						<?= $this->_batch_toggle_checkbox("feed_language") ?>
+					</fieldset>
+				<?php } ?>
+				</section>
+
+				<hr/>
+
+				<section>
+					<fieldset>
+						<label><?= __("Update interval:") ?></label>
+						<?= \Controls\select_hash("update_interval", "", $local_update_intervals, ["disabled" => 1]) ?>
+						<?= $this->_batch_toggle_checkbox("update_interval") ?>
+					</fieldset>
+
+					<?php if (FORCE_ARTICLE_PURGE == 0) { ?>
+						<fieldset>
+							<label><?= __('Article purging:') ?></label>
+							<?= \Controls\select_hash("purge_interval", "", $local_purge_intervals, ["disabled" => 1]) ?>
+							<?= $this->_batch_toggle_checkbox("purge_interval") ?>
+						</fieldset>
+					<?php } ?>
+				</section>
+			</div>
+			<div dojoType="dijit.layout.ContentPane" title="<?= __('Authentication') ?>">
+				<section>
+					<fieldset>
+						<label><?= __("Login:") ?></label>
+						<input dojoType='dijit.form.TextBox'
+							disabled='1' autocomplete='new-password' name='auth_login' value=''>
+						<?= $this->_batch_toggle_checkbox("auth_login") ?>
+					</fieldset>
+					<fieldset>
+						<label><?= __("Password:") ?></label>
+						<input dojoType='dijit.form.TextBox' type='password' name='auth_pass'
+							autocomplete='new-password' disabled='1' value=''>
+						<?= $this->_batch_toggle_checkbox("auth_pass") ?>
+					</fieldset>
+				</section>
+			</div>
+			<div dojoType="dijit.layout.ContentPane" title="<?= __('Options') ?>">
+			<?php
+				foreach ($options as $name => $caption) {
+					?>
+						<fieldset class='narrow'>
+							<label class="checkbox text-muted">
+								<?= \Controls\checkbox_tag($name, false, "", ["disabled" => "1"]) ?>
+								<?= $caption ?>
+								<?= $this->_batch_toggle_checkbox($name) ?>
+							</label>
+						</fieldset>
+			<?php } ?>
+			</div>
+		</div>
 
-		return;
+		<footer>
+			<?= \Controls\submit_tag(__("Save")) ?>
+			<?= \Controls\cancel_dialog_tag(__("Cancel")) ?>
+		</footer>
+		<?php
 	}
 
 	function batchEditSave() {
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index a2a7f9141..468e2025c 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -300,7 +300,6 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 
 				try {
 					const dialog = new fox.SingleUseDialog({
-						id: "feedEditDlg",
 						title: __("Edit Multiple Feeds"),
 						getChildByName: function (name) {
 							let rv = null;
@@ -313,15 +312,21 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 								});
 							return rv;
 						},
-						toggleField: function (checkbox, elem, label) {
-							this.getChildByName(elem).attr('disabled', !checkbox.checked);
+						toggleField: function (checkbox) {
+							const name = checkbox.attr("data-control-for");
+							const target = dijit.getEnclosingWidget(dialog.domNode.querySelector(`input[name="${name}"]`));
 
-							if ($(label))
-								if (checkbox.checked)
-									$(label).removeClassName('text-muted');
-								else
-									$(label).addClassName('text-muted');
+							target.attr('disabled', !checkbox.attr('checked'));
+							console.log(target, target.attr('type'));
+
+							if (target.attr('type') == "checkbox") {
+								const label = checkbox.domNode.closest("label");
 
+								if (checkbox.attr('checked'))
+									label.removeClassName('text-muted');
+								else
+									label.addClassName('text-muted');
+							}
 						},
 						execute: function () {
 							if (this.validate() && confirm(__("Save changes to selected feeds?"))) {
-- 
cgit v1.2.3-54-g00ecf

From 861a632ac7c283c55dfd947ed0152d9846fa2ac0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 21 Feb 2021 18:04:44 +0300
Subject: move published opml JS code to pref helpers

---
 classes/pref/feeds.php |  2 +-
 js/CommonDialogs.js    | 58 --------------------------------------------------
 js/PrefHelpers.js      | 57 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 59 deletions(-)

(limited to 'classes/pref/feeds.php')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index c901bc96e..e583a5f51 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1043,7 +1043,7 @@ class Pref_Feeds extends Handler_Protected {
 			<?= __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") ?>
 		</p>
 
-		<button dojoType='dijit.form.Button' class='alt-primary' onclick="return CommonDialogs.publishedOPML()">
+		<button dojoType='dijit.form.Button' class='alt-primary' onclick="return Helpers.OPML.publish()">
 			<?= __('Display published OPML URL') ?>
 		</button>
 
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index a100a546d..321ddf6d3 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -587,64 +587,6 @@ const	CommonDialogs = {
 
 			dialog.show();
 		},
-		publishedOPML: function() {
-
-			Notify.progress("Loading, please wait...", true);
-
-			xhr.json("backend.php", {op: "pref-feeds", method: "getOPMLKey"}, (reply) => {
-				try {
-					const dialog = new fox.SingleUseDialog({
-						title: __("Public OPML URL"),
-						regenOPMLKey: function() {
-							if (confirm(__("Replace current OPML publishing address with a new one?"))) {
-								Notify.progress("Trying to change address...", true);
-
-								xhr.json("backend.php", {op: "pref-feeds", method: "regenOPMLKey"}, (reply) => {
-									if (reply) {
-										const new_link = reply.link;
-										const target = this.domNode.querySelector('.generated_url');
-
-										if (new_link && target) {
-											target.href = new_link;
-											target.innerHTML = new_link;
-
-											Notify.close();
-
-										} else {
-											Notify.error("Could not change feed URL.");
-										}
-									}
-								});
-							}
-							return false;
-						},
-						content: `
-							<header>${__("Your Public OPML URL is:")}</header>
-							<section>
-								<div class='panel text-center'>
-									<a class='generated_url' href="${App.escapeHtml(reply.link)}" target='_blank'>${App.escapeHtml(reply.link)}</a>
-								</div>
-							</section>
-							<footer class='text-center'>
-								<button dojoType='dijit.form.Button' onclick="return App.dialogOf(this).regenOPMLKey()">
-									${__('Generate new URL')}
-								</button>
-								<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>
-									${__('Close this window')}
-								</button>
-							</footer>
-						`
-					});
-
-					dialog.show();
-
-					Notify.close();
-
-				} catch (e) {
-					App.Error.report(e);
-				}
-			});
-		},
 		generatedFeed: function(feed, is_cat, search = "") {
 
 			Notify.progress("Loading, please wait...", true);
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index d27e0e071..62f6d91b1 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -347,5 +347,62 @@ const	Helpers = {
 			console.log("export");
 			window.open("backend.php?op=opml&method=export&" + dojo.formToQuery("opmlExportForm"));
 		},
+		publish: function() {
+			Notify.progress("Loading, please wait...", true);
+
+			xhr.json("backend.php", {op: "pref-feeds", method: "getOPMLKey"}, (reply) => {
+				try {
+					const dialog = new fox.SingleUseDialog({
+						title: __("Public OPML URL"),
+						regenOPMLKey: function() {
+							if (confirm(__("Replace current OPML publishing address with a new one?"))) {
+								Notify.progress("Trying to change address...", true);
+
+								xhr.json("backend.php", {op: "pref-feeds", method: "regenOPMLKey"}, (reply) => {
+									if (reply) {
+										const new_link = reply.link;
+										const target = this.domNode.querySelector('.generated_url');
+
+										if (new_link && target) {
+											target.href = new_link;
+											target.innerHTML = new_link;
+
+											Notify.close();
+
+										} else {
+											Notify.error("Could not change feed URL.");
+										}
+									}
+								});
+							}
+							return false;
+						},
+						content: `
+							<header>${__("Your Public OPML URL is:")}</header>
+							<section>
+								<div class='panel text-center'>
+									<a class='generated_url' href="${App.escapeHtml(reply.link)}" target='_blank'>${App.escapeHtml(reply.link)}</a>
+								</div>
+							</section>
+							<footer class='text-center'>
+								<button dojoType='dijit.form.Button' onclick="return App.dialogOf(this).regenOPMLKey()">
+									${__('Generate new URL')}
+								</button>
+								<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>
+									${__('Close this window')}
+								</button>
+							</footer>
+						`
+					});
+
+					dialog.show();
+
+					Notify.close();
+
+				} catch (e) {
+					App.Error.report(e);
+				}
+			});
+		},
 	}
 };
-- 
cgit v1.2.3-54-g00ecf

From e4107ac9520ca404d4ab49ef79ca74430e8fd772 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 22 Feb 2021 21:47:48 +0300
Subject: wip: initial for config object

(limited to 'classes/pref/feeds.php')

diff --git a/backend.php b/backend.php
index b6b3e0030..2237c06b3 100644
--- a/backend.php
+++ b/backend.php
@@ -40,7 +40,7 @@
 
 	header("Content-Type: text/json; charset=utf-8");
 
-	if (SINGLE_USER_MODE) {
+	if (Config::get(Config::SINGLE_USER_MODE)) {
 		UserHelper::authenticate( "admin", null);
 	}
 
diff --git a/classes/api.php b/classes/api.php
index 5677cb908..6f3ee77db 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -57,7 +57,7 @@ class API extends Handler {
 		$password = clean($_REQUEST["password"]);
 		$password_base64 = base64_decode(clean($_REQUEST["password"]));
 
-		if (SINGLE_USER_MODE) $login = "admin";
+		if (Config::get(Config::SINGLE_USER_MODE)) $login = "admin";
 
 		if ($uid = UserHelper::find_user_by_login($login)) {
 			if (get_pref("ENABLE_API_ACCESS", $uid)) {
@@ -361,9 +361,10 @@ class API extends Handler {
 	}
 
 	function getConfig() {
-		$config = array(
-			"icons_dir" => ICONS_DIR,
-			"icons_url" => ICONS_URL);
+		$config = [
+			"icons_dir" => Config::get(Config::ICONS_DIR),
+			"icons_url" => Config::get(Config::ICONS_URL)
+		];
 
 		$config["daemon_is_running"] = file_is_locked("update_daemon.lock");
 
diff --git a/classes/article.php b/classes/article.php
index acd83694c..a2a38118b 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -85,7 +85,7 @@ class Article extends Handler_Protected {
 					content = ?, content_hash = ? WHERE id = ?");
 				$sth->execute([$content, $content_hash, $ref_id]);
 
-				if (DB_TYPE == "pgsql"){
+				if (Config::get(Config::DB_TYPE) == "pgsql") {
 					$sth = $pdo->prepare("UPDATE ttrss_entries
 					SET tsvector_combined = to_tsvector( :ts_content)
 					WHERE id = :id");
@@ -130,7 +130,7 @@ class Article extends Handler_Protected {
 
 			if ($row = $sth->fetch()) {
 				$ref_id = $row["id"];
-				if (DB_TYPE == "pgsql"){
+				if (Config::get(Config::DB_TYPE) == "pgsql"){
 					$sth = $pdo->prepare("UPDATE ttrss_entries
 					SET tsvector_combined = to_tsvector( :ts_content)
 					WHERE id = :id");
@@ -475,7 +475,7 @@ class Article extends Handler_Protected {
 
         // purge orphaned posts in main content table
 
-        if (DB_TYPE == "mysql")
+        if (Config::get(Config::DB_TYPE) == "mysql")
             $limit_qpart = "LIMIT 5000";
         else
             $limit_qpart = "";
diff --git a/classes/db.php b/classes/db.php
index 490cecd57..1ccaa3533 100755
--- a/classes/db.php
+++ b/classes/db.php
@@ -21,9 +21,9 @@ class Db
 		$db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
 
 		try {
-			$pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port,
-				DB_USER,
-				DB_PASS);
+			$pdo = new PDO(Config::get(Config::DB_TYPE) . ':dbname=' . Config::get(Config::DB_NAME) . $db_host . $db_port,
+				Config::get(Config::DB_USER),
+				Config::get(Config::DB_PASS));
 		} catch (Exception $e) {
 			print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>";
 			exit(101);
@@ -31,14 +31,14 @@ class Db
 
 		$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 
 			$pdo->query("set client_encoding = 'UTF-8'");
 			$pdo->query("set datestyle = 'ISO, european'");
 			$pdo->query("set TIME ZONE 0");
 			$pdo->query("set cpu_tuple_cost = 0.5");
 
-		} else if (DB_TYPE == "mysql") {
+		} else if (Config::get(Config::DB_TYPE) == "mysql") {
 			$pdo->query("SET time_zone = '+0:0'");
 
 			if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
@@ -68,7 +68,7 @@ class Db
 	}
 
 	public static function sql_random_function() {
-		if (DB_TYPE == "mysql") {
+		if (Config::get(Config::DB_TYPE) == "mysql") {
 			return "RAND()";
 		} else {
 			return "RANDOM()";
diff --git a/classes/digest.php b/classes/digest.php
index e0c23d705..9ac3f6a17 100644
--- a/classes/digest.php
+++ b/classes/digest.php
@@ -8,9 +8,9 @@ class Digest
 
 		Debug::log("Sending digests, batch of max $user_limit users, headline limit = $limit");
 
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 			$interval_qpart = "last_digest_sent < NOW() - INTERVAL '1 days'";
-		} else /* if (DB_TYPE == "mysql") */ {
+		} else /* if (Config::get(Config::DB_TYPE) == "mysql") */ {
 			$interval_qpart = "last_digest_sent < DATE_SUB(NOW(), INTERVAL 1 DAY)";
 		}
 
@@ -91,19 +91,19 @@ class Digest
 
 		$tpl->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
 		$tpl->setVariable('CUR_TIME', date('G:i', $local_ts));
-		$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+		$tpl->setVariable('TTRSS_HOST', Config::get(Config.Config::get(Config::SELF_URL_PATH)));
 
 		$tpl_t->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
 		$tpl_t->setVariable('CUR_TIME', date('G:i', $local_ts));
-		$tpl_t->setVariable('TTRSS_HOST', SELF_URL_PATH);
+		$tpl_t->setVariable('TTRSS_HOST', Config::get(Config.Config::get(Config::SELF_URL_PATH)));
 
 		$affected_ids = array();
 
 		$days = (int) $days;
 
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 			$interval_qpart = "ttrss_entries.date_updated > NOW() - INTERVAL '$days days'";
-		} else /* if (DB_TYPE == "mysql") */ {
+		} else /* if (Config::get(Config::DB_TYPE) == "mysql") */ {
 			$interval_qpart = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
 		}
 
diff --git a/classes/diskcache.php b/classes/diskcache.php
index 94f645f32..063a3847c 100644
--- a/classes/diskcache.php
+++ b/classes/diskcache.php
@@ -191,7 +191,7 @@ class DiskCache {
 	];
 
 	public function __construct($dir) {
-		$this->dir = CACHE_DIR . "/" . basename(clean($dir));
+		$this->dir = Config::get(Config::CACHE_DIR) . "/" . basename(clean($dir));
 	}
 
 	public function get_dir() {
@@ -339,7 +339,7 @@ class DiskCache {
 	}
 
 	static function expire() {
-		$dirs = array_filter(glob(CACHE_DIR . "/*"), "is_dir");
+		$dirs = array_filter(glob(Config::get(Config::CACHE_DIR) . "/*"), "is_dir");
 
 		foreach ($dirs as $cache_dir) {
 			$num_deleted = 0;
@@ -396,7 +396,7 @@ class DiskCache {
 
 			$tmppluginhost = new PluginHost();
 
-			$tmppluginhost->load(PLUGINS, PluginHost::KIND_SYSTEM);
+			$tmppluginhost->load(Config::get(Config::PLUGINS), PluginHost::KIND_SYSTEM);
 			//$tmppluginhost->load_data();
 
 			if ($tmppluginhost->run_hooks_until(PluginHost::HOOK_SEND_LOCAL_FILE, true, $filename))
diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php
index f387e0779..8f2b9188b 100755
--- a/classes/feeditem/common.php
+++ b/classes/feeditem/common.php
@@ -179,7 +179,7 @@ abstract class FeedItem_Common extends FeedItem {
 
 			$cat = preg_replace('/[,\'\"]/', "", $cat);
 
-			if (DB_TYPE == "mysql") {
+			if (Config::get(Config::DB_TYPE) == "mysql") {
 				$cat = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $cat);
 			}
 
diff --git a/classes/feeds.php b/classes/feeds.php
index b59504c03..274cb22d0 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -186,7 +186,7 @@ class Feeds extends Handler_Protected {
 				$id = $line["id"];
 
 				// frontend doesn't expect pdo returning booleans as strings on mysql
-				if (DB_TYPE == "mysql") {
+				if (Config::get(Config::DB_TYPE) == "mysql") {
 					foreach (["unread", "marked", "published"] as $k) {
 						$line[$k] = $line[$k] === "1";
 					}
@@ -576,7 +576,7 @@ class Feeds extends Handler_Protected {
 
 	function search() {
 		print json_encode([
-			"show_language" => DB_TYPE == "pgsql",
+			"show_language" => Config::get(Config::DB_TYPE) == "pgsql",
 			"show_syntax_help" => count(PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH)) == 0,
 			"all_languages" => Pref_Feeds::get_ts_languages(),
 			"default_language" => get_pref('DEFAULT_SEARCH_LANGUAGE')
@@ -716,21 +716,21 @@ class Feeds extends Handler_Protected {
 
 		switch ($mode) {
 			case "1day":
-				if (DB_TYPE == "pgsql") {
+				if (Config::get(Config::DB_TYPE) == "pgsql") {
 					$date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
 				} else {
 					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
 				}
 				break;
 			case "1week":
-				if (DB_TYPE == "pgsql") {
+				if (Config::get(Config::DB_TYPE) == "pgsql") {
 					$date_qpart = "date_entered < NOW() - INTERVAL '1 week' ";
 				} else {
 					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
 				}
 				break;
 			case "2week":
-				if (DB_TYPE == "pgsql") {
+				if (Config::get(Config::DB_TYPE) == "pgsql") {
 					$date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
 				} else {
 					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) ";
@@ -807,7 +807,7 @@ class Feeds extends Handler_Protected {
 
 					$intl = (int) get_pref("FRESH_ARTICLE_MAX_AGE");
 
-					if (DB_TYPE == "pgsql") {
+					if (Config::get(Config::DB_TYPE) == "pgsql") {
 						$match_part = "date_entered > NOW() - INTERVAL '$intl hour' ";
 					} else {
 						$match_part = "date_entered > DATE_SUB(NOW(),
@@ -900,7 +900,7 @@ class Feeds extends Handler_Protected {
 
 			$intl = (int) get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid);
 
-			if (DB_TYPE == "pgsql") {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$match_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
 			} else {
 				$match_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
@@ -1332,7 +1332,7 @@ class Feeds extends Handler_Protected {
 				list($search_query_part, $search_words) = self::_search_to_sql($search, $search_language, $owner_uid);
 			}
 
-			if (DB_TYPE == "pgsql") {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$test_sth = $pdo->prepare("select $search_query_part
 					FROM ttrss_entries, ttrss_user_entries WHERE id = ref_id limit 1");
 
@@ -1469,7 +1469,7 @@ class Feeds extends Handler_Protected {
 		} else if ($feed == -6) { // recently read
 			$query_strategy_part = "unread = false AND last_read IS NOT NULL";
 
-			if (DB_TYPE == "pgsql") {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$query_strategy_part .= " AND last_read > NOW() - INTERVAL '1 DAY' ";
 			} else {
 				$query_strategy_part .= " AND last_read > DATE_SUB(NOW(), INTERVAL 1 DAY) ";
@@ -1486,7 +1486,7 @@ class Feeds extends Handler_Protected {
 
 			$intl = (int) get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid);
 
-			if (DB_TYPE == "pgsql") {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$query_strategy_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
 			} else {
 				$query_strategy_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
@@ -1605,7 +1605,7 @@ class Feeds extends Handler_Protected {
 			if ($feed == -3)
 				$first_id_query_strategy_part = "true";
 
-			if (DB_TYPE == "pgsql") {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$sanity_interval_qpart = "date_entered >= NOW() - INTERVAL '1 hour' AND";
 				$yyiw_qpart = "to_char(date_entered, 'IYYY-IW') AS yyiw";
 
@@ -1705,7 +1705,7 @@ class Feeds extends Handler_Protected {
 		} else {
 			// browsing by tag
 
-			if (DB_TYPE == "pgsql") {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$distinct_columns = str_replace("desc", "", strtolower($order_by));
 				$distinct_qpart = "DISTINCT ON (id, $distinct_columns)";
 			} else {
@@ -1948,10 +1948,10 @@ class Feeds extends Handler_Protected {
 		if ($row = $sth->fetch()) {
 			$owner_uid = $row["owner_uid"];
 
-			if (FORCE_ARTICLE_PURGE != 0) {
-				Debug::log("purge_feed: FORCE_ARTICLE_PURGE is set, overriding interval to " . FORCE_ARTICLE_PURGE, Debug::$LOG_VERBOSE);
+			if (Config::get(Config::FORCE_ARTICLE_PURGE) != 0) {
+				Debug::log("purge_feed: FORCE_ARTICLE_PURGE is set, overriding interval to " . Config::get(Config::FORCE_ARTICLE_PURGE), Debug::$LOG_VERBOSE);
 				$purge_unread = true;
-				$purge_interval = FORCE_ARTICLE_PURGE;
+				$purge_interval = Config::get(Config::FORCE_ARTICLE_PURGE);
 			} else {
 				$purge_unread = get_pref("PURGE_UNREAD_ARTICLES", $owner_uid, false);
 			}
@@ -1970,7 +1970,7 @@ class Feeds extends Handler_Protected {
 			else
 				$query_limit = "";
 
-			if (DB_TYPE == "pgsql") {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$sth = $pdo->prepare("DELETE FROM ttrss_user_entries
 					USING ttrss_entries
 					WHERE ttrss_entries.id = ref_id AND
@@ -2153,7 +2153,7 @@ class Feeds extends Handler_Protected {
 						array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
 					} else {
 
-						if (DB_TYPE == "pgsql") {
+						if (Config::get(Config::DB_TYPE) == "pgsql") {
 							$k = mb_strtolower($k);
 							array_push($search_query_leftover, $not ? "!$k" : $k);
 						} else {
@@ -2168,7 +2168,7 @@ class Feeds extends Handler_Protected {
 
 		if (count($search_query_leftover) > 0) {
 
-			if (DB_TYPE == "pgsql") {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 
 				// if there's no joiners consider this a "simple" search and
 				// concatenate everything with &, otherwise don't try to mess with tsquery syntax
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 3910cf7c1..79dff37b5 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -43,7 +43,7 @@ class Handler_Public extends Handler {
 			$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
 			$tmppluginhost = new PluginHost();
-			$tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+			$tmppluginhost->load(Config::get(Config::PLUGINS), PluginHost::KIND_ALL);
 			$tmppluginhost->load((string)$user_plugins, PluginHost::KIND_USER, $owner_uid);
 			//$tmppluginhost->load_data();
 
@@ -309,7 +309,7 @@ class Handler_Public extends Handler {
 		$format = clean($_REQUEST['format'] ?? "atom");
 		$orig_guid = clean($_REQUEST["orig_guid"] ?? false);
 
-		if (SINGLE_USER_MODE) {
+		if (Config::get(Config::SINGLE_USER_MODE)) {
 			UserHelper::authenticate("admin", null);
 		}
 
@@ -347,7 +347,7 @@ class Handler_Public extends Handler {
 	}
 
 	function login() {
-		if (!SINGLE_USER_MODE) {
+		if (!Config::get(Config::SINGLE_USER_MODE)) {
 
 			$login = clean($_POST["login"]);
 			$password = clean($_POST["password"]);
@@ -355,7 +355,7 @@ class Handler_Public extends Handler {
 			$safe_mode = checkbox_to_sql_bool(clean($_POST["safe_mode"] ?? false));
 
 			if ($remember_me) {
-				@session_set_cookie_params(SESSION_COOKIE_LIFETIME);
+				@session_set_cookie_params(Config::get(Config::SESSION_COOKIE_LIFETIME));
 			} else {
 				@session_set_cookie_params(0);
 			}
@@ -398,7 +398,7 @@ class Handler_Public extends Handler {
 
 			$return = clean($_REQUEST['return']);
 
-			if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
+			if ($_REQUEST['return'] && mb_strpos($return, Config::get(Config::SELF_URL_PATH)) === 0) {
 				header("Location: " . clean($_REQUEST['return']));
 			} else {
 				header("Location: " . get_self_url_prefix());
@@ -559,7 +559,7 @@ class Handler_Public extends Handler {
 
 						$tpl->setVariable('LOGIN', $login);
 						$tpl->setVariable('RESETPASS_LINK', $resetpass_link);
-						$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+						$tpl->setVariable('TTRSS_HOST', Config::get(Config::SELF_URL_PATH));
 
 						$tpl->addBlock('message');
 
@@ -613,7 +613,7 @@ class Handler_Public extends Handler {
 	function dbupdate() {
 		startup_gettext();
 
-		if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
+		if (!Config::get(Config::SINGLE_USER_MODE) && $_SESSION["access_level"] < 10) {
 			$_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
 			$this->_render_login_form();
 			exit;
@@ -660,7 +660,7 @@ class Handler_Public extends Handler {
 
 			<?php
 				@$op = clean($_REQUEST["subop"]);
-				$updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION);
+				$updater = new DbUpdater(Db::pdo(), Config::get(Config::DB_TYPE), SCHEMA_VERSION);
 
 				if ($op == "performupdate") {
 					if ($updater->is_update_required()) {
@@ -709,7 +709,7 @@ class Handler_Public extends Handler {
 						print "<h2>".T_sprintf("Tiny Tiny RSS database needs update to the latest version (%d to %d).",
 							$updater->get_schema_version(), SCHEMA_VERSION)."</h2>";
 
-						if (DB_TYPE == "mysql") {
+						if (Config::get(Config::DB_TYPE) == "mysql") {
 							print_error("<strong>READ THIS:</strong> Due to MySQL limitations, your database is not completely protected while updating. ".
 								"Errors may put it in an inconsistent state requiring manual rollback. <strong>BACKUP YOUR DATABASE BEFORE CONTINUING.</strong>");
 						} else {
diff --git a/classes/opml.php b/classes/opml.php
index 04d287125..cbc1269e3 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -594,7 +594,7 @@ class OPML extends Handler_Protected {
 		}
 
 		if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) {
-			$tmp_file = (string)tempnam(CACHE_DIR . '/upload', 'opml');
+			$tmp_file = (string)tempnam(Config::get(Config::CACHE_DIR) . '/upload', 'opml');
 
 			$result = move_uploaded_file($_FILES['opml_file']['tmp_name'],
 				$tmp_file);
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index e583a5f51..229effeb3 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -9,7 +9,7 @@ class Pref_Feeds extends Handler_Protected {
 	public static function get_ts_languages() {
 		$rv = [];
 
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 			$dbh = Db::pdo();
 
 			$res = $dbh->query("SELECT cfgname FROM pg_ts_config");
@@ -453,7 +453,7 @@ class Pref_Feeds extends Handler_Protected {
 		header("Content-type: text/html");
 
 		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
+			$tmp_file = tempnam(Config::get(Config::CACHE_DIR) . '/upload', 'icon');
 
 			if (!$tmp_file)
 				return;
@@ -529,7 +529,7 @@ class Pref_Feeds extends Handler_Protected {
 			$local_update_intervals = $update_intervals;
 			$local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref("DEFAULT_UPDATE_INTERVAL")]);
 
-			if (FORCE_ARTICLE_PURGE == 0) {
+			if (Config::get(Config::FORCE_ARTICLE_PURGE) == 0) {
 				$local_purge_intervals = $purge_intervals;
 				$default_purge_interval = get_pref("PURGE_OLD_DAYS");
 
@@ -539,7 +539,7 @@ class Pref_Feeds extends Handler_Protected {
 				$local_purge_intervals[0] .= " " . sprintf("(%s)", __("Disabled"));
 
 			} else {
-				$purge_interval = FORCE_ARTICLE_PURGE;
+				$purge_interval = Config::get(Config::FORCE_ARTICLE_PURGE);
 				$local_purge_intervals = [ T_nsprintf('%d day', '%d days', $purge_interval, $purge_interval) ];
 			}
 
@@ -550,13 +550,13 @@ class Pref_Feeds extends Handler_Protected {
 					"select" => \Controls\select_feeds_cats("cat_id", $row["cat_id"]),
 				],
 				"plugin_data" => $plugin_data,
-				"force_purge" => (int)FORCE_ARTICLE_PURGE,
+				"force_purge" => (int)Config::get(Config::FORCE_ARTICLE_PURGE),
 				"intervals" => [
 					"update" => $local_update_intervals,
 					"purge" => $local_purge_intervals,
 				],
 				"lang" => [
-					"enabled" => DB_TYPE == "pgsql",
+					"enabled" => Config::get(Config::DB_TYPE) == "pgsql",
 					"default" => get_pref('DEFAULT_SEARCH_LANGUAGE'),
 					"all" => $this::get_ts_languages(),
 					]
@@ -614,7 +614,7 @@ class Pref_Feeds extends Handler_Protected {
 					</fieldset>
 				<?php } ?>
 
-				<?php	if (DB_TYPE == "pgsql") { ?>
+				<?php	if (Config::get(Config::DB_TYPE) == "pgsql") { ?>
 					<fieldset>
 						<label><?= __('Language:') ?></label>
 						<?= \Controls\select_tag("feed_language", "", $this::get_ts_languages(), ["disabled"=> 1]) ?>
@@ -632,7 +632,7 @@ class Pref_Feeds extends Handler_Protected {
 						<?= $this->_batch_toggle_checkbox("update_interval") ?>
 					</fieldset>
 
-					<?php if (FORCE_ARTICLE_PURGE == 0) { ?>
+					<?php if (Config::get(Config::FORCE_ARTICLE_PURGE) == 0) { ?>
 						<fieldset>
 							<label><?= __('Article purging:') ?></label>
 							<?= \Controls\select_hash("purge_interval", "", $local_purge_intervals, ["disabled" => 1]) ?>
@@ -1147,7 +1147,7 @@ class Pref_Feeds extends Handler_Protected {
 
 	function inactiveFeeds() {
 
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 			$interval_qpart = "NOW() - INTERVAL '3 months'";
 		} else {
 			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index adb249dac..1ca5b28be 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -236,7 +236,7 @@ class Pref_Prefs extends Handler_Protected {
 
 				$tpl->setVariable('LOGIN', $row["login"]);
 				$tpl->setVariable('NEWMAIL', $email);
-				$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+				$tpl->setVariable('TTRSS_HOST', Config::get(Config::SELF_URL_PATH));
 
 				$tpl->addBlock('message');
 
@@ -625,7 +625,7 @@ class Pref_Prefs extends Handler_Protected {
 					continue;
 				}
 
-				if ($pref_name == "DEFAULT_SEARCH_LANGUAGE" && DB_TYPE != "pgsql") {
+				if ($pref_name == "DEFAULT_SEARCH_LANGUAGE" && Config::get(Config::DB_TYPE) != "pgsql") {
 					continue;
 				}
 
@@ -705,7 +705,7 @@ class Pref_Prefs extends Handler_Protected {
 
 						array_push($listed_boolean_prefs, $pref_name);
 
-						if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) {
+						if ($pref_name == "PURGE_UNREAD_ARTICLES" && Config::get(Config::FORCE_ARTICLE_PURGE) != 0) {
 							$is_disabled = true;
 							$is_checked = true;
 						} else {
@@ -719,9 +719,9 @@ class Pref_Prefs extends Handler_Protected {
 					} else if (in_array($pref_name, ['FRESH_ARTICLE_MAX_AGE',
 							'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT'])) {
 
-						if ($pref_name == "PURGE_OLD_DAYS" && FORCE_ARTICLE_PURGE != 0) {
+						if ($pref_name == "PURGE_OLD_DAYS" && Config::get(Config::FORCE_ARTICLE_PURGE) != 0) {
 							$attributes = ["disabled" => true, "required" => true];
-							$value = FORCE_ARTICLE_PURGE;
+							$value = Config::get(Config::FORCE_ARTICLE_PURGE);
 						} else {
 							$attributes = ["required" => true];
 						}
@@ -829,7 +829,7 @@ class Pref_Prefs extends Handler_Protected {
 	private function index_plugins_system() {
 		print_notice("System plugins are enabled in <strong>config.php</strong> for all users.");
 
-		$system_enabled = array_map("trim", explode(",", (string)PLUGINS));
+		$system_enabled = array_map("trim", explode(",", (string)Config::get(Config::PLUGINS)));
 
 		$tmppluginhost = new PluginHost();
 		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true);
@@ -862,7 +862,7 @@ class Pref_Prefs extends Handler_Protected {
 	}
 
 	private function index_plugins_user() {
-		$system_enabled = array_map("trim", explode(",", (string)PLUGINS));
+		$system_enabled = array_map("trim", explode(",", (string)Config::get(Config::PLUGINS)));
 		$user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
 
 		$tmppluginhost = new PluginHost();
@@ -1135,7 +1135,7 @@ class Pref_Prefs extends Handler_Protected {
 				$tpl->readTemplateFromFile("otp_disabled_template.txt");
 
 				$tpl->setVariable('LOGIN', $row["login"]);
-				$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+				$tpl->setVariable('TTRSS_HOST', Config::get(Config::SELF_URL_PATH));
 
 				$tpl->addBlock('message');
 
diff --git a/classes/rpc.php b/classes/rpc.php
index 95fd0f5ae..bf24132b0 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -174,7 +174,7 @@ class RPC extends Handler_Protected {
 	static function updaterandomfeed_real() {
 
 		// Test if the feed need a update (update interval exceded).
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 			$update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
@@ -199,7 +199,7 @@ class RPC extends Handler_Protected {
 		}
 
 		// Test if feed is currently being updated by another process.
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '5 minutes')";
 		} else {
 			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))";
@@ -361,7 +361,7 @@ class RPC extends Handler_Protected {
 		$params["safe_mode"] = !empty($_SESSION["safe_mode"]);
 		$params["check_for_updates"] = CHECK_FOR_UPDATES;
 		$params["icons_url"] = ICONS_URL;
-		$params["cookie_lifetime"] = SESSION_COOKIE_LIFETIME;
+		$params["cookie_lifetime"] = Config::get(Config::SESSION_COOKIE_LIFETIME);
 		$params["default_view_mode"] = get_pref("_DEFAULT_VIEW_MODE");
 		$params["default_view_limit"] = (int) get_pref("_DEFAULT_VIEW_LIMIT");
 		$params["default_view_order_by"] = get_pref("_DEFAULT_VIEW_ORDER_BY");
@@ -433,7 +433,7 @@ class RPC extends Handler_Protected {
 		$data["labels"] = Labels::get_all($_SESSION["uid"]);
 
 		if (LOG_DESTINATION == 'sql' && $_SESSION['access_level'] >= 10) {
-			if (DB_TYPE == 'pgsql') {
+			if (Config::get(Config::DB_TYPE) == 'pgsql') {
 				$log_interval = "created_at > NOW() - interval '1 hour'";
 			} else {
 				$log_interval = "created_at > DATE_SUB(NOW(), INTERVAL 1 HOUR)";
@@ -452,13 +452,13 @@ class RPC extends Handler_Protected {
 			}
 		}
 
-		if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+		if (file_exists(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon.lock")) {
 
 			$data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
 
 			if (time() - ($_SESSION["daemon_stamp_check"] ?? 0) > 30) {
 
-				$stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+				$stamp = (int) @file_get_contents(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon.stamp");
 
 				if ($stamp) {
 					$stamp_delta = time() - $stamp;
diff --git a/classes/rssutils.php b/classes/rssutils.php
index 30d08328f..c951003f0 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -61,8 +61,8 @@ class RSSUtils {
 
 		$pdo = Db::pdo();
 
-		if (!SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) {
-			if (DB_TYPE == "pgsql") {
+		if (!Config::get(Config::SINGLE_USER_MODE) && DAEMON_UPDATE_LOGIN_LIMIT > 0) {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
 			} else {
 				$login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
@@ -71,7 +71,7 @@ class RSSUtils {
 			$login_thresh_qpart = "";
 		}
 
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 			$update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_user_prefs.value != '-1'
@@ -96,7 +96,7 @@ class RSSUtils {
 		}
 
 		// Test if feed is currently being updated by another process.
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 			$updstart_thresh_qpart = "AND (last_update_started IS NULL OR last_update_started < NOW() - INTERVAL '10 minutes')";
 		} else {
 			$updstart_thresh_qpart = "AND (last_update_started IS NULL OR last_update_started < DATE_SUB(NOW(), INTERVAL 10 MINUTE))";
@@ -106,7 +106,7 @@ class RSSUtils {
 
 		// Update the least recently updated feeds first
 		$query_order = "ORDER BY last_updated";
-		if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
+		if (Config::get(Config::DB_TYPE) == "pgsql") $query_order .= " NULLS FIRST";
 
 		$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
 			FROM
@@ -182,7 +182,7 @@ class RSSUtils {
 				if (self::function_enabled('passthru')) {
 					$exit_code = 0;
 
-					passthru(PHP_EXECUTABLE . " update.php --update-feed " . $tline["id"] . " --pidlock feed-" . $tline["id"] . " $quiet $log $log_level", $exit_code);
+					passthru(Config::get(Config::PHP_EXECUTABLE) . " update.php --update-feed " . $tline["id"] . " --pidlock feed-" . $tline["id"] . " $quiet $log $log_level", $exit_code);
 
 					Debug::log(sprintf("<= %.4f (sec) exit code: %d", microtime(true) - $fstarted, $exit_code));
 
@@ -275,7 +275,7 @@ class RSSUtils {
 			$pluginhost = new PluginHost();
 			$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-			$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+			$pluginhost->load(Config::get(Config::PLUGINS), PluginHost::KIND_ALL);
 			$pluginhost->load((string)$user_plugins, PluginHost::KIND_USER, $owner_uid);
 			//$pluginhost->load_data();
 
@@ -395,12 +395,12 @@ class RSSUtils {
 
 		$date_feed_processed = date('Y-m-d H:i');
 
-		$cache_filename = CACHE_DIR . "/feeds/" . sha1($fetch_url) . ".xml";
+		$cache_filename = Config::get(Config::CACHE_DIR) . "/feeds/" . sha1($fetch_url) . ".xml";
 
 		$pluginhost = new PluginHost();
 		$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-		$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+		$pluginhost->load(Config::get(Config::PLUGINS), PluginHost::KIND_ALL);
 		$pluginhost->load((string)$user_plugins, PluginHost::KIND_USER, $owner_uid);
 		//$pluginhost->load_data();
 
@@ -488,7 +488,7 @@ class RSSUtils {
 			}
 
 			// cache vanilla feed data for re-use
-			if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/feeds")) {
+			if ($feed_data && !$auth_pass && !$auth_login && is_writable(Config::get(Config::CACHE_DIR) . "/feeds")) {
 				$new_rss_hash = sha1($feed_data);
 
 				if ($new_rss_hash != $rss_hash) {
@@ -561,7 +561,7 @@ class RSSUtils {
 			Debug::log("language: $feed_language", Debug::$LOG_VERBOSE);
 			Debug::log("processing feed data...", Debug::$LOG_VERBOSE);
 
-			if (DB_TYPE == "pgsql") {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$favicon_interval_qpart = "favicon_last_checked < NOW() - INTERVAL '12 hour'";
 			} else {
 				$favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
@@ -755,7 +755,7 @@ class RSSUtils {
 							$e->type, $e->length, $e->title, $e->width, $e->height);
 
 						// Yet another episode of "mysql utf8_general_ci is gimped"
-						if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
+						if (Config::get(Config::DB_TYPE) == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
 							for ($i = 0; $i < count($e_item); $i++) {
 								if (is_string($e_item[$i])) {
 									$e_item[$i] = self::strip_utf8mb4($e_item[$i]);
@@ -833,7 +833,7 @@ class RSSUtils {
 				Debug::log("plugin data: $entry_plugin_data", Debug::$LOG_VERBOSE);
 
 				// Workaround: 4-byte unicode requires utf8mb4 in MySQL. See https://tt-rss.org/forum/viewtopic.php?f=1&t=3377&p=20077#p20077
-				if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
+				if (Config::get(Config::DB_TYPE) == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
 					foreach ($article as $k => $v) {
 						// i guess we'll have to take the risk of 4byte unicode labels & tags here
 						if (is_string($article[$k])) {
@@ -1079,7 +1079,7 @@ class RSSUtils {
 
 					Debug::log("resulting RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
 
-					if (DB_TYPE == "pgsql")
+					if (Config::get(Config::DB_TYPE) == "pgsql")
 						$tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
 					else
 						$tsvector_qpart = "";
@@ -1107,7 +1107,7 @@ class RSSUtils {
 						":lang" => $entry_language,
 						":id" => $ref_id];
 
-					if (DB_TYPE == "pgsql") {
+					if (Config::get(Config::DB_TYPE) == "pgsql") {
 						$params[":ts_lang"] = $feed_language;
 						$params[":ts_content"] = mb_substr(strip_tags($entry_title . " " . $entry_content), 0, 900000);
 					}
@@ -1375,7 +1375,7 @@ class RSSUtils {
 
 		$pdo = Db::pdo();
 
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 			$pdo->query("DELETE FROM ttrss_error_log
 				WHERE created_at < NOW() - INTERVAL '7 days'");
 		} else {
@@ -1396,8 +1396,8 @@ class RSSUtils {
 
 		$num_deleted = 0;
 
-		if (is_writable(LOCK_DIRECTORY)) {
-			$files = glob(LOCK_DIRECTORY . "/*.lock");
+		if (is_writable(Config::get(Config::LOCK_DIRECTORY))) {
+			$files = glob(Config::get(Config::LOCK_DIRECTORY) . "/*.lock");
 
 			if ($files) {
 				foreach ($files as $file) {
@@ -1589,9 +1589,9 @@ class RSSUtils {
 
 			$days = DAEMON_UNSUCCESSFUL_DAYS_LIMIT;
 
-			if (DB_TYPE == "pgsql") {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$interval_query = "last_successful_update < NOW() - INTERVAL '$days days' AND last_updated > NOW() - INTERVAL '1 days'";
-			} else /* if (DB_TYPE == "mysql") */ {
+			} else /* if (Config::get(Config::DB_TYPE) == "mysql") */ {
 				$interval_query = "last_successful_update < DATE_SUB(NOW(), INTERVAL $days DAY) AND last_updated > DATE_SUB(NOW(), INTERVAL 1 DAY)";
 			}
 
diff --git a/classes/userhelper.php b/classes/userhelper.php
index 7fe1e5557..82a2fe05f 100644
--- a/classes/userhelper.php
+++ b/classes/userhelper.php
@@ -2,7 +2,7 @@
 class UserHelper {
 
 	static function authenticate(string $login = null, string $password = null, bool $check_only = false, string $service = null) {
-		if (!SINGLE_USER_MODE) {
+		if (!Config::get(Config::SINGLE_USER_MODE)) {
 			$user_id = false;
 			$auth_module = false;
 
@@ -88,7 +88,7 @@ class UserHelper {
 	static function login_sequence() {
 		$pdo = Db::pdo();
 
-		if (SINGLE_USER_MODE) {
+		if (Config::get(Config::SINGLE_USER_MODE)) {
 			@session_start();
 			self::authenticate("admin", null);
 			startup_gettext();
@@ -98,7 +98,7 @@ class UserHelper {
 
 			if (empty($_SESSION["uid"])) {
 
-				if (AUTH_AUTO_LOGIN && self::authenticate(null, null)) {
+				if (Config::get(Config::AUTH_AUTO_LOGIN) && self::authenticate(null, null)) {
 					$_SESSION["ref_schema_version"] = get_schema_version(true);
 				} else {
 					 self::authenticate(null, null, true);
diff --git a/include/autoload.php b/include/autoload.php
index c02923dba..19e00b9ea 100644
--- a/include/autoload.php
+++ b/include/autoload.php
@@ -1,6 +1,4 @@
 <?php
-	require_once "functions.php";
-
 	spl_autoload_register(function($class) {
 		$namespace = '';
 		$class_name = $class;
diff --git a/include/functions.php b/include/functions.php
index 7c4e32963..526c6058a 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -80,7 +80,9 @@
 
 	/* tunables end here */
 
-	if (DB_TYPE == "pgsql") {
+	require_once "autoload.php";
+
+	if (Config::get(Config::DB_TYPE) == "pgsql") {
 		define('SUBSTRING_FOR_DATE', 'SUBSTRING_FOR_DATE');
 	} else {
 		define('SUBSTRING_FOR_DATE', 'SUBSTRING');
@@ -375,9 +377,9 @@
 	}
 
 	function file_is_locked($filename) {
-		if (file_exists(LOCK_DIRECTORY . "/$filename")) {
+		if (file_exists(Config::get(Config::LOCK_DIRECTORY) . "/$filename")) {
 			if (function_exists('flock')) {
-				$fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
+				$fp = @fopen(Config::get(Config::LOCK_DIRECTORY) . "/$filename", "r");
 				if ($fp) {
 					if (flock($fp, LOCK_EX | LOCK_NB)) {
 						flock($fp, LOCK_UN);
@@ -397,11 +399,11 @@
 	}
 
 	function make_lockfile($filename) {
-		$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+		$fp = fopen(Config::get(Config::LOCK_DIRECTORY) . "/$filename", "w");
 
 		if ($fp && flock($fp, LOCK_EX | LOCK_NB)) {
 			$stat_h = fstat($fp);
-			$stat_f = stat(LOCK_DIRECTORY . "/$filename");
+			$stat_f = stat(Config::get(Config::LOCK_DIRECTORY) . "/$filename");
 
 			if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
 				if ($stat_h["ino"] != $stat_f["ino"] ||
@@ -444,15 +446,15 @@
 	}
 
 	function is_prefix_https() {
-		return parse_url(SELF_URL_PATH, PHP_URL_SCHEME) == 'https';
+		return parse_url(Config::get(Config::SELF_URL_PATH), PHP_URL_SCHEME) == 'https';
 	}
 
-	// this returns SELF_URL_PATH sans ending slash
+	// this returns Config::get(Config::SELF_URL_PATH) sans ending slash
 	function get_self_url_prefix() {
-		if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH)-1) {
-			return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH)-1);
+		if (strrpos(Config::get(Config::SELF_URL_PATH), "/") === strlen(Config::get(Config::SELF_URL_PATH))-1) {
+			return substr(Config::get(Config::SELF_URL_PATH), 0, strlen(Config::get(Config::SELF_URL_PATH))-1);
 		} else {
-			return SELF_URL_PATH;
+			return Config::get(Config::SELF_URL_PATH);
 		}
 	}
 
@@ -467,7 +469,7 @@
 	} // function encrypt_password
 
 	function init_plugins() {
-		PluginHost::getInstance()->load(PLUGINS, PluginHost::KIND_ALL);
+		PluginHost::getInstance()->load(Config::get(Config::PLUGINS), PluginHost::KIND_ALL);
 
 		return true;
 	}
diff --git a/include/login_form.php b/include/login_form.php
index 211302a87..537c7f994 100755
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -79,7 +79,7 @@
     	},
         bwLimitChange: function(elem) {
         	Cookie.set("ttrss_bwlimit", elem.checked,
-				<?php print SESSION_COOKIE_LIFETIME ?>);
+				<?php print Config::get(Config::SESSION_COOKIE_LIFETIME) ?>);
 	    }
     };
 
@@ -122,7 +122,7 @@
 					   onblur="UtilityApp.fetchProfiles()"
 					   value="<?= $_SESSION["fake_password"] ?? "" ?>"/>
 			</fieldset>
-			<?php if (strpos(PLUGINS, "auth_internal") !== false) { ?>
+			<?php if (strpos(Config::get(Config::PLUGINS), "auth_internal") !== false) { ?>
 				<fieldset class="align-right">
 					<a href="public.php?op=forgotpass"><?= __("I forgot my password") ?></a>
 				</fieldset>
@@ -161,7 +161,7 @@
 			<div dojoType="dijit.Tooltip" connectId="safe_mode_label" position="below" style="display:none">
 				<?= __("Uses default theme and prevents all plugins from loading."); ?>
 			</div>
-			<?php if (SESSION_COOKIE_LIFETIME > 0) { ?>
+			<?php if (Config::get(Config::SESSION_COOKIE_LIFETIME) > 0) { ?>
 
 				<fieldset class="narrow">
 					<label> </label>
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 2786f012f..5efd23d98 100755
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -21,7 +21,7 @@
 
 		$sth = $pdo->prepare("SELECT engine, table_name FROM information_schema.tables WHERE
 				table_schema = ? AND table_name LIKE 'ttrss_%' AND engine != 'InnoDB'");
-		$sth->execute([DB_NAME]);
+		$sth->execute([Config::get(Config::DB_NAME)]);
 
 		$bad_tables = [];
 
@@ -44,8 +44,8 @@
 				array_push($errors, "Please copy config.php-dist to config.php");
 			}
 
-			if (strpos(PLUGINS, "auth_") === false) {
-				array_push($errors, "Please enable at least one authentication module via PLUGINS constant in config.php");
+			if (strpos(Config::get(Config::PLUGINS), "auth_") === false) {
+				array_push($errors, "Please enable at least one authentication module via Config::get(Config::PLUGINS) constant in config.php");
 			}
 
 			if (function_exists('posix_getuid') && posix_getuid() == 0) {
@@ -60,43 +60,25 @@
 				array_push($errors, "PHP UConverter class is missing, it's provided by the Internationalization (intl) module.");
 			}
 
-			if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
-				array_push($errors, "Configuration file (config.php) has incorrect version. Update it with new options from config.php-dist and set CONFIG_VERSION to the correct value.");
+			if (!is_writable(Config::get(Config::CACHE_DIR) . "/images")) {
+				array_push($errors, "Image cache is not writable (chmod -R 777 ".Config::get(Config::CACHE_DIR)."/images)");
 			}
 
-			if (!is_writable(CACHE_DIR . "/images")) {
-				array_push($errors, "Image cache is not writable (chmod -R 777 ".CACHE_DIR."/images)");
+			if (!is_writable(Config::get(Config::CACHE_DIR) . "/upload")) {
+				array_push($errors, "Upload cache is not writable (chmod -R 777 ".Config::get(Config::CACHE_DIR)."/upload)");
 			}
 
-			if (!is_writable(CACHE_DIR . "/upload")) {
-				array_push($errors, "Upload cache is not writable (chmod -R 777 ".CACHE_DIR."/upload)");
+			if (!is_writable(Config::get(Config::CACHE_DIR) . "/export")) {
+				array_push($errors, "Data export cache is not writable (chmod -R 777 ".Config::get(Config::CACHE_DIR)."/export)");
 			}
 
-			if (!is_writable(CACHE_DIR . "/export")) {
-				array_push($errors, "Data export cache is not writable (chmod -R 777 ".CACHE_DIR."/export)");
-			}
-
-			require_once "sanity_config.php";
-
-			if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) {
-				array_push($errors,
-					"Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh");
-			}
-
-			foreach (get_required_defines() as $d) {
-				if (!defined($d)) {
-					array_push($errors,
-						"Required configuration file parameter $d is not defined in config.php. You might need to copy it from config.php-dist.");
-				}
-			}
-
-			if (SINGLE_USER_MODE && class_exists("PDO")) {
+			if (Config::get(Config::SINGLE_USER_MODE) && class_exists("PDO")) {
 			    $pdo = Db::pdo();
 
 				$res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");
 
 				if (!$res->fetch()) {
-					array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
+					array_push($errors, "Config::get(Config::SINGLE_USER_MODE) is enabled in config.php but default admin account is not found.");
 				}
 			}
 
@@ -107,17 +89,17 @@
 					$ref_self_url_path = preg_replace("/\w+\.php$/", "", $ref_self_url_path);
 				}
 
-				if (SELF_URL_PATH == "http://example.org/tt-rss/") {
+				if (Config::get(Config::SELF_URL_PATH) == "http://example.org/tt-rss/") {
 					$hint = $ref_self_url_path ? "(possible value: <b>$ref_self_url_path</b>)" : "";
 					array_push($errors,
-							"Please set SELF_URL_PATH to the correct value for your server: $hint");
+							"Please set Config::get(Config::SELF_URL_PATH) to the correct value for your server: $hint");
 				}
 
 				if ($ref_self_url_path &&
 					(!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS) &&
-					SELF_URL_PATH != $ref_self_url_path && SELF_URL_PATH != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path)-1)) {
+					Config::get(Config::SELF_URL_PATH) != $ref_self_url_path && Config::get(Config::SELF_URL_PATH) != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path)-1)) {
 					array_push($errors,
-						"Please set SELF_URL_PATH to the correct value detected for your server: <b>$ref_self_url_path</b> (you're using: <b>" . SELF_URL_PATH . "</b>)");
+						"Please set Config::get(Config::SELF_URL_PATH) to the correct value detected for your server: <b>$ref_self_url_path</b> (you're using: <b>" . Config::get(Config::SELF_URL_PATH) . "</b>)");
 				}
 			}
 
@@ -125,8 +107,8 @@
 				array_push($errors, "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".ICONS_DIR.").\n");
 			}
 
-			if (!is_writable(LOCK_DIRECTORY)) {
-				array_push($errors, "LOCK_DIRECTORY defined in config.php is not writable (chmod -R 777 ".LOCK_DIRECTORY.").\n");
+			if (!is_writable(Config::get(Config::LOCK_DIRECTORY))) {
+				array_push($errors, "Config::get(Config::LOCK_DIRECTORY) defined in config.php is not writable (chmod -R 777 ".Config::get(Config::LOCK_DIRECTORY).").\n");
 			}
 
 			if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
@@ -161,7 +143,7 @@
 				array_push($errors, "PHP support for DOMDocument is required, but was not found.");
 			}
 
-			if (DB_TYPE == "mysql") {
+			if (Config::get(Config::DB_TYPE) == "mysql") {
 				$bad_tables = check_mysql_tables();
 
 				if (count($bad_tables) > 0) {
diff --git a/include/sanity_config.php b/include/sanity_config.php
deleted file mode 100644
index b304adf54..000000000
--- a/include/sanity_config.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php # This file has been generated at:  Mon Feb 22 14:17:27 MSK 2021
-define('GENERATED_CONFIG_CHECK', 26);
-function get_required_defines() { return [ 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'SESSION_COOKIE_LIFETIME', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'CHECK_FOR_UPDATES', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION']; }
diff --git a/include/sessions.php b/include/sessions.php
index 5b372612b..d2fbc6a41 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -5,10 +5,11 @@
 
 	require_once "config.php";
 	require_once "autoload.php";
+	require_once "functions.php";
 	require_once "errorhandler.php";
 	require_once "lib/gettext/gettext.inc.php";
 
-	$session_expire = min(2147483647 - time() - 1, max(SESSION_COOKIE_LIFETIME, 86400));
+	$session_expire = min(2147483647 - time() - 1, max(\Config::get(\Config::SESSION_COOKIE_LIFETIME), 86400));
 	$session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
 
 	if (is_server_https()) {
@@ -37,7 +38,7 @@
 	}
 
 	function validate_session() {
-		if (SINGLE_USER_MODE) return true;
+		if (\Config::get(\Config::SINGLE_USER_MODE)) return true;
 
 		if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) {
 			$_SESSION["login_error_msg"] =
@@ -144,7 +145,7 @@
 		return true;
 	}
 
-	if (!SINGLE_USER_MODE /* && DB_TYPE == "pgsql" */) {
+	if (!\Config::get(\Config::SINGLE_USER_MODE)) {
 		session_set_save_handler('\Sessions\ttrss_open',
 			'\Sessions\ttrss_close', '\Sessions\ttrss_read',
 			'\Sessions\ttrss_write', '\Sessions\ttrss_destroy',
diff --git a/index.php b/index.php
index eec54c55b..8ba401c2d 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,5 @@
 <?php
+
 	if (!file_exists("config.php")) {
 		print "<b>Fatal Error</b>: You forgot to copy
 		<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
@@ -16,6 +17,7 @@
 		get_include_path());
 
 	require_once "autoload.php";
+
 	require_once "sessions.php";
 	require_once "functions.php";
 	require_once "sanity_check.php";
diff --git a/phpstan.neon b/phpstan.neon
index b2cd978d8..ba425e3d9 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,7 +1,7 @@
 parameters:
    level: 5
    ignoreErrors:
-      - '#Constant.*not found#'
+#      - '#Constant.*not found#'
       - '#Comparison operation ">" between int<1, max> and 0 is always true.#'
       - '#Access to an undefined property DOMNode::\$tagName.#'
       - '#Call to an undefined method DOMNode::(get|remove|set)Attribute.#'
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 3b7ed6b14..5611d8998 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -134,7 +134,7 @@ class Af_Psql_Trgm extends Plugin {
 			title="<i class='material-icons'>extension</i> <?= __('Mark similar articles as read (af_psql_trgm)') ?>">
 
 			<?php
-			if (DB_TYPE != "pgsql") {
+			if (Config::get(Config::DB_TYPE) != "pgsql") {
 				print_error("Database type not supported.");
 			} else {
 				$res = $this->pdo->query("select 'similarity'::regproc");
@@ -258,7 +258,7 @@ class Af_Psql_Trgm extends Plugin {
 
 	function hook_article_filter($article) {
 
-		if (DB_TYPE != "pgsql") return $article;
+		if (Config::get(Config::DB_TYPE) != "pgsql") return $article;
 
 		$res = $this->pdo->query("select 'similarity'::regproc");
 		if (!$res || !$res->fetch()) return $article;
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 713eaea5c..9cd046ba4 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -530,7 +530,7 @@ class Af_RedditImgur extends Plugin {
 						$entry_guid = $article["guid_hashed"];
 						$owner_uid = $article["owner_uid"];
 
-						if (DB_TYPE == "pgsql") {
+						if (Config::get(Config::DB_TYPE) == "pgsql") {
 							$interval_qpart = "date_entered < NOW() - INTERVAL '1 day'";
 						} else {
 							$interval_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY)";
diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php
index 6a68534ea..13a7bc969 100644
--- a/plugins/auth_internal/init.php
+++ b/plugins/auth_internal/init.php
@@ -244,7 +244,7 @@ class Auth_Internal extends Auth_Base {
 				$tpl->readTemplateFromFile("password_change_template.txt");
 
 				$tpl->setVariable('LOGIN', $row["login"]);
-				$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+				$tpl->setVariable('TTRSS_HOST', Config::get(Config::SELF_URL_PATH));
 
 				$tpl->addBlock('message');
 
diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php
index caa8b39df..967918823 100644
--- a/plugins/bookmarklets/init.php
+++ b/plugins/bookmarklets/init.php
@@ -21,7 +21,7 @@ class Bookmarklets extends Plugin {
 	}
 
 	function subscribe() {
-		if (SINGLE_USER_MODE) {
+		if (Config::get(Config::SINGLE_USER_MODE)) {
 			UserHelper::login_sequence();
 		}
 
@@ -172,7 +172,7 @@ class Bookmarklets extends Plugin {
 	}
 
 	function sharepopup() {
-		if (SINGLE_USER_MODE) {
+		if (Config::get(Config::SINGLE_USER_MODE)) {
 			UserHelper::login_sequence();
 		}
 
diff --git a/update.php b/update.php
index ab6272c83..4aff4a774 100755
--- a/update.php
+++ b/update.php
@@ -14,7 +14,7 @@
 	require_once "db-prefs.php";
 
 	function make_stampfile($filename) {
-		$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+		$fp = fopen(Config::get(Config::LOCK_DIRECTORY) . "/$filename", "w");
 
 		if (flock($fp, LOCK_EX | LOCK_NB)) {
 			fwrite($fp, time() . "\n");
@@ -30,9 +30,9 @@
 
 		$days = (int) $days;
 
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 			$interval_query = "date_updated < NOW() - INTERVAL '$days days'";
-		} else /*if (DB_TYPE == "mysql") */ {
+		} else /*if (Config::get(Config::DB_TYPE) == "mysql") */ {
 			$interval_query = "date_updated < DATE_SUB(NOW(), INTERVAL $days DAY)";
 		}
 
@@ -224,7 +224,7 @@
 			$log = isset($options['log']) ? '--log '.$options['log'] : '';
 			$log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : '';
 
-			passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
+			passthru(Config::get(Config::PHP_EXECUTABLE) . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
 
 			// let's enforce a minimum spawn interval as to not forkbomb the host
 			$spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
@@ -277,7 +277,7 @@
 
 		Debug::log("clearing existing indexes...");
 
-		if (DB_TYPE == "pgsql") {
+		if (Config::get(Config::DB_TYPE) == "pgsql") {
 			$sth = $pdo->query( "SELECT relname FROM
 				pg_catalog.pg_class WHERE relname LIKE 'ttrss_%'
 					AND relname NOT LIKE '%_pkey'
@@ -288,7 +288,7 @@
 		}
 
 		while ($line = $sth->fetch()) {
-			if (DB_TYPE == "pgsql") {
+			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$statement = "DROP INDEX " . $line["relname"];
 				Debug::log($statement);
 			} else {
@@ -299,9 +299,9 @@
 			$pdo->query($statement);
 		}
 
-		Debug::log("reading indexes from schema for: " . DB_TYPE);
+		Debug::log("reading indexes from schema for: " . Config::get(Config::DB_TYPE));
 
-		$fp = fopen("schema/ttrss_schema_" . DB_TYPE . ".sql", "r");
+		$fp = fopen("schema/ttrss_schema_" . Config::get(Config::DB_TYPE) . ".sql", "r");
 		if ($fp) {
 			while ($line = fgets($fp)) {
 				$matches = array();
@@ -375,14 +375,14 @@
 	}
 
 	if (isset($options["update-schema"])) {
-		Debug::log("Checking for updates (" . DB_TYPE . ")...");
+		Debug::log("Checking for updates (" . Config::get(Config::DB_TYPE) . ")...");
 
-		$updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION);
+		$updater = new DbUpdater(Db::pdo(), Config::get(Config::DB_TYPE), SCHEMA_VERSION);
 
 		if ($updater->is_update_required()) {
 			Debug::log("Schema update required, version " . $updater->get_schema_version() . " to " . SCHEMA_VERSION);
 
-			if (DB_TYPE == "mysql")
+			if (Config::get(Config::DB_TYPE) == "mysql")
 				Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
 					"Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
 			else
@@ -460,7 +460,7 @@
 	if (isset($options["list-plugins"])) {
 		$tmppluginhost = new PluginHost();
 		$tmppluginhost->load_all($tmppluginhost::KIND_ALL);
-		$enabled = array_map("trim", explode(",", PLUGINS));
+		$enabled = array_map("trim", explode(",", Config::get(Config::PLUGINS)));
 
 		echo "List of all available plugins:\n";
 
@@ -515,8 +515,8 @@
 
 	PluginHost::getInstance()->run_commands($options);
 
-	if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
+	if (file_exists(Config::get(Config::LOCK_DIRECTORY) . "/$lock_filename"))
 		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
 			fclose($lock_handle);
-		unlink(LOCK_DIRECTORY . "/$lock_filename");
+		unlink(Config::get(Config::LOCK_DIRECTORY) . "/$lock_filename");
 ?>
diff --git a/update_daemon2.php b/update_daemon2.php
index 5d4d3759c..b67fba37d 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -98,9 +98,9 @@
 
 	function shutdown($caller_pid) {
 		if ($caller_pid == posix_getpid()) {
-			if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+			if (file_exists(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon.lock")) {
 				Debug::log("Removing lockfile (master)...");
-				unlink(LOCK_DIRECTORY . "/update_daemon.lock");
+				unlink(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon.lock");
 			}
 		}
 	}
@@ -108,9 +108,9 @@
 	function task_shutdown() {
 		$pid = posix_getpid();
 
-		if (file_exists(LOCK_DIRECTORY . "/update_daemon-$pid.lock")) {
+		if (file_exists(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon-$pid.lock")) {
 			Debug::log("Removing task lockfile for PID $pid...");
-			unlink(LOCK_DIRECTORY . "/update_daemon-$pid.lock");
+			unlink(Config::get(Config::LOCK_DIRECTORY) . "/update_daemon-$pid.lock");
 		}
 	}
 
@@ -249,7 +249,7 @@
 
 					$my_pid = posix_getpid();
 
-					passthru(PHP_EXECUTABLE . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
+					passthru(Config::get(Config::PHP_EXECUTABLE) . " update.php --daemon-loop $quiet $log --task $j --pidlock $my_pid");
 
 					sleep(1);
 
diff --git a/utils/regen_config_checks.sh b/utils/regen_config_checks.sh
deleted file mode 100755
index b20ce0480..000000000
--- a/utils/regen_config_checks.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-DESTINATION="include/sanity_config.php"
-
-echo "<?php # This file has been generated at: " `date` > $DESTINATION
-
-echo -n "define('GENERATED_CONFIG_CHECK', " >> $DESTINATION
-grep CONFIG_VERSION config.php-dist | awk -F ' |\)' '{ print $2 }' | xargs echo -n >> $DESTINATION
-echo ");" >> $DESTINATION
-
-echo -n "function get_required_defines() { return [ " >> $DESTINATION
-
-grep define\( config.php-dist | awk -F\' '{ print "*" $2 "*," }' | grep -v DB_PORT | xargs echo -n | sed -e s/,$// -e s/*/\'/g >> $DESTINATION
-
-echo "]; }" >> $DESTINATION
-
-
-- 
cgit v1.2.3-54-g00ecf

From 211f699aa0c4211e4ee8a02446d51b9811d0c28c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 22 Feb 2021 22:35:27 +0300
Subject: migrate the rest into Config::

(limited to 'classes/pref/feeds.php')

diff --git a/classes/config.php b/classes/config.php
index 8a7470135..349706390 100644
--- a/classes/config.php
+++ b/classes/config.php
@@ -1,98 +1,134 @@
 <?php
 class Config {
+	private const _ENVVAR_PREFIX = "TTRSS_";
 
-   const DB_TYPE = "DB_TYPE";
-   const DB_HOST = "DB_HOST";
-   const DB_USER = "DB_USER";
-   const DB_NAME = "DB_NAME";
-   const DB_PASS = "DB_PASS";
-   const DB_PORT = "DB_PORT";
-   const MYSQL_CHARSET = "MYSQL_CHARSET";
-   const SELF_URL_PATH = "SELF_URL_PATH";
-   const SINGLE_USER_MODE = "SINGLE_USER_MODE";
-   const SIMPLE_UPDATE_MODE = "SIMPLE_UPDATE_MODE";
-   const PHP_EXECUTABLE = "PHP_EXECUTABLE";
-   const LOCK_DIRECTORY = "LOCK_DIRECTORY";
-   const CACHE_DIR = "CACHE_DIR";
-   const ICONS_DIR = "ICONS_DIR";
-   const ICONS_URL = "ICONS_URL";
-   const AUTH_AUTO_CREATE = "AUTH_AUTO_CREATE";
-   const AUTH_AUTO_LOGIN = "AUTH_AUTO_LOGIN";
-   const FORCE_ARTICLE_PURGE = "FORCE_ARTICLE_PURGE";
-   const ENABLE_REGISTRATION = "ENABLE_REGISTRATION";
-   const SESSION_COOKIE_LIFETIME = "SESSION_COOKIE_LIFETIME";
-   const SMTP_FROM_NAME = "SMTP_FROM_NAME";
-   const SMTP_FROM_ADDRESS = "SMTP_FROM_ADDRESS";
-   const DIGEST_SUBJECT = "DIGEST_SUBJECT";
-   const CHECK_FOR_UPDATES = "CHECK_FOR_UPDATES";
-   const PLUGINS = "PLUGINS";
-   const LOG_DESTINATION = "LOG_DESTINATION";
+	/* overriding defaults (defined below in _DEFAULTS[]) via environment: DB_TYPE becomes TTRSS_DB_TYPE, etc */
 
-   private const _DEFAULTS = [
-      Config::DB_TYPE => "pgsql",
-      Config::DB_HOST => "db",
-      Config::DB_USER => "",
-      Config::DB_NAME => "",
-      Config::DB_PASS => "",
-      Config::DB_PORT => "5432",
-      Config::MYSQL_CHARSET => "UTF8",
-      Config::SELF_URL_PATH => "",
-      Config::SINGLE_USER_MODE => "",
-      Config::SIMPLE_UPDATE_MODE => "",
-      Config::PHP_EXECUTABLE => "/usr/bin/php",
-      Config::LOCK_DIRECTORY => "lock",
-      Config::CACHE_DIR => "cache",
-      Config::ICONS_DIR => "feed-icons",
-      Config::ICONS_URL => "feed-icons",
-      Config::AUTH_AUTO_CREATE => "true",
-      Config::AUTH_AUTO_LOGIN => "true",
-      Config::FORCE_ARTICLE_PURGE => 0,
-      Config::ENABLE_REGISTRATION => "",
-      Config::SESSION_COOKIE_LIFETIME => 86400,
-      Config::SMTP_FROM_NAME => "Tiny Tiny RSS",
-      Config::SMTP_FROM_ADDRESS => "noreply@localhost",
-      Config::DIGEST_SUBJECT => "[tt-rss] New headlines for last 24 hours",
-      Config::CHECK_FOR_UPDATES => "true",
-      Config::PLUGINS => "auth_internal",
-      Config::LOG_DESTINATION => "sql",
-   ];
+	const DB_TYPE = "DB_TYPE";
+	const DB_HOST = "DB_HOST";
+	const DB_USER = "DB_USER";
+	const DB_NAME = "DB_NAME";
+	const DB_PASS = "DB_PASS";
+	const DB_PORT = "DB_PORT";
+	const MYSQL_CHARSET = "MYSQL_CHARSET";
+	const SELF_URL_PATH = "SELF_URL_PATH";
+	const SINGLE_USER_MODE = "SINGLE_USER_MODE";
+	const SIMPLE_UPDATE_MODE = "SIMPLE_UPDATE_MODE";
+	const PHP_EXECUTABLE = "PHP_EXECUTABLE";
+	const LOCK_DIRECTORY = "LOCK_DIRECTORY";
+	const CACHE_DIR = "CACHE_DIR";
+	const ICONS_DIR = "ICONS_DIR";
+	const ICONS_URL = "ICONS_URL";
+	const AUTH_AUTO_CREATE = "AUTH_AUTO_CREATE";
+	const AUTH_AUTO_LOGIN = "AUTH_AUTO_LOGIN";
+	const FORCE_ARTICLE_PURGE = "FORCE_ARTICLE_PURGE";
+	const ENABLE_REGISTRATION = "ENABLE_REGISTRATION";
+	const SESSION_COOKIE_LIFETIME = "SESSION_COOKIE_LIFETIME";
+	const SMTP_FROM_NAME = "SMTP_FROM_NAME";
+	const SMTP_FROM_ADDRESS = "SMTP_FROM_ADDRESS";
+	const DIGEST_SUBJECT = "DIGEST_SUBJECT";
+	const CHECK_FOR_UPDATES = "CHECK_FOR_UPDATES";
+	const PLUGINS = "PLUGINS";
+	const LOG_DESTINATION = "LOG_DESTINATION";
+	const LOCAL_OVERRIDE_STYLESHEET = "LOCAL_OVERRIDE_STYLESHEET";
+	const DAEMON_MAX_CHILD_RUNTIME = "DAEMON_MAX_CHILD_RUNTIME";
+	const DAEMON_MAX_JOBS = "DAEMON_MAX_JOBS";
+	const FEED_FETCH_TIMEOUT = "FEED_FETCH_TIMEOUT";
+	const FEED_FETCH_NO_CACHE_TIMEOUT = "FEED_FETCH_NO_CACHE_TIMEOUT";
+	const FILE_FETCH_TIMEOUT = "FILE_FETCH_TIMEOUT";
+	const FILE_FETCH_CONNECT_TIMEOUT = "FILE_FETCH_CONNECT_TIMEOUT";
+	const DAEMON_UPDATE_LOGIN_LIMIT = "DAEMON_UPDATE_LOGIN_LIMIT";
+	const DAEMON_FEED_LIMIT = "DAEMON_FEED_LIMIT";
+	const DAEMON_SLEEP_INTERVAL = "DAEMON_SLEEP_INTERVAL";
+	const MAX_CACHE_FILE_SIZE = "MAX_CACHE_FILE_SIZE";
+	const MAX_DOWNLOAD_FILE_SIZE = "MAX_DOWNLOAD_FILE_SIZE";
+	const MAX_FAVICON_FILE_SIZE = "MAX_FAVICON_FILE_SIZE";
+	const CACHE_MAX_DAYS = "CACHE_MAX_DAYS";
+	const MAX_CONDITIONAL_INTERVAL = "MAX_CONDITIONAL_INTERVAL";
+	const DAEMON_UNSUCCESSFUL_DAYS_LIMIT = "DAEMON_UNSUCCESSFUL_DAYS_LIMIT";
+	const LOG_SENT_MAIL = "LOG_SENT_MAIL";
 
-   private const _ENVVAR_PREFIX = "TTRSS_";
-   private static $instance;
+	private const _DEFAULTS = [
+		Config::DB_TYPE => "pgsql",
+		Config::DB_HOST => "db",
+		Config::DB_USER => "",
+		Config::DB_NAME => "",
+		Config::DB_PASS => "",
+		Config::DB_PORT => "5432",
+		Config::MYSQL_CHARSET => "UTF8",
+		Config::SELF_URL_PATH => "",
+		Config::SINGLE_USER_MODE => "",
+		Config::SIMPLE_UPDATE_MODE => "",
+		Config::PHP_EXECUTABLE => "/usr/bin/php",
+		Config::LOCK_DIRECTORY => "lock",
+		Config::CACHE_DIR => "cache",
+		Config::ICONS_DIR => "feed-icons",
+		Config::ICONS_URL => "feed-icons",
+		Config::AUTH_AUTO_CREATE => "true",
+		Config::AUTH_AUTO_LOGIN => "true",
+		Config::FORCE_ARTICLE_PURGE => 0,
+		Config::ENABLE_REGISTRATION => "",
+		Config::SESSION_COOKIE_LIFETIME => 86400,
+		Config::SMTP_FROM_NAME => "Tiny Tiny RSS",
+		Config::SMTP_FROM_ADDRESS => "noreply@localhost",
+		Config::DIGEST_SUBJECT => "[tt-rss] New headlines for last 24 hours",
+		Config::CHECK_FOR_UPDATES => "true",
+		Config::PLUGINS => "auth_internal",
+		Config::LOG_DESTINATION => "sql",
+		Config::LOCAL_OVERRIDE_STYLESHEET => "local-overrides.css",
+		Config::DAEMON_MAX_CHILD_RUNTIME => 1800,
+		Config::DAEMON_MAX_JOBS => 2,
+		Config::FEED_FETCH_TIMEOUT => 45,
+		Config::FEED_FETCH_NO_CACHE_TIMEOUT => 15,
+		Config::FILE_FETCH_TIMEOUT => 45,
+		Config::FILE_FETCH_CONNECT_TIMEOUT => 15,
+		Config::DAEMON_UPDATE_LOGIN_LIMIT => 30,
+		Config::DAEMON_FEED_LIMIT => 500,
+		Config::DAEMON_SLEEP_INTERVAL => 120,
+		Config::MAX_CACHE_FILE_SIZE => 64*1024*1024,
+		Config::MAX_DOWNLOAD_FILE_SIZE => 16*1024*1024,
+		Config::MAX_FAVICON_FILE_SIZE => 1*1024*1024,
+		Config::CACHE_MAX_DAYS => 7,
+		Config::MAX_CONDITIONAL_INTERVAL => 3600*12,
+		Config::DAEMON_UNSUCCESSFUL_DAYS_LIMIT => 30,
+		Config::LOG_SENT_MAIL => "",
+	];
 
-   private $params = [];
+	private static $instance;
 
-   public static function get_instance() {
+	private $params = [];
+
+	public static function get_instance() {
 		if (self::$instance == null)
 			self::$instance = new self();
 
 		return self::$instance;
 	}
 
-   function __construct() {
-      $ref = new ReflectionClass(get_class($this));
+	function __construct() {
+		$ref = new ReflectionClass(get_class($this));
 
-      foreach ($ref->getConstants() as $const => $cvalue) {
-         if (strpos($const, "_") !== 0) {
-            $override = getenv($this::_ENVVAR_PREFIX . $const);
+		foreach ($ref->getConstants() as $const => $cvalue) {
+			if (strpos($const, "_") !== 0) {
+				$override = getenv($this::_ENVVAR_PREFIX . $const);
 
-            if (!empty($override)) {
-               $this->params[$cvalue] = $override;
-            } else {
-               $this->params[$cvalue] = $this::_DEFAULTS[$const];
-            }
-         }
-      }
-   }
+				if (!empty($override)) {
+					$this->params[$cvalue] = $override;
+				} else {
+					$this->params[$cvalue] = $this::_DEFAULTS[$const];
+				}
+			}
+		}
+	}
 
-   private function _get($param) {
-      return $this->params[$param];
-   }
+	private function _get($param) {
+		return $this->params[$param];
+	}
 
-   static function get($param) {
-      $instance = self::get_instance();
+	static function get($param) {
+		$instance = self::get_instance();
 
-      return $instance->_get($param);
-   }
+		return $instance->_get($param);
+	}
 
 }
\ No newline at end of file
diff --git a/classes/db.php b/classes/db.php
index 1ccaa3533..5196e7c7d 100755
--- a/classes/db.php
+++ b/classes/db.php
@@ -41,8 +41,8 @@ class Db
 		} else if (Config::get(Config::DB_TYPE) == "mysql") {
 			$pdo->query("SET time_zone = '+0:0'");
 
-			if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-				$pdo->query("SET NAMES " . MYSQL_CHARSET);
+			if (defined('Config::get(Config::MYSQL_CHARSET)') && Config::get(Config::MYSQL_CHARSET)) {
+				$pdo->query("SET NAMES " . Config::get(Config::MYSQL_CHARSET));
 			}
 		}
 
diff --git a/classes/digest.php b/classes/digest.php
index 9ac3f6a17..a6a0c47de 100644
--- a/classes/digest.php
+++ b/classes/digest.php
@@ -48,11 +48,11 @@ class Digest
 
 						$mailer = new Mailer();
 
-						//$rc = $mail->quickMail($line["email"], $line["login"], DIGEST_SUBJECT, $digest, $digest_text);
+						//$rc = $mail->quickMail($line["email"], $line["login"], Config::get(Config::DIGEST_SUBJECT), $digest, $digest_text);
 
 						$rc = $mailer->mail(["to_name" => $line["login"],
 							"to_address" => $line["email"],
-							"subject" => DIGEST_SUBJECT,
+							"subject" => Config::get(Config::DIGEST_SUBJECT),
 							"message" => $digest_text,
 							"message_html" => $digest]);
 
@@ -91,11 +91,11 @@ class Digest
 
 		$tpl->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
 		$tpl->setVariable('CUR_TIME', date('G:i', $local_ts));
-		$tpl->setVariable('TTRSS_HOST', Config::get(Config.Config::get(Config::SELF_URL_PATH)));
+		$tpl->setVariable('TTRSS_HOST', Config::get(Config::get(Config::SELF_URL_PATH)));
 
 		$tpl_t->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
 		$tpl_t->setVariable('CUR_TIME', date('G:i', $local_ts));
-		$tpl_t->setVariable('TTRSS_HOST', Config::get(Config.Config::get(Config::SELF_URL_PATH)));
+		$tpl_t->setVariable('TTRSS_HOST', Config::get(Config::get(Config::SELF_URL_PATH)));
 
 		$affected_ids = array();
 
diff --git a/classes/diskcache.php b/classes/diskcache.php
index 063a3847c..9c594acc5 100644
--- a/classes/diskcache.php
+++ b/classes/diskcache.php
@@ -349,7 +349,7 @@ class DiskCache {
 
 				if ($files) {
 					foreach ($files as $file) {
-						if (time() - filemtime($file) > 86400*CACHE_MAX_DAYS) {
+						if (time() - filemtime($file) > 86400*Config::get(Config::CACHE_MAX_DAYS)) {
 							unlink($file);
 
 							++$num_deleted;
diff --git a/classes/feeds.php b/classes/feeds.php
index 274cb22d0..eaedc1aee 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1056,11 +1056,11 @@ class Feeds extends Handler_Protected {
 	}
 
 	static function _get_icon_file($feed_id) {
-		return ICONS_DIR . "/$feed_id.ico";
+		return Config::get(Config::ICONS_DIR) . "/$feed_id.ico";
 	}
 
 	static function _has_icon($id) {
-		return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0;
+		return is_file(Config::get(Config::ICONS_DIR) . "/$id.ico") && filesize(Config::get(Config::ICONS_DIR) . "/$id.ico") > 0;
 	}
 
 	static function _get_icon($id) {
@@ -1084,7 +1084,7 @@ class Feeds extends Handler_Protected {
 					$icon = self::_get_icon_file($id);
 
                     if ($icon && file_exists($icon)) {
-						return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
+						return Config::get(Config::ICONS_URL) . "/" . basename($icon) . "?" . filemtime($icon);
 					}
 				}
 				break;
diff --git a/classes/logger.php b/classes/logger.php
index cdc6b240a..6cc33314d 100755
--- a/classes/logger.php
+++ b/classes/logger.php
@@ -42,7 +42,7 @@ class Logger {
 	}
 
 	function __construct() {
-		switch (LOG_DESTINATION) {
+		switch (Config::get(Config::LOG_DESTINATION)) {
 		case "sql":
 			$this->adapter = new Logger_SQL();
 			break;
diff --git a/classes/mailer.php b/classes/mailer.php
index 16be16523..93f778210 100644
--- a/classes/mailer.php
+++ b/classes/mailer.php
@@ -11,15 +11,15 @@ class Mailer {
 		$subject = $params["subject"];
 		$message = $params["message"];
 		$message_html = $params["message_html"];
-		$from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME;
-		$from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS;
+		$from_name = $params["from_name"] ? $params["from_name"] : Config::get(Config::SMTP_FROM_NAME);
+		$from_address = $params["from_address"] ? $params["from_address"] : Config::get(Config::SMTP_FROM_ADDRESS);
 
 		$additional_headers = $params["headers"] ? $params["headers"] : [];
 
 		$from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
 		$to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
 
-		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL)
+		if (Config::get(Config::LOG_SENT_MAIL))
 			Logger::get()->log(E_USER_NOTICE, "Sending mail from $from_combined to $to_combined [$subject]: $message");
 
 		// HOOK_SEND_MAIL plugin instructions:
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 229effeb3..7c3a40647 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -441,7 +441,7 @@ class Pref_Feeds extends Handler_Protected {
 		$sth->execute([$feed_id, $_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
-			@unlink(ICONS_DIR . "/$feed_id.ico");
+			@unlink(Config::get(Config::ICONS_DIR) . "/$feed_id.ico");
 
 			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL, favicon_last_checked = '1970-01-01'
 				where id = ?");
@@ -479,7 +479,7 @@ class Pref_Feeds extends Handler_Protected {
 				$sth->execute([$feed_id, $_SESSION['uid']]);
 
 				if ($row = $sth->fetch()) {
-					$new_filename = ICONS_DIR . "/$feed_id.ico";
+					$new_filename = Config::get(Config::ICONS_DIR) . "/$feed_id.ico";
 
 					if (file_exists($new_filename)) unlink($new_filename);
 
@@ -1228,8 +1228,8 @@ class Pref_Feeds extends Handler_Protected {
 
 			$pdo->commit();
 
-			if (file_exists(ICONS_DIR . "/$id.ico")) {
-				unlink(ICONS_DIR . "/$id.ico");
+			if (file_exists(Config::get(Config::ICONS_DIR) . "/$id.ico")) {
+				unlink(Config::get(Config::ICONS_DIR) . "/$id.ico");
 			}
 
 		} else {
diff --git a/classes/pref/system.php b/classes/pref/system.php
index bc519a321..35c776463 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -153,10 +153,10 @@ class Pref_System extends Handler_Administrative {
 		<div dojoType='dijit.layout.AccordionContainer' region='center'>
 			<div dojoType='dijit.layout.AccordionPane' style='padding : 0' title='<i class="material-icons">report</i> <?= __('Event Log') ?>'>
 				<?php
-					if (LOG_DESTINATION == "sql") {
+					if (Config::get(Config::LOG_DESTINATION) == "sql") {
 						$this->_log_viewer($page, $severity);
 					} else {
-						print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging.");
+						print_notice("Please set Config::get(Config::LOG_DESTINATION) to 'sql' in config.php to enable database logging.");
 					}
 				?>
 			</div>
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 5ac6a7990..f30abe001 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -86,7 +86,7 @@ class Pref_Users extends Handler_Administrative {
 					<?php while ($row = $sth->fetch()) { ?>
 						<li>
 							<?php
-								$icon_file = ICONS_URL . "/" . $row["id"] . ".ico";
+								$icon_file = Config::get(Config::ICONS_URL) . "/" . $row["id"] . ".ico";
 								$icon = file_exists($icon_file) ? $icon_file : "images/blank_icon.gif";
 							?>
 
diff --git a/classes/rpc.php b/classes/rpc.php
index bf24132b0..4aa3f69d5 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -165,8 +165,9 @@ class RPC extends Handler_Protected {
 	function setpanelmode() {
 		$wide = (int) clean($_REQUEST["wide"]);
 
+		// FIXME should this use SESSION_COOKIE_LIFETIME and be renewed periodically?
 		setcookie("ttrss_widescreen", (string)$wide,
-			time() + COOKIE_LIFETIME_LONG);
+			time() + 86400*365);
 
 		print json_encode(array("wide" => $wide));
 	}
@@ -328,7 +329,7 @@ class RPC extends Handler_Protected {
 
 		get_version($git_commit, $git_timestamp);
 
-		if (defined('CHECK_FOR_UPDATES') && CHECK_FOR_UPDATES && $_SESSION["access_level"] >= 10 && $git_timestamp) {
+		if (defined('Config::get(Config::CHECK_FOR_UPDATES)') && Config::get(Config::CHECK_FOR_UPDATES) && $_SESSION["access_level"] >= 10 && $git_timestamp) {
 			$content = @UrlHelper::fetch(["url" => "https://tt-rss.org/version.json"]);
 
 			if ($content) {
@@ -359,8 +360,8 @@ class RPC extends Handler_Protected {
 		}
 
 		$params["safe_mode"] = !empty($_SESSION["safe_mode"]);
-		$params["check_for_updates"] = CHECK_FOR_UPDATES;
-		$params["icons_url"] = ICONS_URL;
+		$params["check_for_updates"] = Config::get(Config::CHECK_FOR_UPDATES);
+		$params["icons_url"] = Config::get(Config::ICONS_URL);
 		$params["cookie_lifetime"] = Config::get(Config::SESSION_COOKIE_LIFETIME);
 		$params["default_view_mode"] = get_pref("_DEFAULT_VIEW_MODE");
 		$params["default_view_limit"] = (int) get_pref("_DEFAULT_VIEW_LIMIT");
@@ -390,15 +391,10 @@ class RPC extends Handler_Protected {
 		$params["self_url_prefix"] = get_self_url_prefix();
 		$params["max_feed_id"] = (int) $max_feed_id;
 		$params["num_feeds"] = (int) $num_feeds;
-
 		$params["hotkeys"] = $this->get_hotkeys_map();
-
 		$params["widescreen"] = (int) ($_COOKIE["ttrss_widescreen"] ?? 0);
-
-		$params['simple_update'] = SIMPLE_UPDATE_MODE;
-
+		$params['simple_update'] = Config::get(Config::SIMPLE_UPDATE_MODE);
 		$params["icon_indicator_white"] = $this->image_to_base64("images/indicator_white.gif");
-
 		$params["labels"] = Labels::get_all($_SESSION["uid"]);
 
 		return $params;
@@ -432,7 +428,7 @@ class RPC extends Handler_Protected {
 		$data['cdm_expanded'] = get_pref('CDM_EXPANDED');
 		$data["labels"] = Labels::get_all($_SESSION["uid"]);
 
-		if (LOG_DESTINATION == 'sql' && $_SESSION['access_level'] >= 10) {
+		if (Config::get(Config::LOG_DESTINATION) == 'sql' && $_SESSION['access_level'] >= 10) {
 			if (Config::get(Config::DB_TYPE) == 'pgsql') {
 				$log_interval = "created_at > NOW() - interval '1 hour'";
 			} else {
diff --git a/classes/rssutils.php b/classes/rssutils.php
index c951003f0..5dcbb48d6 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -34,9 +34,9 @@ class RSSUtils {
 		$pdo = Db::pdo();
 		$sth = $pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ?");
 
-		// check icon files once every CACHE_MAX_DAYS days
-		$icon_files = array_filter(glob(ICONS_DIR . "/*.ico"),
-			function($f) { return filemtime($f) < time() - 86400*CACHE_MAX_DAYS; });
+		// check icon files once every Config::get(Config::CACHE_MAX_DAYS) days
+		$icon_files = array_filter(glob(Config::get(Config::ICONS_DIR) . "/*.ico"),
+			function($f) { return filemtime($f) < time() - 86400 * Config::get(Config::CACHE_MAX_DAYS); });
 
 		foreach ($icon_files as $icon) {
 			$feed_id = basename($icon, ".ico");
@@ -52,20 +52,22 @@ class RSSUtils {
 		}
 	}
 
-	static function update_daemon_common($limit = DAEMON_FEED_LIMIT, $options = []) {
+	static function update_daemon_common($limit = null, $options = []) {
 		$schema_version = get_schema_version();
 
+		if (!$limit) $limit = Config::get(Config::DAEMON_FEED_LIMIT);
+
 		if ($schema_version != SCHEMA_VERSION) {
 			die("Schema version is wrong, please upgrade the database.\n");
 		}
 
 		$pdo = Db::pdo();
 
-		if (!Config::get(Config::SINGLE_USER_MODE) && DAEMON_UPDATE_LOGIN_LIMIT > 0) {
+		if (!Config::get(Config::SINGLE_USER_MODE) && Config::get(Config::DAEMON_UPDATE_LOGIN_LIMIT) > 0) {
 			if (Config::get(Config::DB_TYPE) == "pgsql") {
-				$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
+				$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".Config::get(Config::DAEMON_UPDATE_LOGIN_LIMIT)." days'";
 			} else {
-				$login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
+				$login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".Config::get(Config::DAEMON_UPDATE_LOGIN_LIMIT)." DAY)";
 			}
 		} else {
 			$login_thresh_qpart = "";
@@ -288,7 +290,7 @@ class RSSUtils {
 			if (!$basic_info) {
 				$feed_data = UrlHelper::fetch($fetch_url, false,
 					$auth_login, $auth_pass, false,
-					FEED_FETCH_TIMEOUT,
+					Config::get(Config::FEED_FETCH_TIMEOUT),
 					0);
 
 				$feed_data = trim($feed_data);
@@ -455,7 +457,7 @@ class RSSUtils {
 				Debug::log("not using CURL due to open_basedir restrictions", Debug::$LOG_VERBOSE);
 			}
 
-			if (time() - strtotime($last_unconditional) > MAX_CONDITIONAL_INTERVAL) {
+			if (time() - strtotime($last_unconditional) > Config::get(Config::MAX_CONDITIONAL_INTERVAL)) {
 				Debug::log("maximum allowed interval for conditional requests exceeded, forcing refetch", Debug::$LOG_VERBOSE);
 
 				$force_refetch = true;
@@ -469,7 +471,7 @@ class RSSUtils {
 				"url" => $fetch_url,
 				"login" => $auth_login,
 				"pass" => $auth_pass,
-				"timeout" => $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
+				"timeout" => $no_cache ? Config::get(Config::FEED_FETCH_NO_CACHE_TIMEOUT) : Config::get(Config::FEED_FETCH_TIMEOUT),
 				"last_modified" => $force_refetch ? "" : $stored_last_modified
 			]);
 
@@ -591,7 +593,7 @@ class RSSUtils {
 				/* terrible hack: if we crash on floicon shit here, we won't check
 				 * the icon avgcolor again (unless the icon got updated) */
 
-				$favicon_file = ICONS_DIR . "/$feed.ico";
+				$favicon_file = Config::get(Config::ICONS_DIR) . "/$feed.ico";
 				$favicon_modified = file_exists($favicon_file) ? filemtime($favicon_file) : -1;
 
 				Debug::log("checking favicon for feed $feed...", Debug::$LOG_VERBOSE);
@@ -755,7 +757,7 @@ class RSSUtils {
 							$e->type, $e->length, $e->title, $e->width, $e->height);
 
 						// Yet another episode of "mysql utf8_general_ci is gimped"
-						if (Config::get(Config::DB_TYPE) == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
+						if (Config::get(Config::DB_TYPE) == "mysql" && Config::get(Config::MYSQL_CHARSET) != "UTF8MB4") {
 							for ($i = 0; $i < count($e_item); $i++) {
 								if (is_string($e_item[$i])) {
 									$e_item[$i] = self::strip_utf8mb4($e_item[$i]);
@@ -833,7 +835,7 @@ class RSSUtils {
 				Debug::log("plugin data: $entry_plugin_data", Debug::$LOG_VERBOSE);
 
 				// Workaround: 4-byte unicode requires utf8mb4 in MySQL. See https://tt-rss.org/forum/viewtopic.php?f=1&t=3377&p=20077#p20077
-				if (Config::get(Config::DB_TYPE) == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
+				if (Config::get(Config::DB_TYPE) == "mysql" && Config::get(Config::MYSQL_CHARSET) != "UTF8MB4") {
 					foreach ($article as $k => $v) {
 						// i guess we'll have to take the risk of 4byte unicode labels & tags here
 						if (is_string($article[$k])) {
@@ -1298,7 +1300,7 @@ class RSSUtils {
 
 						$file_content = UrlHelper::fetch(array("url" => $src,
 							"http_referrer" => $src,
-							"max_size" => MAX_CACHE_FILE_SIZE));
+							"max_size" => Config::get(Config::MAX_CACHE_FILE_SIZE)));
 
 						if ($file_content) {
 							$cache->put($local_filename, $file_content);
@@ -1328,7 +1330,7 @@ class RSSUtils {
 
 			$file_content = UrlHelper::fetch(array("url" => $url,
 				"http_referrer" => $url,
-				"max_size" => MAX_CACHE_FILE_SIZE));
+				"max_size" => Config::get(Config::MAX_CACHE_FILE_SIZE)));
 
 			if ($file_content) {
 				$cache->put($local_filename, $file_content);
@@ -1643,7 +1645,7 @@ class RSSUtils {
 	}
 
 	static function check_feed_favicon($site_url, $feed) {
-		$icon_file = ICONS_DIR . "/$feed.ico";
+		$icon_file = Config::get(Config::ICONS_DIR) . "/$feed.ico";
 
 		$favicon_url = self::get_favicon_url($site_url);
 		if (!$favicon_url) {
@@ -1654,7 +1656,7 @@ class RSSUtils {
 		// Limiting to "image" type misses those served with text/plain
 		$contents = UrlHelper::fetch([
 			'url' => $favicon_url,
-			'max_size' => MAX_FAVICON_FILE_SIZE,
+			'max_size' => Config::get(Config::MAX_FAVICON_FILE_SIZE),
 			//'type' => 'image',
 		]);
 		if (!$contents) {
diff --git a/classes/urlhelper.php b/classes/urlhelper.php
index 8717d02c3..42aa069e6 100644
--- a/classes/urlhelper.php
+++ b/classes/urlhelper.php
@@ -209,7 +209,7 @@ class UrlHelper {
 		$last_modified = isset($options["last_modified"]) ? $options["last_modified"] : "";
 		$useragent = isset($options["useragent"]) ? $options["useragent"] : false;
 		$followlocation = isset($options["followlocation"]) ? $options["followlocation"] : true;
-		$max_size = isset($options["max_size"]) ? $options["max_size"] : MAX_DOWNLOAD_FILE_SIZE; // in bytes
+		$max_size = isset($options["max_size"]) ? $options["max_size"] : Config::get(Config::MAX_DOWNLOAD_FILE_SIZE); // in bytes
 		$http_accept = isset($options["http_accept"]) ? $options["http_accept"] : false;
 		$http_referrer = isset($options["http_referrer"]) ? $options["http_referrer"] : false;
 
@@ -250,8 +250,8 @@ class UrlHelper {
 			if (count($curl_http_headers) > 0)
 				curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
 
-			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
-			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : Config::get(Config::FILE_FETCH_CONNECT_TIMEOUT));
+			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : Config::get(Config::FILE_FETCH_TIMEOUT));
 			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir") && $followlocation);
 			curl_setopt($ch, CURLOPT_MAXREDIRS, 20);
 			curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);
@@ -395,7 +395,7 @@ class UrlHelper {
 						),
 						'method' => 'GET',
 						'ignore_errors' => true,
-						'timeout' => $timeout ? $timeout : FILE_FETCH_TIMEOUT,
+						'timeout' => $timeout ? $timeout : Config::get(Config::FILE_FETCH_TIMEOUT),
 						'protocol_version'=> 1.1)
 				  );
 
@@ -417,7 +417,7 @@ class UrlHelper {
 
 			$old_error = error_get_last();
 
-			$fetch_effective_url = self::resolve_redirects($url, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
+			$fetch_effective_url = self::resolve_redirects($url, $timeout ? $timeout : Config::get(Config::FILE_FETCH_CONNECT_TIMEOUT));
 
 			if (!self::validate($fetch_effective_url, true)) {
 				$fetch_last_error = "URL received after redirection failed extended validation.";
diff --git a/config.php-dist b/config.php-dist
index 2ee1c719d..840880ad9 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -131,7 +131,7 @@
 	// Disabling auth_internal in this list would automatically disable
 	// reset password link on the login form.
 
-	define('LOG_DESTINATION', 'sql');
+	define('Config::get(Config::LOG_DESTINATION)', 'sql');
 	// Error log destination to use. Possible values: sql (uses internal logging
 	// you can read in Preferences -> System), syslog - logs to system log.
 	// Setting this to blank uses PHP logging (usually to http server
diff --git a/include/functions.php b/include/functions.php
index 526c6058a..59c824e43 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -5,12 +5,6 @@
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
 
-	define('COOKIE_LIFETIME_LONG', 86400*365);
-
-	// this CSS file is included for everyone (if it exists in themes.local)
-	// on login, registration, and main (index and prefs) pages
-	define('LOCAL_OVERRIDE_STYLESHEET', '.local-overrides.css');
-
 	$fetch_last_error = false;
 	$fetch_last_error_code = false;
 	$fetch_last_content_type = false;
@@ -37,49 +31,7 @@
 	ini_set('display_errors', "false");
 	ini_set('display_startup_errors', "false");
 
-	require_once 'config.php';
-
-	/* Some tunables you can override in config.php using define():	*/
-
-	if (!defined('FEED_FETCH_TIMEOUT')) 					define('FEED_FETCH_TIMEOUT', 45);
-	// How may seconds to wait for response when requesting feed from a site
-	if (!defined('FEED_FETCH_NO_CACHE_TIMEOUT')) 		define('FEED_FETCH_NO_CACHE_TIMEOUT', 15);
-	// How may seconds to wait for response when requesting feed from a
-	// site when that feed wasn't cached before
-	if (!defined('FILE_FETCH_TIMEOUT')) 					define('FILE_FETCH_TIMEOUT', 45);
-	// Default timeout when fetching files from remote sites
-	if (!defined('FILE_FETCH_CONNECT_TIMEOUT')) 			define('FILE_FETCH_CONNECT_TIMEOUT', 15);
-	// How many seconds to wait for initial response from website when
-	// fetching files from remote sites
-	if (!defined('DAEMON_UPDATE_LOGIN_LIMIT'))			define('DAEMON_UPDATE_LOGIN_LIMIT', 30);
-	// stop updating feeds if users haven't logged in for X days
-	if (!defined('DAEMON_FEED_LIMIT'))						define('DAEMON_FEED_LIMIT', 500);
-	// feed limit for one update batch
-	if (!defined('DAEMON_SLEEP_INTERVAL'))					define('DAEMON_SLEEP_INTERVAL', 120);
-	// default sleep interval between feed updates (sec)
-	if (!defined('MAX_CACHE_FILE_SIZE'))					define('MAX_CACHE_FILE_SIZE', 64*1024*1024);
-	// do not cache files larger than that (bytes)
-	if (!defined('MAX_DOWNLOAD_FILE_SIZE'))				define('MAX_DOWNLOAD_FILE_SIZE', 16*1024*1024);
-	// do not download general files larger than that (bytes)
-	if (!defined('MAX_FAVICON_FILE_SIZE'))					define('MAX_FAVICON_FILE_SIZE', 1*1024*1024);
-	// do not download favicon files larger than that (bytes)
-	if (!defined('CACHE_MAX_DAYS'))							define('CACHE_MAX_DAYS', 7);
-	// max age in days for various automatically cached (temporary) files
-	if (!defined('MAX_CONDITIONAL_INTERVAL'))				define('MAX_CONDITIONAL_INTERVAL', 3600*12);
-	// max interval between forced unconditional updates for servers
-	// not complying with http if-modified-since (seconds)
-	// if (!defined('MAX_FETCH_REQUESTS_PER_HOST')) define('MAX_FETCH_REQUESTS_PER_HOST', 25);
-	// a maximum amount of allowed HTTP requests per destination host
-	// during a single update (i.e. within PHP process lifetime)
-	// this is used to not cause excessive load on the origin server on
-	// e.g. feed subscription when all articles are being processes
-	// (not implemented)
-	if (!defined('DAEMON_UNSUCCESSFUL_DAYS_LIMIT'))		define('DAEMON_UNSUCCESSFUL_DAYS_LIMIT', 30);
-	// automatically disable updates for feeds which failed to
-	// update for this amount of days; 0 disables
-
-	/* tunables end here */
-
+	require_once "config.php";
 	require_once "autoload.php";
 
 	if (Config::get(Config::DB_TYPE) == "pgsql") {
diff --git a/include/login_form.php b/include/login_form.php
index 537c7f994..168fe50aa 100755
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -16,8 +16,8 @@
 
 	} ?>
 
-	<?php if (theme_exists(LOCAL_OVERRIDE_STYLESHEET)) {
-		echo stylesheet_tag(get_theme_path(LOCAL_OVERRIDE_STYLESHEET));
+	<?php if (theme_exists(Config::get(Config::LOCAL_OVERRIDE_STYLESHEET))) {
+		echo stylesheet_tag(get_theme_path(Config::get(Config::LOCAL_OVERRIDE_STYLESHEET)));
 	} ?>
 
 	<style type="text/css">
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 5efd23d98..4831209ba 100755
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -103,8 +103,8 @@
 				}
 			}
 
-			if (!is_writable(ICONS_DIR)) {
-				array_push($errors, "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".ICONS_DIR.").\n");
+			if (!is_writable(Config::get(Config::ICONS_DIR))) {
+				array_push($errors, "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".Config::get(Config::ICONS_DIR).").\n");
 			}
 
 			if (!is_writable(Config::get(Config::LOCK_DIRECTORY))) {
diff --git a/index.php b/index.php
index 8ba401c2d..73fccc3ea 100644
--- a/index.php
+++ b/index.php
@@ -17,7 +17,6 @@
 		get_include_path());
 
 	require_once "autoload.php";
-
 	require_once "sessions.php";
 	require_once "functions.php";
 	require_once "sanity_check.php";
@@ -44,8 +43,8 @@
 		}
 	} ?>
 
-	<?php if (theme_exists(LOCAL_OVERRIDE_STYLESHEET)) {
-		echo stylesheet_tag(get_theme_path(LOCAL_OVERRIDE_STYLESHEET));
+	<?php if (theme_exists(Config::get(Config::LOCAL_OVERRIDE_STYLESHEET))) {
+		echo stylesheet_tag(get_theme_path(Config::get(Config::LOCAL_OVERRIDE_STYLESHEET)));
 	} ?>
 
 	<script type="text/javascript">
diff --git a/phpstan.neon b/phpstan.neon
index ba425e3d9..29ca27d26 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -2,6 +2,7 @@ parameters:
    level: 5
    ignoreErrors:
 #      - '#Constant.*not found#'
+      - '#Constant.*\b(SUBSTRING_FOR_DATE|SCHEMA_VERSION|SELF_USER_AGENT|LABEL_BASE_INDEX|PLUGIN_FEED_BASE_INDEX)\b.*not found#'
       - '#Comparison operation ">" between int<1, max> and 0 is always true.#'
       - '#Access to an undefined property DOMNode::\$tagName.#'
       - '#Call to an undefined method DOMNode::(get|remove|set)Attribute.#'
diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php
index a5ba1d62d..b03cacfe4 100644
--- a/plugins/af_proxy_http/init.php
+++ b/plugins/af_proxy_http/init.php
@@ -68,7 +68,7 @@ class Af_Proxy_Http extends Plugin {
 			header("Location: " . $this->cache->get_url($local_filename));
 			return;
 		} else {
-			$data = UrlHelper::fetch(["url" => $url, "max_size" => MAX_CACHE_FILE_SIZE]);
+			$data = UrlHelper::fetch(["url" => $url, "max_size" => Config::get(Config::MAX_CACHE_FILE_SIZE)]);
 
 			if ($data) {
 				if ($this->cache->put($local_filename, $data)) {
diff --git a/plugins/cache_starred_images/init.php b/plugins/cache_starred_images/init.php
index 9f17c492f..2dbdb99cc 100755
--- a/plugins/cache_starred_images/init.php
+++ b/plugins/cache_starred_images/init.php
@@ -136,7 +136,7 @@ class Cache_Starred_Images extends Plugin {
 		if (!$this->cache->exists($local_filename)) {
 			Debug::log("cache_images: downloading: $url to $local_filename", Debug::$LOG_VERBOSE);
 
-			$data = UrlHelper::fetch(["url" => $url, "max_size" => MAX_CACHE_FILE_SIZE]);
+			$data = UrlHelper::fetch(["url" => $url, "max_size" => Config::get(Config::MAX_CACHE_FILE_SIZE)]);
 
 			if ($data)
 				return $this->cache->put($local_filename, $data);;
diff --git a/prefs.php b/prefs.php
index f173d684b..b6026eb23 100644
--- a/prefs.php
+++ b/prefs.php
@@ -34,8 +34,8 @@
 		}
 	} ?>
 
-	<?php if (theme_exists(LOCAL_OVERRIDE_STYLESHEET)) {
-		echo stylesheet_tag(get_theme_path(LOCAL_OVERRIDE_STYLESHEET));
+	<?php if (theme_exists(Config::get(Config::LOCAL_OVERRIDE_STYLESHEET))) {
+		echo stylesheet_tag(get_theme_path(Config::get(Config::LOCAL_OVERRIDE_STYLESHEET)));
 	} ?>
 
 	<script type="text/javascript">
diff --git a/update.php b/update.php
index 4aff4a774..92a087a2e 100755
--- a/update.php
+++ b/update.php
@@ -212,7 +212,7 @@
 	}
 
 	if (isset($options["feeds"])) {
-		RSSUtils::update_daemon_common(DAEMON_FEED_LIMIT, $options);
+		RSSUtils::update_daemon_common(Config::get(Config::DAEMON_FEED_LIMIT), $options);
 		RSSUtils::housekeeping_common();
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, $options);
@@ -227,7 +227,7 @@
 			passthru(Config::get(Config::PHP_EXECUTABLE) . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
 
 			// let's enforce a minimum spawn interval as to not forkbomb the host
-			$spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
+			$spawn_interval = max(60, Config::get(Config::DAEMON_SLEEP_INTERVAL));
 
 			Debug::log("Sleeping for $spawn_interval seconds...");
 			sleep($spawn_interval);
@@ -255,7 +255,7 @@
 			Debug::log("warning: unable to create stampfile\n");
 		}
 
-		RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT, $options);
+		RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : Config::get(Config::DAEMON_FEED_LIMIT), $options);
 
 		if (!isset($options["pidlock"]) || $options["task"] == 0)
 			RSSUtils::housekeeping_common();
diff --git a/update_daemon2.php b/update_daemon2.php
index b67fba37d..b0314f3e9 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -11,13 +11,6 @@
 	require_once "autoload.php";
 	require_once "functions.php";
 	require_once "config.php";
-
-	// defaults
-	if (!defined('PURGE_INTERVAL')) 						define('PURGE_INTERVAL', 3600); // seconds
-	if (!defined('MAX_CHILD_RUNTIME')) 					define('MAX_CHILD_RUNTIME', 1800); // seconds
-	if (!defined('MAX_JOBS')) 								define('MAX_JOBS', 2);
-	if (!defined('SPAWN_INTERVAL')) 						define('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds
-
 	require_once "sanity_check.php";
 	require_once "db-prefs.php";
 
@@ -78,7 +71,7 @@
 		foreach (array_keys($ctimes) as $pid) {
 			$started = $ctimes[$pid];
 
-			if (time() - $started > MAX_CHILD_RUNTIME) {
+			if (time() - $started > Config::get(Config::DAEMON_MAX_CHILD_RUNTIME)) {
 				Debug::log("Child process with PID $pid seems to be stuck, aborting...");
 				posix_kill($pid, SIGKILL);
 			}
@@ -143,9 +136,9 @@
 		print "  --log FILE           - log messages to FILE\n";
         print "  --log-level N        - log verbosity level\n";
 		print "  --tasks N            - amount of update tasks to spawn\n";
-		print "                         default: " . MAX_JOBS . "\n";
+		print "                         default: " . Config::get(Config::DAEMON_MAX_JOBS) . "\n";
 		print "  --interval N         - task spawn interval\n";
-		print "                         default: " . SPAWN_INTERVAL . " seconds.\n";
+		print "                         default: " . Config::get(Config::DAEMON_SLEEP_INTERVAL) . " seconds.\n";
 		print "  --quiet              - don't output messages to stdout\n";
 		return;
 	}
@@ -170,14 +163,14 @@
 		Debug::log("Set to spawn " . $options["tasks"] . " children.");
 		$max_jobs = $options["tasks"];
 	} else {
-		$max_jobs = MAX_JOBS;
+		$max_jobs = Config::get(Config::DAEMON_MAX_JOBS);
 	}
 
 	if (isset($options["interval"])) {
 		Debug::log("Spawn interval: " . $options["interval"] . " seconds.");
 		$spawn_interval = $options["interval"];
 	} else {
-		$spawn_interval = SPAWN_INTERVAL;
+		$spawn_interval = Config::get(Config::DAEMON_SLEEP_INTERVAL);
 	}
 
 	// let's enforce a minimum spawn interval as to not forkbomb the host
-- 
cgit v1.2.3-54-g00ecf

From 8d2e3c2528e67f8650c122f014364a34bf690d2a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 23 Feb 2021 22:26:07 +0300
Subject: drop errors.php and simplify error handling

(limited to 'classes/pref/feeds.php')

diff --git a/api/index.php b/api/index.php
index 4e2c06b9d..d85a1103c 100644
--- a/api/index.php
+++ b/api/index.php
@@ -34,9 +34,11 @@
 		if (!\Sessions\validate_session()) {
 			header("Content-Type: text/json");
 
-			print json_encode(array("seq" => -1,
-				"status" => 1,
-				"content" => array("error" => "NOT_LOGGED_IN")));
+			print json_encode([
+						"seq" => -1,
+						"status" => API::STATUS_ERR,
+						"content" => [ "error" => API::E_NOT_LOGGED_IN ]
+					]);
 
 			return;
 		}
diff --git a/backend.php b/backend.php
index 9bc1449d0..206d866b7 100644
--- a/backend.php
+++ b/backend.php
@@ -45,7 +45,7 @@
 	if (!empty($_SESSION["uid"])) {
 		if (!\Sessions\validate_session()) {
 			header("Content-Type: text/json");
-			print error_json(6);
+			print Errors::to_json(Errors::E_UNAUTHORIZED);
 			return;
 		}
 		UserHelper::load_user_plugins($_SESSION["uid"]);
@@ -106,7 +106,7 @@
 		if (strpos($method, "_") === 0) {
 			user_error("Refusing to invoke method $method of handler $op which starts with underscore.", E_USER_WARNING);
 			header("Content-Type: text/json");
-			print error_json(6);
+			print Errors::to_json(Errors::E_UNAUTHORIZED);
 			return;
 		}
 
@@ -130,7 +130,7 @@
 						} else {
 							user_error("Refusing to invoke method $method of handler $op which has required parameters.", E_USER_WARNING);
 							header("Content-Type: text/json");
-							print error_json(6);
+							print Errors::to_json(Errors::E_UNAUTHORIZED);
 						}
 					} else {
 						if (method_exists($handler, "catchall")) {
@@ -141,19 +141,19 @@
 					return;
 				} else {
 					header("Content-Type: text/json");
-					print error_json(6);
+					print Errors::to_json(Errors::E_UNAUTHORIZED);
 					return;
 				}
 			} else {
 				user_error("Refusing to invoke method $method of handler $op with invalid CSRF token.", E_USER_WARNING);
 				header("Content-Type: text/json");
-				print error_json(6);
+				print Errors::to_json(Errors::E_UNAUTHORIZED);
 				return;
 			}
 		}
 	}
 
 	header("Content-Type: text/json");
-	print error_json(13);
+	print Errors::to_json(Errors::E_UNKNOWN_METHOD);
 
 ?>
diff --git a/classes/api.php b/classes/api.php
index 6f3ee77db..1b3ee7d92 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -6,6 +6,13 @@ class API extends Handler {
 	const STATUS_OK  = 0;
 	const STATUS_ERR = 1;
 
+	const E_API_DISABLED = "API_DISABLED";
+	const E_NOT_LOGGED_IN = "NOT_LOGGED_IN";
+	const E_LOGIN_ERROR = "LOGIN_ERROR";
+	const E_INCORRECT_USAGE = "INCORRECT_USAGE";
+	const E_UNKNOWN_METHOD = "UNKNOWN_METHOD";
+	const E_OPERATION_FAILED = "E_OPERATION_FAILED";
+
 	private $seq;
 
 	private static function _param_to_bool($p) {
@@ -13,9 +20,11 @@ class API extends Handler {
 	}
 
 	private function _wrap($status, $reply) {
-		print json_encode(array("seq" => $this->seq,
-			"status" => $status,
-			"content" => $reply));
+		print json_encode([
+					"seq" => $this->seq,
+					"status" => $status,
+					"content" => $reply
+				]);
 	}
 
 	function before($method) {
@@ -23,12 +32,12 @@ class API extends Handler {
 			header("Content-Type: text/json");
 
 			if (empty($_SESSION["uid"]) && $method != "login" && $method != "isloggedin") {
-				$this->_wrap(self::STATUS_ERR, array("error" => 'NOT_LOGGED_IN'));
+				$this->_wrap(self::STATUS_ERR, array("error" => self::E_NOT_LOGGED_IN));
 				return false;
 			}
 
 			if (!empty($_SESSION["uid"]) && $method != "logout" && !get_pref('ENABLE_API_ACCESS')) {
-				$this->_wrap(self::STATUS_ERR, array("error" => 'API_DISABLED'));
+				$this->_wrap(self::STATUS_ERR, array("error" => self::E_API_DISABLED));
 				return false;
 			}
 
@@ -69,13 +78,13 @@ class API extends Handler {
 						"api_level" => self::API_LEVEL));
 				} else {                                                         // else we are not logged in
 					user_error("Failed login attempt for $login from " . UserHelper::get_user_ip(), E_USER_WARNING);
-					$this->_wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
+					$this->_wrap(self::STATUS_ERR, array("error" => self::E_LOGIN_ERROR));
 				}
 			} else {
-				$this->_wrap(self::STATUS_ERR, array("error" => "API_DISABLED"));
+				$this->_wrap(self::STATUS_ERR, array("error" => self::E_API_DISABLED));
 			}
 		} else {
-			$this->_wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
+			$this->_wrap(self::STATUS_ERR, array("error" => self::E_LOGIN_ERROR));
 			return;
 		}
 	}
@@ -221,7 +230,7 @@ class API extends Handler {
 				$this->_wrap(self::STATUS_OK, $headlines);
 			}
 		} else {
-			$this->_wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+			$this->_wrap(self::STATUS_ERR, array("error" => self::E_INCORRECT_USAGE));
 		}
 	}
 
@@ -281,7 +290,7 @@ class API extends Handler {
 				"updated" => $num_updated));
 
 		} else {
-			$this->_wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+			$this->_wrap(self::STATUS_ERR, array("error" => self::E_INCORRECT_USAGE));
 		}
 
 	}
@@ -356,7 +365,7 @@ class API extends Handler {
 
 			$this->_wrap(self::STATUS_OK, $articles);
 		} else {
-			$this->_wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+			$this->_wrap(self::STATUS_ERR, array("error" => self::E_INCORRECT_USAGE));
 		}
 	}
 
@@ -481,7 +490,7 @@ class API extends Handler {
 			$this->_wrap($reply[0], $reply[1]);
 
 		} else {
-			$this->_wrap(self::STATUS_ERR, array("error" => 'UNKNOWN_METHOD', "method" => $method));
+			$this->_wrap(self::STATUS_ERR, array("error" => self::E_UNKNOWN_METHOD, "method" => $method));
 		}
 	}
 
@@ -493,7 +502,7 @@ class API extends Handler {
 		if (Article::_create_published_article($title, $url, $content, "", $_SESSION["uid"])) {
 			$this->_wrap(self::STATUS_OK, array("status" => 'OK'));
 		} else {
-			$this->_wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
+			$this->_wrap(self::STATUS_ERR, array("error" => self::E_OPERATION_FAILED));
 		}
 	}
 
@@ -816,7 +825,7 @@ class API extends Handler {
 			Pref_Feeds::remove_feed($feed_id, $_SESSION["uid"]);
 			$this->_wrap(self::STATUS_OK, array("status" => "OK"));
 		} else {
-			$this->_wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
+			$this->_wrap(self::STATUS_ERR, array("error" => self::E_OPERATION_FAILED));
 		}
 	}
 
@@ -831,7 +840,7 @@ class API extends Handler {
 
 			$this->_wrap(self::STATUS_OK, array("status" => $rc));
 		} else {
-			$this->_wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+			$this->_wrap(self::STATUS_ERR, array("error" => self::E_INCORRECT_USAGE));
 		}
 	}
 
diff --git a/classes/feeds.php b/classes/feeds.php
index eaedc1aee..a38cbae97 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -499,15 +499,7 @@ class Feeds extends Handler_Protected {
 		// this is parsed by handleRpcJson() on first viewfeed() to set cdm expanded, etc
 		$reply['runtime-info'] = RPC::make_runtime_info();
 
-		$reply_json = json_encode($reply);
-
-		if (!$reply_json) {
-		    $reply_json = json_encode(["error" => ["code" => 15,
-                "message" => json_last_error_msg()]]);
-        }
-
-		print $reply_json;
-
+		print json_encode($reply);
 	}
 
 	private function _generate_dashboard_feed() {
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 79dff37b5..42be6f713 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -240,7 +240,7 @@ class Handler_Public extends Handler {
 
 		} else {
 			header("Content-Type: text/plain; charset=utf-8");
-			print json_encode(array("error" => array("message" => "Unknown format")));
+			print "Unknown format: $format.";
 		}
 	}
 
@@ -290,7 +290,7 @@ class Handler_Public extends Handler {
 			header("Location: index.php");
 		} else {
 			header("Content-Type: text/json");
-			print error_json(6);
+			print Errors::to_json(Errors::E_UNAUTHORIZED);
 		}
 	}
 
@@ -408,7 +408,7 @@ class Handler_Public extends Handler {
 
 	function index() {
 		header("Content-Type: text/plain");
-		print error_json(13);
+		print Errors::to_json(Errors::E_UNKNOWN_METHOD);
 	}
 
 	function forgotpass() {
@@ -659,7 +659,7 @@ class Handler_Public extends Handler {
 			<div class="content">
 
 			<?php
-				@$op = clean($_REQUEST["subop"]);
+				@$op = clean($_REQUEST["subop"] ?? "");
 				$updater = new DbUpdater(Db::pdo(), Config::get(Config::DB_TYPE), SCHEMA_VERSION);
 
 				if ($op == "performupdate") {
@@ -802,17 +802,17 @@ class Handler_Public extends Handler {
 				} else {
 					user_error("PluginHandler[PUBLIC]: Requested private method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
 					header("Content-Type: text/json");
-					print error_json(6);
+					print Errors::to_json(Errors::E_UNAUTHORIZED);
 				}
 			} else {
 				user_error("PluginHandler[PUBLIC]: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
 				header("Content-Type: text/json");
-				print error_json(13);
+				print Errors::to_json(Errors::E_UNKNOWN_METHOD);
 			}
 		} else {
 			user_error("PluginHandler[PUBLIC]: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
 			header("Content-Type: text/json");
-			print error_json(14);
+			print Errors::to_json(Errors::E_UNKNOWN_PLUGIN);
 		}
 	}
 
diff --git a/classes/pluginhandler.php b/classes/pluginhandler.php
index 608f80dcb..75b823822 100644
--- a/classes/pluginhandler.php
+++ b/classes/pluginhandler.php
@@ -15,15 +15,15 @@ class PluginHandler extends Handler_Protected {
 					$plugin->$method();
 				} else {
 					user_error("Rejected ${plugin_name}->${method}(): invalid CSRF token.", E_USER_WARNING);
-					print error_json(6);
+					print Errors::to_json(Errors::E_UNAUTHORIZED);
 				}
 			} else {
 				user_error("Rejected ${plugin_name}->${method}(): unknown method.", E_USER_WARNING);
-				print error_json(13);
+				print Errors::to_json(Errors::E_UNKNOWN_METHOD);
 			}
 		} else {
 			user_error("Rejected ${plugin_name}->${method}(): unknown plugin.", E_USER_WARNING);
-			print error_json(14);
+			print Errors::to_json(Errors::E_UNKNOWN_PLUGIN);
 		}
 	}
 }
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 7c3a40647..086c52697 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -561,8 +561,6 @@ class Pref_Feeds extends Handler_Protected {
 					"all" => $this::get_ts_languages(),
 					]
 				]);
-		} else {
-			print json_encode(["error" => "FEED_NOT_FOUND"]);
 		}
 	}
 
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 0b826e13f..5bc094d55 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -16,8 +16,6 @@ class Pref_Labels extends Handler_Protected {
 
 		if ($line = $sth->fetch(PDO::FETCH_ASSOC)) {
 			print json_encode($line);
-		} else {
-			print json_encode(["error" => "LABEL_NOT_FOUND"]);
 		}
 	}
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 7ee03c21f..0d0dcadbc 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1063,7 +1063,7 @@ class Pref_Prefs extends Handler_Protected {
 			}
 		} else {
 			header("Content-Type: text/json");
-			print error_json(6);
+			print Errors::to_json(Errors::E_UNAUTHORIZED);
 		}
 	}
 
diff --git a/classes/pref/users.php b/classes/pref/users.php
index f30abe001..13f808cb3 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -19,8 +19,6 @@ class Pref_Users extends Handler_Administrative {
 						"user" => $row,
 						"access_level_names" => $access_level_names
 					]);
-			} else {
-				print json_encode(["error" => "USER_NOT_FOUND"]);
 			}
 		}
 
diff --git a/classes/rpc.php b/classes/rpc.php
index 52d514aae..d0388a066 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -118,16 +118,22 @@ class RPC extends Handler_Protected {
 		$_SESSION["hasSandbox"] = clean($_REQUEST["hasSandbox"]) === "true";
 		$_SESSION["clientTzOffset"] = clean($_REQUEST["clientTzOffset"]);
 
-		$reply = array();
+		$error = Errors::E_SUCCESS;
 
-		$reply['error'] = sanity_check();
+		if (get_schema_version(true) != SCHEMA_VERSION) {
+			$error = Errors::E_SCHEMA_MISMATCH;
+		}
+
+		if ($error == Errors::E_SUCCESS) {
+			$reply = [];
 
-		if ($reply['error']['code'] == 0) {
 			$reply['init-params'] = $this->make_init_params();
 			$reply['runtime-info'] = $this->make_runtime_info();
-		}
 
-		print json_encode($reply);
+			print json_encode($reply);
+		} else {
+			print Errors::to_json($error);
+		}
 	}
 
 	/*function completeLabels() {
@@ -315,10 +321,7 @@ class RPC extends Handler_Protected {
 				$msg, 'client-js:' . $file, $line, $context);
 
 			echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
-		} else {
-			echo json_encode(array("error" => "MESSAGE_NOT_FOUND"));
 		}
-
 	}
 
 	function checkforupdates() {
diff --git a/errors.php b/errors.php
deleted file mode 100644
index 3195c4b64..000000000
--- a/errors.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-	set_include_path(__DIR__ ."/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	require_once "functions.php";
-
-	function get_error_types() {
-		$ERRORS[0] = "";
-
-		$ERRORS[1] = __("This program requires XmlHttpRequest " .
-				"to function properly. Your browser doesn't seem to support it.");
-
-		$ERRORS[2] = __("This program requires cookies " .
-				"to function properly. Your browser doesn't seem to support them.");
-
-		$ERRORS[3] = __("Backend sanity check failed.");
-
-		$ERRORS[4] = __("Frontend sanity check failed.");
-
-		$ERRORS[5] = __("Incorrect database schema version. <a href='db-updater.php'>Please update</a>.");
-
-		$ERRORS[6] = __("Request not authorized.");
-
-		$ERRORS[7] = __("No operation to perform.");
-
-		$ERRORS[8] = __("Could not display feed: query failed. Please check label match syntax or local configuration.");
-
-		$ERRORS[8] = __("Denied. Your access level is insufficient to access this page.");
-
-		$ERRORS[9] = __("Configuration check failed");
-
-		$ERRORS[10] = __("Your version of MySQL is not currently supported. Please see official site for more information.");
-
-		$ERRORS[11] = "[This error is not returned by server]";
-
-		$ERRORS[12] = __("SQL escaping test failed, check your database and PHP configuration");
-
-		$ERRORS[13] = __("Method not found");
-
-		$ERRORS[14] = __("Plugin not found");
-
-		$ERRORS[15] = __("Encoding data as JSON failed");
-
-		return $ERRORS;
-	}
-
-	if ($_REQUEST['mode'] ?? "" == 'js') {
-		header("Content-Type: text/javascript; charset=UTF-8");
-
-		print "var ERRORS = [];\n";
-
-		foreach (get_error_types() as $id => $error) {
-
-			$error = preg_replace("/\n/", "", $error);
-			$error = preg_replace("/\"/", "\\\"", $error);
-
-			print "ERRORS[$id] = \"$error\";\n";
-		}
-	}
-?>
diff --git a/include/functions.php b/include/functions.php
index a698fa79d..d916301fb 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -323,20 +323,6 @@
 		}
 	}
 
-	function sanity_check() {
-		require_once 'errors.php';
-		$ERRORS = get_error_types();
-
-		$error_code = 0;
-		$schema_version = get_schema_version(true);
-
-		if ($schema_version != SCHEMA_VERSION) {
-			$error_code = 5;
-		}
-
-		return array("code" => $error_code, "message" => $ERRORS[$error_code]);
-	}
-
 	function file_is_locked($filename) {
 		if (file_exists(Config::get(Config::LOCK_DIRECTORY) . "/$filename")) {
 			if (function_exists('flock')) {
@@ -533,20 +519,6 @@
 		return file_exists("themes/$theme") || file_exists("themes.local/$theme");
 	}
 
-	/**
-	 * @SuppressWarnings(unused)
-	 */
-	function error_json($code) {
-		require_once "errors.php";
-		$ERRORS = get_error_types();
-
-		@$message = $ERRORS[$code];
-
-		return json_encode(array("error" =>
-			array("code" => $code, "message" => $message)));
-
-	}
-
 	function arr_qmarks($arr) {
 		return str_repeat('?,', count($arr) - 1) . '?';
 	}
diff --git a/include/login_form.php b/include/login_form.php
index 168fe50aa..06bf57470 100755
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -6,11 +6,10 @@
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<?php
-	foreach (array("lib/dojo/dojo.js",
+	foreach (["lib/dojo/dojo.js",
 				"lib/dojo/tt-rss-layer.js",
 			 	"js/common.js",
-				"js/utility.js",
-				"errors.php?mode=js") as $jsfile) {
+				"js/utility.js"] as $jsfile) {
 
 		echo javascript_tag($jsfile);
 
diff --git a/index.php b/index.php
index 1f2802864..a21db6fc5 100644
--- a/index.php
+++ b/index.php
@@ -69,11 +69,10 @@
 	</script>
 
 	<?php
-	foreach (array("lib/dojo/dojo.js",
+	foreach (["lib/dojo/dojo.js",
 				"lib/dojo/tt-rss-layer.js",
 				"js/tt-rss.js",
-				"js/common.js",
-				"errors.php?mode=js") as $jsfile) {
+				"js/common.js"] as $jsfile) {
 
 		echo javascript_tag($jsfile);
 
diff --git a/js/App.js b/js/App.js
index 68f3740c5..6cad062f0 100644
--- a/js/App.js
+++ b/js/App.js
@@ -407,23 +407,15 @@ const App = {
          const counters = reply['counters'];
          const runtime_info = reply['runtime-info'];
 
-         if (error) {
-            const code = error['code'];
-
-            if (code && code != 0) {
-               const msg = error['message'];
-
-               console.warn("[handleRpcJson] received fatal error ", code, msg);
-
-               /* global ERRORS */
-               this.Error.fatal(ERRORS[code], {info: msg, code: code});
-               return false;
-            }
+         if (error && error.code && error.code != App.Error.E_SUCCESS) {
+            console.warn("handleRpcJson: fatal error", error);
+            this.Error.fatal(error.code);
+            return false;
          }
 
          if (seq && this.get_seq() != seq) {
-            console.warn("[handleRpcJson] sequence mismatch: ", seq, '!=', this.get_seq());
-            return;
+            console.warn("handleRpcJson: sequence mismatch: ", seq, '!=', this.get_seq());
+            return false;
          }
 
          // not in preferences
@@ -442,10 +434,13 @@ const App = {
 
          if (netalert) netalert.hide();
 
+         return true;
       } else {
          if (netalert) netalert.show();
 
          Notify.error("Communication problem with server.");
+
+         return false;
 		}
 	},
 	parseRuntimeInfo: function(data) {
@@ -487,20 +482,6 @@ const App = {
 		PluginHost.run(PluginHost.HOOK_RUNTIME_INFO_LOADED, data);
 	},
 	backendSanityCallback: function(reply) {
-		if (!reply) {
-			this.Error.fatal(ERRORS[3]);
-			return;
-		}
-
-		if (reply['error']) {
-			const code = reply['error']['code'];
-
-			if (code && code != 0) {
-				return this.Error.fatal(ERRORS[code],
-					{code: code, info: reply['error']['message']});
-			}
-		}
-
 		console.log("sanity check ok");
 
 		const params = reply['init-params'];
@@ -547,24 +528,25 @@ const App = {
 		this.initSecondStage();
 	},
 	Error: {
+      E_SUCCESS: "E_SUCCESS",
+      E_UNAUTHORIZED: "E_UNAUTHORIZED",
+      E_SCHEMA_MISMATCH: "E_SCHEMA_MISMATCH",
 		fatal: function (error, params = {}) {
-			if (params.code) {
-				if (params.code == 6) {
-					window.location.href = "index.php";
-					return;
-				} else if (params.code == 5) {
-					window.location.href = "public.php?op=dbupdate";
-					return;
-				}
-			}
+         if (error == App.Error.E_UNAUTHORIZED) {
+            window.location.href = "index.php";
+            return;
+         } else if (error == App.Error.E_SCHEMA_MISMATCH) {
+            window.location.href = "public.php?op=dbupdate";
+            return;
+         }
 
-			return this.report(error,
+			return this.report(__("Fatal error: %s").replace("%s", error),
 				{...{title: __("Fatal error")}, ...params});
 		},
 		report: function(error, params = {}) {
 			if (!error) return;
 
-			console.error("[Error.report]", error, params);
+			console.error("error.report:", error, params);
 
 			const message = params.message ? params.message : error.toString();
 
diff --git a/js/common.js b/js/common.js
index df1bf8690..670ee1b30 100755
--- a/js/common.js
+++ b/js/common.js
@@ -179,7 +179,10 @@ const xhr = {
 				console.log('xhr.json', '<<<', obj);
 
 				if (obj && typeof App != "undefined")
-					App.handleRpcJson(obj);
+					if (!App.handleRpcJson(obj)) {
+						reject(obj);
+						return;
+					}
 
 				if (complete != undefined) complete(obj);
 
diff --git a/prefs.php b/prefs.php
index 851dd898a..57ddbba7c 100644
--- a/prefs.php
+++ b/prefs.php
@@ -51,11 +51,10 @@
 	</script>
 
 	<?php
-	foreach (array("lib/dojo/dojo.js",
+	foreach (["lib/dojo/dojo.js",
 				"lib/dojo/tt-rss-layer.js",
 				"js/common.js",
-				"js/prefs.js",
-				"errors.php?mode=js") as $jsfile) {
+				"js/prefs.js"] as $jsfile) {
 
 		echo javascript_tag($jsfile);
 
diff --git a/public.php b/public.php
index 43aa66c1d..28f95d0a9 100644
--- a/public.php
+++ b/public.php
@@ -37,7 +37,7 @@
 	if (strpos($method, "_") === 0) {
 		user_error("Refusing to invoke method $method which starts with underscore.", E_USER_WARNING);
 		header("Content-Type: text/json");
-		print error_json(6);
+		print Errors::to_json(Errors::E_UNAUTHORIZED);
 		return;
 	}
 
@@ -50,7 +50,7 @@
 			} else {
 				user_error("Refusing to invoke method $method which has required parameters.", E_USER_WARNING);
 				header("Content-Type: text/json");
-				print error_json(6);
+				print Errors::to_json(Errors::E_UNAUTHORIZED);
 			}
 		} else if (method_exists($handler, 'index')) {
 			$handler->index();
@@ -60,5 +60,5 @@
 	}
 
 	header("Content-Type: text/plain");
-	print error_json(13);
+	print Errors::to_json(Errors::E_UNKNOWN_METHOD);
 ?>
-- 
cgit v1.2.3-54-g00ecf

" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "

" . __("Published OPML") . "

" . __('Published articles can be subscribed by anyone who knows the following URL:') . "

Feed Debugger: getFeedTitle($feed_id) ?>

Feed Debugger: getFeedTitle($feed_id) ?>

Feed Debugger: getFeedTitle($feed_id) ?>

Feed Debugger: _get_title($feed_id) ?>

".__('OPML Utility')."

" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "

" . __("Global settings") . "