From f89924f7a19871e26d5805a6c1863903c6e474bf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 18:38:27 +0300
Subject: set use strict on JS modules; remove some mostly useless stuff like
 get_minified_js()

---
 js/common.js | 493 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 493 insertions(+)
 create mode 100755 js/common.js

(limited to 'js/common.js')

diff --git a/js/common.js b/js/common.js
new file mode 100755
index 000000000..b63257099
--- /dev/null
+++ b/js/common.js
@@ -0,0 +1,493 @@
+'use strict'
+/* global dijit, __ */
+
+let init_params = {};
+let _label_base_index = -1024;
+let loading_progress = 0;
+let notify_hide_timerid = false;
+
+Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
+	function (callOriginal, options) {
+
+		if (getInitParam("csrf_token") != undefined) {
+			Object.extend(options, options || { });
+
+			if (Object.isString(options.parameters))
+				options.parameters = options.parameters.toQueryParams();
+			else if (Object.isHash(options.parameters))
+				options.parameters = options.parameters.toObject();
+
+			options.parameters["csrf_token"] = getInitParam("csrf_token");
+		}
+
+		return callOriginal(options);
+	}
+);
+
+/* xhr shorthand helpers */
+
+function xhrPost(url, params, complete) {
+	console.log("xhrPost:", params);
+	return new Ajax.Request(url, {
+		parameters: params,
+		onComplete: complete
+	});
+}
+
+function xhrJson(url, params, complete) {
+	return xhrPost(url, params, (reply) => {
+		try {
+			const obj = JSON.parse(reply.responseText);
+			complete(obj);
+		} catch (e) {
+			console.error("xhrJson", e, reply);
+			complete(null);
+		}
+
+	})
+}
+
+/* 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);
+	}
+};
+
+const Lists = {
+	onRowChecked: function(elem) {
+		const checked = elem.domNode ? elem.attr("checked") : elem.checked;
+		// account for dojo checkboxes
+		elem = elem.domNode || elem;
+
+		const row = elem.up("li");
+
+		if (row)
+			checked ? row.addClassName("Selected") : row.removeClassName("Selected");
+	}
+};
+
+// noinspection JSUnusedGlobalSymbols
+const Tables = {
+	onRowChecked: function(elem) {
+		// account for dojo checkboxes
+		const checked = elem.domNode ? elem.attr("checked") : elem.checked;
+		elem = elem.domNode || elem;
+
+		const row = elem.up("tr");
+
+		if (row)
+			checked ? row.addClassName("Selected") : row.removeClassName("Selected");
+
+	},
+	select: function(elemId, selected) {
+		$(elemId).select("tr").each((row) => {
+			const checkNode = row.select(".dijitCheckBox,input[type=checkbox]")[0];
+			if (checkNode) {
+				const widget = dijit.getEnclosingWidget(checkNode);
+
+				if (widget) {
+					widget.attr("checked", selected);
+				} else {
+					checkNode.checked = selected;
+				}
+
+				this.onRowChecked(widget);
+			}
+		});
+	},
+	getSelected: function(elemId) {
+		const rv = [];
+
+		$(elemId).select("tr").each((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]*?-/, "");
+
+				if (!isNaN(rowId))
+					rv.push(parseInt(rowId));
+			}
+		});
+
+		return rv;
+	}
+};
+
+function report_error(message, filename, lineno, colno, error) {
+	exception_error(error, null, filename, lineno);
+}
+
+function exception_error(e, e_compat, filename, lineno, colno) {
+	if (typeof e == "string") e = e_compat;
+
+	if (!e) return; // no exception object, nothing to report.
+
+	try {
+		console.error(e);
+		const msg = e.toString();
+
+		try {
+			xhrPost("backend.php",
+				{op: "rpc", method: "log",
+					file: e.fileName ? e.fileName : filename,
+					line: e.lineNumber ? e.lineNumber : lineno,
+					msg: msg, context: e.stack},
+				(transport) => {
+					console.warn(transport.responseText);
+				});
+
+		} catch (e) {
+			console.error("Exception while trying to log the error.", e);
+		}
+
+		let content = "<div class='fatalError'><p>" + msg + "</p>";
+
+		if (e.stack) {
+			content += "<div><b>Stack trace:</b></div>" +
+				"<textarea name=\"stack\" readonly=\"1\">" + e.stack + "</textarea>";
+		}
+
+		content += "</div>";
+
+		content += "<div class='dlgButtons'>";
+
+		content += "<button dojoType=\"dijit.form.Button\" "+
+				"onclick=\"dijit.byId('exceptionDlg').hide()\">" +
+				__('Close') + "</button>";
+		content += "</div>";
+
+		if (dijit.byId("exceptionDlg"))
+			dijit.byId("exceptionDlg").destroyRecursive();
+
+		const dialog = new dijit.Dialog({
+			id: "exceptionDlg",
+			title: "Unhandled exception",
+			style: "width: 600px",
+			content: content});
+
+		dialog.show();
+
+	} catch (ei) {
+		console.error("Exception while trying to report an exception:", ei);
+		console.error("Original exception:", e);
+
+		alert("Exception occured while trying to report an exception.\n" +
+			ei.stack + "\n\nOriginal exception:\n" + e.stack);
+	}
+
+}
+
+function param_escape(arg) {
+	return encodeURIComponent(arg);
+}
+
+function notify_real(msg, no_hide, n_type) {
+
+	const n = $("notify");
+
+	if (!n) return;
+
+	if (notify_hide_timerid) {
+		window.clearTimeout(notify_hide_timerid);
+	}
+
+	if (msg == "") {
+		if (n.hasClassName("visible")) {
+			notify_hide_timerid = window.setTimeout(function() {
+				n.removeClassName("visible") }, 0);
+		}
+		return;
+	}
+
+	/* types:
+
+		1 - generic
+		2 - progress
+		3 - error
+		4 - info
+
+	*/
+
+	msg = "<span class=\"msg\"> " + __(msg) + "</span>";
+
+	if (n_type == 2) {
+		msg = "<span><img src=\""+getInitParam("icon_indicator_white")+"\"></span>" + msg;
+		no_hide = true;
+	} else if (n_type == 3) {
+		msg = "<span><img src=\""+getInitParam("icon_alert")+"\"></span>" + msg;
+	} else if (n_type == 4) {
+		msg = "<span><img src=\""+getInitParam("icon_information")+"\"></span>" + msg;
+	}
+
+	msg += " <span><img src=\""+getInitParam("icon_cross")+"\" class=\"close\" title=\"" +
+		__("Click to close") + "\" onclick=\"notify('')\"></span>";
+
+	n.innerHTML = msg;
+
+	window.setTimeout(function() {
+		// goddamnit firefox
+		if (n_type == 2) {
+		n.className = "notify notify_progress visible";
+			} else if (n_type == 3) {
+			n.className = "notify notify_error visible";
+			msg = "<span><img src='images/alert.png'></span>" + msg;
+		} else if (n_type == 4) {
+			n.className = "notify notify_info visible";
+		} else {
+			n.className = "notify visible";
+		}
+
+		if (!no_hide) {
+			notify_hide_timerid = window.setTimeout(function() {
+				n.removeClassName("visible") }, 5*1000);
+		}
+
+	}, 10);
+
+}
+
+function notify(msg, no_hide) {
+	notify_real(msg, no_hide, 1);
+}
+
+function notify_progress(msg, no_hide) {
+	notify_real(msg, no_hide, 2);
+}
+
+function notify_error(msg, no_hide) {
+	notify_real(msg, no_hide, 3);
+
+}
+
+function notify_info(msg, no_hide) {
+	notify_real(msg, no_hide, 4);
+}
+
+function setCookie(name, value, lifetime, path, domain, secure) {
+
+	let d = false;
+
+	if (lifetime) {
+		d = new Date();
+		d.setTime(d.getTime() + (lifetime * 1000));
+	}
+
+	console.log("setCookie: " + name + " => " + value + ": " + d);
+
+	int_setCookie(name, value, d, path, domain, secure);
+
+}
+
+function int_setCookie(name, value, expires, path, domain, secure) {
+	document.cookie= name + "=" + escape(value) +
+		((expires) ? "; expires=" + expires.toGMTString() : "") +
+		((path) ? "; path=" + path : "") +
+		((domain) ? "; domain=" + domain : "") +
+		((secure) ? "; secure" : "");
+}
+
+function delCookie(name, path, domain) {
+	if (getCookie(name)) {
+		document.cookie = name + "=" +
+		((path) ? ";path=" + path : "") +
+		((domain) ? ";domain=" + domain : "" ) +
+		";expires=Thu, 01-Jan-1970 00:00:01 GMT";
+	}
+}
+
+
+function getCookie(name) {
+
+	const dc = document.cookie;
+	const prefix = name + "=";
+	let begin = dc.indexOf("; " + prefix);
+	if (begin == -1) {
+		begin = dc.indexOf(prefix);
+		if (begin != 0) return null;
+	}
+	else {
+		begin += 2;
+	}
+	let end = document.cookie.indexOf(";", begin);
+	if (end == -1) {
+		end = dc.length;
+	}
+	return unescape(dc.substring(begin + prefix.length, end));
+}
+
+// noinspection JSUnusedGlobalSymbols
+function displayIfChecked(checkbox, elemId) {
+	if (checkbox.checked) {
+		Effect.Appear(elemId, {duration : 0.5});
+	} else {
+		Effect.Fade(elemId, {duration : 0.5});
+	}
+}
+
+// noinspection JSUnusedGlobalSymbols
+function closeInfoBox() {
+	const dialog = dijit.byId("infoBox");
+
+	if (dialog)	dialog.hide();
+
+	return false;
+}
+
+function getInitParam(key) {
+	return init_params[key];
+}
+
+function setInitParam(key, value) {
+	init_params[key] = value;
+}
+
+function fatalError(code, msg, ext_info) {
+	if (code == 6) {
+		window.location.href = "index.php";
+	} else if (code == 5) {
+		window.location.href = "public.php?op=dbupdate";
+	} else {
+
+		if (msg == "") msg = "Unknown error";
+
+		if (ext_info) {
+			if (ext_info.responseText) {
+				ext_info = ext_info.responseText;
+			}
+		}
+
+		/* global ERRORS */
+		if (ERRORS && ERRORS[code] && !msg) {
+			msg = ERRORS[code];
+		}
+
+		let content = "<div><b>Error code:</b> " + code + "</div>" +
+			"<p>" + msg + "</p>";
+
+		if (ext_info) {
+			content = content + "<div><b>Additional information:</b></div>" +
+				"<textarea style='width: 100%' readonly=\"1\">" +
+				ext_info + "</textarea>";
+		}
+
+		const dialog = new dijit.Dialog({
+			title: "Fatal error",
+			style: "width: 600px",
+			content: content});
+
+		dialog.show();
+
+	}
+
+	return false;
+
+}
+
+/* function strip_tags(s) {
+	return s.replace(/<\/?[^>]+(>|$)/g, "");
+} */
+
+// noinspection JSUnusedGlobalSymbols
+function uploadIconHandler(rc) {
+	switch (rc) {
+		case 0:
+			notify_info("Upload complete.");
+			if (App.isPrefs()) {
+				Feeds.reload();
+			} else {
+				setTimeout('Feeds.reload(false, false)', 50);
+			}
+			break;
+		case 1:
+			notify_error("Upload failed: icon is too big.");
+			break;
+		case 2:
+			notify_error("Upload failed.");
+			break;
+	}
+}
+
+// noinspection JSUnusedGlobalSymbols
+function removeFeedIcon(id) {
+	if (confirm(__("Remove stored feed icon?"))) {
+
+		notify_progress("Removing feed icon...", true);
+
+		const query = { op: "pref-feeds", method: "removeicon", feed_id: id };
+
+		xhrPost("backend.php", query, () => {
+			notify_info("Feed icon removed.");
+			if (App.isPrefs()) {
+				Feeds.reload();
+			} else {
+				setTimeout('Feeds.reload(false, false)', 50);
+			}
+		});
+	}
+
+	return false;
+}
+
+// noinspection JSUnusedGlobalSymbols
+function uploadFeedIcon() {
+	const file = $("icon_file");
+
+	if (file.value.length == 0) {
+		alert(__("Please select an image file to upload."));
+	} else if (confirm(__("Upload new icon for this feed?"))) {
+			notify_progress("Uploading, please wait...", true);
+			return true;
+		}
+
+	return false;
+}
+
+// noinspection JSUnusedGlobalSymbols
+function label_to_feed_id(label) {
+	return _label_base_index - 1 - Math.abs(label);
+}
+
+// noinspection JSUnusedGlobalSymbols
+function feed_to_label_id(feed) {
+	return _label_base_index - 1 + Math.abs(feed);
+}
+
+// http://stackoverflow.com/questions/6251937/how-to-get-selecteduser-highlighted-text-in-contenteditable-element-and-replac
+function getSelectionText() {
+	let text = "";
+
+	if (typeof window.getSelection != "undefined") {
+		const sel = window.getSelection();
+		if (sel.rangeCount) {
+			const container = document.createElement("div");
+			for (let i = 0, len = sel.rangeCount; i < len; ++i) {
+				container.appendChild(sel.getRangeAt(i).cloneContents());
+			}
+			text = container.innerHTML;
+		}
+	} else if (typeof document.selection != "undefined") {
+		if (document.selection.type == "Text") {
+			text = document.selection.createRange().textText;
+		}
+	}
+
+	return text.stripTags();
+}
+
+// noinspection JSUnusedGlobalSymbols
+function popupOpenUrl(url) {
+	const w = window.open("");
+
+	w.opener = null;
+	w.location = url;
+}
+
+// noinspection JSUnusedGlobalSymbols
+function popupOpenArticle(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");
+
+	w.opener = null;
+	w.location = "backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + "&csrf_token=" + getInitParam("csrf_token");
+}
-- 
cgit v1.2.3-54-g00ecf


From d9c5c93cef313127b9b5010fbe279fdbddedadec Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 20:07:57 +0300
Subject: move some more stuff out of common.js rework client-side cookie
 functions a bit limit dojo cachebust based on server scripts modification
 time remove param_escape()

---
 classes/dlg.php              |  10 ++--
 classes/pref/feeds.php       |   4 +-
 include/functions.php        |  12 +++++
 index.php                    |   2 +-
 js/Article.js                |   2 +-
 js/CommonDialogs.js          |  34 ++++++++++++
 js/CommonFilters.js          |   4 +-
 js/Feeds.js                  |   2 +-
 js/PrefFilterTree.js         |   2 +-
 js/PrefLabelTree.js          |   2 +-
 js/PrefUsers.js              |   2 +-
 js/Utils.js                  |   2 +-
 js/common.js                 | 126 ++++++++++---------------------------------
 js/tt-rss.js                 |  32 +++++------
 plugins/af_psql_trgm/init.js |   2 +-
 plugins/mail/mail.js         |   2 +-
 plugins/mailto/init.js       |   2 +-
 plugins/note/note.js         |   2 +-
 plugins/share/share.js       |   2 +-
 prefs.php                    |   2 +-
 20 files changed, 111 insertions(+), 137 deletions(-)

(limited to 'js/common.js')

diff --git a/classes/dlg.php b/classes/dlg.php
index 7e66c4b5e..32c41ee34 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -52,7 +52,7 @@ class Dlg extends Handler_Protected {
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return opmlRegenKey()\">".
 			__('Generate new URL')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return closeInfoBox()\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.closeInfoBox()\">".
 			__('Close this window')."</button>";
 
 		print "</div>";
@@ -85,7 +85,7 @@ class Dlg extends Handler_Protected {
 
 		print "<div align='center'>";
 
-		print "<button onclick=\"return closeInfoBox()\">".
+		print "<button onclick=\"return CommonDialogs.closeInfoBox()\">".
 			__('Close this window')."</button>";
 
 		print "</div>";
@@ -150,7 +150,7 @@ class Dlg extends Handler_Protected {
 
 		print "<div align='center'>";
 		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"return closeInfoBox()\">".
+			onclick=\"return CommonDialogs.closeInfoBox()\">".
 			__('Close this window')."</button>";
 		print "</div>";
 
@@ -179,7 +179,7 @@ class Dlg extends Handler_Protected {
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.genUrlChangeKey('$feed_id', '$is_cat')\">".
 			__('Generate new URL')."</button> ";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return closeInfoBox()\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.closeInfoBox()\">".
 			__('Close this window')."</button>";
 
 		print "</div>";
@@ -195,7 +195,7 @@ class Dlg extends Handler_Protected {
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"document.location.href = 'prefs.php'\">".
 			__('Open Preferences')."</button> ";
 		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"return closeInfoBox()\">".
+			onclick=\"return CommonDialogs.closeInfoBox()\">".
 			__('Close this window')."</button>";
 		print "</div>";
 	}
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 3b949073c..7ae7a04c1 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -745,9 +745,9 @@ class Pref_Feeds extends Handler_Protected {
 			<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
 			<input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\">
 			<input type=\"hidden\" name=\"method\" value=\"uploadicon\">
-			<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
+			<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.uploadFeedIcon();\"
 				type=\"submit\">".__('Replace')."</button>
-			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
+			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.removeFeedIcon($feed_id);\"
 				type=\"submit\">".__('Remove')."</button>
 			</form>";
 
diff --git a/include/functions.php b/include/functions.php
index baed6fb20..dcb2e7518 100755
--- a/include/functions.php
+++ b/include/functions.php
@@ -2566,3 +2566,15 @@
 	function arr_qmarks($arr) {
 		return str_repeat('?,', count($arr) - 1) . '?';
 	}
+
+	function get_scripts_timestamp() {
+		$files = glob("js/*.js");
+		$ts = 0;
+
+		foreach ($files as $file) {
+			$file_ts = filemtime($file);
+			if ($file_ts > $ts) $ts = $file_ts;
+		}
+
+		return $ts;
+	}
\ No newline at end of file
diff --git a/index.php b/index.php
index 4a85ff236..6035ac186 100644
--- a/index.php
+++ b/index.php
@@ -91,7 +91,7 @@
 	<script>
 		dojoConfig = {
 			async: true,
-			cacheBust: new Date(),
+			cacheBust: "<?php echo get_scripts_timestamp(); ?>",
 			packages: [
 				{ name: "fox", location: "../../js" },
 			]
diff --git a/js/Article.js b/js/Article.js
index 0e1318948..7e5241fa5 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -176,7 +176,7 @@ define(["dojo/_base/declare"], function (declare) {
 			return false;
 		},
 		editTags: function(id) {
-			const query = "backend.php?op=article&method=editArticleTags&param=" + param_escape(id);
+			const query = "backend.php?op=article&method=editArticleTags&param=" + encodeURIComponent(id);
 
 			if (dijit.byId("editTagsDlg"))
 				dijit.byId("editTagsDlg").destroyRecursive();
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index d8733e1c2..efdc4e503 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -2,6 +2,40 @@
 /* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
 	return declare("fox.CommonDialogs", null, {
+		closeInfoBox: function() {
+			const dialog = dijit.byId("infoBox");
+			if (dialog)	dialog.hide();
+		},
+		removeFeedIcon: function(id) {
+			if (confirm(__("Remove stored feed icon?"))) {
+				notify_progress("Removing feed icon...", true);
+
+				const query = {op: "pref-feeds", method: "removeicon", feed_id: id};
+
+				xhrPost("backend.php", query, () => {
+					notify_info("Feed icon removed.");
+					if (App.isPrefs()) {
+						Feeds.reload();
+					} else {
+						setTimeout('Feeds.reload(false, false)', 50);
+					}
+				});
+			}
+
+			return false;
+		},
+		uploadFeedIcon: function() {
+			const file = $("icon_file");
+
+			if (file.value.length == 0) {
+				alert(__("Please select an image file to upload."));
+			} else if (confirm(__("Upload new icon for this feed?"))) {
+				notify_progress("Uploading, please wait...", true);
+				return true;
+			}
+
+			return false;
+		},
 		quickAddFeed: function() {
 			const query = "backend.php?op=feeds&method=quickAddFeed";
 
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index 3f508ef71..ef087b50c 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -126,7 +126,7 @@ define(["dojo/_base/declare"], function (declare) {
 				dijit.byId("filterNewRuleDlg").destroyRecursive();
 
 			const query = "backend.php?op=pref-filters&method=newrule&rule=" +
-				param_escape(ruleStr);
+				encodeURIComponent(ruleStr);
 
 			const rule_dlg = new dijit.Dialog({
 				id: "filterNewRuleDlg",
@@ -148,7 +148,7 @@ define(["dojo/_base/declare"], function (declare) {
 				dijit.byId("filterNewActionDlg").destroyRecursive();
 
 			const query = "backend.php?op=pref-filters&method=newaction&action=" +
-				param_escape(actionStr);
+				encodeURIComponent(actionStr);
 
 			const rule_dlg = new dijit.Dialog({
 				id: "filterNewActionDlg",
diff --git a/js/Feeds.js b/js/Feeds.js
index c7db1aee5..ec90caba7 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -608,7 +608,7 @@ define(["dojo/_base/declare"], function (declare) {
 		},
 		search: function() {
 			const query = "backend.php?op=feeds&method=search&param=" +
-				param_escape(Feeds.getActive() + ":" + Feeds.activeIsCat());
+				encodeURIComponent(Feeds.getActive() + ":" + Feeds.activeIsCat());
 
 			if (dijit.byId("searchDlg"))
 				dijit.byId("searchDlg").destroyRecursive();
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 9a2dd6c1c..6823fa8ad 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -138,7 +138,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 		},
 		editFilter: function(id) {
 
-			const query = "backend.php?op=pref-filters&method=edit&id=" + param_escape(id);
+			const query = "backend.php?op=pref-filters&method=edit&id=" + encodeURIComponent(id);
 
 			if (dijit.byId("feedEditDlg"))
 				dijit.byId("feedEditDlg").destroyRecursive();
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 914df9a19..abe79a114 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -56,7 +56,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 		},
 		editLabel: function(id) {
 			const query = "backend.php?op=pref-labels&method=edit&id=" +
-				param_escape(id);
+				encodeURIComponent(id);
 
 			if (dijit.byId("labelEditDlg"))
 				dijit.byId("labelEditDlg").destroyRecursive();
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index 891af8ddb..eed64e76b 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -27,7 +27,7 @@ define(["dojo/_base/declare"], function (declare) {
 		},
 		edit: function(id) {
 			const query = "backend.php?op=pref-users&method=edit&id=" +
-				param_escape(id);
+				encodeURIComponent(id);
 
 			if (dijit.byId("userEditDlg"))
 				dijit.byId("userEditDlg").destroyRecursive();
diff --git a/js/Utils.js b/js/Utils.js
index 8778143f2..f01ecbc48 100644
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -95,7 +95,7 @@ define(["dojo/_base/declare"], function (declare) {
 			});
 		},
 		helpDialog: function(topic) {
-			const query = "backend.php?op=backend&method=help&topic=" + param_escape(topic);
+			const query = "backend.php?op=backend&method=help&topic=" + encodeURIComponent(topic);
 
 			if (dijit.byId("helpDlg"))
 				dijit.byId("helpDlg").destroyRecursive();
diff --git a/js/common.js b/js/common.js
index b63257099..9a3c1715d 100755
--- a/js/common.js
+++ b/js/common.js
@@ -54,6 +54,8 @@ Array.prototype.remove = function(s) {
 	}
 };
 
+/* common helpers not worthy of separate Dojo modules */
+
 const Lists = {
 	onRowChecked: function(elem) {
 		const checked = elem.domNode ? elem.attr("checked") : elem.checked;
@@ -113,6 +115,31 @@ const Tables = {
 	}
 };
 
+const Cookie = {
+	set: function (name, value, lifetime) {
+		const d = new Date();
+		d.setTime(d.getTime() + lifetime * 1000);
+		const expires = "expires=" + d.toUTCString();
+		document.cookie = name + "=" + encodeURIComponent(value) + "; " + expires;
+	},
+	get: function (name) {
+		name = name + "=";
+		const ca = document.cookie.split(';');
+		for (let i=0; i < ca.length; i++) {
+			let c = ca[i];
+			while (c.charAt(0) == ' ') c = c.substring(1);
+			if (c.indexOf(name) == 0) return decodeURIComponent(c.substring(name.length, c.length));
+		}
+		return "";
+	},
+	delete: function(name) {
+		const expires = "expires=Thu, 01-Jan-1970 00:00:01 GMT";
+		document.cookie = name + "=" + "" + "; " + expires;
+	}
+};
+
+/* error reporting */
+
 function report_error(message, filename, lineno, colno, error) {
 	exception_error(error, null, filename, lineno);
 }
@@ -177,10 +204,6 @@ function exception_error(e, e_compat, filename, lineno, colno) {
 
 }
 
-function param_escape(arg) {
-	return encodeURIComponent(arg);
-}
-
 function notify_real(msg, no_hide, n_type) {
 
 	const n = $("notify");
@@ -263,58 +286,6 @@ function notify_info(msg, no_hide) {
 	notify_real(msg, no_hide, 4);
 }
 
-function setCookie(name, value, lifetime, path, domain, secure) {
-
-	let d = false;
-
-	if (lifetime) {
-		d = new Date();
-		d.setTime(d.getTime() + (lifetime * 1000));
-	}
-
-	console.log("setCookie: " + name + " => " + value + ": " + d);
-
-	int_setCookie(name, value, d, path, domain, secure);
-
-}
-
-function int_setCookie(name, value, expires, path, domain, secure) {
-	document.cookie= name + "=" + escape(value) +
-		((expires) ? "; expires=" + expires.toGMTString() : "") +
-		((path) ? "; path=" + path : "") +
-		((domain) ? "; domain=" + domain : "") +
-		((secure) ? "; secure" : "");
-}
-
-function delCookie(name, path, domain) {
-	if (getCookie(name)) {
-		document.cookie = name + "=" +
-		((path) ? ";path=" + path : "") +
-		((domain) ? ";domain=" + domain : "" ) +
-		";expires=Thu, 01-Jan-1970 00:00:01 GMT";
-	}
-}
-
-
-function getCookie(name) {
-
-	const dc = document.cookie;
-	const prefix = name + "=";
-	let begin = dc.indexOf("; " + prefix);
-	if (begin == -1) {
-		begin = dc.indexOf(prefix);
-		if (begin != 0) return null;
-	}
-	else {
-		begin += 2;
-	}
-	let end = document.cookie.indexOf(";", begin);
-	if (end == -1) {
-		end = dc.length;
-	}
-	return unescape(dc.substring(begin + prefix.length, end));
-}
-
 // noinspection JSUnusedGlobalSymbols
 function displayIfChecked(checkbox, elemId) {
 	if (checkbox.checked) {
@@ -324,15 +295,6 @@ function displayIfChecked(checkbox, elemId) {
 	}
 }
 
-// noinspection JSUnusedGlobalSymbols
-function closeInfoBox() {
-	const dialog = dijit.byId("infoBox");
-
-	if (dialog)	dialog.hide();
-
-	return false;
-}
-
 function getInitParam(key) {
 	return init_params[key];
 }
@@ -407,40 +369,6 @@ function uploadIconHandler(rc) {
 	}
 }
 
-// noinspection JSUnusedGlobalSymbols
-function removeFeedIcon(id) {
-	if (confirm(__("Remove stored feed icon?"))) {
-
-		notify_progress("Removing feed icon...", true);
-
-		const query = { op: "pref-feeds", method: "removeicon", feed_id: id };
-
-		xhrPost("backend.php", query, () => {
-			notify_info("Feed icon removed.");
-			if (App.isPrefs()) {
-				Feeds.reload();
-			} else {
-				setTimeout('Feeds.reload(false, false)', 50);
-			}
-		});
-	}
-
-	return false;
-}
-
-// noinspection JSUnusedGlobalSymbols
-function uploadFeedIcon() {
-	const file = $("icon_file");
-
-	if (file.value.length == 0) {
-		alert(__("Please select an image file to upload."));
-	} else if (confirm(__("Upload new icon for this feed?"))) {
-			notify_progress("Uploading, please wait...", true);
-			return true;
-		}
-
-	return false;
-}
 
 // noinspection JSUnusedGlobalSymbols
 function label_to_feed_id(label) {
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 74b8403f8..4eeeed131 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -116,9 +116,9 @@ const App = {
 		Feeds.reload();
 		Article.close();
 
-		if (parseInt(getCookie("ttrss_fh_width")) > 0) {
+		if (parseInt(Cookie.get("ttrss_fh_width")) > 0) {
 			dijit.byId("feeds-holder").domNode.setStyle(
-				{width: getCookie("ttrss_fh_width") + "px"});
+				{width: Cookie.get("ttrss_fh_width") + "px"});
 		}
 
 		dijit.byId("main").resize();
@@ -126,19 +126,19 @@ const App = {
 		dojo.connect(dijit.byId('feeds-holder'), 'resize',
 			function (args) {
 				if (args && args.w >= 0) {
-					setCookie("ttrss_fh_width", args.w, getInitParam("cookie_lifetime"));
+					Cookie.set("ttrss_fh_width", args.w, getInitParam("cookie_lifetime"));
 				}
 			});
 
 		dojo.connect(dijit.byId('content-insert'), 'resize',
 			function (args) {
 				if (args && args.w >= 0 && args.h >= 0) {
-					setCookie("ttrss_ci_width", args.w, getInitParam("cookie_lifetime"));
-					setCookie("ttrss_ci_height", args.h, getInitParam("cookie_lifetime"));
+					Cookie.set("ttrss_ci_width", args.w, getInitParam("cookie_lifetime"));
+					Cookie.set("ttrss_ci_height", args.h, getInitParam("cookie_lifetime"));
 				}
 			});
 
-		delCookie("ttrss_test");
+		Cookie.delete("ttrss_test");
 
 		const toolbar = document.forms["main_toolbar_form"];
 
@@ -172,9 +172,9 @@ const App = {
 		console.log("second stage ok");
 	},
 	genericSanityCheck: function() {
-		setCookie("ttrss_test", "TEST");
+		Cookie.set("ttrss_test", "TEST");
 
-		if (getCookie("ttrss_test") != "TEST") {
+		if (Cookie.get("ttrss_test") != "TEST") {
 			return fatalError(2);
 		}
 
@@ -224,9 +224,9 @@ const App = {
 				height: 'auto',
 				borderTopWidth: '0px' });
 
-			if (parseInt(getCookie("ttrss_ci_width")) > 0) {
+			if (parseInt(Cookie.get("ttrss_ci_width")) > 0) {
 				dijit.byId("content-insert").domNode.setStyle(
-					{width: getCookie("ttrss_ci_width") + "px" });
+					{width: Cookie.get("ttrss_ci_width") + "px" });
 			}
 
 			$("headlines-frame").setStyle({ borderBottomWidth: '0px' });
@@ -240,9 +240,9 @@ const App = {
 				height: '50%',
 				borderTopWidth: '0px'});
 
-			if (parseInt(getCookie("ttrss_ci_height")) > 0) {
+			if (parseInt(Cookie.get("ttrss_ci_height")) > 0) {
 				dijit.byId("content-insert").domNode.setStyle(
-					{height: getCookie("ttrss_ci_height") + "px" });
+					{height: Cookie.get("ttrss_ci_height") + "px" });
 			}
 
 			$("headlines-frame").setStyle({ borderBottomWidth: '1px' });
@@ -466,8 +466,8 @@ const App = {
 				App._widescreen_mode = !App._widescreen_mode;
 
 				// reset stored sizes because geometry changed
-				setCookie("ttrss_ci_width", 0);
-				setCookie("ttrss_ci_height", 0);
+				Cookie.set("ttrss_ci_width", 0);
+				Cookie.set("ttrss_ci_height", 0);
 
 				App.switchPanelMode(App._widescreen_mode);
 			} else {
@@ -557,8 +557,8 @@ const App = {
 					App._widescreen_mode = !App._widescreen_mode;
 
 					// reset stored sizes because geometry changed
-					setCookie("ttrss_ci_width", 0);
-					setCookie("ttrss_ci_height", 0);
+					Cookie.set("ttrss_ci_width", 0);
+					Cookie.set("ttrss_ci_height", 0);
 
 					App.switchPanelMode(App._widescreen_mode);
 				} else {
diff --git a/plugins/af_psql_trgm/init.js b/plugins/af_psql_trgm/init.js
index f84bb4877..af2facfc1 100644
--- a/plugins/af_psql_trgm/init.js
+++ b/plugins/af_psql_trgm/init.js
@@ -1,7 +1,7 @@
 function showTrgmRelated(id) {
 	try {
 
-		const query = "backend.php?op=pluginhandler&plugin=af_psql_trgm&method=showrelated&param=" + param_escape(id);
+		const query = "backend.php?op=pluginhandler&plugin=af_psql_trgm&method=showrelated&param=" + encodeURIComponent(id);
 
 		if (dijit.byId("trgmRelatedDlg"))
 			dijit.byId("trgmRelatedDlg").destroyRecursive();
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index d6c28048b..af0cf3552 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -14,7 +14,7 @@ function emailArticle(id) {
 		if (dijit.byId("emailArticleDlg"))
 			dijit.byId("emailArticleDlg").destroyRecursive();
 
-		var query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + param_escape(id);
+		var query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + encodeURIComponent(id);
 
 		dialog = new dijit.Dialog({
 			id: "emailArticleDlg",
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index 47321923a..dacff725e 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -14,7 +14,7 @@ function mailtoArticle(id) {
 		if (dijit.byId("emailArticleDlg"))
 			dijit.byId("emailArticleDlg").destroyRecursive();
 
-		const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + param_escape(id);
+		const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + encodeURIComponent(id);
 
 		dialog = new dijit.Dialog({
 			id: "emailArticleDlg",
diff --git a/plugins/note/note.js b/plugins/note/note.js
index ea0094078..c1f317b52 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -1,7 +1,7 @@
 function editArticleNote(id) {
 	try {
 
-		var query = "backend.php?op=pluginhandler&plugin=note&method=edit&param=" + param_escape(id);
+		var query = "backend.php?op=pluginhandler&plugin=note&method=edit&param=" + encodeURIComponent(id);
 
 		if (dijit.byId("editNoteDlg"))
 			dijit.byId("editNoteDlg").destroyRecursive();
diff --git a/plugins/share/share.js b/plugins/share/share.js
index 11748d8fe..4a6a65ce6 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -3,7 +3,7 @@ function shareArticle(id) {
 		if (dijit.byId("shareArticleDlg"))
 			dijit.byId("shareArticleDlg").destroyRecursive();
 
-		var query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + param_escape(id);
+		var query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + encodeURIComponent(id);
 
 		dialog = new dijit.Dialog({
 			id: "shareArticleDlg",
diff --git a/prefs.php b/prefs.php
index c74985633..93773103f 100644
--- a/prefs.php
+++ b/prefs.php
@@ -57,7 +57,7 @@
 	<script>
 		dojoConfig = {
 			async: true,
-			cacheBust: new Date(),
+			cacheBust: "<?php echo get_scripts_timestamp(); ?>",
 			packages: [
 				{ name: "lib", location: "../" },
 				{ name: "fox", location: "../../js" },
-- 
cgit v1.2.3-54-g00ecf


From 495248dd9783985750591c050d055ac4c2cf1712 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 20:44:53 +0300
Subject: add Notify object

---
 js/common.js | 112 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 59 insertions(+), 53 deletions(-)

(limited to 'js/common.js')

diff --git a/js/common.js b/js/common.js
index 9a3c1715d..4b5165979 100755
--- a/js/common.js
+++ b/js/common.js
@@ -201,73 +201,79 @@ function exception_error(e, e_compat, filename, lineno, colno) {
 		alert("Exception occured while trying to report an exception.\n" +
 			ei.stack + "\n\nOriginal exception:\n" + e.stack);
 	}
-
 }
 
-function notify_real(msg, no_hide, n_type) {
-
-	const n = $("notify");
-
-	if (!n) return;
+/* runtime notifications */
+
+const Notify = {
+	KIND_GENERIC: 0,
+	KIND_INFO: 1,
+	KIND_ERROR: 2,
+	KIND_PROGRESS: 3,
+	timeout: 0,
+	default_timeout: 5 * 1000,
+	close: function() {
+		this.msg("");
+	},
+	msg: function(msg, keep, kind) {
+		kind = kind || this.KIND_GENERIC;
+		const notify = $("notify");
 
-	if (notify_hide_timerid) {
-		window.clearTimeout(notify_hide_timerid);
-	}
+		window.clearTimeout(this.timeout);
 
-	if (msg == "") {
-		if (n.hasClassName("visible")) {
-			notify_hide_timerid = window.setTimeout(function() {
-				n.removeClassName("visible") }, 0);
+		if (!msg) {
+			notify.removeClassName("visible");
+			return;
 		}
-		return;
-	}
-
-	/* types:
 
-		1 - generic
-		2 - progress
-		3 - error
-		4 - info
+		let msgfmt = "<span class=\"msg\">%s</span>".replace("%s", __(msg));
+		let icon = false;
 
-	*/
 
-	msg = "<span class=\"msg\"> " + __(msg) + "</span>";
+		notify.className = "notify";
 
-	if (n_type == 2) {
-		msg = "<span><img src=\""+getInitParam("icon_indicator_white")+"\"></span>" + msg;
-		no_hide = true;
-	} else if (n_type == 3) {
-		msg = "<span><img src=\""+getInitParam("icon_alert")+"\"></span>" + msg;
-	} else if (n_type == 4) {
-		msg = "<span><img src=\""+getInitParam("icon_information")+"\"></span>" + msg;
-	}
+		console.log('notify', msg, kind);
 
-	msg += " <span><img src=\""+getInitParam("icon_cross")+"\" class=\"close\" title=\"" +
-		__("Click to close") + "\" onclick=\"notify('')\"></span>";
-
-	n.innerHTML = msg;
-
-	window.setTimeout(function() {
-		// goddamnit firefox
-		if (n_type == 2) {
-		n.className = "notify notify_progress visible";
-			} else if (n_type == 3) {
-			n.className = "notify notify_error visible";
-			msg = "<span><img src='images/alert.png'></span>" + msg;
-		} else if (n_type == 4) {
-			n.className = "notify notify_info visible";
-		} else {
-			n.className = "notify visible";
+		switch (kind) {
+			case this.KIND_INFO:
+				notify.addClassName("notify_info")
+				icon = getInitParam("icon_information");
+				break;
+			case this.KIND_ERROR:
+				notify.addClassName("notify_error");
+				icon = getInitParam("icon_alert");
+				break;
+			case this.KIND_PROGRESS:
+				notify.addClassName("notify_progress");
+				icon = getInitParam("icon_indicator_white")
+				break;
 		}
 
-		if (!no_hide) {
-			notify_hide_timerid = window.setTimeout(function() {
-				n.removeClassName("visible") }, 5*1000);
-		}
+		if (icon) msgfmt = "<span><img src=\"%s\"></span>".replace("%s", icon) + msgfmt;
 
-	}, 10);
+		msgfmt += (" <span><img src=\"%s\" class='close' title=\"" +
+			__("Click to close") + "\" onclick=\"notify('')\"></span>")
+				.replace("%s", getInitParam("icon_cross"));
 
-}
+		notify.innerHTML = msgfmt;
+		notify.addClassName("visible");
+
+		if (!keep)
+			this.timeout = window.setTimeout(() => {
+				notify.removeClassName("visible");
+			}, this.default_timeout);
+
+	},
+	info: function(msg, keep) {
+		this.msg(msg, keep, this.KIND_INFO);
+	},
+	progress: function(msg, keep) {
+		this.msg(msg, keep, this.KIND_PROGRESS);
+	},
+	error: function(msg) {
+		this.msg(msg, true, this.KIND_ERROR);
+	}
+};
 
 function notify(msg, no_hide) {
 	notify_real(msg, no_hide, 1);
-- 
cgit v1.2.3-54-g00ecf


From 526389b2d380177490605037fdc3a24ebc688fac Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 20:56:30 +0300
Subject: update notify_* calls to use Notify

---
 classes/pref/prefs.php                 | 24 +++++++++++------------
 js/Article.js                          |  6 +++---
 js/CommonDialogs.js                    | 34 ++++++++++++++++----------------
 js/CommonFilters.js                    |  2 +-
 js/Feeds.js                            | 10 +++++-----
 js/Headlines.js                        |  4 ++--
 js/PrefFeedTree.js                     | 36 +++++++++++++++++-----------------
 js/PrefFilterTree.js                   | 14 ++++++-------
 js/PrefHelpers.js                      | 26 ++++++++++++------------
 js/PrefLabelTree.js                    |  4 ++--
 js/PrefUsers.js                        | 12 ++++++------
 js/Utils.js                            | 12 ++++++------
 js/common.js                           | 36 ++++++++++++----------------------
 js/prefs.js                            | 12 ++++++------
 js/tt-rss.js                           |  4 ++--
 plugins/af_psql_trgm/init.php          |  2 +-
 plugins/af_readability/init.php        |  2 +-
 plugins/af_redditimgur/init.php        |  2 +-
 plugins/af_zz_imgproxy/init.php        |  2 +-
 plugins/import_export/import_export.js |  8 ++++----
 plugins/mail/init.php                  |  2 +-
 plugins/mail/mail.js                   |  2 +-
 plugins/note/note.js                   |  4 ++--
 plugins/nsfw/init.php                  |  2 +-
 plugins/share/share.js                 |  8 ++++----
 plugins/share/share_prefs.js           |  4 ++--
 utils/extract-i18n-js.pl               |  2 +-
 utils/update-translations.sh           |  4 ++--
 28 files changed, 134 insertions(+), 146 deletions(-)

(limited to 'js/common.js')

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 88741447e..24c813649 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -183,7 +183,7 @@ class Pref_Prefs extends Handler_Protected {
 		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 		evt.preventDefault();
 		if (this.validate()) {
-			notify_progress('Saving data...', true);
+			Notify.progress('Saving data...', true);
 
 			new Ajax.Request('backend.php', {
 				parameters: dojo.objectToQuery(this.getValues()),
@@ -249,12 +249,12 @@ class Pref_Prefs extends Handler_Protected {
 			print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 			evt.preventDefault();
 			if (this.validate()) {
-				notify_progress('Changing password...', true);
+				Notify.progress('Changing password...', true);
 
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify('');
+						Notify.close();
 						if (transport.responseText.indexOf('ERROR: ') == 0) {
 
 							$('pwd_change_infobox').innerHTML =
@@ -316,14 +316,14 @@ class Pref_Prefs extends Handler_Protected {
 				print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 				evt.preventDefault();
 				if (this.validate()) {
-					notify_progress('Disabling OTP', true);
+					Notify.progress('Disabling OTP', true);
 
 					new Ajax.Request('backend.php', {
 						parameters: dojo.objectToQuery(this.getValues()),
 						onComplete: function(transport) {
-							notify('');
+							Notify.close();
 							if (transport.responseText.indexOf('ERROR: ') == 0) {
-								notify_error(transport.responseText.replace('ERROR: ', ''));
+								Notify.error(transport.responseText.replace('ERROR: ', ''));
 							} else {
 								window.location.reload();
 							}
@@ -367,14 +367,14 @@ class Pref_Prefs extends Handler_Protected {
 					print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 					evt.preventDefault();
 					if (this.validate()) {
-						notify_progress('Saving data...', true);
+						Notify.progress('Saving data...', true);
 
 						new Ajax.Request('backend.php', {
 							parameters: dojo.objectToQuery(this.getValues()),
 							onComplete: function(transport) {
-								notify('');
+								Notify.close();
 								if (transport.responseText.indexOf('ERROR:') == 0) {
-									notify_error(transport.responseText.replace('ERROR:', ''));
+									Notify.error(transport.responseText.replace('ERROR:', ''));
 								} else {
 									window.location.reload();
 								}
@@ -441,7 +441,7 @@ class Pref_Prefs extends Handler_Protected {
 						if (msg == 'PREFS_NEED_RELOAD') {
 							window.location.reload();
 						} else {
-							notify_info(msg);
+							Notify.info(msg);
 						}
 					}
 			} });
@@ -689,12 +689,12 @@ class Pref_Prefs extends Handler_Protected {
 		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
 		evt.preventDefault();
 		if (this.validate()) {
-			notify_progress('Saving data...', true);
+			Notify.progress('Saving data...', true);
 
 			new Ajax.Request('backend.php', {
 				parameters: dojo.objectToQuery(this.getValues()),
 				onComplete: function(transport) {
-					notify('');
+					Notify.close();
 					if (confirm(__('Selected plugins have been enabled. Reload?'))) {
 						window.location.reload();
 					}
diff --git a/js/Article.js b/js/Article.js
index 7e5241fa5..b48d82489 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -165,7 +165,7 @@ define(["dojo/_base/declare"], function (declare) {
 						//const unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
 						//request_counters(unread_in_buffer == 0);
 
-						notify("");
+						Notify.close();
 
 					} catch (e) {
 						exception_error(e);
@@ -187,11 +187,11 @@ define(["dojo/_base/declare"], function (declare) {
 				style: "width: 600px",
 				execute: function () {
 					if (this.validate()) {
-						notify_progress("Saving article tags...", true);
+						Notify.progress("Saving article tags...", true);
 
 						xhrPost("backend.php", this.attr('value'), (transport) => {
 							try {
-								notify('');
+								Notify.close();
 								dialog.hide();
 
 								const data = JSON.parse(transport.responseText);
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index efdc4e503..cac4f9be1 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -8,12 +8,12 @@ define(["dojo/_base/declare"], function (declare) {
 		},
 		removeFeedIcon: function(id) {
 			if (confirm(__("Remove stored feed icon?"))) {
-				notify_progress("Removing feed icon...", true);
+				Notify.progress("Removing feed icon...", true);
 
 				const query = {op: "pref-feeds", method: "removeicon", feed_id: id};
 
 				xhrPost("backend.php", query, () => {
-					notify_info("Feed icon removed.");
+					Notify.info("Feed icon removed.");
 					if (App.isPrefs()) {
 						Feeds.reload();
 					} else {
@@ -30,7 +30,7 @@ define(["dojo/_base/declare"], function (declare) {
 			if (file.value.length == 0) {
 				alert(__("Please select an image file to upload."));
 			} else if (confirm(__("Upload new icon for this feed?"))) {
-				notify_progress("Uploading, please wait...", true);
+				Notify.progress("Uploading, please wait...", true);
 				return true;
 			}
 
@@ -79,7 +79,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 								const rc = reply['result'];
 
-								notify('');
+								Notify.close();
 								Element.hide("feed_add_spinner");
 
 								console.log(rc);
@@ -87,7 +87,7 @@ define(["dojo/_base/declare"], function (declare) {
 								switch (parseInt(rc['code'])) {
 									case 1:
 										dialog.hide();
-										notify_info(__("Subscribed to %s").replace("%s", feed_url));
+										Notify.info(__("Subscribed to %s").replace("%s", feed_url));
 
 										Feeds.reload();
 										break;
@@ -161,7 +161,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					if (sel_rows.length > 0) {
 						if (confirm(__("Remove selected feeds?"))) {
-							notify_progress("Removing selected feeds...", true);
+							Notify.progress("Removing selected feeds...", true);
 
 							const query = {
 								op: "pref-feeds", method: "remove",
@@ -169,7 +169,7 @@ define(["dojo/_base/declare"], function (declare) {
 							};
 
 							xhrPost("backend.php", query, () => {
-								notify('');
+								Notify.close();
 								dialog.hide();
 								Feeds.reload();
 							});
@@ -244,7 +244,7 @@ define(["dojo/_base/declare"], function (declare) {
 					if (selected.length > 0) {
 						dijit.byId("feedBrowserDlg").hide();
 
-						notify_progress("Loading, please wait...", true);
+						Notify.progress("Loading, please wait...", true);
 
 						const query = {
 							op: "rpc", method: "massSubscribe",
@@ -252,7 +252,7 @@ define(["dojo/_base/declare"], function (declare) {
 						};
 
 						xhrPost("backend.php", query, () => {
-							notify('');
+							Notify.close();
 							Feeds.reload();
 						});
 
@@ -265,7 +265,7 @@ define(["dojo/_base/declare"], function (declare) {
 					Element.show('feed_browser_spinner');
 
 					xhrPost("backend.php", dialog.attr("value"), (transport) => {
-						notify('');
+						Notify.close();
 
 						Element.hide('feed_browser_spinner');
 
@@ -320,7 +320,7 @@ define(["dojo/_base/declare"], function (declare) {
 				if (select)
 					Object.extend(query, {output: "select"});
 
-				notify_progress("Loading, please wait...", true);
+				Notify.progress("Loading, please wait...", true);
 
 				xhrPost("backend.php", query, (transport) => {
 					if (callback) {
@@ -338,7 +338,7 @@ define(["dojo/_base/declare"], function (declare) {
 			const msg = __("Unsubscribe from %s?").replace("%s", title);
 
 			if (title == undefined || confirm(msg)) {
-				notify_progress("Removing feed...");
+				Notify.progress("Removing feed...");
 
 				const query = {op: "pref-feeds", quiet: 1, method: "remove", ids: feed_id};
 
@@ -381,11 +381,11 @@ define(["dojo/_base/declare"], function (declare) {
 				style: "width: 600px",
 				execute: function () {
 					if (this.validate()) {
-						notify_progress("Saving data...", true);
+						Notify.progress("Saving data...", true);
 
 						xhrPost("backend.php", dialog.attr('value'), () => {
 							dialog.hide();
-							notify('');
+							Notify.close();
 							Feeds.reload();
 						});
 					}
@@ -398,7 +398,7 @@ define(["dojo/_base/declare"], function (declare) {
 		genUrlChangeKey: function(feed, is_cat) {
 			if (confirm(__("Generate new syndication address for this feed?"))) {
 
-				notify_progress("Trying to change address...", true);
+				Notify.progress("Trying to change address...", true);
 
 				const query = {op: "pref-feeds", method: "regenFeedKey", id: feed, is_cat: is_cat};
 
@@ -415,10 +415,10 @@ define(["dojo/_base/declare"], function (declare) {
 
 						new Effect.Highlight(e);
 
-						notify('');
+						Notify.close();
 
 					} else {
-						notify_error("Could not change feed URL.");
+						Notify.error("Could not change feed URL.");
 					}
 				});
 			}
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index ef087b50c..2c9c7b5a4 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -232,7 +232,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 								Element.hide("prefFilterLoadingIndicator");
 
-								notify_error("Error while trying to get filter test results.");
+								Notify.error("Error while trying to get filter test results.");
 
 							} else {
 								console.log("getTestResults: dialog closed, bailing out.");
diff --git a/js/Feeds.js b/js/Feeds.js
index 678b42f9d..8b6f6a707 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -357,7 +357,7 @@ define(["dojo/_base/declare"], function (declare) {
 			if (!delayed)
 				if (!this.setExpando(feed, is_cat,
 					(is_cat) ? 'images/indicator_tiny.gif' : 'images/indicator_white.gif'))
-					notify_progress("Loading, please wait...", true);
+					Notify.progress("Loading, please wait...", true);
 
 			query.cat = is_cat;
 
@@ -391,7 +391,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
 
-				notify_progress("Marking all feeds as read...");
+				Notify.progress("Marking all feeds as read...");
 
 				xhrPost("backend.php", {op: "feeds", method: "catchupAll"}, () => {
 					this.requestCounters(true);
@@ -458,7 +458,7 @@ define(["dojo/_base/declare"], function (declare) {
 				search_lang: this.last_search_query[1]
 			};
 
-			notify_progress("Loading, please wait...", true);
+			Notify.progress("Loading, please wait...", true);
 
 			xhrPost("backend.php", catchup_query, (transport) => {
 				Utils.handleRpcJson(transport);
@@ -475,7 +475,7 @@ define(["dojo/_base/declare"], function (declare) {
 					this.reloadCurrent();
 				}
 
-				notify("");
+				Notify.close();
 			});
 		},
 		catchupCurrent: function(mode) {
@@ -517,7 +517,7 @@ define(["dojo/_base/declare"], function (declare) {
 					Headlines.updateFloatingTitle(true);
 				}
 
-				notify_progress("Loading, please wait...", true);
+				Notify.progress("Loading, please wait...", true);
 
 				xhrPost("backend.php", {op: "rpc", method: "catchupFeed", feed_id: id, is_cat: false}, (transport) => {
 					Utils.handleRpcJson(transport);
diff --git a/js/Headlines.js b/js/Headlines.js
index d5f680f85..68dda8d3e 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -381,7 +381,7 @@ define(["dojo/_base/declare"], function (declare) {
 			// unpack visible articles, fill buffer more, etc
 			this.scrollHandler();
 
-			notify("");
+			Notify.close();
 		},
 		reverse: function() {
 			const toolbar = document.forms["main_toolbar_form"];
@@ -435,7 +435,7 @@ define(["dojo/_base/declare"], function (declare) {
 				cmode: cmode, ids: ids.toString()
 			};
 
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			xhrPost("backend.php", query, (transport) => {
 				Utils.handleRpcJson(transport);
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index 7beeadd38..accc4f0e5 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -88,7 +88,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			xhrPost("backend.php", { op: "pref-feeds", search: search }, (transport) => {
 				dijit.byId('feedConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		},
 		checkItemAcceptance: function(target, source, position) {
@@ -119,14 +119,14 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			}
 		},
 		resetFeedOrder: function() {
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			xhrPost("backend.php", {op: "pref-feeds", method: "feedsortreset"}, () => {
 				this.reload();
 			});
 		},
 		resetCatOrder: function() {
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			xhrPost("backend.php", {op: "pref-feeds", method: "catsortreset"}, () => {
 				this.reload();
@@ -134,10 +134,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 		},
 		removeCategory: function(id, item) {
 			if (confirm(__("Remove category %s? Any nested feeds would be placed into Uncategorized.").replace("%s", item.name))) {
-				notify_progress("Removing category...");
+				Notify.progress("Removing category...");
 
 				xhrPost("backend.php", {op: "pref-feeds", method: "removeCat", ids: id}, () => {
-					notify('');
+					Notify.close();
 					this.reload();
 				});
 			}
@@ -148,7 +148,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			if (sel_rows.length > 0) {
 				if (confirm(__("Unsubscribe from selected feeds?"))) {
 
-					notify_progress("Unsubscribing from selected feeds...", true);
+					Notify.progress("Unsubscribing from selected feeds...", true);
 
 					const query = {
 						op: "pref-feeds", method: "remove",
@@ -190,7 +190,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			if (sel_rows.length > 0) {
 				if (confirm(__("Remove selected categories?"))) {
-					notify_progress("Removing selected categories...");
+					Notify.progress("Removing selected categories...");
 
 					const query = {
 						op: "pref-feeds", method: "removeCat",
@@ -227,7 +227,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				return;
 			}
 
-			notify("");
+			Notify.close();
 
 			if (rows.length > 1) {
 				return this.editMultiple();
@@ -243,13 +243,13 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				return;
 			}
 
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			if (dijit.byId("feedEditDlg"))
 				dijit.byId("feedEditDlg").destroyRecursive();
 
 			xhrPost("backend.php", {op: "pref-feeds", method: "editfeeds", ids: rows.toString()}, (transport) => {
-				notify("");
+				Notify.close();
 
 				const dialog = new dijit.Dialog({
 					id: "feedEditDlg",
@@ -289,7 +289,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 									query[key] = ["off"];
 							});
 
-							notify_progress("Saving data...", true);
+							Notify.progress("Saving data...", true);
 
 							xhrPost("backend.php", query, () => {
 								dialog.hide();
@@ -312,7 +312,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			if (new_name && new_name != item.name) {
 
-				notify_progress("Loading, please wait...");
+				Notify.progress("Loading, please wait...");
 
 				xhrPost("backend.php", { op: 'pref-feeds', method: 'renamecat', id: id, title: new_name }, () => {
 					this.reload();
@@ -323,10 +323,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			const title = prompt(__("Category title:"));
 
 			if (title) {
-				notify_progress("Creating category...");
+				Notify.progress("Creating category...");
 
 				xhrPost("backend.php", {op: "pref-feeds", method: "addCat", cat: title}, () => {
-					notify('');
+					Notify.close();
 					this.reload();
 				});
 			}
@@ -344,10 +344,10 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				style: "width: 600px",
 				execute: function () {
 					if (this.validate()) {
-						notify_progress(__("Subscribing to feeds..."), true);
+						Notify.progress(__("Subscribing to feeds..."), true);
 
 						xhrPost("backend.php", this.attr('value'), () => {
-							notify("");
+							Notify.close();
 							dijit.byId("feedTree").reload();
 							dialog.hide();
 						});
@@ -376,7 +376,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 					if (sel_rows.length > 0) {
 						if (confirm(__("Remove selected feeds?"))) {
-							notify_progress("Removing selected feeds...", true);
+							Notify.progress("Removing selected feeds...", true);
 
 							const query = {
 								op: "pref-feeds", method: "remove",
@@ -384,7 +384,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 							};
 
 							xhrPost("backend.php", query, () => {
-								notify('');
+								Notify.close();
 								dijit.byId("feedTree").reload();
 								dialog.hide();
 							});
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 6823fa8ad..4f4e02d95 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -93,11 +93,11 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			xhrPost("backend.php", { op: "pref-filters", search: search }, (transport) => {
 				dijit.byId('filterConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		},
 		resetFilterOrder: function() {
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			xhrPost("backend.php", {op: "pref-filters", method: "filtersortreset"}, () => {
 				this.reload();
@@ -112,7 +112,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			}
 
 			if (confirm(__("Combine selected filters?"))) {
-				notify_progress("Joining filters...");
+				Notify.progress("Joining filters...");
 
 				xhrPost("backend.php", {op: "pref-filters", method: "join", ids: rows.toString()}, () => {
 					this.reload();
@@ -132,7 +132,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				return;
 			}
 
-			notify("");
+			Notify.close();
 
 			this.editFilter(rows[0]);
 		},
@@ -192,7 +192,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 					if (confirm(msg)) {
 						this.hide();
 
-						notify_progress("Removing filter...");
+						Notify.progress("Removing filter...");
 
 						const query = {op: "pref-filters", method: "remove", ids: this.attr('value').id};
 
@@ -220,7 +220,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				execute: function () {
 					if (this.validate()) {
 
-						notify_progress("Saving data...", true);
+						Notify.progress("Saving data...", true);
 
 						xhrPost("backend.php", dojo.formToObject("filter_edit_form"), () => {
 							dialog.hide();
@@ -238,7 +238,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			if (sel_rows.length > 0) {
 				if (confirm(__("Remove selected filters?"))) {
-					notify_progress("Removing selected filters...");
+					Notify.progress("Removing selected filters...");
 
 					const query = {
 						op: "pref-filters", method: "remove",
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index a2451f478..343253c9d 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -2,10 +2,10 @@ define(["dojo/_base/declare"], function (declare) {
 	return declare("fox.PrefHelpers", null, {
 		clearFeedAccessKeys: function() {
 			if (confirm(__("This will invalidate all previously generated feed URLs. Continue?"))) {
-				notify_progress("Clearing URLs...");
+				Notify.progress("Clearing URLs...");
 
 				xhrPost("backend.php", {op: "pref-feeds", method: "clearKeys"}, () => {
-					notify_info("Generated URLs cleared.");
+					Notify.info("Generated URLs cleared.");
 				});
 			}
 
@@ -14,13 +14,13 @@ define(["dojo/_base/declare"], function (declare) {
 		updateEventLog: function() {
 			xhrPost("backend.php", { op: "pref-system" }, (transport) => {
 				dijit.byId('systemConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		},
 		clearEventLog: function() {
 			if (confirm(__("Clear event log?"))) {
 
-				notify_progress("Loading, please wait...");
+				Notify.progress("Loading, please wait...");
 
 				xhrPost("backend.php", {op: "pref-system", method: "clearLog"}, () => {
 					this.updateEventLog();
@@ -47,7 +47,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					if (sel_rows.length > 0) {
 						if (confirm(__("Remove selected profiles? Active and default profiles will not be removed."))) {
-							notify_progress("Removing selected profiles...", true);
+							Notify.progress("Removing selected profiles...", true);
 
 							const query = {
 								op: "rpc", method: "remprofiles",
@@ -55,7 +55,7 @@ define(["dojo/_base/declare"], function (declare) {
 							};
 
 							xhrPost("backend.php", query, () => {
-								notify('');
+								Notify.close();
 								Prefs.editProfiles();
 							});
 						}
@@ -69,7 +69,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					if (sel_rows.length == 1) {
 						if (confirm(__("Activate selected profile?"))) {
-							notify_progress("Loading, please wait...");
+							Notify.progress("Loading, please wait...");
 
 							xhrPost("backend.php", {op: "rpc", method: "setprofile", id: sel_rows.toString()}, () => {
 								window.location.reload();
@@ -82,12 +82,12 @@ define(["dojo/_base/declare"], function (declare) {
 				},
 				addProfile: function () {
 					if (this.validate()) {
-						notify_progress("Creating profile...", true);
+						Notify.progress("Creating profile...", true);
 
 						const query = {op: "rpc", method: "addprofile", title: dialog.attr('value').newprofile};
 
 						xhrPost("backend.php", query, () => {
-							notify('');
+							Notify.close();
 							Prefs.editProfiles();
 						});
 
@@ -113,7 +113,7 @@ define(["dojo/_base/declare"], function (declare) {
 				title: __("Customize stylesheet"),
 				style: "width: 600px",
 				execute: function () {
-					notify_progress('Saving data...', true);
+					Notify.progress('Saving data...', true);
 
 					xhrPost("backend.php", this.attr('value'), () => {
 						window.location.reload();
@@ -129,13 +129,13 @@ define(["dojo/_base/declare"], function (declare) {
 			if (confirm(__("Reset to defaults?"))) {
 				xhrPost("backend.php", {op: "pref-prefs", method: "resetconfig"}, (transport) => {
 					Prefs.refresh();
-					notify_info(transport.responseText);
+					Notify.info(transport.responseText);
 				});
 			}
 		},
 		clearPluginData: function(name) {
 			if (confirm(__("Clear stored data for this plugin?"))) {
-				notify_progress("Loading, please wait...");
+				Notify.progress("Loading, please wait...");
 
 				xhrPost("backend.php", {op: "pref-prefs", method: "clearplugindata", name: name}, () => {
 					Prefs.refresh();
@@ -145,7 +145,7 @@ define(["dojo/_base/declare"], function (declare) {
 		refresh: function() {
 			xhrPost("backend.php", { op: "pref-prefs" }, (transport) => {
 				dijit.byId('genConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		}
 	});
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index abe79a114..f808e987b 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -51,7 +51,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 		reload: function() {
 			xhrPost("backend.php", { op: "pref-labels" }, (transport) => {
 				dijit.byId('labelConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		},
 		editLabel: function(id) {
@@ -142,7 +142,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 
 			if (sel_rows.length > 0) {
 				if (confirm(__("Remove selected labels?"))) {
-					notify_progress("Removing selected labels...");
+					Notify.progress("Removing selected labels...");
 
 					const query = {
 						op: "pref-labels", method: "remove",
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index eed64e76b..20790ec5d 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -9,14 +9,14 @@ define(["dojo/_base/declare"], function (declare) {
 
 			xhrPost("backend.php", { op: "pref-users", sort: sort, search: search }, (transport) => {
 				dijit.byId('userConfigTab').attr('content', transport.responseText);
-				notify("");
+				Notify.close();
 			});
 		},
 		add: function() {
 			const login = prompt(__("Please enter username:"), "");
 
 			if (login) {
-				notify_progress("Adding user...");
+				Notify.progress("Adding user...");
 
 				xhrPost("backend.php", {op: "pref-users", method: "add", login: login}, (transport) => {
 					alert(transport.responseText);
@@ -38,7 +38,7 @@ define(["dojo/_base/declare"], function (declare) {
 				style: "width: 600px",
 				execute: function () {
 					if (this.validate()) {
-						notify_progress("Saving data...", true);
+						Notify.progress("Saving data...", true);
 
 						xhrPost("backend.php", dojo.formToObject("user_edit_form"), (transport) => {
 							dialog.hide();
@@ -65,12 +65,12 @@ define(["dojo/_base/declare"], function (declare) {
 			}
 
 			if (confirm(__("Reset password of selected user?"))) {
-				notify_progress("Resetting password for selected user...");
+				Notify.progress("Resetting password for selected user...");
 
 				const id = rows[0];
 
 				xhrPost("backend.php", {op: "pref-users", method: "resetPass", id: id}, (transport) => {
-					notify('');
+					Notify.close();
 					alert(transport.responseText);
 				});
 
@@ -81,7 +81,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			if (sel_rows.length > 0) {
 				if (confirm(__("Remove selected users? Neither default admin nor your account will be removed."))) {
-					notify_progress("Removing selected users...");
+					Notify.progress("Removing selected users...");
 
 					const query = {
 						op: "pref-users", method: "remove",
diff --git a/js/Utils.js b/js/Utils.js
index f01ecbc48..1050cf018 100644
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -110,7 +110,7 @@ define(["dojo/_base/declare"], function (declare) {
 			dialog.show();
 		},
 		displayDlg: function(title, id, param, callback) {
-			notify_progress("Loading, please wait...", true);
+			Notify.progress("Loading, please wait...", true);
 
 			const query = {op: "dlg", method: id, param: param};
 
@@ -143,7 +143,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					dialog.show();
 
-					notify("");
+					Notify.close();
 
 					if (callback) callback(transport);
 				} catch (e) {
@@ -213,14 +213,14 @@ define(["dojo/_base/declare"], function (declare) {
 					if (netalert)
 						netalert.show();
 					else
-						notify_error("Communication problem with server.");
+						Notify.error("Communication problem with server.");
 				}
 
 			} catch (e) {
 				if (netalert)
 					netalert.show();
 				else
-					notify_error("Communication problem with server.");
+					Notify.error("Communication problem with server.");
 
 				console.error(e);
 			}
@@ -238,7 +238,7 @@ define(["dojo/_base/declare"], function (declare) {
 					console.log("RI:", k, "=>", v);
 
 					if (k == "daemon_is_running" && v != 1) {
-						notify_error("<span onclick=\"Utils.explainError(1)\">Update daemon is not running.</span>", true);
+						Notify.error("<span onclick=\"Utils.explainError(1)\">Update daemon is not running.</span>", true);
 						return;
 					}
 
@@ -253,7 +253,7 @@ define(["dojo/_base/declare"], function (declare) {
 					}
 
 					if (k == "daemon_stamp_ok" && v != 1) {
-						notify_error("<span onclick=\"Utils.explainError(3)\">Update daemon is not updating feeds.</span>", true);
+						Notify.error("<span onclick=\"Utils.explainError(3)\">Update daemon is not updating feeds.</span>", true);
 						return;
 					}
 
diff --git a/js/common.js b/js/common.js
index 4b5165979..ec6381e31 100755
--- a/js/common.js
+++ b/js/common.js
@@ -217,6 +217,8 @@ const Notify = {
 	},
 	msg: function(msg, keep, kind) {
 		kind = kind || this.KIND_GENERIC;
+		keep = keep || false;
+
 		const notify = $("notify");
 
 		window.clearTimeout(this.timeout);
@@ -232,7 +234,7 @@ const Notify = {
 
 		notify.className = "notify";
 
-		console.log('notify', msg, kind);
+		console.warn('notify', msg, kind);
 
 		switch (kind) {
 			case this.KIND_INFO:
@@ -252,7 +254,7 @@ const Notify = {
 		if (icon) msgfmt = "<span><img src=\"%s\"></span>".replace("%s", icon) + msgfmt;
 
 		msgfmt += (" <span><img src=\"%s\" class='close' title=\"" +
-			__("Click to close") + "\" onclick=\"notify('')\"></span>")
+			__("Click to close") + "\" onclick=\"Notify.close()\"></span>")
 				.replace("%s", getInitParam("icon_cross"));
 
 		notify.innerHTML = msgfmt;
@@ -265,33 +267,19 @@ const Notify = {
 
 	},
 	info: function(msg, keep) {
+		keep = keep || false;
 		this.msg(msg, keep, this.KIND_INFO);
 	},
 	progress: function(msg, keep) {
+		keep = keep || true;
 		this.msg(msg, keep, this.KIND_PROGRESS);
 	},
-	error: function(msg) {
-		this.msg(msg, true, this.KIND_ERROR);
+	error: function(msg, keep) {
+		keep = keep || true;
+		this.msg(msg, keep, this.KIND_ERROR);
 	}
 };
 
-function notify(msg, no_hide) {
-	notify_real(msg, no_hide, 1);
-}
-
-function notify_progress(msg, no_hide) {
-	notify_real(msg, no_hide, 2);
-}
-
-function notify_error(msg, no_hide) {
-	notify_real(msg, no_hide, 3);
-
-}
-
-function notify_info(msg, no_hide) {
-	notify_real(msg, no_hide, 4);
-}
-
 // noinspection JSUnusedGlobalSymbols
 function displayIfChecked(checkbox, elemId) {
 	if (checkbox.checked) {
@@ -359,7 +347,7 @@ function fatalError(code, msg, ext_info) {
 function uploadIconHandler(rc) {
 	switch (rc) {
 		case 0:
-			notify_info("Upload complete.");
+			Notify.info("Upload complete.");
 			if (App.isPrefs()) {
 				Feeds.reload();
 			} else {
@@ -367,10 +355,10 @@ function uploadIconHandler(rc) {
 			}
 			break;
 		case 1:
-			notify_error("Upload failed: icon is too big.");
+			Notify.error("Upload failed: icon is too big.");
 			break;
 		case 2:
-			notify_error("Upload failed.");
+			Notify.error("Upload failed.");
 			break;
 	}
 }
diff --git a/js/prefs.js b/js/prefs.js
index 7c4021201..a1866f478 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -85,7 +85,7 @@ const App = {
 	initSecondStage: function() {
 		document.onkeydown = () => { App.hotkeyHandler(event) };
 		Utils.setLoadingProgress(50);
-		notify("");
+		Notify.close();
 
 		let tab = Utils.urlParam('tab');
 
@@ -154,7 +154,7 @@ function opmlImportComplete(iframe) {
 
 	Element.show(iframe);
 
-	notify('');
+	Notify.close();
 
 	if (dijit.byId('opmlImportDlg'))
 		dijit.byId('opmlImportDlg').destroyRecursive();
@@ -185,7 +185,7 @@ function opmlImport() {
 		alert(__("Please choose an OPML file first."));
 		return false;
 	} else {
-		notify_progress("Importing, please wait...", true);
+		Notify.progress("Importing, please wait...", true);
 
 		Element.show("upload_iframe");
 
@@ -195,7 +195,7 @@ function opmlImport() {
 
 function opmlRegenKey() {
 	if (confirm(__("Replace current OPML publishing address with a new one?"))) {
-		notify_progress("Trying to change address...", true);
+		Notify.progress("Trying to change address...", true);
 
 		xhrJson("backend.php", { op: "pref-feeds", method: "regenOPMLKey" }, (reply) => {
 			if (reply) {
@@ -208,10 +208,10 @@ function opmlRegenKey() {
 
 					new Effect.Highlight(e);
 
-					notify('');
+					Notify.close();
 
 				} else {
-					notify_error("Could not change feed URL.");
+					Notify.error("Could not change feed URL.");
 				}
 			}
 		});
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 4eeeed131..481386114 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -478,7 +478,7 @@ const App = {
 			Utils.helpDialog("main");
 		};
 		this.hotkey_actions["toggle_combined_mode"] = function () {
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			const value = App.isCombinedMode() ? "false" : "true";
 
@@ -491,7 +491,7 @@ const App = {
 			})
 		};
 		this.hotkey_actions["toggle_cdm_expanded"] = function () {
-			notify_progress("Loading, please wait...");
+			Notify.progress("Loading, please wait...");
 
 			const value = getInitParam("cdm_expanded") ? "false" : "true";
 
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 7787d5b37..514f5731a 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -150,7 +150,7 @@ class Af_Psql_Trgm extends Plugin {
 					new Ajax.Request('backend.php', {
 						parameters: dojo.objectToQuery(this.getValues()),
 						onComplete: function(transport) {
-							notify_info(transport.responseText);
+							Notify.info(transport.responseText);
 						}
 					});
 					//this.reset();
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index e0c57d093..8c17738c9 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -61,7 +61,7 @@ class Af_Readability extends Plugin {
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify_info(transport.responseText);
+						Notify.info(transport.responseText);
 					}
 				});
 				//this.reset();
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 2b8415dd0..1958e83be 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -45,7 +45,7 @@ class Af_RedditImgur extends Plugin {
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify_info(transport.responseText);
+						Notify.info(transport.responseText);
 					}
 				});
 				//this.reset();
diff --git a/plugins/af_zz_imgproxy/init.php b/plugins/af_zz_imgproxy/init.php
index 1c1e99ae4..ca49e94a7 100755
--- a/plugins/af_zz_imgproxy/init.php
+++ b/plugins/af_zz_imgproxy/init.php
@@ -216,7 +216,7 @@ class Af_Zz_ImgProxy extends Plugin {
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify_info(transport.responseText);
+						Notify.info(transport.responseText);
 					}
 				});
 				//this.reset();
diff --git a/plugins/import_export/import_export.js b/plugins/import_export/import_export.js
index 780f6bfc7..56a2a5c3e 100644
--- a/plugins/import_export/import_export.js
+++ b/plugins/import_export/import_export.js
@@ -14,7 +14,7 @@ function exportData() {
 			style: "width: 600px",
 			prepare: function() {
 
-				notify_progress("Loading, please wait...");
+				Notify.progress("Loading, please wait...");
 
 				new Ajax.Request("backend.php", {
 					parameters: "op=pluginhandler&plugin=import_export&method=exportrun&offset=" + exported,
@@ -53,7 +53,7 @@ function exportData() {
 							exception_error("exportData", e, transport.responseText);
 						}
 
-						notify('');
+						Notify.close();
 
 					} });
 
@@ -81,7 +81,7 @@ function dataImportComplete(iframe) {
 
 		Element.hide(iframe);
 
-		notify('');
+		Notify.close();
 
 		if (dijit.byId('dataImportDlg'))
 			dijit.byId('dataImportDlg').destroyRecursive();
@@ -112,7 +112,7 @@ function importData() {
 		alert(__("Please choose the file first."));
 		return false;
 	} else {
-		notify_progress("Importing, please wait...", true);
+		Notify.progress("Importing, please wait...", true);
 
 		Element.show("data_upload_iframe");
 
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 5294931c7..d8f92853e 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -45,7 +45,7 @@ class Mail extends Plugin {
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify_info(transport.responseText);
+						Notify.info(transport.responseText);
 					}
 				});
 				//this.reset();
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index af0cf3552..b72289c2a 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -29,7 +29,7 @@ function emailArticle(id) {
 							if (error) {
 								alert(__('Error sending email:') + ' ' + error);
 							} else {
-								notify_info('Your message has been sent.');
+								Notify.info('Your message has been sent.');
 								dialog.hide();
 							}
 
diff --git a/plugins/note/note.js b/plugins/note/note.js
index c1f317b52..836481c40 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -12,10 +12,10 @@ function editArticleNote(id) {
 			style: "width: 600px",
 			execute: function() {
 				if (this.validate()) {
-					notify_progress("Saving article note...", true);
+					Notify.progress("Saving article note...", true);
 
 					xhrJson("backend.php", this.attr('value'), (reply) => {
-                        notify('');
+                        Notify.close();
                         dialog.hide();
 
                         if (reply) {
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index 6a1ae3c65..53b9ee479 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -63,7 +63,7 @@ class NSFW extends Plugin {
 				new Ajax.Request('backend.php', {
 					parameters: dojo.objectToQuery(this.getValues()),
 					onComplete: function(transport) {
-						notify_info(transport.responseText);
+						Notify.info(transport.responseText);
 					}
 				});
 				//this.reset();
diff --git a/plugins/share/share.js b/plugins/share/share.js
index 4a6a65ce6..a22e01715 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -12,7 +12,7 @@ function shareArticle(id) {
 			newurl: function() {
 				if (confirm(__("Generate new share URL for this article?"))) {
 
-					notify_progress("Trying to change URL...", true);
+					Notify.progress("Trying to change URL...", true);
 
 					const query = { op: "pluginhandler", plugin: "share", method: "newkey", id: id };
 
@@ -34,10 +34,10 @@ function shareArticle(id) {
 								const img = $("SHARE-IMG-" + id);
 								if (img) img.src = img.src.replace("notshared.png", "share.png");
 
-								notify('');
+								Notify.close();
 
 							} else {
-								notify_error("Could not change URL.");
+								Notify.error("Could not change URL.");
 							}
 						}
 					});
@@ -47,7 +47,7 @@ function shareArticle(id) {
 			unshare: function() {
 				if (confirm(__("Remove sharing for this article?"))) {
 
-					notify_progress("Trying to unshare...", true);
+					Notify.progress("Trying to unshare...", true);
 
 					const query = { op: "pluginhandler", plugin: "share", method: "unshare", id: id };
 
diff --git a/plugins/share/share_prefs.js b/plugins/share/share_prefs.js
index 79ca37284..92975f8f4 100644
--- a/plugins/share/share_prefs.js
+++ b/plugins/share/share_prefs.js
@@ -1,11 +1,11 @@
 function clearArticleAccessKeys() {
 	if (confirm(__("This will invalidate all previously shared article URLs. Continue?"))) {
-		notify_progress("Clearing URLs...");
+		Notify.progress("Clearing URLs...");
 
 		const query = { op: "pluginhandler", plugin: "share", method: "clearArticleKeys" };
 
 		xhrPost("backend.php", query, () => {
-			notify_info("Shared URLs cleared.");
+			Notify.info("Shared URLs cleared.");
 		});
 	}
 
diff --git a/utils/extract-i18n-js.pl b/utils/extract-i18n-js.pl
index d6179fc70..b51e7ce5a 100755
--- a/utils/extract-i18n-js.pl
+++ b/utils/extract-i18n-js.pl
@@ -5,7 +5,7 @@ use strict;
 while (<STDIN>) {
 	chomp;
 
-	if (/(__|notify_progress|notify|notify_info|notify_error)\(['"](.*?)['"]\)/) {
+	if (/(__|Notify.progress|Notify.msg|Notify.info|Notify.error)\(['"](.*?)['"]\)/) {
 		my $msg = $2;
 
 		$msg =~ s/\"/\\\"/g;
diff --git a/utils/update-translations.sh b/utils/update-translations.sh
index b955ac28d..1ba50fa5c 100755
--- a/utils/update-translations.sh
+++ b/utils/update-translations.sh
@@ -3,9 +3,9 @@ TEMPLATE=messages.pot
 
 xgettext -kT_js_decl -kT_sprintf -k_ngettext:1,2 -kT_ngettext:1,2 -k__ -L PHP -o $TEMPLATE *.php include/*.php `find classes -iname '*.php'` `find plugins -iname '*.php'`
 
-xgettext --from-code utf-8 -k__ -knotify_info -knotify_progress -kngettext -L Perl -j -o $TEMPLATE js/*.js `find plugins -iname '*.js'`
+xgettext --from-code utf-8 -k__ -kNotify.info -kNotify.error -kNotify.progress -kngettext -L Perl -j -o $TEMPLATE js/*.js `find plugins -iname '*.js'`
 
-xgettext --from-code utf-8 -k__ -knotify_info -knotify_progress -kngettext -L Java -j -o $TEMPLATE js/*.js `find plugins -iname '*.js'`
+xgettext --from-code utf-8 -k__ -kNotify.info -kNotify.error -kNotify.progress -kngettext -L Java -j -o $TEMPLATE js/*.js `find plugins -iname '*.js'`
 
 update_lang() {
 	if [ -f $1.po ]; then
-- 
cgit v1.2.3-54-g00ecf


From eeb49d375ce7e6addc382bab1a1545e897bb1771 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 20:57:51 +0300
Subject: uploadIconHandler -> CommonDialogs

---
 classes/pref/feeds.php |  2 +-
 js/CommonDialogs.js    | 19 +++++++++++++++++++
 js/common.js           | 21 ---------------------
 3 files changed, 20 insertions(+), 22 deletions(-)

(limited to 'js/common.js')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 7ae7a04c1..82cb84daf 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -492,7 +492,7 @@ class Pref_Feeds extends Handler_Protected {
 		@unlink($icon_file);
 
 		print "<script type=\"text/javascript\">";
-		print "parent.uploadIconHandler($rc);";
+		print "parent.CommonDialogs.uploadIconHandler($rc);";
 		print "</script>";
 		return;
 	}
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index cac4f9be1..cf21370d6 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -1,11 +1,30 @@
 'use strict'
 /* global __, ngettext */
 define(["dojo/_base/declare"], function (declare) {
+	// noinspection JSUnusedGlobalSymbols
 	return declare("fox.CommonDialogs", null, {
 		closeInfoBox: function() {
 			const dialog = dijit.byId("infoBox");
 			if (dialog)	dialog.hide();
 		},
+		uploadIconHandler: function(rc) {
+			switch (rc) {
+				case 0:
+					Notify.info("Upload complete.");
+					if (App.isPrefs()) {
+						Feeds.reload();
+					} else {
+						setTimeout('Feeds.reload(false, false)', 50);
+					}
+					break;
+				case 1:
+					Notify.error("Upload failed: icon is too big.");
+					break;
+				case 2:
+					Notify.error("Upload failed.");
+					break;
+			}
+		},
 		removeFeedIcon: function(id) {
 			if (confirm(__("Remove stored feed icon?"))) {
 				Notify.progress("Removing feed icon...", true);
diff --git a/js/common.js b/js/common.js
index ec6381e31..1da3e6d1b 100755
--- a/js/common.js
+++ b/js/common.js
@@ -343,27 +343,6 @@ function fatalError(code, msg, ext_info) {
 	return s.replace(/<\/?[^>]+(>|$)/g, "");
 } */
 
-// noinspection JSUnusedGlobalSymbols
-function uploadIconHandler(rc) {
-	switch (rc) {
-		case 0:
-			Notify.info("Upload complete.");
-			if (App.isPrefs()) {
-				Feeds.reload();
-			} else {
-				setTimeout('Feeds.reload(false, false)', 50);
-			}
-			break;
-		case 1:
-			Notify.error("Upload failed: icon is too big.");
-			break;
-		case 2:
-			Notify.error("Upload failed.");
-			break;
-	}
-}
-
-
 // noinspection JSUnusedGlobalSymbols
 function label_to_feed_id(label) {
 	return _label_base_index - 1 - Math.abs(label);
-- 
cgit v1.2.3-54-g00ecf


From ac8361e6f6e81e25d3c17e14b973af53a9b93885 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 21:52:50 +0300
Subject: add AppBase as a shared ancestor for main and prefs app objects
 remove event.observe stuff from startup, unneeded

---
 index.php       |   6 -
 js/AppBase.js   |  35 ++
 js/FeedTree.js  |   2 +-
 js/Feeds.js     |  30 +-
 js/Headlines.js |  24 +-
 js/Utils.js     |  16 +-
 js/common.js    |  38 +--
 js/prefs.js     | 249 +++++++-------
 js/tt-rss.js    | 989 ++++++++++++++++++++++++++++----------------------------
 prefs.php       |   7 -
 10 files changed, 698 insertions(+), 698 deletions(-)
 create mode 100644 js/AppBase.js

(limited to 'js/common.js')

diff --git a/index.php b/index.php
index 6035ac186..f574eb4d6 100644
--- a/index.php
+++ b/index.php
@@ -135,12 +135,6 @@
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 	<meta name="referrer" content="no-referrer"/>
-
-	<script type="text/javascript">
-		Event.observe(window, 'load', function() {
-			App.init();
-		});
-	</script>
 </head>
 
 <body class="claro ttrss_main">
diff --git a/js/AppBase.js b/js/AppBase.js
new file mode 100644
index 000000000..8987d115e
--- /dev/null
+++ b/js/AppBase.js
@@ -0,0 +1,35 @@
+'use strict'
+/* global __, ngettext */
+define(["dojo/_base/declare"], function (declare) {
+	return declare("fox.AppBase", null, {
+		_initParams: [],
+		getInitParam: function(k) {
+			return this._initParams[k];
+		},
+		setInitParam: function(k, v) {
+			this._initParams[k] = v;
+		},
+		constructor: function(args) {
+			//
+		},
+		enableCsrfSupport: function() {
+			Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
+				function (callOriginal, options) {
+
+					if (App.getInitParam("csrf_token") != undefined) {
+						Object.extend(options, options || { });
+
+						if (Object.isString(options.parameters))
+							options.parameters = options.parameters.toQueryParams();
+						else if (Object.isHash(options.parameters))
+							options.parameters = options.parameters.toObject();
+
+						options.parameters["csrf_token"] = App.getInitParam("csrf_token");
+					}
+
+					return callOriginal(options);
+				}
+			);
+		}
+	});
+});
diff --git a/js/FeedTree.js b/js/FeedTree.js
index 4a28bd2b0..37e3de2d1 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -123,7 +123,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 		postCreate: function() {
 			this.connect(this.model, "onChange", "updateCounter");
 			this.connect(this, "_expandNode", function() {
-				this.hideRead(getInitParam("hide_read_feeds"), getInitParam("hide_read_shows_special"));
+				this.hideRead(App.getInitParam("hide_read_feeds"), App.getInitParam("hide_read_shows_special"));
 			});
 
 			this.inherited(arguments);
diff --git a/js/Feeds.js b/js/Feeds.js
index 8b6f6a707..d5371779f 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -83,7 +83,7 @@ define(["dojo/_base/declare"], function (declare) {
 					if (id > 0) {
 						if (has_img) {
 							this.setIcon(id, false,
-								getInitParam("icons_url") + "/" + id + ".ico?" + has_img);
+								App.getInitParam("icons_url") + "/" + id + ".ico?" + has_img);
 						} else {
 							this.setIcon(id, false, 'images/blank_icon.gif');
 						}
@@ -91,7 +91,7 @@ define(["dojo/_base/declare"], function (declare) {
 				}
 			}
 
-			this.hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
+			this.hideOrShowFeeds(App.getInitParam("hide_read_feeds") == 1);
 			this._counters_prev = elems;
 		},
 		reloadCurrent: function(method) {
@@ -132,7 +132,7 @@ define(["dojo/_base/declare"], function (declare) {
 				let query = {op: "rpc", method: "getAllCounters", seq: Utils.next_seq()};
 
 				if (!force)
-					query.last_article_id = getInitParam("last_article_id");
+					query.last_article_id = App.getInitParam("last_article_id");
 
 				xhrPost("backend.php", query, (transport) => {
 					Utils.handleRpcJson(transport);
@@ -160,7 +160,7 @@ define(["dojo/_base/declare"], function (declare) {
 				const treeModel = new fox.FeedStoreModel({
 					store: store,
 					query: {
-						"type": getInitParam('enable_feed_cats') == 1 ? "category" : "feed"
+						"type": App.getInitParam('enable_feed_cats') == 1 ? "category" : "feed"
 					},
 					rootId: "root",
 					rootLabel: "Feeds",
@@ -221,9 +221,9 @@ define(["dojo/_base/declare"], function (declare) {
 				this.open({feed: this.getActive(), is_cat: this.activeIsCat()});
 			}
 
-			this.hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
+			this.hideOrShowFeeds(App.getInitParam("hide_read_feeds") == 1);
 
-			if (getInitParam("is_default_pw")) {
+			if (App.getInitParam("is_default_pw")) {
 				console.warn("user password is at default value");
 
 				const dialog = new dijit.Dialog({
@@ -246,7 +246,7 @@ define(["dojo/_base/declare"], function (declare) {
 			}
 
 			// bw_limit disables timeout() so we request initial counters separately
-			if (getInitParam("bw_limit") == "1") {
+			if (App.getInitParam("bw_limit") == "1") {
 				this.requestCounters(true);
 			} else {
 				setTimeout(() => {
@@ -281,18 +281,18 @@ define(["dojo/_base/declare"], function (declare) {
 			if (tree) return tree.selectFeed(feed, is_cat);
 		},
 		toggleUnread: function() {
-			const hide = !(getInitParam("hide_read_feeds") == "1");
+			const hide = !(App.getInitParam("hide_read_feeds") == "1");
 
 			xhrPost("backend.php", {op: "rpc", method: "setpref", key: "HIDE_READ_FEEDS", value: hide}, () => {
 				this.hideOrShowFeeds(hide);
-				setInitParam("hide_read_feeds", hide);
+				App.setInitParam("hide_read_feeds", hide);
 			});
 		},
 		hideOrShowFeeds: function(hide) {
 			const tree = dijit.byId("feedTree");
 
 			if (tree)
-				return tree.hideRead(hide, getInitParam("hide_read_shows_special"));
+				return tree.hideRead(hide, App.getInitParam("hide_read_shows_special"));
 		},
 		open: function(params) {
 			const feed = params.feed;
@@ -366,7 +366,7 @@ define(["dojo/_base/declare"], function (declare) {
 			if (viewfeed_debug) {
 				window.open("backend.php?" +
 					dojo.objectToQuery(
-						Object.assign({debug: 1, csrf_token: getInitParam("csrf_token")}, query)
+						Object.assign({debug: 1, csrf_token: App.getInitParam("csrf_token")}, query)
 					));
 			}
 
@@ -389,7 +389,7 @@ define(["dojo/_base/declare"], function (declare) {
 		catchupAll: function() {
 			const str = __("Mark all articles as read?");
 
-			if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
 
 				Notify.progress("Marking all feeds as read...");
 
@@ -448,7 +448,7 @@ define(["dojo/_base/declare"], function (declare) {
 			str = str.replace("%s", fn)
 				.replace("%w", mark_what);
 
-			if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
 				return;
 			}
 
@@ -463,7 +463,7 @@ define(["dojo/_base/declare"], function (declare) {
 			xhrPost("backend.php", catchup_query, (transport) => {
 				Utils.handleRpcJson(transport);
 
-				const show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
+				const show_next_feed = App.getInitParam("on_catchup_show_next_feed") == "1";
 
 				if (show_next_feed) {
 					const nuf = this.getNextUnread(feed, is_cat);
@@ -486,7 +486,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 			const str = __("Mark all articles in %s as read?").replace("%s", title);
 
-			if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
 
 				const rows = $$("#headlines-frame > div[id*=RROW][data-orig-feed-id='" + id + "']");
 
diff --git a/js/Headlines.js b/js/Headlines.js
index 68dda8d3e..1bcd35896 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -12,13 +12,13 @@ define(["dojo/_base/declare"], function (declare) {
 
 			if (App.isCombinedMode()) {
 
-				if (!in_body && (event.ctrlKey || id == Article.getActive() || getInitParam("cdm_expanded"))) {
+				if (!in_body && (event.ctrlKey || id == Article.getActive() || App.getInitParam("cdm_expanded"))) {
 					Article.openInNewWindow(id);
 				}
 
 				Article.setActive(id);
 
-				if (!getInitParam("cdm_expanded"))
+				if (!App.getInitParam("cdm_expanded"))
 					Article.cdmScrollToId(id);
 
 				return in_body;
@@ -81,7 +81,7 @@ define(["dojo/_base/declare"], function (declare) {
 					// set topmost child in the buffer as active, but not if we're at the beginning (to prevent auto marking
 					// first article as read all the time)
 					if ($("headlines-frame").scrollTop != 0 &&
-						getInitParam("cdm_expanded") && getInitParam("cdm_auto_catchup") == 1) {
+						App.getInitParam("cdm_expanded") && App.getInitParam("cdm_auto_catchup") == 1) {
 
 						const rows = $$("#headlines-frame > div[id*=RROW]");
 
@@ -113,7 +113,7 @@ define(["dojo/_base/declare"], function (declare) {
 					}
 				}
 
-				if (getInitParam("cdm_auto_catchup") == 1) {
+				if (App.getInitParam("cdm_auto_catchup") == 1) {
 
 					let rows = $$("#headlines-frame > div[id*=RROW][class*=Unread]");
 
@@ -139,7 +139,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 							console.log("we seem to be at an end");
 
-							if (getInitParam("on_catchup_show_next_feed") == "1") {
+							if (App.getInitParam("on_catchup_show_next_feed") == "1") {
 								Feeds.openNextUnread();
 							}
 						}
@@ -150,7 +150,7 @@ define(["dojo/_base/declare"], function (declare) {
 			}
 		},
 		updateFloatingTitle: function(unread_only) {
-			if (!App.isCombinedMode()/* || !getInitParam("cdm_expanded")*/) return;
+			if (!App.isCombinedMode()/* || !App.getInitParam("cdm_expanded")*/) return;
 
 			const hf = $("headlines-frame");
 			const elems = $$("#headlines-frame > div[id*=RROW]");
@@ -201,7 +201,7 @@ define(["dojo/_base/declare"], function (declare) {
 			}
 		},
 		unpackVisible: function() {
-			if (!App.isCombinedMode() || !getInitParam("cdm_expanded")) return;
+			if (!App.isCombinedMode() || !App.getInitParam("cdm_expanded")) return;
 
 			const rows = $$("#headlines-frame div[id*=RROW][data-content]");
 			const threshold = $("headlines-frame").scrollTop + $("headlines-frame").offsetHeight + 600;
@@ -714,7 +714,7 @@ define(["dojo/_base/declare"], function (declare) {
 			str = str.replace("%d", rows.length);
 			str = str.replace("%s", fn);
 
-			if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
 				return;
 			}
 
@@ -839,7 +839,7 @@ define(["dojo/_base/declare"], function (declare) {
 			str = str.replace("%d", rows.length);
 			str = str.replace("%s", fn);
 
-			if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
 				return;
 			}
 
@@ -869,7 +869,7 @@ define(["dojo/_base/declare"], function (declare) {
 			str = str.replace("%d", rows.length);
 			str = str.replace("%s", fn);
 
-			if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+			if (App.getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
 				return;
 			}
 
@@ -952,7 +952,7 @@ define(["dojo/_base/declare"], function (declare) {
 			} else {
 				const msg = ngettext("Mark %d article as read?", "Mark %d articles as read?", ids_to_mark.length).replace("%d", ids_to_mark.length);
 
-				if (getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) {
+				if (App.getInitParam("confirm_feed_catchup") != 1 || confirm(msg)) {
 
 					for (var i = 0; i < ids_to_mark.length; i++) {
 						var e = $("RROW-" + ids_to_mark[i]);
@@ -1090,7 +1090,7 @@ define(["dojo/_base/declare"], function (declare) {
 			}));
 
 
-			const labels = getInitParam("labels");
+			const labels = App.getInitParam("labels");
 
 			if (labels && labels.length) {
 
diff --git a/js/Utils.js b/js/Utils.js
index 1050cf018..d1de08b2c 100644
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -28,7 +28,7 @@ define(["dojo/_base/declare"], function (declare) {
 		},
 		keyeventToAction: function(event) {
 
-			const hotkeys_map = getInitParam("hotkeys");
+			const hotkeys_map = App.getInitParam("hotkeys");
 			const keycode = event.which;
 			const keychar = String.fromCharCode(keycode).toLowerCase();
 
@@ -191,7 +191,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					if (message == "UPDATE_COUNTERS") {
 						console.log("need to refresh counters...");
-						setInitParam("last_article_id", -1);
+						App.setInitParam("last_article_id", -1);
 						Feeds.requestCounters(true);
 					}
 
@@ -228,9 +228,6 @@ define(["dojo/_base/declare"], function (declare) {
 			return false;
 		},
 		parseRuntimeInfo: function(data) {
-
-			//console.log("parsing runtime info...");
-
 			for (const k in data) {
 				if (data.hasOwnProperty(k)) {
 					const v = data[k];
@@ -258,13 +255,13 @@ define(["dojo/_base/declare"], function (declare) {
 					}
 
 					if (k == "max_feed_id" || k == "num_feeds") {
-						if (init_params[k] != v) {
+						if (App.getInitParam(k) != v) {
 							console.log("feed count changed, need to reload feedlist.");
 							Feeds.reload();
 						}
 					}
 
-					init_params[k] = v;
+					App.setInitParam(k, v);
 				}
 			}
 
@@ -315,13 +312,12 @@ define(["dojo/_base/declare"], function (declare) {
 						}
 
 						console.log("IP:", k, "=>", params[k]);
+						App.setInitParam(k, params[k]);
 					}
 				}
 
-				init_params = params;
-
 				// PluginHost might not be available on non-index pages
-				window.PluginHost && PluginHost.run(PluginHost.HOOK_PARAMS_LOADED, init_params);
+				window.PluginHost && PluginHost.run(PluginHost.HOOK_PARAMS_LOADED, App._initParams);
 			}
 
 			App.initSecondStage();
diff --git a/js/common.js b/js/common.js
index 1da3e6d1b..de6d13a78 100755
--- a/js/common.js
+++ b/js/common.js
@@ -1,28 +1,8 @@
 'use strict'
 /* global dijit, __ */
 
-let init_params = {};
 let _label_base_index = -1024;
 let loading_progress = 0;
-let notify_hide_timerid = false;
-
-Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
-	function (callOriginal, options) {
-
-		if (getInitParam("csrf_token") != undefined) {
-			Object.extend(options, options || { });
-
-			if (Object.isString(options.parameters))
-				options.parameters = options.parameters.toQueryParams();
-			else if (Object.isHash(options.parameters))
-				options.parameters = options.parameters.toObject();
-
-			options.parameters["csrf_token"] = getInitParam("csrf_token");
-		}
-
-		return callOriginal(options);
-	}
-);
 
 /* xhr shorthand helpers */
 
@@ -239,15 +219,15 @@ const Notify = {
 		switch (kind) {
 			case this.KIND_INFO:
 				notify.addClassName("notify_info")
-				icon = getInitParam("icon_information");
+				icon = App.getInitParam("icon_information");
 				break;
 			case this.KIND_ERROR:
 				notify.addClassName("notify_error");
-				icon = getInitParam("icon_alert");
+				icon = App.getInitParam("icon_alert");
 				break;
 			case this.KIND_PROGRESS:
 				notify.addClassName("notify_progress");
-				icon = getInitParam("icon_indicator_white")
+				icon = App.getInitParam("icon_indicator_white")
 				break;
 		}
 
@@ -255,7 +235,7 @@ const Notify = {
 
 		msgfmt += (" <span><img src=\"%s\" class='close' title=\"" +
 			__("Click to close") + "\" onclick=\"Notify.close()\"></span>")
-				.replace("%s", getInitParam("icon_cross"));
+				.replace("%s", App.getInitParam("icon_cross"));
 
 		notify.innerHTML = msgfmt;
 		notify.addClassName("visible");
@@ -289,14 +269,6 @@ function displayIfChecked(checkbox, elemId) {
 	}
 }
 
-function getInitParam(key) {
-	return init_params[key];
-}
-
-function setInitParam(key, value) {
-	init_params[key] = value;
-}
-
 function fatalError(code, msg, ext_info) {
 	if (code == 6) {
 		window.location.href = "index.php";
@@ -390,5 +362,5 @@ function popupOpenArticle(id) {
 		"height=900,width=900,resizable=yes,status=no,location=no,menubar=no,directories=no,scrollbars=yes,toolbar=no");
 
 	w.opener = null;
-	w.location = "backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + "&csrf_token=" + getInitParam("csrf_token");
+	w.location = "backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id + "&csrf_token=" + App.getInitParam("csrf_token");
 }
diff --git a/js/prefs.js b/js/prefs.js
index a1866f478..75f285b38 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -1,64 +1,67 @@
 'use strict'
 /* global dijit, __ */
 
+let App;
 let Utils;
 let CommonDialogs;
 let Filters;
 let Users;
 let Prefs;
 
-const App = {
-	init: function() {
-		window.onerror = function (message, filename, lineno, colno, error) {
-			report_error(message, filename, lineno, colno, error);
-		};
-
-		require(["dojo/_base/kernel",
-			"dojo/ready",
-			"dojo/parser",
-			"dojo/_base/loader",
-			"dojo/_base/html",
-			"dijit/ColorPalette",
-			"dijit/Dialog",
-			"dijit/form/Button",
-			"dijit/form/CheckBox",
-			"dijit/form/DropDownButton",
-			"dijit/form/FilteringSelect",
-			"dijit/form/MultiSelect",
-			"dijit/form/Form",
-			"dijit/form/RadioButton",
-			"dijit/form/ComboButton",
-			"dijit/form/Select",
-			"dijit/form/SimpleTextarea",
-			"dijit/form/TextBox",
-			"dijit/form/ValidationTextBox",
-			"dijit/InlineEditBox",
-			"dijit/layout/AccordionContainer",
-			"dijit/layout/AccordionPane",
-			"dijit/layout/BorderContainer",
-			"dijit/layout/ContentPane",
-			"dijit/layout/TabContainer",
-			"dijit/Menu",
-			"dijit/ProgressBar",
-			"dijit/Toolbar",
-			"dijit/Tree",
-			"dijit/tree/dndSource",
-			"dojo/data/ItemFileWriteStore",
-			"lib/CheckBoxStoreModel",
-			"lib/CheckBoxTree",
-			"fox/Utils",
-			"fox/CommonDialogs",
-			"fox/CommonFilters",
-			"fox/PrefUsers",
-			"fox/PrefHelpers",
-			"fox/PrefFeedStore",
-			"fox/PrefFilterStore",
-			"fox/PrefFeedTree",
-			"fox/PrefFilterTree",
-			"fox/PrefLabelTree"], function (dojo, ready, parser) {
-
-			ready(function () {
-				try {
+require(["dojo/_base/kernel",
+	"dojo/_base/declare",
+	"dojo/ready",
+	"dojo/parser",
+	"fox/AppBase",
+	"dojo/_base/loader",
+	"dojo/_base/html",
+	"dijit/ColorPalette",
+	"dijit/Dialog",
+	"dijit/form/Button",
+	"dijit/form/CheckBox",
+	"dijit/form/DropDownButton",
+	"dijit/form/FilteringSelect",
+	"dijit/form/MultiSelect",
+	"dijit/form/Form",
+	"dijit/form/RadioButton",
+	"dijit/form/ComboButton",
+	"dijit/form/Select",
+	"dijit/form/SimpleTextarea",
+	"dijit/form/TextBox",
+	"dijit/form/ValidationTextBox",
+	"dijit/InlineEditBox",
+	"dijit/layout/AccordionContainer",
+	"dijit/layout/AccordionPane",
+	"dijit/layout/BorderContainer",
+	"dijit/layout/ContentPane",
+	"dijit/layout/TabContainer",
+	"dijit/Menu",
+	"dijit/ProgressBar",
+	"dijit/Toolbar",
+	"dijit/Tree",
+	"dijit/tree/dndSource",
+	"dojo/data/ItemFileWriteStore",
+	"lib/CheckBoxStoreModel",
+	"lib/CheckBoxTree",
+	"fox/Utils",
+	"fox/CommonDialogs",
+	"fox/CommonFilters",
+	"fox/PrefUsers",
+	"fox/PrefHelpers",
+	"fox/PrefFeedStore",
+	"fox/PrefFilterStore",
+	"fox/PrefFeedTree",
+	"fox/PrefFilterTree",
+	"fox/PrefLabelTree"], function (dojo, declare, ready, parser, AppBase) {
+
+	ready(function () {
+		try {
+			const _App = declare("fox.App", AppBase, {
+				constructor: function() {
+					window.onerror = function (message, filename, lineno, colno, error) {
+						report_error(message, filename, lineno, colno, error);
+					};
+
 					Utils = fox.Utils();
 					CommonDialogs = fox.CommonDialogs();
 					Filters = fox.CommonFilters();
@@ -73,81 +76,87 @@ const App = {
 					const params = {op: "rpc", method: "sanityCheck", clientTzOffset: clientTzOffset};
 
 					xhrPost("backend.php", params, (transport) => {
-						Utils.backendSanityCallback(transport);
+						try {
+							Utils.backendSanityCallback(transport);
+						} catch (e) {
+							exception_error(e);
+						}
 					});
+				},
+				initSecondStage: function() {
+					document.onkeydown = () => { App.hotkeyHandler(event) };
+					Utils.setLoadingProgress(50);
+					Notify.close();
 
-				} catch (e) {
-					exception_error(e);
-				}
-			});
-		});
-	},
-	initSecondStage: function() {
-		document.onkeydown = () => { App.hotkeyHandler(event) };
-		Utils.setLoadingProgress(50);
-		Notify.close();
-
-		let tab = Utils.urlParam('tab');
-
-		if (tab) {
-			tab = dijit.byId(tab + "Tab");
-			if (tab) {
-				dijit.byId("pref-tabs").selectChild(tab);
-
-				switch (Utils.urlParam('method')) {
-					case "editfeed":
-						window.setTimeout(function () {
-							CommonDialogs.editFeed(Utils.urlParam('methodparam'))
-						}, 100);
-						break;
-					default:
-						console.warn("initSecondStage, unknown method:", Utils.urlParam("method"));
-				}
-			}
-		} else {
-			let tab = localStorage.getItem("ttrss:prefs-tab");
+					let tab = Utils.urlParam('tab');
+
+					if (tab) {
+						tab = dijit.byId(tab + "Tab");
+						if (tab) {
+							dijit.byId("pref-tabs").selectChild(tab);
+
+							switch (Utils.urlParam('method')) {
+								case "editfeed":
+									window.setTimeout(function () {
+										CommonDialogs.editFeed(Utils.urlParam('methodparam'))
+									}, 100);
+									break;
+								default:
+									console.warn("initSecondStage, unknown method:", Utils.urlParam("method"));
+							}
+						}
+					} else {
+						let tab = localStorage.getItem("ttrss:prefs-tab");
+
+						if (tab) {
+							tab = dijit.byId(tab);
+							if (tab) {
+								dijit.byId("pref-tabs").selectChild(tab);
+							}
+						}
+					}
+
+					dojo.connect(dijit.byId("pref-tabs"), "selectChild", function (elem) {
+						localStorage.setItem("ttrss:prefs-tab", elem.id);
+					});
 
-			if (tab) {
-				tab = dijit.byId(tab);
-				if (tab) {
-					dijit.byId("pref-tabs").selectChild(tab);
+				},
+				hotkeyHandler: function (event) {
+					if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;
+
+					const action_name = Utils.keyeventToAction(event);
+
+					if (action_name) {
+						switch (action_name) {
+							case "feed_subscribe":
+								CommonDialogs.quickAddFeed();
+								return false;
+							case "create_label":
+								CommonDialogs.addLabel();
+								return false;
+							case "create_filter":
+								Filters.quickAddFilter();
+								return false;
+							case "help_dialog":
+								Utils.helpDialog("main");
+								return false;
+							default:
+								console.log("unhandled action: " + action_name + "; keycode: " + event.which);
+						}
+					}
+				},
+				isPrefs: function() {
+					return true;
 				}
-			}
-		}
+			});
 
-		dojo.connect(dijit.byId("pref-tabs"), "selectChild", function (elem) {
-			localStorage.setItem("ttrss:prefs-tab", elem.id);
-		});
+			App = new _App();
 
-	},
-	hotkeyHandler: function (event) {
-		if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;
-
-		const action_name = Utils.keyeventToAction(event);
-
-		if (action_name) {
-			switch (action_name) {
-				case "feed_subscribe":
-					CommonDialogs.quickAddFeed();
-					return false;
-				case "create_label":
-					CommonDialogs.addLabel();
-					return false;
-				case "create_filter":
-					Filters.quickAddFilter();
-					return false;
-				case "help_dialog":
-					Utils.helpDialog("main");
-					return false;
-				default:
-					console.log("unhandled action: " + action_name + "; keycode: " + event.which);
-			}
+		} catch (e) {
+			exception_error(e);
 		}
-	},
-	isPrefs: function() {
-		return true;
-	}
-};
+	});
+});
 
 function opmlImportComplete(iframe) {
 	if (!iframe.contentDocument.body.innerHTML) return false;
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 481386114..ec52755a1 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -1,6 +1,7 @@
 'use strict'
 /* global dijit,__ */
 
+let App;
 let Utils;
 let CommonDialogs;
 let Filters;
@@ -9,63 +10,63 @@ let Headlines;
 let Article;
 let ArticleCache;
 
-const App = {
-	global_unread: -1,
-	_widescreen_mode: false,
-	hotkey_actions: {},
-	init: function() {
-
-		window.onerror = function (message, filename, lineno, colno, error) {
-			report_error(message, filename, lineno, colno, error);
-		};
-
-		require(["dojo/_base/kernel",
-			"dojo/ready",
-			"dojo/parser",
-			"dojo/_base/loader",
-			"dojo/_base/html",
-			"dojo/query",
-			"dijit/ProgressBar",
-			"dijit/ColorPalette",
-			"dijit/Dialog",
-			"dijit/form/Button",
-			"dijit/form/ComboButton",
-			"dijit/form/CheckBox",
-			"dijit/form/DropDownButton",
-			"dijit/form/FilteringSelect",
-			"dijit/form/Form",
-			"dijit/form/RadioButton",
-			"dijit/form/Select",
-			"dijit/form/MultiSelect",
-			"dijit/form/SimpleTextarea",
-			"dijit/form/TextBox",
-			"dijit/form/ComboBox",
-			"dijit/form/ValidationTextBox",
-			"dijit/InlineEditBox",
-			"dijit/layout/AccordionContainer",
-			"dijit/layout/BorderContainer",
-			"dijit/layout/ContentPane",
-			"dijit/layout/TabContainer",
-			"dijit/PopupMenuItem",
-			"dijit/Menu",
-			"dijit/Toolbar",
-			"dijit/Tree",
-			"dijit/tree/dndSource",
-			"dijit/tree/ForestStoreModel",
-			"dojo/data/ItemFileWriteStore",
-			"fox/Utils",
-			"fox/CommonDialogs",
-			"fox/CommonFilters",
-			"fox/Feeds",
-			"fox/Headlines",
-			"fox/Article",
-			"fox/ArticleCache",
-			"fox/FeedStoreModel",
-			"fox/FeedTree"], function (dojo, ready, parser) {
-
-			ready(function () {
-
-				try {
+require(["dojo/_base/kernel",
+	"dojo/_base/declare",
+	"dojo/ready",
+	"dojo/parser",
+	"fox/AppBase",
+	"dojo/_base/loader",
+	"dojo/_base/html",
+	"dojo/query",
+	"dijit/ProgressBar",
+	"dijit/ColorPalette",
+	"dijit/Dialog",
+	"dijit/form/Button",
+	"dijit/form/ComboButton",
+	"dijit/form/CheckBox",
+	"dijit/form/DropDownButton",
+	"dijit/form/FilteringSelect",
+	"dijit/form/Form",
+	"dijit/form/RadioButton",
+	"dijit/form/Select",
+	"dijit/form/MultiSelect",
+	"dijit/form/SimpleTextarea",
+	"dijit/form/TextBox",
+	"dijit/form/ComboBox",
+	"dijit/form/ValidationTextBox",
+	"dijit/InlineEditBox",
+	"dijit/layout/AccordionContainer",
+	"dijit/layout/BorderContainer",
+	"dijit/layout/ContentPane",
+	"dijit/layout/TabContainer",
+	"dijit/PopupMenuItem",
+	"dijit/Menu",
+	"dijit/Toolbar",
+	"dijit/Tree",
+	"dijit/tree/dndSource",
+	"dijit/tree/ForestStoreModel",
+	"dojo/data/ItemFileWriteStore",
+	"fox/Utils",
+	"fox/CommonDialogs",
+	"fox/CommonFilters",
+	"fox/Feeds",
+	"fox/Headlines",
+	"fox/Article",
+	"fox/ArticleCache",
+	"fox/FeedStoreModel",
+	"fox/FeedTree"], function (dojo, declare, ready, parser, AppBase) {
+
+	ready(function () {
+		try {
+			const _App = declare("fox.App", AppBase, {
+				global_unread: -1,
+				_widescreen_mode: false,
+				hotkey_actions: {},
+				constructor: function () {
+					window.onerror = function (message, filename, lineno, colno, error) {
+						report_error(message, filename, lineno, colno, error);
+					};
+
 					Utils = fox.Utils();
 					CommonDialogs = fox.CommonDialogs();
 					Filters = fox.CommonFilters();
@@ -76,11 +77,11 @@ const App = {
 
 					parser.parse();
 
-					if (!App.genericSanityCheck())
-						return false;
+					if (!this.genericSanityCheck())
+						return;
 
 					Utils.setLoadingProgress(30);
-					App.initHotkeyActions();
+					this.initHotkeyActions();
 
 					const a = document.createElement('audio');
 					const hasAudio = !!a.canPlayType;
@@ -99,483 +100,483 @@ const App = {
 						try {
 							Utils.backendSanityCallback(transport);
 						} catch (e) {
-							console.error(e);
+							exception_error(e);
 						}
 					});
+				},
+				initSecondStage: function () {
+					this.enableCsrfSupport();
 
-				} catch (e) {
-					exception_error(e);
-				}
+					Feeds.reload();
+					Article.close();
 
-			});
+					if (parseInt(Cookie.get("ttrss_fh_width")) > 0) {
+						dijit.byId("feeds-holder").domNode.setStyle(
+							{width: Cookie.get("ttrss_fh_width") + "px"});
+					}
 
+					dijit.byId("main").resize();
 
-		});
-	},
-	initSecondStage: function () {
-		Feeds.reload();
-		Article.close();
+					dojo.connect(dijit.byId('feeds-holder'), 'resize',
+						function (args) {
+							if (args && args.w >= 0) {
+								Cookie.set("ttrss_fh_width", args.w, App.getInitParam("cookie_lifetime"));
+							}
+						});
 
-		if (parseInt(Cookie.get("ttrss_fh_width")) > 0) {
-			dijit.byId("feeds-holder").domNode.setStyle(
-				{width: Cookie.get("ttrss_fh_width") + "px"});
-		}
+					dojo.connect(dijit.byId('content-insert'), 'resize',
+						function (args) {
+							if (args && args.w >= 0 && args.h >= 0) {
+								Cookie.set("ttrss_ci_width", args.w, App.getInitParam("cookie_lifetime"));
+								Cookie.set("ttrss_ci_height", args.h, App.getInitParam("cookie_lifetime"));
+							}
+						});
 
-		dijit.byId("main").resize();
+					Cookie.delete("ttrss_test");
 
-		dojo.connect(dijit.byId('feeds-holder'), 'resize',
-			function (args) {
-				if (args && args.w >= 0) {
-					Cookie.set("ttrss_fh_width", args.w, getInitParam("cookie_lifetime"));
-				}
-			});
+					const toolbar = document.forms["main_toolbar_form"];
 
-		dojo.connect(dijit.byId('content-insert'), 'resize',
-			function (args) {
-				if (args && args.w >= 0 && args.h >= 0) {
-					Cookie.set("ttrss_ci_width", args.w, getInitParam("cookie_lifetime"));
-					Cookie.set("ttrss_ci_height", args.h, getInitParam("cookie_lifetime"));
-				}
-			});
+					dijit.getEnclosingWidget(toolbar.view_mode).attr('value',
+						App.getInitParam("default_view_mode"));
 
-		Cookie.delete("ttrss_test");
+					dijit.getEnclosingWidget(toolbar.order_by).attr('value',
+						App.getInitParam("default_view_order_by"));
 
-		const toolbar = document.forms["main_toolbar_form"];
+					const hash_feed_id = hash_get('f');
+					const hash_feed_is_cat = hash_get('c') == "1";
 
-		dijit.getEnclosingWidget(toolbar.view_mode).attr('value',
-			getInitParam("default_view_mode"));
+					if (hash_feed_id != undefined) {
+						Feeds.setActive(hash_feed_id, hash_feed_is_cat);
+					}
 
-		dijit.getEnclosingWidget(toolbar.order_by).attr('value',
-			getInitParam("default_view_order_by"));
+					Utils.setLoadingProgress(50);
 
-		const hash_feed_id = hash_get('f');
-		const hash_feed_is_cat = hash_get('c') == "1";
+					ArticleCache.clear();
 
-		if (hash_feed_id != undefined) {
-			Feeds.setActive(hash_feed_id, hash_feed_is_cat);
-		}
+					this._widescreen_mode = App.getInitParam("widescreen");
+					this.switchPanelMode(this._widescreen_mode);
 
-		Utils.setLoadingProgress(50);
+					Headlines.initScrollHandler();
 
-		ArticleCache.clear();
+					if (App.getInitParam("simple_update")) {
+						console.log("scheduling simple feed updater...");
+						window.setInterval(() => { Feeds.updateRandom() }, 30 * 1000);
+					}
 
-		this._widescreen_mode = getInitParam("widescreen");
-		this.switchPanelMode(this._widescreen_mode);
+					console.log("second stage ok");
+				},
+				genericSanityCheck: function() {
+					Cookie.set("ttrss_test", "TEST");
 
-		Headlines.initScrollHandler();
+					if (Cookie.get("ttrss_test") != "TEST") {
+						return fatalError(2);
+					}
 
-		if (getInitParam("simple_update")) {
-			console.log("scheduling simple feed updater...");
-			window.setInterval(() => { Feeds.updateRandom() }, 30 * 1000);
-		}
+					return true;
+				},
+				updateTitle: function() {
+					let tmp = "Tiny Tiny RSS";
 
-		console.log("second stage ok");
-	},
-	genericSanityCheck: function() {
-		Cookie.set("ttrss_test", "TEST");
+					if (this.global_unread > 0) {
+						tmp = "(" + this.global_unread + ") " + tmp;
+					}
 
-		if (Cookie.get("ttrss_test") != "TEST") {
-			return fatalError(2);
-		}
+					document.title = tmp;
+				},
+				onViewModeChanged: function() {
+					ArticleCache.clear();
+					return Feeds.reloadCurrent('');
+				},
+				isCombinedMode: function() {
+					return App.getInitParam("combined_display_mode");
+				},
+				hotkeyHandler(event) {
+					if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;
+
+					const action_name = Utils.keyeventToAction(event);
+
+					if (action_name) {
+						const action_func = this.hotkey_actions[action_name];
+
+						if (action_func != null) {
+							action_func();
+							event.stopPropagation();
+							return false;
+						}
+					}
+				},
+				switchPanelMode: function(wide) {
+					if (App.isCombinedMode()) return;
 
-		return true;
-	},
-	updateTitle: function() {
-		let tmp = "Tiny Tiny RSS";
+					const article_id = Article.getActive();
 
-		if (this.global_unread > 0) {
-			tmp = "(" + this.global_unread + ") " + tmp;
-		}
+					if (wide) {
+						dijit.byId("headlines-wrap-inner").attr("design", 'sidebar');
+						dijit.byId("content-insert").attr("region", "trailing");
 
-		document.title = tmp;
-	},
-	onViewModeChanged: function() {
-		ArticleCache.clear();
-		return Feeds.reloadCurrent('');
-		},
-	isCombinedMode: function() {
-		return getInitParam("combined_display_mode");
-	},
-	hotkeyHandler(event) {
-		if (event.target.nodeName == "INPUT" || event.target.nodeName == "TEXTAREA") return;
-
-		const action_name = Utils.keyeventToAction(event);
-
-		if (action_name) {
-			const action_func = this.hotkey_actions[action_name];
-
-			if (action_func != null) {
-				action_func();
-				event.stopPropagation();
-				return false;
-			}
-		}
-	},
-	switchPanelMode: function(wide) {
-		if (App.isCombinedMode()) return;
+						dijit.byId("content-insert").domNode.setStyle({width: '50%',
+							height: 'auto',
+							borderTopWidth: '0px' });
 
-		const article_id = Article.getActive();
+						if (parseInt(Cookie.get("ttrss_ci_width")) > 0) {
+							dijit.byId("content-insert").domNode.setStyle(
+								{width: Cookie.get("ttrss_ci_width") + "px" });
+						}
 
-		if (wide) {
-			dijit.byId("headlines-wrap-inner").attr("design", 'sidebar');
-			dijit.byId("content-insert").attr("region", "trailing");
+						$("headlines-frame").setStyle({ borderBottomWidth: '0px' });
+						$("headlines-frame").addClassName("wide");
 
-			dijit.byId("content-insert").domNode.setStyle({width: '50%',
-				height: 'auto',
-				borderTopWidth: '0px' });
+					} else {
 
-			if (parseInt(Cookie.get("ttrss_ci_width")) > 0) {
-				dijit.byId("content-insert").domNode.setStyle(
-					{width: Cookie.get("ttrss_ci_width") + "px" });
-			}
+						dijit.byId("content-insert").attr("region", "bottom");
 
-			$("headlines-frame").setStyle({ borderBottomWidth: '0px' });
-			$("headlines-frame").addClassName("wide");
+						dijit.byId("content-insert").domNode.setStyle({width: 'auto',
+							height: '50%',
+							borderTopWidth: '0px'});
 
-		} else {
+						if (parseInt(Cookie.get("ttrss_ci_height")) > 0) {
+							dijit.byId("content-insert").domNode.setStyle(
+								{height: Cookie.get("ttrss_ci_height") + "px" });
+						}
 
-			dijit.byId("content-insert").attr("region", "bottom");
+						$("headlines-frame").setStyle({ borderBottomWidth: '1px' });
+						$("headlines-frame").removeClassName("wide");
 
-			dijit.byId("content-insert").domNode.setStyle({width: 'auto',
-				height: '50%',
-				borderTopWidth: '0px'});
+					}
 
-			if (parseInt(Cookie.get("ttrss_ci_height")) > 0) {
-				dijit.byId("content-insert").domNode.setStyle(
-					{height: Cookie.get("ttrss_ci_height") + "px" });
-			}
+					Article.close();
 
-			$("headlines-frame").setStyle({ borderBottomWidth: '1px' });
-			$("headlines-frame").removeClassName("wide");
+					if (article_id) Article.view(article_id);
 
-		}
+					xhrPost("backend.php", {op: "rpc", method: "setpanelmode", wide: wide ? 1 : 0});
+				},
+				initHotkeyActions: function() {
+					this.hotkey_actions["next_feed"] = function () {
+						const rv = dijit.byId("feedTree").getNextFeed(
+							Feeds.getActive(), Feeds.activeIsCat());
 
-		Article.close();
-
-		if (article_id) Article.view(article_id);
-
-		xhrPost("backend.php", {op: "rpc", method: "setpanelmode", wide: wide ? 1 : 0});
-	},
-	initHotkeyActions: function() {
-		this.hotkey_actions["next_feed"] = function () {
-			const rv = dijit.byId("feedTree").getNextFeed(
-				Feeds.getActive(), Feeds.activeIsCat());
-
-			if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true})
-		};
-		this.hotkey_actions["prev_feed"] = function () {
-			const rv = dijit.byId("feedTree").getPreviousFeed(
-				Feeds.getActive(), Feeds.activeIsCat());
-
-			if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true})
-		};
-		this.hotkey_actions["next_article"] = function () {
-			Headlines.move('next');
-		};
-		this.hotkey_actions["prev_article"] = function () {
-			Headlines.move('prev');
-		};
-		this.hotkey_actions["next_article_noscroll"] = function () {
-			Headlines.move('next', true);
-		};
-		this.hotkey_actions["prev_article_noscroll"] = function () {
-			Headlines.move('prev', true);
-		};
-		this.hotkey_actions["next_article_noexpand"] = function () {
-			Headlines.move('next', true, true);
-		};
-		this.hotkey_actions["prev_article_noexpand"] = function () {
-			Headlines.move('prev', true, true);
-		};
-		this.hotkey_actions["search_dialog"] = function () {
-			Feeds.search();
-		};
-		this.hotkey_actions["toggle_mark"] = function () {
-			Headlines.selectionToggleMarked();
-		};
-		this.hotkey_actions["toggle_publ"] = function () {
-			Headlines.selectionTogglePublished();
-		};
-		this.hotkey_actions["toggle_unread"] = function () {
-			Headlines.selectionToggleUnread({no_error: 1});
-		};
-		this.hotkey_actions["edit_tags"] = function () {
-			const id = Article.getActive();
-			if (id) {
-				Article.editTags(id);
-			}
-		};
-		this.hotkey_actions["open_in_new_window"] = function () {
-			if (Article.getActive()) {
-				Article.openInNewWindow(Article.getActive());
-			}
-		};
-		this.hotkey_actions["catchup_below"] = function () {
-			Headlines.catchupRelativeTo(1);
-		};
-		this.hotkey_actions["catchup_above"] = function () {
-			Headlines.catchupRelativeTo(0);
-		};
-		this.hotkey_actions["article_scroll_down"] = function () {
-			Article.scroll(40);
-		};
-		this.hotkey_actions["article_scroll_up"] = function () {
-			Article.scroll(-40);
-		};
-		this.hotkey_actions["close_article"] = function () {
-			if (App.isCombinedMode()) {
-				Article.cdmUnsetActive();
-			} else {
-				Article.close();
-			}
-		};
-		this.hotkey_actions["email_article"] = function () {
-			if (typeof emailArticle != "undefined") {
-				emailArticle();
-			} else if (typeof mailtoArticle != "undefined") {
-				mailtoArticle();
-			} else {
-				alert(__("Please enable mail plugin first."));
-			}
-		};
-		this.hotkey_actions["select_all"] = function () {
-			Headlines.select('all');
-		};
-		this.hotkey_actions["select_unread"] = function () {
-			Headlines.select('unread');
-		};
-		this.hotkey_actions["select_marked"] = function () {
-			Headlines.select('marked');
-		};
-		this.hotkey_actions["select_published"] = function () {
-			Headlines.select('published');
-		};
-		this.hotkey_actions["select_invert"] = function () {
-			Headlines.select('invert');
-		};
-		this.hotkey_actions["select_none"] = function () {
-			Headlines.select('none');
-		};
-		this.hotkey_actions["feed_refresh"] = function () {
-			if (Feeds.getActive() != undefined) {
-				Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()});
-			}
-		};
-		this.hotkey_actions["feed_unhide_read"] = function () {
-			Feeds.toggleUnread();
-		};
-		this.hotkey_actions["feed_subscribe"] = function () {
-			CommonDialogs.quickAddFeed();
-		};
-		this.hotkey_actions["feed_debug_update"] = function () {
-			if (!Feeds.activeIsCat() && parseInt(Feeds.getActive()) > 0) {
-				window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + Feeds.getActive() +
-					"&csrf_token=" + getInitParam("csrf_token"));
-			} else {
-				alert("You can't debug this kind of feed.");
-			}
-		};
-
-		this.hotkey_actions["feed_debug_viewfeed"] = function () {
-			Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), viewfeed_debug: true});
-		};
-
-		this.hotkey_actions["feed_edit"] = function () {
-			if (Feeds.activeIsCat())
-				alert(__("You can't edit this kind of feed."));
-			else
-				CommonDialogs.editFeed(Feeds.getActive());
-		};
-		this.hotkey_actions["feed_catchup"] = function () {
-			if (Feeds.getActive() != undefined) {
-				Feeds.catchupCurrent();
-			}
-		};
-		this.hotkey_actions["feed_reverse"] = function () {
-			Headlines.reverse();
-		};
-		this.hotkey_actions["feed_toggle_vgroup"] = function () {
-			xhrPost("backend.php", {op: "rpc", method: "togglepref", key: "VFEED_GROUP_BY_FEED"}, () => {
-				Feeds.reloadCurrent();
-			})
-		};
-		this.hotkey_actions["catchup_all"] = function () {
-			Feeds.catchupAll();
-		};
-		this.hotkey_actions["cat_toggle_collapse"] = function () {
-			if (Feeds.activeIsCat()) {
-				dijit.byId("feedTree").collapseCat(Feeds.getActive());
-			}
-		};
-		this.hotkey_actions["goto_all"] = function () {
-			Feeds.open({feed: -4});
-		};
-		this.hotkey_actions["goto_fresh"] = function () {
-			Feeds.open({feed: -3});
-		};
-		this.hotkey_actions["goto_marked"] = function () {
-			Feeds.open({feed: -1});
-		};
-		this.hotkey_actions["goto_published"] = function () {
-			Feeds.open({feed: -2});
-		};
-		this.hotkey_actions["goto_tagcloud"] = function () {
-			Utils.displayDlg(__("Tag cloud"), "printTagCloud");
-		};
-		this.hotkey_actions["goto_prefs"] = function () {
-			document.location.href = "prefs.php";
-		};
-		this.hotkey_actions["select_article_cursor"] = function () {
-			const id = Article.getUnderPointer();
-			if (id) {
-				const row = $("RROW-" + id);
-
-				if (row) {
-					const cb = dijit.getEnclosingWidget(
-						row.select(".rchk")[0]);
-
-					if (cb) {
-						if (!row.hasClassName("active"))
-							cb.attr("checked", !cb.attr("checked"));
-
-						Headlines.onRowChecked(cb);
-						return false;
-					}
-				}
-			}
-		};
-		this.hotkey_actions["create_label"] = function () {
-			CommonDialogs.addLabel();
-		};
-		this.hotkey_actions["create_filter"] = function () {
-			Filters.quickAddFilter();
-		};
-		this.hotkey_actions["collapse_sidebar"] = function () {
-			Feeds.reloadCurrent();
-		};
-		this.hotkey_actions["toggle_embed_original"] = function () {
-			if (typeof embedOriginalArticle != "undefined") {
-				if (Article.getActive())
-					embedOriginalArticle(Article.getActive());
-			} else {
-				alert(__("Please enable embed_original plugin first."));
-			}
-		};
-		this.hotkey_actions["toggle_widescreen"] = function () {
-			if (!App.isCombinedMode()) {
-				App._widescreen_mode = !App._widescreen_mode;
-
-				// reset stored sizes because geometry changed
-				Cookie.set("ttrss_ci_width", 0);
-				Cookie.set("ttrss_ci_height", 0);
-
-				App.switchPanelMode(App._widescreen_mode);
-			} else {
-				alert(__("Widescreen is not available in combined mode."));
-			}
-		};
-		this.hotkey_actions["help_dialog"] = function () {
-			Utils.helpDialog("main");
-		};
-		this.hotkey_actions["toggle_combined_mode"] = function () {
-			Notify.progress("Loading, please wait...");
-
-			const value = App.isCombinedMode() ? "false" : "true";
-
-			xhrPost("backend.php", {op: "rpc", method: "setpref", key: "COMBINED_DISPLAY_MODE", value: value}, () => {
-				setInitParam("combined_display_mode",
-					!getInitParam("combined_display_mode"));
-
-				Article.close();
-				Feeds.reloadCurrent();
-			})
-		};
-		this.hotkey_actions["toggle_cdm_expanded"] = function () {
-			Notify.progress("Loading, please wait...");
-
-			const value = getInitParam("cdm_expanded") ? "false" : "true";
-
-			xhrPost("backend.php", {op: "rpc", method: "setpref", key: "CDM_EXPANDED", value: value}, () => {
-				setInitParam("cdm_expanded", !getInitParam("cdm_expanded"));
-				Feeds.reloadCurrent();
-			});
-		};
-	},
-	onActionSelected: function(opid) {
-		switch (opid) {
-			case "qmcPrefs":
-				document.location.href = "prefs.php";
-				break;
-			case "qmcLogout":
-				document.location.href = "backend.php?op=logout";
-				break;
-			case "qmcTagCloud":
-				Utils.displayDlg(__("Tag cloud"), "printTagCloud");
-				break;
-			case "qmcSearch":
-				Feeds.search();
-				break;
-			case "qmcAddFeed":
-				CommonDialogs.quickAddFeed();
-				break;
-			case "qmcDigest":
-				window.location.href = "backend.php?op=digest";
-				break;
-			case "qmcEditFeed":
-				if (Feeds.activeIsCat())
-					alert(__("You can't edit this kind of feed."));
-				else
-					CommonDialogs.editFeed(Feeds.getActive());
-				break;
-			case "qmcRemoveFeed":
-				const actid = Feeds.getActive();
-
-				if (!actid) {
-					alert(__("Please select some feed first."));
-					return;
-				}
+						if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true})
+					};
+					this.hotkey_actions["prev_feed"] = function () {
+						const rv = dijit.byId("feedTree").getPreviousFeed(
+							Feeds.getActive(), Feeds.activeIsCat());
 
-				if (Feeds.activeIsCat()) {
-					alert(__("You can't unsubscribe from the category."));
-					return;
-				}
+						if (rv) Feeds.open({feed: rv[0], is_cat: rv[1], delayed: true})
+					};
+					this.hotkey_actions["next_article"] = function () {
+						Headlines.move('next');
+					};
+					this.hotkey_actions["prev_article"] = function () {
+						Headlines.move('prev');
+					};
+					this.hotkey_actions["next_article_noscroll"] = function () {
+						Headlines.move('next', true);
+					};
+					this.hotkey_actions["prev_article_noscroll"] = function () {
+						Headlines.move('prev', true);
+					};
+					this.hotkey_actions["next_article_noexpand"] = function () {
+						Headlines.move('next', true, true);
+					};
+					this.hotkey_actions["prev_article_noexpand"] = function () {
+						Headlines.move('prev', true, true);
+					};
+					this.hotkey_actions["search_dialog"] = function () {
+						Feeds.search();
+					};
+					this.hotkey_actions["toggle_mark"] = function () {
+						Headlines.selectionToggleMarked();
+					};
+					this.hotkey_actions["toggle_publ"] = function () {
+						Headlines.selectionTogglePublished();
+					};
+					this.hotkey_actions["toggle_unread"] = function () {
+						Headlines.selectionToggleUnread({no_error: 1});
+					};
+					this.hotkey_actions["edit_tags"] = function () {
+						const id = Article.getActive();
+						if (id) {
+							Article.editTags(id);
+						}
+					};
+					this.hotkey_actions["open_in_new_window"] = function () {
+						if (Article.getActive()) {
+							Article.openInNewWindow(Article.getActive());
+						}
+					};
+					this.hotkey_actions["catchup_below"] = function () {
+						Headlines.catchupRelativeTo(1);
+					};
+					this.hotkey_actions["catchup_above"] = function () {
+						Headlines.catchupRelativeTo(0);
+					};
+					this.hotkey_actions["article_scroll_down"] = function () {
+						Article.scroll(40);
+					};
+					this.hotkey_actions["article_scroll_up"] = function () {
+						Article.scroll(-40);
+					};
+					this.hotkey_actions["close_article"] = function () {
+						if (App.isCombinedMode()) {
+							Article.cdmUnsetActive();
+						} else {
+							Article.close();
+						}
+					};
+					this.hotkey_actions["email_article"] = function () {
+						if (typeof emailArticle != "undefined") {
+							emailArticle();
+						} else if (typeof mailtoArticle != "undefined") {
+							mailtoArticle();
+						} else {
+							alert(__("Please enable mail plugin first."));
+						}
+					};
+					this.hotkey_actions["select_all"] = function () {
+						Headlines.select('all');
+					};
+					this.hotkey_actions["select_unread"] = function () {
+						Headlines.select('unread');
+					};
+					this.hotkey_actions["select_marked"] = function () {
+						Headlines.select('marked');
+					};
+					this.hotkey_actions["select_published"] = function () {
+						Headlines.select('published');
+					};
+					this.hotkey_actions["select_invert"] = function () {
+						Headlines.select('invert');
+					};
+					this.hotkey_actions["select_none"] = function () {
+						Headlines.select('none');
+					};
+					this.hotkey_actions["feed_refresh"] = function () {
+						if (Feeds.getActive() != undefined) {
+							Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()});
+						}
+					};
+					this.hotkey_actions["feed_unhide_read"] = function () {
+						Feeds.toggleUnread();
+					};
+					this.hotkey_actions["feed_subscribe"] = function () {
+						CommonDialogs.quickAddFeed();
+					};
+					this.hotkey_actions["feed_debug_update"] = function () {
+						if (!Feeds.activeIsCat() && parseInt(Feeds.getActive()) > 0) {
+							window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + Feeds.getActive() +
+								"&csrf_token=" + App.getInitParam("csrf_token"));
+						} else {
+							alert("You can't debug this kind of feed.");
+						}
+					};
 
-				const fn = Feeds.getName(actid);
+					this.hotkey_actions["feed_debug_viewfeed"] = function () {
+						Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), viewfeed_debug: true});
+					};
 
-				if (confirm(__("Unsubscribe from %s?").replace("%s", fn))) {
-					CommonDialogs.unsubscribeFeed(actid);
-				}
-				break;
-			case "qmcCatchupAll":
-				Feeds.catchupAll();
-				break;
-			case "qmcShowOnlyUnread":
-				Feeds.toggleUnread();
-				break;
-			case "qmcToggleWidescreen":
-				if (!App.isCombinedMode()) {
-					App._widescreen_mode = !App._widescreen_mode;
-
-					// reset stored sizes because geometry changed
-					Cookie.set("ttrss_ci_width", 0);
-					Cookie.set("ttrss_ci_height", 0);
-
-					App.switchPanelMode(App._widescreen_mode);
-				} else {
-					alert(__("Widescreen is not available in combined mode."));
+					this.hotkey_actions["feed_edit"] = function () {
+						if (Feeds.activeIsCat())
+							alert(__("You can't edit this kind of feed."));
+						else
+							CommonDialogs.editFeed(Feeds.getActive());
+					};
+					this.hotkey_actions["feed_catchup"] = function () {
+						if (Feeds.getActive() != undefined) {
+							Feeds.catchupCurrent();
+						}
+					};
+					this.hotkey_actions["feed_reverse"] = function () {
+						Headlines.reverse();
+					};
+					this.hotkey_actions["feed_toggle_vgroup"] = function () {
+						xhrPost("backend.php", {op: "rpc", method: "togglepref", key: "VFEED_GROUP_BY_FEED"}, () => {
+							Feeds.reloadCurrent();
+						})
+					};
+					this.hotkey_actions["catchup_all"] = function () {
+						Feeds.catchupAll();
+					};
+					this.hotkey_actions["cat_toggle_collapse"] = function () {
+						if (Feeds.activeIsCat()) {
+							dijit.byId("feedTree").collapseCat(Feeds.getActive());
+						}
+					};
+					this.hotkey_actions["goto_all"] = function () {
+						Feeds.open({feed: -4});
+					};
+					this.hotkey_actions["goto_fresh"] = function () {
+						Feeds.open({feed: -3});
+					};
+					this.hotkey_actions["goto_marked"] = function () {
+						Feeds.open({feed: -1});
+					};
+					this.hotkey_actions["goto_published"] = function () {
+						Feeds.open({feed: -2});
+					};
+					this.hotkey_actions["goto_tagcloud"] = function () {
+						Utils.displayDlg(__("Tag cloud"), "printTagCloud");
+					};
+					this.hotkey_actions["goto_prefs"] = function () {
+						document.location.href = "prefs.php";
+					};
+					this.hotkey_actions["select_article_cursor"] = function () {
+						const id = Article.getUnderPointer();
+						if (id) {
+							const row = $("RROW-" + id);
+
+							if (row) {
+								const cb = dijit.getEnclosingWidget(
+									row.select(".rchk")[0]);
+
+								if (cb) {
+									if (!row.hasClassName("active"))
+										cb.attr("checked", !cb.attr("checked"));
+
+									Headlines.onRowChecked(cb);
+									return false;
+								}
+							}
+						}
+					};
+					this.hotkey_actions["create_label"] = function () {
+						CommonDialogs.addLabel();
+					};
+					this.hotkey_actions["create_filter"] = function () {
+						Filters.quickAddFilter();
+					};
+					this.hotkey_actions["collapse_sidebar"] = function () {
+						Feeds.reloadCurrent();
+					};
+					this.hotkey_actions["toggle_embed_original"] = function () {
+						if (typeof embedOriginalArticle != "undefined") {
+							if (Article.getActive())
+								embedOriginalArticle(Article.getActive());
+						} else {
+							alert(__("Please enable embed_original plugin first."));
+						}
+					};
+					this.hotkey_actions["toggle_widescreen"] = function () {
+						if (!App.isCombinedMode()) {
+							App._widescreen_mode = !App._widescreen_mode;
+
+							// reset stored sizes because geometry changed
+							Cookie.set("ttrss_ci_width", 0);
+							Cookie.set("ttrss_ci_height", 0);
+
+							App.switchPanelMode(App._widescreen_mode);
+						} else {
+							alert(__("Widescreen is not available in combined mode."));
+						}
+					};
+					this.hotkey_actions["help_dialog"] = function () {
+						Utils.helpDialog("main");
+					};
+					this.hotkey_actions["toggle_combined_mode"] = function () {
+						Notify.progress("Loading, please wait...");
+
+						const value = App.isCombinedMode() ? "false" : "true";
+
+						xhrPost("backend.php", {op: "rpc", method: "setpref", key: "COMBINED_DISPLAY_MODE", value: value}, () => {
+							App.setInitParam("combined_display_mode",
+								!App.getInitParam("combined_display_mode"));
+
+							Article.close();
+							Feeds.reloadCurrent();
+						})
+					};
+					this.hotkey_actions["toggle_cdm_expanded"] = function () {
+						Notify.progress("Loading, please wait...");
+
+						const value = App.getInitParam("cdm_expanded") ? "false" : "true";
+
+						xhrPost("backend.php", {op: "rpc", method: "setpref", key: "CDM_EXPANDED", value: value}, () => {
+							App.setInitParam("cdm_expanded", !App.getInitParam("cdm_expanded"));
+							Feeds.reloadCurrent();
+						});
+					};
+				},
+				onActionSelected: function(opid) {
+					switch (opid) {
+						case "qmcPrefs":
+							document.location.href = "prefs.php";
+							break;
+						case "qmcLogout":
+							document.location.href = "backend.php?op=logout";
+							break;
+						case "qmcTagCloud":
+							Utils.displayDlg(__("Tag cloud"), "printTagCloud");
+							break;
+						case "qmcSearch":
+							Feeds.search();
+							break;
+						case "qmcAddFeed":
+							CommonDialogs.quickAddFeed();
+							break;
+						case "qmcDigest":
+							window.location.href = "backend.php?op=digest";
+							break;
+						case "qmcEditFeed":
+							if (Feeds.activeIsCat())
+								alert(__("You can't edit this kind of feed."));
+							else
+								CommonDialogs.editFeed(Feeds.getActive());
+							break;
+						case "qmcRemoveFeed":
+							const actid = Feeds.getActive();
+
+							if (!actid) {
+								alert(__("Please select some feed first."));
+								return;
+							}
+
+							if (Feeds.activeIsCat()) {
+								alert(__("You can't unsubscribe from the category."));
+								return;
+							}
+
+							const fn = Feeds.getName(actid);
+
+							if (confirm(__("Unsubscribe from %s?").replace("%s", fn))) {
+								CommonDialogs.unsubscribeFeed(actid);
+							}
+							break;
+						case "qmcCatchupAll":
+							Feeds.catchupAll();
+							break;
+						case "qmcShowOnlyUnread":
+							Feeds.toggleUnread();
+							break;
+						case "qmcToggleWidescreen":
+							if (!App.isCombinedMode()) {
+								App._widescreen_mode = !App._widescreen_mode;
+
+								// reset stored sizes because geometry changed
+								Cookie.set("ttrss_ci_width", 0);
+								Cookie.set("ttrss_ci_height", 0);
+
+								App.switchPanelMode(App._widescreen_mode);
+							} else {
+								alert(__("Widescreen is not available in combined mode."));
+							}
+							break;
+						case "qmcHKhelp":
+							Utils.helpDialog("main");
+							break;
+						default:
+							console.log("quickMenuGo: unknown action: " + opid);
+					}
+				},
+				isPrefs: function() {
+					return false;
 				}
-				break;
-			case "qmcHKhelp":
-				Utils.helpDialog("main");
-				break;
-			default:
-				console.log("quickMenuGo: unknown action: " + opid);
+			});
+
+			App = new _App();
+		} catch (e) {
+			exception_error(e);
 		}
-	},
-	isPrefs: function() {
-		return false;
-	}
-};
+	});
+});
 
 function hash_get(key) {
 	const kv = window.location.hash.substring(1).toQueryParams();
diff --git a/prefs.php b/prefs.php
index 93773103f..a3d7c8b1b 100644
--- a/prefs.php
+++ b/prefs.php
@@ -100,13 +100,6 @@
 	</script>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-	<script type="text/javascript">
-		Event.observe(window, 'load', function() {
-			App.init();
-		});
-	</script>
-
 </head>
 
 <body class="claro ttrss_main ttrss_prefs">
-- 
cgit v1.2.3-54-g00ecf


From 71fc6d45bd761a9d2715faa68f2b8c0271ee7169 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 3 Dec 2018 13:38:13 +0300
Subject: refactor error reporting to AppBase; keep exception_error() for now
 as a shim

---
 include/login_form.php                 | 41 +++++-----------
 js/AppBase.js                          | 70 +++++++++++++++++++++++++--
 js/Article.js                          |  4 +-
 js/CommonDialogs.js                    |  2 +-
 js/CommonFilters.js                    |  6 +--
 js/FeedTree.js                         |  4 +-
 js/Feeds.js                            |  6 +--
 js/common.js                           | 75 ++++-------------------------
 js/prefs.js                            |  8 +---
 js/tt-rss.js                           |  8 +---
 plugins/embed_original/init.js         | 86 ++++++++++++++++------------------
 plugins/import_export/import_export.js |  6 +--
 plugins/mail/mail.js                   | 83 +++++++++++++++-----------------
 plugins/mailto/init.js                 | 37 +++++++--------
 plugins/nsfw/init.js                   | 11 ++---
 plugins/shorten_expanded/init.js       | 22 +++------
 register.php                           |  6 +--
 17 files changed, 215 insertions(+), 260 deletions(-)

(limited to 'js/common.js')

diff --git a/include/login_form.php b/include/login_form.php
index 1eb5d26d4..cdf70803b 100644
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -42,41 +42,26 @@ require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox',
 });
 
 function fetchProfiles() {
-	try {
-		var query = "op=getProfiles&login=" + encodeURIComponent(document.forms["loginForm"].login.value);
-
-		if (query) {
-			new Ajax.Request("public.php",	{
-				parameters: query,
-				onComplete: function(transport) {
-					if (transport.responseText.match("select")) {
-						$('profile_box').innerHTML = transport.responseText;
-						//dojo.parser.parse('profile_box');
-					}
-			} });
-		}
-
-	} catch (e) {
-		exception_error("fetchProfiles", e);
-	}
+    const query = "op=getProfiles&login=" + encodeURIComponent(document.forms["loginForm"].login.value);
+
+    new Ajax.Request("public.php",	{
+        parameters: query,
+        onComplete: function(transport) {
+            if (transport.responseText.match("select")) {
+                $('profile_box').innerHTML = transport.responseText;
+                //dojo.parser.parse('profile_box');
+            }
+    } });
 }
 
-
 function gotoRegForm() {
 	window.location.href = "register.php";
 	return false;
 }
 
 function bwLimitChange(elem) {
-	try {
-		var limit_set = elem.checked;
-
-		setCookie("ttrss_bwlimit", limit_set,
-			<?php print SESSION_COOKIE_LIFETIME ?>);
-
-	} catch (e) {
-		exception_error("bwLimitChange", e);
-	}
+    Cookie.set("ttrss_bwlimit", elem.checked,
+        <?php print SESSION_COOKIE_LIFETIME ?>);
 }
 </script>
 
@@ -139,7 +124,7 @@ function bwLimitChange(elem) {
 		</div>
 
 		<div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below" style="display:none">
-<?php echo __("Does not display images in articles, reduces automatic refreshes."); ?>
+        <?php echo __("Does not display images in articles, reduces automatic refreshes."); ?>
 		</div>
 
 		<?php if (SESSION_COOKIE_LIFETIME > 0) { ?>
diff --git a/js/AppBase.js b/js/AppBase.js
index ce040e8c9..9ab2f507e 100644
--- a/js/AppBase.js
+++ b/js/AppBase.js
@@ -7,15 +7,15 @@ define(["dojo/_base/declare"], function (declare) {
 		hotkey_prefix: 0,
 		hotkey_prefix_pressed: false,
 		hotkey_prefix_timeout: 0,
+		constructor: function() {
+			window.onerror = this.Error.onWindowError;
+		},
 		getInitParam: function(k) {
 			return this._initParams[k];
 		},
 		setInitParam: function(k, v) {
 			this._initParams[k] = v;
 		},
-		constructor: function(args) {
-			//
-		},
 		enableCsrfSupport: function() {
 			Ajax.Base.prototype.initialize = Ajax.Base.prototype.initialize.wrap(
 				function (callOriginal, options) {
@@ -176,7 +176,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 					if (callback) callback(transport);
 				} catch (e) {
-					exception_error(e);
+					this.Error.report(e);
 				}
 			});
 
@@ -355,5 +355,67 @@ define(["dojo/_base/declare"], function (declare) {
 		explainError: function(code) {
 			return this.displayDlg(__("Error explained"), "explainError", code);
 		},
+		Error: {
+			report: function(error, params) {
+				params = params || {};
+
+				if (!error) return;
+
+				console.error("[Error.report]", error, params);
+
+				const message = params.message ? params.message : error.toString();
+
+				try {
+					xhrPost("backend.php",
+						{op: "rpc", method: "log",
+							file: params.filename ? params.filename : error.fileName,
+							line: params.lineno ? params.lineno : error.lineNumber,
+							msg: message,
+							context: error.stack},
+						(transport) => {
+							console.warn("[Error.report] log response", transport.responseText);
+						});
+				} catch (re) {
+					console.error("[Error.report] exception while saving logging error on server", re);
+				}
+
+				try {
+					if (dijit.byId("exceptionDlg"))
+						dijit.byId("exceptionDlg").destroyRecursive();
+
+					let content = "<div class='fatalError'><p>" + message + "</p>";
+
+					if (error.stack)
+						content += "<div><b>Stack trace:</b></div>" +
+							"<textarea name=\"stack\" readonly=\"1\">" + error.stack + "</textarea>";
+
+					content += "<div style='text-align : center'>";
+
+					content += "<button dojoType=\"dijit.form.Button\" " +
+						"onclick=\"dijit.byId('exceptionDlg').hide()\">" +
+						__('Close this window') + "</button>";
+					content += "</div>";
+
+					const dialog = new dijit.Dialog({
+						id: "exceptionDlg",
+						title: "Unhandled exception",
+						style: "width: 600px",
+						content: content
+					});
+
+					dialog.show();
+				} catch (de) {
+					console.error("[Error.report] exception while showing error dialog", de);
+
+					alert(error.stack ? error.stack : message);
+				}
+
+			},
+			onWindowError: function (message, filename, lineno, colno, error) {
+				// called without context (this) from window.onerror
+				App.Error.report(error,
+					{message: message, filename: filename, lineno: lineno, colno: colno});
+			},
+		}
 	});
 });
diff --git a/js/Article.js b/js/Article.js
index d3ae8eed7..04cba8ab7 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -168,7 +168,7 @@ define(["dojo/_base/declare"], function (declare) {
 						Notify.close();
 
 					} catch (e) {
-						exception_error(e);
+						App.Error.report(e);
 					}
 				})
 			}
@@ -206,7 +206,7 @@ define(["dojo/_base/declare"], function (declare) {
 									if (tooltip) tooltip.attr('label', data.content_full);
 								}
 							} catch (e) {
-								exception_error(e);
+								App.Error.report(e);
 							}
 						});
 					}
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index b9cee8873..81ad2ffce 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -152,7 +152,7 @@ define(["dojo/_base/declare"], function (declare) {
 
 							} catch (e) {
 								console.error(transport.responseText);
-								exception_error(e);
+								App.Error.report(e);
 							}
 						});
 					}
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index d2a3e6317..97a676c98 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -67,7 +67,7 @@ define(["dojo/_base/declare"], function (declare) {
 						parentNode.appendChild(li);
 					}
 				} catch (e) {
-					exception_error(e);
+					App.Error.report(e);
 				}
 			});
 		},
@@ -117,7 +117,7 @@ define(["dojo/_base/declare"], function (declare) {
 					}
 
 				} catch (e) {
-					exception_error(e);
+					App.Error.report(e);
 				}
 			});
 		},
@@ -238,7 +238,7 @@ define(["dojo/_base/declare"], function (declare) {
 								console.log("getTestResults: dialog closed, bailing out.");
 							}
 						} catch (e) {
-							exception_error(e);
+							App.Error.report(e);
 						}
 
 					});
diff --git a/js/FeedTree.js b/js/FeedTree.js
index 37e3de2d1..75d1c901b 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -207,7 +207,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 					}
 				}
 			} catch (e) {
-				exception_error(e);
+				App.Error.report(e);
 			}
 		},
 		findNodeParentsAndExpandThem: function(feed, is_cat, root, parents) {
@@ -242,7 +242,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 							this.expandParentNodes(feed, is_cat, parents.slice(0));
 						}
 			} catch (e) {
-				exception_error(e);
+				App.Error.report(e);
 			}
 		},
 		selectFeed: function(feed, is_cat) {
diff --git a/js/Feeds.js b/js/Feeds.js
index eb9a468ad..fbcb56150 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -198,13 +198,13 @@ define(["dojo/_base/declare"], function (declare) {
 						Feeds.init();
 						App.setLoadingProgress(25);
 					} catch (e) {
-						exception_error(e);
+						App.Error.report(e);
 					}
 				});
 
 				tree.startup();
 			} catch (e) {
-				exception_error(e);
+				App.Error.report(e);
 			}
 		},
 		init: function() {
@@ -380,7 +380,7 @@ define(["dojo/_base/declare"], function (declare) {
 							Headlines.onLoaded(transport, offset);
 							PluginHost.run(PluginHost.HOOK_FEED_LOADED, [feed, is_cat]);
 						} catch (e) {
-							exception_error(e);
+							App.Error.report(e);
 						}
 					});
 				});
diff --git a/js/common.js b/js/common.js
index de6d13a78..427e3034c 100755
--- a/js/common.js
+++ b/js/common.js
@@ -4,6 +4,16 @@
 let _label_base_index = -1024;
 let loading_progress = 0;
 
+/* error reporting shim */
+
+// TODO: deprecated; remove
+function exception_error(e, e_compat, filename, lineno, colno) {
+	if (typeof e == "string")
+		e = e_compat;
+
+	App.Error.report(e, {filename: filename, lineno: lineno, colno: colno});
+}
+
 /* xhr shorthand helpers */
 
 function xhrPost(url, params, complete) {
@@ -118,71 +128,6 @@ const Cookie = {
 	}
 };
 
-/* error reporting */
-
-function report_error(message, filename, lineno, colno, error) {
-	exception_error(error, null, filename, lineno);
-}
-
-function exception_error(e, e_compat, filename, lineno, colno) {
-	if (typeof e == "string") e = e_compat;
-
-	if (!e) return; // no exception object, nothing to report.
-
-	try {
-		console.error(e);
-		const msg = e.toString();
-
-		try {
-			xhrPost("backend.php",
-				{op: "rpc", method: "log",
-					file: e.fileName ? e.fileName : filename,
-					line: e.lineNumber ? e.lineNumber : lineno,
-					msg: msg, context: e.stack},
-				(transport) => {
-					console.warn(transport.responseText);
-				});
-
-		} catch (e) {
-			console.error("Exception while trying to log the error.", e);
-		}
-
-		let content = "<div class='fatalError'><p>" + msg + "</p>";
-
-		if (e.stack) {
-			content += "<div><b>Stack trace:</b></div>" +
-				"<textarea name=\"stack\" readonly=\"1\">" + e.stack + "</textarea>";
-		}
-
-		content += "</div>";
-
-		content += "<div class='dlgButtons'>";
-
-		content += "<button dojoType=\"dijit.form.Button\" "+
-				"onclick=\"dijit.byId('exceptionDlg').hide()\">" +
-				__('Close') + "</button>";
-		content += "</div>";
-
-		if (dijit.byId("exceptionDlg"))
-			dijit.byId("exceptionDlg").destroyRecursive();
-
-		const dialog = new dijit.Dialog({
-			id: "exceptionDlg",
-			title: "Unhandled exception",
-			style: "width: 600px",
-			content: content});
-
-		dialog.show();
-
-	} catch (ei) {
-		console.error("Exception while trying to report an exception:", ei);
-		console.error("Original exception:", e);
-
-		alert("Exception occured while trying to report an exception.\n" +
-			ei.stack + "\n\nOriginal exception:\n" + e.stack);
-	}
-}
-
 /* runtime notifications */
 
 const Notify = {
diff --git a/js/prefs.js b/js/prefs.js
index dafdbcdee..c89c0494f 100755
--- a/js/prefs.js
+++ b/js/prefs.js
@@ -58,10 +58,6 @@ require(["dojo/_base/kernel",
 		try {
 			const _App = declare("fox.App", AppBase, {
 				constructor: function() {
-					window.onerror = function (message, filename, lineno, colno, error) {
-						report_error(message, filename, lineno, colno, error);
-					};
-
 					parser.parse();
 
 					this.setLoadingProgress(50);
@@ -73,7 +69,7 @@ require(["dojo/_base/kernel",
 						try {
 							this.backendSanityCallback(transport);
 						} catch (e) {
-							exception_error(e);
+							this.Error.report(e);
 						}
 					});
 				},
@@ -149,7 +145,7 @@ require(["dojo/_base/kernel",
 			App = new _App();
 
 		} catch (e) {
-			exception_error(e);
+			this.Error.report(e);
 		}
 	});
 });
\ No newline at end of file
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 97d34fbc1..8931e9860 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -65,10 +65,6 @@ require(["dojo/_base/kernel",
 				_widescreen_mode: false,
 				hotkey_actions: {},
 				constructor: function () {
-					window.onerror = function (message, filename, lineno, colno, error) {
-						report_error(message, filename, lineno, colno, error);
-					};
-
 					parser.parse();
 
 					this.setLoadingProgress(30);
@@ -91,7 +87,7 @@ require(["dojo/_base/kernel",
 						try {
 							App.backendSanityCallback(transport);
 						} catch (e) {
-							exception_error(e);
+							App.Error.report(e);
 						}
 					});
 				},
@@ -555,7 +551,7 @@ require(["dojo/_base/kernel",
 
 			App = new _App();
 		} catch (e) {
-			exception_error(e);
+			App.Error.report(e);
 		}
 	});
 });
diff --git a/plugins/embed_original/init.js b/plugins/embed_original/init.js
index 6f797556b..1e9fcb253 100644
--- a/plugins/embed_original/init.js
+++ b/plugins/embed_original/init.js
@@ -1,60 +1,56 @@
 function embedOriginalArticle(id) {
-	try {
-		const hasSandbox = "sandbox" in document.createElement("iframe");
+	const hasSandbox = "sandbox" in document.createElement("iframe");
 
-		if (!hasSandbox) {
-			alert(__("Sorry, your browser does not support sandboxed iframes."));
-			return;
-		}
+	if (!hasSandbox) {
+		alert(__("Sorry, your browser does not support sandboxed iframes."));
+		return;
+	}
 
-		let c = false;
+	let c = false;
+
+	if (App.isCombinedMode()) {
+		c = $$("div#RROW-" + id + " div[class=content-inner]")[0];
+	} else if (id == Article.getActive()) {
+		c = $$(".post .content")[0];
+	}
+
+	if (c) {
+		const iframe = c.parentNode.getElementsByClassName("embeddedContent")[0];
+
+		if (iframe) {
+			Element.show(c);
+			c.parentNode.removeChild(iframe);
+
+			if (App.isCombinedMode()) {
+				Article.cdmScrollToId(id, true);
+			}
 
-		if (App.isCombinedMode()) {
-			c = $$("div#RROW-" + id + " div[class=content-inner]")[0];
-		} else if (id == Article.getActive()) {
-			c = $$(".post .content")[0];
+			return;
 		}
+	}
 
-		if (c) {
-			const iframe = c.parentNode.getElementsByClassName("embeddedContent")[0];
+	const query = { op: "pluginhandler", plugin: "embed_original", method: "getUrl", id: id };
 
-			if (iframe) {
-				Element.show(c);
-				c.parentNode.removeChild(iframe);
+	xhrJson("backend.php", query, (reply) => {
+		if (reply) {
+			const iframe = new Element("iframe", {
+				class: "embeddedContent",
+				src: reply.url,
+				width: (c.parentNode.offsetWidth - 5) + 'px',
+				height: (c.parentNode.parentNode.offsetHeight - c.parentNode.firstChild.offsetHeight - 5) + 'px',
+				style: "overflow: auto; border: none; min-height: " + (document.body.clientHeight / 2) + "px;",
+				sandbox: 'allow-scripts',
+			});
+
+			if (c) {
+				Element.hide(c);
+				c.parentNode.insertBefore(iframe, c);
 
 				if (App.isCombinedMode()) {
 					Article.cdmScrollToId(id, true);
 				}
-
-				return;
 			}
 		}
+	});
 
-		const query = { op: "pluginhandler", plugin: "embed_original", method: "getUrl", id: id };
-
-		xhrJson("backend.php", query, (reply) => {
-			if (reply) {
-				const iframe = new Element("iframe", {
-					class: "embeddedContent",
-					src: reply.url,
-					width: (c.parentNode.offsetWidth - 5) + 'px',
-					height: (c.parentNode.parentNode.offsetHeight - c.parentNode.firstChild.offsetHeight - 5) + 'px',
-					style: "overflow: auto; border: none; min-height: " + (document.body.clientHeight / 2) + "px;",
-					sandbox: 'allow-scripts',
-				});
-
-				if (c) {
-					Element.hide(c);
-					c.parentNode.insertBefore(iframe, c);
-
-					if (App.isCombinedMode()) {
-						Article.cdmScrollToId(id, true);
-					}
-				}
-			}
-		});
-
-	} catch (e) {
-		exception_error("embedOriginalArticle", e);
-	}
 }
diff --git a/plugins/import_export/import_export.js b/plugins/import_export/import_export.js
index 56a2a5c3e..8dc5f7570 100644
--- a/plugins/import_export/import_export.js
+++ b/plugins/import_export/import_export.js
@@ -50,7 +50,7 @@ function exportData() {
 									"Error occured, could not export data.";
 							}
 						} catch (e) {
-							exception_error("exportData", e, transport.responseText);
+							App.Error.report(e);
 						}
 
 						Notify.close();
@@ -71,7 +71,7 @@ function exportData() {
 
 
 	} catch (e) {
-		exception_error("exportData", e);
+		App.Error.report(e);
 	}
 }
 
@@ -100,7 +100,7 @@ function dataImportComplete(iframe) {
 		dialog.show();
 
 	} catch (e) {
-		exception_error("dataImportComplete", e);
+		App.Error.report(e);
 	}
 }
 
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index b72289c2a..87e354b42 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -1,57 +1,52 @@
 function emailArticle(id) {
-	try {
-		if (!id) {
-			var ids = Headlines.getSelected();
+	if (!id) {
+		let ids = Headlines.getSelected();
 
-			if (ids.length == 0) {
-				alert(__("No articles selected."));
-				return;
-			}
-
-			id = ids.toString();
+		if (ids.length == 0) {
+			alert(__("No articles selected."));
+			return;
 		}
 
-		if (dijit.byId("emailArticleDlg"))
-			dijit.byId("emailArticleDlg").destroyRecursive();
-
-		var query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + encodeURIComponent(id);
-
-		dialog = new dijit.Dialog({
-			id: "emailArticleDlg",
-			title: __("Forward article by email"),
-			style: "width: 600px",
-			execute: function() {
-				if (this.validate()) {
-					xhrJson("backend.php", this.attr('value'), (reply) => {
-						if (reply) {
-							const error = reply['error'];
-
-							if (error) {
-								alert(__('Error sending email:') + ' ' + error);
-							} else {
-								Notify.info('Your message has been sent.');
-								dialog.hide();
-							}
+		id = ids.toString();
+	}
 
+	if (dijit.byId("emailArticleDlg"))
+		dijit.byId("emailArticleDlg").destroyRecursive();
+
+	const query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + encodeURIComponent(id);
+
+	const dialog = new dijit.Dialog({
+		id: "emailArticleDlg",
+		title: __("Forward article by email"),
+		style: "width: 600px",
+		execute: function() {
+			if (this.validate()) {
+				xhrJson("backend.php", this.attr('value'), (reply) => {
+					if (reply) {
+						const error = reply['error'];
+
+						if (error) {
+							alert(__('Error sending email:') + ' ' + error);
+						} else {
+							Notify.info('Your message has been sent.');
+							dialog.hide();
 						}
-					});
-				}
-			},
-			href: query});
 
-		/* var tmph = dojo.connect(dialog, 'onLoad', function() {
-	   	dojo.disconnect(tmph);
+					}
+				});
+			}
+		},
+		href: query});
 
-		   new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
-			   "backend.php?op=pluginhandler&plugin=mail&method=completeEmails",
-			   { tokens: '', paramName: "search" });
-		}); */
+	/* var tmph = dojo.connect(dialog, 'onLoad', function() {
+	dojo.disconnect(tmph);
 
-		dialog.show();
+	   new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
+		   "backend.php?op=pluginhandler&plugin=mail&method=completeEmails",
+		   { tokens: '', paramName: "search" });
+	}); */
 
-	} catch (e) {
-		exception_error("emailArticle", e);
-	}
+	dialog.show();
 }
 
 
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index dacff725e..92a90f8e9 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -1,32 +1,27 @@
 function mailtoArticle(id) {
-	try {
-		if (!id) {
-			const ids = Headlines.getSelected();
+	if (!id) {
+		const ids = Headlines.getSelected();
 
-			if (ids.length == 0) {
-				alert(__("No articles selected."));
-				return;
-			}
-
-			id = ids.toString();
+		if (ids.length == 0) {
+			alert(__("No articles selected."));
+			return;
 		}
 
-		if (dijit.byId("emailArticleDlg"))
-			dijit.byId("emailArticleDlg").destroyRecursive();
+		id = ids.toString();
+	}
 
-		const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + encodeURIComponent(id);
+	if (dijit.byId("emailArticleDlg"))
+		dijit.byId("emailArticleDlg").destroyRecursive();
 
-		dialog = new dijit.Dialog({
-			id: "emailArticleDlg",
-			title: __("Forward article by email"),
-			style: "width: 600px",
-			href: query});
+	const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + encodeURIComponent(id);
 
-		dialog.show();
+	const dialog = new dijit.Dialog({
+		id: "emailArticleDlg",
+		title: __("Forward article by email"),
+		style: "width: 600px",
+		href: query});
 
-	} catch (e) {
-		exception_error("emailArticle", e);
-	}
+	dialog.show();
 }
 
 
diff --git a/plugins/nsfw/init.js b/plugins/nsfw/init.js
index 40ad2b0ba..adb6d43c0 100644
--- a/plugins/nsfw/init.js
+++ b/plugins/nsfw/init.js
@@ -1,12 +1,7 @@
 function nsfwShow(elem) {
-	try {
-		content = elem.parentNode.getElementsBySelector("div.nswf.content")[0];
+	let content = elem.parentNode.getElementsBySelector("div.nswf.content")[0];
 
-		if (content) {
-			Element.toggle(content);
-		}
-
-	} catch (e) {
-		exception_error("nswfSHow", e);
+	if (content) {
+		Element.toggle(content);
 	}
 }
diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index d9995e8ac..a5424ea38 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -1,29 +1,20 @@
 var _shorten_expanded_threshold = 1.5; //window heights
 
 function expandSizeWrapper(id) {
-	try {
-		const row = $(id);
+	const row = $(id);
 
-		console.log(row);
+	if (row) {
+		const content = row.select(".contentSizeWrapper")[0];
+		const link = row.select(".expandPrompt")[0];
 
-		if (row) {
-			const content = row.select(".contentSizeWrapper")[0];
-			const link = row.select(".expandPrompt")[0];
-
-			if (content) content.removeClassName("contentSizeWrapper");
-			if (link) Element.hide(link);
-
-		}
-	} catch (e) {
-		exception_error("expandSizeWrapper", e);
+		if (content) content.removeClassName("contentSizeWrapper");
+		if (link) Element.hide(link);
 	}
 
 	return false;
-
 }
 
 require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
-
 	ready(function() {
 		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
 			window.setTimeout(function() {
@@ -48,5 +39,4 @@ require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 			return true;
 		});
 	});
-
 });
diff --git a/register.php b/register.php
index 6c76eed5a..1bd1b2544 100644
--- a/register.php
+++ b/register.php
@@ -135,13 +135,13 @@
 							f.sub_btn.disabled = true;
 						}
 					} catch (e) {
-						exception_error("checkUsername_callback", e);
+						App.Error.report(e);
 					}
 
 				} });
 
 		} catch (e) {
-			exception_error("checkUsername", e);
+			App.Error.report(e);
 		}
 
 		return false;
@@ -171,7 +171,7 @@
 			return true;
 
 		} catch (e) {
-			exception_error("validateRegForm", e);
+			alert(e.stack);
 			return false;
 		}
 	}
-- 
cgit v1.2.3-54-g00ecf