From 049a37aa0e7d37cafd979e7d470c7649700b5010 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Dec 2018 17:05:28 +0300
Subject: WIP reshuffling of JS global context into separate logical objects

---
 classes/pref/feeds.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 43570c740..23e9baee9 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1174,7 +1174,7 @@ class Pref_Feeds extends Handler_Protected {
 		print "<div style='float : right; padding-right : 4px;'>
 			<input dojoType=\"dijit.form.TextBox\" id=\"feed_search\" size=\"20\" type=\"search\"
 				value=\"$feed_search\">
-			<button dojoType=\"dijit.form.Button\" onclick=\"updateFeedList()\">".
+			<button dojoType=\"dijit.form.Button\" onclick=\"Feeds.reload()\">".
 				__('Search')."</button>
 			</div>";
 
@@ -1306,7 +1306,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print_warning("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.");
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Utils.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
 			__('Display published OPML URL')."</button> ";
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
@@ -1323,7 +1323,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<p>";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('".__("View as RSS")."','generatedFeed', '$rss_url')\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Utils.displayDlg('".__("View as RSS")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
 
 		print "<button class=\"warning\" dojoType=\"dijit.form.Button\" onclick=\"return clearFeedAccessKeys()\">".
-- 
cgit v1.2.3


From 4bed9be57d671324921bfd1d90d25b8cd0af3d4f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Dec 2018 18:25:32 +0300
Subject: js-ification: start on some common dialogs

---
 classes/pref/feeds.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 23e9baee9..c061243ee 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1149,7 +1149,7 @@ class Pref_Feeds extends Handler_Protected {
 		if ($num_errors > 0) {
 
 			$error_button = "<button dojoType=\"dijit.form.Button\"
-			  		onclick=\"showFeedsWithErrors()\" id=\"errorButton\">" .
+			  		onclick=\"CommonDialogs.showFeedsWithErrors()\" id=\"errorButton\">" .
 				__("Feeds with errors") . "</button>";
 		}
 
@@ -1190,7 +1190,7 @@ class Pref_Feeds extends Handler_Protected {
 		print "<div dojoType=\"dijit.form.DropDownButton\">".
 				"<span>" . __('Feeds')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"quickAddFeed()\"
+		print "<div onclick=\"CommonDialogs.quickAddFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
 		print "<div onclick=\"editSelectedFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Edit selected feeds')."</div>";
-- 
cgit v1.2.3


From 1e2d4410d320fcee644add76293f229741a163cb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 1 Dec 2018 22:39:29 +0300
Subject: move some more shared stuff to CommonDialogs, Filters, and Utils

---
 classes/pref/feeds.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index c061243ee..2184a0b42 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -765,7 +765,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<div class='dlgButtons'>
 			<div style=\"float : left\">
-			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
 				__('Unsubscribe')."</button>";
 
 			print "</div>";
@@ -1247,7 +1247,7 @@ class Pref_Feeds extends Handler_Protected {
 			var bare_id = id.substr(id.indexOf(':')+1);
 
 			if (id.match('FEED:')) {
-				editFeed(bare_id);
+				CommonDialogs.editFeed(bare_id);
 			} else if (id.match('CAT:')) {
 				editCat(bare_id, item);
 			}
@@ -1441,7 +1441,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<a class=\"visibleLink\" href=\"#\" ".
 				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"editFeed(".$line["id"].")\">".
+				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
 				htmlspecialchars($line["title"])."</a>";
 
 			print "</td><td class=\"insensitive\" align='right'>";
@@ -1506,7 +1506,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print "<a class=\"visibleLink\" href=\"#\" ".
 				"title=\"".__("Click to edit feed")."\" ".
-				"onclick=\"editFeed(".$line["id"].")\">".
+				"onclick=\"CommonDialogs.editFeed(".$line["id"].")\">".
 				htmlspecialchars($line["title"])."</a>: ";
 
 			print "<span class=\"insensitive\">";
-- 
cgit v1.2.3


From 0a18d0b1edb208e5811c419a1119d131b7041173 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 08:57:22 +0300
Subject: Feeds: shorten some method names finally rename "view as rss"

---
 classes/pref/feeds.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 2184a0b42..f47d24501 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1323,7 +1323,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<p>";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Utils.displayDlg('".__("View as RSS")."','generatedFeed', '$rss_url')\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Utils.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
 
 		print "<button class=\"warning\" dojoType=\"dijit.form.Button\" onclick=\"return clearFeedAccessKeys()\">".
-- 
cgit v1.2.3


From 874560db547f718b82d77657dc019d840c30e0ed Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 10:33:58 +0300
Subject: remove obsolete row selection functions move getUrlParam() to Utils

---
 classes/pref/feeds.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index f47d24501..efc76701e 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1435,7 +1435,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			# id needed for selectTableRows()
 			print "<td width='5%' align='center'><input
-				onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
+				onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\"
 				type=\"checkbox\" id=\"FUPDC-$feed_id\"></td>";
 			print "<td>";
 
@@ -1500,7 +1500,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			# id needed for selectTableRows()
 			print "<td width='5%' align='center'><input
-				onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
+				onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\"
 				type=\"checkbox\" id=\"FERDC-$feed_id\"></td>";
 			print "<td>";
 
-- 
cgit v1.2.3


From e23b6e397dbbbba90f9a15a6fe2d45eb862efdc5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 11:25:32 +0300
Subject: prefs: store active tab for reload, remove most old table row
 functions

---
 classes/pref/feeds.php | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index efc76701e..0a7fed7b2 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1412,9 +1412,9 @@ class Pref_Feeds extends Handler_Protected {
 		print "<div dojoType=\"dijit.form.DropDownButton\">".
 				"<span>" . __('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"selectTableRows('prefInactiveFeedList', 'all')\"
+		print "<div onclick=\"Tables.select('prefInactiveFeedList', true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-		print "<div onclick=\"selectTableRows('prefInactiveFeedList', 'none')\"
+		print "<div onclick=\"Tables.select('prefInactiveFeedList', false)\"
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
 		print "</div></div>";
 		print "</div>"; #toolbar
@@ -1428,15 +1428,12 @@ class Pref_Feeds extends Handler_Protected {
 		while ($line = $sth->fetch()) {
 
 			$feed_id = $line["id"];
-			$this_row_id = "id=\"FUPDD-$feed_id\"";
 
-			# class needed for selectTableRows()
-			print "<tr class=\"placeholder\" $this_row_id>";
+			print "<tr class=\"placeholder\" data-row-id='$feed_id'>";
 
-			# id needed for selectTableRows()
 			print "<td width='5%' align='center'><input
 				onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\"
-				type=\"checkbox\" id=\"FUPDC-$feed_id\"></td>";
+				type=\"checkbox\"></td>";
 			print "<td>";
 
 			print "<a class=\"visibleLink\" href=\"#\" ".
@@ -1477,9 +1474,9 @@ class Pref_Feeds extends Handler_Protected {
 		print "<div dojoType=\"dijit.form.DropDownButton\">".
 				"<span>" . __('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-		print "<div onclick=\"selectTableRows('prefErrorFeedList', 'all')\"
+		print "<div onclick=\"Tables.select('prefErrorFeedList', true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
-		print "<div onclick=\"selectTableRows('prefErrorFeedList', 'none')\"
+		print "<div onclick=\"Tables.select('prefErrorFeedList', false)\"
 			dojoType=\"dijit.MenuItem\">".__('None')."</div>";
 		print "</div></div>";
 		print "</div>"; #toolbar
@@ -1493,15 +1490,12 @@ class Pref_Feeds extends Handler_Protected {
 		while ($line = $sth->fetch()) {
 
 			$feed_id = $line["id"];
-			$this_row_id = "id=\"FERDD-$feed_id\"";
 
-			# class needed for selectTableRows()
-			print "<tr class=\"placeholder\" $this_row_id>";
+			print "<tr class=\"placeholder\" data-row-id='$feed_id'>";
 
-			# id needed for selectTableRows()
 			print "<td width='5%' align='center'><input
 				onclick='Tables.onRowChecked(this);' dojoType=\"dijit.form.CheckBox\"
-				type=\"checkbox\" id=\"FERDC-$feed_id\"></td>";
+				type=\"checkbox\"></td>";
 			print "<td>";
 
 			print "<a class=\"visibleLink\" href=\"#\" ".
-- 
cgit v1.2.3


From 60cd4676943169a057518634e3060745e9112511 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 11:50:53 +0300
Subject: embed some pref-feed helper functions into the tree

---
 classes/pref/feeds.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 0a7fed7b2..697daeab2 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1192,13 +1192,13 @@ class Pref_Feeds extends Handler_Protected {
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"CommonDialogs.quickAddFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
-		print "<div onclick=\"editSelectedFeed()\"
+		print "<div onclick=\"dijit.byId('feedTree').editSelectedFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Edit selected feeds')."</div>";
-		print "<div onclick=\"resetFeedOrder()\"
+		print "<div onclick=\"dijit.byId('feedTree').resetFeedOrder()\"
 			dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
-		print "<div onclick=\"batchSubscribe()\"
+		print "<div onclick=\"dijit.byId('feedTree').batchSubscribe()\"
 			dojoType=\"dijit.MenuItem\">".__('Batch subscribe')."</div>";
-		print "<div dojoType=\"dijit.MenuItem\" onclick=\"removeSelectedFeeds()\">"
+		print "<div dojoType=\"dijit.MenuItem\" onclick=\"dijit.byId('feedTree').removeSelectedFeeds()\">"
 			.__('Unsubscribe')."</div> ";
 		print "</div></div>";
 
@@ -1206,11 +1206,11 @@ class Pref_Feeds extends Handler_Protected {
 			print "<div dojoType=\"dijit.form.DropDownButton\">".
 					"<span>" . __('Categories')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-			print "<div onclick=\"createCategory()\"
+			print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
 				dojoType=\"dijit.MenuItem\">".__('Add category')."</div>";
-			print "<div onclick=\"resetCatOrder()\"
+			print "<div onclick=\"dijit.byId('feedTree').resetCatOrder()\"
 				dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
-			print "<div onclick=\"removeSelectedCategories()\"
+			print "<div onclick=\"dijit.byId('feedTree').removeSelectedCategories()\"
 				dojoType=\"dijit.MenuItem\">".__('Remove selected')."</div>";
 			print "</div></div>";
 
-- 
cgit v1.2.3


From f26d404890a55a34ed5779b6f36e949d38705e8d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 12:03:28 +0300
Subject: prefs: move other tree-related functions to respective trees

---
 classes/pref/feeds.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 697daeab2..f34ed33eb 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1255,7 +1255,7 @@ class Pref_Feeds extends Handler_Protected {
 		<script type=\"dojo/method\" event=\"onLoad\" args=\"item\">
 			Element.hide(\"feedlistLoading\");
 
-			checkInactiveFeeds();
+			dijit.byId('feedTree').checkInactiveFeeds();
 		</script>
 		</div>";
 
-- 
cgit v1.2.3


From 58e54282d36d54c2be0e50f78fbc500772a3b762 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 15:30:07 +0300
Subject: prefs: move more global functions into matching classes

---
 classes/pref/feeds.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index f34ed33eb..a39090767 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1156,7 +1156,7 @@ class Pref_Feeds extends Handler_Protected {
 		$inactive_button = "<button dojoType=\"dijit.form.Button\"
 				id=\"pref_feeds_inactive_btn\"
 				style=\"display : none\"
-				onclick=\"showInactiveFeeds()\">" .
+				onclick=\"dijit.byId('feedTree').showInactiveFeeds()\">" .
 				__("Inactive feeds") . "</button>";
 
 		$feed_search = clean($_REQUEST["search"]);
@@ -1249,7 +1249,7 @@ class Pref_Feeds extends Handler_Protected {
 			if (id.match('FEED:')) {
 				CommonDialogs.editFeed(bare_id);
 			} else if (id.match('CAT:')) {
-				editCat(bare_id, item);
+				dijit.byId('feedTree').editCategory(bare_id, item);
 			}
 		</script>
 		<script type=\"dojo/method\" event=\"onLoad\" args=\"item\">
-- 
cgit v1.2.3


From b9869dbc01f505e87def7463e032914cab49f26c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 16:17:36 +0300
Subject: prefs: remove some more stuff from global context (user management,
 etc)

---
 classes/pref/feeds.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index a39090767..3b949073c 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1174,7 +1174,7 @@ class Pref_Feeds extends Handler_Protected {
 		print "<div style='float : right; padding-right : 4px;'>
 			<input dojoType=\"dijit.form.TextBox\" id=\"feed_search\" size=\"20\" type=\"search\"
 				value=\"$feed_search\">
-			<button dojoType=\"dijit.form.Button\" onclick=\"Feeds.reload()\">".
+			<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedTree').reload()\">".
 				__('Search')."</button>
 			</div>";
 
@@ -1326,7 +1326,7 @@ class Pref_Feeds extends Handler_Protected {
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Utils.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
 
-		print "<button class=\"warning\" dojoType=\"dijit.form.Button\" onclick=\"return clearFeedAccessKeys()\">".
+		print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Prefs.clearFeedAccessKeys()\">".
 			__('Clear all generated URLs')."</button> ";
 
 		print "</p>";
-- 
cgit v1.2.3


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/pref/feeds.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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>";
 
-- 
cgit v1.2.3


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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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;
 	}
-- 
cgit v1.2.3


From 5ead558e435dd8d58f6666b445374b0005a60337 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 2 Dec 2018 22:08:18 +0300
Subject: move Utils to AppBase where it belongs

---
 classes/pref/feeds.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 82cb84daf..961a09c28 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1306,7 +1306,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print_warning("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.");
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Utils.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
 			__('Display published OPML URL')."</button> ";
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
@@ -1323,7 +1323,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<p>";
 
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return Utils.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
 
 		print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Prefs.clearFeedAccessKeys()\">".
-- 
cgit v1.2.3


From b3bc638a9fa87cdaf61bff446f8aa0534d2b49ee Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 3 Dec 2018 12:26:49 +0300
Subject: refactor OPML export/import code to be less horrible

---
 classes/pref/feeds.php | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 961a09c28..ff91120ec 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1270,11 +1270,11 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('OPML')."\">";
 
-		print "<p>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") .
-			__("Only main settings profile can be migrated using OPML.") . "</p>";
+		print_notice(__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") .
+			__("Only main settings profile can be migrated using OPML."));
 
 		print "<iframe id=\"upload_iframe\"
-			name=\"upload_iframe\" onload=\"opmlImportComplete(this)\"
+			name=\"upload_iframe\" onload=\"Prefs.OPML.onImportComplete(this)\"
 			style=\"width: 400px; height: 100px; display: none;\"></iframe>";
 
 		print "<form  name=\"opml_form\" style='display : block' target=\"upload_iframe\"
@@ -1285,24 +1285,29 @@ class Pref_Feeds extends Handler_Protected {
 			</label>
 			<input type=\"hidden\" name=\"op\" value=\"dlg\">
 			<input type=\"hidden\" name=\"method\" value=\"importOpml\">
-			<button dojoType=\"dijit.form.Button\" onclick=\"return opmlImport();\" type=\"submit\">" .
-			__('Import my OPML') . "</button>";
+			<button dojoType=\"dijit.form.Button\" onclick=\"return Prefs.OPML.import();\" type=\"submit\">" .
+			__('Import OPML') . "</button>";
 
-		print "<hr>";
+		print "</form>";
+
+		print "<p/>";
 
-		$opml_export_filename = "TinyTinyRSS_".date("Y-m-d").".opml";
+		print "<form dojoType=\"dijit.form.Form\" id=\"opmlExportForm\">";
 
-		print "<p>" . __('Filename:') .
-            " <input class=\"input input-text\" type=\"text\" id=\"filename\" value=\"$opml_export_filename\" />&nbsp;" .
-				__('Include settings') . "<input type=\"checkbox\" id=\"settings\" checked=\"1\"/>";
+		print "<button dojoType=\"dijit.form.Button\"
+			onclick=\"Prefs.OPML.export()\" >" .
+			__('Export OPML') . "</button>";
 
-		print "</p><button dojoType=\"dijit.form.Button\"
-			onclick=\"gotoExportOpml(document.opml_form.filename.value, document.opml_form.settings.checked)\" >" .
-              __('Export OPML') . "</button></p></form>";
+		print "<label>";
+		print_checkbox("include_settings", true, "1", "");
+		print "&nbsp;" . __("Include settings");
+		print "</label>";
+
+		print "</form>";
 
 		print "<hr>";
 
-		print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') . "</p>";
+		print_notice(__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.'));
 
 		print_warning("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.");
 
-- 
cgit v1.2.3


From 4d4034091af3d5f7308cc794cf38f654bbe3083f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 3 Dec 2018 12:46:00 +0300
Subject: prefs: Prefs global -> Helpers

---
 classes/pref/feeds.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index ff91120ec..e0ee82fad 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1274,7 +1274,7 @@ class Pref_Feeds extends Handler_Protected {
 			__("Only main settings profile can be migrated using OPML."));
 
 		print "<iframe id=\"upload_iframe\"
-			name=\"upload_iframe\" onload=\"Prefs.OPML.onImportComplete(this)\"
+			name=\"upload_iframe\" onload=\"Helpers.OPML.onImportComplete(this)\"
 			style=\"width: 400px; height: 100px; display: none;\"></iframe>";
 
 		print "<form  name=\"opml_form\" style='display : block' target=\"upload_iframe\"
@@ -1285,7 +1285,7 @@ class Pref_Feeds extends Handler_Protected {
 			</label>
 			<input type=\"hidden\" name=\"op\" value=\"dlg\">
 			<input type=\"hidden\" name=\"method\" value=\"importOpml\">
-			<button dojoType=\"dijit.form.Button\" onclick=\"return Prefs.OPML.import();\" type=\"submit\">" .
+			<button dojoType=\"dijit.form.Button\" onclick=\"return Helpers.OPML.import();\" type=\"submit\">" .
 			__('Import OPML') . "</button>";
 
 		print "</form>";
@@ -1295,7 +1295,7 @@ class Pref_Feeds extends Handler_Protected {
 		print "<form dojoType=\"dijit.form.Form\" id=\"opmlExportForm\">";
 
 		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"Prefs.OPML.export()\" >" .
+			onclick=\"Helpers.OPML.export()\" >" .
 			__('Export OPML') . "</button>";
 
 		print "<label>";
@@ -1331,7 +1331,7 @@ class Pref_Feeds extends Handler_Protected {
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
 
-		print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Prefs.clearFeedAccessKeys()\">".
+		print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">".
 			__('Clear all generated URLs')."</button> ";
 
 		print "</p>";
-- 
cgit v1.2.3