	".__("Description")."	".__("Created")."	".__("Last used")."
-	" . htmlspecialchars($row["title"]) . "	"; - print TimeHelper::make_local_datetime($row['created'], false); - print "	"; - print TimeHelper::make_local_datetime($row['last_used'], false); - print "


+ +	+ +	+ +	+ +

'> log_viewer($page, $severity); + $this->_log_viewer($page, $severity); } else { print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging."); } diff --git a/classes/pref/users.php b/classes/pref/users.php index bc125d0ce..d2dd06fd8 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -166,7 +166,7 @@ class Pref_Users extends Handler_Administrative { } } - static function resetUserPassword($uid, $format_output = false) { + static function _reset_password($uid, $format_output = false) { $pdo = Db::pdo(); @@ -199,7 +199,7 @@ class Pref_Users extends Handler_Administrative { function resetPass() { $uid = clean($_REQUEST["id"]); - self::resetUserPassword($uid); + self::_reset_password($uid); } function index() { @@ -220,7 +220,7 @@ class Pref_Users extends Handler_Administrative { $sort = "login"; } - $sort = $this->validate_field($sort, + $sort = $this->_validate_field($sort, ["login", "access_level", "created", "num_feeds", "created", "last_login"], "login"); if ($sort != "login") $sort = "$sort DESC"; @@ -314,7 +314,7 @@ class Pref_Users extends Handler_Administrative { 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/prefs.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 bdbbdbb0eddd125bec167da5f42bbd95c770151f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Feb 2021 16:59:21 +0300 Subject: rework controls to accept parameters as array --- classes/feeds.php | 2 +- classes/pref/feeds.php | 15 +++++++-------- classes/pref/filters.php | 8 ++++---- classes/pref/prefs.php | 4 ++-- classes/pref/system.php | 2 +- include/controls.php | 47 ++++++++++++++++++++++++++++++----------------- include/login_form.php | 3 ++- plugins/mail/init.php | 3 ++- 8 files changed, 49 insertions(+), 35 deletions(-) (limited to 'classes/pref/prefs.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 "

"; print "" . __("Language:") . ""; 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 "

"; } 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 ""; @@ -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 "

"; - 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 "

"; print "" . __('Language:') . " "; - 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 ""; 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

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 1adb9bb6b643736706b746629b849df9cdf45e50 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 18 Feb 2021 11:54:22 +0300
Subject: profiles: use client dialog; move related methods to pref-prefs

---
 classes/pref/prefs.php | 143 ++++++++++++++++++++++++-------------------------
 classes/rpc.php        |  75 +-------------------------
 js/App.js              |   6 +++
 js/PrefHelpers.js      |  62 +++++++++++++++++++--
 4 files changed, 133 insertions(+), 153 deletions(-)

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

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 3bc8a9a9c..4a4aa45d6 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1219,102 +1219,97 @@ class Pref_Prefs extends Handler_Protected {
 		print json_encode(["value" => $value]);
 	}
 
-	function editPrefProfiles() {
-		print "<div dojoType='fox.Toolbar'>";
+	function activateprofile() {
+		$_SESSION["profile"] = (int) clean($_REQUEST["id"]);
 
-		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
-		print "<div dojoType='dijit.Menu' style='display: none'>";
-		print "<div onclick=\"Tables.select('pref-profiles-list', true)\"
-			dojoType='dijit.MenuItem'>".__('All')."</div>";
-		print "<div onclick=\"Tables.select('pref-profiles-list', false)\"
-			dojoType='dijit.MenuItem'>".__('None')."</div>";
-		print "</div></div>";
-
-		print "<div style='float : right'>";
-
-		print "<input name='newprofile' dojoType='dijit.form.ValidationTextBox'
-				required='1'>
-			<button dojoType='dijit.form.Button'
-			onclick=\"dijit.byId('profileEditDlg').addProfile()\">".
-				__('Create profile')."</button></div>";
-
-		print "</div>";
-
-		$sth = $this->pdo->prepare("SELECT title,id FROM ttrss_settings_profiles
-			WHERE owner_uid = ? ORDER BY title");
-		$sth->execute([$_SESSION['uid']]);
+		// default value
+		if (!$_SESSION["profile"]) $_SESSION["profile"] = null;
+	}
 
-		print "<form onsubmit='return false'>";
+	function remprofiles() {
+		$ids = explode(",", clean($_REQUEST["ids"]));
 
-		print "<div class='panel panel-scrollable'>";
+		foreach ($ids as $id) {
+			if ($_SESSION["profile"] != $id) {
+				$sth = $this->pdo->prepare("DELETE FROM ttrss_settings_profiles WHERE id = ? AND
+							owner_uid = ?");
+				$sth->execute([$id, $_SESSION['uid']]);
+			}
+		}
+	}
 
-		print "<table width='100%' id='pref-profiles-list'>";
+	function addprofile() {
+		$title = clean($_REQUEST["title"]);
 
-		print "<tr>"; # data-row-id='0' <-- no point, shouldn't be removed
+		if ($title) {
+			$this->pdo->beginTransaction();
 
-		print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
+			$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
+				WHERE title = ? AND owner_uid = ?");
+			$sth->execute([$title, $_SESSION['uid']]);
 
-		if (!isset($_SESSION["profile"])) {
-			$is_active = __("(active)");
-		} else {
-			$is_active = "";
-		}
+			if (!$sth->fetch()) {
 
-		print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>";
+				$sth = $this->pdo->prepare("INSERT INTO ttrss_settings_profiles (title, owner_uid)
+							VALUES (?, ?)");
 
-		print "</tr>";
+				$sth->execute([$title, $_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+				$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles WHERE
+					title = ? AND owner_uid = ?");
+				$sth->execute([$title, $_SESSION['uid']]);
 
-			$profile_id = $line["id"];
+				if ($row = $sth->fetch()) {
+					$profile_id = $row['id'];
 
-			print "<tr data-row-id='$profile_id'>";
+					if ($profile_id) {
+						Pref_Prefs::_init_user_prefs($_SESSION["uid"], $profile_id);
+					}
+				}
+			}
 
-			$edit_title = htmlspecialchars($line["title"]);
+			$this->pdo->commit();
+		}
+	}
 
-			print "<td><input onclick='Tables.onRowChecked(this);' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
+	function saveprofile() {
+		$id = clean($_REQUEST["id"]);
+		$title = clean($_REQUEST["title"]);
 
-			if (isset($_SESSION["profile"]) && $_SESSION["profile"] == $line["id"]) {
-				$is_active = __("(active)");
-			} else {
-				$is_active = "";
-			}
+		if ($id == 0) {
+			print __("Default profile");
+			return;
+		}
 
-			print "<td><span dojoType='dijit.InlineEditBox'
-				width='300px' autoSave='false'
-				profile-id='$profile_id'>" . $edit_title .
-				"<script type='dojo/method' event='onChange' args='item'>
-					var elem = this;
-					dojo.xhrPost({
-						url: 'backend.php',
-						content: {op: 'rpc', method: 'saveprofile',
-							value: this.value,
-							id: this.srcNodeRef.getAttribute('profile-id')},
-							load: function(response) {
-								elem.attr('value', response);
-						}
-					});
-				</script>
-			</span> $is_active</td>";
+		if ($title) {
+			$sth = $this->pdo->prepare("UPDATE ttrss_settings_profiles
+				SET title = ? WHERE id = ? AND
+					owner_uid = ?");
 
-			print "</tr>";
+			$sth->execute([$title, $id, $_SESSION['uid']]);
+			print $title;
 		}
+	}
+
+	// TODO: this maybe needs to be unified with Public::getProfiles()
+	function getProfiles() {
+		$rv = [];
 
-		print "</table>";
-		print "</div>";
+		$sth = $this->pdo->prepare("SELECT title,id FROM ttrss_settings_profiles
+			WHERE owner_uid = ? ORDER BY title");
+		$sth->execute([$_SESSION['uid']]);
 
-		print "<footer>
-			<button style='float : left' class='alt-danger' dojoType='dijit.form.Button' onclick='App.dialogOf(this).removeSelected()'>".
-				__('Remove selected profiles')."</button>
-			<button dojoType='dijit.form.Button' class='alt-primary' type='submit' onclick='App.dialogOf(this).execute()'>".
-				__('Activate profile')."</button>
-			<button dojoType='dijit.form.Button' onclick='App.dialogOf(this).hide()'>".
-				__('Cancel')."</button>";
-		print "</footer>";
+		array_push($rv, ["title" => __("Default profile"),
+				"id" => 0,
+				"active" => empty($_SESSION["profile"])
+			]);
 
-		print "</form>";
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
+			$row["active"] = isset($_SESSION["profile"]) && $_SESSION["profile"] == $row["id"];
+			array_push($rv, $row);
+		};
 
+		print json_encode($rv);
 	}
 
 	private function _get_short_desc($pref_name) {
diff --git a/classes/rpc.php b/classes/rpc.php
index 6831d5667..0fd06da4d 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -2,84 +2,11 @@
 class RPC extends Handler_Protected {
 
 	function csrf_ignore($method) {
-		$csrf_ignored = array("completelabels", "saveprofile");
+		$csrf_ignored = array("completelabels");
 
 		return array_search($method, $csrf_ignored) !== false;
 	}
 
-	function setprofile() {
-		$_SESSION["profile"] = (int) clean($_REQUEST["id"]);
-
-		// default value
-		if (!$_SESSION["profile"]) $_SESSION["profile"] = null;
-	}
-
-	function remprofiles() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-
-		foreach ($ids as $id) {
-			if ($_SESSION["profile"] != $id) {
-				$sth = $this->pdo->prepare("DELETE FROM ttrss_settings_profiles WHERE id = ? AND
-							owner_uid = ?");
-				$sth->execute([$id, $_SESSION['uid']]);
-			}
-		}
-	}
-
-	// Silent
-	function addprofile() {
-		$title = clean($_REQUEST["title"]);
-
-		if ($title) {
-			$this->pdo->beginTransaction();
-
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
-				WHERE title = ? AND owner_uid = ?");
-			$sth->execute([$title, $_SESSION['uid']]);
-
-			if (!$sth->fetch()) {
-
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_settings_profiles (title, owner_uid)
-							VALUES (?, ?)");
-
-				$sth->execute([$title, $_SESSION['uid']]);
-
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles WHERE
-					title = ? AND owner_uid = ?");
-				$sth->execute([$title, $_SESSION['uid']]);
-
-				if ($row = $sth->fetch()) {
-					$profile_id = $row['id'];
-
-					if ($profile_id) {
-						Pref_Prefs::_init_user_prefs($_SESSION["uid"], $profile_id);
-					}
-				}
-			}
-
-			$this->pdo->commit();
-		}
-	}
-
-	function saveprofile() {
-		$id = clean($_REQUEST["id"]);
-		$title = clean($_REQUEST["value"]);
-
-		if ($id == 0) {
-			print __("Default profile");
-			return;
-		}
-
-		if ($title) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_settings_profiles
-				SET title = ? WHERE id = ? AND
-					owner_uid = ?");
-
-			$sth->execute([$title, $id, $_SESSION['uid']]);
-			print $title;
-		}
-	}
-
 	function togglepref() {
 		$key = clean($_REQUEST["key"]);
 		set_pref($key, !get_pref($key));
diff --git a/js/App.js b/js/App.js
index 9d8f6c275..ccfeb9024 100644
--- a/js/App.js
+++ b/js/App.js
@@ -42,6 +42,12 @@ const App = {
       cancel_dialog_tag: function(value, attributes = {}) {
          return this.button_tag(value, "", {...{onclick: "App.dialogOf(this).hide()"}, ...attributes});
       },
+      checkbox_tag: function(name, checked = false, value = "", attributes = {}, id = "") {
+         return `<input dojoType="dijit.form.CheckBox" type="checkbox" name="${App.escapeHtml(name)}"
+                     ${checked ? "checked" : ""}
+                     ${value ? `value="${App.escapeHtml(value)}"` : ""}
+                     ${this.attributes_to_string(attributes)} id="${App.escapeHtml(id)}">`
+      },
       select_tag: function(name, value, values = [], attributes = {}, id = "") {
          return `
             <select name="${name}" dojoType="fox.form.Select" id="${App.escapeHtml(id)}" ${this.attributes_to_string(attributes)}>
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index 96d524953..7e0993cb6 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -104,7 +104,7 @@ const	Helpers = {
 							Notify.progress("Removing selected profiles...", true);
 
 							const query = {
-								op: "rpc", method: "remprofiles",
+								op: "pref-prefs", method: "remprofiles",
 								ids: sel_rows.toString()
 							};
 
@@ -122,7 +122,7 @@ const	Helpers = {
 					if (this.validate()) {
 						Notify.progress("Creating profile...", true);
 
-						const query = {op: "rpc", method: "addprofile", title: dialog.attr('value').newprofile};
+						const query = {op: "pref-prefs", method: "addprofile", title: dialog.attr('value').newprofile};
 
 						xhrPost("backend.php", query, () => {
 							Notify.close();
@@ -132,8 +132,60 @@ const	Helpers = {
 					}
 				},
 				refresh: function() {
-					xhrPost("backend.php", {op: 'pref-prefs', method: 'editPrefProfiles'}, (transport) => {
-						dialog.attr('content', transport.responseText);
+					xhrJson("backend.php", {op: 'pref-prefs', method: 'getprofiles'}, (reply) => {
+						dialog.attr('content', `
+							<div dojoType='fox.Toolbar'>
+								<div dojoType='fox.form.DropDownButton'>
+									<span>${__('Select')}</span>
+									<div dojoType='dijit.Menu' style='display: none'>
+										<div onclick="Tables.select('pref-profiles-list', true)"
+											dojoType='dijit.MenuItem'>${__('All')}</div>
+										<div onclick="Tables.select('pref-profiles-list', false)"
+											dojoType='dijit.MenuItem'>${__('None')}</div>
+									</div>
+								</div>
+
+								<div class="pull-right">
+									<input name='newprofile' dojoType='dijit.form.ValidationTextBox' required='1'>
+									${App.FormFields.button_tag(__('Create profile'), "", {onclick: 'App.dialogOf(this).addProfile()'})}
+								</div>
+							</div>
+
+							<form onsubmit='return false'>
+
+								<div class='panel panel-scrollable'>
+
+									<table width='100%' id='pref-profiles-list'>
+										${reply.map((profile) => `
+											<tr data-row-id="${profile.id}">
+												<td width='5%'>
+													${App.FormFields.checkbox_tag("", false, "", {onclick: 'Tables.onRowChecked(this)'})}
+												</td>
+												<td>
+													${profile.id > 0 ?
+														`<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) => {
+																			//
+																		});
+																</script>
+														</span>` : `${profile.title}`}
+													${profile.active ? __("(active)") : ""}
+												</td>
+											</tr>
+										`).join("")}
+									</table>
+								</div>
+								<footer>
+									${App.FormFields.button_tag(__('Remove selected profiles'), "",
+										{class: 'pull-left alt-danger', onclick: 'App.dialogOf(this).removeSelected()'})}
+									${App.FormFields.submit_tag(__('Activate profile'), {onclick: 'App.dialogOf(this).execute()'})}
+									${App.FormFields.cancel_dialog_tag(__('Cancel'))}
+								</footer>
+							</form>
+						`);
 					});
 				},
 				execute: function () {
@@ -143,7 +195,7 @@ const	Helpers = {
 						if (confirm(__("Activate selected profile?"))) {
 							Notify.progress("Loading, please wait...");
 
-							xhrPost("backend.php", {op: "rpc", method: "setprofile", id: sel_rows.toString()}, () => {
+							xhrPost("backend.php", {op: "pref-prefs", method: "activateprofile", id: sel_rows.toString()}, () => {
 								window.location.reload();
 							});
 						}
-- 
cgit v1.2.3-54-g00ecf

From 39c0fe3697c71e9cfeec74c020b0c31fca376dc0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 18 Feb 2021 12:27:26 +0300
Subject: shorten many invocations of Ajax.Request in inline form methods

---
 classes/pref/prefs.php          | 141 +++++++++++++++++-----------------------
 plugins/af_readability/init.php |  16 ++---
 plugins/af_redditimgur/init.php |  13 ++--
 plugins/mail/init.php           |  14 ++--
 plugins/nsfw/init.php           |  10 ++-
 5 files changed, 80 insertions(+), 114 deletions(-)

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

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 4a4aa45d6..b760affa0 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -291,18 +291,14 @@ class Pref_Prefs extends Handler_Protected {
 			<?= \Controls\hidden_tag("op", "pref-prefs") ?>
 			<?= \Controls\hidden_tag("method", "changeemail") ?>
 
-			<script type='dojo/method' event='onSubmit' args='evt'>
-				evt.preventDefault();
-				if (this.validate()) {
-					Notify.progress('Saving data...', true);
-
-					new Ajax.Request('backend.php', {
-						parameters: dojo.objectToQuery(this.getValues()),
-						onComplete: function(transport) {
+			<script type="dojo/method" event="onSubmit" args="evt">
+					evt.preventDefault();
+					if (this.validate()) {
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
 							Notify.info(transport.responseText);
-						}
-					});
-				}
+						})
+					}
 			</script>
 
 			<fieldset>
@@ -350,32 +346,28 @@ class Pref_Prefs extends Handler_Protected {
 				<?= \Controls\hidden_tag("op", "pref-prefs") ?>
 				<?= \Controls\hidden_tag("method", "changepassword") ?>
 
-				<script type='dojo/method' event='onSubmit' args='evt'>
+				
+				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						Notify.progress('Changing password...', true);
-
-						new Ajax.Request('backend.php', {
-							parameters: dojo.objectToQuery(this.getValues()),
-							onComplete: function(transport) {
-								Notify.close();
-								if (transport.responseText.indexOf('ERROR: ') == 0) {
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.close();
+							if (transport.responseText.indexOf('ERROR: ') == 0) {
 
-									$('pwd_change_infobox').innerHTML =
-										transport.responseText.replace('ERROR: ', '');
+								$('pwd_change_infobox').innerHTML =
+									transport.responseText.replace('ERROR: ', '');
 
-								} else {
-									$('pwd_change_infobox').innerHTML =
-										transport.responseText.replace('ERROR: ', '');
-
-									const warn = $('default_pass_warning');
-									if (warn) Element.hide(warn);
-								}
+							} else {
+								$('pwd_change_infobox').innerHTML =
+									transport.responseText.replace('ERROR: ', '');
 
-								new Effect.Appear('pwd_change_infobox');
+								const warn = $('default_pass_warning');
+								if (warn) Element.hide(warn);
 							}
-						});
-						this.reset();
+
+							new Effect.Appear('pwd_change_infobox');
+						})
 					}
 				</script>
 
@@ -459,23 +451,20 @@ class Pref_Prefs extends Handler_Protected {
 					<?= \Controls\hidden_tag("op", "pref-prefs") ?>
 					<?= \Controls\hidden_tag("method", "otpdisable") ?>
 
-					<script type='dojo/method' event='onSubmit' args='evt'>
+					
+					<script type="dojo/method" event="onSubmit" args="evt">
 						evt.preventDefault();
 						if (this.validate()) {
-							Notify.progress('Disabling OTP', true);
-
-							new Ajax.Request('backend.php', {
-								parameters: dojo.objectToQuery(this.getValues()),
-								onComplete: function(transport) {
-									Notify.close();
-									if (transport.responseText.indexOf('ERROR: ') == 0) {
-										Notify.error(transport.responseText.replace('ERROR: ', ''));
-									} else {
-										window.location.reload();
-									}
+							Notify.progress('Saving data...', true);
+							xhrPost("backend.php", this.getValues(), (transport) => {
+								Notify.close();
+
+								if (transport.responseText.indexOf('ERROR: ') == 0) {
+									Notify.error(transport.responseText.replace('ERROR: ', ''));
+								} else {
+									window.location.reload();
 								}
-							});
-							this.reset();
+							})
 						}
 					</script>
 
@@ -521,22 +510,20 @@ class Pref_Prefs extends Handler_Protected {
 						<input dojoType='dijit.form.ValidationTextBox' disabled='disabled' value="<?= $otp_secret ?>" size='32'>
 					</fieldset>
 
-					<script type='dojo/method' event='onSubmit' args='evt'>
+					
+					<script type="dojo/method" event="onSubmit" args="evt">
 						evt.preventDefault();
 						if (this.validate()) {
 							Notify.progress('Saving data...', true);
+							xhrPost("backend.php", this.getValues(), (transport) => {
+								Notify.close();
 
-							new Ajax.Request('backend.php', {
-								parameters: dojo.objectToQuery(this.getValues()),
-								onComplete: function(transport) {
-									Notify.close();
-									if (transport.responseText.indexOf('ERROR:') == 0) {
-										Notify.error(transport.responseText.replace('ERROR:', ''));
-									} else {
-										window.location.reload();
-									}
+								if (transport.responseText.indexOf('ERROR:') == 0) {
+									Notify.error(transport.responseText.replace('ERROR:', ''));
+								} else {
+									window.location.reload();
 								}
-							});
+							})
 						}
 					</script>
 
@@ -806,26 +793,23 @@ class Pref_Prefs extends Handler_Protected {
 		<form dojoType='dijit.form.Form' id='changeSettingsForm'>
 			<?= \Controls\hidden_tag("op", "pref-prefs") ?>
 			<?= \Controls\hidden_tag("method", "saveconfig") ?>
-			<script type='dojo/method' event='onSubmit' args='evt, quit'>
+
+			<script type="dojo/method" event="onSubmit" args="evt, quit">
 				if (evt) evt.preventDefault();
 				if (this.validate()) {
-					console.log(dojo.objectToQuery(this.getValues()));
-
-					new Ajax.Request('backend.php', {
-						parameters: dojo.objectToQuery(this.getValues()),
-						onComplete: function(transport) {
-							var msg = transport.responseText;
-							if (quit) {
-								document.location.href = 'index.php';
+					xhrPost("backend.php", this.getValues(), (transport) => {
+						if (quit) {
+							document.location.href = 'index.php';
+						} else {
+							const msg = transport.responseText;
+
+							if (msg == 'PREFS_NEED_RELOAD') {
+								window.location.reload();
 							} else {
-								if (msg == 'PREFS_NEED_RELOAD') {
-									window.location.reload();
-								} else {
-									Notify.info(msg);
-								}
+								Notify.info(msg);
 							}
 						}
-					});
+					})
 				}
 			</script>
 
@@ -956,20 +940,15 @@ class Pref_Prefs extends Handler_Protected {
 		?>
 		<form dojoType="dijit.form.Form" id="changePluginsForm">
 			<script type="dojo/method" event="onSubmit" args="evt">
-				evt.preventDefault();
-				if (this.validate()) {
-					Notify.progress('Saving data...', true);
-
-					new Ajax.Request('backend.php', {
-						parameters: dojo.objectToQuery(this.getValues()),
-						onComplete: function(transport) {
+					evt.preventDefault();
+					if (this.validate()) {
+						xhrPost("backend.php", this.getValues(), (transport) => {
 							Notify.close();
 							if (confirm(__('Selected plugins have been enabled. Reload?'))) {
 								window.location.reload();
 							}
-						}
-					});
-				}
+						})
+					}
 			</script>
 
 			<?= \Controls\hidden_tag("op", "pref-prefs") ?>
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index 43d064fc7..a1f92815c 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -69,19 +69,15 @@ class Af_Readability extends Plugin {
 
 				<?= \Controls\pluginhandler_tags($this, "save") ?>
 
-				<script type='dojo/method' event='onSubmit' args='evt'>
+				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						console.log(dojo.objectToQuery(this.getValues()));
-						new Ajax.Request('backend.php', {
-							parameters: dojo.objectToQuery(this.getValues()),
-							onComplete: function(transport) {
-								Notify.info(transport.responseText);
-							}
-						});
-						//this.reset();
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.info(transport.responseText);
+						})
 					}
-					</script>
+				</script>
 
 				<fieldset>
 					<label class='checkbox'>
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 5066186db..827a4c310 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -43,16 +43,13 @@ class Af_RedditImgur extends Plugin {
 
 				<?= \Controls\pluginhandler_tags($this, "save") ?>
 
-				<script type='dojo/method' event='onSubmit' args='evt'>
+				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						console.log(dojo.objectToQuery(this.getValues()));
-						new Ajax.Request('backend.php', {
-							parameters: dojo.objectToQuery(this.getValues()),
-							onComplete: function(transport) {
-								Notify.info(transport.responseText);
-							}
-						});
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.info(transport.responseText);
+						})
 					}
 				</script>
 
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 4b62d1e64..d96006b21 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -50,15 +50,12 @@ class Mail extends Plugin {
 				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						console.log(dojo.objectToQuery(this.getValues()));
-						new Ajax.Request('backend.php', {
-							parameters: dojo.objectToQuery(this.getValues()),
-							onComplete: function(transport) {
-								Notify.info(transport.responseText);
-							}
-						});
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.info(transport.responseText);
+						})
 					}
-					</script>
+				</script>
 
 				<header><?= __("You can set predefined email addressed here (comma-separated list):") ?></header>
 
@@ -70,7 +67,6 @@ class Mail extends Plugin {
 				<?= \Controls\submit_tag(__("Save")) ?>
 
 			</form>
-
 		</div>
 		<?php
 	}
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index 0ee3aebc1..fdc6a3974 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -55,12 +55,10 @@ class NSFW extends Plugin {
 				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
 					if (this.validate()) {
-						new Ajax.Request('backend.php', {
-							parameters: dojo.objectToQuery(this.getValues()),
-							onComplete: function(transport) {
-								Notify.info(transport.responseText);
-							}
-						});
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.info(transport.responseText);
+						})
 					}
 				</script>
 
-- 
cgit v1.2.3-54-g00ecf

From 70fa4230268a422d0b7eef1ea223ca5cc1c14646 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 18 Feb 2021 21:51:18 +0300
Subject: initial for RIP prototype/scriptaculous

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

diff --git a/classes/handler/public.php b/classes/handler/public.php
index b810019c1..80c1c271d 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -362,7 +362,6 @@ class Handler_Public extends Handler {
 			echo javascript_tag("lib/dojo/dojo.js");
 			echo javascript_tag("js/utility.js");
 			echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			echo javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls")
 			?>
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
@@ -388,10 +387,10 @@ class Handler_Public extends Handler {
 						ready(function() {
 							parser.parse();
 
-							new Ajax.Autocompleter('labels_value', 'labels_choices',
+							/* new Ajax.Autocompleter('labels_value', 'labels_choices',
 								"backend.php?op=rpc&method=completeLabels",
 								{ tokens: ',', paramName: "search" });
-							});
+							}); */
 				  	});
 				}
 			};
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index b760affa0..cfbf83d2a 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -366,7 +366,7 @@ class Pref_Prefs extends Handler_Protected {
 								if (warn) Element.hide(warn);
 							}
 
-							new Effect.Appear('pwd_change_infobox');
+							Element.show('pwd_change_infobox');
 						})
 					}
 				</script>
diff --git a/index.php b/index.php
index d53fb54a8..4a4d336ca 100644
--- a/index.php
+++ b/index.php
@@ -76,8 +76,7 @@
 	</script>
 
 	<?php
-	foreach (array("lib/prototype.js",
-				"lib/scriptaculous/scriptaculous.js?load=effects,controls",
+	foreach (array(#"lib/_prototype.js",
 				"lib/dojo/dojo.js",
 				"lib/dojo/tt-rss-layer.js",
 				"js/tt-rss.js",
diff --git a/js/App.js b/js/App.js
index 75cf73288..0a66987ed 100644
--- a/js/App.js
+++ b/js/App.js
@@ -109,6 +109,15 @@ const App = {
          }
       }
    },
+   byId: function(id) {
+      return document.getElementById(id);
+   },
+   find: function(query) {
+      return document.querySelector(query)
+   },
+   findAll: function(query) {
+      return document.querySelectorAll(query);
+   },
    dialogOf: function (elem) {
 
       // elem could be a Dijit widget
@@ -140,21 +149,20 @@ const App = {
 		}
 	},
 	setupNightModeDetection: function(callback) {
-		if (!$("theme_css")) {
+		if (!App.byId("theme_css")) {
 			const mql = window.matchMedia('(prefers-color-scheme: dark)');
 
 			try {
 				mql.addEventListener("change", () => {
-					this.nightModeChanged(mql.matches, $("theme_auto_css"));
+					this.nightModeChanged(mql.matches, App.byId("theme_auto_css"));
 				});
 			} catch (e) {
 				console.warn("exception while trying to set MQL event listener");
 			}
 
-			const link = new Element("link", {
-				rel: "stylesheet",
-				id: "theme_auto_css"
-			});
+			const link = document.createElement("link");
+         link.rel = "stylesheet";
+         link.id = "theme_auto_css";
 
 			if (callback) {
 						link.onload = function() {
@@ -176,7 +184,7 @@ const App = {
 			if (callback) callback();
 		}
 	},
-	enableCsrfSupport: function() {
+	/*enableCsrfSupport: function() {
 		const _this = this;
 
 		Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
@@ -196,7 +204,7 @@ const App = {
 				return callOriginal(options);
 			}
 		);
-   },
+   }, */
    postCurrentWindow: function(target, params) {
       const form = document.createElement("form");
 
@@ -245,8 +253,13 @@ const App = {
 		}
 
    },
-	urlParam: function(param) {
-		return String(window.location.href).parseQuery()[param];
+	urlParam: function(name) {
+		try {
+         const results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
+         return decodeURIComponent(results[1].replace(/\+/g, " ")) || 0;
+      } catch (e) {
+         return 0;
+      }
 	},
 	next_seq: function() {
 		this._rpc_seq += 1;
@@ -262,7 +275,7 @@ const App = {
 			dijit.byId("loading_bar").update({progress: this._loading_progress});
 
 		if (this._loading_progress >= 90) {
-			$("overlay").hide();
+			App.byId("overlay").hide();
 		}
 
 	},
@@ -293,7 +306,7 @@ const App = {
 		if (!this.hotkey_prefix && hotkeys_map[0].indexOf(keychar) != -1) {
 
 			this.hotkey_prefix = keychar;
-			$("cmdline").innerHTML = keychar;
+			App.byId("cmdline").innerHTML = keychar;
 			Element.show("cmdline");
 
 			window.clearTimeout(this.hotkey_prefix_timeout);
@@ -342,11 +355,11 @@ const App = {
 	cleanupMemory: function(root) {
 		const dijits = dojo.query("[widgetid]", dijit.byId(root).domNode).map(dijit.byNode);
 
-		dijits.each(function (d) {
+		dijits.forEach(function (d) {
 			dojo.destroy(d.domNode);
 		});
 
-		$$("#" + root + " *").each(function (i) {
+		App.findAll("#" + root + " *").forEach(function (i) {
 			i.parentNode ? i.parentNode.removeChild(i) : true;
 		});
    },
@@ -364,9 +377,9 @@ const App = {
    },
    displayIfChecked: function(checkbox, elemId) {
       if (checkbox.checked) {
-         Effect.Appear(elemId, {duration : 0.5});
+         Element.show(elemId);
       } else {
-         Effect.Fade(elemId, {duration : 0.5});
+         Element.hide(elemId);
       }
    },
    hotkeyHelp: function() {
@@ -381,7 +394,7 @@ const App = {
    },
 	handleRpcJson: function(transport) {
 
-		const netalert = $$("#toolbar .net-alert")[0];
+		const netalert = App.findAll("#toolbar .net-alert")[0];
 
 		try {
 			const reply = JSON.parse(transport.responseText);
@@ -459,7 +472,7 @@ const App = {
 				}
 
 				if (k == "recent_log_events") {
-					const alert = $$(".log-alert")[0];
+					const alert = App.findAll(".log-alert")[0];
 
 					if (alert) {
 						v > 0 ? alert.show() : alert.hide();
@@ -516,7 +529,7 @@ const App = {
 							break;
 						case "cdm_auto_catchup":
 							if (params[k] == 1) {
-								const hl = $("headlines-frame");
+								const hl = App.byId("headlines-frame");
 								if (hl) hl.addClassName("auto_catchup");
 							}
 							break;
@@ -562,7 +575,7 @@ const App = {
 			}
 
 			return this.report(error,
-				Object.extend({title: __("Fatal error")}, params));
+				{...{title: __("Fatal error")}, ...params});
 		},
 		report: function(error, params = {}) {
 			if (!error) return;
@@ -650,7 +663,7 @@ const App = {
 
          this.setLoadingProgress(30);
          this.initHotkeyActions();
-         this.enableCsrfSupport();
+         //this.enableCsrfSupport();
 
          const params = {
             op: "rpc",
@@ -671,7 +684,7 @@ const App = {
    checkBrowserFeatures: function() {
       let errorMsg = "";
 
-      ['MutationObserver'].each(function(wf) {
+      ['MutationObserver'].forEach(function(wf) {
          if (!(wf in window)) {
             errorMsg = `Browser feature check failed: <code>window.${wf}</code> not found.`;
             throw new Error(errorMsg);
@@ -794,9 +807,9 @@ const App = {
             console.log('update reply', reply);
 
             if (reply.id) {
-               $("updates-available").show();
+               App.byId("updates-available").show();
             } else {
-               $("updates-available").hide();
+               App.byId("updates-available").hide();
             }
          });
    },
@@ -812,7 +825,7 @@ const App = {
    onViewModeChanged: function() {
       const view_mode = document.forms["toolbar-main"].view_mode.value;
 
-      $$("body")[0].setAttribute("view-mode", view_mode);
+      App.findAll("body")[0].setAttribute("view-mode", view_mode);
 
       return Feeds.reloadCurrent('');
    },
@@ -851,8 +864,8 @@ const App = {
                {width: Cookie.get("ttrss_ci_width") + "px" });
          }
 
-         $("headlines-frame").setStyle({ borderBottomWidth: '0px' });
-         $("headlines-frame").addClassName("wide");
+         App.byId("headlines-frame").setStyle({ borderBottomWidth: '0px' });
+         App.byId("headlines-frame").addClassName("wide");
 
       } else {
 
@@ -867,8 +880,8 @@ const App = {
                {height: Cookie.get("ttrss_ci_height") + "px" });
          }
 
-         $("headlines-frame").setStyle({ borderBottomWidth: '1px' });
-         $("headlines-frame").removeClassName("wide");
+         App.byId("headlines-frame").setStyle({ borderBottomWidth: '1px' });
+         App.byId("headlines-frame").removeClassName("wide");
 
       }
 
@@ -1107,7 +1120,7 @@ const App = {
          this.hotkey_actions["select_article_cursor"] = () => {
             const id = Article.getUnderPointer();
             if (id) {
-               const row = $("RROW-" + id);
+               const row = App.byId("RROW-" + id);
 
                if (row)
                   row.toggleClassName("Selected");
@@ -1234,7 +1247,7 @@ const App = {
             }
             break;
          case "qmcHKhelp":
-            this.hotkeyHelp();
+            this.helpDialog("main");
             break;
          default:
             console.log("quickMenuGo: unknown action: " + opid);
diff --git a/js/Article.js b/js/Article.js
index 81917fd47..e7498f0b3 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -36,19 +36,19 @@ const Article = {
 			const score = prompt(__("Please enter new score for selected articles:"));
 
 			if (!isNaN(parseInt(score))) {
-				ids.each((id) => {
-					const row = $("RROW-" + id);
+				ids.forEach((id) => {
+					const row = App.byId("RROW-" + id);
 
 					if (row) {
 						row.setAttribute("data-score", score);
 
-						const pic = row.select(".icon-score")[0];
+						const pic = row.querySelector(".icon-score");
 
 						pic.innerHTML = Article.getScorePic(score);
 						pic.setAttribute("title", score);
 
 						["score-low", "score-high", "score-half-low", "score-half-high", "score-neutral"]
-							.each(function(scl) {
+							.forEach(function(scl) {
 								if (row.hasClassName(scl))
 									row.removeClassName(scl);
 							});
@@ -72,13 +72,13 @@ const Article = {
 			if (!isNaN(parseInt(score))) {
 				row.setAttribute("data-score", score);
 
-				const pic = row.select(".icon-score")[0];
+				const pic = row.querySelector(".icon-score");
 
 				pic.innerHTML = Article.getScorePic(score);
 				pic.setAttribute("title", score);
 
 				["score-low", "score-high", "score-half-low", "score-half-high", "score-neutral"]
-					.each(function(scl) {
+					.forEach(function(scl) {
 						if (row.hasClassName(scl))
 							row.removeClassName(scl);
 					});
@@ -104,7 +104,7 @@ const Article = {
 		}
 	}, */
 	cdmUnsetActive: function (event) {
-		const row = $("RROW-" + Article.getActive());
+		const row = App.byId("RROW-" + Article.getActive());
 
 		if (row) {
 			row.removeClassName("active");
@@ -249,7 +249,7 @@ const Article = {
 				container.innerHTML += " ";
 
 			// in expandable mode, save content for later, so that we can pack unfocused rows back
-			if (App.isCombinedMode() && $("main").hasClassName("expandable"))
+			if (App.isCombinedMode() && App.byId("main").hasClassName("expandable"))
 				row.setAttribute("data-content-original", row.getAttribute("data-content"));
 
 			row.removeAttribute("data-content");
@@ -351,7 +351,7 @@ const Article = {
 							if (data) {
 								const id = data.id;
 
-								const tags = $("ATSTR-" + id);
+								const tags = App.byId("ATSTR-" + id);
 								const tooltip = dijit.byId("ATSTRTIP-" + id);
 
 								if (tags) tags.innerHTML = data.content;
@@ -370,13 +370,13 @@ const Article = {
 
 			xhrJson("backend.php", {op: "article", method: "printArticleTags", id: id}, (reply) => {
 
-				dijit.getEnclosingWidget($("tags_str"))
+				dijit.getEnclosingWidget(App.byId("tags_str"))
 					.attr('value', reply.tags.join(", "))
 					.attr('disabled', false);
 
-				new Ajax.Autocompleter("tags_str", "tags_choices",
+				/* new Ajax.Autocompleter("tags_str", "tags_choices",
 					"backend.php?op=article&method=completeTags",
-					{tokens: ',', paramName: "search"});
+					{tokens: ',', paramName: "search"}); */
 			});
 		});
 
@@ -386,8 +386,8 @@ const Article = {
 	cdmMoveToId: function (id, params = {}) {
 		const force_to_top = params.force_to_top || false;
 
-		const ctr = $("headlines-frame");
-		const row = $("RROW-" + id);
+		const ctr = App.byId("headlines-frame");
+		const row = App.byId("RROW-" + id);
 
 		if (!row || !ctr) return;
 
@@ -399,12 +399,12 @@ const Article = {
 		if (id != Article.getActive()) {
 			console.log("setActive", id, "was", Article.getActive());
 
-			$$("div[id*=RROW][class*=active]").each((row) => {
+			App.findAll("div[id*=RROW][class*=active]").forEach((row) => {
 				row.removeClassName("active");
 				Article.pack(row);
 			});
 
-			const row = $("RROW-" + id);
+			const row = App.byId("RROW-" + id);
 
 			if (row) {
 				Article.unpack(row);
@@ -425,10 +425,10 @@ const Article = {
 			return 0;
 	},
 	scrollByPages: function (page_offset) {
-		App.Scrollable.scrollByPages($("content-insert"), page_offset);
+		App.Scrollable.scrollByPages(App.byId("content-insert"), page_offset);
 	},
 	scroll: function (offset) {
-		App.Scrollable.scroll($("content-insert"), offset);
+		App.Scrollable.scroll(App.byId("content-insert"), offset);
 	},
 	mouseIn: function (id) {
 		this.post_under_pointer = id;
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index dd0d56194..40313d34f 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -25,7 +25,7 @@ const	CommonDialogs = {
 					else
 						Feeds.reload();
 
-					const icon = $$(".feed-editor-icon")[0];
+					const icon = App.findAll(".feed-editor-icon")[0];
 
 					if (icon)
 						icon.src = icon.src.replace(/\?[0-9]+$/, "?" + new Date().getTime());
@@ -36,7 +36,7 @@ const	CommonDialogs = {
 			return false;
 		},
 		uploadFeedIcon: function() {
-			const file = $("icon_file");
+			const file = App.byId("icon_file");
 
 			if (file.value.length == 0) {
 				alert(__("Please select an image file to upload."));
@@ -57,7 +57,7 @@ const	CommonDialogs = {
 								else
 									Feeds.reload();
 
-								const icon = $$(".feed-editor-icon")[0];
+								const icon = App.findAll(".feed-editor-icon")[0];
 
 								if (icon)
 									icon.src = icon.src.replace(/\?[0-9]+$/, "?" + new Date().getTime());
@@ -72,7 +72,7 @@ const	CommonDialogs = {
 							break;
 					}
 				};
-				xhr.send(new FormData($("feed_icon_upload_form")));
+				xhr.send(new FormData(App.byId("feed_icon_upload_form")));
 			}
 
 			return false;
@@ -165,13 +165,11 @@ const	CommonDialogs = {
 								</form>
 							`,
 							show_error: function (msg) {
-								const elem = $("fadd_error_message");
+								const elem = App.byId("fadd_error_message");
 
 								elem.innerHTML = msg;
 
-								if (!Element.visible(elem))
-									new Effect.Appear(elem);
-
+								Element.show(elem);
 							},
 							execute: function () {
 								if (this.validate()) {
@@ -239,7 +237,7 @@ const	CommonDialogs = {
 															}
 														}
 
-														Effect.Appear('feedDlg_feedsContainer', {duration: 0.5});
+														Element.show('feedDlg_feedsContainer');
 													}
 													break;
 												case 5:
@@ -463,8 +461,6 @@ const	CommonDialogs = {
 											target.href = new_link;
 											target.innerHTML = new_link;
 
-											new Effect.Highlight(target);
-
 											Notify.close();
 
 										} else {
@@ -528,8 +524,6 @@ const	CommonDialogs = {
 										target.href = target.href.replace(/&key=.*$/,
 											"&key=" + new_link);
 
-										new Effect.Highlight(target);
-
 										Notify.close();
 
 									} else {
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index e3629157b..d5b751f91 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -9,7 +9,7 @@ const	Filters = {
 	filterDlgCheckAction: function(sender) {
 		const action = sender.value;
 
-		const action_param = $("filterDlg_paramBox");
+		const action_param = App.byId("filterDlg_paramBox");
 
 		if (!action_param) {
 			console.log("filterDlgCheckAction: can't find action param box!");
@@ -18,7 +18,7 @@ const	Filters = {
 
 		// if selected action supports parameters, enable params field
 		if (action == 4 || action == 6 || action == 7 || action == 9) {
-			new Effect.Appear(action_param, {duration: 0.5});
+			Element.show(action_param);
 
 			Element.hide(dijit.byId("filterDlg_actionParam").domNode);
 			Element.hide(dijit.byId("filterDlg_actionParamLabel").domNode);
@@ -97,7 +97,7 @@ const	Filters = {
 			title: ruleStr ? __("Edit rule") : __("Add rule"),
 			execute: function () {
 				if (this.validate()) {
-					Filters.createNewRuleElement($("filterDlg_Matches"), replaceNode);
+					Filters.createNewRuleElement(App.byId("filterDlg_Matches"), replaceNode);
 					this.hide();
 				}
 			},
@@ -119,7 +119,7 @@ const	Filters = {
 			title: actionStr ? __("Edit action") : __("Add action"),
 			execute: function () {
 				if (this.validate()) {
-					Filters.createNewActionElement($("filterDlg_Actions"), replaceNode);
+					Filters.createNewActionElement(App.byId("filterDlg_Actions"), replaceNode);
 					this.hide();
 				}
 			}
@@ -158,7 +158,7 @@ const	Filters = {
 
 							console.log("got results:" + result.length);
 
-							$("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...")
+							App.byId("prefFilterProgressMsg").innerHTML = __("Looking for articles (%d processed, %f found)...")
 								.replace("%f", dialog.results)
 								.replace("%d", offset);
 
@@ -167,7 +167,7 @@ const	Filters = {
 							for (let i = 0; i < result.length; i++) {
 								const tmp = dojo.create("table", { innerHTML: result[i]});
 
-								$("prefFilterTestResultList").innerHTML += tmp.innerHTML;
+								App.byId("prefFilterTestResultList").innerHTML += tmp.innerHTML;
 							}
 
 							if (dialog.results < 30 && offset < dialog.max_offset) {
@@ -183,11 +183,11 @@ const	Filters = {
 								Element.hide("prefFilterLoadingIndicator");
 
 								if (dialog.results == 0) {
-									$("prefFilterTestResultList").innerHTML = `<tr><td align='center'>
+									App.byId("prefFilterTestResultList").innerHTML = `<tr><td align='center'>
 										${__('No recent articles matching this filter have been found.')}</td></tr>`;
-									$("prefFilterProgressMsg").innerHTML = "Articles matching this filter:";
+									App.byId("prefFilterProgressMsg").innerHTML = "Articles matching this filter:";
 								} else {
-									$("prefFilterProgressMsg").innerHTML = __("Found %d articles matching this filter:")
+									App.byId("prefFilterProgressMsg").innerHTML = __("Found %d articles matching this filter:")
 										.replace("%d", dialog.results);
 								}
 
@@ -289,12 +289,12 @@ const	Filters = {
 						Filters.addFilterRule();
 					},
 					deleteAction: function () {
-						$$("#filterDlg_Actions li[class*=Selected]").each(function (e) {
+						App.findAll("#filterDlg_Actions li[class*=Selected]").forEach(function (e) {
 							e.parentNode.removeChild(e)
 						});
 					},
 					deleteRule: function () {
-						$$("#filterDlg_Matches li[class*=Selected]").each(function (e) {
+						App.findAll("#filterDlg_Matches li[class*=Selected]").forEach(function (e) {
 							e.parentNode.removeChild(e)
 						});
 					},
diff --git a/js/FeedTree.js b/js/FeedTree.js
index 694cf8332..17cd3deea 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -286,7 +286,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co
 
 				// focus headlines to route key events there
 				setTimeout(() => {
-					$("headlines-frame").focus();
+					App.byId("headlines-frame").focus();
 
 					if (treeNode) {
 						const node = treeNode.rowNode;
@@ -295,7 +295,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dojo/_base/array", "dojo/co
 						if (node && tree) {
 							// scroll tree to selection if needed
 							if (node.offsetTop < tree.scrollTop || node.offsetTop > tree.scrollTop + tree.clientHeight) {
-								$("feedTree").scrollTop = node.offsetTop;
+								App.byId("feedTree").scrollTop = node.offsetTop;
 							}
 						}
 					}
diff --git a/js/Feeds.js b/js/Feeds.js
index 0567cf8c5..7f3a80f4e 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -117,7 +117,7 @@ const	Feeds = {
 	toggle: function() {
 		Element.toggle("feeds-holder");
 
-		const splitter = $("feeds-holder_splitter");
+		const splitter = App.byId("feeds-holder_splitter");
 
 		Element.visible("feeds-holder") ? splitter.show() : splitter.hide();
 
@@ -180,7 +180,7 @@ const	Feeds = {
 				dojo.disconnect(tmph);
 			});
 
-			$("feeds-holder").appendChild(tree.domNode);
+			App.byId("feeds-holder").appendChild(tree.domNode);
 
 			const tmph2 = dojo.connect(tree, 'onLoad', function () {
 				dojo.disconnect(tmph2);
@@ -284,8 +284,8 @@ const	Feeds = {
 		this._active_feed_id = id;
 		this._active_feed_is_cat = is_cat;
 
-		$("headlines-frame").setAttribute("feed-id", id);
-		$("headlines-frame").setAttribute("is-cat", is_cat ? 1 : 0);
+		App.byId("headlines-frame").setAttribute("feed-id", id);
+		App.byId("headlines-frame").setAttribute("is-cat", is_cat ? 1 : 0);
 
 		this.select(id, is_cat);
 
@@ -310,8 +310,8 @@ const	Feeds = {
 		if (tree)
 			return tree.hideRead(hide, App.getInitParam("hide_read_shows_special"));*/
 
-		$$("body")[0].setAttribute("hide-read-feeds", !!hide);
-		$$("body")[0].setAttribute("hide-read-shows-special", !!App.getInitParam("hide_read_shows_special"));
+		App.findAll("body")[0].setAttribute("hide-read-feeds", !!hide);
+		App.findAll("body")[0].setAttribute("hide-read-shows-special", !!App.getInitParam("hide_read_shows_special"));
 	},
 	open: function(params) {
 		const feed = params.feed;
@@ -339,7 +339,7 @@ const	Feeds = {
 			}, 10 * 1000);
 		}
 
-		Form.enable("toolbar-main");
+		//Form.enable("toolbar-main");
 
 		let query = Object.assign({op: "feeds", method: "view", feed: feed},
 			dojo.formToObject("toolbar-main"));
@@ -362,7 +362,7 @@ const	Feeds = {
 			query.m = "ForceUpdate";
 		}
 
-		Form.enable("toolbar-main");
+		//Form.enable("toolbar-main");
 
 		if (!delayed)
 			if (!this.setExpando(feed, is_cat,
@@ -476,9 +476,9 @@ const	Feeds = {
 
 		if (App.getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
 
-			const rows = $$("#headlines-frame > div[id*=RROW][class*=Unread][data-orig-feed-id='" + id + "']");
+			const rows = App.findAll("#headlines-frame > div[id*=RROW][class*=Unread][data-orig-feed-id='" + id + "']");
 
-			rows.each((row) => {
+			rows.forEach((row) => {
 				row.removeClassName("Unread");
 			})
 		}
diff --git a/js/Headlines.js b/js/Headlines.js
index 128a7e571..143a42d0b 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -44,7 +44,7 @@ const Headlines = {
 	row_observer: new MutationObserver((mutations) => {
 		const modified = [];
 
-		mutations.each((m) => {
+		mutations.forEach((m) => {
 			if (m.type == 'attributes' && ['class', 'data-score'].indexOf(m.attributeName) != -1) {
 
 				const row = m.target;
@@ -54,7 +54,7 @@ const Headlines = {
 					const hl = Headlines.headlines[id];
 
 					if (hl) {
-						const hl_old = Object.extend({}, hl);
+						const hl_old = {...{}, ...hl};
 
 						hl.unread = row.hasClassName("Unread");
 						hl.marked = row.hasClassName("marked");
@@ -94,7 +94,7 @@ const Headlines = {
 			rescore: {},
 		};
 
-		modified.each(function (m) {
+		modified.forEach(function (m) {
 			if (m.old.marked != m.new.marked)
 				ops.tmark.push(m.id);
 
@@ -118,29 +118,29 @@ const Headlines = {
 			}
 		});
 
-		ops.select.each((row) => {
-			const cb = dijit.getEnclosingWidget(row.select(".rchk")[0]);
+		ops.select.forEach((row) => {
+			const cb = dijit.getEnclosingWidget(row.querySelector(".rchk"));
 
 			if (cb)
 				cb.attr('checked', true);
 		});
 
-		ops.deselect.each((row) => {
-			const cb = dijit.getEnclosingWidget(row.select(".rchk")[0]);
+		ops.deselect.forEach((row) => {
+			const cb = dijit.getEnclosingWidget(row.querySelector(".rchk"));
 
 			if (cb && !row.hasClassName("active"))
 				cb.attr('checked', false);
 		});
 
-		ops.activate.each((row) => {
-			const cb = dijit.getEnclosingWidget(row.select(".rchk")[0]);
+		ops.activate.forEach((row) => {
+			const cb = dijit.getEnclosingWidget(row.querySelector(".rchk"));
 
 			if (cb)
 				cb.attr('checked', true);
 		});
 
-		ops.deactivate.each((row) => {
-			const cb = dijit.getEnclosingWidget(row.select(".rchk")[0]);
+		ops.deactivate.forEach((row) => {
+			const cb = dijit.getEnclosingWidget(row.querySelector(".rchk"));
 
 			if (cb && !row.hasClassName("Selected"))
 				cb.attr('checked', false);
@@ -167,7 +167,7 @@ const Headlines = {
 		const scores = Object.keys(ops.rescore);
 
 		if (scores.length != 0) {
-			scores.each((score) => {
+			scores.forEach((score) => {
 				promises.push(xhrPost("backend.php",
 					{op: "article", method: "setScore", id: ops.rescore[score].toString(), score: score}));
 			});
@@ -211,7 +211,7 @@ const Headlines = {
 
 					Headlines.select('none');
 
-					const scroll_position_A = $("RROW-" + id).offsetTop - $("headlines-frame").scrollTop;
+					const scroll_position_A = App.byId("RROW-" + id).offsetTop - App.byId("headlines-frame").scrollTop;
 
 					Article.setActive(id);
 
@@ -222,10 +222,10 @@ const Headlines = {
 
 						Headlines.toggleUnread(id, 0);
 					} else {
-						const scroll_position_B = $("RROW-" + id).offsetTop - $("headlines-frame").scrollTop;
+						const scroll_position_B = App.byId("RROW-" + id).offsetTop - App.byId("headlines-frame").scrollTop;
 
 						// this would only work if there's enough space
-						$("headlines-frame").scrollTop -= scroll_position_A-scroll_position_B;
+						App.byId("headlines-frame").scrollTop -= scroll_position_A-scroll_position_B;
 
 						Article.cdmMoveToId(id);
 					}
@@ -252,7 +252,7 @@ const Headlines = {
 		return false;
 	},
 	initScrollHandler: function () {
-		$("headlines-frame").onscroll = (event) => {
+		App.byId("headlines-frame").onscroll = (event) => {
 			clearTimeout(this._headlines_scroll_timeout);
 			this._headlines_scroll_timeout = window.setTimeout(function () {
 				//console.log('done scrolling', event);
@@ -262,8 +262,8 @@ const Headlines = {
 	},
 	loadMore: function () {
 		const view_mode = document.forms["toolbar-main"].view_mode.value;
-		const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
-		const num_all = $$("#headlines-frame > div[id*=RROW]").length;
+		const unread_in_buffer = App.findAll("#headlines-frame > div[id*=RROW][class*=Unread]").length;
+		const num_all = App.findAll("#headlines-frame > div[id*=RROW]").length;
 		const num_unread = Feeds.getUnread(Feeds.getActive(), Feeds.activeIsCat());
 
 		// TODO implement marked & published
@@ -289,10 +289,10 @@ const Headlines = {
 		Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), offset: offset, append: true});
 	},
 	isChildVisible: function (elem) {
-		return App.Scrollable.isChildVisible(elem, $("headlines-frame"));
+		return App.Scrollable.isChildVisible(elem, App.byId("headlines-frame"));
 	},
 	firstVisible: function () {
-		const rows = $$("#headlines-frame > div[id*=RROW]");
+		const rows = App.findAll("#headlines-frame > div[id*=RROW]");
 
 		for (let i = 0; i < rows.length; i++) {
 			const row = rows[i];
@@ -303,7 +303,7 @@ const Headlines = {
 		}
 	},
 	unpackVisible: function(container) {
-		const rows = $$("#headlines-frame > div[id*=RROW][data-content].cdm");
+		const rows = App.findAll("#headlines-frame > div[id*=RROW][data-content].cdm");
 
 		for (let i = 0; i < rows.length; i++) {
 			if (App.Scrollable.isChildVisible(rows[i], container)) {
@@ -315,8 +315,8 @@ const Headlines = {
 	scrollHandler: function (/*event*/) {
 		try {
 			if (!Feeds.infscroll_disabled && !Feeds.infscroll_in_progress) {
-				const hsp = $("headlines-spacer");
-				const container = $("headlines-frame");
+				const hsp = App.byId("headlines-spacer");
+				const container = App.byId("headlines-frame");
 
 				if (hsp && hsp.previousSibling) {
 					const last_row = hsp.previousSibling;
@@ -333,7 +333,7 @@ const Headlines = {
 			}
 
 			if (App.isCombinedMode() && App.getInitParam("cdm_expanded")) {
-				const container = $("headlines-frame")
+				const container = App.byId("headlines-frame")
 
 				/* don't do anything until there was some scrolling */
 				if (container.scrollTop > 0)
@@ -342,12 +342,12 @@ const Headlines = {
 
 			if (App.getInitParam("cdm_auto_catchup")) {
 
-				const rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]");
+				const rows = App.findAll("#headlines-frame > div[id*=RROW][class*=Unread]");
 
 				for (let i = 0; i < rows.length; i++) {
 					const row = rows[i];
 
-					if ($("headlines-frame").scrollTop > (row.offsetTop + row.offsetHeight / 2)) {
+					if (App.byId("headlines-frame").scrollTop > (row.offsetTop + row.offsetHeight / 2)) {
 						row.removeClassName("Unread");
 					} else {
 						break;
@@ -362,23 +362,23 @@ const Headlines = {
 		return this.headlines[id];
 	},
 	setCommonClasses: function () {
-		$("headlines-frame").removeClassName("cdm");
-		$("headlines-frame").removeClassName("normal");
+		App.byId("headlines-frame").removeClassName("cdm");
+		App.byId("headlines-frame").removeClassName("normal");
 
-		$("headlines-frame").addClassName(App.isCombinedMode() ? "cdm" : "normal");
+		App.byId("headlines-frame").addClassName(App.isCombinedMode() ? "cdm" : "normal");
 
 		// for floating title because it's placed outside of headlines-frame
-		$("main").removeClassName("expandable");
-		$("main").removeClassName("expanded");
+		App.byId("main").removeClassName("expandable");
+		App.byId("main").removeClassName("expanded");
 
 		if (App.isCombinedMode())
-			$("main").addClassName(App.getInitParam("cdm_expanded") ? " expanded" : " expandable");
+			App.byId("main").addClassName(App.getInitParam("cdm_expanded") ? " expanded" : " expandable");
 	},
 	renderAgain: function () {
 		// TODO: wrap headline elements into a knockoutjs model to prevent all this stuff
 		Headlines.setCommonClasses();
 
-		$$("#headlines-frame > div[id*=RROW]").each((row) => {
+		App.findAll("#headlines-frame > div[id*=RROW]").forEach((row) => {
 			const id = row.getAttribute("data-article-id");
 			const hl = this.headlines[id];
 
@@ -401,12 +401,12 @@ const Headlines = {
 			}
 		});
 
-		$$(".cdm .header-sticky-guard").each((e) => {
+		App.findAll(".cdm .header-sticky-guard").forEach((e) => {
 			this.sticky_header_observer.observe(e)
 		});
 
 		if (App.getInitParam("cdm_expanded"))
-			$$("#headlines-frame > div[id*=RROW].cdm").each((e) => {
+			App.findAll("#headlines-frame > div[id*=RROW].cdm").forEach((e) => {
 				this.unpack_observer.observe(e)
 			});
 
@@ -431,7 +431,7 @@ const Headlines = {
 			const tmp = document.createElement("div");
 			tmp.innerHTML = vgrhdr;
 
-			$("headlines-frame").appendChild(tmp.firstChild);
+			App.byId("headlines-frame").appendChild(tmp.firstChild);
 
 			this.vgroup_last_feed = hl.feed_id;
 		}
@@ -555,11 +555,11 @@ const Headlines = {
 		return tmp.firstChild;
 	},
 	updateCurrentUnread: function () {
-		if ($("feed_current_unread")) {
+		if (App.byId("feed_current_unread")) {
 			const feed_unread = Feeds.getUnread(Feeds.getActive(), Feeds.activeIsCat());
 
 			if (feed_unread > 0 && !Element.visible("feeds-holder")) {
-				$("feed_current_unread").innerText = feed_unread;
+				App.byId("feed_current_unread").innerText = feed_unread;
 				Element.show("feed_current_unread");
 			} else {
 				Element.hide("feed_current_unread");
@@ -653,15 +653,15 @@ const Headlines = {
 				// also called in renderAgain() after view mode switch
 				Headlines.setCommonClasses();
 
-				$("headlines-frame").setAttribute("is-vfeed",
+				App.byId("headlines-frame").setAttribute("is-vfeed",
 					reply['headlines']['is_vfeed'] ? 1 : 0);
 
 				Article.setActive(0);
 
 				try {
-					$("headlines-frame").removeClassName("smooth-scroll");
-					$("headlines-frame").scrollTop = 0;
-					$("headlines-frame").addClassName("smooth-scroll");
+					App.byId("headlines-frame").removeClassName("smooth-scroll");
+					App.byId("headlines-frame").scrollTop = 0;
+					App.byId("headlines-frame").addClassName("smooth-scroll");
 				} catch (e) {
 					console.warn(e);
 				}
@@ -669,27 +669,27 @@ const Headlines = {
 				this.headlines = [];
 				this.vgroup_last_feed = undefined;
 
-				/*dojo.html.set($("toolbar-headlines"),
+				/*dojo.html.set(App.byId("toolbar-headlines"),
 					reply['headlines']['toolbar'],
 					{parseContent: true});*/
 
 				Headlines.renderToolbar(reply['headlines']);
 
 				if (typeof reply['headlines']['content'] == 'string') {
-					$("headlines-frame").innerHTML = reply['headlines']['content'];
+					App.byId("headlines-frame").innerHTML = reply['headlines']['content'];
 				} else {
-					$("headlines-frame").innerHTML = '';
+					App.byId("headlines-frame").innerHTML = '';
 
 					for (let i = 0; i < reply['headlines']['content'].length; i++) {
 						const hl = reply['headlines']['content'][i];
 
-						$("headlines-frame").appendChild(this.render(reply['headlines'], hl));
+						App.byId("headlines-frame").appendChild(this.render(reply['headlines'], hl));
 
 						this.headlines[parseInt(hl.id)] = hl;
 					}
 				}
 
-				let hsp = $("headlines-spacer");
+				let hsp = App.byId("headlines-spacer");
 
 				if (!hsp) {
 					hsp = document.createElement("div");
@@ -706,7 +706,7 @@ const Headlines = {
 
 				/*
 				if (Feeds._search_query) {
-					$("feed_title").innerHTML += "<span id='cancel_search'>" +
+					App.byId("feed_title").innerHTML += "<span id='cancel_search'>" +
 						" (<a href='#' onclick='Feeds.cancelSearch()'>" + __("Cancel search") + "</a>)" +
 						"</span>";
 				} */
@@ -716,7 +716,7 @@ const Headlines = {
 			} else if (headlines_count > 0 && feed_id == Feeds.getActive() && is_cat == Feeds.activeIsCat()) {
 				const c = dijit.byId("headlines-frame");
 
-				let hsp = $("headlines-spacer");
+				let hsp = App.byId("headlines-spacer");
 
 				if (hsp)
 					c.domNode.removeChild(hsp);
@@ -724,13 +724,13 @@ const Headlines = {
 				let headlines_appended = 0;
 
 				if (typeof reply['headlines']['content'] == 'string') {
-					$("headlines-frame").innerHTML = reply['headlines']['content'];
+					App.byId("headlines-frame").innerHTML = reply['headlines']['content'];
 				} else {
 					for (let i = 0; i < reply['headlines']['content'].length; i++) {
 						const hl = reply['headlines']['content'][i];
 
 						if (!this.headlines[parseInt(hl.id)]) {
-							$("headlines-frame").appendChild(this.render(reply['headlines'], hl));
+							App.byId("headlines-frame").appendChild(this.render(reply['headlines'], hl));
 
 							this.headlines[parseInt(hl.id)] = hl;
 							++headlines_appended;
@@ -762,7 +762,7 @@ const Headlines = {
 
 				console.log("no headlines received, infscroll_disabled=", Feeds.infscroll_disabled, 'first_id_changed=', first_id_changed);
 
-				const hsp = $("headlines-spacer");
+				const hsp = App.byId("headlines-spacer");
 
 				if (hsp) {
 					if (first_id_changed) {
@@ -775,12 +775,12 @@ const Headlines = {
 				}
 			}
 
-			$$(".cdm .header-sticky-guard").each((e) => {
+			App.findAll(".cdm .header-sticky-guard").forEach((e) => {
 				this.sticky_header_observer.observe(e)
 			});
 
 			if (App.getInitParam("cdm_expanded"))
-				$$("#headlines-frame > div[id*=RROW].cdm").each((e) => {
+				App.findAll("#headlines-frame > div[id*=RROW].cdm").forEach((e) => {
 					this.unpack_observer.observe(e)
 				});
 
@@ -826,8 +826,8 @@ const Headlines = {
 			return;
 		}
 
-		ids.each((id) => {
-			const row = $("RROW-" + id);
+		ids.forEach((id) => {
+			const row = App.byId("RROW-" + id);
 
 			if (row) {
 				switch (cmode) {
@@ -851,7 +851,7 @@ const Headlines = {
 			return;
 		}
 
-		ids.each((id) => {
+		ids.forEach((id) => {
 			this.toggleMark(id);
 		});
 	},
@@ -863,19 +863,19 @@ const Headlines = {
 			return;
 		}
 
-		ids.each((id) => {
+		ids.forEach((id) => {
 			this.togglePub(id);
 		});
 	},
 	toggleMark: function (id) {
-		const row = $("RROW-" + id);
+		const row = App.byId("RROW-" + id);
 
 		if (row)
 			row.toggleClassName("marked");
 
 	},
 	togglePub: function (id) {
-		const row = $("RROW-" + id);
+		const row = App.byId("RROW-" + id);
 
 		if (row)
 			row.toggleClassName("published");
@@ -889,7 +889,7 @@ const Headlines = {
 		let next_id = false;
 		let current_id = Article.getActive();
 
-		if (!Headlines.isChildVisible($("RROW-" + current_id))) {
+		if (!Headlines.isChildVisible(App.byId("RROW-" + current_id))) {
 			console.log('active article is obscured, resetting to first visible...');
 			current_id = Headlines.firstVisible();
 			prev_id = current_id;
@@ -928,15 +928,15 @@ const Headlines = {
 				}
 			} else if (App.isCombinedMode()) {
 				// try to show hsp if no next article exists, in case there's useful information like first_id_changed etc
-				const row = $("RROW-" + current_id);
-				const ctr = $("headlines-frame");
+				const row = App.byId("RROW-" + current_id);
+				const ctr = App.byId("headlines-frame");
 
 				if (row) {
 					const next = row.nextSibling;
 
 					// hsp has half-screen height in auto catchup mode therefore we use its first child (normally A element)
 					if (next && Element.visible(next) && next.id == "headlines-spacer" && next.firstChild) {
-						const offset = $("headlines-spacer").offsetTop - $("headlines-frame").offsetHeight + next.firstChild.offsetHeight;
+						const offset = App.byId("headlines-spacer").offsetTop - App.byId("headlines-frame").offsetHeight + next.firstChild.offsetHeight;
 
 						// don't jump back either
 						if (ctr.scrollTop < offset)
@@ -948,8 +948,8 @@ const Headlines = {
 			if (prev_id || current_id) {
 				if (App.isCombinedMode()) {
 					window.requestAnimationFrame(() => {
-						const row = $("RROW-" + current_id);
-						const ctr = $("headlines-frame");
+						const row = App.byId("RROW-" + current_id);
+						const ctr = App.byId("headlines-frame");
 						const delta_px = Math.round(row.offsetTop) - Math.round(ctr.scrollTop);
 
 						console.log('moving back, delta_px', delta_px);
@@ -970,7 +970,7 @@ const Headlines = {
 	},
 	updateSelectedPrompt: function () {
 		const count = Headlines.getSelected().length;
-		const elem = $("selected_prompt");
+		const elem = App.byId("selected_prompt");
 
 		if (elem) {
 			elem.innerHTML = ngettext("%d article selected",
@@ -980,7 +980,7 @@ const Headlines = {
 		}
 	},
 	toggleUnread: function (id, cmode) {
-		const row = $("RROW-" + id);
+		const row = App.byId("RROW-" + id);
 
 		if (row) {
 			if (typeof cmode == "undefined") cmode = 2;
@@ -1068,7 +1068,7 @@ const Headlines = {
 	getSelected: function () {
 		const rv = [];
 
-		$$("#headlines-frame > div[id*=RROW][class*=Selected]").each(
+		App.findAll("#headlines-frame > div[id*=RROW][class*=Selected]").forEach(
 			function (child) {
 				rv.push(child.getAttribute("data-article-id"));
 			});
@@ -1082,9 +1082,9 @@ const Headlines = {
 	getLoaded: function () {
 		const rv = [];
 
-		const children = $$("#headlines-frame > div[id*=RROW-]");
+		const children = App.findAll("#headlines-frame > div[id*=RROW-]");
 
-		children.each(function (child) {
+		children.forEach(function (child) {
 			if (Element.visible(child)) {
 				rv.push(child.getAttribute("data-article-id"));
 			}
@@ -1111,7 +1111,7 @@ const Headlines = {
 		if (start == stop)
 			return [start];
 
-		const rows = $$("#headlines-frame > div[id*=RROW]");
+		const rows = App.findAll("#headlines-frame > div[id*=RROW]");
 		const results = [];
 		let collecting = false;
 
@@ -1158,10 +1158,7 @@ const Headlines = {
 				console.warn("select: unknown mode", mode);
 		}
 
-		const rows = $$(query);
-
-		for (let i = 0; i < rows.length; i++) {
-			const row = rows[i];
+		App.findAll(query).forEach((row) => {
 
 			switch (mode) {
 				case "none":
@@ -1173,7 +1170,7 @@ const Headlines = {
 				default:
 					row.addClassName("Selected");
 			}
-		}
+		});
 	},
 	catchupSelection: function () {
 		const rows = Headlines.getSelected();
@@ -1212,7 +1209,7 @@ const Headlines = {
 		if (!below) {
 			for (let i = 0; i < visible_ids.length; i++) {
 				if (visible_ids[i] != id) {
-					const e = $("RROW-" + visible_ids[i]);
+					const e = App.byId("RROW-" + visible_ids[i]);
 
 					if (e && e.hasClassName("Unread")) {
 						ids_to_mark.push(visible_ids[i]);
@@ -1224,7 +1221,7 @@ const Headlines = {
 		} else {
 			for (let i = visible_ids.length - 1; i >= 0; i--) {
 				if (visible_ids[i] != id) {
-					const e = $("RROW-" + visible_ids[i]);
+					const e = App.byId("RROW-" + visible_ids[i]);
 
 					if (e && e.hasClassName("Unread")) {
 						ids_to_mark.push(visible_ids[i]);
@@ -1243,7 +1240,7 @@ const Headlines = {
 			if (App.getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) {
 
 				for (let i = 0; i < ids_to_mark.length; i++) {
-					const e = $("RROW-" + ids_to_mark[i]);
+					const e = App.byId("RROW-" + ids_to_mark[i]);
 					e.removeClassName("Unread");
 				}
 			}
@@ -1253,16 +1250,16 @@ const Headlines = {
 		const data = JSON.parse(transport.responseText);
 
 		if (data) {
-			data['info-for-headlines'].each(function (elem) {
-				$$(".HLLCTR-" + elem.id).each(function (ctr) {
+			data['info-for-headlines'].forEach(function (elem) {
+				App.findAll(".HLLCTR-" + elem.id).forEach(function (ctr) {
 					ctr.innerHTML = elem.labels;
 				});
 			});
 		}
 	},
 	scrollToArticleId: function (id) {
-		const container = $("headlines-frame");
-		const row = $("RROW-" + id);
+		const container = App.byId("headlines-frame");
+		const row = App.byId("RROW-" + id);
 
 		if (!container || !row) return;
 
@@ -1361,7 +1358,7 @@ const Headlines = {
 			const labelAddMenu = new dijit.Menu({ownerMenu: menu});
 			const labelDelMenu = new dijit.Menu({ownerMenu: menu});
 
-			labels.each(function (label) {
+			labels.forEach(function (label) {
 				const bare_id = label.id;
 				const name = label.caption;
 
@@ -1409,10 +1406,10 @@ const Headlines = {
 		}
 	},
 	scrollByPages: function (page_offset) {
-		App.Scrollable.scrollByPages($("headlines-frame"), page_offset);
+		App.Scrollable.scrollByPages(App.byId("headlines-frame"), page_offset);
 	},
 	scroll: function (offset) {
-		App.Scrollable.scroll($("headlines-frame"), offset);
+		App.Scrollable.scroll(App.byId("headlines-frame"), offset);
 	},
 	initHeadlinesMenu: function () {
 		if (!dijit.byId("headlinesMenu")) {
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index e081e2e31..92194e037 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -126,7 +126,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 			return (!item || this.model.store.getValue(item, 'type') == 'category') ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feed-icon";
 		},
 		reload: function() {
-			const searchElem = $("feed_search");
+			const searchElem = App.byId("feed_search");
 			const search = (searchElem) ? searchElem.value : "";
 
 			xhrPost("backend.php", { op: "pref-feeds", search: search }, (transport) => {
@@ -228,7 +228,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 			const items = tree.model.getCheckedItems();
 			const rv = [];
 
-			items.each(function (item) {
+			items.forEach(function (item) {
 				if (item.id[0].match("CAT:"))
 					rv.push(tree.model.store.getValue(item, 'bare_id'));
 			});
@@ -262,7 +262,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 			const items = tree.model.getCheckedItems();
 			const rv = [];
 
-			items.each(function (item) {
+			items.forEach(function (item) {
 				if (item.id[0].match("FEED:"))
 					rv.push(tree.model.store.getValue(item, 'bare_id'));
 			});
@@ -304,7 +304,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 						title: __("Edit Multiple Feeds"),
 						getChildByName: function (name) {
 							let rv = null;
-							this.getChildren().each(
+							this.getChildren().forEach(
 								function (child) {
 									if (child.name == name) {
 										rv = child;
@@ -329,7 +329,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 
 								/* normalize unchecked checkboxes because [] is not serialized */
 
-								Object.keys(query).each((key) => {
+								Object.keys(query).forEach((key) => {
 									const val = query[key];
 
 									if (typeof val == "object" && val.length == 0)
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index e7d4efdc1..3d00c730c 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -80,14 +80,14 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			const items = tree.model.getCheckedItems();
 			const rv = [];
 
-			items.each(function (item) {
+			items.forEach(function (item) {
 				rv.push(tree.model.store.getValue(item, 'bare_id'));
 			});
 
 			return rv;
 		},
 		reload: function() {
-			const user_search = $("filter_search");
+			const user_search = App.byId("filter_search");
 			let search = "";
 			if (user_search) { search = user_search.value; }
 
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index 671431c39..f3c44e30d 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -9,7 +9,7 @@ const	Helpers = {
 			return Tables.getSelected("app-password-list");
 		},
 		updateContent: function(data) {
-			$("app_passwords_holder").innerHTML = data;
+			App.byId("app_passwords_holder").innerHTML = data;
 			dojo.parser.parse("app_passwords_holder");
 		},
 		removeSelected: function() {
@@ -218,8 +218,8 @@ const	Helpers = {
 					title: __("Customize stylesheet"),
 					apply: function() {
 						xhrPost("backend.php", this.attr('value'), () => {
-							new Effect.Appear("css_edit_apply_msg");
-							$("user_css_style").innerText = this.attr('value');
+							Element.show("css_edit_apply_msg");
+							App.byId("user_css_style").innerText = this.attr('value');
 						});
 					},
 					execute: function () {
@@ -291,7 +291,7 @@ const	Helpers = {
 	},
 	OPML: {
 		import: function() {
-			const opml_file = $("opml_file");
+			const opml_file = App.byId("opml_file");
 
 			if (opml_file.value.length == 0) {
 				alert(__("Please choose an OPML file first."));
@@ -333,7 +333,7 @@ const	Helpers = {
 					dialog.show();
 				};
 
-				xhr.send(new FormData($("opml_import_form")));
+				xhr.send(new FormData(App.byId("opml_import_form")));
 
 				return false;
 			}
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index f22423091..4392dfc44 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -48,7 +48,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 			const items = tree.model.getCheckedItems();
 			const rv = [];
 
-			items.each(function(item) {
+			items.forEach(function(item) {
 				rv.push(tree.model.store.getValue(item, 'bare_id'));
 			});
 
@@ -87,7 +87,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 							color = bg;
 						}
 
-						const e = $("icon-label-" + id);
+						const e = App.byId("icon-label-" + id);
 
 						if (e) {
 							if (bg) e.style.color = bg;
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index ebfe9231b..2e8c9c4a8 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -5,7 +5,7 @@
 
 const	Users = {
 	reload: function(sort) {
-		const user_search = $("user_search");
+		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) => {
diff --git a/js/common.js b/js/common.js
index fb5cc6531..982bb94a7 100755
--- a/js/common.js
+++ b/js/common.js
@@ -3,35 +3,117 @@
 /* global dijit, __, App, Ajax */
 /* eslint-disable no-new */
 
-/* error reporting shim */
-// TODO: deprecated; remove
-/* function exception_error(e, e_compat, filename, lineno, colno) {
-	if (typeof e == "string")
-		e = e_compat;
+Element.prototype.hasClassName = function(className) {
+	dojo.hasClass(this, className);
+};
+
+Element.prototype.addClassName = function(className) {
+	dojo.addClass(this, className);
+};
+
+Element.prototype.removeClassName = function(className) {
+	dojo.removeClass(this, className);
+};
+
+Element.prototype.setStyle = function(args) {
+	Object.keys(args).forEach((k) => {
+		this.style[k] = args[k];
+	});
+};
+
+Element.prototype.show = function() {
+	this.style.display = "";
+};
+
+Element.prototype.hide = function() {
+	this.style.display = "none";
+};
+
+Element.prototype.toggle = function() {
+	if (this.visible())
+		this.show();
+	else
+		this.hide();
+};
+
+Element.prototype.visible = function() {
+	// TODO: should we actually check for offsetWidth/offsetHeight == 0?
+	return this.style.display != "none";
+}
+
+Element.visible = function(elem) {
+	if (typeof elem == "string")
+		elem = document.getElementById(elem);
+
+	return elem.visible();
+}
+
+Element.show = function(elem) {
+	if (typeof elem == "string")
+		elem = document.getElementById(elem);
+
+	return elem.show();
+}
+
+Element.hide = function(elem) {
+	if (typeof elem == "string")
+		elem = document.getElementById(elem);
+
+	return elem.hide();
+}
+
+Element.toggle = function(elem) {
+	if (typeof elem == "string")
+		elem = document.getElementById(elem);
+
+	return elem.toggle();
+}
 
-	App.Error.report(e, {filename: filename, lineno: lineno, colno: colno});
-} */
+Element.hasClassName = function (id, className) {
+	return document.getElementById(id).hasClassName(className);
+}
 
 /* xhr shorthand helpers */
 
 /* exported xhrPost */
-function xhrPost(url, params, complete) {
+function xhrPost(url, params = {}, complete = undefined) {
 	console.log("xhrPost:", params);
 
 	return new Promise((resolve, reject) => {
-		new Ajax.Request(url, {
-			parameters: params,
-			onComplete: function(reply) {
-				if (complete != undefined) complete(reply);
-
-				resolve(reply);
-			}
-		});
+		if (typeof __csrf_token != "undefined")
+			params = {...params, ...{csrf_token: __csrf_token}};
+
+		dojo.xhrPost({url: url,
+			postData: dojo.objectToQuery(params),
+			handleAs: "text",
+			error: function(error) {
+				reject(error);
+			},
+			load: function(data, ioargs) {
+				if (complete != undefined)
+					complete(ioargs.xhr);
+
+				resolve(ioargs.xhr)
+			}});
 	});
 }
 
+Array.prototype.remove = function(s) {
+	for (let i=0; i < this.length; i++) {
+		if (s == this[i]) this.splice(i, 1);
+	}
+};
+
+Array.prototype.uniq = function() {
+	return this.filter((v, i, a) => a.indexOf(v) === i);
+};
+
+String.prototype.stripTags = function() {
+	return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>])+)?(\/)?>|<\/\w+>/gi, '');
+}
+
 /* exported xhrJson */
-function xhrJson(url, params, complete) {
+function xhrJson(url, params = {}, complete = undefined) {
 	return new Promise((resolve, reject) =>
 		xhrPost(url, params).then((reply) => {
 			let obj = null;
@@ -48,13 +130,6 @@ function xhrJson(url, params, complete) {
 		}));
 }
 
-/* add method to remove element from array */
-Array.prototype.remove = function(s) {
-	for (let i=0; i < this.length; i++) {
-		if (s == this[i]) this.splice(i, 1);
-	}
-};
-
 /* common helpers not worthy of separate Dojo modules */
 
 /* exported Lists */
@@ -70,8 +145,8 @@ const Lists = {
 			checked ? row.addClassName("Selected") : row.removeClassName("Selected");
 	},
 	select: function(elemId, selected) {
-		$(elemId).select("li").each((row) => {
-			const checkNode = row.select(".dijitCheckBox,input[type=checkbox]")[0];
+		$(elemId).querySelectorAll("li").forEach((row) => {
+			const checkNode = row.querySelector(".dijitCheckBox,input[type=checkbox]");
 			if (checkNode) {
 				const widget = dijit.getEnclosingWidget(checkNode);
 
@@ -101,8 +176,8 @@ const Tables = {
 
 	},
 	select: function(elemId, selected) {
-		$(elemId).select("tr").each((row) => {
-			const checkNode = row.select(".dijitCheckBox,input[type=checkbox]")[0];
+		$(elemId).querySelector("tr").forEach((row) => {
+			const checkNode = row.querySelector(".dijitCheckBox,input[type=checkbox]");
 			if (checkNode) {
 				const widget = dijit.getEnclosingWidget(checkNode);
 
@@ -119,7 +194,7 @@ const Tables = {
 	getSelected: function(elemId) {
 		const rv = [];
 
-		$(elemId).select("tr").each((row) => {
+		$(elemId).querySelector("tr").forEach((row) => {
 			if (row.hasClassName("Selected")) {
 				// either older prefix-XXX notation or separate attribute
 				const rowId = row.getAttribute("data-row-id") || row.id.replace(/^[A-Z]*?-/, "");
@@ -173,7 +248,7 @@ const Notify = {
 		kind = kind || this.KIND_GENERIC;
 		keep = keep || false;
 
-		const notify = $("notify");
+		const notify = App.byId("notify");
 
 		window.clearTimeout(this.timeout);
 
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 764667a0d..28b598c25 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -70,13 +70,20 @@ require(["dojo/_base/kernel",
 
 /* exported hash_get */
 function hash_get(key) {
-	const kv = window.location.hash.substring(1).toQueryParams();
-	return kv[key];
+	console.warn("FIXME: hash_get", key);
+
+	//const kv = window.location.hash.substring(1).toQueryParams();
+	//return kv[key];
+	console.warn("FIXME: hash_get", key);
 }
 
 /* exported hash_set */
 function hash_set(key, value) {
-	const kv = window.location.hash.substring(1).toQueryParams();
+	console.warn("FIXME: hash_set", key, value);
+
+	/*const kv = window.location.hash.substring(1).toQueryParams();
 	kv[key] = value;
-	window.location.hash = $H(kv).toQueryString();
+	window.location.hash = $H(kv).toQueryString();*/
+
+	console.warn("FIXME: hash_set", key);
 }
diff --git a/js/utility.js b/js/utility.js
index eef1c6b61..a7530a97f 100644
--- a/js/utility.js
+++ b/js/utility.js
@@ -2,7 +2,7 @@
 
 /* TODO: this should probably be something like night_mode.js since it does nothing specific to utility scripts */
 
-Event.observe(window, "load", function() {
+window.addEventListener("load", function() {
     const UtilityJS = {
         apply_night_mode: function (is_night, link) {
             console.log("night mode changed to", is_night);
diff --git a/lib/scriptaculous/controls.js b/lib/scriptaculous/controls.js
deleted file mode 100644
index 5137ab510..000000000
--- a/lib/scriptaculous/controls.js
+++ /dev/null
@@ -1,965 +0,0 @@
-// script.aculo.us controls.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010
-
-// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005-2010 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
-//           (c) 2005-2010 Jon Tirsen (http://www.tirsen.com)
-// Contributors:
-//  Richard Livsey
-//  Rahul Bhargava
-//  Rob Wills
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-// Autocompleter.Base handles all the autocompletion functionality
-// that's independent of the data source for autocompletion. This
-// includes drawing the autocompletion menu, observing keyboard
-// and mouse events, and similar.
-//
-// Specific autocompleters need to provide, at the very least,
-// a getUpdatedChoices function that will be invoked every time
-// the text inside the monitored textbox changes. This method
-// should get the text for which to provide autocompletion by
-// invoking this.getToken(), NOT by directly accessing
-// this.element.value. This is to allow incremental tokenized
-// autocompletion. Specific auto-completion logic (AJAX, etc)
-// belongs in getUpdatedChoices.
-//
-// Tokenized incremental autocompletion is enabled automatically
-// when an autocompleter is instantiated with the 'tokens' option
-// in the options parameter, e.g.:
-// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' });
-// will incrementally autocomplete with a comma as the token.
-// Additionally, ',' in the above example can be replaced with
-// a token array, e.g. { tokens: [',', '\n'] } which
-// enables autocompletion on multiple tokens. This is most
-// useful when one of the tokens is \n (a newline), as it
-// allows smart autocompletion after linebreaks.
-
-if(typeof Effect == 'undefined')
-  throw("controls.js requires including script.aculo.us' effects.js library");
-
-var Autocompleter = { };
-Autocompleter.Base = Class.create({
-  baseInitialize: function(element, update, options) {
-    element          = $(element);
-    this.element     = element;
-    this.update      = $(update);
-    this.hasFocus    = false;
-    this.changed     = false;
-    this.active      = false;
-    this.index       = 0;
-    this.entryCount  = 0;
-    this.oldElementValue = this.element.value;
-
-    if(this.setOptions)
-      this.setOptions(options);
-    else
-      this.options = options || { };
-
-    this.options.paramName    = this.options.paramName || this.element.name;
-    this.options.tokens       = this.options.tokens || [];
-    this.options.frequency    = this.options.frequency || 0.4;
-    this.options.minChars     = this.options.minChars || 1;
-    this.options.onShow       = this.options.onShow ||
-      function(element, update){
-        if(!update.style.position || update.style.position=='absolute') {
-          update.style.position = 'absolute';
-          Position.clone(element, update, {
-            setHeight: false,
-            offsetTop: element.offsetHeight
-          });
-        }
-        Effect.Appear(update,{duration:0.15});
-      };
-    this.options.onHide = this.options.onHide ||
-      function(element, update){ new Effect.Fade(update,{duration:0.15}) };
-
-    if(typeof(this.options.tokens) == 'string')
-      this.options.tokens = new Array(this.options.tokens);
-    // Force carriage returns as token delimiters anyway
-    if (!this.options.tokens.include('\n'))
-      this.options.tokens.push('\n');
-
-    this.observer = null;
-
-    this.element.setAttribute('autocomplete','off');
-
-    Element.hide(this.update);
-
-    Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
-    Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
-  },
-
-  show: function() {
-    if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
-    if(!this.iefix &&
-      (Prototype.Browser.IE) &&
-      (Element.getStyle(this.update, 'position')=='absolute')) {
-      new Insertion.After(this.update,
-       '<iframe id="' + this.update.id + '_iefix" '+
-       'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
-       'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
-      this.iefix = $(this.update.id+'_iefix');
-    }
-    if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
-  },
-
-  fixIEOverlapping: function() {
-    Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
-    this.iefix.style.zIndex = 1;
-    this.update.style.zIndex = 2;
-    Element.show(this.iefix);
-  },
-
-  hide: function() {
-    this.stopIndicator();
-    if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update);
-    if(this.iefix) Element.hide(this.iefix);
-  },
-
-  startIndicator: function() {
-    if(this.options.indicator) Element.show(this.options.indicator);
-  },
-
-  stopIndicator: function() {
-    if(this.options.indicator) Element.hide(this.options.indicator);
-  },
-
-  onKeyPress: function(event) {
-    if(this.active)
-      switch(event.keyCode) {
-       case Event.KEY_TAB:
-       case Event.KEY_RETURN:
-         this.selectEntry();
-         Event.stop(event);
-       case Event.KEY_ESC:
-         this.hide();
-         this.active = false;
-         Event.stop(event);
-         return;
-       case Event.KEY_LEFT:
-       case Event.KEY_RIGHT:
-         return;
-       case Event.KEY_UP:
-         this.markPrevious();
-         this.render();
-         Event.stop(event);
-         return;
-       case Event.KEY_DOWN:
-         this.markNext();
-         this.render();
-         Event.stop(event);
-         return;
-      }
-     else
-       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
-         (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
-
-    this.changed = true;
-    this.hasFocus = true;
-
-    if(this.observer) clearTimeout(this.observer);
-      this.observer =
-        setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
-  },
-
-  activate: function() {
-    this.changed = false;
-    this.hasFocus = true;
-    this.getUpdatedChoices();
-  },
-
-  onHover: function(event) {
-    var element = Event.findElement(event, 'LI');
-    if(this.index != element.autocompleteIndex)
-    {
-        this.index = element.autocompleteIndex;
-        this.render();
-    }
-    Event.stop(event);
-  },
-
-  onClick: function(event) {
-    var element = Event.findElement(event, 'LI');
-    this.index = element.autocompleteIndex;
-    this.selectEntry();
-    this.hide();
-  },
-
-  onBlur: function(event) {
-    // needed to make click events working
-    setTimeout(this.hide.bind(this), 250);
-    this.hasFocus = false;
-    this.active = false;
-  },
-
-  render: function() {
-    if(this.entryCount > 0) {
-      for (var i = 0; i < this.entryCount; i++)
-        this.index==i ?
-          Element.addClassName(this.getEntry(i),"selected") :
-          Element.removeClassName(this.getEntry(i),"selected");
-      if(this.hasFocus) {
-        this.show();
-        this.active = true;
-      }
-    } else {
-      this.active = false;
-      this.hide();
-    }
-  },
-
-  markPrevious: function() {
-    if(this.index > 0) this.index--;
-      else this.index = this.entryCount-1;
-    this.getEntry(this.index).scrollIntoView(true);
-  },
-
-  markNext: function() {
-    if(this.index < this.entryCount-1) this.index++;
-      else this.index = 0;
-    this.getEntry(this.index).scrollIntoView(false);
-  },
-
-  getEntry: function(index) {
-    return this.update.firstChild.childNodes[index];
-  },
-
-  getCurrentEntry: function() {
-    return this.getEntry(this.index);
-  },
-
-  selectEntry: function() {
-    this.active = false;
-    this.updateElement(this.getCurrentEntry());
-  },
-
-  updateElement: function(selectedElement) {
-    if (this.options.updateElement) {
-      this.options.updateElement(selectedElement);
-      return;
-    }
-    var value = '';
-    if (this.options.select) {
-      var nodes = $(selectedElement).select('.' + this.options.select) || [];
-      if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
-    } else
-      value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
-
-    var bounds = this.getTokenBounds();
-    if (bounds[0] != -1) {
-      var newValue = this.element.value.substr(0, bounds[0]);
-      var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
-      if (whitespace)
-        newValue += whitespace[0];
-      this.element.value = newValue + value + this.element.value.substr(bounds[1]);
-    } else {
-      this.element.value = value;
-    }
-    this.oldElementValue = this.element.value;
-    this.element.focus();
-
-    if (this.options.afterUpdateElement)
-      this.options.afterUpdateElement(this.element, selectedElement);
-  },
-
-  updateChoices: function(choices) {
-    if(!this.changed && this.hasFocus) {
-      this.update.innerHTML = choices;
-      Element.cleanWhitespace(this.update);
-      Element.cleanWhitespace(this.update.down());
-
-      if(this.update.firstChild && this.update.down().childNodes) {
-        this.entryCount =
-          this.update.down().childNodes.length;
-        for (var i = 0; i < this.entryCount; i++) {
-          var entry = this.getEntry(i);
-          entry.autocompleteIndex = i;
-          this.addObservers(entry);
-        }
-      } else {
-        this.entryCount = 0;
-      }
-
-      this.stopIndicator();
-      this.index = 0;
-
-      if(this.entryCount==1 && this.options.autoSelect) {
-        this.selectEntry();
-        this.hide();
-      } else {
-        this.render();
-      }
-    }
-  },
-
-  addObservers: function(element) {
-    Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this));
-    Event.observe(element, "click", this.onClick.bindAsEventListener(this));
-  },
-
-  onObserverEvent: function() {
-    this.changed = false;
-    this.tokenBounds = null;
-    if(this.getToken().length>=this.options.minChars) {
-      this.getUpdatedChoices();
-    } else {
-      this.active = false;
-      this.hide();
-    }
-    this.oldElementValue = this.element.value;
-  },
-
-  getToken: function() {
-    var bounds = this.getTokenBounds();
-    return this.element.value.substring(bounds[0], bounds[1]).strip();
-  },
-
-  getTokenBounds: function() {
-    if (null != this.tokenBounds) return this.tokenBounds;
-    var value = this.element.value;
-    if (value.strip().empty()) return [-1, 0];
-    var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue);
-    var offset = (diff == this.oldElementValue.length ? 1 : 0);
-    var prevTokenPos = -1, nextTokenPos = value.length;
-    var tp;
-    for (var index = 0, l = this.options.tokens.length; index < l; ++index) {
-      tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1);
-      if (tp > prevTokenPos) prevTokenPos = tp;
-      tp = value.indexOf(this.options.tokens[index], diff + offset);
-      if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp;
-    }
-    return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]);
-  }
-});
-
-Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) {
-  var boundary = Math.min(newS.length, oldS.length);
-  for (var index = 0; index < boundary; ++index)
-    if (newS[index] != oldS[index])
-      return index;
-  return boundary;
-};
-
-Ajax.Autocompleter = Class.create(Autocompleter.Base, {
-  initialize: function(element, update, url, options) {
-    this.baseInitialize(element, update, options);
-    this.options.asynchronous  = true;
-    this.options.onComplete    = this.onComplete.bind(this);
-    this.options.defaultParams = this.options.parameters || null;
-    this.url                   = url;
-  },
-
-  getUpdatedChoices: function() {
-    this.startIndicator();
-
-    var entry = encodeURIComponent(this.options.paramName) + '=' +
-      encodeURIComponent(this.getToken());
-
-    this.options.parameters = this.options.callback ?
-      this.options.callback(this.element, entry) : entry;
-
-    if(this.options.defaultParams)
-      this.options.parameters += '&' + this.options.defaultParams;
-
-    new Ajax.Request(this.url, this.options);
-  },
-
-  onComplete: function(request) {
-    this.updateChoices(request.responseText);
-  }
-});
-
-// The local array autocompleter. Used when you'd prefer to
-// inject an array of autocompletion options into the page, rather
-// than sending out Ajax queries, which can be quite slow sometimes.
-//
-// The constructor takes four parameters. The first two are, as usual,
-// the id of the monitored textbox, and id of the autocompletion menu.
-// The third is the array you want to autocomplete from, and the fourth
-// is the options block.
-//
-// Extra local autocompletion options:
-// - choices - How many autocompletion choices to offer
-//
-// - partialSearch - If false, the autocompleter will match entered
-//                    text only at the beginning of strings in the
-//                    autocomplete array. Defaults to true, which will
-//                    match text at the beginning of any *word* in the
-//                    strings in the autocomplete array. If you want to
-//                    search anywhere in the string, additionally set
-//                    the option fullSearch to true (default: off).
-//
-// - fullSsearch - Search anywhere in autocomplete array strings.
-//
-// - partialChars - How many characters to enter before triggering
-//                   a partial match (unlike minChars, which defines
-//                   how many characters are required to do any match
-//                   at all). Defaults to 2.
-//
-// - ignoreCase - Whether to ignore case when autocompleting.
-//                 Defaults to true.
-//
-// It's possible to pass in a custom function as the 'selector'
-// option, if you prefer to write your own autocompletion logic.
-// In that case, the other options above will not apply unless
-// you support them.
-
-Autocompleter.Local = Class.create(Autocompleter.Base, {
-  initialize: function(element, update, array, options) {
-    this.baseInitialize(element, update, options);
-    this.options.array = array;
-  },
-
-  getUpdatedChoices: function() {
-    this.updateChoices(this.options.selector(this));
-  },
-
-  setOptions: function(options) {
-    this.options = Object.extend({
-      choices: 10,
-      partialSearch: true,
-      partialChars: 2,
-      ignoreCase: true,
-      fullSearch: false,
-      selector: function(instance) {
-        var ret       = []; // Beginning matches
-        var partial   = []; // Inside matches
-        var entry     = instance.getToken();
-        var count     = 0;
-
-        for (var i = 0; i < instance.options.array.length &&
-          ret.length < instance.options.choices ; i++) {
-
-          var elem = instance.options.array[i];
-          var foundPos = instance.options.ignoreCase ?
-            elem.toLowerCase().indexOf(entry.toLowerCase()) :
-            elem.indexOf(entry);
-
-          while (foundPos != -1) {
-            if (foundPos == 0 && elem.length != entry.length) {
-              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
-                elem.substr(entry.length) + "</li>");
-              break;
-            } else if (entry.length >= instance.options.partialChars &&
-              instance.options.partialSearch && foundPos != -1) {
-              if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
-                partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
-                  elem.substr(foundPos, entry.length) + "</strong>" + elem.substr(
-                  foundPos + entry.length) + "</li>");
-                break;
-              }
-            }
-
-            foundPos = instance.options.ignoreCase ?
-              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
-              elem.indexOf(entry, foundPos + 1);
-
-          }
-        }
-        if (partial.length)
-          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length));
-        return "<ul>" + ret.join('') + "</ul>";
-      }
-    }, options || { });
-  }
-});
-
-// AJAX in-place editor and collection editor
-// Full rewrite by Christophe Porteneuve <tdd@tddsworld.com> (April 2007).
-
-// Use this if you notice weird scrolling problems on some browsers,
-// the DOM might be a bit confused when this gets called so do this
-// waits 1 ms (with setTimeout) until it does the activation
-Field.scrollFreeActivate = function(field) {
-  setTimeout(function() {
-    Field.activate(field);
-  }, 1);
-};
-
-Ajax.InPlaceEditor = Class.create({
-  initialize: function(element, url, options) {
-    this.url = url;
-    this.element = element = $(element);
-    this.prepareOptions();
-    this._controls = { };
-    arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
-    Object.extend(this.options, options || { });
-    if (!this.options.formId && this.element.id) {
-      this.options.formId = this.element.id + '-inplaceeditor';
-      if ($(this.options.formId))
-        this.options.formId = '';
-    }
-    if (this.options.externalControl)
-      this.options.externalControl = $(this.options.externalControl);
-    if (!this.options.externalControl)
-      this.options.externalControlOnly = false;
-    this._originalBackground = this.element.getStyle('background-color') || 'transparent';
-    this.element.title = this.options.clickToEditText;
-    this._boundCancelHandler = this.handleFormCancellation.bind(this);
-    this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this);
-    this._boundFailureHandler = this.handleAJAXFailure.bind(this);
-    this._boundSubmitHandler = this.handleFormSubmission.bind(this);
-    this._boundWrapperHandler = this.wrapUp.bind(this);
-    this.registerListeners();
-  },
-  checkForEscapeOrReturn: function(e) {
-    if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return;
-    if (Event.KEY_ESC == e.keyCode)
-      this.handleFormCancellation(e);
-    else if (Event.KEY_RETURN == e.keyCode)
-      this.handleFormSubmission(e);
-  },
-  createControl: function(mode, handler, extraClasses) {
-    var control = this.options[mode + 'Control'];
-    var text = this.options[mode + 'Text'];
-    if ('button' == control) {
-      var btn = document.createElement('input');
-      btn.type = 'submit';
-      btn.value = text;
-      btn.className = 'editor_' + mode + '_button';
-      if ('cancel' == mode)
-        btn.onclick = this._boundCancelHandler;
-      this._form.appendChild(btn);
-      this._controls[mode] = btn;
-    } else if ('link' == control) {
-      var link = document.createElement('a');
-      link.href = '#';
-      link.appendChild(document.createTextNode(text));
-      link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler;
-      link.className = 'editor_' + mode + '_link';
-      if (extraClasses)
-        link.className += ' ' + extraClasses;
-      this._form.appendChild(link);
-      this._controls[mode] = link;
-    }
-  },
-  createEditField: function() {
-    var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
-    var fld;
-    if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) {
-      fld = document.createElement('input');
-      fld.type = 'text';
-      var size = this.options.size || this.options.cols || 0;
-      if (0 < size) fld.size = size;
-    } else {
-      fld = document.createElement('textarea');
-      fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows);
-      fld.cols = this.options.cols || 40;
-    }
-    fld.name = this.options.paramName;
-    fld.value = text; // No HTML breaks conversion anymore
-    fld.className = 'editor_field';
-    if (this.options.submitOnBlur)
-      fld.onblur = this._boundSubmitHandler;
-    this._controls.editor = fld;
-    if (this.options.loadTextURL)
-      this.loadExternalText();
-    this._form.appendChild(this._controls.editor);
-  },
-  createForm: function() {
-    var ipe = this;
-    function addText(mode, condition) {
-      var text = ipe.options['text' + mode + 'Controls'];
-      if (!text || condition === false) return;
-      ipe._form.appendChild(document.createTextNode(text));
-    };
-    this._form = $(document.createElement('form'));
-    this._form.id = this.options.formId;
-    this._form.addClassName(this.options.formClassName);
-    this._form.onsubmit = this._boundSubmitHandler;
-    this.createEditField();
-    if ('textarea' == this._controls.editor.tagName.toLowerCase())
-      this._form.appendChild(document.createElement('br'));
-    if (this.options.onFormCustomization)
-      this.options.onFormCustomization(this, this._form);
-    addText('Before', this.options.okControl || this.options.cancelControl);
-    this.createControl('ok', this._boundSubmitHandler);
-    addText('Between', this.options.okControl && this.options.cancelControl);
-    this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
-    addText('After', this.options.okControl || this.options.cancelControl);
-  },
-  destroy: function() {
-    if (this._oldInnerHTML)
-      this.element.innerHTML = this._oldInnerHTML;
-    this.leaveEditMode();
-    this.unregisterListeners();
-  },
-  enterEditMode: function(e) {
-    if (this._saving || this._editing) return;
-    this._editing = true;
-    this.triggerCallback('onEnterEditMode');
-    if (this.options.externalControl)
-      this.options.externalControl.hide();
-    this.element.hide();
-    this.createForm();
-    this.element.parentNode.insertBefore(this._form, this.element);
-    if (!this.options.loadTextURL)
-      this.postProcessEditField();
-    if (e) Event.stop(e);
-  },
-  enterHover: function(e) {
-    if (this.options.hoverClassName)
-      this.element.addClassName(this.options.hoverClassName);
-    if (this._saving) return;
-    this.triggerCallback('onEnterHover');
-  },
-  getText: function() {
-    return this.element.innerHTML.unescapeHTML();
-  },
-  handleAJAXFailure: function(transport) {
-    this.triggerCallback('onFailure', transport);
-    if (this._oldInnerHTML) {
-      this.element.innerHTML = this._oldInnerHTML;
-      this._oldInnerHTML = null;
-    }
-  },
-  handleFormCancellation: function(e) {
-    this.wrapUp();
-    if (e) Event.stop(e);
-  },
-  handleFormSubmission: function(e) {
-    var form = this._form;
-    var value = $F(this._controls.editor);
-    this.prepareSubmission();
-    var params = this.options.callback(form, value) || '';
-    if (Object.isString(params))
-      params = params.toQueryParams();
-    params.editorId = this.element.id;
-    if (this.options.htmlResponse) {
-      var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
-      Object.extend(options, {
-        parameters: params,
-        onComplete: this._boundWrapperHandler,
-        onFailure: this._boundFailureHandler
-      });
-      new Ajax.Updater({ success: this.element }, this.url, options);
-    } else {
-      var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-      Object.extend(options, {
-        parameters: params,
-        onComplete: this._boundWrapperHandler,
-        onFailure: this._boundFailureHandler
-      });
-      new Ajax.Request(this.url, options);
-    }
-    if (e) Event.stop(e);
-  },
-  leaveEditMode: function() {
-    this.element.removeClassName(this.options.savingClassName);
-    this.removeForm();
-    this.leaveHover();
-    this.element.style.backgroundColor = this._originalBackground;
-    this.element.show();
-    if (this.options.externalControl)
-      this.options.externalControl.show();
-    this._saving = false;
-    this._editing = false;
-    this._oldInnerHTML = null;
-    this.triggerCallback('onLeaveEditMode');
-  },
-  leaveHover: function(e) {
-    if (this.options.hoverClassName)
-      this.element.removeClassName(this.options.hoverClassName);
-    if (this._saving) return;
-    this.triggerCallback('onLeaveHover');
-  },
-  loadExternalText: function() {
-    this._form.addClassName(this.options.loadingClassName);
-    this._controls.editor.disabled = true;
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        this._form.removeClassName(this.options.loadingClassName);
-        var text = transport.responseText;
-        if (this.options.stripLoadedTextTags)
-          text = text.stripTags();
-        this._controls.editor.value = text;
-        this._controls.editor.disabled = false;
-        this.postProcessEditField();
-      }.bind(this),
-      onFailure: this._boundFailureHandler
-    });
-    new Ajax.Request(this.options.loadTextURL, options);
-  },
-  postProcessEditField: function() {
-    var fpc = this.options.fieldPostCreation;
-    if (fpc)
-      $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate']();
-  },
-  prepareOptions: function() {
-    this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions);
-    Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks);
-    [this._extraDefaultOptions].flatten().compact().each(function(defs) {
-      Object.extend(this.options, defs);
-    }.bind(this));
-  },
-  prepareSubmission: function() {
-    this._saving = true;
-    this.removeForm();
-    this.leaveHover();
-    this.showSaving();
-  },
-  registerListeners: function() {
-    this._listeners = { };
-    var listener;
-    $H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
-      listener = this[pair.value].bind(this);
-      this._listeners[pair.key] = listener;
-      if (!this.options.externalControlOnly)
-        this.element.observe(pair.key, listener);
-      if (this.options.externalControl)
-        this.options.externalControl.observe(pair.key, listener);
-    }.bind(this));
-  },
-  removeForm: function() {
-    if (!this._form) return;
-    this._form.remove();
-    this._form = null;
-    this._controls = { };
-  },
-  showSaving: function() {
-    this._oldInnerHTML = this.element.innerHTML;
-    this.element.innerHTML = this.options.savingText;
-    this.element.addClassName(this.options.savingClassName);
-    this.element.style.backgroundColor = this._originalBackground;
-    this.element.show();
-  },
-  triggerCallback: function(cbName, arg) {
-    if ('function' == typeof this.options[cbName]) {
-      this.options[cbName](this, arg);
-    }
-  },
-  unregisterListeners: function() {
-    $H(this._listeners).each(function(pair) {
-      if (!this.options.externalControlOnly)
-        this.element.stopObserving(pair.key, pair.value);
-      if (this.options.externalControl)
-        this.options.externalControl.stopObserving(pair.key, pair.value);
-    }.bind(this));
-  },
-  wrapUp: function(transport) {
-    this.leaveEditMode();
-    // Can't use triggerCallback due to backward compatibility: requires
-    // binding + direct element
-    this._boundComplete(transport, this.element);
-  }
-});
-
-Object.extend(Ajax.InPlaceEditor.prototype, {
-  dispose: Ajax.InPlaceEditor.prototype.destroy
-});
-
-Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
-  initialize: function($super, element, url, options) {
-    this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
-    $super(element, url, options);
-  },
-
-  createEditField: function() {
-    var list = document.createElement('select');
-    list.name = this.options.paramName;
-    list.size = 1;
-    this._controls.editor = list;
-    this._collection = this.options.collection || [];
-    if (this.options.loadCollectionURL)
-      this.loadCollection();
-    else
-      this.checkForExternalText();
-    this._form.appendChild(this._controls.editor);
-  },
-
-  loadCollection: function() {
-    this._form.addClassName(this.options.loadingClassName);
-    this.showLoadingText(this.options.loadingCollectionText);
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        var js = transport.responseText.strip();
-        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
-          throw('Server returned an invalid collection representation.');
-        this._collection = eval(js);
-        this.checkForExternalText();
-      }.bind(this),
-      onFailure: this.onFailure
-    });
-    new Ajax.Request(this.options.loadCollectionURL, options);
-  },
-
-  showLoadingText: function(text) {
-    this._controls.editor.disabled = true;
-    var tempOption = this._controls.editor.firstChild;
-    if (!tempOption) {
-      tempOption = document.createElement('option');
-      tempOption.value = '';
-      this._controls.editor.appendChild(tempOption);
-      tempOption.selected = true;
-    }
-    tempOption.update((text || '').stripScripts().stripTags());
-  },
-
-  checkForExternalText: function() {
-    this._text = this.getText();
-    if (this.options.loadTextURL)
-      this.loadExternalText();
-    else
-      this.buildOptionList();
-  },
-
-  loadExternalText: function() {
-    this.showLoadingText(this.options.loadingText);
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        this._text = transport.responseText.strip();
-        this.buildOptionList();
-      }.bind(this),
-      onFailure: this.onFailure
-    });
-    new Ajax.Request(this.options.loadTextURL, options);
-  },
-
-  buildOptionList: function() {
-    this._form.removeClassName(this.options.loadingClassName);
-    this._collection = this._collection.map(function(entry) {
-      return 2 === entry.length ? entry : [entry, entry].flatten();
-    });
-    var marker = ('value' in this.options) ? this.options.value : this._text;
-    var textFound = this._collection.any(function(entry) {
-      return entry[0] == marker;
-    }.bind(this));
-    this._controls.editor.update('');
-    var option;
-    this._collection.each(function(entry, index) {
-      option = document.createElement('option');
-      option.value = entry[0];
-      option.selected = textFound ? entry[0] == marker : 0 == index;
-      option.appendChild(document.createTextNode(entry[1]));
-      this._controls.editor.appendChild(option);
-    }.bind(this));
-    this._controls.editor.disabled = false;
-    Field.scrollFreeActivate(this._controls.editor);
-  }
-});
-
-//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! ****
-//**** This only  exists for a while,  in order to  let ****
-//**** users adapt to  the new API.  Read up on the new ****
-//**** API and convert your code to it ASAP!            ****
-
-Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
-  if (!options) return;
-  function fallback(name, expr) {
-    if (name in options || expr === undefined) return;
-    options[name] = expr;
-  };
-  fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
-    options.cancelLink == options.cancelButton == false ? false : undefined)));
-  fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
-    options.okLink == options.okButton == false ? false : undefined)));
-  fallback('highlightColor', options.highlightcolor);
-  fallback('highlightEndColor', options.highlightendcolor);
-};
-
-Object.extend(Ajax.InPlaceEditor, {
-  DefaultOptions: {
-    ajaxOptions: { },
-    autoRows: 3,                                // Use when multi-line w/ rows == 1
-    cancelControl: 'link',                      // 'link'|'button'|false
-    cancelText: 'cancel',
-    clickToEditText: 'Click to edit',
-    externalControl: null,                      // id|elt
-    externalControlOnly: false,
-    fieldPostCreation: 'activate',              // 'activate'|'focus'|false
-    formClassName: 'inplaceeditor-form',
-    formId: null,                               // id|elt
-    highlightColor: '#ffff99',
-    highlightEndColor: '#ffffff',
-    hoverClassName: '',
-    htmlResponse: true,
-    loadingClassName: 'inplaceeditor-loading',
-    loadingText: 'Loading...',
-    okControl: 'button',                        // 'link'|'button'|false
-    okText: 'ok',
-    paramName: 'value',
-    rows: 1,                                    // If 1 and multi-line, uses autoRows
-    savingClassName: 'inplaceeditor-saving',
-    savingText: 'Saving...',
-    size: 0,
-    stripLoadedTextTags: false,
-    submitOnBlur: false,
-    textAfterControls: '',
-    textBeforeControls: '',
-    textBetweenControls: ''
-  },
-  DefaultCallbacks: {
-    callback: function(form) {
-      return Form.serialize(form);
-    },
-    onComplete: function(transport, element) {
-      // For backward compatibility, this one is bound to the IPE, and passes
-      // the element directly.  It was too often customized, so we don't break it.
-      new Effect.Highlight(element, {
-        startcolor: this.options.highlightColor, keepBackgroundImage: true });
-    },
-    onEnterEditMode: null,
-    onEnterHover: function(ipe) {
-      ipe.element.style.backgroundColor = ipe.options.highlightColor;
-      if (ipe._effect)
-        ipe._effect.cancel();
-    },
-    onFailure: function(transport, ipe) {
-      alert('Error communication with the server: ' + transport.responseText.stripTags());
-    },
-    onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
-    onLeaveEditMode: null,
-    onLeaveHover: function(ipe) {
-      ipe._effect = new Effect.Highlight(ipe.element, {
-        startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
-        restorecolor: ipe._originalBackground, keepBackgroundImage: true
-      });
-    }
-  },
-  Listeners: {
-    click: 'enterEditMode',
-    keydown: 'checkForEscapeOrReturn',
-    mouseover: 'enterHover',
-    mouseout: 'leaveHover'
-  }
-});
-
-Ajax.InPlaceCollectionEditor.DefaultOptions = {
-  loadingCollectionText: 'Loading options...'
-};
-
-// Delayed observer, like Form.Element.Observer,
-// but waits for delay after last key input
-// Ideal for live-search fields
-
-Form.Element.DelayedObserver = Class.create({
-  initialize: function(element, delay, callback) {
-    this.delay     = delay || 0.5;
-    this.element   = $(element);
-    this.callback  = callback;
-    this.timer     = null;
-    this.lastValue = $F(this.element);
-    Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
-  },
-  delayedListener: function(event) {
-    if(this.lastValue == $F(this.element)) return;
-    if(this.timer) clearTimeout(this.timer);
-    this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
-    this.lastValue = $F(this.element);
-  },
-  onTimerEvent: function() {
-    this.timer = null;
-    this.callback(this.element, $F(this.element));
-  }
-});
\ No newline at end of file
diff --git a/lib/scriptaculous/effects.js b/lib/scriptaculous/effects.js
deleted file mode 100644
index 860ddc093..000000000
--- a/lib/scriptaculous/effects.js
+++ /dev/null
@@ -1,1123 +0,0 @@
-// script.aculo.us effects.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010
-
-// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// Contributors:
-//  Justin Palmer (http://encytemedia.com/)
-//  Mark Pilgrim (http://diveintomark.org/)
-//  Martin Bialasinki
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-// converts rgb() and #xxx to #xxxxxx format,
-// returns self (or first argument) if not convertable
-String.prototype.parseColor = function() {
-  var color = '#';
-  if (this.slice(0,4) == 'rgb(') {
-    var cols = this.slice(4,this.length-1).split(',');
-    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
-  } else {
-    if (this.slice(0,1) == '#') {
-      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
-      if (this.length==7) color = this.toLowerCase();
-    }
-  }
-  return (color.length==7 ? color : (arguments[0] || this));
-};
-
-/*--------------------------------------------------------------------------*/
-
-Element.collectTextNodes = function(element) {
-  return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue :
-      (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
-  }).flatten().join('');
-};
-
-Element.collectTextNodesIgnoreClass = function(element, className) {
-  return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue :
-      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
-        Element.collectTextNodesIgnoreClass(node, className) : ''));
-  }).flatten().join('');
-};
-
-Element.setContentZoom = function(element, percent) {
-  element = $(element);
-  element.setStyle({fontSize: (percent/100) + 'em'});
-  if (Prototype.Browser.WebKit) window.scrollBy(0,0);
-  return element;
-};
-
-Element.getInlineOpacity = function(element){
-  return $(element).style.opacity || '';
-};
-
-Element.forceRerendering = function(element) {
-  try {
-    element = $(element);
-    var n = document.createTextNode(' ');
-    element.appendChild(n);
-    element.removeChild(n);
-  } catch(e) { }
-};
-
-/*--------------------------------------------------------------------------*/
-
-var Effect = {
-  _elementDoesNotExistError: {
-    name: 'ElementDoesNotExistError',
-    message: 'The specified DOM element does not exist, but is required for this effect to operate'
-  },
-  Transitions: {
-    linear: Prototype.K,
-    sinoidal: function(pos) {
-      return (-Math.cos(pos*Math.PI)/2) + .5;
-    },
-    reverse: function(pos) {
-      return 1-pos;
-    },
-    flicker: function(pos) {
-      var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4;
-      return pos > 1 ? 1 : pos;
-    },
-    wobble: function(pos) {
-      return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5;
-    },
-    pulse: function(pos, pulses) {
-      return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5;
-    },
-    spring: function(pos) {
-      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
-    },
-    none: function(pos) {
-      return 0;
-    },
-    full: function(pos) {
-      return 1;
-    }
-  },
-  DefaultOptions: {
-    duration:   1.0,   // seconds
-    fps:        100,   // 100= assume 66fps max.
-    sync:       false, // true for combining
-    from:       0.0,
-    to:         1.0,
-    delay:      0.0,
-    queue:      'parallel'
-  },
-  tagifyText: function(element) {
-    var tagifyStyle = 'position:relative';
-    if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
-
-    element = $(element);
-    $A(element.childNodes).each( function(child) {
-      if (child.nodeType==3) {
-        child.nodeValue.toArray().each( function(character) {
-          element.insertBefore(
-            new Element('span', {style: tagifyStyle}).update(
-              character == ' ' ? String.fromCharCode(160) : character),
-              child);
-        });
-        Element.remove(child);
-      }
-    });
-  },
-  multiple: function(element, effect) {
-    var elements;
-    if (((typeof element == 'object') ||
-        Object.isFunction(element)) &&
-       (element.length))
-      elements = element;
-    else
-      elements = $(element).childNodes;
-
-    var options = Object.extend({
-      speed: 0.1,
-      delay: 0.0
-    }, arguments[2] || { });
-    var masterDelay = options.delay;
-
-    $A(elements).each( function(element, index) {
-      new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
-    });
-  },
-  PAIRS: {
-    'slide':  ['SlideDown','SlideUp'],
-    'blind':  ['BlindDown','BlindUp'],
-    'appear': ['Appear','Fade']
-  },
-  toggle: function(element, effect, options) {
-    element = $(element);
-    effect  = (effect || 'appear').toLowerCase();
-    
-    return Effect[ Effect.PAIRS[ effect ][ element.visible() ? 1 : 0 ] ](element, Object.extend({
-      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
-    }, options || {}));
-  }
-};
-
-Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
-
-/* ------------- core effects ------------- */
-
-Effect.ScopedQueue = Class.create(Enumerable, {
-  initialize: function() {
-    this.effects  = [];
-    this.interval = null;
-  },
-  _each: function(iterator) {
-    this.effects._each(iterator);
-  },
-  add: function(effect) {
-    var timestamp = new Date().getTime();
-
-    var position = Object.isString(effect.options.queue) ?
-      effect.options.queue : effect.options.queue.position;
-
-    switch(position) {
-      case 'front':
-        // move unstarted effects after this effect
-        this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
-            e.startOn  += effect.finishOn;
-            e.finishOn += effect.finishOn;
-          });
-        break;
-      case 'with-last':
-        timestamp = this.effects.pluck('startOn').max() || timestamp;
-        break;
-      case 'end':
-        // start effect after last queued effect has finished
-        timestamp = this.effects.pluck('finishOn').max() || timestamp;
-        break;
-    }
-
-    effect.startOn  += timestamp;
-    effect.finishOn += timestamp;
-
-    if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
-      this.effects.push(effect);
-
-    if (!this.interval)
-      this.interval = setInterval(this.loop.bind(this), 15);
-  },
-  remove: function(effect) {
-    this.effects = this.effects.reject(function(e) { return e==effect });
-    if (this.effects.length == 0) {
-      clearInterval(this.interval);
-      this.interval = null;
-    }
-  },
-  loop: function() {
-    var timePos = new Date().getTime();
-    for(var i=0, len=this.effects.length;i<len;i++)
-      this.effects[i] && this.effects[i].loop(timePos);
-  }
-});
-
-Effect.Queues = {
-  instances: $H(),
-  get: function(queueName) {
-    if (!Object.isString(queueName)) return queueName;
-
-    return this.instances.get(queueName) ||
-      this.instances.set(queueName, new Effect.ScopedQueue());
-  }
-};
-Effect.Queue = Effect.Queues.get('global');
-
-Effect.Base = Class.create({
-  position: null,
-  start: function(options) {
-    if (options && options.transition === false) options.transition = Effect.Transitions.linear;
-    this.options      = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
-    this.currentFrame = 0;
-    this.state        = 'idle';
-    this.startOn      = this.options.delay*1000;
-    this.finishOn     = this.startOn+(this.options.duration*1000);
-    this.fromToDelta  = this.options.to-this.options.from;
-    this.totalTime    = this.finishOn-this.startOn;
-    this.totalFrames  = this.options.fps*this.options.duration;
-
-    this.render = (function() {
-      function dispatch(effect, eventName) {
-        if (effect.options[eventName + 'Internal'])
-          effect.options[eventName + 'Internal'](effect);
-        if (effect.options[eventName])
-          effect.options[eventName](effect);
-      }
-
-      return function(pos) {
-        if (this.state === "idle") {
-          this.state = "running";
-          dispatch(this, 'beforeSetup');
-          if (this.setup) this.setup();
-          dispatch(this, 'afterSetup');
-        }
-        if (this.state === "running") {
-          pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from;
-          this.position = pos;
-          dispatch(this, 'beforeUpdate');
-          if (this.update) this.update(pos);
-          dispatch(this, 'afterUpdate');
-        }
-      };
-    })();
-
-    this.event('beforeStart');
-    if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ?
-        'global' : this.options.queue.scope).add(this);
-  },
-  loop: function(timePos) {
-    if (timePos >= this.startOn) {
-      if (timePos >= this.finishOn) {
-        this.render(1.0);
-        this.cancel();
-        this.event('beforeFinish');
-        if (this.finish) this.finish();
-        this.event('afterFinish');
-        return;
-      }
-      var pos   = (timePos - this.startOn) / this.totalTime,
-          frame = (pos * this.totalFrames).round();
-      if (frame > this.currentFrame) {
-        this.render(pos);
-        this.currentFrame = frame;
-      }
-    }
-  },
-  cancel: function() {
-    if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ?
-        'global' : this.options.queue.scope).remove(this);
-    this.state = 'finished';
-  },
-  event: function(eventName) {
-    if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
-    if (this.options[eventName]) this.options[eventName](this);
-  },
-  inspect: function() {
-    var data = $H();
-    for(property in this)
-      if (!Object.isFunction(this[property])) data.set(property, this[property]);
-    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
-  }
-});
-
-Effect.Parallel = Class.create(Effect.Base, {
-  initialize: function(effects) {
-    this.effects = effects || [];
-    this.start(arguments[1]);
-  },
-  update: function(position) {
-    this.effects.invoke('render', position);
-  },
-  finish: function(position) {
-    this.effects.each( function(effect) {
-      effect.render(1.0);
-      effect.cancel();
-      effect.event('beforeFinish');
-      if (effect.finish) effect.finish(position);
-      effect.event('afterFinish');
-    });
-  }
-});
-
-Effect.Tween = Class.create(Effect.Base, {
-  initialize: function(object, from, to) {
-    object = Object.isString(object) ? $(object) : object;
-    var args = $A(arguments), method = args.last(),
-      options = args.length == 5 ? args[3] : null;
-    this.method = Object.isFunction(method) ? method.bind(object) :
-      Object.isFunction(object[method]) ? object[method].bind(object) :
-      function(value) { object[method] = value };
-    this.start(Object.extend({ from: from, to: to }, options || { }));
-  },
-  update: function(position) {
-    this.method(position);
-  }
-});
-
-Effect.Event = Class.create(Effect.Base, {
-  initialize: function() {
-    this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
-  },
-  update: Prototype.emptyFunction
-});
-
-Effect.Opacity = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    // make this work on IE on elements without 'layout'
-    if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
-      this.element.setStyle({zoom: 1});
-    var options = Object.extend({
-      from: this.element.getOpacity() || 0.0,
-      to:   1.0
-    }, arguments[1] || { });
-    this.start(options);
-  },
-  update: function(position) {
-    this.element.setOpacity(position);
-  }
-});
-
-Effect.Move = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      x:    0,
-      y:    0,
-      mode: 'relative'
-    }, arguments[1] || { });
-    this.start(options);
-  },
-  setup: function() {
-    this.element.makePositioned();
-    this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
-    this.originalTop  = parseFloat(this.element.getStyle('top')  || '0');
-    if (this.options.mode == 'absolute') {
-      this.options.x = this.options.x - this.originalLeft;
-      this.options.y = this.options.y - this.originalTop;
-    }
-  },
-  update: function(position) {
-    this.element.setStyle({
-      left: (this.options.x  * position + this.originalLeft).round() + 'px',
-      top:  (this.options.y  * position + this.originalTop).round()  + 'px'
-    });
-  }
-});
-
-// for backwards compatibility
-Effect.MoveBy = function(element, toTop, toLeft) {
-  return new Effect.Move(element,
-    Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
-};
-
-Effect.Scale = Class.create(Effect.Base, {
-  initialize: function(element, percent) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      scaleX: true,
-      scaleY: true,
-      scaleContent: true,
-      scaleFromCenter: false,
-      scaleMode: 'box',        // 'box' or 'contents' or { } with provided values
-      scaleFrom: 100.0,
-      scaleTo:   percent
-    }, arguments[2] || { });
-    this.start(options);
-  },
-  setup: function() {
-    this.restoreAfterFinish = this.options.restoreAfterFinish || false;
-    this.elementPositioning = this.element.getStyle('position');
-
-    this.originalStyle = { };
-    ['top','left','width','height','fontSize'].each( function(k) {
-      this.originalStyle[k] = this.element.style[k];
-    }.bind(this));
-
-    this.originalTop  = this.element.offsetTop;
-    this.originalLeft = this.element.offsetLeft;
-
-    var fontSize = this.element.getStyle('font-size') || '100%';
-    ['em','px','%','pt'].each( function(fontSizeType) {
-      if (fontSize.indexOf(fontSizeType)>0) {
-        this.fontSize     = parseFloat(fontSize);
-        this.fontSizeType = fontSizeType;
-      }
-    }.bind(this));
-
-    this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
-
-    this.dims = null;
-    if (this.options.scaleMode=='box')
-      this.dims = [this.element.offsetHeight, this.element.offsetWidth];
-    if (/^content/.test(this.options.scaleMode))
-      this.dims = [this.element.scrollHeight, this.element.scrollWidth];
-    if (!this.dims)
-      this.dims = [this.options.scaleMode.originalHeight,
-                   this.options.scaleMode.originalWidth];
-  },
-  update: function(position) {
-    var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
-    if (this.options.scaleContent && this.fontSize)
-      this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
-    this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
-  },
-  finish: function(position) {
-    if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
-  },
-  setDimensions: function(height, width) {
-    var d = { };
-    if (this.options.scaleX) d.width = width.round() + 'px';
-    if (this.options.scaleY) d.height = height.round() + 'px';
-    if (this.options.scaleFromCenter) {
-      var topd  = (height - this.dims[0])/2;
-      var leftd = (width  - this.dims[1])/2;
-      if (this.elementPositioning == 'absolute') {
-        if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
-        if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
-      } else {
-        if (this.options.scaleY) d.top = -topd + 'px';
-        if (this.options.scaleX) d.left = -leftd + 'px';
-      }
-    }
-    this.element.setStyle(d);
-  }
-});
-
-Effect.Highlight = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
-    this.start(options);
-  },
-  setup: function() {
-    // Prevent executing on elements not in the layout flow
-    if (this.element.getStyle('display')=='none') { this.cancel(); return; }
-    // Disable background image during the effect
-    this.oldStyle = { };
-    if (!this.options.keepBackgroundImage) {
-      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
-      this.element.setStyle({backgroundImage: 'none'});
-    }
-    if (!this.options.endcolor)
-      this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
-    if (!this.options.restorecolor)
-      this.options.restorecolor = this.element.getStyle('background-color');
-    // init color calculations
-    this._base  = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
-    this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this));
-  },
-  update: function(position) {
-    this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
-      return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
-  },
-  finish: function() {
-    this.element.setStyle(Object.extend(this.oldStyle, {
-      backgroundColor: this.options.restorecolor
-    }));
-  }
-});
-
-Effect.ScrollTo = function(element) {
-  var options = arguments[1] || { },
-  scrollOffsets = document.viewport.getScrollOffsets(),
-  elementOffsets = $(element).cumulativeOffset();
-
-  if (options.offset) elementOffsets[1] += options.offset;
-
-  return new Effect.Tween(null,
-    scrollOffsets.top,
-    elementOffsets[1],
-    options,
-    function(p){ scrollTo(scrollOffsets.left, p.round()); }
-  );
-};
-
-/* ------------- combination effects ------------- */
-
-Effect.Fade = function(element) {
-  element = $(element);
-  var oldOpacity = element.getInlineOpacity();
-  var options = Object.extend({
-    from: element.getOpacity() || 1.0,
-    to:   0.0,
-    afterFinishInternal: function(effect) {
-      if (effect.options.to!=0) return;
-      effect.element.hide().setStyle({opacity: oldOpacity});
-    }
-  }, arguments[1] || { });
-  return new Effect.Opacity(element,options);
-};
-
-Effect.Appear = function(element) {
-  element = $(element);
-  var options = Object.extend({
-  from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
-  to:   1.0,
-  // force Safari to render floated elements properly
-  afterFinishInternal: function(effect) {
-    effect.element.forceRerendering();
-  },
-  beforeSetup: function(effect) {
-    effect.element.setOpacity(effect.options.from).show();
-  }}, arguments[1] || { });
-  return new Effect.Opacity(element,options);
-};
-
-Effect.Puff = function(element) {
-  element = $(element);
-  var oldStyle = {
-    opacity: element.getInlineOpacity(),
-    position: element.getStyle('position'),
-    top:  element.style.top,
-    left: element.style.left,
-    width: element.style.width,
-    height: element.style.height
-  };
-  return new Effect.Parallel(
-   [ new Effect.Scale(element, 200,
-      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
-     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
-     Object.extend({ duration: 1.0,
-      beforeSetupInternal: function(effect) {
-        Position.absolutize(effect.effects[0].element);
-      },
-      afterFinishInternal: function(effect) {
-         effect.effects[0].element.hide().setStyle(oldStyle); }
-     }, arguments[1] || { })
-   );
-};
-
-Effect.BlindUp = function(element) {
-  element = $(element);
-  element.makeClipping();
-  return new Effect.Scale(element, 0,
-    Object.extend({ scaleContent: false,
-      scaleX: false,
-      restoreAfterFinish: true,
-      afterFinishInternal: function(effect) {
-        effect.element.hide().undoClipping();
-      }
-    }, arguments[1] || { })
-  );
-};
-
-Effect.BlindDown = function(element) {
-  element = $(element);
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({
-    scaleContent: false,
-    scaleX: false,
-    scaleFrom: 0,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makeClipping().setStyle({height: '0px'}).show();
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.undoClipping();
-    }
-  }, arguments[1] || { }));
-};
-
-Effect.SwitchOff = function(element) {
-  element = $(element);
-  var oldOpacity = element.getInlineOpacity();
-  return new Effect.Appear(element, Object.extend({
-    duration: 0.4,
-    from: 0,
-    transition: Effect.Transitions.flicker,
-    afterFinishInternal: function(effect) {
-      new Effect.Scale(effect.element, 1, {
-        duration: 0.3, scaleFromCenter: true,
-        scaleX: false, scaleContent: false, restoreAfterFinish: true,
-        beforeSetup: function(effect) {
-          effect.element.makePositioned().makeClipping();
-        },
-        afterFinishInternal: function(effect) {
-          effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
-        }
-      });
-    }
-  }, arguments[1] || { }));
-};
-
-Effect.DropOut = function(element) {
-  element = $(element);
-  var oldStyle = {
-    top: element.getStyle('top'),
-    left: element.getStyle('left'),
-    opacity: element.getInlineOpacity() };
-  return new Effect.Parallel(
-    [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
-      new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
-    Object.extend(
-      { duration: 0.5,
-        beforeSetup: function(effect) {
-          effect.effects[0].element.makePositioned();
-        },
-        afterFinishInternal: function(effect) {
-          effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
-        }
-      }, arguments[1] || { }));
-};
-
-Effect.Shake = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    distance: 20,
-    duration: 0.5
-  }, arguments[1] || {});
-  var distance = parseFloat(options.distance);
-  var split = parseFloat(options.duration) / 10.0;
-  var oldStyle = {
-    top: element.getStyle('top'),
-    left: element.getStyle('left') };
-    return new Effect.Move(element,
-      { x:  distance, y: 0, duration: split, afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
-        effect.element.undoPositioned().setStyle(oldStyle);
-  }}); }}); }}); }}); }}); }});
-};
-
-Effect.SlideDown = function(element) {
-  element = $(element).cleanWhitespace();
-  // SlideDown need to have the content of the element wrapped in a container element with fixed height!
-  var oldInnerBottom = element.down().getStyle('bottom');
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({
-    scaleContent: false,
-    scaleX: false,
-    scaleFrom: window.opera ? 0 : 1,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makePositioned();
-      effect.element.down().makePositioned();
-      if (window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping().setStyle({height: '0px'}).show();
-    },
-    afterUpdateInternal: function(effect) {
-      effect.element.down().setStyle({bottom:
-        (effect.dims[0] - effect.element.clientHeight) + 'px' });
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.undoClipping().undoPositioned();
-      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
-    }, arguments[1] || { })
-  );
-};
-
-Effect.SlideUp = function(element) {
-  element = $(element).cleanWhitespace();
-  var oldInnerBottom = element.down().getStyle('bottom');
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, window.opera ? 0 : 1,
-   Object.extend({ scaleContent: false,
-    scaleX: false,
-    scaleMode: 'box',
-    scaleFrom: 100,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makePositioned();
-      effect.element.down().makePositioned();
-      if (window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping().show();
-    },
-    afterUpdateInternal: function(effect) {
-      effect.element.down().setStyle({bottom:
-        (effect.dims[0] - effect.element.clientHeight) + 'px' });
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.hide().undoClipping().undoPositioned();
-      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
-    }
-   }, arguments[1] || { })
-  );
-};
-
-// Bug in opera makes the TD containing this element expand for a instance after finish
-Effect.Squish = function(element) {
-  return new Effect.Scale(element, window.opera ? 1 : 0, {
-    restoreAfterFinish: true,
-    beforeSetup: function(effect) {
-      effect.element.makeClipping();
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.hide().undoClipping();
-    }
-  });
-};
-
-Effect.Grow = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    direction: 'center',
-    moveTransition: Effect.Transitions.sinoidal,
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.full
-  }, arguments[1] || { });
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    height: element.style.height,
-    width: element.style.width,
-    opacity: element.getInlineOpacity() };
-
-  var dims = element.getDimensions();
-  var initialMoveX, initialMoveY;
-  var moveX, moveY;
-
-  switch (options.direction) {
-    case 'top-left':
-      initialMoveX = initialMoveY = moveX = moveY = 0;
-      break;
-    case 'top-right':
-      initialMoveX = dims.width;
-      initialMoveY = moveY = 0;
-      moveX = -dims.width;
-      break;
-    case 'bottom-left':
-      initialMoveX = moveX = 0;
-      initialMoveY = dims.height;
-      moveY = -dims.height;
-      break;
-    case 'bottom-right':
-      initialMoveX = dims.width;
-      initialMoveY = dims.height;
-      moveX = -dims.width;
-      moveY = -dims.height;
-      break;
-    case 'center':
-      initialMoveX = dims.width / 2;
-      initialMoveY = dims.height / 2;
-      moveX = -dims.width / 2;
-      moveY = -dims.height / 2;
-      break;
-  }
-
-  return new Effect.Move(element, {
-    x: initialMoveX,
-    y: initialMoveY,
-    duration: 0.01,
-    beforeSetup: function(effect) {
-      effect.element.hide().makeClipping().makePositioned();
-    },
-    afterFinishInternal: function(effect) {
-      new Effect.Parallel(
-        [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
-          new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
-          new Effect.Scale(effect.element, 100, {
-            scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
-            sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
-        ], Object.extend({
-             beforeSetup: function(effect) {
-               effect.effects[0].element.setStyle({height: '0px'}).show();
-             },
-             afterFinishInternal: function(effect) {
-               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
-             }
-           }, options)
-      );
-    }
-  });
-};
-
-Effect.Shrink = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    direction: 'center',
-    moveTransition: Effect.Transitions.sinoidal,
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.none
-  }, arguments[1] || { });
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    height: element.style.height,
-    width: element.style.width,
-    opacity: element.getInlineOpacity() };
-
-  var dims = element.getDimensions();
-  var moveX, moveY;
-
-  switch (options.direction) {
-    case 'top-left':
-      moveX = moveY = 0;
-      break;
-    case 'top-right':
-      moveX = dims.width;
-      moveY = 0;
-      break;
-    case 'bottom-left':
-      moveX = 0;
-      moveY = dims.height;
-      break;
-    case 'bottom-right':
-      moveX = dims.width;
-      moveY = dims.height;
-      break;
-    case 'center':
-      moveX = dims.width / 2;
-      moveY = dims.height / 2;
-      break;
-  }
-
-  return new Effect.Parallel(
-    [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
-      new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
-      new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
-    ], Object.extend({
-         beforeStartInternal: function(effect) {
-           effect.effects[0].element.makePositioned().makeClipping();
-         },
-         afterFinishInternal: function(effect) {
-           effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
-       }, options)
-  );
-};
-
-Effect.Pulsate = function(element) {
-  element = $(element);
-  var options    = arguments[1] || { },
-    oldOpacity = element.getInlineOpacity(),
-    transition = options.transition || Effect.Transitions.linear,
-    reverser   = function(pos){
-      return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5);
-    };
-
-  return new Effect.Opacity(element,
-    Object.extend(Object.extend({  duration: 2.0, from: 0,
-      afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
-    }, options), {transition: reverser}));
-};
-
-Effect.Fold = function(element) {
-  element = $(element);
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    width: element.style.width,
-    height: element.style.height };
-  element.makeClipping();
-  return new Effect.Scale(element, 5, Object.extend({
-    scaleContent: false,
-    scaleX: false,
-    afterFinishInternal: function(effect) {
-    new Effect.Scale(element, 1, {
-      scaleContent: false,
-      scaleY: false,
-      afterFinishInternal: function(effect) {
-        effect.element.hide().undoClipping().setStyle(oldStyle);
-      } });
-  }}, arguments[1] || { }));
-};
-
-Effect.Morph = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      style: { }
-    }, arguments[1] || { });
-
-    if (!Object.isString(options.style)) this.style = $H(options.style);
-    else {
-      if (options.style.include(':'))
-        this.style = options.style.parseStyle();
-      else {
-        this.element.addClassName(options.style);
-        this.style = $H(this.element.getStyles());
-        this.element.removeClassName(options.style);
-        var css = this.element.getStyles();
-        this.style = this.style.reject(function(style) {
-          return style.value == css[style.key];
-        });
-        options.afterFinishInternal = function(effect) {
-          effect.element.addClassName(effect.options.style);
-          effect.transforms.each(function(transform) {
-            effect.element.style[transform.style] = '';
-          });
-        };
-      }
-    }
-    this.start(options);
-  },
-
-  setup: function(){
-    function parseColor(color){
-      if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
-      color = color.parseColor();
-      return $R(0,2).map(function(i){
-        return parseInt( color.slice(i*2+1,i*2+3), 16 );
-      });
-    }
-    this.transforms = this.style.map(function(pair){
-      var property = pair[0], value = pair[1], unit = null;
-
-      if (value.parseColor('#zzzzzz') != '#zzzzzz') {
-        value = value.parseColor();
-        unit  = 'color';
-      } else if (property == 'opacity') {
-        value = parseFloat(value);
-        if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
-          this.element.setStyle({zoom: 1});
-      } else if (Element.CSS_LENGTH.test(value)) {
-          var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
-          value = parseFloat(components[1]);
-          unit = (components.length == 3) ? components[2] : null;
-      }
-
-      var originalValue = this.element.getStyle(property);
-      return {
-        style: property.camelize(),
-        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
-        targetValue: unit=='color' ? parseColor(value) : value,
-        unit: unit
-      };
-    }.bind(this)).reject(function(transform){
-      return (
-        (transform.originalValue == transform.targetValue) ||
-        (
-          transform.unit != 'color' &&
-          (isNaN(transform.originalValue) || isNaN(transform.targetValue))
-        )
-      );
-    });
-  },
-  update: function(position) {
-    var style = { }, transform, i = this.transforms.length;
-    while(i--)
-      style[(transform = this.transforms[i]).style] =
-        transform.unit=='color' ? '#'+
-          (Math.round(transform.originalValue[0]+
-            (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
-          (Math.round(transform.originalValue[1]+
-            (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
-          (Math.round(transform.originalValue[2]+
-            (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
-        (transform.originalValue +
-          (transform.targetValue - transform.originalValue) * position).toFixed(3) +
-            (transform.unit === null ? '' : transform.unit);
-    this.element.setStyle(style, true);
-  }
-});
-
-Effect.Transform = Class.create({
-  initialize: function(tracks){
-    this.tracks  = [];
-    this.options = arguments[1] || { };
-    this.addTracks(tracks);
-  },
-  addTracks: function(tracks){
-    tracks.each(function(track){
-      track = $H(track);
-      var data = track.values().first();
-      this.tracks.push($H({
-        ids:     track.keys().first(),
-        effect:  Effect.Morph,
-        options: { style: data }
-      }));
-    }.bind(this));
-    return this;
-  },
-  play: function(){
-    return new Effect.Parallel(
-      this.tracks.map(function(track){
-        var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
-        var elements = [$(ids) || $$(ids)].flatten();
-        return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
-      }).flatten(),
-      this.options
-    );
-  }
-});
-
-Element.CSS_PROPERTIES = $w(
-  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
-  'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
-  'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
-  'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
-  'fontSize fontWeight height left letterSpacing lineHeight ' +
-  'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
-  'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
-  'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
-  'right textIndent top width wordSpacing zIndex');
-
-Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
-
-String.__parseStyleElement = document.createElement('div');
-String.prototype.parseStyle = function(){
-  var style, styleRules = $H();
-  if (Prototype.Browser.WebKit)
-    style = new Element('div',{style:this}).style;
-  else {
-    String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
-    style = String.__parseStyleElement.childNodes[0].style;
-  }
-
-  Element.CSS_PROPERTIES.each(function(property){
-    if (style[property]) styleRules.set(property, style[property]);
-  });
-
-  if (Prototype.Browser.IE && this.include('opacity'))
-    styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
-
-  return styleRules;
-};
-
-if (document.defaultView && document.defaultView.getComputedStyle) {
-  Element.getStyles = function(element) {
-    var css = document.defaultView.getComputedStyle($(element), null);
-    return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
-      styles[property] = css[property];
-      return styles;
-    });
-  };
-} else {
-  Element.getStyles = function(element) {
-    element = $(element);
-    var css = element.currentStyle, styles;
-    styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
-      results[property] = css[property];
-      return results;
-    });
-    if (!styles.opacity) styles.opacity = element.getOpacity();
-    return styles;
-  };
-}
-
-Effect.Methods = {
-  morph: function(element, style) {
-    element = $(element);
-    new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
-    return element;
-  },
-  visualEffect: function(element, effect, options) {
-    element = $(element);
-    var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
-    new Effect[klass](element, options);
-    return element;
-  },
-  highlight: function(element, options) {
-    element = $(element);
-    new Effect.Highlight(element, options);
-    return element;
-  }
-};
-
-$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
-  'pulsate shake puff squish switchOff dropOut').each(
-  function(effect) {
-    Effect.Methods[effect] = function(element, options){
-      element = $(element);
-      Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
-      return element;
-    };
-  }
-);
-
-$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
-  function(f) { Effect.Methods[f] = Element[f]; }
-);
-
-Element.addMethods(Effect.Methods);
\ No newline at end of file
diff --git a/lib/scriptaculous/scriptaculous.js b/lib/scriptaculous/scriptaculous.js
deleted file mode 100644
index 0ea5c4457..000000000
--- a/lib/scriptaculous/scriptaculous.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// script.aculo.us scriptaculous.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010
-
-// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-var Scriptaculous = {
-  Version: '1.9.0',
-  require: function(libraryName) {
-    try{
-      // inserting via DOM fails in Safari 2.0, so brute force approach
-      document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>');
-    } catch(e) {
-      // for xhtml+xml served content, fall back to DOM methods
-      var script = document.createElement('script');
-      script.type = 'text/javascript';
-      script.src = libraryName;
-      document.getElementsByTagName('head')[0].appendChild(script);
-    }
-  },
-  REQUIRED_PROTOTYPE: '1.6.0.3',
-  load: function() {
-    function convertVersionString(versionString) {
-      var v = versionString.replace(/_.*|\./g, '');
-      v = parseInt(v + '0'.times(4-v.length));
-      return versionString.indexOf('_') > -1 ? v-1 : v;
-    }
-
-    if((typeof Prototype=='undefined') ||
-       (typeof Element == 'undefined') ||
-       (typeof Element.Methods=='undefined') ||
-       (convertVersionString(Prototype.Version) <
-        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
-       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
-        Scriptaculous.REQUIRED_PROTOTYPE);
-
-    var js = /scriptaculous\.js(\?.*)?$/;
-    $$('script[src]').findAll(function(s) {
-      return s.src.match(js);
-    }).each(function(s) {
-      var path = s.src.replace(js, ''),
-      includes = s.src.match(/\?.*load=([a-z,]*)/);
-      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
-       function(include) { Scriptaculous.require(path+include+'.js') });
-    });
-  }
-};
-
-Scriptaculous.load();
\ No newline at end of file
diff --git a/plugins/af_readability/init.js b/plugins/af_readability/init.js
index ff2d94e8b..6dec82f45 100644
--- a/plugins/af_readability/init.js
+++ b/plugins/af_readability/init.js
@@ -2,8 +2,8 @@ Plugins.Af_Readability = {
     orig_attr_name: 'data-readability-orig-content',
     self: this,
     embed: function(id) {
-        const content = $$(App.isCombinedMode() ? ".cdm[data-article-id=" + id + "] .content-inner" :
-            ".post[data-article-id=" + id + "] .content")[0];
+        const content = App.find(App.isCombinedMode() ? ".cdm[data-article-id=" + id + "] .content-inner" :
+            ".post[data-article-id=" + id + "] .content");
 
         if (content.hasAttribute(self.orig_attr_name)) {
             content.innerHTML = content.getAttribute(self.orig_attr_name);
diff --git a/plugins/af_zz_vidmute/init.js b/plugins/af_zz_vidmute/init.js
index fab9b99e6..b8be8cecd 100644
--- a/plugins/af_zz_vidmute/init.js
+++ b/plugins/af_zz_vidmute/init.js
@@ -3,7 +3,7 @@ require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function (row) {
 			if (row) {
 
-				row.select("video").each(function (v) {
+				row.querySelectorAll("video").forEach(function (v) {
 					v.muted = true;
 				});
 			}
@@ -14,7 +14,7 @@ require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED, function (row) {
 			if (row) {
 
-				row.select("video").each(function (v) {
+				row.querySelectorAll("video").forEach(function (v) {
 					v.muted = true;
 				});
 			}
diff --git a/plugins/share/share.js b/plugins/share/share.js
index 46b62ca5b..a5f60d267 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -23,9 +23,6 @@ Plugins.Share = {
 								target.href = target.href.replace(/&key=.*$/,
 									"&key=" + new_link);
 
-								// eslint-disable-next-line no-new
-								new Effect.Highlight(target);
-
 								const icon = document.querySelector(".share-icon-" + id);
 
 								if (icon)
diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index 873749c03..0abc8c129 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -7,8 +7,8 @@ Plugins.Shorten_Expanded = {
 		const row = $(id);
 
 		if (row) {
-			const content = row.select(".content-shrink-wrap")[0];
-			const link = row.select(".expand-prompt")[0];
+			const content = row.querySelector(".content-shrink-wrap");
+			const link = row.querySelector(".expand-prompt");
 
 			if (content) content.removeClassName("content-shrink-wrap");
 			if (link) Element.hide(link);
diff --git a/prefs.php b/prefs.php
index 9d5f8e499..71dc73b29 100644
--- a/prefs.php
+++ b/prefs.php
@@ -59,8 +59,7 @@
 	</script>
 
 	<?php
-	foreach (array("lib/prototype.js",
-				"lib/scriptaculous/scriptaculous.js?load=effects,controls",
+	foreach (array(#"lib/prototype.js",
 				"lib/dojo/dojo.js",
 				"lib/dojo/tt-rss-layer.js",
 				"js/common.js",
-- 
cgit v1.2.3-54-g00ecf

From 00310d2d23dd459c17b3f6e86a127de348b330f8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 06:58:50 +0300
Subject: cleanup some unused code, fix App.byId() invoked by wrong name

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

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index cfbf83d2a..fecec6d91 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -355,14 +355,14 @@ class Pref_Prefs extends Handler_Protected {
 							Notify.close();
 							if (transport.responseText.indexOf('ERROR: ') == 0) {
 
-								$('pwd_change_infobox').innerHTML =
+								App.byId('pwd_change_infobox').innerHTML =
 									transport.responseText.replace('ERROR: ', '');
 
 							} else {
-								$('pwd_change_infobox').innerHTML =
+								App.byId('pwd_change_infobox').innerHTML =
 									transport.responseText.replace('ERROR: ', '');
 
-								const warn = $('default_pass_warning');
+								const warn = App.byId('default_pass_warning');
 								if (warn) Element.hide(warn);
 							}
 
diff --git a/js/App.js b/js/App.js
index 0055fcd4f..f7a9254ba 100644
--- a/js/App.js
+++ b/js/App.js
@@ -1044,8 +1044,6 @@ const App = {
          };
 
          this.hotkey_actions["feed_debug_viewfeed"] = () => {
-            //Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), viewfeed_debug: true});
-
             App.postOpenWindow("backend.php", {op: "feeds", method: "view",
                feed: Feeds.getActive(), timestamps: 1, debug: 1, cat: Feeds.activeIsCat(), csrf_token: __csrf_token});
          };
diff --git a/js/Article.js b/js/Article.js
index e7498f0b3..15c5cac65 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -93,16 +93,6 @@ const Article = {
 		w.opener = null;
 		w.location = url;
 	},
-	/* popupOpenArticle: function(id) {
-		const w = window.open("",
-			"ttrss_article_popup",
-			"height=900,width=900,resizable=yes,status=no,location=no,menubar=no,directories=no,scrollbars=yes,toolbar=no");
-
-		if (w) {
-			w.opener = null;
-			w.location = "backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + "&csrf_token=" + App.getInitParam("csrf_token");
-		}
-	}, */
 	cdmUnsetActive: function (event) {
 		const row = App.byId("RROW-" + Article.getActive());
 
diff --git a/js/Feeds.js b/js/Feeds.js
index 7f3a80f4e..67c78cbfe 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -317,7 +317,6 @@ const	Feeds = {
 		const feed = params.feed;
 		const is_cat = !!params.is_cat || false;
 		const offset = params.offset || 0;
-		const viewfeed_debug = params.viewfeed_debug;
 		const append = params.append || false;
 		const method = params.method;
 		// this is used to quickly switch between feeds, sets active but xhr is on a timeout
@@ -373,13 +372,6 @@ const	Feeds = {
 
 		this.setActive(feed, is_cat);
 
-		if (viewfeed_debug) {
-			window.open("backend.php?" +
-				dojo.objectToQuery(
-					Object.assign({csrf_token: App.getInitParam("csrf_token")}, query)
-				));
-		}
-
 		window.clearTimeout(this._viewfeed_wait_timeout);
 		this._viewfeed_wait_timeout = window.setTimeout(() => {
 			xhrPost("backend.php", query, (transport) => {
diff --git a/js/common.js b/js/common.js
index 1adf5d56e..6dd5713df 100755
--- a/js/common.js
+++ b/js/common.js
@@ -4,7 +4,7 @@
 /* eslint-disable no-new */
 
 function $(id) {
-	console.warn("FIXME: please use App.getById() or document.getElementById() instead of $():", id);
+	console.warn("FIXME: please use App.byId() or document.getElementById() instead of $():", id);
 	return document.getElementById(id);
 }
 
diff --git a/plugins/note/note.js b/plugins/note/note.js
index bc6c48156..d2d9c2b01 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -13,7 +13,7 @@ Plugins.Note = {
 						dialog.hide();
 
 						if (reply) {
-							const elem = $("POSTNOTE-" + id);
+							const elem = App.byId("POSTNOTE-" + id);
 
 							if (elem) {
 								elem.innerHTML = reply.note;
-- 
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/prefs.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 f6bfb89b2912933f638416135dff7bb8cb28890d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 21 Feb 2021 23:18:32 +0300
Subject: pref-prefs: switch to new control shorthand in a few places

---
 classes/pref/prefs.php | 51 +++++++++++++++++++++-----------------------------
 include/controls.php   | 17 +++++++++++++++++
 2 files changed, 38 insertions(+), 30 deletions(-)

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

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 2ea2e9f01..a26281fee 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -712,59 +712,50 @@ class Pref_Prefs extends Handler_Protected {
 
 						array_push($listed_boolean_prefs, $pref_name);
 
-						$is_checked = ($value == "true") ? "checked=\"checked\"" : "";
-
 						if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) {
-							$is_disabled = "disabled=\"1\"";
-							$is_checked = "checked=\"checked\"";
+							$is_disabled = true;
+							$is_checked = true;
 						} else {
-							$is_disabled = "";
+							$is_disabled = false;
+							$is_checked = ($value == "true");
 						}
 
-						print "<input type='checkbox' name='$pref_name' $is_checked $is_disabled
-							dojoType='dijit.form.CheckBox' id='CB_$pref_name' value='1'>";
+						print \Controls\checkbox_tag($pref_name, $is_checked, "true",
+							["disabled" => $is_disabled], "CB_$pref_name");
 
 					} else if (in_array($pref_name, ['FRESH_ARTICLE_MAX_AGE',
 							'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT'])) {
 
-						$regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
-
 						if ($pref_name == "PURGE_OLD_DAYS" && FORCE_ARTICLE_PURGE != 0) {
-							$is_disabled = "disabled='1'";
+							$attributes = ["disabled" => true, "required" => true];
 							$value = FORCE_ARTICLE_PURGE;
 						} else {
-							$is_disabled = "";
+							$attributes = ["required" => true];
 						}
 
 						if ($type_name == 'integer')
-							print "<input dojoType=\"dijit.form.NumberSpinner\"
-								required='1' $is_disabled
-								name=\"$pref_name\" value=\"$value\">";
+							print \Controls\number_spinner_tag($pref_name, $value, $attributes);
 						else
-							print "<input dojoType=\"dijit.form.TextBox\"
-								required='1' $regexp $is_disabled
-								name=\"$pref_name\" value=\"$value\">";
+							print \Controls\input_tag($pref_name, $value, "text", $attributes);
 
 					} else if ($pref_name == "SSL_CERT_SERIAL") {
 
-						print "<input dojoType='dijit.form.ValidationTextBox'
-							id='SSL_CERT_SERIAL' readonly='1'
-							name=\"$pref_name\" value=\"$value\">";
+						print \Controls\input_tag($pref_name, $value, "text", ["readonly" => true], "SSL_CERT_SERIAL");
 
 						$cert_serial = htmlspecialchars(get_ssl_certificate_id());
-						$has_serial = ($cert_serial) ? "false" : "true";
+						$has_serial = ($cert_serial) ? true : false;
 
-						print "<button dojoType='dijit.form.Button' disabled='$has_serial'
-							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">" .
-							__('Register') . "</button>";
+						print \Controls\button_tag(__('Register'), "", [
+							"disabled" => !$has_serial,
+							"onclick" => "dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')"]);
 
-						print "<button dojoType='dijit.form.Button' class='alt-danger'
-							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '')\">" .
-							__('Clear') . "</button>";
+						print \Controls\button_tag(__('Clear'), "", [
+							"class" => "alt-danger",
+							"onclick" => "dijit.byId('SSL_CERT_SERIAL').attr('value', '')"]);
 
-						print "<button dojoType='dijit.form.Button' class='alt-info'
-							onclick='window.open(\"https://tt-rss.org/wiki/SSL%20Certificate%20Authentication\")'>
-							<i class='material-icons'>help</i> ".__("More info...")."</button>";
+						print \Controls\button_tag(\Controls\icon("help") . " " . __("More info..."), "", [
+							"class" => "alt-info",
+							"onclick" => "window.open('https://tt-rss.org/wiki/SSL%20Certificate%20Authentication')"]);
 
 					} else if ($pref_name == 'DIGEST_PREFERRED_TIME') {
 						print "<input dojoType=\"dijit.form.ValidationTextBox\"
diff --git a/include/controls.php b/include/controls.php
index e3349d31b..b65a166c2 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -5,6 +5,11 @@
       $rv = "";
 
       foreach ($attributes as $k => $v) {
+
+         // special handling for "disabled"
+         if ($k === "disabled" && !sql_bool_to_bool($v))
+            continue;
+
          $rv .= "$k=\"" . htmlspecialchars($v) . "\"";
       }
 
@@ -30,6 +35,18 @@
       return "<button dojoType=\"dijit.form.Button\" ".attributes_to_string($attributes)." type=\"$type\">$value</button>";
    }
 
+   function input_tag(string $name, string $value, string $type = "text", array $attributes = [], string $id = "") {
+      $attributes_str = attributes_to_string($attributes);
+      $dojo_type = strpos($attributes_str, "dojoType") === false ? "dojoType='dijit.form.TextBox'" : "";
+
+      return "<input name=\"".htmlspecialchars($name)."\" $dojo_type ".attributes_to_string($attributes)." id=\"".htmlspecialchars($id)."\"
+         type=\"$type\" value=\"".htmlspecialchars($value)."\">";
+   }
+
+   function number_spinner_tag(string $name, string $value, array $attributes = [], string $id = "") {
+      return input_tag($name, $value, "text", array_merge(["dojoType" => "dijit.form.NumberSpinner"], $attributes), $id);
+   }
+
    function submit_tag(string $value, array $attributes = []) {
       return button_tag($value, "submit", array_merge(["class" => "alt-primary"], $attributes));
    }
-- 
cgit v1.2.3-54-g00ecf

From be4e7b13403666fc477d4b563ea8c075d0fd2022 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 22 Feb 2021 14:41:09 +0300
Subject: fix several issues reported by phpstan

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

diff --git a/api/index.php b/api/index.php
index eb79422f9..1b713d561 100644
--- a/api/index.php
+++ b/api/index.php
@@ -18,8 +18,8 @@
 	require_once "functions.php";
 	require_once "sessions.php";
 
-	ini_set('session.use_cookies', 0);
-	ini_set("session.gc_maxlifetime", 86400);
+	ini_set('session.use_cookies', "0");
+	ini_set("session.gc_maxlifetime", "86400");
 
 	ob_start();
 
diff --git a/classes/api.php b/classes/api.php
index 03eea1927..5677cb908 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -292,7 +292,7 @@ class API extends Handler {
 		$sanitize_content = !isset($_REQUEST["sanitize"]) ||
 			self::_param_to_bool($_REQUEST["sanitize"]);
 
-		if ($article_ids) {
+		if (count($article_ids) > 0) {
 
 			$article_qmarks = arr_qmarks($article_ids);
 
diff --git a/classes/digest.php b/classes/digest.php
index 77eb92c54..e0c23d705 100644
--- a/classes/digest.php
+++ b/classes/digest.php
@@ -1,12 +1,6 @@
 <?php
 class Digest
 {
-
-	/**
-	 * Send by mail a digest of last articles.
-	 *
-	 * @return boolean Return false if digests are not enabled.
-	 */
 	static function send_headlines_digests() {
 
 		$user_limit = 15; // amount of users to process (e.g. emails to send out)
@@ -81,9 +75,7 @@ class Digest
 				}
 			}
 		}
-
 		Debug::log("All done.");
-
 	}
 
 	static function prepare_headlines_digest($user_id, $days = 1, $limit = 1000) {
@@ -210,5 +202,4 @@ class Digest
 
 		return array($tmp, $headlines_count, $affected_ids, $tmp_t);
 	}
-
 }
diff --git a/classes/feeds.php b/classes/feeds.php
index 63b84edae..b59504c03 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1067,22 +1067,16 @@ class Feeds extends Handler_Protected {
 		switch ($id) {
 			case 0:
 				return "archive";
-				break;
 			case -1:
 				return "star";
-				break;
 			case -2:
 				return "rss_feed";
-				break;
 			case -3:
 				return "whatshot";
-				break;
 			case -4:
 				return "inbox";
-				break;
 			case -6:
 				return "restore";
-				break;
 			default:
 				if ($id < LABEL_BASE_INDEX) {
 					return "label";
diff --git a/classes/handler/public.php b/classes/handler/public.php
index b0ce2306d..3910cf7c1 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -146,9 +146,9 @@ class Handler_Public extends Handler {
 						$tpl->addBlock('enclosure');
 					}
 				} else {
-					$tpl->setVariable('ARTICLE_ENCLOSURE_URL', null, true);
-					$tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', null, true);
-					$tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', null, true);
+					$tpl->setVariable('ARTICLE_ENCLOSURE_URL', "", true);
+					$tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', "", true);
+					$tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', "", true);
 				}
 
 				list ($og_image, $og_stream) = Article::_get_image($enclosures, $line['content'], $feed_site_url);
@@ -207,8 +207,8 @@ class Handler_Public extends Handler {
 				$article['content'] = Sanitizer::sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
 				$article['updated'] = date('c', strtotime($line["updated"]));
 
-				if ($line['note']) $article['note'] = $line['note'];
-				if ($article['author']) $article['author'] = $line['author'];
+				if (!empty($line['note'])) $article['note'] = $line['note'];
+				if (!empty($line['author'])) $article['author'] = $line['author'];
 
 				if (count($line["tags"]) > 0) {
 					$article['tags'] = array();
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index a05938111..5121c8491 100755
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -108,8 +108,9 @@ class PluginHost {
 		return false;
 	}
 
+	// needed for compatibility with API 2 (?)
 	function get_dbh() {
-		return Db::get();
+		return false;
 	}
 
 	function get_pdo(): PDO {
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index a26281fee..adb249dac 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -311,13 +311,6 @@ class Pref_Prefs extends Handler_Protected {
 				<input dojoType='dijit.form.ValidationTextBox' name='email' required='1' value="<?= $email ?>">
 			</fieldset>
 
-			<?php if (!SINGLE_USER_MODE && !empty($_SESSION["hide_hello"])) { ?>
-				<fieldset>
-					<label><?= __('Access level:') ?></label>
-					<?= $access_level_names[$row["access_level"]] ?>
-				</fieldset>
-			<?php } ?>
-
 			<hr/>
 
 			<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>
diff --git a/include/functions.php b/include/functions.php
index 174ef39f0..bf9b374a2 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -34,8 +34,8 @@
 		error_reporting(E_ALL & ~E_NOTICE);
 	}
 
-	ini_set('display_errors', 0);
-	ini_set('display_startup_errors', 0);
+	ini_set('display_errors', "false");
+	ini_set('display_startup_errors', "false");
 
 	require_once 'config.php';
 
@@ -281,7 +281,7 @@
 		} else if (is_string($param)) {
 			return trim(strip_tags($param));
 		} else {
-			return trim($param);
+			return $param;
 		}
 	}
 
@@ -430,7 +430,7 @@
 	}
 
 	function uniqid_short() {
-		return uniqid(base_convert(rand(), 10, 36));
+		return uniqid(base_convert((string)rand(), 10, 36));
 	}
 
 	function T_sprintf() {
diff --git a/include/sanity_check.php b/include/sanity_check.php
index 9407b606f..2786f012f 100755
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -40,8 +40,6 @@
 			array_push($errors, "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it.");
 		} else {
 
-			require_once "sanity_config.php";
-
 			if (!file_exists("config.php")) {
 				array_push($errors, "Please copy config.php-dist to config.php");
 			}
@@ -78,12 +76,14 @@
 				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 ($required_defines as $d) {
+			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.");
diff --git a/include/sanity_config.php b/include/sanity_config.php
index 5059ee83b..b304adf54 100644
--- a/include/sanity_config.php
+++ b/include/sanity_config.php
@@ -1,3 +1,3 @@
-<?php # This file has been generated at:  Fri Feb 12 21:33:46 MSK 2021
+<?php # This file has been generated at:  Mon Feb 22 14:17:27 MSK 2021
 define('GENERATED_CONFIG_CHECK', 26);
-$required_defines = array( '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'); ?>
+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 16de53ab2..5b372612b 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -12,14 +12,14 @@
 	$session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
 
 	if (is_server_https()) {
-		ini_set("session.cookie_secure", true);
+		ini_set("session.cookie_secure", "true");
 	}
 
-	ini_set("session.gc_probability", 75);
+	ini_set("session.gc_probability", "75");
 	ini_set("session.name", $session_name);
-	ini_set("session.use_only_cookies", true);
+	ini_set("session.use_only_cookies", "true");
 	ini_set("session.gc_maxlifetime", $session_expire);
-	ini_set("session.cookie_lifetime", 0);
+	ini_set("session.cookie_lifetime", "0");
 
 	function session_get_schema_version() {
 		global $schema_version;
diff --git a/phpstan.neon b/phpstan.neon
index 0703e0d15..b2cd978d8 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -2,7 +2,9 @@ parameters:
    level: 5
    ignoreErrors:
       - '#Constant.*not found#'
-      - '#Call to an undefined method DOMNode::getAttribute.#'
+      - '#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.#'
       - '#PHPDoc tag @param has invalid value#'
       - message: '##'
         paths:
diff --git a/plugins/af_fsckportal/init.php b/plugins/af_fsckportal/init.php
index 04b77a15a..8caa617c6 100644
--- a/plugins/af_fsckportal/init.php
+++ b/plugins/af_fsckportal/init.php
@@ -19,9 +19,7 @@ class Af_Fsckportal extends Plugin {
 
 			$doc = new DOMDocument();
 
-			@$doc->loadHTML('<?xml encoding="UTF-8">' . $article["content"]);
-
-			if ($doc) {
+			if (@$doc->loadHTML('<?xml encoding="UTF-8">' . $article["content"])) {
 				$xpath = new DOMXPath($doc);
 				$entries = $xpath->query('(//img[@src]|//a[@href])');
 
@@ -34,7 +32,6 @@ class Af_Fsckportal extends Plugin {
 				}
 
 				$article["content"] = $doc->saveHTML();
-
 		}
 
 		return $article;
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 2677fdd90..713eaea5c 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -207,7 +207,7 @@ class Af_RedditImgur extends Plugin {
 		$found = false;
 
 		// embed before reddit <table> post layout
-		$anchor = $xpath->query('//body/*')->item(0);
+		$anchor = $xpath->query('//_body/*')->item(0);
 
 		// deal with json-provided media content first
 		if ($article["link"] && $anchor) {
@@ -217,6 +217,7 @@ class Af_RedditImgur extends Plugin {
 
 			$this->fallback_preview_urls = [];
 
+			// @phpstan-ignore-next-line
 			if ($tmp && $anchor) {
 				$json = json_decode($tmp, true);
 
@@ -346,6 +347,8 @@ class Af_RedditImgur extends Plugin {
 
 				if (strpos($source_stream, "imgur.com") !== false)
 					$poster_url = str_replace(".mp4", "h.jpg", $source_stream);
+				else
+					$poster_url = false;
 
 				$this->handle_as_video($doc, $entry, $source_stream, $poster_url);
 
diff --git a/update.php b/update.php
index 1f79dccf0..71b8cf76c 100755
--- a/update.php
+++ b/update.php
@@ -32,7 +32,7 @@
 
 		if (DB_TYPE == "pgsql") {
 			$interval_query = "date_updated < NOW() - INTERVAL '$days days'";
-		} else if (DB_TYPE == "mysql") {
+		} else /*if (DB_TYPE == "mysql") */ {
 			$interval_query = "date_updated < DATE_SUB(NOW(), INTERVAL $days DAY)";
 		}
 
@@ -459,7 +459,7 @@
 
 	if (isset($options["list-plugins"])) {
 		$tmppluginhost = new PluginHost();
-		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, false);
+		$tmppluginhost->load_all($tmppluginhost::KIND_ALL);
 		$enabled = array_map("trim", explode(",", PLUGINS));
 
 		echo "List of all available plugins:\n";
diff --git a/utils/regen_config_checks.sh b/utils/regen_config_checks.sh
index e8b1ed830..b20ce0480 100755
--- a/utils/regen_config_checks.sh
+++ b/utils/regen_config_checks.sh
@@ -8,10 +8,10 @@ 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 "\$required_defines = array( " >> $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
+echo "]; }" >> $DESTINATION
 
 
-- 
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/prefs.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 2ae0b7059f2ed56b92a8f396c63224b36f71df09 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 23 Feb 2021 09:01:27 +0300
Subject: cleanup some defined-stuff

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

diff --git a/api/index.php b/api/index.php
index d1e02bbd4..4e2c06b9d 100644
--- a/api/index.php
+++ b/api/index.php
@@ -8,7 +8,6 @@
 
 	chdir("..");
 
-	define('TTRSS_SESSION_NAME', 'ttrss_api_sid');
 	define('NO_SESSION_AUTOSTART', true);
 
 	require_once "autoload.php";
@@ -20,26 +19,11 @@
 
 	ob_start();
 
-	$input = file_get_contents("php://input");
-
-	if (defined('_API_DEBUG_HTTP_ENABLED') && _API_DEBUG_HTTP_ENABLED) {
-		// Override $_REQUEST with JSON-encoded data if available
-		// fallback on HTTP parameters
-		if ($input) {
-			$input = json_decode($input, true);
-			if ($input) $_REQUEST = $input;
-		}
-	} else {
-		// Accept JSON only
-		$input = json_decode((string)$input, true);
-		$_REQUEST = $input;
-	}
+	$_REQUEST = json_decode((string)file_get_contents("php://input"), true);
 
 	if (!empty($_REQUEST["sid"])) {
 		session_id($_REQUEST["sid"]);
 		@session_start();
-	} else if (defined('_API_DEBUG_HTTP_ENABLED')) {
-		@session_start();
 	}
 
 	startup_gettext();
diff --git a/classes/auth/base.php b/classes/auth/base.php
index d54e9d8a2..f18cc2d2d 100644
--- a/classes/auth/base.php
+++ b/classes/auth/base.php
@@ -16,7 +16,7 @@ abstract class Auth_Base extends Plugin implements IAuthModule {
 	// Auto-creates specified user if allowed by system configuration
 	// Can be used instead of find_user_by_login() by external auth modules
 	function auto_create_user(string $login, $password = false) {
-		if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
+		if ($login && Config::get(Config::AUTH_AUTO_CREATE)) {
 			$user_id = UserHelper::find_user_by_login($login);
 
 			if (!$user_id) {
diff --git a/classes/config.php b/classes/config.php
index 6f62863e9..e7455daab 100644
--- a/classes/config.php
+++ b/classes/config.php
@@ -47,6 +47,9 @@ class Config {
 	const MAX_CONDITIONAL_INTERVAL = "MAX_CONDITIONAL_INTERVAL";
 	const DAEMON_UNSUCCESSFUL_DAYS_LIMIT = "DAEMON_UNSUCCESSFUL_DAYS_LIMIT";
 	const LOG_SENT_MAIL = "LOG_SENT_MAIL";
+	const HTTP_PROXY = "HTTP_PROXY";
+	const FORBID_PASSWORD_CHANGES = "FORBID_PASSWORD_CHANGES";
+	const TTRSS_SESSION_NAME = "TTRSS_SESSION_NAME";
 
 	private const _DEFAULTS = [
 		Config::DB_TYPE => "pgsql",
@@ -92,6 +95,9 @@ class Config {
 		Config::MAX_CONDITIONAL_INTERVAL => 3600*12,
 		Config::DAEMON_UNSUCCESSFUL_DAYS_LIMIT => 30,
 		Config::LOG_SENT_MAIL => "",
+		Config::HTTP_PROXY => "",
+		Config::FORBID_PASSWORD_CHANGES => "",
+		Config::TTRSS_SESSION_NAME => "ttrss_sid",
 	];
 
 	private static $instance;
diff --git a/classes/db.php b/classes/db.php
index cbfb9e598..a760d4402 100755
--- a/classes/db.php
+++ b/classes/db.php
@@ -41,7 +41,7 @@ class Db
 		} else if (Config::get(Config::DB_TYPE) == "mysql") {
 			$pdo->query("SET time_zone = '+0:0'");
 
-			if (defined('Config::get(Config::MYSQL_CHARSET)') && Config::get(Config::MYSQL_CHARSET)) {
+			if (Config::get(Config::MYSQL_CHARSET)) {
 				$pdo->query("SET NAMES " . Config::get(Config::MYSQL_CHARSET));
 			}
 		}
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 1ca5b28be..7ee03c21f 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -123,8 +123,8 @@ class Pref_Prefs extends Handler_Protected {
 
 	function changepassword() {
 
-		if (defined('_TTRSS_DEMO_INSTANCE')) {
-			print "ERROR: ".format_error("Disabled in demo version.");
+		if (Config::get(Config::FORBID_PASSWORD_CHANGES)) {
+			print "ERROR: ".format_error("Access forbidden.");
 			return;
 		}
 
diff --git a/classes/rpc.php b/classes/rpc.php
index 4aa3f69d5..52d514aae 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -329,7 +329,7 @@ class RPC extends Handler_Protected {
 
 		get_version($git_commit, $git_timestamp);
 
-		if (defined('Config::get(Config::CHECK_FOR_UPDATES)') && Config::get(Config::CHECK_FOR_UPDATES) && $_SESSION["access_level"] >= 10 && $git_timestamp) {
+		if (Config::get(Config::CHECK_FOR_UPDATES) && $_SESSION["access_level"] >= 10 && $git_timestamp) {
 			$content = @UrlHelper::fetch(["url" => "https://tt-rss.org/version.json"]);
 
 			if ($content) {
diff --git a/classes/rssutils.php b/classes/rssutils.php
index 5dcbb48d6..6479d9f97 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -1583,13 +1583,13 @@ class RSSUtils {
 	}
 
 	static function disable_failed_feeds() {
-		if (defined('DAEMON_UNSUCCESSFUL_DAYS_LIMIT') && DAEMON_UNSUCCESSFUL_DAYS_LIMIT > 0) {
+		if (Config::get(Config::DAEMON_UNSUCCESSFUL_DAYS_LIMIT) > 0) {
 
 			$pdo = Db::pdo();
 
 			$pdo->beginTransaction();
 
-			$days = DAEMON_UNSUCCESSFUL_DAYS_LIMIT;
+			$days = Config::get(Config::DAEMON_UNSUCCESSFUL_DAYS_LIMIT);
 
 			if (Config::get(Config::DB_TYPE) == "pgsql") {
 				$interval_query = "last_successful_update < NOW() - INTERVAL '$days days' AND last_updated > NOW() - INTERVAL '1 days'";
@@ -1606,10 +1606,10 @@ class RSSUtils {
 			while ($row = $sth->fetch()) {
 				Logger::get()->log(E_USER_NOTICE,
 					sprintf("Auto disabling feed %d (%s, UID: %d) because it failed to update for %d days.",
-						$row["id"], clean($row["title"]), $row["owner_uid"], DAEMON_UNSUCCESSFUL_DAYS_LIMIT));
+						$row["id"], clean($row["title"]), $row["owner_uid"], Config::get(Config::DAEMON_UNSUCCESSFUL_DAYS_LIMIT)));
 
 				Debug::log(sprintf("Auto-disabling feed %d (%s) (failed to update for %d days).", $row["id"],
-					clean($row["title"]), DAEMON_UNSUCCESSFUL_DAYS_LIMIT));
+					clean($row["title"]), Config::get(Config::DAEMON_UNSUCCESSFUL_DAYS_LIMIT)));
 			}
 
 			$sth = $pdo->prepare("UPDATE ttrss_feeds SET update_interval = -1 WHERE
diff --git a/classes/urlhelper.php b/classes/urlhelper.php
index 42aa069e6..bf2e22a76 100644
--- a/classes/urlhelper.php
+++ b/classes/urlhelper.php
@@ -123,9 +123,9 @@ class UrlHelper {
 					 'protocol_version'=> 1.1)
 				);
 
-			if (defined('_HTTP_PROXY')) {
+			if (Config::get(Config::HTTP_PROXY)) {
 				$context_options['http']['request_fulluri'] = true;
-				$context_options['http']['proxy'] = _HTTP_PROXY;
+				$context_options['http']['proxy'] = Config::get(Config::HTTP_PROXY);
 			}
 
 			$context = stream_context_create($context_options);
@@ -231,7 +231,7 @@ class UrlHelper {
 			return false;
 		}
 
-		if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) {
+		if (function_exists('curl_init') && !ini_get("open_basedir")) {
 
 			$fetch_curl_used = true;
 
@@ -283,8 +283,8 @@ class UrlHelper {
 				curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null");
 			}
 
-			if (defined('_HTTP_PROXY')) {
-				curl_setopt($ch, CURLOPT_PROXY, _HTTP_PROXY);
+			if (Config::get(Config::HTTP_PROXY)) {
+				curl_setopt($ch, CURLOPT_PROXY, Config::get(Config::HTTP_PROXY));
 			}
 
 			if ($post_query) {
@@ -408,9 +408,9 @@ class UrlHelper {
 			if ($http_referrer)
 				array_push($context_options['http']['header'], "Referer: $http_referrer");
 
-			if (defined('_HTTP_PROXY')) {
+			if (Config::get(Config::HTTP_PROXY)) {
 				$context_options['http']['request_fulluri'] = true;
-				$context_options['http']['proxy'] = _HTTP_PROXY;
+				$context_options['http']['proxy'] = Config::get(Config::HTTP_PROXY);
 			}
 
 			$context = stream_context_create($context_options);
diff --git a/include/sessions.php b/include/sessions.php
index 8b7de0ac7..84b1d722a 100644
--- a/include/sessions.php
+++ b/include/sessions.php
@@ -1,15 +1,13 @@
 <?php
 	namespace Sessions;
 
-	// Original from http://www.daniweb.com/code/snippet43.html
-
 	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(\Config::get(\Config::SESSION_COOKIE_LIFETIME), 86400));
-	$session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
+	$session_name = \Config::get(\Config::TTRSS_SESSION_NAME);
 
 	if (is_server_https()) {
 		ini_set("session.cookie_secure", "true");
@@ -48,7 +46,7 @@
 
 		if (!empty($_SESSION["uid"])) {
 
-			if (!defined('_SESSION_SKIP_UA_CHECKS') && $_SESSION["user_agent"] != sha1($_SERVER['HTTP_USER_AGENT'])) {
+			if ($_SESSION["user_agent"] != sha1($_SERVER['HTTP_USER_AGENT'])) {
 				$_SESSION["login_error_msg"] = __("Session failed to validate (UA changed).");
 				return false;
 			}
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 7d5aeff5a..1aa4793ea 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -701,7 +701,7 @@ class Af_RedditImgur extends Plugin {
 	private function get_header($url, $header, $useragent = SELF_USER_AGENT) {
 		$ret = false;
 
-		if (function_exists("curl_init") && !defined("NO_CURL")) {
+		if (function_exists("curl_init")) {
 			$ch = curl_init($url);
 			curl_setopt($ch, CURLOPT_TIMEOUT, 5);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
@@ -727,7 +727,7 @@ class Af_RedditImgur extends Plugin {
 
 	private function readability($article, $url, $doc, $xpath, $debug = false) {
 
-		if (!defined('NO_CURL') && function_exists("curl_init") && $this->host->get($this, "enable_readability") &&
+		if (function_exists("curl_init") && $this->host->get($this, "enable_readability") &&
 			mb_strlen(strip_tags($article["content"])) <= 150) {
 
 			// do not try to embed posts linking back to other reddit posts
diff --git a/plugins/af_unburn/init.php b/plugins/af_unburn/init.php
index 4d0c56740..386b6387f 100755
--- a/plugins/af_unburn/init.php
+++ b/plugins/af_unburn/init.php
@@ -21,7 +21,7 @@ class Af_Unburn extends Plugin {
 	function hook_article_filter($article) {
 		$owner_uid = $article["owner_uid"];
 
-		if (defined('NO_CURL') || !function_exists("curl_init") || ini_get("open_basedir"))
+		if (!function_exists("curl_init") || ini_get("open_basedir"))
 			return $article;
 
 		if ((strpos($article["link"], "feedproxy.google.com") !== false ||
@@ -37,8 +37,8 @@ class Af_Unburn extends Plugin {
 				curl_setopt($ch, CURLOPT_NOBODY, true);
 				curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
 
-				if (defined('_CURL_HTTP_PROXY')) {
-					curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY);
+				if (Config::get(Config::HTTP_PROXY)) {
+					curl_setopt($ch, CURLOPT_PROXY, Config::get(Config::HTTP_PROXY));
 				}
 
 				@curl_exec($ch);
@@ -80,4 +80,4 @@ class Af_Unburn extends Plugin {
 		return 2;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/plugins/auth_remote/init.php b/plugins/auth_remote/init.php
index 85be67d05..f2dcfb318 100644
--- a/plugins/auth_remote/init.php
+++ b/plugins/auth_remote/init.php
@@ -56,7 +56,7 @@ class Auth_Remote extends Auth_Base {
 				$_SESSION["hide_logout"] = true;
 
 				// LemonLDAP can send user informations via HTTP HEADER
-				if (defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE){
+				if (Config::get(Config::AUTH_AUTO_CREATE)) {
 					// update user name
 					$fullname = isset($_SERVER['HTTP_USER_NAME']) ? $_SERVER['HTTP_USER_NAME'] : ($_SERVER['AUTHENTICATE_CN'] ?? "");
 					if ($fullname){
-- 
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/prefs.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

" . __("Use the following OTP key with a compatible Authenticator application") . "