From 17413078a72e1298c6dc8953c40e8d83ce38c49c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 13 Feb 2021 18:32:02 +0300
Subject: pref feeds: index cleanup, split into several methods, use tabs to
 maximize space for feed tree, persist feed tree state

---
 plugins/share/init.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins')

diff --git a/plugins/share/init.php b/plugins/share/init.php
index 0794f5125..42923ed8a 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -42,13 +42,13 @@ class Share extends Plugin {
 	function hook_prefs_tab_section($id) {
 		if ($id == "prefFeedsPublishedGenerated") {
 
-			print "<h3>" . __("You can disable all articles shared by unique URLs here.") . "</h3>";
+			print "<hr/>";
+
+			print "<h2>" . __("You can disable all articles shared by unique URLs here.") . "</h2>";
 
 			print "<button class='alt-danger' dojoType='dijit.form.Button' onclick=\"return Plugins.Share.clearKeys()\">".
 				__('Unshare all articles')."</button> ";
 
-			print "</p>";
-
 		}
 	}
 
-- 
cgit v1.2.3-54-g00ecf


From 15fd23c374eb32c50733de1906065f552afbfbc4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 14 Feb 2021 09:15:51 +0300
Subject: use shortcut echo syntax for php templates

---
 classes/feeds.php               | 10 +++---
 classes/handler/public.php      | 44 +++++++++++------------
 classes/pref/feeds.php          | 74 +++++++++++++++++++-------------------
 classes/pref/filters.php        | 20 +++++------
 classes/pref/labels.php         | 12 +++----
 classes/pref/system.php         | 42 +++++++++++-----------
 include/login_form.php          | 34 +++++++++---------
 index.php                       | 78 ++++++++++++++++++++---------------------
 plugins/af_redditimgur/init.php |  4 +--
 plugins/auth_internal/init.php  | 18 +++++-----
 plugins/toggle_sidebar/init.php |  2 +-
 prefs.php                       | 28 +++++++--------
 12 files changed, 183 insertions(+), 183 deletions(-)

(limited to 'plugins')

diff --git a/classes/feeds.php b/classes/feeds.php
index 031a671ae..e6bd1459d 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -838,14 +838,14 @@ class Feeds extends Handler_Protected {
 		</script>
 
 			<div class="container">
-				<h1>Feed Debugger: <?php echo "$feed_id: " . $this->getFeedTitle($feed_id) ?></h1>
+				<h1>Feed Debugger: <?= "$feed_id: " . $this->getFeedTitle($feed_id) ?></h1>
 				<div class="content">
 					<form method="post" action="">
 						<input type="hidden" name="op" value="feeds">
 						<input type="hidden" name="method" value="update_debugger">
-						<input type="hidden" name="csrf_token" value="<?php echo $csrf_token ?>">
+						<input type="hidden" name="csrf_token" value="<?= $csrf_token ?>">
 						<input type="hidden" name="action" value="do_update">
-						<input type="hidden" name="feed_id" value="<?php echo $feed_id ?>">
+						<input type="hidden" name="feed_id" value="<?= $feed_id ?>">
 
 						<fieldset>
 							<label>
@@ -856,11 +856,11 @@ class Feeds extends Handler_Protected {
 						</fieldset>
 
 						<fieldset>
-							<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_refetch" value="1" <?php echo $refetch_checked ?>> Force refetch</label>
+							<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_refetch" value="1" <?= $refetch_checked ?>> Force refetch</label>
 						</fieldset>
 
 						<fieldset class="narrow">
-							<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_rehash" value="1" <?php echo $rehash_checked ?>> Force rehash</label>
+							<label class="checkbox"><input dojoType="dijit.form.CheckBox" type="checkbox" name="force_rehash" value="1" <?= $rehash_checked ?>> Force rehash</label>
 						</fieldset>
 
 						<button type="submit" dojoType="dijit.form.Button" class="alt-primary">Continue</button>
diff --git a/classes/handler/public.php b/classes/handler/public.php
index db8a924ad..481145606 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -519,7 +519,7 @@ class Handler_Public extends Handler {
 		<!DOCTYPE html>
 		<html>
 		<head>
-			<title><?php echo __("Share with Tiny Tiny RSS") ?></title>
+			<title><?= __("Share with Tiny Tiny RSS") ?></title>
 			<?php
 			echo javascript_tag("lib/prototype.js");
 			echo javascript_tag("lib/dojo/dojo.js");
@@ -592,22 +592,22 @@ class Handler_Public extends Handler {
 					<input type="hidden" name="action" value="share">
 
 					<fieldset>
-						<label><?php echo __("Title:") ?></label>
-						<input style='width : 270px' dojoType='dijit.form.TextBox' name='title' value="<?php echo $title ?>">
+						<label><?= __("Title:") ?></label>
+						<input style='width : 270px' dojoType='dijit.form.TextBox' name='title' value="<?= $title ?>">
 					</fieldset>
 
 					<fieldset>
-						<label><?php echo __("URL:") ?></label>
-						<input style='width : 270px' name='url' dojoType='dijit.form.TextBox' value="<?php echo $url ?>">
+						<label><?= __("URL:") ?></label>
+						<input style='width : 270px' name='url' dojoType='dijit.form.TextBox' value="<?= $url ?>">
 					</fieldset>
 
 					<fieldset>
-						<label><?php echo __("Content:") ?></label>
+						<label><?= __("Content:") ?></label>
 						<input style='width : 270px' name='content' dojoType='dijit.form.TextBox' value="">
 					</fieldset>
 
 					<fieldset>
-						<label><?php echo __("Labels:") ?></label>
+						<label><?= __("Labels:") ?></label>
 						<input style='width : 270px' name='labels' dojoType='dijit.form.TextBox' id="labels_value"
 						   placeholder='Alpha, Beta, Gamma' value="">
 						<div class="autocomplete" id="labels_choices"
@@ -617,9 +617,9 @@ class Handler_Public extends Handler {
 					<hr/>
 
 					<fieldset>
-						<button dojoType='dijit.form.Button' class="alt-primary" type="submit"><?php echo __('Share') ?></button>
-						<button dojoType='dijit.form.Button' onclick="return window.close()"><?php echo __('Cancel') ?></button>
-						<span class="text-muted small"><?php echo __("Shared article will appear in the Published feed.") ?></span>
+						<button dojoType='dijit.form.Button' class="alt-primary" type="submit"><?= __('Share') ?></button>
+						<button dojoType='dijit.form.Button' onclick="return window.close()"><?= __('Cancel') ?></button>
+						<span class="text-muted small"><?= __("Shared article will appear in the Published feed.") ?></span>
 					</fieldset>
 
 				</form>
@@ -635,24 +635,24 @@ class Handler_Public extends Handler {
 
 			<?php print_error("Not logged in"); ?>
 
-			<form action="public.php?return=<?php echo $return ?>" method="post">
+			<form action="public.php?return=<?= $return ?>" method="post">
 
 				<input type="hidden" name="op" value="login">
 
 				<fieldset>
-					<label><?php echo __("Login:") ?></label>
+					<label><?= __("Login:") ?></label>
 					<input name="login" id="login" dojoType="dijit.form.TextBox" type="text"
 						   onchange="fetchProfiles()" onfocus="fetchProfiles()" onblur="fetchProfiles()"
-						   required="1" value="<?php echo $_SESSION["fake_login"] ?>" />
+						   required="1" value="<?= $_SESSION["fake_login"] ?>" />
 				</fieldset>
 
 				<fieldset>
-					<label><?php echo __("Password:") ?></label>
+					<label><?= __("Password:") ?></label>
 
 					<input type="password" name="password" required="1"
 						   dojoType="dijit.form.TextBox"
 						   class="input input-text"
-						   value="<?php echo $_SESSION["fake_password"] ?>"/>
+						   value="<?= $_SESSION["fake_password"] ?>"/>
 				</fieldset>
 
 				<hr/>
@@ -660,7 +660,7 @@ class Handler_Public extends Handler {
 				<fieldset>
 					<label> </label>
 
-					<button dojoType="dijit.form.Button" type="submit" class="alt-primary"><?php echo __('Log in') ?></button>
+					<button dojoType="dijit.form.Button" type="submit" class="alt-primary"><?= __('Log in') ?></button>
 				</fieldset>
 
 			</form>
@@ -781,7 +781,7 @@ class Handler_Public extends Handler {
 				};
 			</script>
 			<div class="container">
-			<h1><?php echo __("Subscribe to feed...") ?></h1>
+			<h1><?= __("Subscribe to feed...") ?></h1>
 			<div class='content'>
 			<?php
 
@@ -792,14 +792,14 @@ class Handler_Public extends Handler {
 					<?php print_hidden("csrf_token", $_SESSION["csrf_token"]) ?>
 					<fieldset>
 						<label>Feed or site URL:</label>
-						<input style="width: 300px" dojoType="dijit.form.ValidationTextBox" required="1" name="feed_url" value="<?php echo htmlspecialchars($feed_url) ?>">
+						<input style="width: 300px" dojoType="dijit.form.ValidationTextBox" required="1" name="feed_url" value="<?= htmlspecialchars($feed_url) ?>">
 					</fieldset>
 
 					<button class="alt-primary" dojoType="dijit.form.Button" type="submit">
-						<?php echo __("Subscribe") ?>
+						<?= __("Subscribe") ?>
 					</button>
 
-					<a href="index.php"><?php echo __("Return to Tiny Tiny RSS") ?></a>
+					<a href="index.php"><?= __("Return to Tiny Tiny RSS") ?></a>
 				</form>
 				<?php
 			} else {
@@ -1105,7 +1105,7 @@ class Handler_Public extends Handler {
 			<head>
 			<title>Database Updater</title>
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-			<?php echo stylesheet_tag("themes/light.css") ?>
+			<?= stylesheet_tag("themes/light.css") ?>
 			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
 			<?php
@@ -1135,7 +1135,7 @@ class Handler_Public extends Handler {
 			</script>
 
 			<div class="container">
-			<h1><?php echo __("Database Updater") ?></h1>
+			<h1><?= __("Database Updater") ?></h1>
 
 			<div class="content">
 
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 72a8344ad..6b5df0289 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1223,52 +1223,52 @@ class Pref_Feeds extends Handler_Protected {
 			<div region='top' dojoType="fox.Toolbar">
 				<div style='float : right'>
 					<input dojoType="dijit.form.TextBox" id="feed_search" size="20" type="search"
-						value="<?php echo htmlspecialchars($feed_search) ?>">
+						value="<?= htmlspecialchars($feed_search) ?>">
 					<button dojoType="dijit.form.Button" onclick="dijit.byId('feedTree').reload()">
-						<?php echo __('Search') ?></button>
+						<?= __('Search') ?></button>
 				</div>
 
 				<div dojoType="fox.form.DropDownButton">
-					<span><?php echo __('Select') ?></span>
+					<span><?= __('Select') ?></span>
 					<div dojoType="dijit.Menu" style="display: none;">
 						<div onclick="dijit.byId('feedTree').model.setAllChecked(true)"
-							dojoType="dijit.MenuItem"><?php echo __('All') ?></div>
+							dojoType="dijit.MenuItem"><?= __('All') ?></div>
 						<div onclick="dijit.byId('feedTree').model.setAllChecked(false)"
-							dojoType="dijit.MenuItem"><?php echo __('None') ?></div>
+							dojoType="dijit.MenuItem"><?= __('None') ?></div>
 					</div>
 				</div>
 
 				<div dojoType="fox.form.DropDownButton">
-					<span><?php echo __('Feeds') ?></span>
+					<span><?= __('Feeds') ?></span>
 					<div dojoType="dijit.Menu" style="display: none">
 						<div onclick="CommonDialogs.quickAddFeed()"
-							dojoType="dijit.MenuItem"><?php echo __('Subscribe to feed') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Subscribe to feed') ?></div>
 						<div onclick="dijit.byId('feedTree').editSelectedFeed()"
-							dojoType="dijit.MenuItem"><?php echo __('Edit selected feeds') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Edit selected feeds') ?></div>
 						<div onclick="dijit.byId('feedTree').resetFeedOrder()"
-							dojoType="dijit.MenuItem"><?php echo __('Reset sort order') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Reset sort order') ?></div>
 						<div onclick="dijit.byId('feedTree').batchSubscribe()"
-							dojoType="dijit.MenuItem"><?php echo __('Batch subscribe') ?></div>
+							dojoType="dijit.MenuItem"><?= __('Batch subscribe') ?></div>
 						<div dojoType="dijit.MenuItem" onclick="dijit.byId('feedTree').removeSelectedFeeds()">
-							<?php echo __('Unsubscribe') ?></div>
+							<?= __('Unsubscribe') ?></div>
 					</div>
 				</div>
 
 				<?php if (get_pref('ENABLE_FEED_CATS')) { ?>
 					<div dojoType="fox.form.DropDownButton">
-						<span><?php echo __('Categories') ?></span>
+						<span><?= __('Categories') ?></span>
 						<div dojoType="dijit.Menu" style="display: none">
 							<div onclick="dijit.byId('feedTree').createCategory()"
-								dojoType="dijit.MenuItem"><?php echo __('Add category') ?></div>
+								dojoType="dijit.MenuItem"><?= __('Add category') ?></div>
 							<div onclick="dijit.byId('feedTree').resetCatOrder()"
-								dojoType="dijit.MenuItem"><?php echo __('Reset sort order') ?></div>
+								dojoType="dijit.MenuItem"><?= __('Reset sort order') ?></div>
 							<div onclick="dijit.byId('feedTree').removeSelectedCategories()"
-								dojoType="dijit.MenuItem"><?php echo __('Remove selected') ?></div>
+								dojoType="dijit.MenuItem"><?= __('Remove selected') ?></div>
 						</div>
 					</div>
 				<?php } ?>
-				<?php echo $error_button ?>
-				<?php echo $inactive_button ?>
+				<?= $error_button ?>
+				<?= $inactive_button ?>
 			</div>
 			<div style="padding : 0px" dojoType="dijit.layout.ContentPane" region="center">
 				<div dojoType="fox.PrefFeedStore" jsId="feedStore"
@@ -1283,7 +1283,7 @@ class Pref_Feeds extends Handler_Protected {
 				<div dojoType="fox.PrefFeedTree" id="feedTree"
 					dndController="dijit.tree.dndSource"
 					betweenThreshold="5"
-					autoExpand="<?php echo (!empty($feed_search) ? "true" : "false") ?>"
+					autoExpand="<?= (!empty($feed_search) ? "true" : "false") ?>"
 					persist="true"
 					model="feedModel"
 					openOnClick="false">
@@ -1311,19 +1311,19 @@ class Pref_Feeds extends Handler_Protected {
 	private function index_opml() {
 		?>
 
-		<h3><?php echo __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") ?></h3>
+		<h3><?= __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") ?></h3>
 
 		<?php print_notice("Only main settings profile can be migrated using OPML.") ?>
 
 		<form id='opml_import_form' method='post' enctype='multipart/form-data'>
-			<label class='dijitButton'><?php echo __("Choose file...") ?>
+			<label class='dijitButton'><?= __("Choose file...") ?>
 				<input style='display : none' id='opml_file' name='opml_file' type='file'>
 			</label>
 			<input type='hidden' name='op' value='pref-feeds'>
-			<input type='hidden' name='csrf_token' value="<?php echo $_SESSION['csrf_token'] ?>">
+			<input type='hidden' name='csrf_token' value="<?= $_SESSION['csrf_token'] ?>">
 			<input type='hidden' name='method' value='importOpml'>
 			<button dojoType='dijit.form.Button' class='alt-primary' onclick="return Helpers.OPML.import()" type="submit">
-				<?php echo __('Import OPML') ?>
+				<?= __('Import OPML') ?>
 			</button>
 		</form>
 
@@ -1331,26 +1331,26 @@ class Pref_Feeds extends Handler_Protected {
 
 		<form dojoType='dijit.form.Form' id='opmlExportForm' style='display : inline-block'>
 			<button dojoType='dijit.form.Button' onclick='Helpers.OPML.export()'>
-				<?php echo __('Export OPML') ?>
+				<?= __('Export OPML') ?>
 			</button>
 
 			<label class='checkbox'>
 				<?php print_checkbox("include_settings", true, "1", "") ?>
-				<?php echo __("Include settings") ?>
+				<?= __("Include settings") ?>
 			</label>
 		</form>
 
 		<hr/>
 
-		<h2><?php echo __("Published OPML") ?></h2>
+		<h2><?= __("Published OPML") ?></h2>
 
 		<p>
-			<?php echo __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') ?>
-			<?php echo __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") ?>
+			<?= __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') ?>
+			<?= __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") ?>
 		</p>
 
 		<button dojoType='dijit.form.Button' class='alt-primary' onclick="return CommonDialogs.publishedOPML()">
-			<?php echo __('Display published OPML URL') ?>
+			<?= __('Display published OPML URL') ?>
 		</button>
 
 		<?php
@@ -1362,15 +1362,15 @@ class Pref_Feeds extends Handler_Protected {
 			"/public.php?op=rss&id=-2&view-mode=all_articles");
 		?>
 
-		<h3><?php echo __('Published articles can be subscribed by anyone who knows the following URL:') ?></h3>
+		<h3><?= __('Published articles can be subscribed by anyone who knows the following URL:') ?></h3>
 
 		<button dojoType='dijit.form.Button' class='alt-primary'
-			onclick='CommonDialogs.generatedFeed(-2, false, "<?php echo $rss_url ?>", "<?php echo __("Published articles") ?>")'>
-			<?php echo __('Display URL') ?>
+			onclick='CommonDialogs.generatedFeed(-2, false, "<?= $rss_url ?>", "<?= __("Published articles") ?>")'>
+			<?= __('Display URL') ?>
 		</button>
 
 		<button class='alt-danger' dojoType='dijit.form.Button' onclick='return Helpers.Feeds.clearFeedAccessKeys()'>
-			<?php echo __('Clear all generated URLs') ?>
+			<?= __('Clear all generated URLs') ?>
 		</button>
 
 		<?php
@@ -1382,17 +1382,17 @@ class Pref_Feeds extends Handler_Protected {
 
 		<div dojoType='dijit.layout.TabContainer' tabPosition='left-h'>
 			<div style='padding : 0px' dojoType='dijit.layout.ContentPane'
-				title="<i class='material-icons'>rss_feed</i> <?php echo __('My feeds') ?>">
+				title="<i class='material-icons'>rss_feed</i> <?= __('My feeds') ?>">
 				<?php $this->index_feeds() ?>
 			</div>
 
 			<div dojoType='dijit.layout.ContentPane'
-						title="<i class='material-icons'>import_export</i> <?php echo __('OPML') ?>">
+						title="<i class='material-icons'>import_export</i> <?= __('OPML') ?>">
 						<?php $this->index_opml() ?>
 					</div>
 
 			<div dojoType="dijit.layout.ContentPane"
-				title="<i class='material-icons'>share</i> <?php echo __('Sharing') ?>">
+				title="<i class='material-icons'>share</i> <?= __('Sharing') ?>">
 				<?php $this->index_shared() ?>
 			</div>
 
@@ -1405,10 +1405,10 @@ class Pref_Feeds extends Handler_Protected {
 
 			<?php if ($plugin_data) { ?>
 				<div dojoType='dijit.layout.ContentPane'
-					title="<i class='material-icons'>extension</i> <?php echo __('Plugins') ?>">
+					title="<i class='material-icons'>extension</i> <?= __('Plugins') ?>">
 
 					<div dojoType='dijit.layout.AccordionContainer' region='center'>
-						<?php echo $plugin_data ?>
+						<?= $plugin_data ?>
 					</div>
 				</div>
 			<?php } ?>
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 571ddce4a..c898a8b67 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -717,31 +717,31 @@ class Pref_Filters extends Handler_Protected {
 
 					<div style='float : right; padding-right : 4px;'>
 						<input dojoType="dijit.form.TextBox" id="filter_search" size="20" type="search"
-							value="<?php echo htmlspecialchars($filter_search) ?>">
+							value="<?= htmlspecialchars($filter_search) ?>">
 						<button dojoType="dijit.form.Button" onclick="dijit.byId('filterTree').reload()">
-							<?php echo __('Search') ?></button>
+							<?= __('Search') ?></button>
 					</div>
 
 					<div dojoType="fox.form.DropDownButton">
-						<span><?php echo __('Select') ?></span>
+						<span><?= __('Select') ?></span>
 						<div dojoType="dijit.Menu" style="display: none;">
 							<div onclick="dijit.byId('filterTree').model.setAllChecked(true)"
-								dojoType="dijit.MenuItem"><?php echo __('All') ?></div>
+								dojoType="dijit.MenuItem"><?= __('All') ?></div>
 							<div onclick="dijit.byId('filterTree').model.setAllChecked(false)"
-								dojoType="dijit.MenuItem"><?php echo __('None') ?></div>
+								dojoType="dijit.MenuItem"><?= __('None') ?></div>
 						</div>
 					</div>
 
 					<button dojoType="dijit.form.Button" onclick="return Filters.edit()">
-						<?php echo __('Create filter') ?></button>
+						<?= __('Create filter') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').joinSelectedFilters()">
-						<?php echo __('Combine') ?></button>
+						<?= __('Combine') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').editSelectedFilter()">
-						<?php echo __('Edit') ?></button>
+						<?= __('Edit') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').resetFilterOrder()">
-						<?php echo __('Reset sort order') ?></button>
+						<?= __('Reset sort order') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').removeSelectedFilters()">
-						<?php echo __('Remove') ?></button>
+						<?= __('Remove') ?></button>
 
 				</div>
 			</div>
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 22a2dddea..d182a0995 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -195,23 +195,23 @@ class Pref_Labels extends Handler_Protected {
 			<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='top'>
 				<div dojoType='fox.Toolbar'>
 					<div dojoType='fox.form.DropDownButton'>
-						<span><?php echo __('Select') ?></span>
+						<span><?= __('Select') ?></span>
 						<div dojoType='dijit.Menu' style='display: none'>
 						<div onclick="dijit.byId('labelTree').model.setAllChecked(true)"
-							dojoType='dijit.MenuItem'><?php echo('All') ?></div>
+							dojoType='dijit.MenuItem'><?=('All') ?></div>
 						<div onclick="dijit.byId('labelTree').model.setAllChecked(false)"
-							dojoType='dijit.MenuItem'><?php echo('None') ?></div>
+							dojoType='dijit.MenuItem'><?=('None') ?></div>
 					</div>
 				</div>
 
 				<button dojoType='dijit.form.Button' onclick='CommonDialogs.addLabel()'>
-					<?php echo('Create label') ?></button dojoType='dijit.form.Button'>
+					<?=('Create label') ?></button dojoType='dijit.form.Button'>
 
 				<button dojoType='dijit.form.Button' onclick="dijit.byId('labelTree').removeSelected()">
-					<?php echo('Remove') ?></button dojoType='dijit.form.Button'>
+					<?=('Remove') ?></button dojoType='dijit.form.Button'>
 
 				<button dojoType='dijit.form.Button' onclick="dijit.byId('labelTree').resetColors()">
-					<?php echo('Clear colors') ?></button dojoType='dijit.form.Button'>
+					<?=('Clear colors') ?></button dojoType='dijit.form.Button'>
 
 				</div>
 			</div>
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 72e15e4f3..1adddf116 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -76,30 +76,30 @@ class Pref_System extends Handler_Protected {
 			<div region='top' dojoType='fox.Toolbar'>
 
 				<button dojoType='dijit.form.Button' onclick='Helpers.EventLog.refresh()'>
-					<?php echo __('Refresh') ?>
+					<?= __('Refresh') ?>
 				</button>
 
-				<button dojoType='dijit.form.Button' <?php echo ($page <= 0 ? "disabled" : "") ?>
+				<button dojoType='dijit.form.Button' <?= ($page <= 0 ? "disabled" : "") ?>
 					onclick='Helpers.EventLog.prevPage()'>
-					<?php echo __('&lt;&lt;') ?>
+					<?= __('&lt;&lt;') ?>
 				</button>
 
 				<button dojoType='dijit.form.Button' disabled>
-					<?php echo T_sprintf('Page %d of %d', $page+1, $total_pages+1) ?>
+					<?= T_sprintf('Page %d of %d', $page+1, $total_pages+1) ?>
 				</button>
 
-				<button dojoType='dijit.form.Button' <?php echo ($page >= $total_pages ? "disabled" : "") ?>
+				<button dojoType='dijit.form.Button' <?= ($page >= $total_pages ? "disabled" : "") ?>
 					onclick='Helpers.EventLog.nextPage()'>
-					<?php echo __('&gt;&gt;') ?>
+					<?= __('&gt;&gt;') ?>
 				</button>
 
 				<button dojoType='dijit.form.Button'
 					onclick='Helpers.EventLog.clear()'>
-					<?php echo __('Clear') ?>
+					<?= __('Clear') ?>
 				</button>
 
 				<div class='pull-right'>
-					<?php echo __("Severity:") ?>
+					<?= __("Severity:") ?>
 
 					<?php print_select_hash("severity", $severity,
 						[
@@ -115,11 +115,11 @@ class Pref_System extends Handler_Protected {
 				<table width='100%' class='event-log'>
 
 					<tr class='title'>
-						<td width='5%'><?php echo __("Error") ?></td>
-						<td><?php echo __("Filename") ?></td>
-						<td><?php echo __("Message") ?></td>
-						<td width='5%'><?php echo __("User") ?></td>
-						<td width='5%'><?php echo __("Date") ?></td>
+						<td width='5%'><?= __("Error") ?></td>
+						<td><?= __("Filename") ?></td>
+						<td><?= __("Message") ?></td>
+						<td width='5%'><?= __("User") ?></td>
+						<td width='5%'><?= __("Date") ?></td>
 					</tr>
 
 					<?php
@@ -140,13 +140,13 @@ class Pref_System extends Handler_Protected {
 						?>
 						<tr>
 							<td class='errno'>
-								<?php echo Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")" ?>
+								<?= Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")" ?>
 							</td>
-							<td class='filename'><?php echo  $line["filename"] . ":" . $line["lineno"] ?></td>
-							<td class='errstr'><?php echo  $line["errstr"] . "\n" .  $line["context"] ?></td>
-							<td class='login'><?php echo  $line["login"] ?></td>
+							<td class='filename'><?= $line["filename"] . ":" . $line["lineno"] ?></td>
+							<td class='errstr'><?= $line["errstr"] . "\n" .  $line["context"] ?></td>
+							<td class='login'><?= $line["login"] ?></td>
 							<td class='timestamp'>
-								<?php echo TimeHelper::make_local_datetime($line["created_at"], false) ?>
+								<?= TimeHelper::make_local_datetime($line["created_at"], false) ?>
 							</td>
 						</tr>
 					<?php } ?>
@@ -162,7 +162,7 @@ class Pref_System extends Handler_Protected {
 		$page = (int) ($_REQUEST["page"] ?? 0);
 		?>
 		<div dojoType='dijit.layout.AccordionContainer' region='center'>
-			<div dojoType='dijit.layout.AccordionPane' style='padding : 0' title='<i class="material-icons">report</i> <?php echo __('Event Log') ?>'>
+			<div dojoType='dijit.layout.AccordionPane' style='padding : 0' title='<i class="material-icons">report</i> <?= __('Event Log') ?>'>
 				<?php
 					if (LOG_DESTINATION == "sql") {
 						$this->log_viewer($page, $severity);
@@ -172,11 +172,11 @@ class Pref_System extends Handler_Protected {
 				?>
 			</div>
 
-			<div dojoType='dijit.layout.AccordionPane' title='<i class="material-icons">info</i> <?php echo __('PHP Information') ?>'>
+			<div dojoType='dijit.layout.AccordionPane' title='<i class="material-icons">info</i> <?= __('PHP Information') ?>'>
 				<script type='dojo/method' event='onSelected' args='evt'>
 					Helpers.System.getPHPInfo(this);
 				</script>
-				<div class='phpinfo'><?php echo __("Loading, please wait...") ?></div>
+				<div class='phpinfo'><?= __("Loading, please wait...") ?></div>
 			</div>
 
 			<?php PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB, "prefSystem") ?>
diff --git a/include/login_form.php b/include/login_form.php
index aec305b13..aa6a72260 100755
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -92,29 +92,29 @@
 
 <div class="container">
 
-	<h1><?php echo "Authentication" ?></h1>
+	<h1><?= "Authentication" ?></h1>
 	<div class="content">
-		<form action="public.php?return=<?php echo $return ?>"
+		<form action="public.php?return=<?= $return ?>"
 			  dojoType="dijit.form.Form" method="POST">
 
 			<?php print_hidden("op", "login"); ?>
 
 			<?php if (!empty($_SESSION["login_error_msg"])) { ?>
-				<?php echo format_error($_SESSION["login_error_msg"]) ?>
+				<?= format_error($_SESSION["login_error_msg"]) ?>
 				<?php $_SESSION["login_error_msg"] = ""; ?>
 			<?php } ?>
 
 			<fieldset>
-				<label><?php echo __("Login:") ?></label>
+				<label><?= __("Login:") ?></label>
 				<input name="login" id="login" dojoType="dijit.form.TextBox" type="text"
 					   onchange="UtilityApp.fetchProfiles()"
 					   onfocus="UtilityApp.fetchProfiles()"
 					   onblur="UtilityApp.fetchProfiles()"
-					   required="1" value="<?php echo $_SESSION["fake_login"] ?? "" ?>" />
+					   required="1" value="<?= $_SESSION["fake_login"] ?? "" ?>" />
 			</fieldset>
 
 			<fieldset>
-				<label><?php echo __("Password:") ?></label>
+				<label><?= __("Password:") ?></label>
 
 				<input type="password" name="password" required="1"
 					   dojoType="dijit.form.TextBox"
@@ -122,19 +122,19 @@
 					   onchange="UtilityApp.fetchProfiles()"
 					   onfocus="UtilityApp.fetchProfiles()"
 					   onblur="UtilityApp.fetchProfiles()"
-					   value="<?php echo $_SESSION["fake_password"] ?? "" ?>"/>
+					   value="<?= $_SESSION["fake_password"] ?? "" ?>"/>
 			</fieldset>
 			<?php if (strpos(PLUGINS, "auth_internal") !== false) { ?>
 				<fieldset class="align-right">
-					<a href="public.php?op=forgotpass"><?php echo __("I forgot my password") ?></a>
+					<a href="public.php?op=forgotpass"><?= __("I forgot my password") ?></a>
 				</fieldset>
 			<?php } ?>
 
 			<fieldset>
-				<label><?php echo __("Profile:") ?></label>
+				<label><?= __("Profile:") ?></label>
 
 				<select disabled='disabled' name="profile" id="profile" dojoType='dijit.form.Select'>
-					<option><?php echo __("Default profile") ?></option>
+					<option><?= __("Default profile") ?></option>
 				</select>
 			</fieldset>
 
@@ -143,11 +143,11 @@
 
 				<label id="bw_limit_label"><input dojoType="dijit.form.CheckBox" name="bw_limit" id="bw_limit"
 					  type="checkbox" onchange="UtilityApp.bwLimitChange(this)">
-					<?php echo __("Use less traffic") ?></label>
+					<?= __("Use less traffic") ?></label>
 			</fieldset>
 
 			<div dojoType="dijit.Tooltip" connectId="bw_limit_label" position="below" style="display:none">
-				<?php echo __("Does not display images in articles, reduces automatic refreshes."); ?>
+				<?= __("Does not display images in articles, reduces automatic refreshes."); ?>
 			</div>
 
 			<fieldset class="narrow">
@@ -155,11 +155,11 @@
 
 				<label id="safe_mode_label"><input dojoType="dijit.form.CheckBox" name="safe_mode" id="safe_mode"
 					  type="checkbox">
-					<?php echo __("Safe mode") ?></label>
+					<?= __("Safe mode") ?></label>
 			</fieldset>
 
 			<div dojoType="dijit.Tooltip" connectId="safe_mode_label" position="below" style="display:none">
-				<?php echo __("Uses default theme and prevents all plugins from loading."); ?>
+				<?= __("Uses default theme and prevents all plugins from loading."); ?>
 			</div>
 			<?php if (SESSION_COOKIE_LIFETIME > 0) { ?>
 
@@ -167,7 +167,7 @@
 					<label> </label>
 					<label>
 						<input dojoType="dijit.form.CheckBox" name="remember_me" id="remember_me" type="checkbox">
-						<?php echo __("Remember me") ?>
+						<?= __("Remember me") ?>
 					</label>
 				</fieldset>
 
@@ -177,7 +177,7 @@
 
 			<fieldset class="align-right">
 				<label> </label>
-				<button dojoType="dijit.form.Button" type="submit" class="alt-primary"><?php echo __('Log in') ?></button>
+				<button dojoType="dijit.form.Button" type="submit" class="alt-primary"><?= __('Log in') ?></button>
 			</fieldset>
 
 		</form>
@@ -185,7 +185,7 @@
 
 	<div class="footer">
 		<a href="https://tt-rss.org/">Tiny Tiny RSS</a>
-		&copy; 2005&ndash;<?php echo date('Y') ?> <a href="https://fakecake.org/">Andrew Dolgov</a>
+		&copy; 2005&ndash;<?= date('Y') ?> <a href="https://fakecake.org/">Andrew Dolgov</a>
 	</div>
 
 </div>
diff --git a/index.php b/index.php
index fa23570ff..8bfca1af2 100644
--- a/index.php
+++ b/index.php
@@ -47,7 +47,7 @@
 	} ?>
 
 	<script type="text/javascript">
-		const __csrf_token = "<?php echo $_SESSION["csrf_token"]; ?>";
+		const __csrf_token = "<?= $_SESSION["csrf_token"]; ?>";
 	</script>
 
 	<?php UserHelper::print_user_stylesheet() ?>
@@ -68,7 +68,7 @@
 	<script>
 		dojoConfig = {
 			async: true,
-			cacheBust: "<?php echo get_scripts_timestamp(); ?>",
+			cacheBust: "<?= get_scripts_timestamp(); ?>",
 			packages: [
 				{ name: "fox", location: "../../js" },
 			]
@@ -132,7 +132,7 @@
 
 <div id="overlay" style="display : block">
 	<div id="overlay_inner">
-		<?php echo __("Loading, please wait...") ?>
+		<?= __("Loading, please wait...") ?>
 		<div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar"
 	     progress="0" maximum="100">
 		</div>
@@ -147,7 +147,7 @@
     <div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
         <div id="feedlistLoading">
             <img src='images/indicator_tiny.gif'/>
-            <?php echo  __("Loading, please wait..."); ?></div>
+            <?= __("Loading, please wait..."); ?></div>
         <?php
 			 PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_FEED_TREE, function ($result) {
 				 echo $result;
@@ -161,13 +161,13 @@
             <div id="toolbar" dojoType="fox.Toolbar">
 
             <i class="material-icons net-alert" style="display : none"
-                title="<?php echo __("Communication problem with server.") ?>">error_outline</i>
+                title="<?= __("Communication problem with server.") ?>">error_outline</i>
 
             <i class="material-icons log-alert" style="display : none" onclick="App.openPreferences('system')"
-                 title="<?php echo __("Recent entries found in event log.") ?>">warning</i>
+                 title="<?= __("Recent entries found in event log.") ?>">warning</i>
 
             <i id="updates-available" class="material-icons icon-new-version" style="display : none"
-               title="<?php echo __('Updates are available from Git.') ?>">new_releases</i>
+               title="<?= __('Updates are available from Git.') ?>">new_releases</i>
 
             <?php
 
@@ -182,26 +182,26 @@
 
             <form id="toolbar-main" action="" style="order : 20" onsubmit='return false'>
 
-            <select name="view_mode" title="<?php echo __('Show articles') ?>"
+            <select name="view_mode" title="<?= __('Show articles') ?>"
                 onchange="App.onViewModeChanged()"
                 dojoType="fox.form.Select">
-                <option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
-                <option value="all_articles"><?php echo __('All Articles') ?></option>
-                <option value="marked"><?php echo __('Starred') ?></option>
-                <option value="published"><?php echo __('Published') ?></option>
-                <option value="unread"><?php echo __('Unread') ?></option>
-                <option value="has_note"><?php echo __('With Note') ?></option>
-                <!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
+                <option selected="selected" value="adaptive"><?= __('Adaptive') ?></option>
+                <option value="all_articles"><?= __('All Articles') ?></option>
+                <option value="marked"><?= __('Starred') ?></option>
+                <option value="published"><?= __('Published') ?></option>
+                <option value="unread"><?= __('Unread') ?></option>
+                <option value="has_note"><?= __('With Note') ?></option>
+                <!-- <option value="noscores"><?= __('Ignore Scoring') ?></option> -->
             </select>
 
-			<select title="<?php echo __('Sort articles') ?>"
+			<select title="<?= __('Sort articles') ?>"
                 onchange="App.onViewModeChanged()"
                 dojoType="fox.form.Select" name="order_by">
 
-				<option selected="selected" value="default"><?php echo __('Default') ?></option>
-                <option value="feed_dates"><?php echo __('Newest first') ?></option>
-                <option value="date_reverse"><?php echo __('Oldest first') ?></option>
-                <option value="title"><?php echo __('Title') ?></option>
+				<option selected="selected" value="default"><?= __('Default') ?></option>
+                <option value="feed_dates"><?= __('Newest first') ?></option>
+                <option value="date_reverse"><?= __('Oldest first') ?></option>
+                <option value="title"><?= __('Title') ?></option>
 
 				<?php
 					PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_HEADLINES_CUSTOM_SORT_MAP, function ($result) {
@@ -213,16 +213,16 @@
             </select>
 
             <div dojoType="fox.form.ComboButton" onclick="Feeds.catchupCurrent()">
-                <span><?php echo __('Mark as read') ?></span>
+                <span><?= __('Mark as read') ?></span>
                 <div dojoType="dijit.DropDownMenu">
                     <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1day')">
-                        <?php echo __('Older than one day') ?>
+                        <?= __('Older than one day') ?>
                     </div>
                     <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1week')">
-                        <?php echo __('Older than one week') ?>
+                        <?= __('Older than one week') ?>
                     </div>
                     <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('2week')">
-                        <?php echo __('Older than two weeks') ?>
+                        <?= __('Older than two weeks') ?>
                     </div>
                 </div>
             </div>
@@ -237,21 +237,21 @@
 						});
                 ?>
 
-                <div dojoType="fox.form.DropDownButton" class="action-button" title="<?php echo __('Actions...') ?>">
+                <div dojoType="fox.form.DropDownButton" class="action-button" title="<?= __('Actions...') ?>">
 					<span><i class="material-icons">menu</i></span>
                     <div dojoType="dijit.Menu" style="display: none">
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?php echo __('Preferences...') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcSearch')"><?php echo __('Search...') ?></div>
-                        <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
-                        <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
-                        <div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
-                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?= __('Preferences...') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcSearch')"><?= __('Search...') ?></div>
+                        <div dojoType="dijit.MenuItem" disabled="1"><?= __('Feed actions:') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcAddFeed')"><?= __('Subscribe to feed...') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcEditFeed')"><?= __('Edit this feed...') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcRemoveFeed')"><?= __('Unsubscribe') ?></div>
+                        <div dojoType="dijit.MenuItem" disabled="1"><?= __('All feeds:') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcCatchupAll')"><?= __('Mark as read') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcShowOnlyUnread')"><?= __('(Un)hide read feeds') ?></div>
+                        <div dojoType="dijit.MenuItem" disabled="1"><?= __('Other actions:') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcToggleWidescreen')"><?= __('Toggle widescreen mode') ?></div>
+                        <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?= __('Keyboard shortcuts help') ?></div>
 
                         <?php
 									PluginHost::getInstance()->run_hooks_callback(PluginHost::HOOK_ACTION_ITEM, function ($result) {
@@ -260,7 +260,7 @@
                         ?>
 
                         <?php if (empty($_SESSION["hide_logout"])) { ?>
-                            <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcLogout')"><?php echo __('Logout') ?></div>
+                            <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcLogout')"><?= __('Logout') ?></div>
                         <?php } ?>
                     </div>
                 </div>
@@ -271,7 +271,7 @@
             <div id="headlines-frame" dojoType="dijit.layout.ContentPane" tabindex="0"
                     region="center">
                 <div id="headlinesInnerContainer">
-                    <div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
+                    <div class="whiteBox"><?= __('Loading, please wait...') ?></div>
                 </div>
             </div>
             <div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom"
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 2e89fcdff..b9a2db68d 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -648,11 +648,11 @@ class Af_RedditImgur extends Plugin {
 			<form action="backend.php?op=pluginhandler&method=testurl&plugin=af_redditimgur" method="post">
 				<fieldset>
 					<label>URL:</label>
-					<input name="url" size="100" value="<?php echo htmlspecialchars($url) ?>"></input>
+					<input name="url" size="100" value="<?= htmlspecialchars($url) ?>"></input>
 				</fieldset>
 				<fieldset>
 					<label>Article URL:</label>
-					<input name="article_url" size="100" value="<?php echo htmlspecialchars($article_url) ?>"></input>
+					<input name="article_url" size="100" value="<?= htmlspecialchars($article_url) ?>"></input>
 				</fieldset>
 				<fieldset>
 					<button type="submit">Test</button>
diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php
index a69ea444c..6a68534ea 100644
--- a/plugins/auth_internal/init.php
+++ b/plugins/auth_internal/init.php
@@ -63,21 +63,21 @@ class Auth_Internal extends Auth_Base {
 								<title>Tiny Tiny RSS</title>
 								<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 							</head>
-							<?php echo stylesheet_tag("themes/light.css") ?>
+							<?= stylesheet_tag("themes/light.css") ?>
 						<body class="ttrss_utility otp">
-						<h1><?php echo __("Authentication") ?></h1>
+						<h1><?= __("Authentication") ?></h1>
 						<div class="content">
-						<form action="public.php?return=<?php echo $return ?>"
+						<form action="public.php?return=<?= $return ?>"
 								method="POST" class="otpform">
 							<input type="hidden" name="op" value="login">
-							<input type="hidden" name="login" value="<?php echo htmlspecialchars($login) ?>">
-							<input type="hidden" name="password" value="<?php echo htmlspecialchars($password) ?>">
-							<input type="hidden" name="bw_limit" value="<?php echo htmlspecialchars($_POST["bw_limit"]) ?>">
-							<input type="hidden" name="remember_me" value="<?php echo htmlspecialchars($_POST["remember_me"]) ?>">
-							<input type="hidden" name="profile" value="<?php echo htmlspecialchars($_POST["profile"]) ?>">
+							<input type="hidden" name="login" value="<?= htmlspecialchars($login) ?>">
+							<input type="hidden" name="password" value="<?= htmlspecialchars($password) ?>">
+							<input type="hidden" name="bw_limit" value="<?= htmlspecialchars($_POST["bw_limit"]) ?>">
+							<input type="hidden" name="remember_me" value="<?= htmlspecialchars($_POST["remember_me"]) ?>">
+							<input type="hidden" name="profile" value="<?= htmlspecialchars($_POST["profile"]) ?>">
 
 							<fieldset>
-								<label><?php echo __("Please enter your one time password:") ?></label>
+								<label><?= __("Please enter your one time password:") ?></label>
 								<input autocomplete="off" size="6" name="otp" value=""/>
 								<input type="submit" value="Continue"/>
 							</fieldset>
diff --git a/plugins/toggle_sidebar/init.php b/plugins/toggle_sidebar/init.php
index f8ec35a91..19ca960e2 100644
--- a/plugins/toggle_sidebar/init.php
+++ b/plugins/toggle_sidebar/init.php
@@ -24,7 +24,7 @@ class Toggle_Sidebar extends Plugin {
 
 		<button dojoType="dijit.form.Button" onclick="Plugins.Toggle_Sidebar.toggle(this)">
 			<i class="material-icons toggle-sidebar-label"
-               title="<?php echo __('Toggle sidebar') ?>">chevron_left</i>
+               title="<?= __('Toggle sidebar') ?>">chevron_left</i>
 		</button>
 
 		<?php
diff --git a/prefs.php b/prefs.php
index 61e1145b7..9d5f8e499 100644
--- a/prefs.php
+++ b/prefs.php
@@ -24,7 +24,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
+	<title>Tiny Tiny RSS : <?= __("Preferences") ?></title>
     <meta name="viewport" content="initial-scale=1,width=device-width" />
 
 	<?php if ($_SESSION["uid"] && empty($_SESSION["safe_mode"])) {
@@ -39,7 +39,7 @@
 	} ?>
 
 	<script type="text/javascript">
-		const __csrf_token = "<?php echo $_SESSION["csrf_token"]; ?>";
+		const __csrf_token = "<?= $_SESSION["csrf_token"]; ?>";
 	</script>
 
 	<?php UserHelper::print_user_stylesheet() ?>
@@ -50,7 +50,7 @@
 	<script>
 		dojoConfig = {
 			async: true,
-			cacheBust: "<?php echo get_scripts_timestamp(); ?>",
+			cacheBust: "<?= get_scripts_timestamp(); ?>",
 			packages: [
 				{ name: "lib", location: "../" },
 				{ name: "fox", location: "../../js" },
@@ -117,7 +117,7 @@
 
 <div id="overlay">
 	<div id="overlay_inner">
-		<?php echo __("Loading, please wait...") ?>
+		<?= __("Loading, please wait...") ?>
 		<div dojoType="dijit.ProgressBar" places="0" style="width : 300px" id="loading_bar"
 	     progress="0" maximum="100">
 		</div>
@@ -126,34 +126,34 @@
 </div>
 
 <div id="header">
-	<!-- <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> | -->
-	<a href="#" onclick="document.location.href = 'index.php'"><?php echo __('Exit preferences') ?></a>
+	<!-- <a href='#' onclick="showHelp()"><?= __("Keyboard shortcuts") ?></a> | -->
+	<a href="#" onclick="document.location.href = 'index.php'"><?= __('Exit preferences') ?></a>
 </div>
 
 <div id="main" dojoType="dijit.layout.BorderContainer">
     <div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs">
         <div id="prefsTab" dojoType="dijit.layout.ContentPane"
             href="backend.php?op=pref-prefs"
-            title="<i class='material-icons'>settings</i> <?php echo __('Preferences') ?>"></div>
+            title="<i class='material-icons'>settings</i> <?= __('Preferences') ?>"></div>
         <div id="feedsTab" dojoType="dijit.layout.ContentPane"
             href="backend.php?op=pref-feeds"
-            title="<i class='material-icons'>rss_feed</i>  <?php echo __('Feeds') ?>"></div>
+            title="<i class='material-icons'>rss_feed</i>  <?= __('Feeds') ?>"></div>
         <div id="filtersTab" dojoType="dijit.layout.ContentPane"
             style="padding : 0px"
             href="backend.php?op=pref-filters"
-            title="<i class='material-icons'>filter_list1</i> <?php echo __('Filters') ?>"></div>
+            title="<i class='material-icons'>filter_list1</i> <?= __('Filters') ?>"></div>
         <div id="labelsTab" dojoType="dijit.layout.ContentPane"
             style="padding : 0px"
             href="backend.php?op=pref-labels"
-            title="<i class='material-icons'>label_outline1</i> <?php echo __('Labels') ?>"></div>
+            title="<i class='material-icons'>label_outline1</i> <?= __('Labels') ?>"></div>
         <?php if ($_SESSION["access_level"] >= 10) { ?>
             <div id="usersTab" dojoType="dijit.layout.ContentPane"
                 style="padding : 0px"
                 href="backend.php?op=pref-users"
-                title="<i class='material-icons'>person</i> <?php echo __('Users') ?>"></div>
+                title="<i class='material-icons'>person</i> <?= __('Users') ?>"></div>
             <div id="systemTab" dojoType="dijit.layout.ContentPane"
                 href="backend.php?op=pref-system"
-                title="<i class='material-icons'>info_outline</i> <?php echo __('System') ?>"></div>
+                title="<i class='material-icons'>info_outline</i> <?= __('System') ?>"></div>
         <?php } ?>
         <?php
             PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS);
@@ -162,8 +162,8 @@
 		<?php $version = get_version($git_commit, $git_timestamp, $last_error); ?>
 		<div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
 		<a class="text-muted" target="_blank" href="https://tt-rss.org/">Tiny Tiny RSS</a>
-			<span title="<?php echo htmlspecialchars($last_error) ?>">v<?php echo $version ?></span>
-        &copy; 2005-<?php echo date('Y') ?>
+			<span title="<?= htmlspecialchars($last_error) ?>">v<?= $version ?></span>
+        &copy; 2005-<?= date('Y') ?>
         <a class="text-muted" target="_blank"
         href="https://fakecake.org/">Andrew Dolgov</a>
     </div> <!-- footer -->
-- 
cgit v1.2.3-54-g00ecf


From a2e688fcb2d463a5db700ebd013c783e3a8f4971 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 14 Feb 2021 22:17:13 +0300
Subject: render headline-specific toolbar on the client

---
 classes/feeds.php        | 123 +++++++++--------------------------------------
 classes/pref/feeds.php   |  22 ++++++---
 index.php                |   4 +-
 js/CommonDialogs.js      |  13 ++---
 js/Headlines.js          |  61 +++++++++++++++++++++--
 plugins/mail/init.php    |   7 ++-
 plugins/mailto/init.php  |   5 ++
 themes/compact.css       |   5 +-
 themes/compact_night.css |   5 +-
 themes/light.css         |   5 +-
 themes/light/tt-rss.less |   4 +-
 themes/night.css         |   5 +-
 themes/night_blue.css    |   5 +-
 13 files changed, 136 insertions(+), 128 deletions(-)

(limited to 'plugins')

diff --git a/classes/feeds.php b/classes/feeds.php
index e6bd1459d..0a3e77a1a 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -16,103 +16,6 @@ class Feeds extends Handler_Protected {
 		return array_search($method, $csrf_ignored) !== false;
 	}
 
-	private function format_headline_subtoolbar($feed_site_url, $feed_title,
-			$feed_id, $is_cat, $search,
-			$error, $feed_last_updated) {
-
-		$cat_q = $is_cat ? "&is_cat=$is_cat" : "";
-
-		if ($search) {
-			$search_q = "&q=$search";
-		} else {
-			$search_q = "";
-		}
-
-		$reply = "";
-
-		$rss_link = htmlspecialchars(get_self_url_prefix() .
-			"/public.php?op=rss&id=${feed_id}${cat_q}${search_q}");
-
-		$reply .= "<span class='left'>";
-
-		$reply .= "<a href=\"#\"
-				title=\"".__("Show as feed")."\"
-				onclick='CommonDialogs.generatedFeed(\"$feed_id\", \"$is_cat\", \"$rss_link\")'>
-				<i class='icon-syndicate material-icons'>rss_feed</i></a>";
-
-		$reply .= "<span id='feed_title'>";
-
-		if ($feed_site_url) {
-			$last_updated = T_sprintf("Last updated: %s", $feed_last_updated);
-
-			$reply .= "<a title=\"$last_updated\" target='_blank' href=\"$feed_site_url\">".
-				truncate_string(strip_tags($feed_title), 30)."</a>";
-		} else {
-			$reply .= strip_tags($feed_title);
-		}
-
-		if ($error)
-			$reply .= " <i title=\"" . htmlspecialchars($error) . "\" class='material-icons icon-error'>error</i>";
-
-		$reply .= "</span>";
-		$reply .= "<span id='feed_current_unread' style='display: none'></span>";
-		$reply .= "</span>";
-
-		$reply .= "<span class=\"right\">";
-		$reply .= "<span id='selected_prompt'></span>";
-		$reply .= "&nbsp;";
-
-		$reply .= "<div dojoType='fox.form.DropDownButton' title='".__('Select articles')."'>
-			<span>".__("Select...")."</span>
-			<div dojoType='dijit.Menu' style='display: none;'>
-			<div dojoType='dijit.MenuItem' onclick='Headlines.select(\"all\")'>".__('All')."</div>
-			<div dojoType='dijit.MenuItem' onclick='Headlines.select(\"unread\")'>".__('Unread')."</div>
-			<div dojoType='dijit.MenuItem' onclick='Headlines.select(\"invert\")'>".__('Invert')."</div>
-			<div dojoType='dijit.MenuItem' onclick='Headlines.select(\"none\")'>".__('None')."</div>
-			<div dojoType='dijit.MenuSeparator'></div>
-			<div dojoType='dijit.MenuItem' onclick='Headlines.selectionToggleUnread()'>".__('Toggle unread')."</div>
-			<div dojoType='dijit.MenuItem' onclick='Headlines.selectionToggleMarked()'>".__('Toggle starred')."</div>
-			<div dojoType='dijit.MenuItem' onclick='Headlines.selectionTogglePublished()'>".__('Toggle published')."</div>
-			<div dojoType='dijit.MenuSeparator'></div>
-			<div dojoType='dijit.MenuItem' onclick='Headlines.catchupSelection()'>".__('Mark as read')."</div>
-			<div dojoType='dijit.MenuItem' onclick='Article.selectionSetScore()'>".__('Set score')."</div>";
-
-		// TODO: move to mail plugin
-		if (PluginHost::getInstance()->get_plugin("mail")) {
-			$reply .= "<div dojoType='dijit.MenuItem' value='Plugins.Mail.send()'>".__('Forward by email')."</div>";
-		}
-
-		// TODO: move to mailto plugin
-		if (PluginHost::getInstance()->get_plugin("mailto")) {
-			$reply .= "<div dojoType='dijit.MenuItem' value='Plugins.Mailto.send()'>".__('Forward by email')."</div>";
-		}
-
-		PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_HEADLINE_TOOLBAR_SELECT_MENU_ITEM,
-			function ($result) use (&$reply) {
-				$reply .= $result;
-			},
-			$feed_id, $is_cat);
-
-		if ($feed_id == 0 && !$is_cat) {
-			$reply .= "<div dojoType='dijit.MenuSeparator'></div>
-				<div dojoType='dijit.MenuItem' class='text-error' onclick='Headlines.deleteSelection()'>".__('Delete permanently')."</div>";
-		}
-
-		$reply .= "</div>"; /* menu */
-
-		$reply .= "</div>"; /* dropdown */
-
-		PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_HEADLINE_TOOLBAR_BUTTON,
-			function ($result) use (&$reply) {
-				$reply .= $result;
-			},
-			$feed_id, $is_cat);
-
-		$reply .= "</span>";
-
-		return $reply;
-	}
-
 	private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
 					$offset, $override_order = false, $include_children = false, $check_first_id = false,
 					$skip_first_id_check = false, $order_by = false) {
@@ -222,10 +125,28 @@ class Feeds extends Handler_Protected {
 		$reply['search_query'] = [$search, $search_language];
 		$reply['vfeed_group_enabled'] = $vfeed_group_enabled;
 
-		$reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,
-			$feed_title,
-			$feed, $cat_view, $search,
-			$last_error, $last_updated);
+		$plugin_menu_items = "";
+		PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_HEADLINE_TOOLBAR_SELECT_MENU_ITEM,
+			function ($result) use (&$plugin_menu_items) {
+				$plugin_menu_items .= $result;
+			},
+			$feed, $cat_view);
+
+		$plugin_buttons = "";
+		PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_HEADLINE_TOOLBAR_BUTTON,
+			function ($result) use (&$plugin_buttons) {
+				$plugin_buttons .= $result;
+			},
+			$feed, $cat_view);
+
+		$reply['toolbar'] = [
+			'site_url' => $feed_site_url,
+			'title' => truncate_string(strip_tags($feed_title), 30),
+			'error' => $last_error,
+			'last_updated' => $last_updated,
+			'plugin_menu_items' => $plugin_menu_items,
+			'plugin_buttons' => $plugin_buttons,
+		];
 
 		$reply['content'] = [];
 
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 6b5df0289..e225949f2 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1358,14 +1358,12 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	private function index_shared() {
-		$rss_url = htmlspecialchars(get_self_url_prefix() .
-			"/public.php?op=rss&id=-2&view-mode=all_articles");
 		?>
 
 		<h3><?= __('Published articles can be subscribed by anyone who knows the following URL:') ?></h3>
 
 		<button dojoType='dijit.form.Button' class='alt-primary'
-			onclick='CommonDialogs.generatedFeed(-2, false, "<?= $rss_url ?>", "<?= __("Published articles") ?>")'>
+			onclick="CommonDialogs.generatedFeed(-2, false)">
 			<?= __('Display URL') ?>
 		</button>
 
@@ -1603,11 +1601,23 @@ class Pref_Feeds extends Handler_Protected {
 		print json_encode(["link" => $new_key]);
 	}
 
-	function getFeedKey() {
+	function getsharedurl() {
 		$feed_id = clean($_REQUEST['id']);
-		$is_cat = clean($_REQUEST['is_cat']);
+		$is_cat = clean($_REQUEST['is_cat']) == "true";
+		$search = clean($_REQUEST['search']);
+
+		$link = get_self_url_prefix() . "/public.php?" . http_build_query([
+			'op' => 'rss',
+			'id' => $feed_id,
+			'is_cat' => (int)$is_cat,
+			'q' => $search,
+			'key' => Feeds::get_feed_access_key($feed_id, $is_cat, $_SESSION["uid"])
+		]);
 
-		print json_encode(["link" => Feeds::get_feed_access_key($feed_id, $is_cat, $_SESSION["uid"])]);
+		print json_encode([
+			"title" => Feeds::getFeedTitle($feed_id, $is_cat),
+			"link" => $link
+		]);
 	}
 
 	private function update_feed_access_key($feed_id, $is_cat, $owner_uid) {
diff --git a/index.php b/index.php
index 8bfca1af2..d53fb54a8 100644
--- a/index.php
+++ b/index.php
@@ -176,9 +176,9 @@
 				});
             ?>
 
-            <form id="toolbar-headlines" action="" style="order : 10" onsubmit='return false'>
+            <div id="toolbar-headlines" dojoType="fox.Toolbar" style="order : 10">
 
-            </form>
+            </div>
 
             <form id="toolbar-main" action="" style="order : 20" onsubmit='return false'>
 
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index 5a72f705b..e6b1822c2 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -433,24 +433,19 @@ const	CommonDialogs = {
 				}
 			});
 		},
-		generatedFeed: function(feed, is_cat, rss_url, feed_title) {
+		generatedFeed: function(feed, is_cat, search = "") {
 
 			Notify.progress("Loading, please wait...", true);
 
-			xhrJson("backend.php", {op: "pref-feeds", method: "getFeedKey", id: feed, is_cat: is_cat}, (reply) => {
+			xhrJson("backend.php", {op: "pref-feeds", method: "getsharedurl", id: feed, is_cat: is_cat, search: search}, (reply) => {
 				try {
-					if (!feed_title && typeof Feeds != "undefined")
-						feed_title = Feeds.getName(feed, is_cat);
-
-					const secret_url = rss_url + "&key=" + encodeURIComponent(reply.link);
-
 					const dialog = new fox.SingleUseDialog({
 						title: __("Show as feed"),
 						content: `
-							<header>${__("%s can be accessed via the following secret URL:").replace("%s", feed_title)}</header>
+							<header>${__("%s can be accessed via the following secret URL:").replace("%s", App.escapeHtml(reply.title))}</header>
 							<section>
 								<div class='panel text-center'>
-									<a id='gen_feed_url' href="${App.escapeHtml(secret_url)}" target='_blank'>${secret_url}</a>
+									<a id='gen_feed_url' href="${App.escapeHtml(reply.link)}" target='_blank'>${App.escapeHtml(reply.link)}</a>
 								</div>
 							</section>
 							<footer>
diff --git a/js/Headlines.js b/js/Headlines.js
index ea4c81a6a..954b6b45f 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -566,6 +566,58 @@ const Headlines = {
 			}
 		}
 	},
+	renderToolbar: function(headlines) {
+
+		const tb = headlines['toolbar'];
+		const search_query = Feeds._search_query ? Feeds._search_query.query : "";
+		const target = dijit.byId('toolbar-headlines');
+
+		target.attr('innerHTML',
+		`
+			<span class='left'>
+				<a href="#" title="${__("Show as feed")}"
+					onclick='CommonDialogs.generatedFeed("${headlines.id}", ${headlines.is_cat}, "${App.escapeHtml(search_query)}")'>
+					<i class='icon-syndicate material-icons'>rss_feed</i>
+				</a>
+				${tb.site_url ?
+					`<a class="feed_title" target="_blank" href="${App.escapeHtml(tb.site_url)}" title="${tb.last_updated}">${tb.title}</a>`	:
+					`<span class="feed_title">${tb.title}</span>`}
+				${search_query ?
+					`
+					<span class='cancel_search'>(<a href='#' onclick='Feeds.cancelSearch()'>${__("Cancel search")}</a>)</span>
+					` : ''}
+				${tb.error ? `<i title="${App.escapeHtml(tb.error)}" class='material-icons icon-error'>error</i>` : ''}
+				<span id='feed_current_unread' style='display: none'></span>
+			</span>
+			<span class='right'>
+				<span id='selected_prompt'></span>
+				<div dojoType='fox.form.DropDownButton' title='"${__('Select articles')}'>
+					<span>${__("Select...")}</span>
+					<div dojoType='dijit.Menu' style='display: none;'>
+					<div dojoType='dijit.MenuItem' onclick='Headlines.select("all")'>${__('All')}</div>
+					<div dojoType='dijit.MenuItem' onclick='Headlines.select("unread")'>${__('Unread')}</div>
+					<div dojoType='dijit.MenuItem' onclick='Headlines.select("invert")'>${__('Invert')}</div>
+					<div dojoType='dijit.MenuItem' onclick='Headlines.select("none")'>${__('None')}</div>
+					<div dojoType='dijit.MenuSeparator'></div>
+					<div dojoType='dijit.MenuItem' onclick='Headlines.selectionToggleUnread()'>${__('Toggle unread')}</div>
+					<div dojoType='dijit.MenuItem' onclick='Headlines.selectionToggleMarked()'>${__('Toggle starred')}</div>
+					<div dojoType='dijit.MenuItem' onclick='Headlines.selectionTogglePublished()'>${__('Toggle published')}</div>
+					<div dojoType='dijit.MenuSeparator'></div>
+					<div dojoType='dijit.MenuItem' onclick='Headlines.catchupSelection()'>${__('Mark as read')}</div>
+					<div dojoType='dijit.MenuItem' onclick='Article.selectionSetScore()'>${__('Set score')}</div>
+					${tb.plugin_menu_items}
+					${headlines.id === 0 && !headlines.is_cat ?
+						`
+						<div dojoType='dijit.MenuSeparator'></div>
+						<div dojoType='dijit.MenuItem' class='text-error' onclick='Headlines.deleteSelection()'>${__('Delete permanently')}</div>
+						` : ''}
+				</div>
+				${tb.plugin_buttons}
+			</span>
+		`);
+
+		dojo.parser.parse(target.domNode);
+	},
 	onLoaded: function (transport, offset, append) {
 		const reply = App.handleRpcJson(transport);
 
@@ -613,9 +665,11 @@ const Headlines = {
 				this.headlines = [];
 				this.vgroup_last_feed = undefined;
 
-				dojo.html.set($("toolbar-headlines"),
+				/*dojo.html.set($("toolbar-headlines"),
 					reply['headlines']['toolbar'],
-					{parseContent: true});
+					{parseContent: true});*/
+
+				Headlines.renderToolbar(reply['headlines']);
 
 				if (typeof reply['headlines']['content'] == 'string') {
 					$("headlines-frame").innerHTML = reply['headlines']['content'];
@@ -646,11 +700,12 @@ const Headlines = {
 					hsp.innerHTML = "<a href='#' onclick='Feeds.openNextUnread()'>" +
 						__("Click to open next unread feed.") + "</a>";
 
+				/*
 				if (Feeds._search_query) {
 					$("feed_title").innerHTML += "<span id='cancel_search'>" +
 						" (<a href='#' onclick='Feeds.cancelSearch()'>" + __("Cancel search") + "</a>)" +
 						"</span>";
-				}
+				} */
 
 				Headlines.updateCurrentUnread();
 
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 40d147fc9..829620ebc 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -15,12 +15,17 @@ class Mail extends Plugin {
 
 		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
 		$host->add_hook($host::HOOK_PREFS_TAB, $this);
+		$host->add_hook($host::HOOK_HEADLINE_TOOLBAR_SELECT_MENU_ITEM, $this);
 	}
 
 	function get_js() {
 		return file_get_contents(dirname(__FILE__) . "/mail.js");
 	}
 
+	function hook_headline_toolbar_select_menu_item($feed_id, $is_cat) {
+		return "<div dojoType='dijit.MenuItem' onclick='Plugins.Mail.send()'>".__('Forward by email')."</div>";
+	}
+
 	function save() {
 		$addresslist = $_POST["addresslist"];
 
@@ -32,7 +37,7 @@ class Mail extends Plugin {
 	function hook_prefs_tab($args) {
 		if ($args != "prefPrefs") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\" 
+		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>mail</i> ".__('Mail plugin')."\">";
 
 		print "<p>" . __("You can set predefined email addressed here (comma-separated list):") . "</p>";
diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index 390984b71..3e24dcf29 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -12,6 +12,11 @@ class MailTo extends Plugin {
 		$this->host = $host;
 
 		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+		$host->add_hook($host::HOOK_HEADLINE_TOOLBAR_SELECT_MENU_ITEM, $this);
+	}
+
+	function hook_headline_toolbar_select_menu_item($feed_id, $is_cat) {
+		return "<div dojoType='dijit.MenuItem' onclick='Plugins.Mailto.send()'>".__('Forward by email')."</div>";
 	}
 
 	function get_js() {
diff --git a/themes/compact.css b/themes/compact.css
index 24380d428..6e4f59c84 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -704,6 +704,8 @@ body.ttrss_main #toolbar-frame #toolbar i {
   margin: 0 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
+  font-size: 12px;
+  background: transparent;
   padding-right: 4px;
   flex-grow: 2;
   display: flex;
@@ -713,7 +715,8 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
   display: flex;
   align-items: center;
 }
-body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left #feed_title {
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .feed_title,
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .cancel_search {
   margin-left: 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
diff --git a/themes/compact_night.css b/themes/compact_night.css
index a366404a4..7dd4c0b0e 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -704,6 +704,8 @@ body.ttrss_main #toolbar-frame #toolbar i {
   margin: 0 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
+  font-size: 12px;
+  background: transparent;
   padding-right: 4px;
   flex-grow: 2;
   display: flex;
@@ -713,7 +715,8 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
   display: flex;
   align-items: center;
 }
-body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left #feed_title {
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .feed_title,
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .cancel_search {
   margin-left: 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
diff --git a/themes/light.css b/themes/light.css
index d3f5d7978..6f70862d6 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -704,6 +704,8 @@ body.ttrss_main #toolbar-frame #toolbar i {
   margin: 0 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
+  font-size: 12px;
+  background: transparent;
   padding-right: 4px;
   flex-grow: 2;
   display: flex;
@@ -713,7 +715,8 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
   display: flex;
   align-items: center;
 }
-body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left #feed_title {
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .feed_title,
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .cancel_search {
   margin-left: 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index d13ffff3e..4632997ba 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -820,6 +820,8 @@ body.ttrss_main {
 			}
 
 			#toolbar-headlines {
+				font-size : 12px;
+				background: transparent;
 				padding-right : 4px;
 				flex-grow : 2;
 				display : flex;
@@ -829,7 +831,7 @@ body.ttrss_main {
 					display : flex;
 					align-items : center;
 
-					#feed_title {
+					.feed_title, .cancel_search {
 						margin-left : 4px;
 					}
 				}
diff --git a/themes/night.css b/themes/night.css
index 87a68a3c0..579f6dcdf 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -705,6 +705,8 @@ body.ttrss_main #toolbar-frame #toolbar i {
   margin: 0 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
+  font-size: 12px;
+  background: transparent;
   padding-right: 4px;
   flex-grow: 2;
   display: flex;
@@ -714,7 +716,8 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
   display: flex;
   align-items: center;
 }
-body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left #feed_title {
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .feed_title,
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .cancel_search {
   margin-left: 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 02a66656b..3697cff05 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -705,6 +705,8 @@ body.ttrss_main #toolbar-frame #toolbar i {
   margin: 0 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines {
+  font-size: 12px;
+  background: transparent;
   padding-right: 4px;
   flex-grow: 2;
   display: flex;
@@ -714,7 +716,8 @@ body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left {
   display: flex;
   align-items: center;
 }
-body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left #feed_title {
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .feed_title,
+body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .left .cancel_search {
   margin-left: 4px;
 }
 body.ttrss_main #toolbar-frame #toolbar #toolbar-headlines .right {
-- 
cgit v1.2.3-54-g00ecf


From 82adb01307e108e8a2b4eeb900552160d730d0b7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 14:10:46 +0300
Subject: render enclosures on the client

---
 classes/api.php                  |   6 +-
 classes/article.php              | 173 ++++++++++-----------------------------
 classes/feeds.php                |   6 +-
 classes/handler/public.php       |  13 ++-
 classes/rpc.php                  |   2 -
 include/controls.php             |  31 -------
 js/App.js                        |  18 ++--
 js/Article.js                    |  58 ++++++++++++-
 js/Headlines.js                  |   2 +-
 plugins/shorten_expanded/init.js |  27 +++---
 10 files changed, 136 insertions(+), 200 deletions(-)

(limited to 'plugins')

diff --git a/classes/api.php b/classes/api.php
index 6debad2f7..2531f0017 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -311,8 +311,6 @@ class API extends Handler {
 
 			while ($line = $sth->fetch()) {
 
-				$attachments = Article::get_article_enclosures($line['id']);
-
 				$article = array(
 					"id" => $line["id"],
 					"guid" => $line["guid"],
@@ -326,7 +324,7 @@ class API extends Handler {
 					"author" => $line["author"],
 					"updated" => (int) strtotime($line["updated"]),
 					"feed_id" => $line["feed_id"],
-					"attachments" => $attachments,
+					"attachments" => Article::get_enclosures($line['id']),
 					"score" => (int)$line["score"],
 					"feed_title" => $line["feed_title"],
 					"note" => $line["note"],
@@ -736,7 +734,7 @@ class API extends Handler {
 						"tags" => $tags,
 					);
 
-					$enclosures = Article::get_article_enclosures($line['id']);
+					$enclosures = Article::get_enclosures($line['id']);
 
 					if ($include_attachments)
 						$headline_row['attachments'] = $enclosures;
diff --git a/classes/article.php b/classes/article.php
index 5ea936985..00d9d09c5 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -352,145 +352,62 @@ class Article extends Handler_Protected {
 		}
 	}
 
-	static function format_article_enclosures($id, $always_display_enclosures,
-									   $article_content, $hide_images = false) {
-
-		$result = self::get_article_enclosures($id);
-		$rv = '';
+	static function format_enclosures($id,
+										$always_display_enclosures,
+									   $article_content,
+										$hide_images = false) {
+
+		$enclosures = self::get_enclosures($id);
+		$rv = [];
+		$enclosures_formatted = "";
+
+		/*foreach ($enclosures as &$enc) {
+			array_push($enclosures, [
+				"type" => $enc["content_type"],
+				"filename" => basename($enc["content_url"]),
+				"url" => $enc["content_url"],
+				"title" => $enc["title"],
+				"width" => (int) $enc["width"],
+				"height" => (int) $enc["height"]
+			]);
+		}*/
 
 		PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_FORMAT_ENCLOSURES,
-			function ($result) use (&$rv) {
+			function ($result) use (&$enclosures_formatted, &$enclosures) {
 				if (is_array($result)) {
-					$rv = $result[0];
-					$result = $result[1];
+					$enclosures_formatted = $result[0];
+					$enclosures = $result[1];
 				} else {
-					$rv = $result;
+					$enclosures_formatted = $result;
 				}
 			},
-			$rv, $result, $id, $always_display_enclosures, $article_content, $hide_images);
-
-		if ($rv === '' && !empty($result)) {
-			$entries_html = array();
-			$entries = array();
-			$entries_inline = array();
-
-			foreach ($result as $line) {
-
-				PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_ENCLOSURE_ENTRY,
-					function($result) use (&$line) {
-						$line = $result;
-					},
-					$line, $id);
-
-				$url = $line["content_url"];
-				$ctype = $line["content_type"];
-				$title = $line["title"];
-				$width = $line["width"];
-				$height = $line["height"];
-
-				if (!$ctype) $ctype = __("unknown type");
-
-				//$filename = substr($url, strrpos($url, "/")+1);
-				$filename = basename($url);
-
-				$player = format_inline_player($url, $ctype);
-
-				if ($player) array_push($entries_inline, $player);
-
-#				$entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\" rel=\"noopener noreferrer\">" .
-#					$filename . " (" . $ctype . ")" . "</a>";
-
-				$entry = "<div onclick=\"Article.popupOpenUrl('".htmlspecialchars($url)."')\"
-					dojoType=\"dijit.MenuItem\">$filename ($ctype)</div>";
-
-				array_push($entries_html, $entry);
-
-				$entry = array();
-
-				$entry["type"] = $ctype;
-				$entry["filename"] = $filename;
-				$entry["url"] = $url;
-				$entry["title"] = $title;
-				$entry["width"] = $width;
-				$entry["height"] = $height;
+			$enclosures_formatted, $enclosures, $id, $always_display_enclosures, $article_content, $hide_images);
 
-				array_push($entries, $entry);
-			}
-
-			if ($_SESSION['uid'] && !get_pref("STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
-				if ($always_display_enclosures ||
-					!preg_match("/<img/i", $article_content)) {
-
-					foreach ($entries as $entry) {
-
-						$retval = null;
-
-						PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_RENDER_ENCLOSURE,
-							function($result) use (&$retval) {
-								$retval = $result;
-							},
-							$entry, $hide_images);
-
-						if (!empty($retval)) {
-							$rv .= $retval;
-						} else {
-
-							if (preg_match("/image/", $entry["type"])) {
-
-								if (!$hide_images) {
-									$encsize = '';
-									if ($entry['height'] > 0)
-										$encsize .= ' height="' . intval($entry['height']) . '"';
-									if ($entry['width'] > 0)
-										$encsize .= ' width="' . intval($entry['width']) . '"';
-									$rv .= "<p><img loading=\"lazy\"
-										alt=\"".htmlspecialchars($entry["filename"])."\"
-										src=\"" .htmlspecialchars($entry["url"]) . "\"
-										" . $encsize . " /></p>";
-								} else {
-									$rv .= "<p><a target=\"_blank\" rel=\"noopener noreferrer\"
-										href=\"".htmlspecialchars($entry["url"])."\"
-										>" .htmlspecialchars($entry["url"]) . "</a></p>";
-								}
-
-								if ($entry['title']) {
-									$rv.= "<div class=\"enclosure_title\">${entry['title']}</div>";
-								}
-							}
-						}
-					}
-				}
-			}
-
-			if (count($entries_inline) > 0) {
-				//$rv .= "<hr clear='both'/>";
-				foreach ($entries_inline as $entry) { $rv .= $entry; };
-				$rv .= "<br clear='both'/>";
-			}
+		if (!empty($enclosures_formatted)) {
+			$rv['formatted'] = $enclosures_formatted;
+			return $rv;
+		}
 
-			$rv .= "<div class=\"attachments\" dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Attachments')."</span>";
+		$rv['can_inline'] = isset($_SESSION["uid"]) &&
+									empty($_SESSION["bw_limit"]) &&
+									!get_pref("STRIP_IMAGES") &&
+									($always_display_enclosures || !preg_match("/<img/i", $article_content));
 
-			$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+		$rv['inline_text_only'] = $hide_images && $rv['can_inline'];
 
-			foreach ($entries as $entry) {
-				if ($entry["title"])
-					$title = " &mdash; " . truncate_string($entry["title"], 30);
-				else
-					$title = "";
+		$rv['entries'] = [];
 
-				if ($entry["filename"])
-					$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
-				else
-					$filename = "";
+		foreach ($enclosures as $enc) {
 
-				$rv .= "<div onclick='Article.popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
-					dojoType=\"dijit.MenuItem\">".$filename . $title."</div>";
+			// this is highly approximate
+			$enc["filename"] = basename($enc["content_url"]);
 
-			};
-
-			$rv .= "</div>";
-			$rv .= "</div>";
+			PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_ENCLOSURE_ENTRY,
+				function ($result) use (&$enc) {
+					$enc = $result;
+				},
+				$enc, $id);
+			array_push($rv['entries'], $enc);
 		}
 
 		return $rv;
@@ -613,7 +530,7 @@ class Article extends Handler_Protected {
 		}
 	}
 
-	static function get_article_enclosures($id) {
+	static function get_enclosures($id) {
 
 		$pdo = Db::pdo();
 
@@ -625,7 +542,7 @@ class Article extends Handler_Protected {
 
 		$cache = new DiskCache("images");
 
-		while ($line = $sth->fetch()) {
+		while ($line = $sth->fetch(PDO::FETCH_ASSOC)) {
 
 			if ($cache->exists(sha1($line["content_url"]))) {
 				$line["content_url"] = $cache->getUrl(sha1($line["content_url"]));
diff --git a/classes/feeds.php b/classes/feeds.php
index ba320b52f..d49fe7698 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -283,8 +283,10 @@ class Feeds extends Handler_Protected {
 
 				$this->mark_timestamp("   pre-enclosures");
 
-				$line["enclosures"] = Article::format_article_enclosures($id, $line["always_display_enclosures"],
-					$line["content"], $line["hide_images"]);
+				$line["enclosures"] = Article::format_enclosures($id,
+					$line["always_display_enclosures"],
+					$line["content"],
+					$line["hide_images"]);
 
 				$this->mark_timestamp("   enclosures");
 
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 79f3a9e6c..0613e9a28 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -131,7 +131,7 @@ class Handler_Public extends Handler {
 					$tpl->addBlock('category');
 				}
 
-				$enclosures = Article::get_article_enclosures($line["id"]);
+				$enclosures = Article::get_enclosures($line["id"]);
 
 				if (count($enclosures) > 0) {
 					foreach ($enclosures as $e) {
@@ -218,7 +218,7 @@ class Handler_Public extends Handler {
 					}
 				}
 
-				$enclosures = Article::get_article_enclosures($line["id"]);
+				$enclosures = Article::get_enclosures($line["id"]);
 
 				if (count($enclosures) > 0) {
 					$article['enclosures'] = array();
@@ -356,9 +356,7 @@ class Handler_Public extends Handler {
 
 			$line['content'] = DiskCache::rewriteUrls($line['content']);
 
-			$enclosures = Article::get_article_enclosures($line["id"]);
-
-            header("Content-Type: text/html");
+			header("Content-Type: text/html");
 
             $rv .= "<!DOCTYPE html>
                     <html><head>
@@ -392,6 +390,7 @@ class Handler_Public extends Handler {
 
             $rv .= "</head>";
 
+				$enclosures = Article::get_enclosures($line["id"]);
             list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $line["site_url"]);
 
             if ($og_image) {
@@ -436,10 +435,10 @@ class Handler_Public extends Handler {
 
 			$rv .= $line["content"];
 
-            $rv .= Article::format_article_enclosures($id,
+         /*  $rv .= Article::format_article_enclosures($id,
                 $line["always_display_enclosures"],
                 $line["content"],
-                $line["hide_images"]);
+                $line["hide_images"]); */
 
 			$rv .= "</div>"; # content
 
diff --git a/classes/rpc.php b/classes/rpc.php
index f6b57775d..e0753a08e 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -192,9 +192,7 @@ class RPC extends Handler_Protected {
 	}
 
 	function sanityCheck() {
-		$_SESSION["hasAudio"] = clean($_REQUEST["hasAudio"]) === "true";
 		$_SESSION["hasSandbox"] = clean($_REQUEST["hasSandbox"]) === "true";
-		$_SESSION["hasMp3"] = clean($_REQUEST["hasMp3"]) === "true";
 		$_SESSION["clientTzOffset"] = clean($_REQUEST["clientTzOffset"]);
 
 		$reply = array();
diff --git a/include/controls.php b/include/controls.php
index e6678db9a..f706931db 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -298,37 +298,6 @@ function print_error($msg) {
 	return print format_error($msg);
 }
 
-function format_inline_player($url, $ctype) {
-
-	$entry = "";
-
-	$url = htmlspecialchars($url);
-
-	if (strpos($ctype, "audio/") === 0) {
-
-		$entry .= "<div class='inline-player'>";
-
-		if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
-				$_SESSION["hasMp3"])) {
-
-			$entry .= "<audio preload=\"none\" controls>
-					<source type=\"$ctype\" src=\"$url\"/>
-					</audio> ";
-
-		}
-
-		if ($entry) $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
-				href=\"$url\">" . basename($url) . "</a>";
-
-		$entry .= "</div>";
-
-		return $entry;
-
-	}
-
-	return "";
-}
-
 function print_label_select($name, $value, $attributes = "") {
 
 	$pdo = Db::pdo();
diff --git a/js/App.js b/js/App.js
index 0a72d1b12..3a31438c5 100644
--- a/js/App.js
+++ b/js/App.js
@@ -586,6 +586,10 @@ const App = {
 	isPrefs() {
 		return this.is_prefs;
    },
+   audioCanPlay: function(ctype) {
+      const a = document.createElement('audio');
+      return a.canPlayType(ctype);
+   },
    init: function(parser, is_prefs) {
       this.is_prefs = is_prefs;
       window.onerror = this.Error.onWindowError;
@@ -604,17 +608,11 @@ const App = {
          this.initHotkeyActions();
          this.enableCsrfSupport();
 
-         const a = document.createElement('audio');
-         const hasAudio = !!a.canPlayType;
-         const hasSandbox = "sandbox" in document.createElement("iframe");
-         const hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
-         const clientTzOffset = new Date().getTimezoneOffset() * 60;
-
          const params = {
-            op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
-            hasMp3: hasMp3,
-            clientTzOffset: clientTzOffset,
-            hasSandbox: hasSandbox
+            op: "rpc",
+            method: "sanityCheck",
+            clientTzOffset: new Date().getTimezoneOffset() * 60,
+            hasSandbox: "sandbox" in document.createElement("iframe")
          };
 
          xhrPost("backend.php", params, (transport) => {
diff --git a/js/Article.js b/js/Article.js
index f8b0415b9..efe33bc99 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -140,6 +140,62 @@ const Article = {
 
 		Headlines.toggleUnread(id, 0);
 	},
+	renderEnclosures: function (enclosures) {
+
+		// enclosure list was handled by backend (HOOK_FORMAT_ENCLOSURES)
+		if (enclosures.formatted)
+			return enclosures.formatted;
+
+		return `
+				${enclosures.can_inline ?
+					`<div class='attachments-inline'>
+						${enclosures.entries.map((enc) => {
+							if (!enclosures.inline_text_only) {
+								if (enc.content_type && enc.content_type.indexOf("image/") != -1) {
+									return `<p>
+										<img loading="lazy"
+											width="${enc.width ? enc.width : ''}"
+											height="${enc.height ? enc.height : ''}"
+											src="${App.escapeHtml(enc.content_url)}"
+											title="${App.escapeHtml(enc.title ? enc.title : enc.content_url)}"/>
+									</p>`
+								} else if (enc.content_type && enc.content_type.indexOf("audio/") != -1 && App.audioCanPlay(enc.content_type)) {
+									return `<p class='inline-player' title="${App.escapeHtml(enc.content_url)}">
+										<audio preload="none" controls="controls">
+											<source type="${App.escapeHtml(enc.content_type)}" src="${App.escapeHtml(enc.content_url)}"/>
+										</audio>
+									</p>
+									`;
+								} else {
+									return `<p>
+										<a target="_blank" href="${App.escapeHtml(enc.content_url)}"
+											title="${App.escapeHtml(enc.title ? enc.title : enc.content_url)}"
+											rel="noopener noreferrer">${App.escapeHtml(enc.content_url)}</a>
+										</p>`
+								}
+							} else {
+								return `<p>
+									<a target="_blank" href="${App.escapeHtml(enc.content_url)}"
+										title="${App.escapeHtml(enc.title ? enc.title : enc.content_url)}"
+										rel="noopener noreferrer">${App.escapeHtml(enc.content_url)}</a>
+									</p>`
+							}
+						}).join("")}
+					</div>` : ''}
+			${enclosures.entries.length > 0 ?
+				`<div class="attachments" dojoType="fox.form.DropDownButton">
+					<span>${__('Attachments')}</span>
+					<div dojoType="dijit.Menu" style="display: none">
+					${enclosures.entries.map((enc) => `
+							<div onclick='Article.popupOpenUrl("${App.escapeHtml(enc.content_url)}")'
+								title="${App.escapeHtml(enc.title ? enc.title : enc.content_url)}" dojoType="dijit.MenuItem">
+									${enc.title ? enc.title : enc.filename}
+							</div>
+						`).join("")}
+					</div>
+				</div>` : ''}
+			`
+	},
 	render: function (article) {
 		App.cleanupMemory("content-insert");
 
@@ -241,7 +297,7 @@ const Article = {
 					<div id="POSTNOTE-${hl.id}">${hl.note}</div>
 					<div class="content" lang="${hl.lang ? hl.lang : 'en'}">
 						${hl.content}
-						${hl.enclosures}
+						${Article.renderEnclosures(hl.enclosures)}
 					</div>
 					</div>`;
 
diff --git a/js/Headlines.js b/js/Headlines.js
index 94541b974..dadf79c1a 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -488,7 +488,7 @@ const Headlines = {
 								<img src="${App.getInitParam('icon_indicator_white')}">
 							</div>
 							<div class="intermediate">
-								${hl.enclosures}
+								${Article.renderEnclosures(hl.enclosures)}
 							</div>
 							<div class="footer" onclick="event.stopPropagation()">
 
diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index 30bfac6ba..181e426a4 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -1,3 +1,5 @@
+/* global Plugins, __, require, PluginHost */
+
 const _shorten_expanded_threshold = 1.5; //window heights
 
 Plugins.Shorten_Expanded = {
@@ -22,26 +24,23 @@ require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 			window.setTimeout(function() {
 				if (row) {
 
-					const c_inner = row.select(".content-inner")[0];
-					const c_inter = row.select(".intermediate")[0];
+					const content = row.querySelector(".content-inner");
+					const attachments = row.querySelector(".attachments-inline");
 
-					if (c_inner && c_inter &&
+					if (content && attachments &&
 						row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
 
-						let tmp = document.createElement("div");
-
-						c_inter.select("> *:not([class*='attachments'])").each(function(p) {
-							p.parentNode.removeChild(p);
-							tmp.appendChild(p);
-						});
-
-						c_inner.innerHTML = `<div class="content-shrink-wrap">
-							${c_inner.innerHTML}
-							${tmp.innerHTML}</div>
+						content.innerHTML = `
+							<div class="content-shrink-wrap">
+								${content.innerHTML}
+								${attachments.innerHTML}
+							</div>
 							<button dojoType="dijit.form.Button" class="alt-info expand-prompt" onclick="return Plugins.Shorten_Expanded.expand('${row.id}')" href="#">
 								${__("Click to expand article")}</button>`;
 
-						dojo.parser.parse(c_inner);
+						attachments.innerHTML = "";
+
+						dojo.parser.parse(content);
 					}
 				}
 			}, 150);
-- 
cgit v1.2.3-54-g00ecf


From 020f062a76746a313fae9c82fbcf9b37fcc9d459 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 15:43:07 +0300
Subject: feeds: unify naming

---
 classes/api.php                                    |  20 +--
 classes/counters.php                               |  14 +-
 classes/feeds.php                                  | 152 ++++++++++-----------
 classes/handler/public.php                         |  12 +-
 classes/opml.php                                   |  12 +-
 classes/pref/feeds.php                             |  24 ++--
 classes/pref/filters.php                           |  12 +-
 classes/rpc.php                                    |   2 +-
 classes/rssutils.php                               |   6 +-
 include/functions.php                              |   2 +-
 js/Feeds.js                                        |   2 +-
 plugins/af_comics/filters/af_comics_gocomics.php   |   2 +-
 .../filters/af_comics_gocomics_farside.php         |   2 +-
 plugins/af_psql_trgm/init.php                      |   2 +-
 plugins/af_readability/init.php                    |   2 +-
 plugins/vf_shared/init.php                         |   2 +-
 16 files changed, 134 insertions(+), 134 deletions(-)

(limited to 'plugins')

diff --git a/classes/api.php b/classes/api.php
index 2531f0017..73e5c221a 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -96,7 +96,7 @@ class API extends Handler {
 		if ($feed_id) {
 			$this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
 		} else {
-			$this->wrap(self::STATUS_OK, array("unread" => Feeds::getGlobalUnread()));
+			$this->wrap(self::STATUS_OK, array("unread" => Feeds::_get_global_unread()));
 		}
 	}
 
@@ -147,7 +147,7 @@ class API extends Handler {
 				$unread = getFeedUnread($line["id"], true);
 
 				if ($enable_nested)
-					$unread += Feeds::getCategoryChildrenUnread($line["id"]);
+					$unread += Feeds::_get_cat_children_unread($line["id"]);
 
 				if ($unread || !$unread_only) {
 					array_push($cats, array("id" => (int) $line["id"],
@@ -165,7 +165,7 @@ class API extends Handler {
 
 				if ($unread || !$unread_only) {
 					array_push($cats, array("id" => $cat_id,
-						"title" => Feeds::getCategoryTitle($cat_id),
+						"title" => Feeds::_get_cat_title($cat_id),
 						"unread" => (int) $unread));
 				}
 			}
@@ -204,7 +204,7 @@ class API extends Handler {
 
 			$_SESSION['hasSandbox'] = $has_sandbox;
 
-			list($override_order, $skip_first_id_check) = Feeds::order_to_override_query(clean($_REQUEST["order_by"] ?? null));
+			list($override_order, $skip_first_id_check) = Feeds::_order_to_override_query(clean($_REQUEST["order_by"] ?? null));
 
 			/* do not rely on params below */
 
@@ -395,7 +395,7 @@ class API extends Handler {
 		if (!in_array($mode, ["all", "1day", "1week", "2week"]))
 			$mode = "all";
 
-		Feeds::catchup_feed($feed_id, $is_cat, $_SESSION["uid"], $mode);
+		Feeds::_catchup($feed_id, $is_cat, $_SESSION["uid"], $mode);
 
 		$this->wrap(self::STATUS_OK, array("status" => "OK"));
 	}
@@ -537,7 +537,7 @@ class API extends Handler {
 					$unread = getFeedUnread($i);
 
 					if ($unread || !$unread_only) {
-						$title = Feeds::getFeedTitle($i);
+						$title = Feeds::_get_title($i);
 
 						$row = array(
 								"id" => $i,
@@ -562,7 +562,7 @@ class API extends Handler {
 
 				while ($line = $sth->fetch()) {
 					$unread = getFeedUnread($line["id"], true) +
-						Feeds::getCategoryChildrenUnread($line["id"]);
+						Feeds::_get_cat_children_unread($line["id"]);
 
 					if ($unread || !$unread_only) {
 						$row = array(
@@ -610,7 +610,7 @@ class API extends Handler {
 
 				$unread = getFeedUnread($line["id"]);
 
-				$has_icon = Feeds::feedHasIcon($line['id']);
+				$has_icon = Feeds::_has_icon($line['id']);
 
 				if ($unread || !$unread_only) {
 
@@ -676,7 +676,7 @@ class API extends Handler {
 				"skip_first_id_check" => $skip_first_id_check
 			);
 
-			$qfh_ret = Feeds::queryFeedHeadlines($params);
+			$qfh_ret = Feeds::_get_headlines($params);
 
 			$result = $qfh_ret[0];
 			$feed_title = $qfh_ret[1];
@@ -826,7 +826,7 @@ class API extends Handler {
 		$password = clean($_REQUEST["password"]);
 
 		if ($feed_url) {
-			$rc = Feeds::subscribe_to_feed($feed_url, $category_id, $login, $password);
+			$rc = Feeds::_subscribe($feed_url, $category_id, $login, $password);
 
 			$this->wrap(self::STATUS_OK, array("status" => $rc));
 		} else {
diff --git a/classes/counters.php b/classes/counters.php
index 59605df18..29ced3d6c 100644
--- a/classes/counters.php
+++ b/classes/counters.php
@@ -25,8 +25,8 @@ class Counters {
 		while ($line = $sth->fetch()) {
 			list ($tmp_unread, $tmp_marked) = self::getCategoryChildrenCounters($line["id"], $owner_uid);
 
-			$unread += $tmp_unread + Feeds::getCategoryUnread($line["id"], $owner_uid);
-			$marked += $tmp_marked + Feeds::getCategoryMarked($line["id"], $owner_uid);
+			$unread += $tmp_unread + Feeds::_get_cat_unread($line["id"], $owner_uid);
+			$marked += $tmp_marked + Feeds::_get_cat_marked($line["id"], $owner_uid);
 		}
 
 		return [$unread, $marked];
@@ -38,7 +38,7 @@ class Counters {
 		/* Labels category */
 
 		$cv = array("id" => -2, "kind" => "cat",
-			"counter" => Feeds::getCategoryUnread(-2));
+			"counter" => Feeds::_get_cat_unread(-2));
 
 		array_push($ret, $cv);
 
@@ -114,8 +114,8 @@ class Counters {
 			$last_error = htmlspecialchars($line["last_error"]);
 			$last_updated = TimeHelper::make_local_datetime($line['last_updated'], false);
 
-			if (Feeds::feedHasIcon($id)) {
-				$has_img = filemtime(Feeds::getIconFile($id));
+			if (Feeds::_has_icon($id)) {
+				$has_img = filemtime(Feeds::_get_icon_file($id));
 			} else {
 				$has_img = false;
 			}
@@ -149,7 +149,7 @@ class Counters {
 		$ret = [];
 
 		if ($global_unread == -1) {
-			$global_unread = Feeds::getGlobalUnread();
+			$global_unread = Feeds::_get_global_unread();
 		}
 
 		$cv = [
@@ -187,7 +187,7 @@ class Counters {
 			$count = getFeedUnread($i);
 
 			if ($i == 0 || $i == -1 || $i == -2)
-				$auxctr = Feeds::getFeedArticles($i, false);
+				$auxctr = Feeds::_get_counters($i, false);
 			else
 				$auxctr = 0;
 
diff --git a/classes/feeds.php b/classes/feeds.php
index 4cc76bd62..6bf176261 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -16,13 +16,13 @@ class Feeds extends Handler_Protected {
 		return array_search($method, $csrf_ignored) !== false;
 	}
 
-	private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
+	private function _format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
 					$offset, $override_order = false, $include_children = false, $check_first_id = false,
 					$skip_first_id_check = false, $order_by = false) {
 
 		$disable_cache = false;
 
-		$this->mark_timestamp("init");
+		$this->_mark_timestamp("init");
 
 		$reply = [];
 		$rgba_cache = [];
@@ -41,7 +41,7 @@ class Feeds extends Handler_Protected {
 		}
 
 		if ($method_split[0] == "MarkAllReadGR")  {
-			$this->catchup_feed($method_split[1], false);
+			$this->_catchup($method_split[1], false);
 		}
 
 		// FIXME: might break tag display?
@@ -103,10 +103,10 @@ class Feeds extends Handler_Protected {
                 "order_by" => $order_by
 			);
 
-			$qfh_ret = $this->queryFeedHeadlines($params);
+			$qfh_ret = $this->_get_headlines($params);
 		}
 
-		$this->mark_timestamp("db query");
+		$this->_mark_timestamp("db query");
 
 		$vfeed_group_enabled = get_pref("VFEED_GROUP_BY_FEED") &&
 			!(in_array($feed, self::NEVER_GROUP_FEEDS) && !$cat_view);
@@ -157,13 +157,13 @@ class Feeds extends Handler_Protected {
 					},
 					$feed, $cat_view, $qfh_ret);
 
-		$this->mark_timestamp("object header");
+		$this->_mark_timestamp("object header");
 
 		$headlines_count = 0;
 
 		if ($result instanceof PDOStatement) {
 			while ($line = $result->fetch(PDO::FETCH_ASSOC)) {
-				$this->mark_timestamp("article start: " . $line["id"] . " " . $line["title"]);
+				$this->_mark_timestamp("article start: " . $line["id"] . " " . $line["title"]);
 
 				++$headlines_count;
 
@@ -181,7 +181,7 @@ class Feeds extends Handler_Protected {
 						$line, $max_excerpt_length);
 				}
 
-				$this->mark_timestamp("   hook_query_headlines");
+				$this->_mark_timestamp("   hook_query_headlines");
 
 				$id = $line["id"];
 
@@ -226,7 +226,7 @@ class Feeds extends Handler_Protected {
 					array_push($topmost_article_ids, $id);
 				}
 
-				$this->mark_timestamp("   labels");
+				$this->_mark_timestamp("   labels");
 
 				$line["feed_title"] = $line["feed_title"] ?? "";
 
@@ -244,32 +244,32 @@ class Feeds extends Handler_Protected {
 					},
 					$line);
 
-				$this->mark_timestamp("   pre-sanitize");
+				$this->_mark_timestamp("   pre-sanitize");
 
 				$line["content"] = Sanitizer::sanitize($line["content"],
 					$line['hide_images'], false, $line["site_url"], $highlight_words, $line["id"]);
 
-				$this->mark_timestamp("   sanitize");
+				$this->_mark_timestamp("   sanitize");
 
 				PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_RENDER_ARTICLE_CDM,
 					function ($result, $plugin) use (&$line) {
 						$line = $result;
-						$this->mark_timestamp("       hook_render_cdm: " . get_class($plugin));
+						$this->_mark_timestamp("       hook_render_cdm: " . get_class($plugin));
 					},
 					$line);
 
-				$this->mark_timestamp("   hook_render_cdm");
+				$this->_mark_timestamp("   hook_render_cdm");
 
 				$line['content'] = DiskCache::rewriteUrls($line['content']);
 
-				$this->mark_timestamp("   disk_cache_rewrite");
+				$this->_mark_timestamp("   disk_cache_rewrite");
 
 				if ($line['note'])
 					$line['note'] = Article::format_article_note($id, $line['note']);
 				else
 					$line['note'] = "";
 
-				$this->mark_timestamp("   note");
+				$this->_mark_timestamp("   note");
 
 				if (!get_pref("CDM_EXPANDED")) {
 					$line["cdm_excerpt"] = "<span class='collapse'>
@@ -281,14 +281,14 @@ class Feeds extends Handler_Protected {
 					}
 				}
 
-				$this->mark_timestamp("   pre-enclosures");
+				$this->_mark_timestamp("   pre-enclosures");
 
 				$line["enclosures"] = Article::format_enclosures($id,
 					$line["always_display_enclosures"],
 					$line["content"],
 					$line["hide_images"]);
 
-				$this->mark_timestamp("   enclosures");
+				$this->_mark_timestamp("   enclosures");
 
 				$line["updated_long"] = TimeHelper::make_local_datetime($line["updated"],true);
 				$line["updated"] = TimeHelper::make_local_datetime($line["updated"], false, false, false, true);
@@ -296,7 +296,7 @@ class Feeds extends Handler_Protected {
 				$line['imported'] = T_sprintf("Imported at %s",
 					TimeHelper::make_local_datetime($line["date_entered"], false));
 
-				$this->mark_timestamp("   local-datetime");
+				$this->_mark_timestamp("   local-datetime");
 
 				if ($line["tag_cache"])
 					$tags = explode(",", $line["tag_cache"]);
@@ -305,9 +305,9 @@ class Feeds extends Handler_Protected {
 
 				$line["tags_str"] = Article::format_tags_string($tags);
 
-				$this->mark_timestamp("   tags");
+				$this->_mark_timestamp("   tags");
 
-				if (self::feedHasIcon($feed_id)) {
+				if (self::_has_icon($feed_id)) {
 					$line['feed_icon'] = "<img class=\"icon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
 				} else {
 					$line['feed_icon'] = "<i class='icon-no-feed material-icons'>rss_feed</i>";
@@ -316,7 +316,7 @@ class Feeds extends Handler_Protected {
 			    //setting feed headline background color, needs to change text color based on dark/light
 				$fav_color = $line['favicon_avg_color'] ?? false;
 
-				$this->mark_timestamp("   pre-color");
+				$this->_mark_timestamp("   pre-color");
 
 				require_once "colors.php";
 
@@ -324,7 +324,7 @@ class Feeds extends Handler_Protected {
 					if ($fav_color && $fav_color != 'fail') {
 						$rgba_cache[$feed_id] = _color_unpack($fav_color);
 					} else {
-						$rgba_cache[$feed_id] = _color_unpack($this->color_of($line['feed_title']));
+						$rgba_cache[$feed_id] = _color_unpack($this->_color_of($line['feed_title']));
 					}
 				}
 
@@ -332,7 +332,7 @@ class Feeds extends Handler_Protected {
 				    $line['feed_bg_color'] = 'rgba(' . implode(",", $rgba_cache[$feed_id]) . ',0.3)';
 				}
 
-				$this->mark_timestamp("   color");
+				$this->_mark_timestamp("   color");
 
 				/* we don't need those */
 
@@ -342,11 +342,11 @@ class Feeds extends Handler_Protected {
 
 				array_push($reply['content'], $line);
 
-				$this->mark_timestamp("article end");
+				$this->_mark_timestamp("article end");
 			}
 		}
 
-		$this->mark_timestamp("end of articles");
+		$this->_mark_timestamp("end of articles");
 
 		if (!$headlines_count) {
 
@@ -408,7 +408,7 @@ class Feeds extends Handler_Protected {
 			}
 		}
 
-		$this->mark_timestamp("end");
+		$this->_mark_timestamp("end");
 
 		return array($topmost_article_ids, $headlines_count, $feed, $disable_cache, $reply);
 	}
@@ -489,9 +489,9 @@ class Feeds extends Handler_Protected {
 
 		$reply['headlines'] = [];
 
-		list($override_order, $skip_first_id_check) = self::order_to_override_query($order_by);
+		list($override_order, $skip_first_id_check) = self::_order_to_override_query($order_by);
 
-		$ret = $this->format_headlines_list($feed, $method,
+		$ret = $this->_format_headlines_list($feed, $method,
 			$view_mode, $limit, $cat_view, $offset,
 			$override_order, true, $check_first_id, $skip_first_id_check, $order_by);
 
@@ -600,7 +600,7 @@ class Feeds extends Handler_Protected {
 		print "<fieldset>";
 		print "<input dojoType='dijit.form.ValidationTextBox' id='search_query'
 			style='font-size : 16px; width : 540px;'
-			placeHolder=\"".T_sprintf("Search %s...", $this->getFeedTitle($active_feed_id, $is_cat))."\"
+			placeHolder=\"".T_sprintf("Search %s...", $this->_get_title($active_feed_id, $is_cat))."\"
 			name='query' type='search' value=''>";
 		print "</fieldset>";
 
@@ -686,7 +686,7 @@ class Feeds extends Handler_Protected {
 		</script>
 
 			<div class="container">
-				<h1>Feed Debugger: <?= "$feed_id: " . $this->getFeedTitle($feed_id) ?></h1>
+				<h1>Feed Debugger: <?= "$feed_id: " . $this->_get_title($feed_id) ?></h1>
 				<div class="content">
 					<form method="post" action="">
 						<input type="hidden" name="op" value="feeds">
@@ -731,7 +731,7 @@ class Feeds extends Handler_Protected {
 
 	}
 
-	static function catchup_feed($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) {
+	static function _catchup($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
@@ -751,7 +751,7 @@ class Feeds extends Handler_Protected {
 
 			// fall back in case of no plugins
 			if (empty($search_qpart)) {
-				list($search_qpart, $search_words) = self::search_to_sql($search[0], $search[1], $owner_uid);
+				list($search_qpart, $search_words) = self::_search_to_sql($search[0], $search[1], $owner_uid);
 			}
 		} else {
 			$search_qpart = "true";
@@ -791,7 +791,7 @@ class Feeds extends Handler_Protected {
 				if ($feed >= 0) {
 
 					if ($feed > 0) {
-						$children = self::getChildCategories($feed, $owner_uid);
+						$children = self::_get_child_cats($feed, $owner_uid);
 						array_push($children, $feed);
 						$children = array_map("intval", $children);
 
@@ -902,7 +902,7 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	static function getFeedArticles($feed, $is_cat = false, $unread_only = false,
+	static function _get_counters($feed, $is_cat = false, $unread_only = false,
 							 $owner_uid = false) {
 
 		$n_feed = (int) $feed;
@@ -921,7 +921,7 @@ class Feeds extends Handler_Protected {
 		$match_part = "";
 
 		if ($is_cat) {
-			return self::getCategoryUnread($n_feed, $owner_uid);
+			return self::_get_cat_unread($n_feed, $owner_uid);
 		} else if ($n_feed == -6) {
 			return 0;
 		} else if ($feed != "0" && $n_feed == 0) {
@@ -967,7 +967,7 @@ class Feeds extends Handler_Protected {
 
 			$label_id = Labels::feed_to_label_id($feed);
 
-			return self::getLabelUnread($label_id, $owner_uid);
+			return self::_get_label_unread($label_id, $owner_uid);
 		}
 
 		if ($match_part) {
@@ -1009,7 +1009,7 @@ class Feeds extends Handler_Protected {
 		$login = $need_auth ? clean($_REQUEST['login']) : '';
 		$pass = $need_auth ? clean($_REQUEST['pass']) : '';
 
-		$rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass);
+		$rc = Feeds::_subscribe($feed, $cat, $login, $pass);
 
 		print json_encode(array("result" => $rc));
 	}
@@ -1027,7 +1027,7 @@ class Feeds extends Handler_Protected {
 	 *                 5 - Couldn't download the URL content.
 	 *                 6 - Content is an invalid XML.
 	 */
-	static function subscribe_to_feed($url, $cat_id = 0,
+	static function _subscribe($url, $cat_id = 0,
 							   $auth_login = '', $auth_pass = '') {
 
 		global $fetch_last_error;
@@ -1056,8 +1056,8 @@ class Feeds extends Handler_Protected {
 			return array("code" => 5, "message" => $fetch_last_error);
 		}
 
-		if (mb_strpos($fetch_last_content_type, "html") !== false && self::is_html($contents)) {
-			$feedUrls = self::get_feeds_from_html($url, $contents);
+		if (mb_strpos($fetch_last_content_type, "html") !== false && self::_is_html($contents)) {
+			$feedUrls = self::_get_feeds_from_html($url, $contents);
 
 			if (count($feedUrls) == 0) {
 				return array("code" => 3);
@@ -1100,15 +1100,15 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	static function getIconFile($feed_id) {
+	static function _get_icon_file($feed_id) {
 		return ICONS_DIR . "/$feed_id.ico";
 	}
 
-	static function feedHasIcon($id) {
+	static function _has_icon($id) {
 		return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0;
 	}
 
-	static function getFeedIcon($id) {
+	static function _get_icon($id) {
 		switch ($id) {
 			case 0:
 				return "archive";
@@ -1132,7 +1132,7 @@ class Feeds extends Handler_Protected {
 				if ($id < LABEL_BASE_INDEX) {
 					return "label";
 				} else {
-					$icon = self::getIconFile($id);
+					$icon = self::_get_icon_file($id);
 
                     if ($icon && file_exists($icon)) {
 						return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
@@ -1144,11 +1144,11 @@ class Feeds extends Handler_Protected {
 		return false;
 	}
 
-	static function getFeedTitle($id, $cat = false) {
+	static function _get_title($id, $cat = false) {
 	    $pdo = Db::pdo();
 
 		if ($cat) {
-			return self::getCategoryTitle($id);
+			return self::_get_cat_title($id);
 		} else if ($id == -1) {
 			return __("Starred articles");
 		} else if ($id == -2) {
@@ -1191,7 +1191,7 @@ class Feeds extends Handler_Protected {
 	}
 
 	// only real cats
-	static function getCategoryMarked($cat, $owner_uid = false) {
+	static function _get_cat_marked($cat, $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -1214,7 +1214,7 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	static function getCategoryUnread($cat, $owner_uid = false) {
+	static function _get_cat_unread($cat, $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -1248,7 +1248,7 @@ class Feeds extends Handler_Protected {
 	}
 
 	// only accepts real cats (>= 0)
-	static function getCategoryChildrenUnread($cat, $owner_uid = false) {
+	static function _get_cat_children_unread($cat, $owner_uid = false) {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
 		$pdo = Db::pdo();
@@ -1260,14 +1260,14 @@ class Feeds extends Handler_Protected {
 		$unread = 0;
 
 		while ($line = $sth->fetch()) {
-			$unread += self::getCategoryUnread($line["id"], $owner_uid);
-			$unread += self::getCategoryChildrenUnread($line["id"], $owner_uid);
+			$unread += self::_get_cat_unread($line["id"], $owner_uid);
+			$unread += self::_get_cat_children_unread($line["id"], $owner_uid);
 		}
 
 		return $unread;
 	}
 
-	static function getGlobalUnread($user_id = false) {
+	static function _get_global_unread($user_id = false) {
 
 		if (!$user_id) $user_id = $_SESSION["uid"];
 
@@ -1283,7 +1283,7 @@ class Feeds extends Handler_Protected {
 		return $row["count"];
 	}
 
-	static function getCategoryTitle($cat_id) {
+	static function _get_cat_title($cat_id) {
 
 		if ($cat_id == -1) {
 			return __("Special");
@@ -1305,7 +1305,7 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	static function getLabelUnread($label_id, $owner_uid = false) {
+	private static function _get_label_unread($label_id, $owner_uid = false) {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
 		$pdo = Db::pdo();
@@ -1322,7 +1322,7 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	static function queryFeedHeadlines($params) {
+	static function _get_headlines($params) {
 
 		$pdo = Db::pdo();
 
@@ -1368,7 +1368,7 @@ class Feeds extends Handler_Protected {
 
 			// fall back in case of no plugins
 			if (!$search_query_part) {
-				list($search_query_part, $search_words) = self::search_to_sql($search, $search_language, $owner_uid);
+				list($search_query_part, $search_words) = self::_search_to_sql($search, $search_language, $owner_uid);
 			}
 
 			if (DB_TYPE == "pgsql") {
@@ -1406,7 +1406,7 @@ class Feeds extends Handler_Protected {
 				$unread = getFeedUnread($feed, $cat_view);
 
 				if ($cat_view && $feed > 0 && $include_children)
-					$unread += self::getCategoryChildrenUnread($feed);
+					$unread += self::_get_cat_children_unread($feed);
 
 				if ($unread > 0) {
 					$view_query_part = " unread = true AND ";
@@ -1450,7 +1450,7 @@ class Feeds extends Handler_Protected {
 				if ($feed > 0) {
 					if ($include_children) {
 						# sub-cats
-						$subcats = self::getChildCategories($feed, $owner_uid);
+						$subcats = self::_get_child_cats($feed, $owner_uid);
 						array_push($subcats, $feed);
 						$subcats = array_map("intval", $subcats);
 
@@ -1574,7 +1574,7 @@ class Feeds extends Handler_Protected {
 			$feed_title = T_sprintf("Search results: %s", $search);
 		} else {
 			if ($cat_view) {
-				$feed_title = self::getCategoryTitle($feed);
+				$feed_title = self::_get_cat_title($feed);
 			} else {
 				if (is_numeric($feed) && $feed > 0) {
 					$ssth = $pdo->prepare("SELECT title,site_url,last_error,last_updated
@@ -1587,7 +1587,7 @@ class Feeds extends Handler_Protected {
 					$last_error = $row["last_error"];
 					$last_updated = $row["last_updated"];
 				} else {
-					$feed_title = self::getFeedTitle($feed);
+					$feed_title = self::_get_title($feed);
 				}
 			}
 		}
@@ -1802,7 +1802,7 @@ class Feeds extends Handler_Protected {
 
 	}
 
-	static function getParentCategories($cat, $owner_uid) {
+	static function _get_parent_cats($cat, $owner_uid) {
 		$rv = array();
 
 		$pdo = Db::pdo();
@@ -1813,13 +1813,13 @@ class Feeds extends Handler_Protected {
 
 		while ($line = $sth->fetch()) {
 			array_push($rv, $line["parent_cat"]);
-			$rv = array_merge($rv, self::getParentCategories($line["parent_cat"], $owner_uid));
+			$rv = array_merge($rv, self::_get_parent_cats($line["parent_cat"], $owner_uid));
 		}
 
 		return $rv;
 	}
 
-	static function getChildCategories($cat, $owner_uid) {
+	static function _get_child_cats($cat, $owner_uid) {
 		$rv = array();
 
 		$pdo = Db::pdo();
@@ -1830,13 +1830,13 @@ class Feeds extends Handler_Protected {
 
 		while ($line = $sth->fetch()) {
 			array_push($rv, $line["id"]);
-			$rv = array_merge($rv, self::getChildCategories($line["id"], $owner_uid));
+			$rv = array_merge($rv, self::_get_child_cats($line["id"], $owner_uid));
 		}
 
 		return $rv;
 	}
 
-	static function getFeedCategory($feed) {
+	static function _cat_of_feed($feed) {
 		$pdo = Db::pdo();
 
 	    $sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
@@ -1851,7 +1851,7 @@ class Feeds extends Handler_Protected {
 
 	}
 
-    function color_of($name) {
+    private function _color_of($name) {
         $colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
             "#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416",
             "#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ];
@@ -1867,7 +1867,7 @@ class Feeds extends Handler_Protected {
         return $colormap[$sum];
 	}
 
-	static function get_feeds_from_html($url, $content) {
+	private static function _get_feeds_from_html($url, $content) {
 		$url     = UrlHelper::validate($url);
 		$baseUrl = substr($url, 0, strrpos($url, '/') + 1);
 
@@ -1895,11 +1895,11 @@ class Feeds extends Handler_Protected {
 		return $feedUrls;
 	}
 
-	static function is_html($content) {
+	static function _is_html($content) {
 		return preg_match("/<html|DOCTYPE html/i", substr($content, 0, 8192)) !== 0;
 	}
 
-	static function add_feed_category($feed_cat, $parent_cat_id = false, $order_id = 0) {
+	static function _add_cat($feed_cat, $parent_cat_id = false, $order_id = 0) {
 
 		if (!$feed_cat) return false;
 
@@ -1936,7 +1936,7 @@ class Feeds extends Handler_Protected {
 		return false;
 	}
 
-	static function get_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
+	static function _get_access_key($feed_id, $is_cat, $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -1972,9 +1972,9 @@ class Feeds extends Handler_Protected {
 	 * @access public
 	 * @return mixed
 	 */
-	static function purge_feed($feed_id, $purge_interval) {
+	static function _purge($feed_id, $purge_interval) {
 
-		if (!$purge_interval) $purge_interval = self::feed_purge_interval($feed_id);
+		if (!$purge_interval) $purge_interval = self::_get_purge_interval($feed_id);
 
 		$pdo = Db::pdo();
 
@@ -2042,7 +2042,7 @@ class Feeds extends Handler_Protected {
 		return $rows_deleted;
 	}
 
-	static function feed_purge_interval($feed_id) {
+	private static function _get_purge_interval($feed_id) {
 
 		$pdo = Db::pdo();
 
@@ -2063,7 +2063,7 @@ class Feeds extends Handler_Protected {
 		}
 	}
 
-	static function search_to_sql($search, $search_language, $owner_uid) {
+	private static function _search_to_sql($search, $search_language, $owner_uid) {
 
 		$keywords = str_getcsv(trim($search), " ");
 		$query_keywords = array();
@@ -2231,7 +2231,7 @@ class Feeds extends Handler_Protected {
 		return array($search_query_part, $search_words);
 	}
 
-	static function order_to_override_query($order) {
+	static function _order_to_override_query($order) {
 		$query = "";
 		$skip_first_id = false;
 
@@ -2259,7 +2259,7 @@ class Feeds extends Handler_Protected {
 		return [$query, $skip_first_id];
 	}
 
-	function mark_timestamp($label) {
+	private function _mark_timestamp($label) {
 
 		if (empty($_REQUEST['timestamps']))
 			return;
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 0613e9a28..98386cbf1 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -12,7 +12,7 @@ class Handler_Public extends Handler {
 
 		if (!$limit) $limit = 60;
 
-		list($override_order, $skip_first_id_check) = Feeds::order_to_override_query($order);
+		list($override_order, $skip_first_id_check) = Feeds::_order_to_override_query($order);
 
 		if (!$override_order) {
 			$override_order = "date_entered DESC, updated DESC";
@@ -55,7 +55,7 @@ class Handler_Public extends Handler {
 			}
 
 		} else {
-			$qfh_ret = Feeds::queryFeedHeadlines($params);
+			$qfh_ret = Feeds::_get_headlines($params);
 		}
 
 		$result = $qfh_ret[0];
@@ -65,7 +65,7 @@ class Handler_Public extends Handler {
 
 		$feed_self_url = get_self_url_prefix() .
 			"/public.php?op=rss&id=$feed&key=" .
-			Feeds::get_feed_access_key($feed, false, $owner_uid);
+			Feeds::_get_access_key($feed, false, $owner_uid);
 
 		if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
 
@@ -251,11 +251,11 @@ class Handler_Public extends Handler {
 		$uid = UserHelper::find_user_by_login($login);
 
 		if ($uid) {
-			print Feeds::getGlobalUnread($uid);
+			print Feeds::_get_global_unread($uid);
 
 			if ($fresh) {
 				print ";";
-				print Feeds::getFeedArticles(-3, false, true, $uid);
+				print Feeds::_get_counters(-3, false, true, $uid);
 			}
 		} else {
 			print "-1;User not found";
@@ -803,7 +803,7 @@ class Handler_Public extends Handler {
 				<?php
 			} else {
 
-				$rc = Feeds::subscribe_to_feed($feed_url);
+				$rc = Feeds::_subscribe($feed_url);
 				$feed_urls = false;
 
 				switch ($rc['code']) {
diff --git a/classes/opml.php b/classes/opml.php
index aa5e22b80..78ddb2842 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -31,7 +31,7 @@ class OPML extends Handler_Protected {
 			<body class='claro ttrss_utility'>
 			<h1>".__('OPML Utility')."</h1><div class='content'>";
 
-		Feeds::add_feed_category("Imported feeds");
+		Feeds::_add_cat("Imported feeds");
 
 		$this->opml_notice(__("Importing OPML..."));
 
@@ -205,7 +205,7 @@ class OPML extends Handler_Protected {
 
 					if (!$tmp_line["match_on"]) {
                         if ($cat_filter && $tmp_line["cat_id"] || $tmp_line["feed_id"]) {
-                            $tmp_line["feed"] = Feeds::getFeedTitle(
+                            $tmp_line["feed"] = Feeds::_get_title(
                                 $cat_filter ? $tmp_line["cat_id"] : $tmp_line["feed_id"],
                                 $cat_filter);
                         } else {
@@ -218,13 +218,13 @@ class OPML extends Handler_Protected {
                             if (strpos($feed_id, "CAT:") === 0) {
                                 $feed_id = (int)substr($feed_id, 4);
                                 if ($feed_id) {
-                                    array_push($match, [Feeds::getCategoryTitle($feed_id), true, false]);
+                                    array_push($match, [Feeds::_get_cat_title($feed_id), true, false]);
                                 } else {
                                     array_push($match, [0, true, true]);
                                 }
                             } else {
                                 if ($feed_id) {
-                                    array_push($match, [Feeds::getFeedTitle((int)$feed_id), false, false]);
+                                    array_push($match, [Feeds::_get_title((int)$feed_id), false, false]);
                                 } else {
                                     array_push($match, [0, false, true]);
                                 }
@@ -523,7 +523,7 @@ class OPML extends Handler_Protected {
 					$order_id = (int) $root_node->attributes->getNamedItem('ttrssSortOrder')->nodeValue;
 					if (!$order_id) $order_id = 0;
 
-					Feeds::add_feed_category($cat_title, $parent_id, $order_id);
+					Feeds::_add_cat($cat_title, $parent_id, $order_id);
 					$cat_id = $this->get_feed_category($cat_title, $parent_id);
 				}
 
@@ -638,7 +638,7 @@ class OPML extends Handler_Protected {
 
 		$url_path = get_self_url_prefix();
 		$url_path .= "/opml.php?op=publish&key=" .
-			Feeds::get_feed_access_key('OPML:Publish', false, $_SESSION["uid"]);
+			Feeds::_get_access_key('OPML:Publish', false, $_SESSION["uid"]);
 
 		return $url_path;
 	}
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index af3877159..edba71c5c 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -98,7 +98,7 @@ class Pref_Feeds extends Handler_Protected {
 			$feed['checkbox'] = false;
 			$feed['unread'] = -1;
 			$feed['error'] = $feed_line['last_error'];
-			$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
+			$feed['icon'] = Feeds::_get_icon($feed_line['id']);
 			$feed['param'] = TimeHelper::make_local_datetime(
 				$feed_line['last_updated'], true);
 			$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
@@ -266,7 +266,7 @@ class Pref_Feeds extends Handler_Protected {
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
 				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
+				$feed['icon'] = Feeds::_get_icon($feed_line['id']);
 				$feed['param'] = TimeHelper::make_local_datetime(
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
@@ -301,7 +301,7 @@ class Pref_Feeds extends Handler_Protected {
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
 				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
+				$feed['icon'] = Feeds::_get_icon($feed_line['id']);
 				$feed['param'] = TimeHelper::make_local_datetime(
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
@@ -777,7 +777,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			/* Icon */
 
-			print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::getFeedIcon($feed_id)."\">";
+			print "<img class='feedIcon feed-editor-icon' src=\"".Feeds::_get_icon($feed_id)."\">";
 
 			print "<form onsubmit='return false;' id='feed_icon_upload_form'
 				enctype='multipart/form-data' method='POST'>
@@ -1189,7 +1189,7 @@ class Pref_Feeds extends Handler_Protected {
 	function addCat() {
 		$feed_cat = clean($_REQUEST["cat"]);
 
-		Feeds::add_feed_category($feed_cat);
+		Feeds::_add_cat($feed_cat);
 	}
 
 	function importOpml() {
@@ -1420,9 +1420,9 @@ class Pref_Feeds extends Handler_Protected {
 
 		$obj['id'] = 'CAT:' . $cat_id;
 		$obj['items'] = array();
-		$obj['name'] = Feeds::getCategoryTitle($cat_id);
+		$obj['name'] = Feeds::_get_cat_title($cat_id);
 		$obj['type'] = 'category';
-		$obj['unread'] = -1; //(int) Feeds::getCategoryUnread($cat_id);
+		$obj['unread'] = -1; //(int) Feeds::_get_cat_unread($cat_id);
 		$obj['bare_id'] = $cat_id;
 
 		return $obj;
@@ -1433,7 +1433,7 @@ class Pref_Feeds extends Handler_Protected {
 		$feed_id = (int) $feed_id;
 
 		if (!$title)
-			$title = Feeds::getFeedTitle($feed_id, false);
+			$title = Feeds::_get_title($feed_id, false);
 
 		if ($unread === false)
 			$unread = getFeedUnread($feed_id, false);
@@ -1444,7 +1444,7 @@ class Pref_Feeds extends Handler_Protected {
 		$obj['type'] = 'feed';
 		$obj['error'] = $error;
 		$obj['updated'] = $updated;
-		$obj['icon'] = Feeds::getFeedIcon($feed_id);
+		$obj['icon'] = Feeds::_get_icon($feed_id);
 		$obj['bare_id'] = $feed_id;
 		$obj['auxcounter'] = 0;
 
@@ -1611,11 +1611,11 @@ class Pref_Feeds extends Handler_Protected {
 			'id' => $feed_id,
 			'is_cat' => (int)$is_cat,
 			'q' => $search,
-			'key' => Feeds::get_feed_access_key($feed_id, $is_cat, $_SESSION["uid"])
+			'key' => Feeds::_get_access_key($feed_id, $is_cat, $_SESSION["uid"])
 		]);
 
 		print json_encode([
-			"title" => Feeds::getFeedTitle($feed_id, $is_cat),
+			"title" => Feeds::_get_title($feed_id, $is_cat),
 			"link" => $link
 		]);
 	}
@@ -1627,7 +1627,7 @@ class Pref_Feeds extends Handler_Protected {
 			WHERE feed_id = ? AND is_cat = ? AND owner_uid = ?");
 		$sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]);
 
-		return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid);
+		return Feeds::_get_access_key($feed_id, $is_cat, $owner_uid);
 	}
 
 	// Silent
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 1c264f642..62bcb8f59 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -189,10 +189,10 @@ class Pref_Filters extends Handler_Protected {
 
                     if (strpos($feed_id, "CAT:") === 0) {
                         $feed_id = (int)substr($feed_id, 4);
-                        array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
+                        array_push($feeds_fmt, Feeds::_get_cat_title($feed_id));
                     } else {
                         if ($feed_id)
-                            array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
+                            array_push($feeds_fmt, Feeds::_get_title((int)$feed_id));
                         else
                             array_push($feeds_fmt, __("All feeds"));
                     }
@@ -203,9 +203,9 @@ class Pref_Filters extends Handler_Protected {
             } else {
 
                 $where = $line["cat_filter"] ?
-                    Feeds::getCategoryTitle($line["cat_id"]) :
+                    Feeds::_get_cat_title($line["cat_id"]) :
                     ($line["feed_id"] ?
-                        Feeds::getFeedTitle($line["feed_id"]) : __("All feeds"));
+                        Feeds::_get_title($line["feed_id"]) : __("All feeds"));
             }
 
 #			$where = $line["cat_id"] . "/" . $line["feed_id"];
@@ -494,10 +494,10 @@ class Pref_Filters extends Handler_Protected {
 
             if (strpos($feed_id, "CAT:") === 0) {
                 $feed_id = (int)substr($feed_id, 4);
-                array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
+                array_push($feeds_fmt, Feeds::_get_cat_title($feed_id));
             } else {
                 if ($feed_id)
-                    array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
+                    array_push($feeds_fmt, Feeds::_get_title((int)$feed_id));
                 else
                     array_push($feeds_fmt, __("All feeds"));
             }
diff --git a/classes/rpc.php b/classes/rpc.php
index 2bbaf4135..206a93d60 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -219,7 +219,7 @@ class RPC extends Handler_Protected {
 		$search_query = clean($_REQUEST['search_query']);
 		$search_lang = clean($_REQUEST['search_lang']);
 
-		Feeds::catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
+		Feeds::_catchup($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
 
 		// return counters here synchronously so that frontend can figure out next unread feed properly
 		print json_encode(['counters' => Counters::getAllCounters()]);
diff --git a/classes/rssutils.php b/classes/rssutils.php
index 9dd7c4ab1..0e90d8fe4 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -1239,7 +1239,7 @@ class RSSUtils {
 
 			Debug::log("purging feed...", Debug::$LOG_VERBOSE);
 
-			Feeds::purge_feed($feed, 0);
+			Feeds::_purge($feed, 0);
 
 			$sth = $pdo->prepare("UPDATE ttrss_feeds SET
 				last_updated = NOW(),
@@ -1706,7 +1706,7 @@ class RSSUtils {
 		$filters = array();
 
 		$feed_id = (int) $feed_id;
-		$cat_id = (int)Feeds::getFeedCategory($feed_id);
+		$cat_id = (int)Feeds::_cat_of_feed($feed_id);
 
 		if ($cat_id == 0)
 			$null_cat_qpart = "cat_id IS NULL OR";
@@ -1720,7 +1720,7 @@ class RSSUtils {
 		$sth->execute([$owner_uid]);
 
 		$check_cats = array_merge(
-			Feeds::getParentCategories($cat_id, $owner_uid),
+			Feeds::_get_parent_cats($cat_id, $owner_uid),
 			[$cat_id]);
 
 		$check_cats_str = join(",", $check_cats);
diff --git a/include/functions.php b/include/functions.php
index eaf7d8243..4557c0411 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -217,7 +217,7 @@
 
 	// @deprecated
 	function getFeedUnread($feed, $is_cat = false) {
-		return Feeds::getFeedArticles($feed, $is_cat, true, $_SESSION["uid"]);
+		return Feeds::_get_counters($feed, $is_cat, true, $_SESSION["uid"]);
 	}
 
 	// @deprecated
diff --git a/js/Feeds.js b/js/Feeds.js
index 986936285..73f1bc338 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -501,7 +501,7 @@ const	Feeds = {
 			const tree = dijit.byId("feedTree");
 
 			if (tree && tree.model)
-				return tree.getFeedCategory(feed);
+				return tree._cat_of_feed(feed);
 
 		} catch (e) {
 			//
diff --git a/plugins/af_comics/filters/af_comics_gocomics.php b/plugins/af_comics/filters/af_comics_gocomics.php
index 949b7a235..6c5c7c0d3 100644
--- a/plugins/af_comics/filters/af_comics_gocomics.php
+++ b/plugins/af_comics/filters/af_comics_gocomics.php
@@ -11,7 +11,7 @@ class Af_Comics_Gocomics extends Af_ComicFilter {
 
 	public function on_subscribe($url) {
 		if (preg_match('#^https?://www\.gocomics\.com/([-a-z0-9]+)$#i', $url))
-			return '<?xml version="1.0" encoding="utf-8"?>'; // Get is_html() to return false.
+			return '<?xml version="1.0" encoding="utf-8"?>'; // Get _is_html() to return false.
 		else
 			return false;
 	}
diff --git a/plugins/af_comics/filters/af_comics_gocomics_farside.php b/plugins/af_comics/filters/af_comics_gocomics_farside.php
index 9663da8f9..89322209d 100644
--- a/plugins/af_comics/filters/af_comics_gocomics_farside.php
+++ b/plugins/af_comics/filters/af_comics_gocomics_farside.php
@@ -11,7 +11,7 @@ class Af_Comics_Gocomics_FarSide extends Af_ComicFilter {
 
 	public function on_subscribe($url) {
 		if (preg_match("#^https?://www\.thefarside\.com#", $url))
-			return '<?xml version="1.0" encoding="utf-8"?>'; // Get is_html() to return false.
+			return '<?xml version="1.0" encoding="utf-8"?>'; // Get _is_html() to return false.
 		else
 			return false;
 	}
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 163b0ec38..47ff98fc2 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -209,7 +209,7 @@ class Af_Psql_Trgm extends Plugin {
 					print "<li>" .
 						"<i class='material-icons'>rss_feed</i> <a href='#'
 							onclick='CommonDialogs.editFeed($f)'>" .
-						Feeds::getFeedTitle($f) . "</a></li>";
+						Feeds::_get_title($f) . "</a></li>";
 				}
 				print "</ul>";
 			}
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index a76c98380..4d21a831c 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -122,7 +122,7 @@ class Af_Readability extends Plugin {
 
 					print "<li><i class='material-icons'>rss_feed</i> <a href='#'
 						onclick='CommonDialogs.editFeed($f)'>".
-						Feeds::getFeedTitle($f) . " " . ($is_append ? __("(append)") : "") . "</a></li>";
+						Feeds::_get_title($f) . " " . ($is_append ? __("(append)") : "") . "</a></li>";
 				}
 				print "</ul>";
 			}
diff --git a/plugins/vf_shared/init.php b/plugins/vf_shared/init.php
index 8c38cbf32..1112f6f2f 100644
--- a/plugins/vf_shared/init.php
+++ b/plugins/vf_shared/init.php
@@ -60,7 +60,7 @@ class VF_Shared extends Plugin {
 			"override_vfeed" => "ttrss_feeds.title AS feed_title,"
 		);
 
-		$qfh_ret = Feeds::queryFeedHeadlines($params);
+		$qfh_ret = Feeds::_get_headlines($params);
 		$qfh_ret[1] = __("Shared articles");
 
 		return $qfh_ret;
-- 
cgit v1.2.3-54-g00ecf


From 257efb43c6e32226280d8198acc946a2fc4c454f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 15:52:28 +0300
Subject: article: unify naming

---
 classes/api.php             | 14 ++++-----
 classes/article.php         | 69 ++++++++++++++-------------------------------
 classes/digest.php          |  4 +--
 classes/feeditem.php        |  2 +-
 classes/feeditem/atom.php   |  4 +--
 classes/feeditem/common.php |  2 +-
 classes/feeditem/rss.php    |  4 +--
 classes/feeds.php           | 10 +++----
 classes/handler/public.php  | 18 ++++++------
 classes/labels.php          |  2 +-
 classes/pluginhost.php      |  2 +-
 classes/rpc.php             |  6 ++--
 classes/rssutils.php        |  8 +++---
 js/Article.js               |  2 +-
 js/CommonFilters.js         |  2 +-
 plugins/note/init.php       |  2 +-
 16 files changed, 62 insertions(+), 89 deletions(-)

(limited to 'plugins')

diff --git a/classes/api.php b/classes/api.php
index 73e5c221a..4d1c15598 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -316,7 +316,7 @@ class API extends Handler {
 					"guid" => $line["guid"],
 					"title" => $line["title"],
 					"link" => $line["link"],
-					"labels" => Article::get_article_labels($line['id']),
+					"labels" => Article::_get_labels($line['id']),
 					"unread" => self::param_to_bool($line["unread"]),
 					"marked" => self::param_to_bool($line["marked"]),
 					"published" => self::param_to_bool($line["published"]),
@@ -324,7 +324,7 @@ class API extends Handler {
 					"author" => $line["author"],
 					"updated" => (int) strtotime($line["updated"]),
 					"feed_id" => $line["feed_id"],
-					"attachments" => Article::get_enclosures($line['id']),
+					"attachments" => Article::_get_enclosures($line['id']),
 					"score" => (int)$line["score"],
 					"feed_title" => $line["feed_title"],
 					"note" => $line["note"],
@@ -417,7 +417,7 @@ class API extends Handler {
 		$sth->execute([$_SESSION['uid']]);
 
 		if ($article_id)
-			$article_labels = Article::get_article_labels($article_id);
+			$article_labels = Article::_get_labels($article_id);
 		else
 			$article_labels = array();
 
@@ -489,7 +489,7 @@ class API extends Handler {
 		$url = strip_tags(clean($_REQUEST["url"]));
 		$content = strip_tags(clean($_REQUEST["content"]));
 
-		if (Article::create_published_article($title, $url, $content, "", $_SESSION["uid"])) {
+		if (Article::_create_published_article($title, $url, $content, "", $_SESSION["uid"])) {
 			$this->wrap(self::STATUS_OK, array("status" => 'OK'));
 		} else {
 			$this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
@@ -718,7 +718,7 @@ class API extends Handler {
 						}
 					}
 
-					if (!is_array($labels)) $labels = Article::get_article_labels($line["id"]);
+					if (!is_array($labels)) $labels = Article::_get_labels($line["id"]);
 
 					$headline_row = array(
 						"id" => (int)$line["id"],
@@ -734,7 +734,7 @@ class API extends Handler {
 						"tags" => $tags,
 					);
 
-					$enclosures = Article::get_enclosures($line['id']);
+					$enclosures = Article::_get_enclosures($line['id']);
 
 					if ($include_attachments)
 						$headline_row['attachments'] = $enclosures;
@@ -775,7 +775,7 @@ class API extends Handler {
 					if ($show_content) {
 						$hook_object = ["headline" => &$headline_row];
 
-						list ($flavor_image, $flavor_stream, $flavor_kind) = Article::get_article_image($enclosures,
+						list ($flavor_image, $flavor_stream, $flavor_kind) = Article::_get_image($enclosures,
 																												$line["content"], // unsanitized
 																												$line["site_url"]);
 
diff --git a/classes/article.php b/classes/article.php
index cc5d73b64..d177a8d6d 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -27,7 +27,7 @@ class Article extends Handler_Protected {
 		}
 	}
 
-	static function create_published_article($title, $url, $content, $labels_str,
+	static function _create_published_article($title, $url, $content, $labels_str,
 			$owner_uid) {
 
 		$guid = 'SHA1:' . sha1("ttshared:" . $url . $owner_uid); // include owner_uid to prevent global GUID clash
@@ -165,7 +165,7 @@ class Article extends Handler_Protected {
 		$id = (int) clean($_REQUEST['id'] ?? 0);
 
 		print json_encode(["id" => $id,
-			"tags" => self::get_article_tags($id)]);
+			"tags" => self::_get_tags($id)]);
 	}
 
 	function setScore() {
@@ -248,8 +248,8 @@ class Article extends Handler_Protected {
 
 		$this->pdo->commit();
 
-		$tags = self::get_article_tags($id);
-		$tags_str = $this->format_tags_string($tags);
+		$tags = self::_get_tags($id);
+		$tags_str = $this->_format_tags_html($tags);
 		$tags_str_full = join(", ", $tags);
 
 		if (!$tags_str_full) $tags_str_full = __("no tags");
@@ -277,14 +277,14 @@ class Article extends Handler_Protected {
 	}
 
 	function assigntolabel() {
-		return $this->labelops(true);
+		return $this->_label_ops(true);
 	}
 
 	function removefromlabel() {
-		return $this->labelops(false);
+		return $this->_label_ops(false);
 	}
 
-	private function labelops($assign) {
+	private function _label_ops($assign) {
 		$reply = array();
 
 		$ids = explode(",", clean($_REQUEST["ids"]));
@@ -303,10 +303,10 @@ class Article extends Handler_Protected {
 				else
 					Labels::remove_article($id, $label, $_SESSION["uid"]);
 
-				$labels = $this->get_article_labels($id, $_SESSION["uid"]);
+				$labels = $this->_get_labels($id, $_SESSION["uid"]);
 
 				array_push($reply["info-for-headlines"],
-				array("id" => $id, "labels" => $this->format_article_labels($labels)));
+				array("id" => $id, "labels" => $this->_format_labels_html($labels)));
 
 			}
 		}
@@ -316,24 +316,12 @@ class Article extends Handler_Protected {
 		print json_encode($reply);
 	}
 
-	function getArticleFeed($id) {
-		$sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
-			WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$id, $_SESSION['uid']]);
-
-		if ($row = $sth->fetch()) {
-			return $row["feed_id"];
-		} else {
-			return 0;
-		}
-	}
-
-	static function format_enclosures($id,
+	static function _format_enclosures($id,
 										$always_display_enclosures,
 									   $article_content,
 										$hide_images = false) {
 
-		$enclosures = self::get_enclosures($id);
+		$enclosures = self::_get_enclosures($id);
 		$rv = [];
 		$enclosures_formatted = "";
 
@@ -389,7 +377,7 @@ class Article extends Handler_Protected {
 		return $rv;
 	}
 
-	static function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
+	static function _get_tags($id, $owner_uid = 0, $tag_cache = false) {
 
 		$a_id = $id;
 
@@ -439,7 +427,7 @@ class Article extends Handler_Protected {
 		return $tags;
 	}
 
-	static function format_tags_string($tags) {
+	static function _format_tags_html($tags) {
 		if (!is_array($tags) || count($tags) == 0) {
 			return __("no tags");
 		} else {
@@ -459,7 +447,7 @@ class Article extends Handler_Protected {
 		}
 	}
 
-	static function format_article_labels($labels) {
+	static function _format_labels_html($labels) {
 
 		if (!is_array($labels)) return '';
 
@@ -475,8 +463,7 @@ class Article extends Handler_Protected {
 
 	}
 
-	static function format_article_note($id, $note, $allow_edit = true) {
-
+	static function _format_note_html($id, $note, $allow_edit = true) {
 		if ($allow_edit) {
 			$onclick = "onclick='Plugins.Note.edit($id)'";
 			$note_class = 'editable';
@@ -491,7 +478,7 @@ class Article extends Handler_Protected {
 			</div>";
 	}
 
-	function get_metadata_by_id() {
+	function getmetadatabyid() {
 		$id = clean($_REQUEST['id']);
 
 		$sth = $this->pdo->prepare("SELECT link, title FROM ttrss_entries, ttrss_user_entries
@@ -506,7 +493,7 @@ class Article extends Handler_Protected {
 		}
 	}
 
-	static function get_enclosures($id) {
+	static function _get_enclosures($id) {
 
 		$pdo = Db::pdo();
 
@@ -530,7 +517,7 @@ class Article extends Handler_Protected {
 		return $rv;
 	}
 
-	static function purge_orphans() {
+	static function _purge_orphans() {
 
         // purge orphaned posts in main content table
 
@@ -549,7 +536,7 @@ class Article extends Handler_Protected {
         }
     }
 
-	static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
+	static function _catchup_by_id($ids, $cmode, $owner_uid = false) {
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -574,21 +561,7 @@ class Article extends Handler_Protected {
 		$sth->execute(array_merge($ids, [$owner_uid]));
 	}
 
-	static function getLastArticleId() {
-		$pdo = Db::pdo();
-
-		$sth = $pdo->prepare("SELECT ref_id AS id FROM ttrss_user_entries
-			WHERE owner_uid = ? ORDER BY ref_id DESC LIMIT 1");
-		$sth->execute([$_SESSION['uid']]);
-
-		if ($row = $sth->fetch()) {
-			return $row['id'];
-		} else {
-			return -1;
-		}
-	}
-
-	static function get_article_labels($id, $owner_uid = false) {
+	static function _get_labels($id, $owner_uid = false) {
 		$rv = array();
 
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
@@ -635,7 +608,7 @@ class Article extends Handler_Protected {
 		return $rv;
 	}
 
-	static function get_article_image($enclosures, $content, $site_url) {
+	static function _get_image($enclosures, $content, $site_url) {
 
 		$article_image = "";
 		$article_stream = "";
diff --git a/classes/digest.php b/classes/digest.php
index 7790424ca..77eb92c54 100644
--- a/classes/digest.php
+++ b/classes/digest.php
@@ -68,7 +68,7 @@ class Digest
 
 						if ($rc && $do_catchup) {
 							Debug::log("Marking affected articles as read...");
-							Article::catchupArticlesById($affected_ids, 0, $line["id"]);
+							Article::_catchup_by_id($affected_ids, 0, $line["id"]);
 						}
 					} else {
 						Debug::log("No headlines");
@@ -164,7 +164,7 @@ class Digest
 				$line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
 			}
 
-			$article_labels = Article::get_article_labels($line["ref_id"], $user_id);
+			$article_labels = Article::_get_labels($line["ref_id"], $user_id);
 			$article_labels_formatted = "";
 
 			if (is_array($article_labels) && count($article_labels) > 0) {
diff --git a/classes/feeditem.php b/classes/feeditem.php
index 3a5e5dc09..e30df3086 100644
--- a/classes/feeditem.php
+++ b/classes/feeditem.php
@@ -9,7 +9,7 @@ abstract class FeedItem {
 	abstract function get_comments_url();
 	abstract function get_comments_count();
 	abstract function get_categories();
-	abstract function get_enclosures();
+	abstract function _get_enclosures();
 	abstract function get_author();
 	abstract function get_language();
 }
diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index a03080981..3e092a048 100755
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -119,7 +119,7 @@ class FeedItem_Atom extends FeedItem_Common {
 		return $this->normalize_categories($cats);
 	}
 
-	function get_enclosures() {
+	function _get_enclosures() {
 		$links = $this->elem->getElementsByTagName("link");
 
 		$encs = array();
@@ -138,7 +138,7 @@ class FeedItem_Atom extends FeedItem_Common {
 			}
 		}
 
-		$encs = array_merge($encs, parent::get_enclosures());
+		$encs = array_merge($encs, parent::_get_enclosures());
 
 		return $encs;
 	}
diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php
index 1e9d62228..f387e0779 100755
--- a/classes/feeditem/common.php
+++ b/classes/feeditem/common.php
@@ -78,7 +78,7 @@ abstract class FeedItem_Common extends FeedItem {
 	}
 
 	// this is common for both Atom and RSS types and deals with various media: elements
-	function get_enclosures() {
+	function _get_enclosures() {
 		$encs = [];
 
 		$enclosures = $this->xpath->query("media:content", $this->elem);
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index 1f7953c51..f103ad787 100755
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -112,7 +112,7 @@ class FeedItem_RSS extends FeedItem_Common {
 		return $this->normalize_categories($cats);
 	}
 
-	function get_enclosures() {
+	function _get_enclosures() {
 		$enclosures = $this->elem->getElementsByTagName("enclosure");
 
 		$encs = array();
@@ -129,7 +129,7 @@ class FeedItem_RSS extends FeedItem_Common {
 			array_push($encs, $enc);
 		}
 
-		$encs = array_merge($encs, parent::get_enclosures());
+		$encs = array_merge($encs, parent::_get_enclosures());
 
 		return $encs;
 	}
diff --git a/classes/feeds.php b/classes/feeds.php
index 6bf176261..10873d8ca 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -214,10 +214,10 @@ class Feeds extends Handler_Protected {
 					}
 				}
 
-				if (!is_array($labels)) $labels = Article::get_article_labels($id);
+				if (!is_array($labels)) $labels = Article::_get_labels($id);
 
 				$labels_str = "<span class=\"HLLCTR-$id\">";
-				$labels_str .= Article::format_article_labels($labels);
+				$labels_str .= Article::_format_labels_html($labels);
 				$labels_str .= "</span>";
 
 				$line["labels"] = $labels_str;
@@ -265,7 +265,7 @@ class Feeds extends Handler_Protected {
 				$this->_mark_timestamp("   disk_cache_rewrite");
 
 				if ($line['note'])
-					$line['note'] = Article::format_article_note($id, $line['note']);
+					$line['note'] = Article::_format_note_html($id, $line['note']);
 				else
 					$line['note'] = "";
 
@@ -283,7 +283,7 @@ class Feeds extends Handler_Protected {
 
 				$this->_mark_timestamp("   pre-enclosures");
 
-				$line["enclosures"] = Article::format_enclosures($id,
+				$line["enclosures"] = Article::_format_enclosures($id,
 					$line["always_display_enclosures"],
 					$line["content"],
 					$line["hide_images"]);
@@ -303,7 +303,7 @@ class Feeds extends Handler_Protected {
 				else
 					$tags = false;
 
-				$line["tags_str"] = Article::format_tags_string($tags);
+				$line["tags_str"] = Article::_format_tags_html($tags);
 
 				$this->_mark_timestamp("   tags");
 
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 98386cbf1..b11c8ba04 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -82,7 +82,7 @@ class Handler_Public extends Handler {
 			while ($line = $result->fetch()) {
 
 				$line["content_preview"] = Sanitizer::sanitize(truncate_string(strip_tags($line["content"]), 100, '...'));
-				$line["tags"] = Article::get_article_tags($line["id"], $owner_uid);
+				$line["tags"] = Article::_get_tags($line["id"], $owner_uid);
 
 				PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_QUERY_HEADLINES,
 					function ($result) use (&$line) {
@@ -131,7 +131,7 @@ class Handler_Public extends Handler {
 					$tpl->addBlock('category');
 				}
 
-				$enclosures = Article::get_enclosures($line["id"]);
+				$enclosures = Article::_get_enclosures($line["id"]);
 
 				if (count($enclosures) > 0) {
 					foreach ($enclosures as $e) {
@@ -151,7 +151,7 @@ class Handler_Public extends Handler {
 					$tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', null, true);
 				}
 
-				list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $feed_site_url);
+				list ($og_image, $og_stream) = Article::_get_image($enclosures, $line['content'], $feed_site_url);
 
 				$tpl->setVariable('ARTICLE_OG_IMAGE', $og_image, true);
 
@@ -184,7 +184,7 @@ class Handler_Public extends Handler {
 			while ($line = $result->fetch()) {
 
 				$line["content_preview"] = Sanitizer::sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...'));
-				$line["tags"] = Article::get_article_tags($line["id"], $owner_uid);
+				$line["tags"] = Article::_get_tags($line["id"], $owner_uid);
 
 				PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_QUERY_HEADLINES,
 					function ($result) use (&$line) {
@@ -218,7 +218,7 @@ class Handler_Public extends Handler {
 					}
 				}
 
-				$enclosures = Article::get_enclosures($line["id"]);
+				$enclosures = Article::_get_enclosures($line["id"]);
 
 				if (count($enclosures) > 0) {
 					$article['enclosures'] = array();
@@ -341,7 +341,7 @@ class Handler_Public extends Handler {
 
 		if ($line = $sth->fetch()) {
 
-			$line["tags"] = Article::get_article_tags($id, $owner_uid, $line["tag_cache"]);
+			$line["tags"] = Article::_get_tags($id, $owner_uid, $line["tag_cache"]);
 			unset($line["tag_cache"]);
 
 			$line["content"] = Sanitizer::sanitize($line["content"],
@@ -390,8 +390,8 @@ class Handler_Public extends Handler {
 
             $rv .= "</head>";
 
-				$enclosures = Article::get_enclosures($line["id"]);
-            list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $line["site_url"]);
+				$enclosures = Article::_get_enclosures($line["id"]);
+            list ($og_image, $og_stream) = Article::_get_image($enclosures, $line['content'], $line["site_url"]);
 
             if ($og_image) {
                 $rv .= "<meta property='og:image' content=\"" . htmlspecialchars($og_image) . "\"/>";
@@ -573,7 +573,7 @@ class Handler_Public extends Handler {
 				$content = strip_tags(clean($_REQUEST["content"]));
 				$labels = strip_tags(clean($_REQUEST["labels"]));
 
-				Article::create_published_article($title, $url, $content, $labels,
+				Article::_create_published_article($title, $url, $content, $labels,
 					$_SESSION["uid"]);
 
 				print "<script type='text/javascript'>";
diff --git a/classes/labels.php b/classes/labels.php
index 786091650..f72d7d84b 100644
--- a/classes/labels.php
+++ b/classes/labels.php
@@ -60,7 +60,7 @@ class Labels
 			self::clear_cache($id);
 
 		if (!$labels)
-			$labels = Article::get_article_labels($id);
+			$labels = Article::_get_labels($id);
 
 		$labels = json_encode($labels);
 
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 42f7f6bf9..6f223ee11 100755
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -47,7 +47,7 @@ class PluginHost {
 	const HOOK_QUERY_HEADLINES = "hook_query_headlines";										// hook_query_headlines($row) (byref)
 	const HOOK_HOUSE_KEEPING = "hook_house_keeping"; //*1										// GLOBAL: hook_house_keeping()
 	const HOOK_SEARCH = "hook_search";																// hook_search($query)
-	const HOOK_FORMAT_ENCLOSURES = "hook_format_enclosures";									// hook_format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images) (byref)
+	const HOOK_FORMAT_ENCLOSURES = "hook_format_enclosures";									// hook__format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images) (byref)
 	const HOOK_SUBSCRIBE_FEED = "hook_subscribe_feed";											// hook_subscribe_feed($contents, $url, $auth_login, $auth_pass) (byref)
 	const HOOK_HEADLINES_BEFORE = "hook_headlines_before";									// hook_headlines_before($feed, $is_cat, $qfh_ret)
 	const HOOK_RENDER_ENCLOSURE = "hook_render_enclosure";									// hook_render_enclosure($entry, $hide_images)
diff --git a/classes/rpc.php b/classes/rpc.php
index 206a93d60..7edc59921 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -119,7 +119,7 @@ class RPC extends Handler_Protected {
 			WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
 		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
-		Article::purge_orphans();
+		Article::_purge_orphans();
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
@@ -156,7 +156,7 @@ class RPC extends Handler_Protected {
 		$ids = explode(",", clean($_REQUEST["ids"]));
 		$cmode = (int)clean($_REQUEST["cmode"]);
 
-		Article::catchupArticlesById($ids, $cmode);
+		Article::_catchup_by_id($ids, $cmode);
 
 		print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
 	}
@@ -310,7 +310,7 @@ class RPC extends Handler_Protected {
 		}
 
 		// Purge orphans and cleanup tags
-		Article::purge_orphans();
+		Article::_purge_orphans();
 		//cleanup_tags(14, 50000);
 
 		if ($num_updated > 0) {
diff --git a/classes/rssutils.php b/classes/rssutils.php
index 0e90d8fe4..cd6f90859 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -723,9 +723,9 @@ class RSSUtils {
 				if ($row = $sth->fetch()) {
 					$base_entry_id = $row["id"];
 					$entry_stored_hash = $row["content_hash"];
-					$article_labels = Article::get_article_labels($base_entry_id, $owner_uid);
+					$article_labels = Article::_get_labels($base_entry_id, $owner_uid);
 
-					$existing_tags = Article::get_article_tags($base_entry_id, $owner_uid);
+					$existing_tags = Article::_get_tags($base_entry_id, $owner_uid);
 					$entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
 				} else {
 					$base_entry_id = false;
@@ -739,7 +739,7 @@ class RSSUtils {
 
 				$enclosures = array();
 
-				$encs = $item->get_enclosures();
+				$encs = $item->_get_enclosures();
 
 				if (is_array($encs)) {
 					foreach ($encs as $e) {
@@ -1636,7 +1636,7 @@ class RSSUtils {
 		self::cleanup_feed_icons();
 		self::disable_failed_feeds();
 
-		Article::purge_orphans();
+		Article::_purge_orphans();
 		self::cleanup_counters_cache();
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING);
diff --git a/js/Article.js b/js/Article.js
index 210427892..54883c2bf 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -123,7 +123,7 @@ const Article = {
 		Article.setActive(0);
 	},
 	displayUrl: function (id) {
-		const query = {op: "article", method: "get_metadata_by_id", id: id};
+		const query = {op: "article", method: "getmetadatabyid", id: id};
 
 		xhrJson("backend.php", query, (reply) => {
 			if (reply && reply.link) {
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index 06e0410c7..5afffafdc 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -332,7 +332,7 @@ const	Filters = {
 
 						} else {
 
-							const query = {op: "article", method: "get_metadata_by_id", id: Article.getActive()};
+							const query = {op: "article", method: "getmetadatabyid", id: Article.getActive()};
 
 							xhrPost("backend.php", query, (transport) => {
 								const reply = JSON.parse(transport.responseText);
diff --git a/plugins/note/init.php b/plugins/note/init.php
index 3c2ca0075..d5b231190 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -65,7 +65,7 @@ class Note extends Plugin {
 			WHERE ref_id = ? AND owner_uid = ?");
 		$sth->execute([$note, $id, $_SESSION['uid']]);
 
-		$formatted_note = Article::format_article_note($id, $note);
+		$formatted_note = Article::_format_note_html($id, $note);
 
 		print json_encode(array("note" => $formatted_note,
 				"raw_length" => mb_strlen($note)));
-- 
cgit v1.2.3-54-g00ecf


From 166f2d46666bb872a1f30a5ab23b113f2f481640 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 16:11:30 +0300
Subject: diskcache: unify naming

---
 classes/api.php                       |  4 ++--
 classes/article.php                   |  6 ++---
 classes/diskcache.php                 | 44 +++++++++++++++++------------------
 classes/feeds.php                     |  2 +-
 classes/handler/public.php            |  4 ++--
 classes/rssutils.php                  |  6 ++---
 plugins/af_proxy_http/init.php        |  4 ++--
 plugins/cache_starred_images/init.php | 18 +++++++-------
 8 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'plugins')

diff --git a/classes/api.php b/classes/api.php
index 62ce1764c..ec51c70a6 100755
--- a/classes/api.php
+++ b/classes/api.php
@@ -348,7 +348,7 @@ class API extends Handler {
 					},
 					$hook_object);
 
-				$article['content'] = DiskCache::rewriteUrls($article['content']);
+				$article['content'] = DiskCache::rewrite_urls($article['content']);
 
 				array_push($articles, $article);
 
@@ -792,7 +792,7 @@ class API extends Handler {
 							},
 							$hook_object);
 
-						$headline_row["content"] = DiskCache::rewriteUrls($headline_row['content']);
+						$headline_row["content"] = DiskCache::rewrite_urls($headline_row['content']);
 					}
 
 					array_push($headlines, $headline_row);
diff --git a/classes/article.php b/classes/article.php
index d177a8d6d..5800af2b7 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -508,7 +508,7 @@ class Article extends Handler_Protected {
 		while ($line = $sth->fetch(PDO::FETCH_ASSOC)) {
 
 			if ($cache->exists(sha1($line["content_url"]))) {
-				$line["content_url"] = $cache->getUrl(sha1($line["content_url"]));
+				$line["content_url"] = $cache->get_url(sha1($line["content_url"]));
 			}
 
 			array_push($rv, $line);
@@ -678,10 +678,10 @@ class Article extends Handler_Protected {
 		$cache = new DiskCache("images");
 
 		if ($article_image && $cache->exists(sha1($article_image)))
-			$article_image = $cache->getUrl(sha1($article_image));
+			$article_image = $cache->get_url(sha1($article_image));
 
 		if ($article_stream && $cache->exists(sha1($article_stream)))
-			$article_stream = $cache->getUrl(sha1($article_stream));
+			$article_stream = $cache->get_url(sha1($article_stream));
 
 		return [$article_image, $article_stream, $article_kind];
 	}
diff --git a/classes/diskcache.php b/classes/diskcache.php
index 3fd099d3c..bad2ee0da 100644
--- a/classes/diskcache.php
+++ b/classes/diskcache.php
@@ -194,20 +194,20 @@ class DiskCache {
 		$this->dir = CACHE_DIR . "/" . basename(clean($dir));
 	}
 
-	public function getDir() {
+	public function get_dir() {
 		return $this->dir;
 	}
 
-	public function makeDir() {
+	public function make_dir() {
 		if (!is_dir($this->dir)) {
 			return mkdir($this->dir);
 		}
 	}
 
-	public function isWritable($filename = "") {
+	public function is_writable($filename = "") {
 		if ($filename) {
-			if (file_exists($this->getFullPath($filename)))
-				return is_writable($this->getFullPath($filename));
+			if (file_exists($this->get_full_path($filename)))
+				return is_writable($this->get_full_path($filename));
 			else
 				return is_writable($this->dir);
 		} else {
@@ -216,44 +216,44 @@ class DiskCache {
 	}
 
 	public function exists($filename) {
-		return file_exists($this->getFullPath($filename));
+		return file_exists($this->get_full_path($filename));
 	}
 
-	public function getSize($filename) {
+	public function get_size($filename) {
 		if ($this->exists($filename))
-			return filesize($this->getFullPath($filename));
+			return filesize($this->get_full_path($filename));
 		else
 			return -1;
 	}
 
-	public function getFullPath($filename) {
+	public function get_full_path($filename) {
 		return $this->dir . "/" . basename(clean($filename));
 	}
 
 	public function put($filename, $data) {
-		return file_put_contents($this->getFullPath($filename), $data);
+		return file_put_contents($this->get_full_path($filename), $data);
 	}
 
 	public function touch($filename) {
-		return touch($this->getFullPath($filename));
+		return touch($this->get_full_path($filename));
 	}
 
 	public function get($filename) {
 		if ($this->exists($filename))
-			return file_get_contents($this->getFullPath($filename));
+			return file_get_contents($this->get_full_path($filename));
 		else
 			return null;
 	}
 
-	public function getMimeType($filename) {
+	public function get_mime_type($filename) {
 		if ($this->exists($filename))
-			return mime_content_type($this->getFullPath($filename));
+			return mime_content_type($this->get_full_path($filename));
 		else
 			return null;
 	}
 
-	public function getFakeExtension($filename) {
-		$mimetype = $this->getMimeType($filename);
+	public function get_fake_extension($filename) {
+		$mimetype = $this->get_mime_type($filename);
 
 		if ($mimetype)
 			return isset($this->mimeMap[$mimetype]) ? $this->mimeMap[$mimetype] : "";
@@ -262,17 +262,17 @@ class DiskCache {
 	}
 
 	public function send($filename) {
-		$fake_extension = $this->getFakeExtension($filename);
+		$fake_extension = $this->get_fake_extension($filename);
 
 		if ($fake_extension)
 			$fake_extension = ".$fake_extension";
 
 		header("Content-Disposition: inline; filename=\"${filename}${fake_extension}\"");
 
-		return $this->send_local_file($this->getFullPath($filename));
+		return $this->send_local_file($this->get_full_path($filename));
 	}
 
-	public function getUrl($filename) {
+	public function get_url($filename) {
 		return get_self_url_prefix() . "/public.php?op=cached_url&file=" . basename($this->dir) . "/" . basename($filename);
 	}
 
@@ -280,7 +280,7 @@ class DiskCache {
 	// this is called separately after sanitize() and plugin render article hooks to allow
 	// plugins work on original source URLs used before caching
 	// NOTE: URLs should be already absolutized because this is called after sanitize()
-	static public function rewriteUrls($str)
+	static public function rewrite_urls($str)
 	{
 		$res = trim($str);
 		if (!$res) return '';
@@ -301,7 +301,7 @@ class DiskCache {
 						$cached_filename = sha1($url);
 
 						if ($cache->exists($cached_filename)) {
-							$url = $cache->getUrl($cached_filename);
+							$url = $cache->get_url($cached_filename);
 
 							$entry->setAttribute($attr, $url);
 							$entry->removeAttribute("srcset");
@@ -318,7 +318,7 @@ class DiskCache {
 						$cached_filename = sha1($matches[$i]["url"]);
 
 						if ($cache->exists($cached_filename)) {
-							$matches[$i]["url"] = $cache->getUrl($cached_filename);
+							$matches[$i]["url"] = $cache->get_url($cached_filename);
 
 							$need_saving = true;
 						}
diff --git a/classes/feeds.php b/classes/feeds.php
index 10873d8ca..07e3aa455 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -260,7 +260,7 @@ class Feeds extends Handler_Protected {
 
 				$this->_mark_timestamp("   hook_render_cdm");
 
-				$line['content'] = DiskCache::rewriteUrls($line['content']);
+				$line['content'] = DiskCache::rewrite_urls($line['content']);
 
 				$this->_mark_timestamp("   disk_cache_rewrite");
 
diff --git a/classes/handler/public.php b/classes/handler/public.php
index ea2a0c5ef..6ea02c361 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -106,7 +106,7 @@ class Handler_Public extends Handler {
 				$content = Sanitizer::sanitize($line["content"], false, $owner_uid,
 					$feed_site_url, false, $line["id"]);
 
-				$content = DiskCache::rewriteUrls($content);
+				$content = DiskCache::rewrite_urls($content);
 
 				if ($line['note']) {
 					$content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
@@ -354,7 +354,7 @@ class Handler_Public extends Handler {
 				},
 				$line);
 
-			$line['content'] = DiskCache::rewriteUrls($line['content']);
+			$line['content'] = DiskCache::rewrite_urls($line['content']);
 
 			header("Content-Type: text/html");
 
diff --git a/classes/rssutils.php b/classes/rssutils.php
index cd6f90859..751cae58e 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -1281,7 +1281,7 @@ class RSSUtils {
 	static function cache_enclosures($enclosures, $site_url) {
 		$cache = new DiskCache("images");
 
-		if ($cache->isWritable()) {
+		if ($cache->is_writable()) {
 			foreach ($enclosures as $enc) {
 
 				if (preg_match("/(image|audio|video)/", $enc[1])) {
@@ -1335,7 +1335,7 @@ class RSSUtils {
 			} else {
 				Debug::log("cache_media: failed with $fetch_last_error_code: $fetch_last_error");
 			}
-		} else if ($cache->isWritable($local_filename)) {
+		} else if ($cache->is_writable($local_filename)) {
 			$cache->touch($local_filename);
 		}
 	}
@@ -1344,7 +1344,7 @@ class RSSUtils {
 	static function cache_media($html, $site_url) {
 		$cache = new DiskCache("images");
 
-		if ($html && $cache->isWritable()) {
+		if ($html && $cache->is_writable()) {
 			$doc = new DOMDocument();
 			if (@$doc->loadHTML($html)) {
 				$xpath = new DOMXPath($doc);
diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php
index 3bde08fdb..3f26ca900 100644
--- a/plugins/af_proxy_http/init.php
+++ b/plugins/af_proxy_http/init.php
@@ -59,14 +59,14 @@ class Af_Proxy_Http extends Plugin {
 		$local_filename = sha1($url);
 
 		if ($this->cache->exists($local_filename)) {
-			header("Location: " . $this->cache->getUrl($local_filename));
+			header("Location: " . $this->cache->get_url($local_filename));
 			return;
 		} else {
 			$data = UrlHelper::fetch(["url" => $url, "max_size" => MAX_CACHE_FILE_SIZE]);
 
 			if ($data) {
 				if ($this->cache->put($local_filename, $data)) {
-					header("Location: " . $this->cache->getUrl($local_filename));
+					header("Location: " . $this->cache->get_url($local_filename));
 					return;
 				}
 			} else {
diff --git a/plugins/cache_starred_images/init.php b/plugins/cache_starred_images/init.php
index 9dd4cd49d..9c2d4cb7e 100755
--- a/plugins/cache_starred_images/init.php
+++ b/plugins/cache_starred_images/init.php
@@ -17,18 +17,18 @@ class Cache_Starred_Images extends Plugin {
 		$this->host = $host;
 		$this->cache = new DiskCache("starred-images");
 
-		if ($this->cache->makeDir())
-			chmod($this->cache->getDir(), 0777);
+		if ($this->cache->make_dir())
+			chmod($this->cache->get_dir(), 0777);
 
 		if (!$this->cache->exists(".no-auto-expiry"))
 			$this->cache->touch(".no-auto-expiry");
 
-		if ($this->cache->isWritable()) {
+		if ($this->cache->is_writable()) {
 			$host->add_hook($host::HOOK_HOUSE_KEEPING, $this);
 			$host->add_hook($host::HOOK_ENCLOSURE_ENTRY, $this);
 			$host->add_hook($host::HOOK_SANITIZE, $this);
 		} else {
-			user_error("Starred cache directory ".$this->cache->getDir()." is not writable.", E_USER_WARNING);
+			user_error("Starred cache directory ".$this->cache->get_dir()." is not writable.", E_USER_WARNING);
 		}
 	}
 
@@ -69,9 +69,9 @@ class Cache_Starred_Images extends Plugin {
 
 		/* actual housekeeping */
 
-		Debug::log("expiring " . $this->cache->getDir() . "...");
+		Debug::log("expiring " . $this->cache->get_dir() . "...");
 
-		$files = glob($this->cache->getDir() . "/*.{png,mp4,status}", GLOB_BRACE);
+		$files = glob($this->cache->get_dir() . "/*.{png,mp4,status}", GLOB_BRACE);
 
 		$last_article_id = 0;
 		$article_exists = 1;
@@ -98,7 +98,7 @@ class Cache_Starred_Images extends Plugin {
 		$local_filename = $article_id . "-" . sha1($enc["content_url"]);
 
 		if ($this->cache->exists($local_filename)) {
-			$enc["content_url"] = $this->cache->getUrl($local_filename);
+			$enc["content_url"] = $this->cache->get_url($local_filename);
 		}
 
 		return $enc;
@@ -117,7 +117,7 @@ class Cache_Starred_Images extends Plugin {
 					$local_filename = $article_id . "-" . sha1($src);
 
 					if ($this->cache->exists($local_filename)) {
-						$entry->setAttribute("src", $this->cache->getUrl($local_filename));
+						$entry->setAttribute("src", $this->cache->get_url($local_filename));
 						$entry->removeAttribute("srcset");
 					}
 				}
@@ -151,7 +151,7 @@ class Cache_Starred_Images extends Plugin {
 		$status_filename = $article_id . "-" . sha1($site_url) . ".status";
 
 		/* housekeeping might run as a separate user, in this case status/media might not be writable */
-		if (!$this->cache->isWritable($status_filename)) {
+		if (!$this->cache->is_writable($status_filename)) {
 			Debug::log("status not writable: $status_filename", Debug::$LOG_VERBOSE);
 			return false;
 		}
-- 
cgit v1.2.3-54-g00ecf


From bd3c38de849330b3ed28df05c1220c631c103628 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 16:41:52 +0300
Subject: move bookmarklet-related subscribe_to_feed_url to bookmarklet plugin

---
 classes/pref/feeds.php        | 6 ------
 plugins/bookmarklets/init.php | 8 +++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 4c865e9f0..cb6ff94fc 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1655,10 +1655,4 @@ class Pref_Feeds extends Handler_Protected {
 		return $c;
 	}
 
-	static function subscribe_to_feed_url() {
-		$url_path = get_self_url_prefix() .
-			"/public.php?op=subscribe&feed_url=%s";
-		return $url_path;
-	}
-
 }
diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php
index fa1bb8cf6..9e0f8f348 100644
--- a/plugins/bookmarklets/init.php
+++ b/plugins/bookmarklets/init.php
@@ -16,6 +16,12 @@ class Bookmarklets extends Plugin {
     $host->add_hook($host::HOOK_PREFS_TAB, $this);
   }
 
+  private function subscribe_to_feed_url() {
+		$url_path = get_self_url_prefix() .
+			"/public.php?op=subscribe&feed_url=%s";
+		return $url_path;
+	}
+
   function hook_prefs_tab($args) {
     if ($args == "prefFeeds") {
 
@@ -24,7 +30,7 @@ class Bookmarklets extends Plugin {
 
 		print "<h3>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</h3>";
 
-		$bm_subscribe_url = str_replace('%s', '', Pref_Feeds::subscribe_to_feed_url());
+		$bm_subscribe_url = str_replace('%s', '', $this->subscribe_to_feed_url());
 
 		$confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?'));
 
-- 
cgit v1.2.3-54-g00ecf


From 6e06fe2885f2250d446d613215dbadf63d08a766 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 08:31:24 +0300
Subject: shorten_expanded: fix for posts without attachments

---
 plugins/shorten_expanded/init.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'plugins')

diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index 181e426a4..873749c03 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -25,20 +25,23 @@ require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 				if (row) {
 
 					const content = row.querySelector(".content-inner");
-					const attachments = row.querySelector(".attachments-inline");
 
-					if (content && attachments &&
-						row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
+					//console.log('shorten', row.offsetHeight, 'vs', _shorten_expanded_threshold * window.innerHeight);
+
+					if (content && row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
+
+						const attachments = row.querySelector(".attachments-inline"); // optional
 
 						content.innerHTML = `
 							<div class="content-shrink-wrap">
 								${content.innerHTML}
-								${attachments.innerHTML}
+								${attachments ? attachments.innerHTML : ''}
 							</div>
 							<button dojoType="dijit.form.Button" class="alt-info expand-prompt" onclick="return Plugins.Shorten_Expanded.expand('${row.id}')" href="#">
 								${__("Click to expand article")}</button>`;
 
-						attachments.innerHTML = "";
+						if (attachments)
+							attachments.innerHTML = "";
 
 						dojo.parser.parse(content);
 					}
-- 
cgit v1.2.3-54-g00ecf


From 26d6b84a572b5cbd99acffc5ae727ea6d1be543a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 14:23:00 +0300
Subject: add namespaced controls with unified naming; deprecated old-style
 control shortcuts

---
 classes/feeds.php           |  22 ++-
 classes/handler/public.php  |   4 +-
 classes/pref/feeds.php      |  27 ++--
 classes/pref/filters.php    |  21 +--
 classes/pref/prefs.php      |  41 +++--
 classes/pref/system.php     |   4 +-
 include/controls.php        | 383 +++++++++++---------------------------------
 include/controls_compat.php | 312 ++++++++++++++++++++++++++++++++++++
 include/functions.php       |   1 +
 include/login_form.php      |   2 +-
 plugins/mail/init.php       |   2 +-
 11 files changed, 470 insertions(+), 349 deletions(-)
 create mode 100644 include/controls_compat.php

(limited to 'plugins')

diff --git a/classes/feeds.php b/classes/feeds.php
index f3ce1e48b..aa1f889e0 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -583,7 +583,7 @@ class Feeds extends Handler_Protected {
 
 	function subscribeToFeed() {
 		print json_encode([
-			"cat_select" => format_feed_cat_select("cat", false, 'dojoType="fox.form.Select"')
+			"cat_select" => \Controls\select_feeds_cats("cat")
 		]);
 	}
 
@@ -607,8 +607,8 @@ class Feeds extends Handler_Protected {
 		if (DB_TYPE == "pgsql") {
 			print "<fieldset>";
 			print "<label class='inline'>" . __("Language:") . "</label>";
-			print_select("search_language", get_pref('DEFAULT_SEARCH_LANGUAGE'), Pref_Feeds::get_ts_languages(),
-				"dojoType='fox.form.Select' title=\"".__('Used for word stemming')."\"");
+			print \Controls\select_tag("search_language", get_pref('DEFAULT_SEARCH_LANGUAGE'), Pref_Feeds::get_ts_languages(),
+				"title=\"".__('Used for word stemming')."\"");
 			print "</fieldset>";
 		}
 
@@ -668,6 +668,15 @@ class Feeds extends Handler_Protected {
 					display : none;
 				}
 			</style>
+			<script>
+				dojoConfig = {
+					async: true,
+					cacheBust: "<?= get_scripts_timestamp(); ?>",
+					packages: [
+						{ name: "fox", location: "../../js" },
+					]
+				};
+			</script>
 			<?php
 				echo javascript_tag("lib/prototype.js");
 				echo javascript_tag("js/utility.js");
@@ -677,7 +686,7 @@ class Feeds extends Handler_Protected {
 		</head>
 		<body class="flat ttrss_utility feed_debugger css_loading">
 		<script type="text/javascript">
-			require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox', 'dijit/form/Select', 'dijit/form/Form',
+			require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox', 'fox/form/Select', 'dijit/form/Form',
 				'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'],function(parser, ready){
 				ready(function() {
 					parser.parse();
@@ -697,9 +706,8 @@ class Feeds extends Handler_Protected {
 
 						<fieldset>
 							<label>
-							<?php print_select_hash("xdebug", $xdebug,
-									[Debug::$LOG_VERBOSE => "LOG_VERBOSE", Debug::$LOG_EXTENDED => "LOG_EXTENDED"],
-									'dojoType="dijit.form.Select"');
+							<?= \Controls\select_hash("xdebug", $xdebug,
+									[Debug::$LOG_VERBOSE => "LOG_VERBOSE", Debug::$LOG_EXTENDED => "LOG_EXTENDED"]);
 							?></label>
 						</fieldset>
 
diff --git a/classes/handler/public.php b/classes/handler/public.php
index da1e53853..b0bed5d1c 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -788,7 +788,7 @@ class Handler_Public extends Handler {
 				?>
 				<form method="post">
 					<input type="hidden" name="op" value="subscribe">
-					<?php print_hidden("csrf_token", $_SESSION["csrf_token"]) ?>
+					<?= \Controls\hidden_tag("csrf_token", $_SESSION["csrf_token"]) ?>
 					<fieldset>
 						<label>Feed or site URL:</label>
 						<input style="width: 300px" dojoType="dijit.form.ValidationTextBox" required="1" name="feed_url" value="<?= htmlspecialchars($feed_url) ?>">
@@ -831,7 +831,7 @@ class Handler_Public extends Handler {
 
 					print "<form action='public.php'>";
 					print "<input type='hidden' name='op' value='subscribe'>";
-					print_hidden("csrf_token", $_SESSION["csrf_token"]);
+					print \Controls\hidden_tag("csrf_token", $_SESSION["csrf_token"]);
 
 					print "<fieldset>";
 					print "<label style='display : inline'>" . __("Multiple feed URLs found:") . "</label>";
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index cb6ff94fc..d97081293 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -563,15 +563,11 @@ class Pref_Feeds extends Handler_Protected {
 			/* Category */
 
 			if (get_pref('ENABLE_FEED_CATS')) {
-
-				$cat_id = $row["cat_id"];
-
 				print "<fieldset>";
 
 				print "<label>" . __('Place in category:') . "</label> ";
 
-				print_feed_cat_select("cat_id", $cat_id,
-					'dojoType="fox.form.Select"');
+				print \Controls\select_feeds_cats("cat_id", $row["cat_id"]);
 
 				print "</fieldset>";
 			}
@@ -601,8 +597,7 @@ class Pref_Feeds extends Handler_Protected {
 				print "<fieldset>";
 
 				print "<label>" . __('Language:') . "</label> ";
-				print_select("feed_language", $feed_language, $this::get_ts_languages(),
-					'dojoType="fox.form.Select"');
+				print \Controls\select_tag("feed_language", $feed_language, $this::get_ts_languages());
 
 				print "</fieldset>";
 			}
@@ -623,8 +618,7 @@ class Pref_Feeds extends Handler_Protected {
 			$local_update_intervals = $update_intervals;
 			$local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref("DEFAULT_UPDATE_INTERVAL")]);
 
-			print_select_hash("update_interval", $update_interval, $local_update_intervals,
-				'dojoType="fox.form.Select"');
+			print \Controls\select_hash("update_interval", $update_interval, $local_update_intervals);
 
 			print "</fieldset>";
 
@@ -650,8 +644,7 @@ class Pref_Feeds extends Handler_Protected {
 				$local_purge_intervals = [ T_nsprintf('%d day', '%d days', $purge_interval, $purge_interval) ];
 			}
 
-			print_select_hash("purge_interval", $purge_interval, $local_purge_intervals,
-				'dojoType="fox.form.Select" ' .
+			print \Controls\select_hash("purge_interval", $purge_interval, $local_purge_intervals,
 				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
 
 			print "</fieldset>";
@@ -857,8 +850,8 @@ class Pref_Feeds extends Handler_Protected {
 			print "<fieldset>";
 
 			print "<label>" . __('Language:') . "</label> ";
-			print_select("feed_language", "", $this::get_ts_languages(),
-				'disabled="1" dojoType="fox.form.Select"');
+			print \Controls\select_tag("feed_language", "", $this::get_ts_languages(),
+				'disabled="1"');
 
 			$this->batch_edit_cbox("feed_language");
 
@@ -879,8 +872,7 @@ class Pref_Feeds extends Handler_Protected {
 		$local_update_intervals = $update_intervals;
 		$local_update_intervals[0] .= sprintf(" (%s)", $update_intervals[get_pref("DEFAULT_UPDATE_INTERVAL")]);
 
-		print_select_hash("update_interval", "", $local_update_intervals,
-			'disabled="1" dojoType="fox.form.Select"');
+		print \Controls\select_hash("update_interval", "", $local_update_intervals, 'disabled="1"');
 
 		$this->batch_edit_cbox("update_interval");
 
@@ -902,8 +894,7 @@ class Pref_Feeds extends Handler_Protected {
 			else
 				$local_purge_intervals[0] .= " " . sprintf("(%s)", __("Disabled"));
 
-			print_select_hash("purge_interval", "", $local_purge_intervals,
-				'disabled="1" dojoType="fox.form.Select"');
+			print \Controls\select_hash("purge_interval", "", $local_purge_intervals, 'disabled="1"');
 
 			$this->batch_edit_cbox("purge_interval");
 
@@ -1550,7 +1541,7 @@ class Pref_Feeds extends Handler_Protected {
 	function batchSubscribe() {
 		print json_encode([
 			"enable_cats" => (int)get_pref('ENABLE_FEED_CATS'),
-			"cat_select" => format_feed_cat_select("cat", false, 'dojoType="fox.form.Select"')
+			"cat_select" => \Controls\select_feeds_cats("cat")
 		]);
 	}
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 930a4eeac..23275a1d6 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -392,7 +392,7 @@ class Pref_Filters extends Handler_Protected {
 
 					print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
 						<span onclick='App.dialogOf(this).editRule(this)'>".$this->_get_rule_name($line)."</span>".
-						format_hidden("rule[]", $data)."</li>";
+						\Controls\hidden_tag("rule[]", $data)."</li>";
 				}
 			}
 
@@ -434,7 +434,7 @@ class Pref_Filters extends Handler_Protected {
 
 					print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
 						<span onclick='App.dialogOf(this).editAction(this)'>".$this->_get_action_name($line)."</span>".
-						format_hidden("action[]", $data)."</li>";
+						\Controls\hidden_tag("action[]", $data)."</li>";
 				}
 			}
 
@@ -815,8 +815,7 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<fieldset>";
 		print "<label style='display : inline'>".  __("on field") . "</label> ";
-		print_select_hash("filter_type", $filter_type, $filter_types,
-			'dojoType="fox.form.Select"');
+		print \Controls\select_hash("filter_type", $filter_type, $filter_types);
 		print "<label style='padding-left : 10px; display : inline'>" . __("in") . "</label> ";
 
 		print "</fieldset>";
@@ -894,9 +893,13 @@ class Pref_Filters extends Handler_Protected {
 			id='filterDlg_actionParam' style=\"$param_hidden\"
 			name='action_param' value=\"$action_param\">";
 
-		print_label_select("action_param_label", $action_param,
+		/*print_label_select("action_param_label", $action_param,
 			"id='filterDlg_actionParamLabel' style=\"$label_param_hidden\"
-			dojoType='fox.form.Select'");
+			dojoType='fox.form.Select'");*/
+
+		print \Controls\select_labels("action_param_label", $action_param,
+			"style=\"$label_param_hidden\"",
+			"filterDlg_actionParamLabel");
 
 		$filter_actions = PluginHost::getInstance()->get_filter_actions();
 		$filter_action_hash = array();
@@ -918,9 +921,9 @@ class Pref_Filters extends Handler_Protected {
 			$filter_plugin_disabled = "";
 		}
 
-		print_select_hash("filterDlg_actionParamPlugin", $action_param, $filter_action_hash,
-			"style=\"$plugin_param_hidden\" dojoType='fox.form.Select' $filter_plugin_disabled",
-			"action_param_plugin");
+		print \Controls\select_hash("action_param_plugin", $action_param, $filter_action_hash,
+			"style=\"$plugin_param_hidden\" $filter_plugin_disabled",
+			"filterDlg_actionParamPlugin");
 
 		print "</span>";
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 81b7767eb..d8491995d 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -288,8 +288,8 @@ class Pref_Prefs extends Handler_Protected {
 		?>
 		<form dojoType='dijit.form.Form'>
 
-			<?php print_hidden("op", "pref-prefs") ?>
-			<?php print_hidden("method", "changeemail") ?>
+			<?= \Controls\hidden_tag("op", "pref-prefs") ?>
+			<?= \Controls\hidden_tag("method", "changeemail") ?>
 
 			<script type='dojo/method' event='onSubmit' args='evt'>
 				evt.preventDefault();
@@ -347,8 +347,8 @@ class Pref_Prefs extends Handler_Protected {
 
 			<form dojoType='dijit.form.Form'>
 
-				<?php print_hidden("op", "pref-prefs") ?>
-				<?php print_hidden("method", "changepassword") ?>
+				<?= \Controls\hidden_tag("op", "pref-prefs") ?>
+				<?= \Controls\hidden_tag("method", "changepassword") ?>
 
 				<script type='dojo/method' event='onSubmit' args='evt'>
 					evt.preventDefault();
@@ -456,8 +456,8 @@ class Pref_Prefs extends Handler_Protected {
 				?>
 
 				<form dojoType='dijit.form.Form'>
-					<?php print_hidden("op", "pref-prefs") ?>
-					<?php print_hidden("method", "otpdisable") ?>
+					<?= \Controls\hidden_tag("op", "pref-prefs") ?>
+					<?= \Controls\hidden_tag("method", "otpdisable") ?>
 
 					<script type='dojo/method' event='onSubmit' args='evt'>
 						evt.preventDefault();
@@ -511,10 +511,10 @@ class Pref_Prefs extends Handler_Protected {
 				$otp_secret = $this->otpsecret();
 				?>
 
-				<form dojoType='dijit.form.Form' id='changeOtpForm'>
+				<form dojoType='dijit.form.Form'>
 
-					<?php print_hidden("op", "pref-prefs") ?>
-					<?php print_hidden("method", "otpenable") ?>
+					<?= \Controls\hidden_tag("op", "pref-prefs") ?>
+					<?= \Controls\hidden_tag("method", "otpenable") ?>
 
 					<fieldset>
 						<label><?= __("OTP Key:") ?></label>
@@ -663,14 +663,14 @@ class Pref_Prefs extends Handler_Protected {
 					$type_name = $item['type_name'];
 
 					if ($pref_name == "USER_LANGUAGE") {
-						print_select_hash($pref_name, $value, get_translations(),
-							"style='width : 220px; margin : 0px' dojoType='fox.form.Select'");
+						print \Controls\select_hash($pref_name, $value, get_translations(),
+							"style='width : 220px; margin : 0px'");
 
 					} else if ($pref_name == "USER_TIMEZONE") {
 
 						$timezones = explode("\n", file_get_contents("lib/timezones.txt"));
 
-						print_select($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"');
+						print \Controls\select_tag($pref_name, $value, $timezones, 'dojoType="dijit.form.FilteringSelect"');
 
 					} else if ($pref_name == "BLACKLISTED_TAGS") { # TODO: other possible <textarea> prefs go here
 
@@ -715,12 +715,11 @@ class Pref_Prefs extends Handler_Protected {
 
 						global $update_intervals_nodefault;
 
-						print_select_hash($pref_name, $value, $update_intervals_nodefault,
-							'dojoType="fox.form.Select"');
+						print \Controls\select_hash($pref_name, $value, $update_intervals_nodefault);
+
 					} else if ($pref_name == "DEFAULT_SEARCH_LANGUAGE") {
 
-						print_select($pref_name, $value, Pref_Feeds::get_ts_languages(),
-							'dojoType="fox.form.Select"');
+						print \Controls\select_tag($pref_name, $value, Pref_Feeds::get_ts_languages());
 
 					} else if ($type_name == "bool") {
 
@@ -799,14 +798,14 @@ class Pref_Prefs extends Handler_Protected {
 				}
 			}
 		}
-		print_hidden("boolean_prefs", htmlspecialchars(join(",", $listed_boolean_prefs)));
+		print \Controls\hidden_tag("boolean_prefs", htmlspecialchars(join(",", $listed_boolean_prefs)));
 	}
 
 	private function index_prefs() {
 		?>
 		<form dojoType='dijit.form.Form' id='changeSettingsForm'>
-			<?php print_hidden("op", "pref-prefs") ?>
-			<?php print_hidden("method", "saveconfig") ?>
+			<?= \Controls\hidden_tag("op", "pref-prefs") ?>
+			<?= \Controls\hidden_tag("method", "saveconfig") ?>
 			<script type='dojo/method' event='onSubmit' args='evt, quit'>
 				if (evt) evt.preventDefault();
 				if (this.validate()) {
@@ -973,8 +972,8 @@ class Pref_Prefs extends Handler_Protected {
 				}
 			</script>
 
-			<?php print_hidden("op", "pref-prefs") ?>
-			<?php print_hidden("method", "setplugins") ?>
+			<?= \Controls\hidden_tag("op", "pref-prefs") ?>
+			<?= \Controls\hidden_tag("method", "setplugins") ?>
 
 			<div dojoType="dijit.layout.BorderContainer" gutters="false">
 				<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">
diff --git a/classes/pref/system.php b/classes/pref/system.php
index f0a5f7b7f..d3b733364 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -90,12 +90,12 @@ class Pref_System extends Handler_Administrative {
 				<div class='pull-right'>
 					<?= __("Severity:") ?>
 
-					<?php print_select_hash("severity", $severity,
+					<?= \Controls\select_hash("severity", $severity,
 						[
 							E_USER_ERROR => __("Errors"),
 							E_USER_WARNING => __("Warnings"),
 							E_USER_NOTICE => __("Everything")
-						], 'dojoType="fox.form.Select" onchange="Helpers.EventLog.refresh()"') ?>
+						], 'onchange="Helpers.EventLog.refresh()"', "severity") ?>
 				</div>
 			</div>
 
diff --git a/include/controls.php b/include/controls.php
index f706931db..34a4af1f2 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -1,326 +1,133 @@
 <?php
+   namespace Controls;
 
-function print_select($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) $name = $id;
+   function select_tag(string $name, $value, array $values, string $attributes = "", string $id = "") {
+      $dojo_type = strpos($attributes, "dojoType") === false ? "dojoType='fox.form.Select'" : "";
 
-	print "<select name=\"$name\" id=\"$id\" $attributes>";
-	foreach ($values as $v) {
-		if ($v == $default)
-			$sel = "selected=\"1\"";
-		else
-			$sel = "";
+      $rv = "<select $dojo_type name=\"".htmlspecialchars($name)."\"
+         id=\"".htmlspecialchars($id)."\" name=\"".htmlspecialchars($name)."\" $attributes>";
 
-		$v = trim($v);
+      foreach ($values as $v) {
+         $is_sel = ($v == $value) ? "selected=\"selected\"" : "";
 
-		print "<option value=\"$v\" $sel>$v</option>";
-	}
-	print "</select>";
-}
+         $rv .= "<option value=\"".htmlspecialchars($v)."\" $is_sel>".htmlspecialchars($v)."</option>";
+      }
 
-function print_select_hash($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) $name = $id;
+      $rv .= "</select>";
 
-	print "<select name=\"$name\" id='$id' $attributes>";
-	foreach (array_keys($values) as $v) {
-		if ($v == $default)
-			$sel = 'selected="selected"';
-		else
-			$sel = "";
+      return $rv;
+   }
 
-		$v = trim($v);
+   function select_labels(string $name, string $value, string $attributes = "", string $id = "") {
+      $pdo = \Db::pdo();
 
-		print "<option $sel value=\"$v\">".$values[$v]."</option>";
-	}
+      $sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
+            WHERE owner_uid = ? ORDER BY caption");
+      $sth->execute([$_SESSION['uid']]);
 
-	print "</select>";
-}
+      $values = [];
 
-function format_hidden($name, $value) {
-	return "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"$name\" value=\"$value\">";
-}
+      while ($row = $sth->fetch()) {
+         array_push($values, $row["caption"]);
+      }
 
-function print_hidden($name, $value) {
-	print format_hidden($name, $value);
-}
+      return select_tag($name, $value, $values, $attributes, $id);
+   }
 
-function format_checkbox($id, $checked, $value = "", $attributes = "") {
-	$checked_str = $checked ? "checked" : "";
-	$value_str = $value ? "value=\"$value\"" : "";
+   function select_hash(string $name, $value, array $values, string $attributes = "", string $id = "") {
+      $dojo_type = strpos($attributes, "dojoType") === false ? "dojoType='fox.form.Select'" : "";
 
-	return "<input dojoType=\"dijit.form.CheckBox\" id=\"$id\" $value_str $checked_str $attributes name=\"$id\">";
-}
+      $rv = "<select $dojo_type name=\"".htmlspecialchars($name)."\"
+         id=\"".htmlspecialchars($id)."\" name=\"".htmlspecialchars($name)."\" $attributes>";
 
-function print_checkbox($id, $checked, $value = "", $attributes = "") {
-	print format_checkbox($id, $checked, $value, $attributes);
-}
+      foreach ($values as $k => $v) {
+         $is_sel = ($k == $value) ? "selected=\"selected\"" : "";
 
-function print_button($type, $value, $attributes = "") {
-	print "<p><button dojoType=\"dijit.form.Button\" $attributes type=\"$type\">$value</button>";
-}
+         $rv .= "<option value=\"".htmlspecialchars($k)."\" $is_sel>".htmlspecialchars($v)."</option>";
+      }
 
-function print_radio($id, $default, $true_is, $values, $attributes = "") {
-	foreach ($values as $v) {
+      $rv .= "</select>";
 
-		if ($v == $default)
-			$sel = "checked";
-		else
-			$sel = "";
+      return $rv;
+   }
 
-		if ($v == $true_is) {
-			$sel .= " value=\"1\"";
-		} else {
-			$sel .= " value=\"0\"";
-		}
+   function hidden_tag(string $name, string $value) {
+      return "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"
+         name=\"".htmlspecialchars($name)."\" value=\"".htmlspecialchars($value)."\">";
+   }
 
-		print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\"
-				type=\"radio\" $sel $attributes name=\"$id\">&nbsp;$v&nbsp;";
+   function checkbox_tag(string $name, bool $checked, string $value = "", string $attributes = "", string $id = "") {
+      $is_checked = $checked ? "checked" : "";
+      $value_str = $value ? "value=\"".htmlspecialchars($value)."\"" : "";
 
-	}
-}
+      return "<input dojoType='dijit.form.CheckBox' name=\"".htmlspecialchars($name)."\"
+                  $value_str $is_checked $attributes name=\"".htmlspecialchars($id)."\">";
+   }
 
-function print_feed_multi_select($id, $default_ids = [],
-						   $attributes = "", $include_all_feeds = true,
-						   $root_id = null, $nest_level = 0) {
+   function select_feeds_cats(string $name, int $default_id = null, string $attributes = "",
+                  bool $include_all_cats = true, string $root_id = null, int $nest_level = 0, string $id = "") {
 
-	$pdo = Db::pdo();
+      $ret = "";
 
-	print_r(in_array("CAT:6",$default_ids));
+      if (!$root_id) {
+         $ret .= "<select name=\"".htmlspecialchars($name)."\"
+                        id=\"".htmlspecialchars($id)."\"
+                        default=\"".((string)$default_id)."\"
+                        dojoType=\"fox.form.Select\" $attributes>";
+      }
 
-	if (!$root_id) {
-		print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
-		if ($include_all_feeds) {
-			$is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : "";
-			print "<option $is_selected value=\"0\">".__('All feeds')."</option>";
-		}
-	}
+      $pdo = \Db::pdo();
 
-	if (get_pref('ENABLE_FEED_CATS')) {
+      if (!$root_id) $root_id = null;
 
-		if (!$root_id) $root_id = null;
+      $sth = $pdo->prepare("SELECT id,title,
+               (SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
+                  c2.parent_cat = ttrss_feed_categories.id) AS num_children
+               FROM ttrss_feed_categories
+               WHERE owner_uid = :uid AND
+               (parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
+      $sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
 
-		$sth = $pdo->prepare("SELECT id,title,
-				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
-					c2.parent_cat = ttrss_feed_categories.id) AS num_children
-				FROM ttrss_feed_categories
-				WHERE owner_uid = :uid AND
-				(parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
+      $found = 0;
 
-		$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
+      while ($line = $sth->fetch()) {
+         ++$found;
 
-		while ($line = $sth->fetch()) {
+         if ($line["id"] == $default_id) {
+            $is_selected = "selected=\"1\"";
+         } else {
+            $is_selected = "";
+         }
 
-			for ($i = 0; $i < $nest_level; $i++)
-				$line["title"] = " " . $line["title"];
+         for ($i = 0; $i < $nest_level; $i++)
+            $line["title"] = " " . $line["title"];
 
-			$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
+         if ($line["title"])
+            $ret .= sprintf("<option $is_selected value='%d'>%s</option>",
+               $line["id"], htmlspecialchars($line["title"]));
 
-			printf("<option $is_selected value='CAT:%d'>%s</option>",
-				$line["id"], htmlspecialchars($line["title"]));
+         if ($line["num_children"] > 0)
+            $ret .= select_feeds_cats($id, $default_id, $attributes,
+               $include_all_cats, $line["id"], $nest_level+1, $id);
+      }
 
-			if ($line["num_children"] > 0)
-				print_feed_multi_select($id, $default_ids, $attributes,
-					$include_all_feeds, $line["id"], $nest_level+1);
+      if (!$root_id) {
+         if ($include_all_cats) {
+            if ($found > 0) {
+               $ret .= "<option disabled=\"1\">―――――――――――――――</option>";
+            }
 
-			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
-					WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
+            if ($default_id == 0) {
+               $is_selected = "selected=\"1\"";
+            } else {
+               $is_selected = "";
+            }
 
-			$f_sth->execute([$line['id'], $_SESSION['uid']]);
+            $ret .= "<option $is_selected value=\"0\">".__('Uncategorized')."</option>";
+         }
+         $ret .= "</select>";
+      }
 
-			while ($fline = $f_sth->fetch()) {
-				$is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
+      return $ret;
+   }
 
-				$fline["title"] = " " . $fline["title"];
-
-				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " " . $fline["title"];
-
-				printf("<option $is_selected value='%d'>%s</option>",
-					$fline["id"], htmlspecialchars($fline["title"]));
-			}
-		}
-
-		if (!$root_id) {
-			$is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : "";
-
-			printf("<option $is_selected value='CAT:0'>%s</option>",
-				__("Uncategorized"));
-
-			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
-					WHERE cat_id IS NULL AND owner_uid = ? ORDER BY title");
-			$f_sth->execute([$_SESSION['uid']]);
-
-			while ($fline = $f_sth->fetch()) {
-				$is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
-
-				$fline["title"] = " " . $fline["title"];
-
-				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " " . $fline["title"];
-
-				printf("<option $is_selected value='%d'>%s</option>",
-					$fline["id"], htmlspecialchars($fline["title"]));
-			}
-		}
-
-	} else {
-		$sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
-				WHERE owner_uid = ? ORDER BY title");
-		$sth->execute([$_SESSION['uid']]);
-
-		while ($line = $sth->fetch()) {
-
-			$is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : "";
-
-			printf("<option $is_selected value='%d'>%s</option>",
-				$line["id"], htmlspecialchars($line["title"]));
-		}
-	}
-
-	if (!$root_id) {
-		print "</select>";
-	}
-}
-
-function print_feed_cat_select($id, $default_id, $attributes, $include_all_cats = true,
-	$root_id = null, $nest_level = 0) {
-
-	print format_feed_cat_select($id, $default_id, $attributes, $include_all_cats, $root_id, $nest_level);
-}
-
-function format_feed_cat_select($id, $default_id, $attributes, $include_all_cats = true,
-	$root_id = null, $nest_level = 0) {
-
-	$ret = "";
-
-	if (!$root_id) {
-		$ret .= "<select id=\"$id\" name=\"$id\" default=\"$default_id\" $attributes>";
-	}
-
-	$pdo = Db::pdo();
-
-	if (!$root_id) $root_id = null;
-
-	$sth = $pdo->prepare("SELECT id,title,
-				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
-					c2.parent_cat = ttrss_feed_categories.id) AS num_children
-				FROM ttrss_feed_categories
-				WHERE owner_uid = :uid AND
-				  (parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
-	$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
-
-	$found = 0;
-
-	while ($line = $sth->fetch()) {
-		++$found;
-
-		if ($line["id"] == $default_id) {
-			$is_selected = "selected=\"1\"";
-		} else {
-			$is_selected = "";
-		}
-
-		for ($i = 0; $i < $nest_level; $i++)
-			$line["title"] = " " . $line["title"];
-
-		if ($line["title"])
-			$ret .= sprintf("<option $is_selected value='%d'>%s</option>",
-				$line["id"], htmlspecialchars($line["title"]));
-
-		if ($line["num_children"] > 0)
-			$ret .= format_feed_cat_select($id, $default_id, $attributes,
-				$include_all_cats, $line["id"], $nest_level+1);
-	}
-
-	if (!$root_id) {
-		if ($include_all_cats) {
-			if ($found > 0) {
-				$ret .= "<option disabled=\"1\">―――――――――――――――</option>";
-			}
-
-			if ($default_id == 0) {
-				$is_selected = "selected=\"1\"";
-			} else {
-				$is_selected = "";
-			}
-
-			$ret .= "<option $is_selected value=\"0\">".__('Uncategorized')."</option>";
-		}
-		$ret .= "</select>";
-	}
-
-	return $ret;
-}
-
-function stylesheet_tag($filename, $id = false) {
-	$timestamp = filemtime($filename);
-
-	$id_part = $id ? "id=\"$id\"" : "";
-
-	return "<link rel=\"stylesheet\" $id_part type=\"text/css\" data-orig-href=\"$filename\" href=\"$filename?$timestamp\"/>\n";
-}
-
-function javascript_tag($filename) {
-	$query = "";
-
-	if (!(strpos($filename, "?") === false)) {
-		$query = substr($filename, strpos($filename, "?")+1);
-		$filename = substr($filename, 0, strpos($filename, "?"));
-	}
-
-	$timestamp = filemtime($filename);
-
-	if ($query) $timestamp .= "&$query";
-
-	return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
-}
-
-function format_warning($msg, $id = "") {
-	return "<div class=\"alert\" id=\"$id\">$msg</div>";
-}
-
-function format_notice($msg, $id = "") {
-	return "<div class=\"alert alert-info\" id=\"$id\">$msg</div>";
-}
-
-function format_error($msg, $id = "") {
-	return "<div class=\"alert alert-danger\" id=\"$id\">$msg</div>";
-}
-
-function print_notice($msg) {
-	return print format_notice($msg);
-}
-
-function print_warning($msg) {
-	return print format_warning($msg);
-}
-
-function print_error($msg) {
-	return print format_error($msg);
-}
-
-function print_label_select($name, $value, $attributes = "") {
-
-	$pdo = Db::pdo();
-
-	$sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
-			WHERE owner_uid = ? ORDER BY caption");
-	$sth->execute([$_SESSION['uid']]);
-
-	print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
-		"\" $attributes>";
-
-	while ($line = $sth->fetch()) {
-
-		$issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
-
-		print "<option value=\"".htmlspecialchars($line["caption"])."\"
-				$issel>" . htmlspecialchars($line["caption"]) . "</option>";
-
-	}
-
-#		print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
-
-	print "</select>";
-
-
-}
diff --git a/include/controls_compat.php b/include/controls_compat.php
new file mode 100644
index 000000000..3d2779b08
--- /dev/null
+++ b/include/controls_compat.php
@@ -0,0 +1,312 @@
+<?php
+
+// the following is deprecated and will be eventually removed
+
+function print_select($id, $default, $values, $attributes = "", $name = "") {
+	if (!$name) $name = $id;
+
+	print "<select name=\"$name\" id=\"$id\" $attributes>";
+	foreach ($values as $v) {
+		if ($v == $default)
+			$sel = "selected=\"1\"";
+		else
+			$sel = "";
+
+		$v = trim($v);
+
+		print "<option value=\"$v\" $sel>$v</option>";
+	}
+	print "</select>";
+}
+
+function print_select_hash($id, $default, $values, $attributes = "", $name = "") {
+	if (!$name) $name = $id;
+
+	print "<select name=\"$name\" id='$id' $attributes>";
+	foreach (array_keys($values) as $v) {
+		if ($v == $default)
+			$sel = 'selected="selected"';
+		else
+			$sel = "";
+
+		$v = trim($v);
+
+		print "<option $sel value=\"$v\">".$values[$v]."</option>";
+	}
+
+	print "</select>";
+}
+
+function format_hidden($name, $value) {
+	return "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"$name\" value=\"$value\">";
+}
+
+function print_hidden($name, $value) {
+	print format_hidden($name, $value);
+}
+
+function format_checkbox($id, $checked, $value = "", $attributes = "") {
+	$checked_str = $checked ? "checked" : "";
+	$value_str = $value ? "value=\"$value\"" : "";
+
+	return "<input dojoType=\"dijit.form.CheckBox\" id=\"$id\" $value_str $checked_str $attributes name=\"$id\">";
+}
+
+function print_checkbox($id, $checked, $value = "", $attributes = "") {
+	print format_checkbox($id, $checked, $value, $attributes);
+}
+
+function format_button($type, $value, $attributes = "") {
+	return "<button dojoType=\"dijit.form.Button\" $attributes type=\"$type\">$value</button>";
+}
+
+function print_button($type, $value, $attributes = "") {
+	print format_button($type, $value, $attributes);
+}
+
+function print_feed_multi_select($id, $default_ids = [],
+						   $attributes = "", $include_all_feeds = true,
+						   $root_id = null, $nest_level = 0) {
+
+	$pdo = Db::pdo();
+
+	print_r(in_array("CAT:6",$default_ids));
+
+	if (!$root_id) {
+		print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
+		if ($include_all_feeds) {
+			$is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : "";
+			print "<option $is_selected value=\"0\">".__('All feeds')."</option>";
+		}
+	}
+
+	if (get_pref('ENABLE_FEED_CATS')) {
+
+		if (!$root_id) $root_id = null;
+
+		$sth = $pdo->prepare("SELECT id,title,
+				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
+					c2.parent_cat = ttrss_feed_categories.id) AS num_children
+				FROM ttrss_feed_categories
+				WHERE owner_uid = :uid AND
+				(parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
+
+		$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
+
+		while ($line = $sth->fetch()) {
+
+			for ($i = 0; $i < $nest_level; $i++)
+				$line["title"] = " " . $line["title"];
+
+			$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
+
+			printf("<option $is_selected value='CAT:%d'>%s</option>",
+				$line["id"], htmlspecialchars($line["title"]));
+
+			if ($line["num_children"] > 0)
+				print_feed_multi_select($id, $default_ids, $attributes,
+					$include_all_feeds, $line["id"], $nest_level+1);
+
+			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+					WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
+
+			$f_sth->execute([$line['id'], $_SESSION['uid']]);
+
+			while ($fline = $f_sth->fetch()) {
+				$is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
+
+				$fline["title"] = " " . $fline["title"];
+
+				for ($i = 0; $i < $nest_level; $i++)
+					$fline["title"] = " " . $fline["title"];
+
+				printf("<option $is_selected value='%d'>%s</option>",
+					$fline["id"], htmlspecialchars($fline["title"]));
+			}
+		}
+
+		if (!$root_id) {
+			$is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : "";
+
+			printf("<option $is_selected value='CAT:0'>%s</option>",
+				__("Uncategorized"));
+
+			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+					WHERE cat_id IS NULL AND owner_uid = ? ORDER BY title");
+			$f_sth->execute([$_SESSION['uid']]);
+
+			while ($fline = $f_sth->fetch()) {
+				$is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
+
+				$fline["title"] = " " . $fline["title"];
+
+				for ($i = 0; $i < $nest_level; $i++)
+					$fline["title"] = " " . $fline["title"];
+
+				printf("<option $is_selected value='%d'>%s</option>",
+					$fline["id"], htmlspecialchars($fline["title"]));
+			}
+		}
+
+	} else {
+		$sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+				WHERE owner_uid = ? ORDER BY title");
+		$sth->execute([$_SESSION['uid']]);
+
+		while ($line = $sth->fetch()) {
+
+			$is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : "";
+
+			printf("<option $is_selected value='%d'>%s</option>",
+				$line["id"], htmlspecialchars($line["title"]));
+		}
+	}
+
+	if (!$root_id) {
+		print "</select>";
+	}
+}
+
+function print_feed_cat_select($id, $default_id, $attributes, $include_all_cats = true,
+	$root_id = null, $nest_level = 0) {
+
+	print format_feed_cat_select($id, $default_id, $attributes, $include_all_cats, $root_id, $nest_level);
+}
+
+function format_feed_cat_select($id, $default_id, $attributes, $include_all_cats = true,
+	$root_id = null, $nest_level = 0) {
+
+	$ret = "";
+
+	if (!$root_id) {
+		$ret .= "<select id=\"$id\" name=\"$id\" default=\"$default_id\" $attributes>";
+	}
+
+	$pdo = Db::pdo();
+
+	if (!$root_id) $root_id = null;
+
+	$sth = $pdo->prepare("SELECT id,title,
+				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
+					c2.parent_cat = ttrss_feed_categories.id) AS num_children
+				FROM ttrss_feed_categories
+				WHERE owner_uid = :uid AND
+				  (parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
+	$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
+
+	$found = 0;
+
+	while ($line = $sth->fetch()) {
+		++$found;
+
+		if ($line["id"] == $default_id) {
+			$is_selected = "selected=\"1\"";
+		} else {
+			$is_selected = "";
+		}
+
+		for ($i = 0; $i < $nest_level; $i++)
+			$line["title"] = " " . $line["title"];
+
+		if ($line["title"])
+			$ret .= sprintf("<option $is_selected value='%d'>%s</option>",
+				$line["id"], htmlspecialchars($line["title"]));
+
+		if ($line["num_children"] > 0)
+			$ret .= format_feed_cat_select($id, $default_id, $attributes,
+				$include_all_cats, $line["id"], $nest_level+1);
+	}
+
+	if (!$root_id) {
+		if ($include_all_cats) {
+			if ($found > 0) {
+				$ret .= "<option disabled=\"1\">―――――――――――――――</option>";
+			}
+
+			if ($default_id == 0) {
+				$is_selected = "selected=\"1\"";
+			} else {
+				$is_selected = "";
+			}
+
+			$ret .= "<option $is_selected value=\"0\">".__('Uncategorized')."</option>";
+		}
+		$ret .= "</select>";
+	}
+
+	return $ret;
+}
+
+function stylesheet_tag($filename, $id = false) {
+	$timestamp = filemtime($filename);
+
+	$id_part = $id ? "id=\"$id\"" : "";
+
+	return "<link rel=\"stylesheet\" $id_part type=\"text/css\" data-orig-href=\"$filename\" href=\"$filename?$timestamp\"/>\n";
+}
+
+function javascript_tag($filename) {
+	$query = "";
+
+	if (!(strpos($filename, "?") === false)) {
+		$query = substr($filename, strpos($filename, "?")+1);
+		$filename = substr($filename, 0, strpos($filename, "?"));
+	}
+
+	$timestamp = filemtime($filename);
+
+	if ($query) $timestamp .= "&$query";
+
+	return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
+}
+
+function format_warning($msg, $id = "") {
+	return "<div class=\"alert\" id=\"$id\">$msg</div>";
+}
+
+function format_notice($msg, $id = "") {
+	return "<div class=\"alert alert-info\" id=\"$id\">$msg</div>";
+}
+
+function format_error($msg, $id = "") {
+	return "<div class=\"alert alert-danger\" id=\"$id\">$msg</div>";
+}
+
+function print_notice($msg) {
+	return print format_notice($msg);
+}
+
+function print_warning($msg) {
+	return print format_warning($msg);
+}
+
+function print_error($msg) {
+	return print format_error($msg);
+}
+
+function print_label_select($name, $value, $attributes = "") {
+
+	$pdo = Db::pdo();
+
+	$sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
+			WHERE owner_uid = ? ORDER BY caption");
+	$sth->execute([$_SESSION['uid']]);
+
+	print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
+		"\" $attributes>";
+
+	while ($line = $sth->fetch()) {
+
+		$issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
+
+		print "<option value=\"".htmlspecialchars($line["caption"])."\"
+				$issel>" . htmlspecialchars($line["caption"]) . "</option>";
+
+	}
+
+#		print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
+
+	print "</select>";
+
+
+}
diff --git a/include/functions.php b/include/functions.php
index 4557c0411..174ef39f0 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -203,6 +203,7 @@
 
 	require_once 'db-prefs.php';
 	require_once 'controls.php';
+	require_once 'controls_compat.php';
 
 	define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . get_version() . ' (http://tt-rss.org/)');
 	ini_set('user_agent', SELF_USER_AGENT);
diff --git a/include/login_form.php b/include/login_form.php
index aa6a72260..798efa624 100755
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -97,7 +97,7 @@
 		<form action="public.php?return=<?= $return ?>"
 			  dojoType="dijit.form.Form" method="POST">
 
-			<?php print_hidden("op", "login"); ?>
+			<?= \Controls\hidden_tag("op", "login"); ?>
 
 			<?php if (!empty($_SESSION["login_error_msg"])) { ?>
 				<?= format_error($_SESSION["login_error_msg"]) ?>
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 829620ebc..b1263ece5 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -160,7 +160,7 @@ class Mail extends Plugin {
 				style=\"width : 30em;\"
 				name=\"destination\" id=\"emailArticleDlg_destination\">"; */
 
-		print_select("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.ComboBox"');
+		print \Controls\select_tag("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.ComboBox"');
 
 /*		print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
 	style=\"z-index: 30; display : none\"></div>"; */
-- 
cgit v1.2.3-54-g00ecf


From 1f43d7916cda16e9680b9087bda1f52934e8f25b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 14:32:06 +0300
Subject: replace print_hidden with hidden_tag

---
 classes/pref/feeds.php          | 12 ++++++------
 classes/pref/filters.php        | 10 +++++-----
 plugins/af_proxy_http/init.php  |  6 +++---
 plugins/af_psql_trgm/init.php   |  6 +++---
 plugins/af_readability/init.php |  6 +++---
 plugins/af_redditimgur/init.php |  6 +++---
 plugins/mail/init.php           | 16 ++++++++--------
 plugins/note/init.php           |  8 ++++----
 plugins/nsfw/init.php           |  6 +++---
 9 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'plugins')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index d97081293..d087d026d 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -524,9 +524,9 @@ class Pref_Feeds extends Handler_Protected {
 
 			$title = htmlspecialchars($row["title"]);
 
-			print_hidden("id", "$feed_id");
-			print_hidden("op", "pref-feeds");
-			print_hidden("method", "editSave");
+			print \Controls\hidden_tag("id", "$feed_id");
+			print \Controls\hidden_tag("op", "pref-feeds");
+			print \Controls\hidden_tag("method", "editSave");
 
 			print "<header>".__("Feed")."</header>";
 			print "<section>";
@@ -821,9 +821,9 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<p>";
 
-		print_hidden("ids", "$feed_ids");
-		print_hidden("op", "pref-feeds");
-		print_hidden("method", "batchEditSave");
+		print \Controls\hidden_tag("ids", "$feed_ids");
+		print \Controls\hidden_tag("op", "pref-feeds");
+		print \Controls\hidden_tag("method", "batchEditSave");
 
 		print "<header>".__("Feed")."</header>";
 		print "<section>";
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 23275a1d6..9b740753a 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -327,16 +327,16 @@ class Pref_Filters extends Handler_Protected {
 
 			print "<form onsubmit='return false'>";
 
-			print_hidden("op", "pref-filters");
+			print \Controls\hidden_tag("op", "pref-filters");
 
 			if ($filter_id) {
-				print_hidden("id", "$filter_id");
-				print_hidden("method", "editSave");
+				print \Controls\hidden_tag("id", "$filter_id");
+				print \Controls\hidden_tag("method", "editSave");
 			} else {
-				print_hidden("method", "add");
+				print \Controls\hidden_tag("method", "add");
 			}
 
-			print_hidden("csrf_token", $_SESSION['csrf_token']);
+			print \Controls\hidden_tag("csrf_token", $_SESSION['csrf_token']);
 
 			print "<header>".__("Caption")."</header>
 				<section>
diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php
index 3f26ca900..b82999281 100644
--- a/plugins/af_proxy_http/init.php
+++ b/plugins/af_proxy_http/init.php
@@ -218,9 +218,9 @@ class Af_Proxy_Http extends Plugin {
 			}
 			</script>";
 
-		print_hidden("op", "pluginhandler");
-		print_hidden("method", "save");
-		print_hidden("plugin", "af_proxy_http");
+		print \Controls\hidden_tag("op", "pluginhandler");
+		print \Controls\hidden_tag("method", "save");
+		print \Controls\hidden_tag("plugin", "af_proxy_http");
 
 		$proxy_all = $this->host->get($this, "proxy_all");
 		print_checkbox("proxy_all", $proxy_all);
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 47ff98fc2..715e63927 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -157,9 +157,9 @@ class Af_Psql_Trgm extends Plugin {
 				}
 				</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "af_psql_trgm");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "save");
+			print \Controls\hidden_tag("plugin", "af_psql_trgm");
 
 			print "<h2>" . __("Global settings") . "</h2>";
 
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index 4d21a831c..435864c21 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -87,9 +87,9 @@ class Af_Readability extends Plugin {
 			}
 			</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "af_readability");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "save");
+			print \Controls\hidden_tag("plugin", "af_readability");
 
 			$enable_share_anything = $this->host->get($this, "enable_share_anything");
 
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index b9a2db68d..b9891ea03 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -58,9 +58,9 @@ class Af_RedditImgur extends Plugin {
 			}
 			</script>";
 
-		print_hidden("op", "pluginhandler");
-		print_hidden("method", "save");
-		print_hidden("plugin", "af_redditimgur");
+		print \Controls\hidden_tag("op", "pluginhandler");
+		print \Controls\hidden_tag("method", "save");
+		print \Controls\hidden_tag("plugin", "af_redditimgur");
 
 		print "<fieldset class='narrow'>";
 		print "<label class='checkbox'>";
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index b1263ece5..ffd0397e0 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -58,9 +58,9 @@ class Mail extends Plugin {
 			}
 			</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "mail");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "save");
+			print \Controls\hidden_tag("plugin", "mail");
 
 			$addresslist = $this->host->get($this, "addresslist");
 
@@ -86,9 +86,9 @@ class Mail extends Plugin {
 		$ids = explode(",", $_REQUEST['param']);
 		$ids_qmarks = arr_qmarks($ids);
 
-		print_hidden("op", "pluginhandler");
-		print_hidden("plugin", "mail");
-		print_hidden("method", "sendEmail");
+		print \Controls\hidden_tag("op", "pluginhandler");
+		print \Controls\hidden_tag("plugin", "mail");
+		print \Controls\hidden_tag("method", "sendEmail");
 
 		$sth = $this->pdo->prepare("SELECT email, full_name FROM ttrss_users WHERE
 			id = ?");
@@ -105,8 +105,8 @@ class Mail extends Plugin {
 		if (!$user_name)
 			$user_name = $_SESSION['name'];
 
-		print_hidden("from_email", "$user_email");
-		print_hidden("from_name", "$user_name");
+		print \Controls\hidden_tag("from_email", "$user_email");
+		print \Controls\hidden_tag("from_name", "$user_name");
 
 		$tpl = new Templator();
 
diff --git a/plugins/note/init.php b/plugins/note/init.php
index d5b231190..0634d4c57 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -37,10 +37,10 @@ class Note extends Plugin {
 
 			$note = $row['note'];
 
-			print_hidden("id", "$param");
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "setNote");
-			print_hidden("plugin", "note");
+			print \Controls\hidden_tag("id", "$param");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "setNote");
+			print \Controls\hidden_tag("plugin", "note");
 
 			print "<textarea dojoType='dijit.form.SimpleTextarea'
 				style='font-size : 12px; width : 98%; height: 100px;'
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index 02344eb14..1b27cc017 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -71,9 +71,9 @@ class NSFW extends Plugin {
 			}
 			</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "nsfw");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "save");
+			print \Controls\hidden_tag("plugin", "nsfw");
 
 			print "<table width=\"100%\" class=\"prefPrefsList\">";
 
-- 
cgit v1.2.3-54-g00ecf


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

---
 classes/feeds.php        |  2 +-
 classes/pref/feeds.php   | 15 +++++++--------
 classes/pref/filters.php |  8 ++++----
 classes/pref/prefs.php   |  4 ++--
 classes/pref/system.php  |  2 +-
 include/controls.php     | 47 ++++++++++++++++++++++++++++++-----------------
 include/login_form.php   |  3 ++-
 plugins/mail/init.php    |  3 ++-
 8 files changed, 49 insertions(+), 35 deletions(-)

(limited to 'plugins')

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


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

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

(limited to 'plugins')

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


From 0fc783e2b350b8ac6ff275fd9b201674cbcf2c16 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 22:07:37 +0300
Subject: cleanup markup in some plugins, make nsfw generate dijit widgets

---
 include/controls.php   |  4 +++
 plugins/note/init.php  | 21 ++++++-------
 plugins/nsfw/init.js   | 13 +++++---
 plugins/nsfw/init.php  | 84 ++++++++++++++++++++++----------------------------
 plugins/share/init.php | 52 ++++++++++++++-----------------
 5 files changed, 83 insertions(+), 91 deletions(-)

(limited to 'plugins')

diff --git a/include/controls.php b/include/controls.php
index 78ff75572..4c60d94f3 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -19,6 +19,10 @@
       return button_tag($value, "submit", array_merge(["class" => "alt-primary"], $attributes));
    }
 
+   function cancel_dialog_tag(string $value, array $attributes = []) {
+      return button_tag($value, "", array_merge(["onclick" => "App.dialogOf(this).hide()"], $attributes));
+   }
+
    function select_tag(string $name, $value, array $values, array $attributes = [], string $id = "") {
       $attributes_str = attributes_to_string($attributes);
       $dojo_type = strpos($attributes_str, "dojoType") === false ? "dojoType='fox.form.Select'" : "";
diff --git a/plugins/note/init.php b/plugins/note/init.php
index 0634d4c57..12c56f7ad 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -42,19 +42,18 @@ class Note extends Plugin {
 			print \Controls\hidden_tag("method", "setNote");
 			print \Controls\hidden_tag("plugin", "note");
 
-			print "<textarea dojoType='dijit.form.SimpleTextarea'
+			?>
+			<textarea dojoType='dijit.form.SimpleTextarea'
 				style='font-size : 12px; width : 98%; height: 100px;'
-				name='note'>$note</textarea>";
-
+				name='note'><?= $note ?></textarea>
+			<?php
 		}
-
-		print "<footer class='text-center'>";
-		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"dijit.byId('editNoteDlg').execute()\">".__('Save')."</button> ";
-		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"dijit.byId('editNoteDlg').hide()\">".__('Cancel')."</button>";
-		print "</footer>";
-
+		?>
+		<footer class='text-center'>
+			<?= \Controls\submit_tag(__('Save')) ?>
+			<?= \Controls\cancel_dialog_tag(__('Cancel')) ?>
+		</footer>
+		<?php
 	}
 
 	function setNote() {
diff --git a/plugins/nsfw/init.js b/plugins/nsfw/init.js
index adb6d43c0..4bc2443e8 100644
--- a/plugins/nsfw/init.js
+++ b/plugins/nsfw/init.js
@@ -1,7 +1,12 @@
-function nsfwShow(elem) {
-	let content = elem.parentNode.getElementsBySelector("div.nswf.content")[0];
+/* global Plugins */
 
-	if (content) {
-		Element.toggle(content);
+Plugins.NSFW = {
+	toggle: function(elem) {
+		const content = elem.domNode.parentNode.querySelector(".nswf.content");
+
+		if (content) {
+			Element.toggle(content);
+		}
 	}
 }
+
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index 1b27cc017..fecbc62af 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -27,74 +27,64 @@ class NSFW extends Plugin {
 		$a_tags = array_map("trim", explode(",", $article["tag_cache"]));
 
 		if (count(array_intersect($tags, $a_tags)) > 0) {
-			$article["content"] = "<div class='nswf wrapper'><button onclick=\"nsfwShow(this)\">".__("Not work safe (click to toggle)")."</button>
-				<div class='nswf content' style='display : none'>".$article["content"]."</div></div>";
+			$article["content"] = "<div class='nswf wrapper'>".
+					\Controls\button_tag(__("Not work safe (click to toggle)"), '', ['onclick' => 'Plugins.NSFW.toggle(this)']).
+					"<div class='nswf content' style='display : none'>".$article["content"]."</div>
+				</div>";
 		}
 
 		return $article;
 	}
 
 	function hook_render_article_cdm($article) {
-		$tags = array_map("trim", explode(",", $this->host->get($this, "tags")));
-		$a_tags = array_map("trim", explode(",", $article["tag_cache"]));
-
-		if (count(array_intersect($tags, $a_tags)) > 0) {
-			$article["content"] = "<div class='nswf wrapper'><button onclick=\"nsfwShow(this)\">".__("Not work safe (click to toggle)")."</button>
-				<div class='nswf content' style='display : none'>".$article["content"]."</div></div>";
-		}
-
-		return $article;
+		return $this->hook_render_article($article);
 	}
 
 	function hook_prefs_tab($args) {
 		if ($args != "prefPrefs") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\" 
-			title=\"<i class='material-icons'>extension</i> ".__("NSFW Plugin")."\">";
-
-		print "<br/>";
-
 		$tags = $this->host->get($this, "tags");
 
-		print "<form dojoType=\"dijit.form.Form\">";
-
-		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
-			evt.preventDefault();
-			if (this.validate()) {
-				new Ajax.Request('backend.php', {
-					parameters: dojo.objectToQuery(this.getValues()),
-					onComplete: function(transport) {
-						Notify.info(transport.responseText);
+		?>
+		<div dojoType="dijit.layout.AccordionPane"
+			title="<i class='material-icons'>extension</i> <?= __("NSFW Plugin") ?>">
+			<form dojoType="dijit.form.Form">
+
+				<?= \Controls\hidden_tag("op", "pluginhandler") ?>
+				<?= \Controls\hidden_tag("method", "save") ?>
+				<?= \Controls\hidden_tag("plugin", "nsfw") ?>
+
+				<script type="dojo/method" event="onSubmit" args="evt">
+					evt.preventDefault();
+					if (this.validate()) {
+						new Ajax.Request('backend.php', {
+							parameters: dojo.objectToQuery(this.getValues()),
+							onComplete: function(transport) {
+								Notify.info(transport.responseText);
+							}
+						});
 					}
-				});
-				//this.reset();
-			}
-			</script>";
-
-			print \Controls\hidden_tag("op", "pluginhandler");
-			print \Controls\hidden_tag("method", "save");
-			print \Controls\hidden_tag("plugin", "nsfw");
-
-			print "<table width=\"100%\" class=\"prefPrefsList\">";
-
-			print "<tr><td width=\"40%\">".__("Tags to consider NSFW (comma-separated)")."</td>";
-			print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"tags\" value=\"$tags\"></td></tr>";
+				</script>
 
-			print "</table>";
+				<header><?= __("Tags to consider NSFW (comma-separated):") ?></header>
 
-			print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
-				__("Save")."</button>";
+				<fieldset>
+					<textarea dojoType='dijit.form.SimpleTextarea' rows='4'
+							style='width: 500px; font-size : 12px;'
+							name='tags'><?= $tags ?></textarea>
+				</fieldset>
 
-			print "</form>";
+				<hr/>
 
-			print "</div>"; #pane
+				<?= \Controls\submit_tag(__("Save")) ?>
+			</form>
+		</div>
+		<?php
 	}
 
 	function save() {
-		$tags = explode(",", $_POST["tags"]);
-		$tags = array_map("trim", $tags);
-		$tags = array_map("mb_strtolower", $tags);
-		$tags = join(", ", $tags);
+		$tags = implode(", ",
+			FeedItem_Common::normalize_categories(explode(",", $_POST["tags"] ?? "")));
 
 		$this->host->set($this, "tags", $tags);
 
diff --git a/plugins/share/init.php b/plugins/share/init.php
index 42923ed8a..846e1f39c 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -41,14 +41,14 @@ class Share extends Plugin {
 
 	function hook_prefs_tab_section($id) {
 		if ($id == "prefFeedsPublishedGenerated") {
+			?>
+			<hr/>
 
-			print "<hr/>";
-
-			print "<h2>" . __("You can disable all articles shared by unique URLs here.") . "</h2>";
-
-			print "<button class='alt-danger' dojoType='dijit.form.Button' onclick=\"return Plugins.Share.clearKeys()\">".
-				__('Unshare all articles')."</button> ";
+			<h2><?= __("You can disable all articles shared by unique URLs here.") ?></h2>
 
+			<button class='alt-danger' dojoType='dijit.form.Button' onclick="return Plugins.Share.clearKeys()">
+				<?= __('Unshare all articles') ?></button>
+			<?php
 		}
 	}
 
@@ -100,39 +100,33 @@ class Share extends Plugin {
 				$sth->execute([$uuid, $param, $_SESSION['uid']]);
 			}
 
-			print "<header>" . __("You can share this article by the following unique URL:") . "</header>";
+			$url_path = htmlspecialchars(get_self_url_prefix() . "/public.php?op=share&key=$uuid");
 
-			$url_path = get_self_url_prefix();
-			$url_path .= "/public.php?op=share&key=$uuid";
+			?>
 
-			print "<section>
-				<div class='panel text-center'>
-				<a id='gen_article_url' href='$url_path' target='_blank' rel='noopener noreferrer'>$url_path</a>
-				</div>
-				</section>";
+			<header><?= __("You can share this article by the following unique URL:") ?></header>
 
-			/* if (!label_find_id(__('Shared'), $_SESSION["uid"]))
-				label_create(__('Shared'), $_SESSION["uid"]);
 
-			label_add_article($ref_id, __('Shared'), $_SESSION['uid']); */
+			<section>
+				<div class='panel text-center'>
+					<a id='gen_article_url' href="<?= $url_path ?>"
+						target='_blank' rel='noopener noreferrer'><?= $url_path ?></a>
+				</div>
+			</section>
 
+			<?php
 
 		} else {
 			print "Article not found.";
 		}
 
-		print "<footer class='text-center'>";
-
-		print "<button dojoType='dijit.form.Button' onclick=\"return App.dialogOf(this).unshare()\">".
-			__('Unshare article')."</button>";
-
-		print "<button dojoType='dijit.form.Button' onclick=\"return App.dialogOf(this).newurl()\">".
-			__('Generate new URL')."</button>";
-
-		print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".
-			__('Close this window')."</button>";
-
-		print "</footer>";
+		?>
+		<footer class='text-center'>
+			<?= \Controls\button_tag(__('Unshare article'), '', ['class' => 'alt-danger', 'onclick' => "App.dialogOf(this).unshare()"]) ?>
+			<?= \Controls\button_tag(__('Generate new URL'), '', ['onclick' => "App.dialogOf(this).newurl()"]) ?>
+			<?= \Controls\submit_tag(__("Close this window")) ?>
+		</footer>
+		<?php
 	}
 
 	function api_version() {
-- 
cgit v1.2.3-54-g00ecf


From 7adcada324dc6960cf4a120b1397c1bd60521d9b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 08:52:39 +0300
Subject: share plugin: cleanup, fix icon not highlighting properly

---
 plugins/share/init.php       | 37 ++++++++++++----------------
 plugins/share/share.css      |  2 +-
 plugins/share/share.js       | 58 +++++++++++++++++++++++---------------------
 plugins/share/share_prefs.js |  8 +++---
 4 files changed, 52 insertions(+), 53 deletions(-)

(limited to 'plugins')

diff --git a/plugins/share/init.php b/plugins/share/init.php
index 846e1f39c..a569393fe 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -17,18 +17,17 @@ class Share extends Plugin {
 	}
 
 	function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/share.js");
+		return file_get_contents(__DIR__ . "/share.js");
 	}
 
 	function get_css() {
-		return file_get_contents(dirname(__FILE__) . "/share.css");
+		return file_get_contents(__DIR__ . "/share.css");
 	}
 
 	function get_prefs_js() {
-		return file_get_contents(dirname(__FILE__) . "/share_prefs.js");
+		return file_get_contents(__DIR__ . "/share_prefs.js");
 	}
 
-
 	function unshare() {
 		$id = $_REQUEST['id'];
 
@@ -36,7 +35,7 @@ class Share extends Plugin {
 			AND owner_uid = ?");
 		$sth->execute([$id, $_SESSION['uid']]);
 
-		print "OK";
+		print __("Article unshared");
 	}
 
 	function hook_prefs_tab_section($id) {
@@ -52,16 +51,14 @@ class Share extends Plugin {
 		}
 	}
 
-	// Silent
 	function clearArticleKeys() {
 		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET uuid = '' WHERE
 			owner_uid = ?");
 		$sth->execute([$_SESSION['uid']]);
 
-		return;
+		print __("Shared URLs cleared.");
 	}
 
-
 	function newkey() {
 		$id = $_REQUEST['id'];
 		$uuid = uniqid_short();
@@ -70,26 +67,25 @@ class Share extends Plugin {
 			AND owner_uid = ?");
 		$sth->execute([$uuid, $id, $_SESSION['uid']]);
 
-		print json_encode(array("link" => $uuid));
+		print json_encode(["link" => $uuid]);
 	}
 
 	function hook_article_button($line) {
-		$img_class = $line['uuid'] ? "shared" : "";
+		$icon_class = !empty($line['uuid']) ? "is-shared" : "";
 
-		return "<i id='SHARE-IMG-".$line['int_id']."' class='material-icons icon-share $img_class'
+		return "<i class='material-icons icon-share share-icon-".$line['int_id']." $icon_class'
 			style='cursor : pointer' onclick=\"Plugins.Share.shareArticle(".$line['int_id'].")\"
 			title='".__('Share by URL')."'>link</i>";
 	}
 
-	function shareArticle() {
-		$param = $_REQUEST['param'];
+	function shareDialog() {
+		$id = (int)clean($_REQUEST['id'] ?? 0);
 
 		$sth = $this->pdo->prepare("SELECT uuid FROM ttrss_user_entries WHERE int_id = ?
 			AND owner_uid = ?");
-		$sth->execute([$param, $_SESSION['uid']]);
+		$sth->execute([$id, $_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
-
 			$uuid = $row['uuid'];
 
 			if (!$uuid) {
@@ -97,27 +93,26 @@ class Share extends Plugin {
 
 				$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET uuid = ? WHERE int_id = ?
 					AND owner_uid = ?");
-				$sth->execute([$uuid, $param, $_SESSION['uid']]);
+				$sth->execute([$uuid, $id, $_SESSION['uid']]);
 			}
 
-			$url_path = htmlspecialchars(get_self_url_prefix() . "/public.php?op=share&key=$uuid");
+			$url_path = get_self_url_prefix() . "/public.php?op=share&key=$uuid";
 
 			?>
 
 			<header><?= __("You can share this article by the following unique URL:") ?></header>
 
-
 			<section>
 				<div class='panel text-center'>
-					<a id='gen_article_url' href="<?= $url_path ?>"
-						target='_blank' rel='noopener noreferrer'><?= $url_path ?></a>
+					<a class='target-url' href="<?= htmlspecialchars($url_path) ?>"
+						target='_blank' rel='noopener noreferrer'><?= htmlspecialchars($url_path) ?></a>
 				</div>
 			</section>
 
 			<?php
 
 		} else {
-			print "Article not found.";
+			print format_error(__("Article not found."));
 		}
 
 		?>
diff --git a/plugins/share/share.css b/plugins/share/share.css
index 00bad68dd..ac9247a54 100644
--- a/plugins/share/share.css
+++ b/plugins/share/share.css
@@ -1,3 +1,3 @@
-i.icon-share.shared {
+i.material-icons.icon-share.is-shared {
     color : #0a0;
 }
\ No newline at end of file
diff --git a/plugins/share/share.js b/plugins/share/share.js
index 3fc42d654..09fb145c9 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -1,9 +1,7 @@
-/* global Plugins, xhrJson, Notify, fox, xhrPost, __ */
+/* global dojo, Effect, Plugins, xhrJson, Notify, fox, xhrPost, __ */
 
 Plugins.Share = {
 	shareArticle: function(id) {
-		const query = "backend.php?op=pluginhandler&plugin=share&method=shareArticle&param=" + encodeURIComponent(id);
-
 		const dialog = new fox.SingleUseDialog({
 			id: "shareArticleDlg",
 			title: __("Share article by URL"),
@@ -17,20 +15,23 @@ Plugins.Share = {
 					xhrJson("backend.php", query, (reply) => {
 						if (reply) {
 							const new_link = reply.link;
-							const e = $('gen_article_url');
+							const target = dialog.domNode.querySelector(".target-url");
 
-							if (new_link) {
+							if (new_link && target) {
 
-								e.innerHTML = e.innerHTML.replace(/\&amp;key=.*$/,
+								target.innerHTML = target.innerHTML.replace(/&amp;key=.*$/,
 									"&amp;key=" + new_link);
 
-								e.href = e.href.replace(/\&key=.*$/,
+								target.href = target.href.replace(/&key=.*$/,
 									"&key=" + new_link);
 
-								new Effect.Highlight(e);
+								// eslint-disable-next-line no-new
+								new Effect.Highlight(target);
+
+								const icon = document.querySelector(".share-icon-" + id);
 
-								const img = $("SHARE-IMG-" + id);
-								img.addClassName("shared");
+								if (icon)
+									icon.addClassName("is-shared");
 
 								Notify.close();
 
@@ -44,32 +45,35 @@ Plugins.Share = {
 			},
 			unshare: function () {
 				if (confirm(__("Remove sharing for this article?"))) {
+					xhrPost("backend.php", {op: "pluginhandler", plugin: "share", method: "unshare", id: id}, (transport) => {
+						Notify.info(transport.responseText);
 
-					const query = {op: "pluginhandler", plugin: "share", method: "unshare", id: id};
-
-					xhrPost("backend.php", query, () => {
-						try {
-							const img = $("SHARE-IMG-" + id);
+						const icon = document.querySelector(".share-icon-" + id);
 
-							if (img) {
-								img.removeClassName("shared");
-								img.up("div[id*=RROW]").removeClassName("shared");
-							}
+						if (icon)
+							icon.removeClassName("is-shared");
 
-							dialog.hide();
-						} catch (e) {
-							console.error(e);
-						}
+						dialog.hide();
 					});
 				}
 
 			},
-			href: query
+			content: __("Loading, please wait...")
 		});
 
-		dialog.show();
+		const tmph = dojo.connect(dialog, 'onShow', function () {
+			dojo.disconnect(tmph);
 
-		const img = $("SHARE-IMG-" + id);
-		img.addClassName("shared");
+			xhrPost("backend.php", {op: "pluginhandler", plugin: "share", method: "shareDialog", id: id}, (transport) => {
+				dialog.attr('content', transport.responseText)
+
+				const icon = document.querySelector(".share-icon-" + id);
+
+				if (icon)
+					icon.addClassName("is-shared");
+			});
+		});
+
+		dialog.show();
 	}
 }
diff --git a/plugins/share/share_prefs.js b/plugins/share/share_prefs.js
index 071a6667c..29c9aeaf8 100644
--- a/plugins/share/share_prefs.js
+++ b/plugins/share/share_prefs.js
@@ -1,12 +1,12 @@
+/* global Plugins, Notify, xhrPost */
+
 Plugins.Share = {
 	clearKeys: function() {
 		if (confirm(__("This will invalidate all previously shared article URLs. Continue?"))) {
 			Notify.progress("Clearing URLs...");
 
-			const query = {op: "pluginhandler", plugin: "share", method: "clearArticleKeys"};
-
-			xhrPost("backend.php", query, () => {
-				Notify.info("Shared URLs cleared.");
+			xhrPost("backend.php", {op: "pluginhandler", plugin: "share", method: "clearArticleKeys"}, (transport) => {
+				Notify.info(transport.responseText);
 			});
 		}
 
-- 
cgit v1.2.3-54-g00ecf


From 273ada7353b185e20452d54a8206d5e0cef9e573 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 09:59:14 +0300
Subject: * implement shortcut syntax for exposed plugin methods * move shared
 article rendering code to share plugin

---
 classes/handler/public.php | 162 -------------------------------------------
 classes/pluginhost.php     |   5 +-
 plugins/share/init.php     | 169 ++++++++++++++++++++++++++++++++++++++++++++-
 public.php                 |  11 +++
 4 files changed, 180 insertions(+), 167 deletions(-)

(limited to 'plugins')

diff --git a/classes/handler/public.php b/classes/handler/public.php
index b0bed5d1c..b810019c1 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -294,168 +294,6 @@ class Handler_Public extends Handler {
 		}
 	}
 
-	function share() {
-		$uuid = clean($_REQUEST["key"]);
-
-		if ($uuid) {
-			$sth = $this->pdo->prepare("SELECT ref_id, owner_uid
-						FROM ttrss_user_entries WHERE uuid = ?");
-			$sth->execute([$uuid]);
-
-			if ($row = $sth->fetch()) {
-				header("Content-Type: text/html");
-
-				$id = $row["ref_id"];
-				$owner_uid = $row["owner_uid"];
-
-				print $this->format_article($id, $owner_uid);
-
-				return;
-			}
-		}
-
-		header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
-		print "Article not found.";
-	}
-
-	private function format_article($id, $owner_uid) {
-
-		$pdo = Db::pdo();
-
-		$sth = $pdo->prepare("SELECT id,title,link,content,feed_id,comments,int_id,lang,
-			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
-			(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
-			(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,
-			(SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images,
-			(SELECT always_display_enclosures FROM ttrss_feeds WHERE id = feed_id) as always_display_enclosures,
-			num_comments,
-			tag_cache,
-			author,
-			guid,
-			note
-			FROM ttrss_entries,ttrss_user_entries
-			WHERE	id = ? AND ref_id = id AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
-
-		$rv = '';
-
-		if ($line = $sth->fetch()) {
-
-			$line["tags"] = Article::_get_tags($id, $owner_uid, $line["tag_cache"]);
-			unset($line["tag_cache"]);
-
-			$line["content"] = Sanitizer::sanitize($line["content"],
-				$line['hide_images'],
-				$owner_uid, $line["site_url"], false, $line["id"]);
-
-			PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_RENDER_ARTICLE,
-				function ($result) use (&$line) {
-					$line = $result;
-				},
-				$line);
-
-			$line['content'] = DiskCache::rewrite_urls($line['content']);
-
-			header("Content-Type: text/html");
-
-            $rv .= "<!DOCTYPE html>
-                    <html><head>
-                    <meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
-                    <title>".$line["title"]."</title>".
-					javascript_tag("lib/prototype.js").
-					javascript_tag("js/utility.js")."
-					<style type='text/css'>
-                    @media (prefers-color-scheme: dark) {
-						body {
-							background : #222;
-						}
-					}
-                    body.css_loading * {
-						display : none;
-					}
-					</style>
-                    <link rel='shortcut icon' type='image/png' href='images/favicon.png'>
-                    <link rel='icon' type='image/png' sizes='72x72' href='images/favicon-72px.png'>";
-
-            $rv .= "<meta property='og:title' content=\"".htmlspecialchars(html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401))."\"/>\n";
-            $rv .= "<meta property='og:description' content=\"".
-                htmlspecialchars(
-                	truncate_string(
-                		preg_replace("/[\r\n\t]/", "",
-							preg_replace("/ {1,}/", " ",
-								strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
-							)
-					), 500, "...")
-				)."\"/>\n";
-
-            $rv .= "</head>";
-
-				$enclosures = Article::_get_enclosures($line["id"]);
-            list ($og_image, $og_stream) = Article::_get_image($enclosures, $line['content'], $line["site_url"]);
-
-            if ($og_image) {
-                $rv .= "<meta property='og:image' content=\"" . htmlspecialchars($og_image) . "\"/>";
-            }
-
-            $rv .= "<body class='flat ttrss_utility ttrss_zoom css_loading'>";
-            $rv .= "<div class='container'>";
-
-			if ($line["link"]) {
-				$rv .= "<h1><a target='_blank' rel='noopener noreferrer'
-					title=\"".htmlspecialchars($line['title'])."\"
-					href=\"" .htmlspecialchars($line["link"]) . "\">" .	$line["title"] . "</a></h1>";
-			} else {
-				$rv .= "<h1>" . $line["title"] . "</h1>";
-			}
-
-			$rv .= "<div class='content post'>";
-
-			/* header */
-
-			$rv .= "<div class='header'>";
-			$rv .= "<div class='row'>"; # row
-
-			//$entry_author = $line["author"] ? " - " . $line["author"] : "";
-			$parsed_updated = TimeHelper::make_local_datetime($line["updated"], true,
-				$owner_uid, true);
-
-			$rv .= "<div>".$line['author']."</div>";
-            $rv .= "<div>$parsed_updated</div>";
-
-			$rv .= "</div>"; # row
-
-			$rv .= "</div>"; # header
-
-			/* content */
-
-			$lang = $line['lang'] ? $line['lang'] : "en";
-			$rv .= "<div class='content' lang='$lang'>";
-
-			/* content body */
-
-			$rv .= $line["content"];
-
-         /*  $rv .= Article::format_article_enclosures($id,
-                $line["always_display_enclosures"],
-                $line["content"],
-                $line["hide_images"]); */
-
-			$rv .= "</div>"; # content
-
-			$rv .= "</div>"; # post
-
-		}
-
-		PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_FORMAT_ARTICLE,
-			function ($result) use (&$rv) {
-				$rv = $result;
-			},
-			$rv, $line);
-
-		return $rv;
-
-	}
-
 	function rss() {
 		$feed = clean($_REQUEST["id"]);
 		$key = clean($_REQUEST["key"]);
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 6f223ee11..097bf987c 100755
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -18,6 +18,7 @@ class PluginHost {
 	private static $instance;
 
 	const API_VERSION = 2;
+	const PUBLIC_METHOD_DELIMITER = "--";
 
 	// Hooks marked with *1 are run in global context and available
 	// to plugins loaded in config.php only
@@ -617,9 +618,7 @@ class PluginHost {
 				http_build_query(
 					array_merge(
 						[
-							"op" => "pluginhandler",
-							"plugin" => strtolower(get_class($sender)),
-							"pmethod" => $method
+							"op" => strtolower(get_class($sender) . PluginHost::PUBLIC_METHOD_DELIMITER . $method),
 						],
 						$params));
 		} else {
diff --git a/plugins/share/init.php b/plugins/share/init.php
index a569393fe..6b7b81a2d 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -16,6 +16,10 @@ class Share extends Plugin {
 		$host->add_hook($host::HOOK_PREFS_TAB_SECTION, $this);
 	}
 
+	function is_public_method($method) {
+		return $method == "get";
+	}
+
 	function get_js() {
 		return file_get_contents(__DIR__ . "/share.js");
 	}
@@ -78,6 +82,168 @@ class Share extends Plugin {
 			title='".__('Share by URL')."'>link</i>";
 	}
 
+	function get() {
+		$uuid = clean($_REQUEST["key"] ?? "");
+
+		if ($uuid) {
+			$sth = $this->pdo->prepare("SELECT ref_id, owner_uid
+						FROM ttrss_user_entries WHERE uuid = ?");
+			$sth->execute([$uuid]);
+
+			if ($row = $sth->fetch()) {
+				header("Content-Type: text/html");
+
+				$id = $row["ref_id"];
+				$owner_uid = $row["owner_uid"];
+
+				print $this->format_article($id, $owner_uid);
+
+				return;
+			}
+		}
+
+		header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+		print "Article not found.";
+	}
+
+	private function format_article($id, $owner_uid) {
+
+		$pdo = Db::pdo();
+
+		$sth = $pdo->prepare("SELECT id,title,link,content,feed_id,comments,int_id,lang,
+			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
+			(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
+			(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,
+			(SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images,
+			(SELECT always_display_enclosures FROM ttrss_feeds WHERE id = feed_id) as always_display_enclosures,
+			num_comments,
+			tag_cache,
+			author,
+			guid,
+			note
+			FROM ttrss_entries,ttrss_user_entries
+			WHERE	id = ? AND ref_id = id AND owner_uid = ?");
+		$sth->execute([$id, $owner_uid]);
+
+		$rv = '';
+
+		if ($line = $sth->fetch()) {
+
+			$line["tags"] = Article::_get_tags($id, $owner_uid, $line["tag_cache"]);
+			unset($line["tag_cache"]);
+
+			$line["content"] = Sanitizer::sanitize($line["content"],
+				$line['hide_images'],
+				$owner_uid, $line["site_url"], false, $line["id"]);
+
+			PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_RENDER_ARTICLE,
+				function ($result) use (&$line) {
+					$line = $result;
+				},
+				$line);
+
+			$line['content'] = DiskCache::rewrite_urls($line['content']);
+
+			header("Content-Type: text/html");
+
+            $rv .= "<!DOCTYPE html>
+                    <html><head>
+                    <meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
+                    <title>".$line["title"]."</title>".
+					javascript_tag("lib/prototype.js").
+					javascript_tag("js/utility.js")."
+					<style type='text/css'>
+                    @media (prefers-color-scheme: dark) {
+						body {
+							background : #222;
+						}
+					}
+                    body.css_loading * {
+						display : none;
+					}
+					</style>
+                    <link rel='shortcut icon' type='image/png' href='images/favicon.png'>
+                    <link rel='icon' type='image/png' sizes='72x72' href='images/favicon-72px.png'>";
+
+            $rv .= "<meta property='og:title' content=\"".htmlspecialchars(html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401))."\"/>\n";
+            $rv .= "<meta property='og:description' content=\"".
+                htmlspecialchars(
+                	truncate_string(
+                		preg_replace("/[\r\n\t]/", "",
+							preg_replace("/ {1,}/", " ",
+								strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
+							)
+					), 500, "...")
+				)."\"/>\n";
+
+            $rv .= "</head>";
+
+				$enclosures = Article::_get_enclosures($line["id"]);
+            list ($og_image, $og_stream) = Article::_get_image($enclosures, $line['content'], $line["site_url"]);
+
+            if ($og_image) {
+                $rv .= "<meta property='og:image' content=\"" . htmlspecialchars($og_image) . "\"/>";
+            }
+
+            $rv .= "<body class='flat ttrss_utility ttrss_zoom css_loading'>";
+            $rv .= "<div class='container'>";
+
+			if ($line["link"]) {
+				$rv .= "<h1><a target='_blank' rel='noopener noreferrer'
+					title=\"".htmlspecialchars($line['title'])."\"
+					href=\"" .htmlspecialchars($line["link"]) . "\">" .	$line["title"] . "</a></h1>";
+			} else {
+				$rv .= "<h1>" . $line["title"] . "</h1>";
+			}
+
+			$rv .= "<div class='content post'>";
+
+			/* header */
+
+			$rv .= "<div class='header'>";
+			$rv .= "<div class='row'>"; # row
+
+			//$entry_author = $line["author"] ? " - " . $line["author"] : "";
+			$parsed_updated = TimeHelper::make_local_datetime($line["updated"], true,
+				$owner_uid, true);
+
+			$rv .= "<div>".$line['author']."</div>";
+            $rv .= "<div>$parsed_updated</div>";
+
+			$rv .= "</div>"; # row
+
+			$rv .= "</div>"; # header
+
+			/* content */
+
+			$lang = $line['lang'] ? $line['lang'] : "en";
+			$rv .= "<div class='content' lang='$lang'>";
+
+			/* content body */
+
+			$rv .= $line["content"];
+
+         /*  $rv .= Article::format_article_enclosures($id,
+                $line["always_display_enclosures"],
+                $line["content"],
+                $line["hide_images"]); */
+
+			$rv .= "</div>"; # content
+
+			$rv .= "</div>"; # post
+
+		}
+
+		PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_FORMAT_ARTICLE,
+			function ($result) use (&$rv) {
+				$rv = $result;
+			},
+			$rv, $line);
+
+		return $rv;
+
+	}
+
 	function shareDialog() {
 		$id = (int)clean($_REQUEST['id'] ?? 0);
 
@@ -96,8 +262,7 @@ class Share extends Plugin {
 				$sth->execute([$uuid, $id, $_SESSION['uid']]);
 			}
 
-			$url_path = get_self_url_prefix() . "/public.php?op=share&key=$uuid";
-
+			$url_path = $this->host->get_public_method_url($this, "get", ["key" => $uuid]);
 			?>
 
 			<header><?= __("You can share this article by the following unique URL:") ?></header>
diff --git a/public.php b/public.php
index 59b5a499c..fadb2f14d 100644
--- a/public.php
+++ b/public.php
@@ -17,6 +17,17 @@
 
 	$method = (string)clean($_REQUEST["op"]);
 
+	// shortcut syntax for public (exposed) methods (?op=plugin--pmethod&...params)
+	if (strpos($method, PluginHost::PUBLIC_METHOD_DELIMITER) !== false) {
+		list ($plugin, $pmethod) = explode(PluginHost::PUBLIC_METHOD_DELIMITER, $method, 2);
+
+		// TODO: better implementation that won't modify $_REQUEST
+		$_REQUEST["plugin"] = $plugin;
+		$_REQUEST["pmethod"] = $pmethod;
+
+		$method = "pluginhandler";
+	}
+
 	$override = PluginHost::getInstance()->lookup_handler("public", $method);
 
 	if ($override) {
-- 
cgit v1.2.3-54-g00ecf


From 4325c30a3f7574ed2b1cc3fcf41a08d92c0ccc49 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 12:10:19 +0300
Subject: share: markup cleanup

---
 plugins/share/init.php | 148 ++++++++++++++++++++++---------------------------
 1 file changed, 65 insertions(+), 83 deletions(-)

(limited to 'plugins')

diff --git a/plugins/share/init.php b/plugins/share/init.php
index 6b7b81a2d..4c47e29d3 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -96,7 +96,7 @@ class Share extends Plugin {
 				$id = $row["ref_id"];
 				$owner_uid = $row["owner_uid"];
 
-				print $this->format_article($id, $owner_uid);
+				$this->format_article($id, $owner_uid);
 
 				return;
 			}
@@ -125,8 +125,6 @@ class Share extends Plugin {
 			WHERE	id = ? AND ref_id = id AND owner_uid = ?");
 		$sth->execute([$id, $owner_uid]);
 
-		$rv = '';
-
 		if ($line = $sth->fetch()) {
 
 			$line["tags"] = Article::_get_tags($id, $owner_uid, $line["tag_cache"]);
@@ -142,106 +140,90 @@ class Share extends Plugin {
 				},
 				$line);
 
+			$enclosures = Article::_get_enclosures($line["id"]);
+			list ($og_image, $og_stream) = Article::_get_image($enclosures, $line['content'], $line["site_url"]);
+
+			$content_decoded = html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401);
+			$parsed_updated = TimeHelper::make_local_datetime($line["updated"], true, $owner_uid, true);
+
 			$line['content'] = DiskCache::rewrite_urls($line['content']);
 
-			header("Content-Type: text/html");
+			ob_start();
 
-            $rv .= "<!DOCTYPE html>
-                    <html><head>
-                    <meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
-                    <title>".$line["title"]."</title>".
-					javascript_tag("lib/prototype.js").
-					javascript_tag("js/utility.js")."
+			?>
+			<!DOCTYPE html>
+			<html>
+				<head>
+					<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
+					<title><?= $line["title"] ?></title>
+					<?= javascript_tag("lib/prototype.js") ?>
+					<?= javascript_tag("js/utility.js") ?>
 					<style type='text/css'>
-                    @media (prefers-color-scheme: dark) {
+						@media (prefers-color-scheme: dark) {
 						body {
 							background : #222;
 						}
 					}
-                    body.css_loading * {
+					body.css_loading * {
 						display : none;
 					}
 					</style>
-                    <link rel='shortcut icon' type='image/png' href='images/favicon.png'>
-                    <link rel='icon' type='image/png' sizes='72x72' href='images/favicon-72px.png'>";
-
-            $rv .= "<meta property='og:title' content=\"".htmlspecialchars(html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401))."\"/>\n";
-            $rv .= "<meta property='og:description' content=\"".
-                htmlspecialchars(
-                	truncate_string(
-                		preg_replace("/[\r\n\t]/", "",
+					<link rel='shortcut icon' type='image/png' href='images/favicon.png'>
+					<link rel='icon' type='image/png' sizes='72x72' href='images/favicon-72px.png'>
+
+					<meta property='og:title' content="<?= htmlspecialchars($content_decoded) ?>">
+					<meta property='og:description' content="<?= htmlspecialchars(
+						truncate_string(
+							preg_replace("/[\r\n\t]/", "",
 							preg_replace("/ {1,}/", " ",
-								strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
+								strip_tags($content_decoded)
 							)
-					), 500, "...")
-				)."\"/>\n";
-
-            $rv .= "</head>";
-
-				$enclosures = Article::_get_enclosures($line["id"]);
-            list ($og_image, $og_stream) = Article::_get_image($enclosures, $line['content'], $line["site_url"]);
-
-            if ($og_image) {
-                $rv .= "<meta property='og:image' content=\"" . htmlspecialchars($og_image) . "\"/>";
-            }
-
-            $rv .= "<body class='flat ttrss_utility ttrss_zoom css_loading'>";
-            $rv .= "<div class='container'>";
-
-			if ($line["link"]) {
-				$rv .= "<h1><a target='_blank' rel='noopener noreferrer'
-					title=\"".htmlspecialchars($line['title'])."\"
-					href=\"" .htmlspecialchars($line["link"]) . "\">" .	$line["title"] . "</a></h1>";
-			} else {
-				$rv .= "<h1>" . $line["title"] . "</h1>";
-			}
-
-			$rv .= "<div class='content post'>";
-
-			/* header */
-
-			$rv .= "<div class='header'>";
-			$rv .= "<div class='row'>"; # row
-
-			//$entry_author = $line["author"] ? " - " . $line["author"] : "";
-			$parsed_updated = TimeHelper::make_local_datetime($line["updated"], true,
-				$owner_uid, true);
-
-			$rv .= "<div>".$line['author']."</div>";
-            $rv .= "<div>$parsed_updated</div>";
-
-			$rv .= "</div>"; # row
-
-			$rv .= "</div>"; # header
-
-			/* content */
-
-			$lang = $line['lang'] ? $line['lang'] : "en";
-			$rv .= "<div class='content' lang='$lang'>";
-
-			/* content body */
-
-			$rv .= $line["content"];
-
-         /*  $rv .= Article::format_article_enclosures($id,
-                $line["always_display_enclosures"],
-                $line["content"],
-                $line["hide_images"]); */
-
-			$rv .= "</div>"; # content
+						), 500, "...")) ?>">
+				</head>
+
+				<?php if ($og_image) { ?>
+					<meta property='og:image' content="<?= htmlspecialchars($og_image) ?>">
+				<?php } ?>
+
+				<body class='flat ttrss_utility ttrss_zoom css_loading'>
+					<div class='container'>
+
+					<?php if (!empty($line["link"])) { ?>
+						<h1>
+							<a target='_blank' rel='noopener noreferrer'
+								href="<?= htmlspecialchars($line["link"]) ?>"><?= htmlspecialchars($line["title"]) ?></a>
+						</h1>
+					<?php } else { ?>
+						<h1><?= $line["title"] ?></h1>
+					<?php } ?>
+
+					<div class='content post'>
+						<div class='header'>
+							<div class='row'>
+								<div><?= $line['author'] ?></div>
+								<div><?= $parsed_updated ?></div>
+							</div>
+						</div>
+
+						<div class='content' lang="<?= $line['lang'] ? $line['lang'] : "en" ?>">
+							<?= $line["content"] ?>
+						</div>
+					</div>
+				</body>
+			</html>
+			<?php
 
-			$rv .= "</div>"; # post
+			$rv = ob_get_contents();
+			ob_end_clean();
 
-		}
-
-		PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_FORMAT_ARTICLE,
+			PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_FORMAT_ARTICLE,
 			function ($result) use (&$rv) {
 				$rv = $result;
 			},
 			$rv, $line);
 
-		return $rv;
-
+			print $rv;
+		}
 	}
 
 	function shareDialog() {
-- 
cgit v1.2.3-54-g00ecf


From 9ac6741d2476944b77e8665e8ff9a9d811848908 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 12:25:33 +0300
Subject: af_comics: markup cleanup

---
 plugins/af_comics/init.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_comics/init.php b/plugins/af_comics/init.php
index c99d4b1d8..c8a8f8637 100755
--- a/plugins/af_comics/init.php
+++ b/plugins/af_comics/init.php
@@ -47,11 +47,6 @@ class Af_Comics extends Plugin {
 	function hook_prefs_tab($args) {
 		if ($args != "prefFeeds") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\" 
-			title=\"<i class='material-icons'>photo</i> ".__('Feeds supported by af_comics')."\">";
-
-		print "<p>" . __("The following comics are currently supported:") . "</p>";
-
 		$comics = [];
 
 		foreach ($this->filters as $f) {
@@ -62,17 +57,22 @@ class Af_Comics extends Plugin {
 
 		asort($comics);
 
-		print "<ul class='panel panel-scrollable list list-unstyled'>";
-		foreach ($comics as $comic) {
-			print "<li>$comic</li>";
-		}
-		print "</ul>";
+		?>
+		<div dojoType="dijit.layout.AccordionPane"
+			title="<i class='material-icons'>photo</i> <?= __('Feeds supported by af_comics') ?>">
 
-		print_notice("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).");
+			<h3><?= __("The following comics are currently supported:") ?></h3>
 
-		print_notice('Drop any updated filters into <code>filters.local</code> in plugin directory.');
+			<ul class='panel panel-scrollable list list-unstyled'>
+				<?php foreach ($comics as $comic) { ?>
+					<li><?= htmlspecialchars($comic) ?></li>
+				<?php } ?>
+			</ul>
 
-		print "</div>";
+			<?= format_notice("To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>).") ?>
+			<?= format_notice('Drop any updated filters into <code>filters.local</code> in plugin directory.') ?>
+		</div>
+		<?php
 	}
 
 	function hook_article_filter($article) {
-- 
cgit v1.2.3-54-g00ecf


From 91049335ebbf2815e8802f88721e997f9938baff Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 12:36:02 +0300
Subject: af_readability: cleanup markup

---
 plugins/af_readability/init.php | 132 ++++++++++++++++++++--------------------
 1 file changed, 65 insertions(+), 67 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index b9c4e252e..84cfe869a 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -55,79 +55,77 @@ class Af_Readability extends Plugin {
 	function hook_prefs_tab($args) {
 		if ($args != "prefFeeds") return;
 
-		print "<div dojoType='dijit.layout.AccordionPane'
-			title=\"<i class='material-icons'>extension</i> ".__('Readability settings (af_readability)')."\">";
+		$enable_share_anything = sql_bool_to_bool($this->host->get($this, "enable_share_anything"));
 
-		if (version_compare(PHP_VERSION, '7.0.0', '<')) {
-			print_error("This plugin requires PHP 7.0.");
-		} else {
-
-			print "<h2>" . __("Global settings") . "</h2>";
-
-			print_notice("Enable for specific feeds in the feed editor.");
-
-			print "<form dojoType='dijit.form.Form'>";
-
-			print "<script type='dojo/method' event='onSubmit' args='evt'>
-			evt.preventDefault();
-			if (this.validate()) {
-				console.log(dojo.objectToQuery(this.getValues()));
-				new Ajax.Request('backend.php', {
-					parameters: dojo.objectToQuery(this.getValues()),
-					onComplete: function(transport) {
-						Notify.info(transport.responseText);
-					}
-				});
-				//this.reset();
-			}
-			</script>";
-
-			print \Controls\hidden_tag("op", "pluginhandler");
-			print \Controls\hidden_tag("method", "save");
-			print \Controls\hidden_tag("plugin", "af_readability");
-
-			$enable_share_anything = sql_bool_to_bool($this->host->get($this, "enable_share_anything"));
-
-			print "<fieldset>";
-			print "<label class='checkbox'> ";
-			print \Controls\checkbox_tag("enable_share_anything", $enable_share_anything);
-			print " " . __("Provide full-text services to core code (bookmarklets) and other plugins");
-			print "</label>";
-			print "</fieldset>";
+		?>
+		<div dojoType='dijit.layout.AccordionPane'
+			title="<i class='material-icons'>extension</i> <?= __('Readability settings (af_readability)') ?>">
 
-			print "<hr/>";
+			<h2><?= __("Global settings") ?></h2>
 
-			print \Controls\submit_tag(__("Save"));
-			print "</form>";
+			<?= format_notice("Enable for specific feeds in the feed editor.") ?>
 
-			/* cleanup */
-			$enabled_feeds = $this->filter_unknown_feeds(
-				$this->get_stored_array("enabled_feeds"));
+			<form dojoType='dijit.form.Form'>
 
-			$append_feeds = $this->filter_unknown_feeds(
-				$this->get_stored_array("append_feeds"));
+				<?= \Controls\hidden_tag("op", "pluginhandler") ?>
+				<?= \Controls\hidden_tag("method", "save") ?>
+				<?= \Controls\hidden_tag("plugin", "af_readability") ?>
 
-			$this->host->set($this, "enabled_feeds", $enabled_feeds);
-			$this->host->set($this, "append_feeds", $append_feeds);
-
-			if (count($enabled_feeds) > 0) {
-				print "<hr/>";
-				print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
-
-				print "<ul class='panel panel-scrollable list list-unstyled'>";
-				foreach ($enabled_feeds as $f) {
-					$is_append = in_array($f, $append_feeds);
-
-					print "<li><i class='material-icons'>rss_feed</i> <a href='#'
-						onclick='CommonDialogs.editFeed($f)'>".
-						Feeds::_get_title($f) . " " . ($is_append ? __("(append)") : "") . "</a></li>";
-				}
-				print "</ul>";
-			}
-
-		}
-
-		print "</div>";
+				<script type='dojo/method' event='onSubmit' args='evt'>
+					evt.preventDefault();
+					if (this.validate()) {
+						console.log(dojo.objectToQuery(this.getValues()));
+						new Ajax.Request('backend.php', {
+							parameters: dojo.objectToQuery(this.getValues()),
+							onComplete: function(transport) {
+								Notify.info(transport.responseText);
+							}
+						});
+						//this.reset();
+					}
+					</script>
+
+				<fieldset>
+					<label class='checkbox'>
+						<?= \Controls\checkbox_tag("enable_share_anything", $enable_share_anything) ?>
+						<?= __("Provide full-text services to core code (bookmarklets) and other plugins") ?>
+					</label>
+				</fieldset>
+
+				<hr/>
+
+				<?= \Controls\submit_tag(__("Save")) ?>
+			</form>
+
+			<?php
+				/* cleanup */
+				$enabled_feeds = $this->filter_unknown_feeds(
+					$this->get_stored_array("enabled_feeds"));
+
+				$append_feeds = $this->filter_unknown_feeds(
+					$this->get_stored_array("append_feeds"));
+
+				$this->host->set($this, "enabled_feeds", $enabled_feeds);
+				$this->host->set($this, "append_feeds", $append_feeds);
+			?>
+
+			<?php if (count($enabled_feeds) > 0) { ?>
+				<hr/>
+				<h3><?= __("Currently enabled for (click to edit):") ?></h3>
+
+				<ul class='panel panel-scrollable list list-unstyled'>
+					<?php foreach ($enabled_feeds as $f) { ?>
+						<li>
+							<i class='material-icons'>rss_feed</i>
+							<a href='#'	onclick="CommonDialogs.editFeed(<?= $f ?>)">
+									<?= Feeds::_get_title($f) . " " . (in_array($f, $append_feeds) ? __("(append)") : "") ?>
+							</a>
+						</li>
+					<?php } ?>
+				</ul>
+			<?php } ?>
+		</div>
+		<?php
 	}
 
 	function hook_prefs_edit_feed($feed_id) {
-- 
cgit v1.2.3-54-g00ecf


From 7587f2cdc68c86b765397fe29644c1c9ef15ce4f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 13:35:10 +0300
Subject: af_redditimgur: cleanup markup

---
 plugins/af_redditimgur/init.php | 101 ++++++++++++++++++++--------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 1c520b7ed..1fa61953a 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -31,60 +31,61 @@ class Af_RedditImgur extends Plugin {
 	function hook_prefs_tab($args) {
 		if ($args != "prefFeeds") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
-			title=\"<i class='material-icons'>extension</i> ".__('Reddit content settings (af_redditimgur)')."\">";
+			$enable_readability = $this->host->get($this, "enable_readability");
+			$enable_content_dupcheck = $this->host->get($this, "enable_content_dupcheck");
+			$reddit_to_teddit = $this->host->get($this, "reddit_to_teddit");
+		?>
+
+		<div dojoType="dijit.layout.AccordionPane"
+			title="<i class='material-icons'>extension</i> <?= __('Reddit content settings (af_redditimgur)') ?>">
+
+			<form dojoType='dijit.form.Form'>
+
+				<?= \Controls\hidden_tag("op", "pluginhandler") ?>
+				<?= \Controls\hidden_tag("method", "save") ?>
+				<?= \Controls\hidden_tag("plugin", "af_redditimgur") ?>
+
+				<script type='dojo/method' event='onSubmit' args='evt'>
+					evt.preventDefault();
+					if (this.validate()) {
+						console.log(dojo.objectToQuery(this.getValues()));
+						new Ajax.Request('backend.php', {
+							parameters: dojo.objectToQuery(this.getValues()),
+							onComplete: function(transport) {
+								Notify.info(transport.responseText);
+							}
+						});
+					}
+				</script>
 
-		$enable_readability = $this->host->get($this, "enable_readability");
-		$enable_content_dupcheck = $this->host->get($this, "enable_content_dupcheck");
-		$reddit_to_teddit = $this->host->get($this, "reddit_to_teddit");
+				<fieldset class='narrow'>
+					<label class='checkbox'>
+						<?= \Controls\checkbox_tag("enable_readability", $enable_readability) ?>
+						<?= __("Extract missing content using Readability (requires af_readability)") ?>
+					</label>
+				</fieldset>
 
-		if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-			print_error("Readability requires PHP version 5.6.");
-		}
+				<fieldset class='narrow'>
+					<label class='checkbox'>
+						<?= \Controls\checkbox_tag("enable_content_dupcheck", $enable_content_dupcheck) ?>
+						<?= __("Enable additional duplicate checking") ?>
+					</label>
+				</fieldset>
 
-		print "<form dojoType='dijit.form.Form'>";
+				<fieldset class='narrow'>
+					<label class='checkbox'>
+						<?= \Controls\checkbox_tag("reddit_to_teddit", $reddit_to_teddit) ?>
+						<?= T_sprintf("Rewrite Reddit URLs to %s",
+									"<a target=\"_blank\" href=\"https://teddit.net/about\">Teddit</a>") ?>
+					</label>
+				</fieldset>
 
-		print "<script type='dojo/method' event='onSubmit' args='evt'>
-			evt.preventDefault();
-			if (this.validate()) {
-				console.log(dojo.objectToQuery(this.getValues()));
-				new Ajax.Request('backend.php', {
-					parameters: dojo.objectToQuery(this.getValues()),
-					onComplete: function(transport) {
-						Notify.info(transport.responseText);
-					}
-				});
-				//this.reset();
-			}
-			</script>";
-
-		print \Controls\hidden_tag("op", "pluginhandler");
-		print \Controls\hidden_tag("method", "save");
-		print \Controls\hidden_tag("plugin", "af_redditimgur");
-
-		print "<fieldset class='narrow'>";
-		print "<label class='checkbox'>";
-		print \Controls\checkbox_tag("enable_readability", $enable_readability);
-		print " " . __("Extract missing content using Readability (requires af_readability)") . "</label>";
-		print "</fieldset>";
-
-		print "<fieldset class='narrow'>";
-		print "<label class='checkbox'>";
-		print \Controls\checkbox_tag("enable_content_dupcheck", $enable_content_dupcheck);
-		print " " . __("Enable additional duplicate checking") . "</label>";
-		print "</fieldset>";
-
-		print "<fieldset class='narrow'>";
-		print "<label class='checkbox'>";
-		print \Controls\checkbox_tag("reddit_to_teddit", $reddit_to_teddit);
-		print " " . T_sprintf("Rewrite Reddit URLs to %s",
-			"<a target=\"_blank\" href=\"https://teddit.net/about\">Teddit</a>") . "</label>";
-
-		print "<hr/>";
-		print \Controls\submit_tag(__("Save"));
-		print "</form>";
-
-		print "</div>";
+				<hr/>
+				<?= \Controls\submit_tag(__("Save")) ?>
+			</form>
+		</div>
+
+		<?php
 	}
 
 	function save() {
-- 
cgit v1.2.3-54-g00ecf


From 35b6a881467800d554e3cd548c120ad58d2e9bf7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 13:36:24 +0300
Subject: RIP af_tumblr_1280

---
 plugins/af_tumblr_1280/init.php | 91 -----------------------------------------
 1 file changed, 91 deletions(-)
 delete mode 100755 plugins/af_tumblr_1280/init.php

(limited to 'plugins')

diff --git a/plugins/af_tumblr_1280/init.php b/plugins/af_tumblr_1280/init.php
deleted file mode 100755
index 5d7f366a4..000000000
--- a/plugins/af_tumblr_1280/init.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-class Af_Tumblr_1280 extends Plugin {
-	private $host;
-
-	function about() {
-		return array(1.0,
-			"Replace Tumblr pictures and videos with largest size if available (requires CURL)",
-			"fox");
-	}
-
-	function flags() {
-		return array("needs_curl" => true);
-	}
-
-	function init($host) {
-		$this->host = $host;
-
-		if (function_exists("curl_init")) {
-			$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-		}
-	}
-
-	function hook_article_filter($article) {
-
-		if (!function_exists("curl_init") || ini_get("open_basedir"))
-			return $article;
-
-		$doc = new DOMDocument();
-		$doc->loadHTML('<?xml encoding="UTF-8">' . $article["content"]);
-
-		$found = false;
-
-		if ($doc) {
-			$xpath = new DOMXpath($doc);
-
-			$images = $xpath->query('(//img[contains(@src, \'media.tumblr.com\')])');
-
-			foreach ($images as $img) {
-				$src = $img->getAttribute("src");
-
-				$test_src = preg_replace("/_\d{3}.(jpg|gif|png)/", "_1280.$1", $src);
-
-				if ($src != $test_src) {
-
-					$ch = curl_init($test_src);
-					curl_setopt($ch, CURLOPT_TIMEOUT, 5);
-					curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-					curl_setopt($ch, CURLOPT_HEADER, true);
-					curl_setopt($ch, CURLOPT_NOBODY, true);
-					curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-					curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
-
-					@$result = curl_exec($ch);
-					$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
-					if ($result && $http_code == 200) {
-						$img->setAttribute("src", $test_src);
-						$found = true;
-					}
-				}
-			}
-
-			$video_sources = $xpath->query('//video/source[contains(@src, \'.tumblr.com/video_file\')]');
-
-			foreach ($video_sources as $source) {
-				$src = $source->getAttribute("src");
-
-				$new_src = preg_replace("/\/\d{3}$/", "", $src);
-
-				if ($src != $new_src) {
-					$source->setAttribute("src", $new_src);
-					$found = true;
-				}
-			}
-
-			if ($found) {
-				$doc->removeChild($doc->firstChild); //remove doctype
-				$article["content"] = $doc->saveHTML();
-			}
-		}
-
-		return $article;
-
-	}
-
-
-	function api_version() {
-		return 2;
-	}
-
-}
-- 
cgit v1.2.3-54-g00ecf


From 3c14eed1c2e0ad80b521e874762f9a326c33cce5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 13:45:38 +0300
Subject: close_button: fix color not applying

---
 plugins/close_button/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/close_button/init.php b/plugins/close_button/init.php
index a2ba89478..4f33d1af0 100644
--- a/plugins/close_button/init.php
+++ b/plugins/close_button/init.php
@@ -15,7 +15,7 @@ class Close_Button extends Plugin {
 	}
 
 	function get_css() {
-		return "i.icon-close-article { color : red; }";
+		return ".post .header .buttons i.material-icons.icon-close-article { color : red; }";
 	}
 
 	function hook_article_button($line) {
-- 
cgit v1.2.3-54-g00ecf


From 00b31c3f53db740984220bd9a745f76032890bea Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 13:55:58 +0300
Subject: af_readability: cleanup markup

---
 plugins/af_readability/init.php | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index 84cfe869a..aeef8cddc 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -129,26 +129,26 @@ class Af_Readability extends Plugin {
 	}
 
 	function hook_prefs_edit_feed($feed_id) {
-		print "<header>".__("Readability")."</header>";
-		print "<section>";
-
 		$enabled_feeds = $this->get_stored_array("enabled_feeds");
 		$append_feeds = $this->get_stored_array("append_feeds");
+		?>
 
-		$enable_checked = in_array($feed_id, $enabled_feeds) ? "checked" : "";
-		$append_checked = in_array($feed_id, $append_feeds) ? "checked" : "";
-
-		print "<fieldset>";
-
-		print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='af_readability_enabled'
-			name='af_readability_enabled' $enable_checked>&nbsp;".__('Inline article content')."</label>";
-
-		print "</fieldset><fieldset>";
-
-		print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='af_readability_append'
-			name='af_readability_append' $append_checked>&nbsp;".__('Append to summary, instead of replacing it')."</label>";
-
-		print "</section>";
+		<header><?= __("Readability") ?></header>
+		<section>
+			<fieldset>
+				<label class='checkbox'>
+					<?= \Controls\checkbox_tag("af_readability_enabled", in_array($feed_id, $enabled_feeds)) ?>
+					<?= __('Inline article content') ?>
+				</label>
+			</fieldset>
+			<fieldset>
+				<label class='checkbox'>
+					<?= \Controls\checkbox_tag("af_readability_append", in_array($feed_id, $append_feeds)) ?>
+					<?= __('Append to summary, instead of replacing it') ?>
+				</label>
+			</fieldset>
+		</section>
+		<?php
 	}
 
 	function hook_prefs_save_feed($feed_id) {
-- 
cgit v1.2.3-54-g00ecf


From 538f87e41551745a49cacf41c1a5d3772d3581a6 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 14:08:06 +0300
Subject: af_psql_trgm: don't load dialog via http

---
 plugins/af_psql_trgm/init.js  | 17 ++++++++++-------
 plugins/af_psql_trgm/init.php |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_psql_trgm/init.js b/plugins/af_psql_trgm/init.js
index a22e673f6..e5bc21885 100644
--- a/plugins/af_psql_trgm/init.js
+++ b/plugins/af_psql_trgm/init.js
@@ -1,15 +1,18 @@
-/* global dijit, Plugins, __ */
+/* global dijit, dojo, Plugins, xhrPost, __ */
 
 Plugins.Psql_Trgm = {
 	showRelated: function (id) {
-		const query = "backend.php?op=pluginhandler&plugin=af_psql_trgm&method=showrelated&param=" + encodeURIComponent(id);
-
 		const dialog = new dijit.Dialog({
 			title: __("Related articles"),
-			execute: function () {
-				//
-			},
-			href: query,
+			content: __("Loading, please wait...")
+		});
+
+		const tmph = dojo.connect(dialog, "onShow", null, function (/* e */) {
+			dojo.disconnect(tmph);
+
+			xhrPost("backend.php", {op: 'pluginhandler', plugin: 'af_psql_trgm', method: 'showrelated', id: id}, (transport) => {
+				dialog.attr('content', transport.responseText);
+			});
 		});
 
 		dialog.show();
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 3662e490a..d1a029adc 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -46,7 +46,7 @@ class Af_Psql_Trgm extends Plugin {
 	}
 
 	function showrelated() {
-		$id = (int) $_REQUEST['param'];
+		$id = (int) $_REQUEST['id'];
 		$owner_uid = $_SESSION["uid"];
 
 		$sth = $this->pdo->prepare("SELECT title FROM ttrss_entries, ttrss_user_entries
-- 
cgit v1.2.3-54-g00ecf


From 4632d6cf558774cfcb17b3b4cf10399c3626096b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 14:14:17 +0300
Subject: fix some php8 warnings

---
 plugins/af_psql_trgm/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index d1a029adc..1d83ce5e0 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -15,7 +15,7 @@ class Af_Psql_Trgm extends Plugin {
 	function save() {
 		$similarity = (float) $_POST["similarity"];
 		$min_title_length = (int) $_POST["min_title_length"];
-		$enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]);
+		$enable_globally = checkbox_to_sql_bool($_POST["enable_globally"] ?? "");
 
 		if ($similarity < 0) $similarity = 0;
 		if ($similarity > 1) $similarity = 1;
-- 
cgit v1.2.3-54-g00ecf


From 2b2833bb4fa6f958b89a83adea89d9e7c73daee7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 14:56:36 +0300
Subject: plugins: load dialogs via xhr instead of http

---
 plugins/af_redditimgur/init.php |  6 +++++-
 plugins/mail/init.php           | 35 ++++++++---------------------------
 plugins/mail/mail.js            | 19 ++++++++-----------
 plugins/mailto/init.js          | 17 ++++++++++++-----
 plugins/mailto/init.php         |  6 +++---
 plugins/note/init.php           |  6 +++---
 plugins/note/note.js            | 15 ++++++++++-----
 7 files changed, 49 insertions(+), 55 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 1fa61953a..63a23cd36 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -647,7 +647,11 @@ class Af_RedditImgur extends Plugin {
 				fieldset { border : 0; }
 				label { display : inline-block; min-width : 120px; }
 			</style>
-			<form action="backend.php?op=pluginhandler&method=testurl&plugin=af_redditimgur" method="post">
+			<form action="backend.php" method="post">
+				<input type="hidden" name="op" value="pluginhandler">
+				<input type="hidden" name="method" value="testurl">
+				<input type="hidden" name="plugin" value="af_redditimgur">
+				<input type="hidden" name="csrf_token" value="<?= $_SESSION["csrf_token"] ?>">
 				<fieldset>
 					<label>URL:</label>
 					<input name="url" size="100" value="<?= htmlspecialchars($url) ?>"></input>
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index c054196df..8a0d01aca 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -19,7 +19,7 @@ class Mail extends Plugin {
 	}
 
 	function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/mail.js");
+		return file_get_contents(__DIR__ . "/mail.js");
 	}
 
 	function hook_headline_toolbar_select_menu_item($feed_id, $is_cat) {
@@ -83,9 +83,11 @@ class Mail extends Plugin {
 
 	function emailArticle() {
 
-		$ids = explode(",", $_REQUEST['param']);
+		$ids = explode(",", clean($_REQUEST['ids']));
 		$ids_qmarks = arr_qmarks($ids);
 
+		print "<form onsubmit=\"return false\">";
+
 		print \Controls\hidden_tag("op", "pluginhandler");
 		print \Controls\hidden_tag("plugin", "mail");
 		print \Controls\hidden_tag("method", "sendEmail");
@@ -156,15 +158,8 @@ class Mail extends Plugin {
 
 		print "</td><td>";
 
-/*		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
-				style=\"width : 30em;\"
-				name=\"destination\" id=\"emailArticleDlg_destination\">"; */
-
 		print \Controls\select_tag("destination", "", $addresslist,
-									["style" => "width: 30em", "dojoType" => "dijit.form.ComboBox"]);
-
-/*		print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
-	style=\"z-index: 30; display : none\"></div>"; */
+									["style" => "width: 30em", "required" => 1, "dojoType" => "dijit.form.ComboBox"]);
 
 		print "</td></tr><tr><td>";
 
@@ -184,11 +179,11 @@ class Mail extends Plugin {
 		print "</td></tr></table>";
 
 		print "<footer>";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
+		print \Controls\submit_tag(__('Send email'));
+		print \Controls\cancel_dialog_tag(__('Cancel'));
 		print "</footer>";
 
-		//return;
+		print "</form>";
 	}
 
 	function sendEmail() {
@@ -229,20 +224,6 @@ class Mail extends Plugin {
 		print json_encode($reply);
 	}
 
-	/* function completeEmails() {
-		$search = $_REQUEST["search"];
-
-		print "<ul>";
-
-		foreach ($_SESSION['stored_emails'] as $email) {
-			if (strpos($email, $search) !== false) {
-				print "<li>$email</li>";
-			}
-		}
-
-		print "</ul>";
-	} */
-
 	function api_version() {
 		return 2;
 	}
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index 5ddc0dc41..4cdf6999d 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -1,4 +1,4 @@
-/* global Plugins, Headlines, xhrJson, Notify, fox, __ */
+/* global Plugins, Headlines, dojo, xhrPost, xhrJson, Notify, fox, __ */
 
 Plugins.Mail = {
 	send: function(id) {
@@ -13,10 +13,7 @@ Plugins.Mail = {
 			id = ids.toString();
 		}
 
-		const query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + encodeURIComponent(id);
-
 		const dialog = new fox.SingleUseDialog({
-			id: "emailArticleDlg",
 			title: __("Forward article by email"),
 			execute: function () {
 				if (this.validate()) {
@@ -35,16 +32,16 @@ Plugins.Mail = {
 					});
 				}
 			},
-			href: query
+			content: __("Loading, please wait...")
 		});
 
-		/* var tmph = dojo.connect(dialog, 'onLoad', function() {
-		dojo.disconnect(tmph);
+		const tmph = dojo.connect(dialog, 'onShow', function () {
+			dojo.disconnect(tmph);
 
-		   new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
-			   "backend.php?op=pluginhandler&plugin=mail&method=completeEmails",
-			   { tokens: '', paramName: "search" });
-		}); */
+			xhrPost("backend.php", {op: "pluginhandler", plugin: "mail", method: "emailArticle", ids: id}, (transport) => {
+				dialog.attr('content', transport.responseText);
+			});
+		});
 
 		dialog.show();
 	},
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index ae68bf49b..4bf672a88 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -1,4 +1,4 @@
-/* global Plugins, Headlines, fox, __ */
+/* global Plugins, Headlines, xhrPost, dojo, fox, __ */
 
 Plugins.Mailto = {
 	send: function (id) {
@@ -13,12 +13,19 @@ Plugins.Mailto = {
 			id = ids.toString();
 		}
 
-		const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + encodeURIComponent(id);
-
 		const dialog = new fox.SingleUseDialog({
-			id: "emailArticleDlg",
 			title: __("Forward article by email"),
-			href: query});
+			content: __("Loading, please wait...")
+		});
+
+		const tmph = dojo.connect(dialog, 'onShow', function () {
+			dojo.disconnect(tmph);
+
+			xhrPost("backend.php", {op: "pluginhandler", plugin: "mailto", method: "emailArticle", ids: id}, (transport) => {
+				dialog.attr('content', transport.responseText);
+			});
+		});
+
 
 		dialog.show();
 	}
diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index 3e24dcf29..4b858eae6 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -20,7 +20,7 @@ class MailTo extends Plugin {
 	}
 
 	function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/init.js");
+		return file_get_contents(__DIR__ . "/init.js");
 	}
 
 	function hook_article_button($line) {
@@ -31,7 +31,7 @@ class MailTo extends Plugin {
 
 	function emailArticle() {
 
-		$ids = explode(",", $_REQUEST['param']);
+		$ids = explode(",", clean($_REQUEST['ids']));
 		$ids_qmarks = arr_qmarks($ids);
 
 		$tpl = new Templator();
@@ -85,7 +85,7 @@ class MailTo extends Plugin {
 		print "<p>";
 
 		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Close this dialog')."</button>";
+		print \Controls\submit_tag(__('Close this dialog'));
 		print "</footer>";
 
 		//return;
diff --git a/plugins/note/init.php b/plugins/note/init.php
index 12c56f7ad..65e1f0eef 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -27,17 +27,17 @@ class Note extends Plugin {
 	}
 
 	function edit() {
-		$param = $_REQUEST['param'];
+		$id = clean($_REQUEST['id']);
 
 		$sth = $this->pdo->prepare("SELECT note FROM ttrss_user_entries WHERE
 			ref_id = ? AND owner_uid = ?");
-		$sth->execute([$param, $_SESSION['uid']]);
+		$sth->execute([$id, $_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
 
 			$note = $row['note'];
 
-			print \Controls\hidden_tag("id", "$param");
+			print \Controls\hidden_tag("id", $id);
 			print \Controls\hidden_tag("op", "pluginhandler");
 			print \Controls\hidden_tag("method", "setNote");
 			print \Controls\hidden_tag("plugin", "note");
diff --git a/plugins/note/note.js b/plugins/note/note.js
index ab2ed9208..215058b21 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -1,11 +1,8 @@
-/* global Plugins, xhrJson, Notify, fox, __ */
+/* global dojo, xhrPost, Plugins, xhrJson, Notify, fox, __ */
 
 Plugins.Note = {
 	edit: function(id) {
-		const query = "backend.php?op=pluginhandler&plugin=note&method=edit&param=" + encodeURIComponent(id);
-
 		const dialog = new fox.SingleUseDialog({
-			id: "editNoteDlg",
 			title: __("Edit article note"),
 			execute: function () {
 				if (this.validate()) {
@@ -30,7 +27,15 @@ Plugins.Note = {
 					});
 				}
 			},
-			href: query,
+			content: __("Loading, please wait...")
+		});
+
+		const tmph = dojo.connect(dialog, 'onShow', function () {
+			dojo.disconnect(tmph);
+
+			xhrPost("backend.php", {op: "pluginhandler", plugin: "note", method: "edit", id: id}, (transport) => {
+				dialog.attr('content', transport.responseText);
+			});
 		});
 
 		dialog.show();
-- 
cgit v1.2.3-54-g00ecf


From 2ac6508fe697ed5e95cc7bf73ffb9e2e0bf0d3fa Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 15:53:00 +0300
Subject: mail, mailto: cleanup markup

---
 plugins/mail/init.php   | 150 ++++++++++++++++++++++++++----------------------
 plugins/mailto/init.js  |   2 +-
 plugins/mailto/init.php |  33 +++++------
 3 files changed, 97 insertions(+), 88 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 8a0d01aca..bb576a4d9 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -37,42 +37,44 @@ class Mail extends Plugin {
 	function hook_prefs_tab($args) {
 		if ($args != "prefPrefs") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
-			title=\"<i class='material-icons'>mail</i> ".__('Mail plugin')."\">";
-
-		print "<p>" . __("You can set predefined email addressed here (comma-separated list):") . "</p>";
-
-		print "<form dojoType=\"dijit.form.Form\">";
-
-		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
-			evt.preventDefault();
-			if (this.validate()) {
-				console.log(dojo.objectToQuery(this.getValues()));
-				new Ajax.Request('backend.php', {
-					parameters: dojo.objectToQuery(this.getValues()),
-					onComplete: function(transport) {
-						Notify.info(transport.responseText);
+		$addresslist = $this->host->get($this, "addresslist");
+
+		?>
+
+		<div dojoType="dijit.layout.AccordionPane"
+			title="<i class='material-icons'>mail</i> <?= __('Mail plugin') ?>">
+
+			<form dojoType="dijit.form.Form">
+				<?= \Controls\hidden_tag("op", "pluginhandler") ?>
+				<?= \Controls\hidden_tag("method", "save") ?>
+				<?= \Controls\hidden_tag("plugin", "mail") ?>
+
+				<script type="dojo/method" event="onSubmit" args="evt">
+					evt.preventDefault();
+					if (this.validate()) {
+						console.log(dojo.objectToQuery(this.getValues()));
+						new Ajax.Request('backend.php', {
+							parameters: dojo.objectToQuery(this.getValues()),
+							onComplete: function(transport) {
+								Notify.info(transport.responseText);
+							}
+						});
 					}
-				});
-				//this.reset();
-			}
-			</script>";
+					</script>
 
-			print \Controls\hidden_tag("op", "pluginhandler");
-			print \Controls\hidden_tag("method", "save");
-			print \Controls\hidden_tag("plugin", "mail");
+				<header><?= __("You can set predefined email addressed here (comma-separated list):") ?></header>
 
-			$addresslist = $this->host->get($this, "addresslist");
+				<textarea dojoType="dijit.form.SimpleTextarea" style='font-size : 12px; width : 50%' rows="3"
+					name='addresslist'><?= $addresslist ?></textarea>
 
-			print "<textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 50%' rows=\"3\"
-				name='addresslist'>$addresslist</textarea>";
+				<hr/>
 
-			print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
-				__("Save")."</button>";
+				<?= \Controls\submit_tag(__("Save")) ?>
 
-			print "</form>";
+			</form>
 
-		print "</div>";
+		</div>
+		<?php
 	}
 
 	function hook_article_button($line) {
@@ -86,11 +88,6 @@ class Mail extends Plugin {
 		$ids = explode(",", clean($_REQUEST['ids']));
 		$ids_qmarks = arr_qmarks($ids);
 
-		print "<form onsubmit=\"return false\">";
-
-		print \Controls\hidden_tag("op", "pluginhandler");
-		print \Controls\hidden_tag("plugin", "mail");
-		print \Controls\hidden_tag("method", "sendEmail");
 
 		$sth = $this->pdo->prepare("SELECT email, full_name FROM ttrss_users WHERE
 			id = ?");
@@ -107,9 +104,6 @@ class Mail extends Plugin {
 		if (!$user_name)
 			$user_name = $_SESSION['name'];
 
-		print \Controls\hidden_tag("from_email", "$user_email");
-		print \Controls\hidden_tag("from_name", "$user_name");
-
 		$tpl = new Templator();
 
 		$tpl->readTemplateFromFile("email_article_template.txt");
@@ -150,40 +144,58 @@ class Mail extends Plugin {
 		$content = "";
 		$tpl->generateOutputToString($content);
 
-		print "<table width='100%'><tr><td>";
-
 		$addresslist = explode(",", $this->host->get($this, "addresslist"));
 
-		print __('To:');
-
-		print "</td><td>";
-
-		print \Controls\select_tag("destination", "", $addresslist,
-									["style" => "width: 30em", "required" => 1, "dojoType" => "dijit.form.ComboBox"]);
-
-		print "</td></tr><tr><td>";
-
-		print __('Subject:');
-
-		print "</td><td>";
-
-		print "<input dojoType='dijit.form.ValidationTextBox' required='true'
-				style='width : 30em;' name='subject' value=\"$subject\" id='subject'>";
-
-		print "</td></tr>";
-
-		print "<tr><td colspan='2'><textarea dojoType='dijit.form.SimpleTextarea'
-			style='height : 200px; font-size : 12px; width : 98%' rows=\"20\"
-			name='content'>$content</textarea>";
-
-		print "</td></tr></table>";
-
-		print "<footer>";
-		print \Controls\submit_tag(__('Send email'));
-		print \Controls\cancel_dialog_tag(__('Cancel'));
-		print "</footer>";
-
-		print "</form>";
+		?>
+
+		<form dojoType='dijit.form.Form'>
+
+			<?= \Controls\hidden_tag("op", "pluginhandler") ?>
+			<?= \Controls\hidden_tag("plugin", "mail") ?>
+			<?= \Controls\hidden_tag("method", "sendEmail") ?>
+
+			<?= \Controls\hidden_tag("from_email", "$user_email") ?>
+			<?= \Controls\hidden_tag("from_name", "$user_name") ?>
+
+			<script type='dojo/method' event='onSubmit' args='evt'>
+				evt.preventDefault();
+				if (this.validate()) {
+					xhrJson("backend.php", this.getValues(), (reply) => {
+						if (reply && reply.error)
+							Notify.error(reply.error);
+						else
+							this.hide();
+					});
+				}
+			</script>
+
+			<section>
+				<fieldset class='narrow'>
+					<label><?= __('To:') ?></label>
+					<?= \Controls\select_tag("destination", "", $addresslist,
+											["style" => "width: 380px", "required" => 1, "dojoType" => "dijit.form.ComboBox"]) ?>
+				</fieldset>
+			</section>
+
+			<section>
+				<fieldset class='narrow'>
+					<label><?= __('Subject:') ?></label>
+					<input dojoType='dijit.form.ValidationTextBox' required='true'
+						style='width : 380px' name='subject' value="<?= htmlspecialchars($subject) ?>" id='subject'>
+				</fieldset>
+			</section>
+
+			<textarea dojoType='dijit.form.SimpleTextarea'
+				style='height : 200px; font-size : 12px; width : 98%' rows="20"
+				name='content'><?= $content ?></textarea>
+
+			<footer>
+				<?= \Controls\submit_tag(__('Send email')) ?>
+				<?= \Controls\cancel_dialog_tag(__('Cancel')) ?>
+			</footer>
+
+		</form>
+		<?php
 	}
 
 	function sendEmail() {
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index 4bf672a88..56afa1cca 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -14,7 +14,7 @@ Plugins.Mailto = {
 		}
 
 		const dialog = new fox.SingleUseDialog({
-			title: __("Forward article by email"),
+			title: __("Forward article by email (mailto:)"),
 			content: __("Loading, please wait...")
 		});
 
diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index 4b858eae6..c34b400ce 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -16,7 +16,7 @@ class MailTo extends Plugin {
 	}
 
 	function hook_headline_toolbar_select_menu_item($feed_id, $is_cat) {
-		return "<div dojoType='dijit.MenuItem' onclick='Plugins.Mailto.send()'>".__('Forward by email')."</div>";
+		return "<div dojoType='dijit.MenuItem' onclick='Plugins.Mailto.send()'>".__('Forward by email (mailto:)')."</div>";
 	}
 
 	function get_js() {
@@ -26,7 +26,7 @@ class MailTo extends Plugin {
 	function hook_article_button($line) {
 		return "<i class='material-icons' style=\"cursor : pointer\"
 					onclick=\"Plugins.Mailto.send(".$line["id"].")\"
-					title='".__('Forward by email')."'>mail_outline</i>";
+					title='".__('Forward by email (mailto:)')."'>mail_outline</i>";
 	}
 
 	function emailArticle() {
@@ -42,7 +42,6 @@ class MailTo extends Plugin {
 		//$tpl->setVariable('USER_EMAIL', $user_email, true);
 		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
 
-
 		$sth = $this->pdo->prepare("SELECT DISTINCT link, content, title
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
 			id IN ($ids_qmarks) AND owner_uid = ?");
@@ -70,25 +69,23 @@ class MailTo extends Plugin {
 		$content = "";
 		$tpl->generateOutputToString($content);
 
-		$mailto_link = htmlspecialchars("mailto:?subject=".rawurlencode($subject).
-			"&body=".rawurlencode($content));
-
-		print __("Clicking the following link to invoke your mail client:");
-
-		print "<div class='panel text-center'>";
-		print "<a target=\"_blank\" href=\"$mailto_link\">".
-			__("Forward selected article(s) by email.")."</a>";
-		print "</div>";
+		$mailto_link = "mailto:?subject=".rawurlencode($subject)."&body=".rawurlencode($content);
 
-		print __("You should be able to edit the message before sending in your mail client.");
+		?>
 
-		print "<p>";
+		<section>
+			<div class='panel text-center'>
+				<a target="_blank" href="<?= htmlspecialchars($mailto_link) ?>">
+					<?= __("Click to open your mail client") ?>
+				</a>
+			</div>
+		</section>
 
-		print "<footer class='text-center'>";
-		print \Controls\submit_tag(__('Close this dialog'));
-		print "</footer>";
+		<footer class='text-center'>
+			<?= \Controls\submit_tag(__('Close this dialog')) ?>
+		</footer>
 
-		//return;
+		<?php
 	}
 
 	function api_version() {
-- 
cgit v1.2.3-54-g00ecf


From ea37d05a83e22ab75d27b3562161d3a89c622b59 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 15:53:58 +0300
Subject: delete unused mail .pngs

---
 plugins/mail/mail.png   | Bin 641 -> 0 bytes
 plugins/mailto/mail.png | Bin 821 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 plugins/mail/mail.png
 delete mode 100644 plugins/mailto/mail.png

(limited to 'plugins')

diff --git a/plugins/mail/mail.png b/plugins/mail/mail.png
deleted file mode 100644
index 7348aed77..000000000
Binary files a/plugins/mail/mail.png and /dev/null differ
diff --git a/plugins/mailto/mail.png b/plugins/mailto/mail.png
deleted file mode 100644
index 2c49f78a6..000000000
Binary files a/plugins/mailto/mail.png and /dev/null differ
-- 
cgit v1.2.3-54-g00ecf


From 6ecee2abbd96eac2b0efab259c184644b71d1449 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 16:17:05 +0300
Subject: cache_starred_images: minor fixes

---
 plugins/cache_starred_images/init.php | 53 ++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 25 deletions(-)

(limited to 'plugins')

diff --git a/plugins/cache_starred_images/init.php b/plugins/cache_starred_images/init.php
index 9c2d4cb7e..bd44a2b28 100755
--- a/plugins/cache_starred_images/init.php
+++ b/plugins/cache_starred_images/init.php
@@ -5,7 +5,7 @@ class Cache_Starred_Images extends Plugin {
 	private $host;
 	/* @var DiskCache $cache */
 	private $cache;
-    private $max_cache_attempts = 5; // per-article
+	private $max_cache_attempts = 5; // per-article
 
 	function about() {
 		return array(1.0,
@@ -38,13 +38,13 @@ class Cache_Starred_Images extends Plugin {
 		Debug::log("caching media of starred articles for user " . $this->host->get_owner_uid() . "...");
 
 		$sth = $this->pdo->prepare("SELECT content, ttrss_entries.title,
-       		ttrss_user_entries.owner_uid, link, site_url, ttrss_entries.id, plugin_data
+				ttrss_user_entries.owner_uid, link, site_url, ttrss_entries.id, plugin_data
 			FROM ttrss_entries, ttrss_user_entries LEFT JOIN ttrss_feeds ON
 				(ttrss_user_entries.feed_id = ttrss_feeds.id)
 			WHERE ref_id = ttrss_entries.id AND
 				marked = true AND
 				site_url != '' AND
-			    ttrss_user_entries.owner_uid = ? AND
+				ttrss_user_entries.owner_uid = ? AND
 				plugin_data NOT LIKE '%starred_cache_images%'
 			ORDER BY ".Db::sql_random_function()." LIMIT 100");
 
@@ -59,7 +59,7 @@ class Cache_Starred_Images extends Plugin {
 					$success = $this->cache_article_images($line["content"], $line["site_url"], $line["owner_uid"], $line["id"]);
 
 					if ($success) {
-						$plugin_data = "starred_cache_images,${line['owner_uid']}:" . $line["plugin_data"];
+						$plugin_data = "starred_cache_images," . $line["owner_uid"] . ":" . $line["plugin_data"];
 
 						$usth->execute([$plugin_data, $line['id']]);
 					}
@@ -71,7 +71,10 @@ class Cache_Starred_Images extends Plugin {
 
 		Debug::log("expiring " . $this->cache->get_dir() . "...");
 
-		$files = glob($this->cache->get_dir() . "/*.{png,mp4,status}", GLOB_BRACE);
+		$files = array_merge(
+				glob($this->cache->get_dir() . "/*.png"),
+				glob($this->cache->get_dir() . "/*.mp4"),
+				glob($this->cache->get_dir() . "/*.status"));
 
 		$last_article_id = 0;
 		$article_exists = 1;
@@ -105,7 +108,7 @@ class Cache_Starred_Images extends Plugin {
 	}
 
 	function hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes, $article_id) {
-		$xpath = new DOMXpath($doc);
+		$xpath = new DOMXPath($doc);
 
 		if ($article_id) {
 			$entries = $xpath->query('(//img[@src])|(//video/source[@src])');
@@ -158,30 +161,30 @@ class Cache_Starred_Images extends Plugin {
 
 		Debug::log("status: $status_filename", Debug::$LOG_VERBOSE);
 
-        if ($this->cache->exists($status_filename))
-            $status = json_decode($this->cache->get($status_filename), true);
-        else
-            $status = [];
+		if ($this->cache->exists($status_filename))
+			$status = json_decode($this->cache->get($status_filename), true);
+		else
+			$status = [];
 
-        $status["attempt"] += 1;
+		$status["attempt"] += 1;
 
-        // only allow several download attempts for article
-        if ($status["attempt"] > $this->max_cache_attempts) {
-            Debug::log("too many attempts for $site_url", Debug::$LOG_VERBOSE);
-            return false;
-        }
+		// only allow several download attempts for article
+		if ($status["attempt"] > $this->max_cache_attempts) {
+			Debug::log("too many attempts for $site_url", Debug::$LOG_VERBOSE);
+			return false;
+		}
 
-        if (!$this->cache->put($status_filename, json_encode($status))) {
-            user_error("unable to write status file: $status_filename", E_USER_WARNING);
-            return false;
-        }
+		if (!$this->cache->put($status_filename, json_encode($status))) {
+			user_error("unable to write status file: $status_filename", E_USER_WARNING);
+			return false;
+		}
 
 		$doc = new DOMDocument();
 
 		$has_images = false;
 		$success = false;
 
-        if (@$doc->loadHTML('<?xml encoding="UTF-8">' . $content)) {
+		if (@$doc->loadHTML('<?xml encoding="UTF-8">' . $content)) {
 			$xpath = new DOMXPath($doc);
 			$entries = $xpath->query('(//img[@src])|(//video/source[@src])');
 
@@ -203,11 +206,11 @@ class Cache_Starred_Images extends Plugin {
 		$esth = $this->pdo->prepare("SELECT content_url FROM ttrss_enclosures WHERE post_id = ? AND
 			(content_type LIKE '%image%' OR content_type LIKE '%video%')");
 
-        if ($esth->execute([$article_id])) {
-        	while ($enc = $esth->fetch()) {
+		if ($esth->execute([$article_id])) {
+			while ($enc = $esth->fetch()) {
 
-        		$has_images = true;
-        		$url = rewrite_relative_url($site_url, $enc["content_url"]);
+				$has_images = true;
+				$url = rewrite_relative_url($site_url, $enc["content_url"]);
 
 				if ($this->cache_url($article_id, $url)) {
 					$success = true;
-- 
cgit v1.2.3-54-g00ecf


From 35b6d63289dcce3be27127aec607c970b050a986 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 16:27:52 +0300
Subject: af_proxy_http: don't try to proxy back to ourselves

---
 plugins/af_proxy_http/init.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php
index 79d2f5294..5804e450f 100644
--- a/plugins/af_proxy_http/init.php
+++ b/plugins/af_proxy_http/init.php
@@ -50,8 +50,14 @@ class Af_Proxy_Http extends Plugin {
 	public function imgproxy() {
 		$url = UrlHelper::validate(clean($_REQUEST["url"]));
 
-		// called without user context, let's just redirect to original URL
-		if (!$_SESSION["uid"] || $_REQUEST['af_proxy_http_token'] != $_SESSION['af_proxy_http_token']) {
+		// immediately redirect to original URL if:
+		// - url points back to ourselves
+		// - called without user context
+		// - session-spefific token is invalid
+		if (
+			strpos($url, get_self_url_prefix()) === 0 ||
+			empty($_SESSION["uid"]) ||
+			$_REQUEST['af_proxy_http_token'] != $_SESSION['af_proxy_http_token']) {
 			header("Location: $url");
 			return;
 		}
@@ -104,6 +110,11 @@ class Af_Proxy_Http extends Plugin {
 	}
 
 	private function rewrite_url_if_needed($url, $all_remote = false) {
+		/* don't rewrite urls pointing to ourselves */
+
+		if (strpos($url, get_self_url_prefix()) === 0)
+			return $url;
+
 		/* we don't need to handle URLs where local cache already exists, tt-rss rewrites those automatically */
 		if (!$this->cache->exists(sha1($url))) {
 
-- 
cgit v1.2.3-54-g00ecf


From e4609c18efceebb1e021d814f53061ada7f6489a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 21:44:21 +0300
Subject:  * add (disabled) shortcut syntax for plugin methods  * add controls
 shortcut for pluginhandler tags  * add similar shortcut for frontend  * allow
 plugins to selectively exclude their methods from CSRF checking

---
 backend.php                     | 11 +++++++++++
 classes/plugin.php              |  4 ++++
 classes/pluginhandler.php       |  2 +-
 classes/pluginhost.php          | 13 ++++++++++++-
 include/controls.php            | 12 +++++++++++-
 js/App.js                       |  3 +++
 plugins/af_proxy_http/init.php  |  4 +---
 plugins/af_psql_trgm/init.php   |  4 +---
 plugins/af_readability/init.js  |  2 +-
 plugins/af_readability/init.php |  6 ++----
 plugins/af_redditimgur/init.php |  9 +++++----
 plugins/mail/init.php           | 12 ++++--------
 plugins/mail/mail.js            |  2 +-
 plugins/mailto/init.js          |  2 +-
 plugins/note/init.php           |  4 +---
 plugins/note/note.js            |  2 +-
 plugins/nsfw/init.php           |  4 +---
 plugins/share/share.js          |  8 +++-----
 plugins/share/share_prefs.js    |  2 +-
 19 files changed, 65 insertions(+), 41 deletions(-)

(limited to 'plugins')

diff --git a/backend.php b/backend.php
index 9ecc22914..e64c6561f 100644
--- a/backend.php
+++ b/backend.php
@@ -88,6 +88,17 @@
 		5 => __("Power User"),
 		10 => __("Administrator"));
 
+	// shortcut syntax for plugin methods (?op=plugin--pmethod&...params)
+	/* if (strpos($op, PluginHost::PUBLIC_METHOD_DELIMITER) !== false) {
+		list ($plugin, $pmethod) = explode(PluginHost::PUBLIC_METHOD_DELIMITER, $op, 2);
+
+		// TODO: better implementation that won't modify $_REQUEST
+		$_REQUEST["plugin"] = $plugin;
+		$method = $pmethod;
+		$op = "pluginhandler";
+	} */
+
+	// TODO: figure out if is this still needed
 	$op = str_replace("-", "_", $op);
 
 	$override = PluginHost::getInstance()->lookup_handler($op, $method);
diff --git a/classes/plugin.php b/classes/plugin.php
index 2416418cd..6c572467a 100644
--- a/classes/plugin.php
+++ b/classes/plugin.php
@@ -54,4 +54,8 @@ abstract class Plugin {
 
 		return vsprintf($this->__($msgid), $args);
 	}
+
+	function csrf_ignore($method) {
+		return false;
+	}
 }
diff --git a/classes/pluginhandler.php b/classes/pluginhandler.php
index a0e60b4e6..608f80dcb 100644
--- a/classes/pluginhandler.php
+++ b/classes/pluginhandler.php
@@ -11,7 +11,7 @@ class PluginHandler extends Handler_Protected {
 
 		if ($plugin) {
 			if (method_exists($plugin, $method)) {
-				if (validate_csrf($csrf_token)) {
+				if (validate_csrf($csrf_token) || $plugin->csrf_ignore($method)) {
 					$plugin->$method();
 				} else {
 					user_error("Rejected ${plugin_name}->${method}(): invalid CSRF token.", E_USER_WARNING);
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 097bf987c..065fa99c4 100755
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -611,6 +611,17 @@ class PluginHost {
 					$params));
 	}
 
+	// shortcut syntax (disabled for now)
+	/* function get_method_url(Plugin $sender, string $method, $params)  {
+		return get_self_url_prefix() . "/backend.php?" .
+			http_build_query(
+				array_merge(
+					[
+						"op" => strtolower(get_class($sender) . self::PUBLIC_METHOD_DELIMITER . $method),
+					],
+					$params));
+	} */
+
 	// WARNING: endpoint in public.php, exposed to unauthenticated users
 	function get_public_method_url(Plugin $sender, string $method, $params)  {
 		if ($sender->is_public_method($method)) {
@@ -618,7 +629,7 @@ class PluginHost {
 				http_build_query(
 					array_merge(
 						[
-							"op" => strtolower(get_class($sender) . PluginHost::PUBLIC_METHOD_DELIMITER . $method),
+							"op" => strtolower(get_class($sender) . self::PUBLIC_METHOD_DELIMITER . $method),
 						],
 						$params));
 		} else {
diff --git a/include/controls.php b/include/controls.php
index 4c60d94f3..d8506877b 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -11,6 +11,17 @@
       return $rv;
    }
 
+   // shortcut syntax (disabled)
+   /* function pluginhandler_tags(\Plugin $plugin, string $method) {
+      return hidden_tag("op", strtolower(get_class($plugin) . \PluginHost::PUBLIC_METHOD_DELIMITER . $method));
+   } */
+
+   function pluginhandler_tags(\Plugin $plugin, string $method) {
+      return hidden_tag("op", "pluginhandler") .
+               hidden_tag("plugin", strtolower(get_class($plugin))) .
+               hidden_tag("method", $method);
+   }
+
    function button_tag(string $value, string $type, array $attributes = []) {
       return "<button dojoType=\"dijit.form.Button\" ".attributes_to_string($attributes)." type=\"$type\">".htmlspecialchars($value)."</button>";
    }
@@ -155,4 +166,3 @@
 
       return $ret;
    }
-
diff --git a/js/App.js b/js/App.js
index 9d8f6c275..aeca688b7 100644
--- a/js/App.js
+++ b/js/App.js
@@ -101,6 +101,9 @@ const App = {
 
       return dijit.getEnclosingWidget(elem.closest('.dijitDialog'));
    },
+   getPhArgs(plugin, method, args = {}) {
+      return {...{op: "pluginhandler", plugin: plugin, method: method}, ...args};
+   },
    label_to_feed_id: function(label) {
       return this.LABEL_BASE_INDEX - 1 - Math.abs(label);
    },
diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php
index 5804e450f..d6cee5fcd 100644
--- a/plugins/af_proxy_http/init.php
+++ b/plugins/af_proxy_http/init.php
@@ -229,9 +229,7 @@ class Af_Proxy_Http extends Plugin {
 			}
 			</script>";
 
-		print \Controls\hidden_tag("op", "pluginhandler");
-		print \Controls\hidden_tag("method", "save");
-		print \Controls\hidden_tag("plugin", "af_proxy_http");
+		print \Controls\pluginhandler_tags($this, "save");
 
 		$proxy_all = sql_bool_to_bool($this->host->get($this, "proxy_all"));
 		print \Controls\checkbox_tag("proxy_all", $proxy_all);
diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 1d83ce5e0..bfbbdf49c 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -157,9 +157,7 @@ class Af_Psql_Trgm extends Plugin {
 				}
 				</script>";
 
-			print \Controls\hidden_tag("op", "pluginhandler");
-			print \Controls\hidden_tag("method", "save");
-			print \Controls\hidden_tag("plugin", "af_psql_trgm");
+			print \Controls\pluginhandler_tags($this, "save");
 
 			print "<h2>" . __("Global settings") . "</h2>";
 
diff --git a/plugins/af_readability/init.js b/plugins/af_readability/init.js
index 3155475cc..ff2d94e8b 100644
--- a/plugins/af_readability/init.js
+++ b/plugins/af_readability/init.js
@@ -16,7 +16,7 @@ Plugins.Af_Readability = {
 
         Notify.progress("Loading, please wait...");
 
-        xhrJson("backend.php",{ op: "pluginhandler", plugin: "af_readability", method: "embed", param: id }, (reply) => {
+        xhrJson("backend.php", App.getPhArgs("af_readability", "embed", {id: id}), (reply) => {
 
             if (content && reply.content) {
                 content.setAttribute(self.orig_attr_name, content.innerHTML);
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index aeef8cddc..43d064fc7 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -67,9 +67,7 @@ class Af_Readability extends Plugin {
 
 			<form dojoType='dijit.form.Form'>
 
-				<?= \Controls\hidden_tag("op", "pluginhandler") ?>
-				<?= \Controls\hidden_tag("method", "save") ?>
-				<?= \Controls\hidden_tag("plugin", "af_readability") ?>
+				<?= \Controls\pluginhandler_tags($this, "save") ?>
 
 				<script type='dojo/method' event='onSubmit' args='evt'>
 					evt.preventDefault();
@@ -329,7 +327,7 @@ class Af_Readability extends Plugin {
 	}
 
 	function embed() {
-		$article_id = (int) $_REQUEST["param"];
+		$article_id = (int) $_REQUEST["id"];
 
 		$sth = $this->pdo->prepare("SELECT link FROM ttrss_entries WHERE id = ?");
 		$sth->execute([$article_id]);
diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 63a23cd36..5066186db 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -41,9 +41,7 @@ class Af_RedditImgur extends Plugin {
 
 			<form dojoType='dijit.form.Form'>
 
-				<?= \Controls\hidden_tag("op", "pluginhandler") ?>
-				<?= \Controls\hidden_tag("method", "save") ?>
-				<?= \Controls\hidden_tag("plugin", "af_redditimgur") ?>
+				<?= \Controls\pluginhandler_tags($this, "save") ?>
 
 				<script type='dojo/method' event='onSubmit' args='evt'>
 					evt.preventDefault();
@@ -633,6 +631,10 @@ class Af_RedditImgur extends Plugin {
 		$entry->parentNode->insertBefore($img, $entry);*/
 	}
 
+	function csrf_ignore($method) {
+		return $method === "testurl";
+	}
+
 	function testurl() {
 
 		$url = clean($_POST["url"]);
@@ -651,7 +653,6 @@ class Af_RedditImgur extends Plugin {
 				<input type="hidden" name="op" value="pluginhandler">
 				<input type="hidden" name="method" value="testurl">
 				<input type="hidden" name="plugin" value="af_redditimgur">
-				<input type="hidden" name="csrf_token" value="<?= $_SESSION["csrf_token"] ?>">
 				<fieldset>
 					<label>URL:</label>
 					<input name="url" size="100" value="<?= htmlspecialchars($url) ?>"></input>
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index bb576a4d9..4b62d1e64 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -45,9 +45,7 @@ class Mail extends Plugin {
 			title="<i class='material-icons'>mail</i> <?= __('Mail plugin') ?>">
 
 			<form dojoType="dijit.form.Form">
-				<?= \Controls\hidden_tag("op", "pluginhandler") ?>
-				<?= \Controls\hidden_tag("method", "save") ?>
-				<?= \Controls\hidden_tag("plugin", "mail") ?>
+				<?= \Controls\pluginhandler_tags($this, "save") ?>
 
 				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
@@ -150,12 +148,10 @@ class Mail extends Plugin {
 
 		<form dojoType='dijit.form.Form'>
 
-			<?= \Controls\hidden_tag("op", "pluginhandler") ?>
-			<?= \Controls\hidden_tag("plugin", "mail") ?>
-			<?= \Controls\hidden_tag("method", "sendEmail") ?>
+			<?= \Controls\pluginhandler_tags($this, "sendemail") ?>
 
-			<?= \Controls\hidden_tag("from_email", "$user_email") ?>
-			<?= \Controls\hidden_tag("from_name", "$user_name") ?>
+			<?= \Controls\hidden_tag("from_email", $user_email) ?>
+			<?= \Controls\hidden_tag("from_name", $user_name) ?>
 
 			<script type='dojo/method' event='onSubmit' args='evt'>
 				evt.preventDefault();
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index 4cdf6999d..36b0baac5 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -38,7 +38,7 @@ Plugins.Mail = {
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", {op: "pluginhandler", plugin: "mail", method: "emailArticle", ids: id}, (transport) => {
+			xhrPost("backend.php", App.getPhArgs("mail", "emailArticle", {ids: id}), (transport) => {
 				dialog.attr('content', transport.responseText);
 			});
 		});
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index 56afa1cca..b5e68680b 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -21,7 +21,7 @@ Plugins.Mailto = {
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", {op: "pluginhandler", plugin: "mailto", method: "emailArticle", ids: id}, (transport) => {
+			xhrPost("backend.php", App.getPhArgs("mailto", "emailArticle", {ids: id}), (transport) => {
 				dialog.attr('content', transport.responseText);
 			});
 		});
diff --git a/plugins/note/init.php b/plugins/note/init.php
index 65e1f0eef..278cfe6c3 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -38,9 +38,7 @@ class Note extends Plugin {
 			$note = $row['note'];
 
 			print \Controls\hidden_tag("id", $id);
-			print \Controls\hidden_tag("op", "pluginhandler");
-			print \Controls\hidden_tag("method", "setNote");
-			print \Controls\hidden_tag("plugin", "note");
+			print \Controls\pluginhandler_tags($this, "setnote");
 
 			?>
 			<textarea dojoType='dijit.form.SimpleTextarea'
diff --git a/plugins/note/note.js b/plugins/note/note.js
index 215058b21..bc6c48156 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -33,7 +33,7 @@ Plugins.Note = {
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", {op: "pluginhandler", plugin: "note", method: "edit", id: id}, (transport) => {
+			xhrPost("backend.php", App.getPhArgs("note", "edit", {id: id}), (transport) => {
 				dialog.attr('content', transport.responseText);
 			});
 		});
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index fecbc62af..0ee3aebc1 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -50,9 +50,7 @@ class NSFW extends Plugin {
 			title="<i class='material-icons'>extension</i> <?= __("NSFW Plugin") ?>">
 			<form dojoType="dijit.form.Form">
 
-				<?= \Controls\hidden_tag("op", "pluginhandler") ?>
-				<?= \Controls\hidden_tag("method", "save") ?>
-				<?= \Controls\hidden_tag("plugin", "nsfw") ?>
+				<?= \Controls\pluginhandler_tags($this, "save") ?>
 
 				<script type="dojo/method" event="onSubmit" args="evt">
 					evt.preventDefault();
diff --git a/plugins/share/share.js b/plugins/share/share.js
index 09fb145c9..46b62ca5b 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -10,9 +10,7 @@ Plugins.Share = {
 
 					Notify.progress("Trying to change URL...", true);
 
-					const query = {op: "pluginhandler", plugin: "share", method: "newkey", id: id};
-
-					xhrJson("backend.php", query, (reply) => {
+					xhrJson("backend.php", App.getPhArgs("share", "newkey", {id: id}), (reply) => {
 						if (reply) {
 							const new_link = reply.link;
 							const target = dialog.domNode.querySelector(".target-url");
@@ -45,7 +43,7 @@ Plugins.Share = {
 			},
 			unshare: function () {
 				if (confirm(__("Remove sharing for this article?"))) {
-					xhrPost("backend.php", {op: "pluginhandler", plugin: "share", method: "unshare", id: id}, (transport) => {
+					xhrPost("backend.php", App.getPhArgs("share", "unshare", {id: id}), (transport) => {
 						Notify.info(transport.responseText);
 
 						const icon = document.querySelector(".share-icon-" + id);
@@ -64,7 +62,7 @@ Plugins.Share = {
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", {op: "pluginhandler", plugin: "share", method: "shareDialog", id: id}, (transport) => {
+			xhrPost("backend.php", App.getPhArgs("share", "shareDialog", {id: id}), (transport) => {
 				dialog.attr('content', transport.responseText)
 
 				const icon = document.querySelector(".share-icon-" + id);
diff --git a/plugins/share/share_prefs.js b/plugins/share/share_prefs.js
index 29c9aeaf8..91f979daf 100644
--- a/plugins/share/share_prefs.js
+++ b/plugins/share/share_prefs.js
@@ -5,7 +5,7 @@ Plugins.Share = {
 		if (confirm(__("This will invalidate all previously shared article URLs. Continue?"))) {
 			Notify.progress("Clearing URLs...");
 
-			xhrPost("backend.php", {op: "pluginhandler", plugin: "share", method: "clearArticleKeys"}, (transport) => {
+			xhrPost("backend.php", App.getPhArgs("share", "clearArticleKeys"), (transport) => {
 				Notify.info(transport.responseText);
 			});
 		}
-- 
cgit v1.2.3-54-g00ecf


From b888bc2091c6737846f54a729ee047e4693fd8e3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 21:54:43 +0300
Subject: cache_starred_images: don't try to use undefined array index

---
 plugins/cache_starred_images/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/cache_starred_images/init.php b/plugins/cache_starred_images/init.php
index bd44a2b28..9f17c492f 100755
--- a/plugins/cache_starred_images/init.php
+++ b/plugins/cache_starred_images/init.php
@@ -164,7 +164,7 @@ class Cache_Starred_Images extends Plugin {
 		if ($this->cache->exists($status_filename))
 			$status = json_decode($this->cache->get($status_filename), true);
 		else
-			$status = [];
+			$status = ["attempt" => 0];
 
 		$status["attempt"] += 1;
 
-- 
cgit v1.2.3-54-g00ecf


From ee0b66b6bd14d116b878a57f1d35b466d9994138 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 18 Feb 2021 12:13:02 +0300
Subject: af_proxy_http: markup cleanup

---
 plugins/af_proxy_http/init.php | 50 ++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php
index d6cee5fcd..2c472a32d 100644
--- a/plugins/af_proxy_http/init.php
+++ b/plugins/af_proxy_http/init.php
@@ -209,39 +209,37 @@ class Af_Proxy_Http extends Plugin {
 
 	function hook_prefs_tab($args) {
 		if ($args != "prefFeeds") return;
+		?>
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
-			title=\"<i class='material-icons'>extension</i> ".__('Image proxy settings (af_proxy_http)')."\">";
+		<div dojoType="dijit.layout.AccordionPane"
+			title="<i class='material-icons'>extension</i> <?= __('Image proxy settings (af_proxy_http)') ?>">
 
-		print "<form dojoType=\"dijit.form.Form\">";
+			<form dojoType="dijit.form.Form">
 
-		print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
-			evt.preventDefault();
-			if (this.validate()) {
-				console.log(dojo.objectToQuery(this.getValues()));
-				new Ajax.Request('backend.php', {
-					parameters: dojo.objectToQuery(this.getValues()),
-					onComplete: function(transport) {
-						Notify.info(transport.responseText);
-					}
-				});
-				//this.reset();
-			}
-			</script>";
-
-		print \Controls\pluginhandler_tags($this, "save");
+				<?= \Controls\pluginhandler_tags($this, "save") ?>
 
-		$proxy_all = sql_bool_to_bool($this->host->get($this, "proxy_all"));
-		print \Controls\checkbox_tag("proxy_all", $proxy_all);
-		print "&nbsp;<label for=\"proxy_all\">" . __("Enable proxy for all remote images.") . "</label><br/>";
-
-		print "<hr/>";
+				<script type="dojo/method" event="onSubmit" args="evt">
+					evt.preventDefault();
+					if (this.validate()) {
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.info(transport.responseText);
+						})
+					}
+				</script>
 
-		print \Controls\submit_tag(__("Save"));
+				<fieldset>
+					<label class="checkbox">
+						<?= \Controls\checkbox_tag("proxy_all", $this->host->get($this, "proxy_all")) ?>
+						<?=  __("Enable proxy for all remote images.") ?>
+					</label>
+				</fieldset>
 
-		print "</form>";
+				<hr/>
 
-		print "</div>";
+				<?= \Controls\submit_tag(__("Save")) ?>
+			</form>
+		</div>
+		<?php
 	}
 
 	function save() {
-- 
cgit v1.2.3-54-g00ecf


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

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

(limited to 'plugins')

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


From d8a99ce06a3ce789a5971a03d97f37b2df23d0f9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 18 Feb 2021 12:45:31 +0300
Subject: remove unneeded headings

---
 plugins/af_psql_trgm/init.php   | 2 --
 plugins/af_readability/init.php | 2 --
 2 files changed, 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index bfbbdf49c..c66c49aed 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -159,8 +159,6 @@ class Af_Psql_Trgm extends Plugin {
 
 			print \Controls\pluginhandler_tags($this, "save");
 
-			print "<h2>" . __("Global settings") . "</h2>";
-
 			print_notice("Enable for specific feeds in the feed editor.");
 
 			print "<fieldset>";
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php
index a1f92815c..4cd72904a 100755
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@@ -61,8 +61,6 @@ class Af_Readability extends Plugin {
 		<div dojoType='dijit.layout.AccordionPane'
 			title="<i class='material-icons'>extension</i> <?= __('Readability settings (af_readability)') ?>">
 
-			<h2><?= __("Global settings") ?></h2>
-
 			<?= format_notice("Enable for specific feeds in the feed editor.") ?>
 
 			<form dojoType='dijit.form.Form'>
-- 
cgit v1.2.3-54-g00ecf


From a2c75257f191d218dae6de8e5e4ad240a0588654 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 18 Feb 2021 13:16:55 +0300
Subject: bookmarklets: cleanup

---
 include/controls.php          |  6 +++-
 plugins/bookmarklets/init.php | 71 ++++++++++++++++++++++---------------------
 2 files changed, 41 insertions(+), 36 deletions(-)

(limited to 'plugins')

diff --git a/include/controls.php b/include/controls.php
index d8506877b..a60b1e0b0 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -23,7 +23,7 @@
    }
 
    function button_tag(string $value, string $type, array $attributes = []) {
-      return "<button dojoType=\"dijit.form.Button\" ".attributes_to_string($attributes)." type=\"$type\">".htmlspecialchars($value)."</button>";
+      return "<button dojoType=\"dijit.form.Button\" ".attributes_to_string($attributes)." type=\"$type\">$value</button>";
    }
 
    function submit_tag(string $value, array $attributes = []) {
@@ -34,6 +34,10 @@
       return button_tag($value, "", array_merge(["onclick" => "App.dialogOf(this).hide()"], $attributes));
    }
 
+   function icon(string $icon, array $attributes = []) {
+      return "<i class=\"material-icons\" ".attributes_to_string($attributes).">$icon</i>";
+   }
+
    function select_tag(string $name, $value, array $values, array $attributes = [], string $id = "") {
       $attributes_str = attributes_to_string($attributes);
       $dojo_type = strpos($attributes_str, "dojoType") === false ? "dojoType='fox.form.Select'" : "";
diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php
index 9e0f8f348..a9dc3e69d 100644
--- a/plugins/bookmarklets/init.php
+++ b/plugins/bookmarklets/init.php
@@ -1,59 +1,60 @@
 <?php
 class Bookmarklets extends Plugin {
-  private $host;
-
-  function about() {
-    return array(1.0,
-		 "Easy feed subscription and web page sharing using bookmarklets",
-		 "fox",
-	     false,
-		 "https://git.tt-rss.org/fox/tt-rss/wiki/ShareAnything");
+	private $host;
+
+	function about() {
+		return array(1.0,
+			"Easy feed subscription and web page sharing using bookmarklets",
+			"fox",
+			false,
+			"https://git.tt-rss.org/fox/tt-rss/wiki/ShareAnything");
   }
 
-  function init($host) {
-    $this->host = $host;
+	function init($host) {
+		$this->host = $host;
 
-    $host->add_hook($host::HOOK_PREFS_TAB, $this);
-  }
+		$host->add_hook($host::HOOK_PREFS_TAB, $this);
+	}
 
-  private function subscribe_to_feed_url() {
+	private function subscribe_to_feed_url() {
 		$url_path = get_self_url_prefix() .
 			"/public.php?op=subscribe&feed_url=%s";
 		return $url_path;
 	}
 
-  function hook_prefs_tab($args) {
-    if ($args == "prefFeeds") {
-
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
-			title=\"<i class='material-icons'>bookmark</i> ".__('Bookmarklets')."\">";
+	function hook_prefs_tab($args) {
+		if ($args != "prefFeeds")
+			return;
 
-		print "<h3>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</h3>";
+			$bm_subscribe_url = str_replace('%s', '', $this->subscribe_to_feed_url());
+			$confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?'));
+			$bm_subscribe_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+encodeURIComponent(window.location.href)}");
 
-		$bm_subscribe_url = str_replace('%s', '', $this->subscribe_to_feed_url());
+			$bm_share_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
+		?>
 
-		$confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?'));
+		<div dojoType="dijit.layout.AccordionPane"
+			title="<i class='material-icons'>bookmark</i> <?= __('Bookmarklets') ?>">
 
-		$bm_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+encodeURIComponent(window.location.href)}");
+			<h3><?= __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") ?></h3>
 
-		print "<p><label class='dijitButton'>";
-		print "<a href=\"$bm_url\">" . __('Subscribe in Tiny Tiny RSS'). "</a>";
-		print "</label></p>";
+			<label class='dijitButton'>
+				<a href="<?= $bm_subscribe_url ?>"><?= __('Subscribe in Tiny Tiny RSS') ?></a>
+			</label>
 
-		print "<h3>" . __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") . "</h3>";
+			<h3><?= __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") ?></h3>
 
-		print "<label class='dijitButton'>";
-		$bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
-		print "<a href=\"$bm_url\">" . __('Share with Tiny Tiny RSS'). "</a>";
-		print "</label>";
+			<label class='dijitButton'>
+				<a href="<?= $bm_share_url ?>"><?= __('Share with Tiny Tiny RSS') ?></a>
+			</label>
 
-		print "<button dojoType='dijit.form.Button' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/ShareAnything\")'>
-					<i class='material-icons'>help</i> ".__("More info...")."</button>";
+			<?= \Controls\button_tag(\Controls\icon("help") . " " . __("More info..."), "",
+									["class" => 'alt-info', "onclick" => "window.open('https://tt-rss.org/wiki/ShareAnything')"]) ?>
 
-		print "</div>"; #pane
+		</div>
 
-	 }
-  }
+		<?php
+	}
 
 	function api_version() {
 		return 2;
-- 
cgit v1.2.3-54-g00ecf


From bed36cbf9fde4a9016029fb8c21e6e68d540dee2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 18 Feb 2021 13:41:40 +0300
Subject: af_psql_trgm: cleanup

---
 plugins/af_psql_trgm/init.php | 196 +++++++++++++++++++++---------------------
 1 file changed, 100 insertions(+), 96 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index c66c49aed..4ecfe0cd5 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -124,113 +124,117 @@ class Af_Psql_Trgm extends Plugin {
 	function hook_prefs_tab($args) {
 		if ($args != "prefFeeds") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
-			title=\"<i class='material-icons'>extension</i> ".__('Mark similar articles as read (af_psql_trgm)')."\">";
+		$similarity = $this->host->get($this, "similarity", $this->default_similarity);
+		$min_title_length = $this->host->get($this, "min_title_length", $this->default_min_length);
+		$enable_globally = sql_bool_to_bool($this->host->get($this, "enable_globally"));
 
-		if (DB_TYPE != "pgsql") {
-			print_error("Database type not supported.");
-		} else {
-
-			$res = $this->pdo->query("select 'similarity'::regproc");
-
-			if (!$res || !$res->fetch()) {
-				print_error("pg_trgm extension not found.");
-			}
+		?>
 
-			$similarity = $this->host->get($this, "similarity", $this->default_similarity);
-			$min_title_length = $this->host->get($this, "min_title_length", $this->default_min_length);
-			$enable_globally = sql_bool_to_bool($this->host->get($this, "enable_globally"));
+		<div dojoType="dijit.layout.AccordionPane"
+			title="<i class='material-icons'>extension</i> <?= __('Mark similar articles as read (af_psql_trgm)') ?>">
 
-			print "<form dojoType=\"dijit.form.Form\">";
+			<?php
+			if (DB_TYPE != "pgsql") {
+				print_error("Database type not supported.");
+			} else {
+				$res = $this->pdo->query("select 'similarity'::regproc");
 
-			print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
-				evt.preventDefault();
-				if (this.validate()) {
-					console.log(dojo.objectToQuery(this.getValues()));
-					new Ajax.Request('backend.php', {
-						parameters: dojo.objectToQuery(this.getValues()),
-						onComplete: function(transport) {
-							Notify.info(transport.responseText);
-						}
-					});
-					//this.reset();
+				if (!$res || !$res->fetch()) {
+					print_error("pg_trgm extension not found.");
 				}
-				</script>";
-
-			print \Controls\pluginhandler_tags($this, "save");
-
-			print_notice("Enable for specific feeds in the feed editor.");
-
-			print "<fieldset>";
-
-			print "<label>" . __("Minimum similarity:") . "</label> ";
-			print "<input dojoType=\"dijit.form.NumberSpinner\"
-				placeholder=\"0.75\" id='psql_trgm_similarity'
-				required=\"1\" name=\"similarity\" value=\"$similarity\">";
-
-			print "<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>" .
-				__("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.") .
-				"</div>";
-
-			print "</fieldset><fieldset>";
-
-			print "<label>" . __("Minimum title length:") . "</label> ";
-			print "<input dojoType=\"dijit.form.NumberSpinner\"
-				placeholder=\"32\"
-				required=\"1\" name=\"min_title_length\" value=\"$min_title_length\">";
-
-			print "</fieldset><fieldset>";
-
-			print "<label class='checkbox'>";
-			print \Controls\checkbox_tag("enable_globally", $enable_globally);
-			print " " . __("Enable for all feeds:");
-			print "</label>";
+			} ?>
 
-			print "</fieldset>";
+			<form dojoType="dijit.form.Form">
 
-			print "<hr/>";
-			print \Controls\submit_tag(__("Save"));
-			print "</form>";
+				<?= \Controls\pluginhandler_tags($this, "save") ?>
 
-			/* cleanup */
-			$enabled_feeds = $this->filter_unknown_feeds(
-				$this->get_stored_array("enabled_feeds"));
-
-			$this->host->set($this, "enabled_feeds", $enabled_feeds);
-
-			if (count($enabled_feeds) > 0) {
-				print "<hr/>";
-				print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
-
-				print "<ul class=\"panel panel-scrollable list list-unstyled\">";
-				foreach ($enabled_feeds as $f) {
-					print "<li>" .
-						"<i class='material-icons'>rss_feed</i> <a href='#'
-							onclick='CommonDialogs.editFeed($f)'>" .
-						Feeds::_get_title($f) . "</a></li>";
-				}
-				print "</ul>";
-			}
-		}
-
-		print "</div>";
+				<script type="dojo/method" event="onSubmit" args="evt">
+					evt.preventDefault();
+					if (this.validate()) {
+						Notify.progress('Saving data...', true);
+						xhrPost("backend.php", this.getValues(), (transport) => {
+							Notify.info(transport.responseText);
+						})
+					}
+				</script>
+
+				<?= format_notice("Enable for specific feeds in the feed editor.") ?>
+
+				<fieldset>
+					<label><?= __("Minimum similarity:") ?></label>
+					<input dojoType="dijit.form.NumberSpinner"
+						placeholder="<?= $this->default_similarity ?>"
+						id='psql_trgm_similarity'
+						required="1"
+						name="similarity" value="<?= htmlspecialchars($similarity) ?>">
+
+					<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>
+						<?= __("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.") ?>
+					</div>
+				</fieldset>
+
+				<fieldset>
+					<label><?= __("Minimum title length:") ?></label>
+					<input dojoType="dijit.form.NumberSpinner"
+						placeholder="<?= $this->default_min_length ?>"
+						required="1"
+						name="min_title_length" value="<?= htmlspecialchars($min_title_length) ?>">
+				</fieldset>
+
+				<fieldset>
+					<label class='checkbox'>
+						<?= \Controls\checkbox_tag("enable_globally", $enable_globally) ?>
+						<?= __("Enable for all feeds.") ?>
+					</label>
+				</fieldset>
+
+				<hr/>
+
+				<?= \Controls\submit_tag(__("Save")) ?>
+			</form>
+
+			<?php
+				/* cleanup */
+				$enabled_feeds = $this->filter_unknown_feeds(
+					$this->get_stored_array("enabled_feeds"));
+
+				$this->host->set($this, "enabled_feeds", $enabled_feeds);
+			?>
+
+			<?php	if (count($enabled_feeds) > 0) {	?>
+				<hr/>
+				<h3><?= __("Currently enabled for (click to edit):") ?></h3>
+
+				<ul class="panel panel-scrollable list list-unstyled">
+					<?php foreach ($enabled_feeds as $f) { ?>
+						<li>
+							<i class='material-icons'>rss_feed</i>
+							<a href='#'	onclick="CommonDialogs.editFeed(<?= $f ?>)">
+									<?= Feeds::_get_title($f) ?>
+							</a>
+						</li>
+					<?php } ?>
+				</ul>
+			<?php	} ?>
+		</div>
+		<?php
 	}
 
 	function hook_prefs_edit_feed($feed_id) {
-		print "<header>".__("Similarity (af_psql_trgm)")."</header>";
-		print "<section>";
-
-		$enabled_feeds = $this->get_stored_array("enabled_feeds");
-		$checked = in_array($feed_id, $enabled_feeds) ? "checked" : "";
-
-		print "<fieldset>";
-
-		print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='trgm_similarity_enabled'
-			name='trgm_similarity_enabled' $checked> ".__('Mark similar articles as read')."</label>";
-
-		print "</fieldset>";
-
-		print "</section>";
+			$enabled_feeds = $this->get_stored_array("enabled_feeds");
+		?>
+			<header><?= __("Similarity (af_psql_trgm)") ?></header>
+
+			<section>
+				<fieldset>
+					<label class="checkbox">
+						<?= \Controls\checkbox_tag("trgm_similarity_enabled", in_array($feed_id, $enabled_feeds)) ?>
+						<?= __('Mark similar articles as read') ?>
+					</label>
+				</fieldset>
+			</section>
+		</section>
+		<?php
 	}
 
 	function hook_prefs_save_feed($feed_id) {
-- 
cgit v1.2.3-54-g00ecf


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

---
 classes/handler/public.php         |    5 +-
 classes/pref/prefs.php             |    2 +-
 index.php                          |    3 +-
 js/App.js                          |   75 ++-
 js/Article.js                      |   36 +-
 js/CommonDialogs.js                |   20 +-
 js/CommonFilters.js                |   22 +-
 js/FeedTree.js                     |    4 +-
 js/Feeds.js                        |   20 +-
 js/Headlines.js                    |  171 +++---
 js/PrefFeedTree.js                 |   10 +-
 js/PrefFilterTree.js               |    4 +-
 js/PrefHelpers.js                  |   10 +-
 js/PrefLabelTree.js                |    4 +-
 js/PrefUsers.js                    |    2 +-
 js/common.js                       |  135 ++++-
 js/tt-rss.js                       |   15 +-
 js/utility.js                      |    2 +-
 lib/scriptaculous/controls.js      |  965 -------------------------------
 lib/scriptaculous/effects.js       | 1123 ------------------------------------
 lib/scriptaculous/scriptaculous.js |   68 ---
 plugins/af_readability/init.js     |    4 +-
 plugins/af_zz_vidmute/init.js      |    4 +-
 plugins/share/share.js             |    3 -
 plugins/shorten_expanded/init.js   |    4 +-
 prefs.php                          |    3 +-
 26 files changed, 319 insertions(+), 2395 deletions(-)
 delete mode 100644 lib/scriptaculous/controls.js
 delete mode 100644 lib/scriptaculous/effects.js
 delete mode 100644 lib/scriptaculous/scriptaculous.js

(limited to 'plugins')

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


From c088e9d9d8296fe154763da3b5297bf85c3cc3a1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 18 Feb 2021 22:23:06 +0300
Subject: get rid of a few more prototype-isms

---
 classes/feeds.php          |    1 -
 classes/handler/public.php |    4 -
 include/login_form.php     |    6 +-
 index.php                  |    3 +-
 js/utility.js              |    8 +-
 lib/prototype.js           | 7590 --------------------------------------------
 plugins/share/init.php     |    1 -
 prefs.php                  |    3 +-
 8 files changed, 8 insertions(+), 7608 deletions(-)
 delete mode 100644 lib/prototype.js

(limited to 'plugins')

diff --git a/classes/feeds.php b/classes/feeds.php
index 30478ae39..04553451c 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -640,7 +640,6 @@ class Feeds extends Handler_Protected {
 				};
 			</script>
 			<?php
-				echo javascript_tag("lib/prototype.js");
 				echo javascript_tag("js/utility.js");
 				echo javascript_tag("lib/dojo/dojo.js");
 				echo javascript_tag("lib/dojo/tt-rss-layer.js");
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 80c1c271d..de3165e2f 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -358,7 +358,6 @@ class Handler_Public extends Handler {
 		<head>
 			<title><?= __("Share with Tiny Tiny RSS") ?></title>
 			<?php
-			echo javascript_tag("lib/prototype.js");
 			echo javascript_tag("lib/dojo/dojo.js");
 			echo javascript_tag("js/utility.js");
 			echo javascript_tag("lib/dojo/tt-rss-layer.js");
@@ -583,7 +582,6 @@ class Handler_Public extends Handler {
 			<head>
 				<title>Tiny Tiny RSS</title>
 				<?php
-					echo javascript_tag("lib/prototype.js");
 					echo javascript_tag("js/utility.js");
 					echo javascript_tag("lib/dojo/dojo.js");
 					echo javascript_tag("lib/dojo/tt-rss-layer.js");
@@ -743,7 +741,6 @@ class Handler_Public extends Handler {
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 			<?php
 				echo stylesheet_tag("themes/light.css");
-				echo javascript_tag("lib/prototype.js");
 				echo javascript_tag("lib/dojo/dojo.js");
 				echo javascript_tag("lib/dojo/tt-rss-layer.js");
 			?>
@@ -946,7 +943,6 @@ class Handler_Public extends Handler {
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
 			<?php
 				echo stylesheet_tag("themes/light.css");
-				echo javascript_tag("lib/prototype.js");
 				echo javascript_tag("lib/dojo/dojo.js");
 				echo javascript_tag("lib/dojo/tt-rss-layer.js");
 			?>
diff --git a/include/login_form.php b/include/login_form.php
index c3660bced..d1af23459 100755
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -6,10 +6,8 @@
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<?php
-	foreach (array("lib/prototype.js",
-				"lib/dojo/dojo.js",
+	foreach (array("lib/dojo/dojo.js",
 				"lib/dojo/tt-rss-layer.js",
-				"lib/prototype.js",
 			 	"js/common.js",
 				"js/utility.js",
 				"errors.php?mode=js") as $jsfile) {
@@ -67,7 +65,7 @@
 
                         profile.removeOption(profile.getOptions());
 
-                        reply.each((p) => {
+                        reply.forEach((p) => {
                             profile
                                 .attr("disabled", false)
                                 .addOption(p);
diff --git a/index.php b/index.php
index 4a4d336ca..4494082dd 100644
--- a/index.php
+++ b/index.php
@@ -76,8 +76,7 @@
 	</script>
 
 	<?php
-	foreach (array(#"lib/_prototype.js",
-				"lib/dojo/dojo.js",
+	foreach (array("lib/dojo/dojo.js",
 				"lib/dojo/tt-rss-layer.js",
 				"js/tt-rss.js",
 				"js/common.js",
diff --git a/js/utility.js b/js/utility.js
index a7530a97f..43ad5644e 100644
--- a/js/utility.js
+++ b/js/utility.js
@@ -16,10 +16,10 @@ window.addEventListener("load", function() {
         setup_night_mode: function() {
             const mql = window.matchMedia('(prefers-color-scheme: dark)');
 
-            const link = new Element("link", {
-                rel: "stylesheet",
-                id: "theme_auto_css"
-            });
+            const link = document.createElement("link");
+
+            link.rel = "stylesheet";
+            link.id = "theme_auto_css";
 
             link.onload = function() {
                 document.querySelector("body").removeClassName("css_loading");
diff --git a/lib/prototype.js b/lib/prototype.js
deleted file mode 100644
index d9bbc6e80..000000000
--- a/lib/prototype.js
+++ /dev/null
@@ -1,7590 +0,0 @@
-// Modified document.on() to modified.p_on() to fix compatibility with Dojo -fox
-
-/*  Prototype JavaScript framework, version 1.7.3
- *  (c) 2005-2010 Sam Stephenson
- *
- *  Prototype is freely distributable under the terms of an MIT-style license.
- *  For details, see the Prototype web site: http://www.prototypejs.org/
- *
- *--------------------------------------------------------------------------*/
-
-var Prototype = {
-
-  Version: '1.7.3',
-
-  Browser: (function(){
-    var ua = navigator.userAgent;
-    var isOpera = Object.prototype.toString.call(window.opera) == '[object Opera]';
-    return {
-      IE:             !!window.attachEvent && !isOpera,
-      Opera:          isOpera,
-      WebKit:         ua.indexOf('AppleWebKit/') > -1,
-      Gecko:          ua.indexOf('Gecko') > -1 && ua.indexOf('KHTML') === -1,
-      MobileSafari:   /Apple.*Mobile/.test(ua)
-    }
-  })(),
-
-  BrowserFeatures: {
-    XPath: !!document.evaluate,
-
-    SelectorsAPI: !!document.querySelector,
-
-    ElementExtensions: (function() {
-      var constructor = window.Element || window.HTMLElement;
-      return !!(constructor && constructor.prototype);
-    })(),
-    SpecificElementExtensions: (function() {
-      if (typeof window.HTMLDivElement !== 'undefined')
-        return true;
-
-      var div = document.createElement('div'),
-          form = document.createElement('form'),
-          isSupported = false;
-
-      if (div['__proto__'] && (div['__proto__'] !== form['__proto__'])) {
-        isSupported = true;
-      }
-
-      div = form = null;
-
-      return isSupported;
-    })()
-  },
-
-  ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script\\s*>',
-  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
-
-  emptyFunction: function() { },
-
-  K: function(x) { return x }
-};
-
-if (Prototype.Browser.MobileSafari)
-  Prototype.BrowserFeatures.SpecificElementExtensions = false;
-/* Based on Alex Arnell's inheritance implementation. */
-
-var Class = (function() {
-
-  var IS_DONTENUM_BUGGY = (function(){
-    for (var p in { toString: 1 }) {
-      if (p === 'toString') return false;
-    }
-    return true;
-  })();
-
-  function subclass() {};
-  function create() {
-    var parent = null, properties = $A(arguments);
-    if (Object.isFunction(properties[0]))
-      parent = properties.shift();
-
-    function klass() {
-      this.initialize.apply(this, arguments);
-    }
-
-    Object.extend(klass, Class.Methods);
-    klass.superclass = parent;
-    klass.subclasses = [];
-
-    if (parent) {
-      subclass.prototype = parent.prototype;
-      klass.prototype = new subclass;
-      parent.subclasses.push(klass);
-    }
-
-    for (var i = 0, length = properties.length; i < length; i++)
-      klass.addMethods(properties[i]);
-
-    if (!klass.prototype.initialize)
-      klass.prototype.initialize = Prototype.emptyFunction;
-
-    klass.prototype.constructor = klass;
-    return klass;
-  }
-
-  function addMethods(source) {
-    var ancestor   = this.superclass && this.superclass.prototype,
-        properties = Object.keys(source);
-
-    if (IS_DONTENUM_BUGGY) {
-      if (source.toString != Object.prototype.toString)
-        properties.push("toString");
-      if (source.valueOf != Object.prototype.valueOf)
-        properties.push("valueOf");
-    }
-
-    for (var i = 0, length = properties.length; i < length; i++) {
-      var property = properties[i], value = source[property];
-      if (ancestor && Object.isFunction(value) &&
-          value.argumentNames()[0] == "$super") {
-        var method = value;
-        value = (function(m) {
-          return function() { return ancestor[m].apply(this, arguments); };
-        })(property).wrap(method);
-
-        value.valueOf = (function(method) {
-          return function() { return method.valueOf.call(method); };
-        })(method);
-
-        value.toString = (function(method) {
-          return function() { return method.toString.call(method); };
-        })(method);
-      }
-      this.prototype[property] = value;
-    }
-
-    return this;
-  }
-
-  return {
-    create: create,
-    Methods: {
-      addMethods: addMethods
-    }
-  };
-})();
-(function() {
-
-  var _toString = Object.prototype.toString,
-      _hasOwnProperty = Object.prototype.hasOwnProperty,
-      NULL_TYPE = 'Null',
-      UNDEFINED_TYPE = 'Undefined',
-      BOOLEAN_TYPE = 'Boolean',
-      NUMBER_TYPE = 'Number',
-      STRING_TYPE = 'String',
-      OBJECT_TYPE = 'Object',
-      FUNCTION_CLASS = '[object Function]',
-      BOOLEAN_CLASS = '[object Boolean]',
-      NUMBER_CLASS = '[object Number]',
-      STRING_CLASS = '[object String]',
-      ARRAY_CLASS = '[object Array]',
-      DATE_CLASS = '[object Date]',
-      NATIVE_JSON_STRINGIFY_SUPPORT = window.JSON &&
-        typeof JSON.stringify === 'function' &&
-        JSON.stringify(0) === '0' &&
-        typeof JSON.stringify(Prototype.K) === 'undefined';
-
-
-
-  var DONT_ENUMS = ['toString', 'toLocaleString', 'valueOf',
-   'hasOwnProperty', 'isPrototypeOf', 'propertyIsEnumerable', 'constructor'];
-
-  var IS_DONTENUM_BUGGY = (function(){
-    for (var p in { toString: 1 }) {
-      if (p === 'toString') return false;
-    }
-    return true;
-  })();
-
-  function Type(o) {
-    switch(o) {
-      case null: return NULL_TYPE;
-      case (void 0): return UNDEFINED_TYPE;
-    }
-    var type = typeof o;
-    switch(type) {
-      case 'boolean': return BOOLEAN_TYPE;
-      case 'number':  return NUMBER_TYPE;
-      case 'string':  return STRING_TYPE;
-    }
-    return OBJECT_TYPE;
-  }
-
-  function extend(destination, source) {
-    for (var property in source)
-      destination[property] = source[property];
-    return destination;
-  }
-
-  function inspect(object) {
-    try {
-      if (isUndefined(object)) return 'undefined';
-      if (object === null) return 'null';
-      return object.inspect ? object.inspect() : String(object);
-    } catch (e) {
-      if (e instanceof RangeError) return '...';
-      throw e;
-    }
-  }
-
-  function toJSON(value) {
-    return Str('', { '': value }, []);
-  }
-
-  function Str(key, holder, stack) {
-    var value = holder[key];
-    if (Type(value) === OBJECT_TYPE && typeof value.toJSON === 'function') {
-      value = value.toJSON(key);
-    }
-
-    var _class = _toString.call(value);
-
-    switch (_class) {
-      case NUMBER_CLASS:
-      case BOOLEAN_CLASS:
-      case STRING_CLASS:
-        value = value.valueOf();
-    }
-
-    switch (value) {
-      case null: return 'null';
-      case true: return 'true';
-      case false: return 'false';
-    }
-
-    var type = typeof value;
-    switch (type) {
-      case 'string':
-        return value.inspect(true);
-      case 'number':
-        return isFinite(value) ? String(value) : 'null';
-      case 'object':
-
-        for (var i = 0, length = stack.length; i < length; i++) {
-          if (stack[i] === value) {
-            throw new TypeError("Cyclic reference to '" + value + "' in object");
-          }
-        }
-        stack.push(value);
-
-        var partial = [];
-        if (_class === ARRAY_CLASS) {
-          for (var i = 0, length = value.length; i < length; i++) {
-            var str = Str(i, value, stack);
-            partial.push(typeof str === 'undefined' ? 'null' : str);
-          }
-          partial = '[' + partial.join(',') + ']';
-        } else {
-          var keys = Object.keys(value);
-          for (var i = 0, length = keys.length; i < length; i++) {
-            var key = keys[i], str = Str(key, value, stack);
-            if (typeof str !== "undefined") {
-               partial.push(key.inspect(true)+ ':' + str);
-             }
-          }
-          partial = '{' + partial.join(',') + '}';
-        }
-        stack.pop();
-        return partial;
-    }
-  }
-
-  function stringify(object) {
-    return JSON.stringify(object);
-  }
-
-  function toQueryString(object) {
-    return $H(object).toQueryString();
-  }
-
-  function toHTML(object) {
-    return object && object.toHTML ? object.toHTML() : String.interpret(object);
-  }
-
-  function keys(object) {
-    if (Type(object) !== OBJECT_TYPE) { throw new TypeError(); }
-    var results = [];
-    for (var property in object) {
-      if (_hasOwnProperty.call(object, property))
-        results.push(property);
-    }
-
-    if (IS_DONTENUM_BUGGY) {
-      for (var i = 0; property = DONT_ENUMS[i]; i++) {
-        if (_hasOwnProperty.call(object, property))
-          results.push(property);
-      }
-    }
-
-    return results;
-  }
-
-  function values(object) {
-    var results = [];
-    for (var property in object)
-      results.push(object[property]);
-    return results;
-  }
-
-  function clone(object) {
-    return extend({ }, object);
-  }
-
-  function isElement(object) {
-    return !!(object && object.nodeType == 1);
-  }
-
-  function isArray(object) {
-    return _toString.call(object) === ARRAY_CLASS;
-  }
-
-  var hasNativeIsArray = (typeof Array.isArray == 'function')
-    && Array.isArray([]) && !Array.isArray({});
-
-  if (hasNativeIsArray) {
-    isArray = Array.isArray;
-  }
-
-  function isHash(object) {
-    return object instanceof Hash;
-  }
-
-  function isFunction(object) {
-    return _toString.call(object) === FUNCTION_CLASS;
-  }
-
-  function isString(object) {
-    return _toString.call(object) === STRING_CLASS;
-  }
-
-  function isNumber(object) {
-    return _toString.call(object) === NUMBER_CLASS;
-  }
-
-  function isDate(object) {
-    return _toString.call(object) === DATE_CLASS;
-  }
-
-  function isUndefined(object) {
-    return typeof object === "undefined";
-  }
-
-  extend(Object, {
-    extend:        extend,
-    inspect:       inspect,
-    toJSON:        NATIVE_JSON_STRINGIFY_SUPPORT ? stringify : toJSON,
-    toQueryString: toQueryString,
-    toHTML:        toHTML,
-    keys:          Object.keys || keys,
-    values:        values,
-    clone:         clone,
-    isElement:     isElement,
-    isArray:       isArray,
-    isHash:        isHash,
-    isFunction:    isFunction,
-    isString:      isString,
-    isNumber:      isNumber,
-    isDate:        isDate,
-    isUndefined:   isUndefined
-  });
-})();
-Object.extend(Function.prototype, (function() {
-  var slice = Array.prototype.slice;
-
-  function update(array, args) {
-    var arrayLength = array.length, length = args.length;
-    while (length--) array[arrayLength + length] = args[length];
-    return array;
-  }
-
-  function merge(array, args) {
-    array = slice.call(array, 0);
-    return update(array, args);
-  }
-
-  function argumentNames() {
-    var names = this.toString().match(/^[\s\(]*function[^(]*\(([^)]*)\)/)[1]
-      .replace(/\/\/.*?[\r\n]|\/\*(?:.|[\r\n])*?\*\//g, '')
-      .replace(/\s+/g, '').split(',');
-    return names.length == 1 && !names[0] ? [] : names;
-  }
-
-
-  function bind(context) {
-    if (arguments.length < 2 && Object.isUndefined(arguments[0]))
-      return this;
-
-    if (!Object.isFunction(this))
-      throw new TypeError("The object is not callable.");
-
-    var nop = function() {};
-    var __method = this, args = slice.call(arguments, 1);
-
-    var bound = function() {
-      var a = merge(args, arguments);
-      var c = this instanceof bound ? this : context;
-      return __method.apply(c, a);
-    };
-
-    nop.prototype   = this.prototype;
-    bound.prototype = new nop();
-
-    return bound;
-  }
-
-  function bindAsEventListener(context) {
-    var __method = this, args = slice.call(arguments, 1);
-    return function(event) {
-      var a = update([event || window.event], args);
-      return __method.apply(context, a);
-    }
-  }
-
-  function curry() {
-    if (!arguments.length) return this;
-    var __method = this, args = slice.call(arguments, 0);
-    return function() {
-      var a = merge(args, arguments);
-      return __method.apply(this, a);
-    }
-  }
-
-  function delay(timeout) {
-    var __method = this, args = slice.call(arguments, 1);
-    timeout = timeout * 1000;
-    return window.setTimeout(function() {
-      return __method.apply(__method, args);
-    }, timeout);
-  }
-
-  function defer() {
-    var args = update([0.01], arguments);
-    return this.delay.apply(this, args);
-  }
-
-  function wrap(wrapper) {
-    var __method = this;
-    return function() {
-      var a = update([__method.bind(this)], arguments);
-      return wrapper.apply(this, a);
-    }
-  }
-
-  function methodize() {
-    if (this._methodized) return this._methodized;
-    var __method = this;
-    return this._methodized = function() {
-      var a = update([this], arguments);
-      return __method.apply(null, a);
-    };
-  }
-
-  var extensions = {
-    argumentNames:       argumentNames,
-    bindAsEventListener: bindAsEventListener,
-    curry:               curry,
-    delay:               delay,
-    defer:               defer,
-    wrap:                wrap,
-    methodize:           methodize
-  };
-
-  if (!Function.prototype.bind)
-    extensions.bind = bind;
-
-  return extensions;
-})());
-
-
-
-(function(proto) {
-
-
-  function toISOString() {
-    return this.getUTCFullYear() + '-' +
-      (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
-      this.getUTCDate().toPaddedString(2) + 'T' +
-      this.getUTCHours().toPaddedString(2) + ':' +
-      this.getUTCMinutes().toPaddedString(2) + ':' +
-      this.getUTCSeconds().toPaddedString(2) + 'Z';
-  }
-
-
-  function toJSON() {
-    return this.toISOString();
-  }
-
-  if (!proto.toISOString) proto.toISOString = toISOString;
-  if (!proto.toJSON) proto.toJSON = toJSON;
-
-})(Date.prototype);
-
-
-RegExp.prototype.match = RegExp.prototype.test;
-
-RegExp.escape = function(str) {
-  return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
-};
-var PeriodicalExecuter = Class.create({
-  initialize: function(callback, frequency) {
-    this.callback = callback;
-    this.frequency = frequency;
-    this.currentlyExecuting = false;
-
-    this.registerCallback();
-  },
-
-  registerCallback: function() {
-    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
-  },
-
-  execute: function() {
-    this.callback(this);
-  },
-
-  stop: function() {
-    if (!this.timer) return;
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-
-  onTimerEvent: function() {
-    if (!this.currentlyExecuting) {
-      try {
-        this.currentlyExecuting = true;
-        this.execute();
-        this.currentlyExecuting = false;
-      } catch(e) {
-        this.currentlyExecuting = false;
-        throw e;
-      }
-    }
-  }
-});
-Object.extend(String, {
-  interpret: function(value) {
-    return value == null ? '' : String(value);
-  },
-  specialChar: {
-    '\b': '\\b',
-    '\t': '\\t',
-    '\n': '\\n',
-    '\f': '\\f',
-    '\r': '\\r',
-    '\\': '\\\\'
-  }
-});
-
-Object.extend(String.prototype, (function() {
-  var NATIVE_JSON_PARSE_SUPPORT = window.JSON &&
-    typeof JSON.parse === 'function' &&
-    JSON.parse('{"test": true}').test;
-
-  function prepareReplacement(replacement) {
-    if (Object.isFunction(replacement)) return replacement;
-    var template = new Template(replacement);
-    return function(match) { return template.evaluate(match) };
-  }
-
-  function isNonEmptyRegExp(regexp) {
-    return regexp.source && regexp.source !== '(?:)';
-  }
-
-
-  function gsub(pattern, replacement) {
-    var result = '', source = this, match;
-    replacement = prepareReplacement(replacement);
-
-    if (Object.isString(pattern))
-      pattern = RegExp.escape(pattern);
-
-    if (!(pattern.length || isNonEmptyRegExp(pattern))) {
-      replacement = replacement('');
-      return replacement + source.split('').join(replacement) + replacement;
-    }
-
-    while (source.length > 0) {
-      match = source.match(pattern)
-      if (match && match[0].length > 0) {
-        result += source.slice(0, match.index);
-        result += String.interpret(replacement(match));
-        source  = source.slice(match.index + match[0].length);
-      } else {
-        result += source, source = '';
-      }
-    }
-    return result;
-  }
-
-  function sub(pattern, replacement, count) {
-    replacement = prepareReplacement(replacement);
-    count = Object.isUndefined(count) ? 1 : count;
-
-    return this.gsub(pattern, function(match) {
-      if (--count < 0) return match[0];
-      return replacement(match);
-    });
-  }
-
-  function scan(pattern, iterator) {
-    this.gsub(pattern, iterator);
-    return String(this);
-  }
-
-  function truncate(length, truncation) {
-    length = length || 30;
-    truncation = Object.isUndefined(truncation) ? '...' : truncation;
-    return this.length > length ?
-      this.slice(0, length - truncation.length) + truncation : String(this);
-  }
-
-  function strip() {
-    return this.replace(/^\s+/, '').replace(/\s+$/, '');
-  }
-
-  function stripTags() {
-    return this.replace(/<\w+(\s+("[^"]*"|'[^']*'|[^>])+)?(\/)?>|<\/\w+>/gi, '');
-  }
-
-  function stripScripts() {
-    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
-  }
-
-  function extractScripts() {
-    var matchAll = new RegExp(Prototype.ScriptFragment, 'img'),
-        matchOne = new RegExp(Prototype.ScriptFragment, 'im');
-    return (this.match(matchAll) || []).map(function(scriptTag) {
-      return (scriptTag.match(matchOne) || ['', ''])[1];
-    });
-  }
-
-  function evalScripts() {
-    return this.extractScripts().map(function(script) { return eval(script); });
-  }
-
-  function escapeHTML() {
-    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-  }
-
-  function unescapeHTML() {
-    return this.stripTags().replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&');
-  }
-
-
-  function toQueryParams(separator) {
-    var match = this.strip().match(/([^?#]*)(#.*)?$/);
-    if (!match) return { };
-
-    return match[1].split(separator || '&').inject({ }, function(hash, pair) {
-      if ((pair = pair.split('='))[0]) {
-        var key = decodeURIComponent(pair.shift()),
-            value = pair.length > 1 ? pair.join('=') : pair[0];
-
-        if (value != undefined) {
-          value = value.gsub('+', ' ');
-          value = decodeURIComponent(value);
-        }
-
-        if (key in hash) {
-          if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
-          hash[key].push(value);
-        }
-        else hash[key] = value;
-      }
-      return hash;
-    });
-  }
-
-  function toArray() {
-    return this.split('');
-  }
-
-  function succ() {
-    return this.slice(0, this.length - 1) +
-      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
-  }
-
-  function times(count) {
-    return count < 1 ? '' : new Array(count + 1).join(this);
-  }
-
-  function camelize() {
-    return this.replace(/-+(.)?/g, function(match, chr) {
-      return chr ? chr.toUpperCase() : '';
-    });
-  }
-
-  function capitalize() {
-    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
-  }
-
-  function underscore() {
-    return this.replace(/::/g, '/')
-               .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
-               .replace(/([a-z\d])([A-Z])/g, '$1_$2')
-               .replace(/-/g, '_')
-               .toLowerCase();
-  }
-
-  function dasherize() {
-    return this.replace(/_/g, '-');
-  }
-
-  function inspect(useDoubleQuotes) {
-    var escapedString = this.replace(/[\x00-\x1f\\]/g, function(character) {
-      if (character in String.specialChar) {
-        return String.specialChar[character];
-      }
-      return '\\u00' + character.charCodeAt().toPaddedString(2, 16);
-    });
-    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
-    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
-  }
-
-  function unfilterJSON(filter) {
-    return this.replace(filter || Prototype.JSONFilter, '$1');
-  }
-
-  function isJSON() {
-    var str = this;
-    if (str.blank()) return false;
-    str = str.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@');
-    str = str.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']');
-    str = str.replace(/(?:^|:|,)(?:\s*\[)+/g, '');
-    return (/^[\],:{}\s]*$/).test(str);
-  }
-
-  function evalJSON(sanitize) {
-    var json = this.unfilterJSON(),
-        cx = /[\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff\u0000]/g;
-    if (cx.test(json)) {
-      json = json.replace(cx, function (a) {
-        return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-      });
-    }
-    try {
-      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
-    } catch (e) { }
-    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
-  }
-
-  function parseJSON() {
-    var json = this.unfilterJSON();
-    return JSON.parse(json);
-  }
-
-  function include(pattern) {
-    return this.indexOf(pattern) > -1;
-  }
-
-  function startsWith(pattern, position) {
-    position = Object.isNumber(position) ? position : 0;
-    return this.lastIndexOf(pattern, position) === position;
-  }
-
-  function endsWith(pattern, position) {
-    pattern = String(pattern);
-    position = Object.isNumber(position) ? position : this.length;
-    if (position < 0) position = 0;
-    if (position > this.length) position = this.length;
-    var d = position - pattern.length;
-    return d >= 0 && this.indexOf(pattern, d) === d;
-  }
-
-  function empty() {
-    return this == '';
-  }
-
-  function blank() {
-    return /^\s*$/.test(this);
-  }
-
-  function interpolate(object, pattern) {
-    return new Template(this, pattern).evaluate(object);
-  }
-
-  return {
-    gsub:           gsub,
-    sub:            sub,
-    scan:           scan,
-    truncate:       truncate,
-    strip:          String.prototype.trim || strip,
-    stripTags:      stripTags,
-    stripScripts:   stripScripts,
-    extractScripts: extractScripts,
-    evalScripts:    evalScripts,
-    escapeHTML:     escapeHTML,
-    unescapeHTML:   unescapeHTML,
-    toQueryParams:  toQueryParams,
-    parseQuery:     toQueryParams,
-    toArray:        toArray,
-    succ:           succ,
-    times:          times,
-    camelize:       camelize,
-    capitalize:     capitalize,
-    underscore:     underscore,
-    dasherize:      dasherize,
-    inspect:        inspect,
-    unfilterJSON:   unfilterJSON,
-    isJSON:         isJSON,
-    evalJSON:       NATIVE_JSON_PARSE_SUPPORT ? parseJSON : evalJSON,
-    include:        include,
-    startsWith:     String.prototype.startsWith || startsWith,
-    endsWith:       String.prototype.endsWith || endsWith,
-    empty:          empty,
-    blank:          blank,
-    interpolate:    interpolate
-  };
-})());
-
-var Template = Class.create({
-  initialize: function(template, pattern) {
-    this.template = template.toString();
-    this.pattern = pattern || Template.Pattern;
-  },
-
-  evaluate: function(object) {
-    if (object && Object.isFunction(object.toTemplateReplacements))
-      object = object.toTemplateReplacements();
-
-    return this.template.gsub(this.pattern, function(match) {
-      if (object == null) return (match[1] + '');
-
-      var before = match[1] || '';
-      if (before == '\\') return match[2];
-
-      var ctx = object, expr = match[3],
-          pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
-
-      match = pattern.exec(expr);
-      if (match == null) return before;
-
-      while (match != null) {
-        var comp = match[1].startsWith('[') ? match[2].replace(/\\\\]/g, ']') : match[1];
-        ctx = ctx[comp];
-        if (null == ctx || '' == match[3]) break;
-        expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
-        match = pattern.exec(expr);
-      }
-
-      return before + String.interpret(ctx);
-    });
-  }
-});
-Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
-
-var $break = { };
-
-var Enumerable = (function() {
-  function each(iterator, context) {
-    try {
-      this._each(iterator, context);
-    } catch (e) {
-      if (e != $break) throw e;
-    }
-    return this;
-  }
-
-  function eachSlice(number, iterator, context) {
-    var index = -number, slices = [], array = this.toArray();
-    if (number < 1) return array;
-    while ((index += number) < array.length)
-      slices.push(array.slice(index, index+number));
-    return slices.collect(iterator, context);
-  }
-
-  function all(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result = true;
-    this.each(function(value, index) {
-      result = result && !!iterator.call(context, value, index, this);
-      if (!result) throw $break;
-    }, this);
-    return result;
-  }
-
-  function any(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result = false;
-    this.each(function(value, index) {
-      if (result = !!iterator.call(context, value, index, this))
-        throw $break;
-    }, this);
-    return result;
-  }
-
-  function collect(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var results = [];
-    this.each(function(value, index) {
-      results.push(iterator.call(context, value, index, this));
-    }, this);
-    return results;
-  }
-
-  function detect(iterator, context) {
-    var result;
-    this.each(function(value, index) {
-      if (iterator.call(context, value, index, this)) {
-        result = value;
-        throw $break;
-      }
-    }, this);
-    return result;
-  }
-
-  function findAll(iterator, context) {
-    var results = [];
-    this.each(function(value, index) {
-      if (iterator.call(context, value, index, this))
-        results.push(value);
-    }, this);
-    return results;
-  }
-
-  function grep(filter, iterator, context) {
-    iterator = iterator || Prototype.K;
-    var results = [];
-
-    if (Object.isString(filter))
-      filter = new RegExp(RegExp.escape(filter));
-
-    this.each(function(value, index) {
-      if (filter.match(value))
-        results.push(iterator.call(context, value, index, this));
-    }, this);
-    return results;
-  }
-
-  function include(object) {
-    if (Object.isFunction(this.indexOf) && this.indexOf(object) != -1)
-      return true;
-
-    var found = false;
-    this.each(function(value) {
-      if (value == object) {
-        found = true;
-        throw $break;
-      }
-    });
-    return found;
-  }
-
-  function inGroupsOf(number, fillWith) {
-    fillWith = Object.isUndefined(fillWith) ? null : fillWith;
-    return this.eachSlice(number, function(slice) {
-      while(slice.length < number) slice.push(fillWith);
-      return slice;
-    });
-  }
-
-  function inject(memo, iterator, context) {
-    this.each(function(value, index) {
-      memo = iterator.call(context, memo, value, index, this);
-    }, this);
-    return memo;
-  }
-
-  function invoke(method) {
-    var args = $A(arguments).slice(1);
-    return this.map(function(value) {
-      return value[method].apply(value, args);
-    });
-  }
-
-  function max(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result;
-    this.each(function(value, index) {
-      value = iterator.call(context, value, index, this);
-      if (result == null || value >= result)
-        result = value;
-    }, this);
-    return result;
-  }
-
-  function min(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result;
-    this.each(function(value, index) {
-      value = iterator.call(context, value, index, this);
-      if (result == null || value < result)
-        result = value;
-    }, this);
-    return result;
-  }
-
-  function partition(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var trues = [], falses = [];
-    this.each(function(value, index) {
-      (iterator.call(context, value, index, this) ?
-        trues : falses).push(value);
-    }, this);
-    return [trues, falses];
-  }
-
-  function pluck(property) {
-    var results = [];
-    this.each(function(value) {
-      results.push(value[property]);
-    });
-    return results;
-  }
-
-  function reject(iterator, context) {
-    var results = [];
-    this.each(function(value, index) {
-      if (!iterator.call(context, value, index, this))
-        results.push(value);
-    }, this);
-    return results;
-  }
-
-  function sortBy(iterator, context) {
-    return this.map(function(value, index) {
-      return {
-        value: value,
-        criteria: iterator.call(context, value, index, this)
-      };
-    }, this).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      return a < b ? -1 : a > b ? 1 : 0;
-    }).pluck('value');
-  }
-
-  function toArray() {
-    return this.map();
-  }
-
-  function zip() {
-    var iterator = Prototype.K, args = $A(arguments);
-    if (Object.isFunction(args.last()))
-      iterator = args.pop();
-
-    var collections = [this].concat(args).map($A);
-    return this.map(function(value, index) {
-      return iterator(collections.pluck(index));
-    });
-  }
-
-  function size() {
-    return this.toArray().length;
-  }
-
-  function inspect() {
-    return '#<Enumerable:' + this.toArray().inspect() + '>';
-  }
-
-
-
-
-
-
-
-
-
-  return {
-    each:       each,
-    eachSlice:  eachSlice,
-    all:        all,
-    every:      all,
-    any:        any,
-    some:       any,
-    collect:    collect,
-    map:        collect,
-    detect:     detect,
-    findAll:    findAll,
-    select:     findAll,
-    filter:     findAll,
-    grep:       grep,
-    include:    include,
-    member:     include,
-    inGroupsOf: inGroupsOf,
-    inject:     inject,
-    invoke:     invoke,
-    max:        max,
-    min:        min,
-    partition:  partition,
-    pluck:      pluck,
-    reject:     reject,
-    sortBy:     sortBy,
-    toArray:    toArray,
-    entries:    toArray,
-    zip:        zip,
-    size:       size,
-    inspect:    inspect,
-    find:       detect
-  };
-})();
-
-function $A(iterable) {
-  if (!iterable) return [];
-  if ('toArray' in Object(iterable)) return iterable.toArray();
-  var length = iterable.length || 0, results = new Array(length);
-  while (length--) results[length] = iterable[length];
-  return results;
-}
-
-
-function $w(string) {
-  if (!Object.isString(string)) return [];
-  string = string.strip();
-  return string ? string.split(/\s+/) : [];
-}
-
-Array.from = $A;
-
-
-(function() {
-  var arrayProto = Array.prototype,
-      slice = arrayProto.slice,
-      _each = arrayProto.forEach; // use native browser JS 1.6 implementation if available
-
-  function each(iterator, context) {
-    for (var i = 0, length = this.length >>> 0; i < length; i++) {
-      if (i in this) iterator.call(context, this[i], i, this);
-    }
-  }
-  if (!_each) _each = each;
-
-  function clear() {
-    this.length = 0;
-    return this;
-  }
-
-  function first() {
-    return this[0];
-  }
-
-  function last() {
-    return this[this.length - 1];
-  }
-
-  function compact() {
-    return this.select(function(value) {
-      return value != null;
-    });
-  }
-
-  function flatten() {
-    return this.inject([], function(array, value) {
-      if (Object.isArray(value))
-        return array.concat(value.flatten());
-      array.push(value);
-      return array;
-    });
-  }
-
-  function without() {
-    var values = slice.call(arguments, 0);
-    return this.select(function(value) {
-      return !values.include(value);
-    });
-  }
-
-  function reverse(inline) {
-    return (inline === false ? this.toArray() : this)._reverse();
-  }
-
-  function uniq(sorted) {
-    return this.inject([], function(array, value, index) {
-      if (0 == index || (sorted ? array.last() != value : !array.include(value)))
-        array.push(value);
-      return array;
-    });
-  }
-
-  function intersect(array) {
-    return this.uniq().findAll(function(item) {
-      return array.indexOf(item) !== -1;
-    });
-  }
-
-
-  function clone() {
-    return slice.call(this, 0);
-  }
-
-  function size() {
-    return this.length;
-  }
-
-  function inspect() {
-    return '[' + this.map(Object.inspect).join(', ') + ']';
-  }
-
-  function indexOf(item, i) {
-    if (this == null) throw new TypeError();
-
-    var array = Object(this), length = array.length >>> 0;
-    if (length === 0) return -1;
-
-    i = Number(i);
-    if (isNaN(i)) {
-      i = 0;
-    } else if (i !== 0 && isFinite(i)) {
-      i = (i > 0 ? 1 : -1) * Math.floor(Math.abs(i));
-    }
-
-    if (i > length) return -1;
-
-    var k = i >= 0 ? i : Math.max(length - Math.abs(i), 0);
-    for (; k < length; k++)
-      if (k in array && array[k] === item) return k;
-    return -1;
-  }
-
-
-  function lastIndexOf(item, i) {
-    if (this == null) throw new TypeError();
-
-    var array = Object(this), length = array.length >>> 0;
-    if (length === 0) return -1;
-
-    if (!Object.isUndefined(i)) {
-      i = Number(i);
-      if (isNaN(i)) {
-        i = 0;
-      } else if (i !== 0 && isFinite(i)) {
-        i = (i > 0 ? 1 : -1) * Math.floor(Math.abs(i));
-      }
-    } else {
-      i = length;
-    }
-
-    var k = i >= 0 ? Math.min(i, length - 1) :
-     length - Math.abs(i);
-
-    for (; k >= 0; k--)
-      if (k in array && array[k] === item) return k;
-    return -1;
-  }
-
-  function concat(_) {
-    var array = [], items = slice.call(arguments, 0), item, n = 0;
-    items.unshift(this);
-    for (var i = 0, length = items.length; i < length; i++) {
-      item = items[i];
-      if (Object.isArray(item) && !('callee' in item)) {
-        for (var j = 0, arrayLength = item.length; j < arrayLength; j++) {
-          if (j in item) array[n] = item[j];
-          n++;
-        }
-      } else {
-        array[n++] = item;
-      }
-    }
-    array.length = n;
-    return array;
-  }
-
-
-  function wrapNative(method) {
-    return function() {
-      if (arguments.length === 0) {
-        return method.call(this, Prototype.K);
-      } else if (arguments[0] === undefined) {
-        var args = slice.call(arguments, 1);
-        args.unshift(Prototype.K);
-        return method.apply(this, args);
-      } else {
-        return method.apply(this, arguments);
-      }
-    };
-  }
-
-
-  function map(iterator) {
-    if (this == null) throw new TypeError();
-    iterator = iterator || Prototype.K;
-
-    var object = Object(this);
-    var results = [], context = arguments[1], n = 0;
-
-    for (var i = 0, length = object.length >>> 0; i < length; i++) {
-      if (i in object) {
-        results[n] = iterator.call(context, object[i], i, object);
-      }
-      n++;
-    }
-    results.length = n;
-    return results;
-  }
-
-  if (arrayProto.map) {
-    map = wrapNative(Array.prototype.map);
-  }
-
-  function filter(iterator) {
-    if (this == null || !Object.isFunction(iterator))
-      throw new TypeError();
-
-    var object = Object(this);
-    var results = [], context = arguments[1], value;
-
-    for (var i = 0, length = object.length >>> 0; i < length; i++) {
-      if (i in object) {
-        value = object[i];
-        if (iterator.call(context, value, i, object)) {
-          results.push(value);
-        }
-      }
-    }
-    return results;
-  }
-
-  if (arrayProto.filter) {
-    filter = Array.prototype.filter;
-  }
-
-  function some(iterator) {
-    if (this == null) throw new TypeError();
-    iterator = iterator || Prototype.K;
-    var context = arguments[1];
-
-    var object = Object(this);
-    for (var i = 0, length = object.length >>> 0; i < length; i++) {
-      if (i in object && iterator.call(context, object[i], i, object)) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
-  if (arrayProto.some) {
-    some = wrapNative(Array.prototype.some);
-  }
-
-  function every(iterator) {
-    if (this == null) throw new TypeError();
-    iterator = iterator || Prototype.K;
-    var context = arguments[1];
-
-    var object = Object(this);
-    for (var i = 0, length = object.length >>> 0; i < length; i++) {
-      if (i in object && !iterator.call(context, object[i], i, object)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  if (arrayProto.every) {
-    every = wrapNative(Array.prototype.every);
-  }
-
-
-  Object.extend(arrayProto, Enumerable);
-
-  if (arrayProto.entries === Enumerable.entries) {
-    delete arrayProto.entries;
-  }
-
-  if (!arrayProto._reverse)
-    arrayProto._reverse = arrayProto.reverse;
-
-  Object.extend(arrayProto, {
-    _each:     _each,
-
-    map:       map,
-    collect:   map,
-    select:    filter,
-    filter:    filter,
-    findAll:   filter,
-    some:      some,
-    any:       some,
-    every:     every,
-    all:       every,
-
-    clear:     clear,
-    first:     first,
-    last:      last,
-    compact:   compact,
-    flatten:   flatten,
-    without:   without,
-    reverse:   reverse,
-    uniq:      uniq,
-    intersect: intersect,
-    clone:     clone,
-    toArray:   clone,
-    size:      size,
-    inspect:   inspect
-  });
-
-  var CONCAT_ARGUMENTS_BUGGY = (function() {
-    return [].concat(arguments)[0][0] !== 1;
-  })(1,2);
-
-  if (CONCAT_ARGUMENTS_BUGGY) arrayProto.concat = concat;
-
-  if (!arrayProto.indexOf) arrayProto.indexOf = indexOf;
-  if (!arrayProto.lastIndexOf) arrayProto.lastIndexOf = lastIndexOf;
-})();
-function $H(object) {
-  return new Hash(object);
-};
-
-var Hash = Class.create(Enumerable, (function() {
-  function initialize(object) {
-    this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
-  }
-
-
-  function _each(iterator, context) {
-    var i = 0;
-    for (var key in this._object) {
-      var value = this._object[key], pair = [key, value];
-      pair.key = key;
-      pair.value = value;
-      iterator.call(context, pair, i);
-      i++;
-    }
-  }
-
-  function set(key, value) {
-    return this._object[key] = value;
-  }
-
-  function get(key) {
-    if (this._object[key] !== Object.prototype[key])
-      return this._object[key];
-  }
-
-  function unset(key) {
-    var value = this._object[key];
-    delete this._object[key];
-    return value;
-  }
-
-  function toObject() {
-    return Object.clone(this._object);
-  }
-
-
-
-  function keys() {
-    return this.pluck('key');
-  }
-
-  function values() {
-    return this.pluck('value');
-  }
-
-  function index(value) {
-    var match = this.detect(function(pair) {
-      return pair.value === value;
-    });
-    return match && match.key;
-  }
-
-  function merge(object) {
-    return this.clone().update(object);
-  }
-
-  function update(object) {
-    return new Hash(object).inject(this, function(result, pair) {
-      result.set(pair.key, pair.value);
-      return result;
-    });
-  }
-
-  function toQueryPair(key, value) {
-    if (Object.isUndefined(value)) return key;
-
-    value = String.interpret(value);
-
-    value = value.gsub(/(\r)?\n/, '\r\n');
-    value = encodeURIComponent(value);
-    value = value.gsub(/%20/, '+');
-    return key + '=' + value;
-  }
-
-  function toQueryString() {
-    return this.inject([], function(results, pair) {
-      var key = encodeURIComponent(pair.key), values = pair.value;
-
-      if (values && typeof values == 'object') {
-        if (Object.isArray(values)) {
-          var queryValues = [];
-          for (var i = 0, len = values.length, value; i < len; i++) {
-            value = values[i];
-            queryValues.push(toQueryPair(key, value));
-          }
-          return results.concat(queryValues);
-        }
-      } else results.push(toQueryPair(key, values));
-      return results;
-    }).join('&');
-  }
-
-  function inspect() {
-    return '#<Hash:{' + this.map(function(pair) {
-      return pair.map(Object.inspect).join(': ');
-    }).join(', ') + '}>';
-  }
-
-  function clone() {
-    return new Hash(this);
-  }
-
-  return {
-    initialize:             initialize,
-    _each:                  _each,
-    set:                    set,
-    get:                    get,
-    unset:                  unset,
-    toObject:               toObject,
-    toTemplateReplacements: toObject,
-    keys:                   keys,
-    values:                 values,
-    index:                  index,
-    merge:                  merge,
-    update:                 update,
-    toQueryString:          toQueryString,
-    inspect:                inspect,
-    toJSON:                 toObject,
-    clone:                  clone
-  };
-})());
-
-Hash.from = $H;
-Object.extend(Number.prototype, (function() {
-  function toColorPart() {
-    return this.toPaddedString(2, 16);
-  }
-
-  function succ() {
-    return this + 1;
-  }
-
-  function times(iterator, context) {
-    $R(0, this, true).each(iterator, context);
-    return this;
-  }
-
-  function toPaddedString(length, radix) {
-    var string = this.toString(radix || 10);
-    return '0'.times(length - string.length) + string;
-  }
-
-  function abs() {
-    return Math.abs(this);
-  }
-
-  function round() {
-    return Math.round(this);
-  }
-
-  function ceil() {
-    return Math.ceil(this);
-  }
-
-  function floor() {
-    return Math.floor(this);
-  }
-
-  return {
-    toColorPart:    toColorPart,
-    succ:           succ,
-    times:          times,
-    toPaddedString: toPaddedString,
-    abs:            abs,
-    round:          round,
-    ceil:           ceil,
-    floor:          floor
-  };
-})());
-
-function $R(start, end, exclusive) {
-  return new ObjectRange(start, end, exclusive);
-}
-
-var ObjectRange = Class.create(Enumerable, (function() {
-  function initialize(start, end, exclusive) {
-    this.start = start;
-    this.end = end;
-    this.exclusive = exclusive;
-  }
-
-  function _each(iterator, context) {
-    var value = this.start, i;
-    for (i = 0; this.include(value); i++) {
-      iterator.call(context, value, i);
-      value = value.succ();
-    }
-  }
-
-  function include(value) {
-    if (value < this.start)
-      return false;
-    if (this.exclusive)
-      return value < this.end;
-    return value <= this.end;
-  }
-
-  return {
-    initialize: initialize,
-    _each:      _each,
-    include:    include
-  };
-})());
-
-
-
-var Abstract = { };
-
-
-var Try = {
-  these: function() {
-    var returnValue;
-
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      var lambda = arguments[i];
-      try {
-        returnValue = lambda();
-        break;
-      } catch (e) { }
-    }
-
-    return returnValue;
-  }
-};
-
-var Ajax = {
-  getTransport: function() {
-    return Try.these(
-      function() {return new XMLHttpRequest()},
-      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
-      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
-    ) || false;
-  },
-
-  activeRequestCount: 0
-};
-
-Ajax.Responders = {
-  responders: [],
-
-  _each: function(iterator, context) {
-    this.responders._each(iterator, context);
-  },
-
-  register: function(responder) {
-    if (!this.include(responder))
-      this.responders.push(responder);
-  },
-
-  unregister: function(responder) {
-    this.responders = this.responders.without(responder);
-  },
-
-  dispatch: function(callback, request, transport, json) {
-    this.each(function(responder) {
-      if (Object.isFunction(responder[callback])) {
-        try {
-          responder[callback].apply(responder, [request, transport, json]);
-        } catch (e) { }
-      }
-    });
-  }
-};
-
-Object.extend(Ajax.Responders, Enumerable);
-
-Ajax.Responders.register({
-  onCreate:   function() { Ajax.activeRequestCount++ },
-  onComplete: function() { Ajax.activeRequestCount-- }
-});
-Ajax.Base = Class.create({
-  initialize: function(options) {
-    this.options = {
-      method:       'post',
-      asynchronous: true,
-      contentType:  'application/x-www-form-urlencoded',
-      encoding:     'UTF-8',
-      parameters:   '',
-      evalJSON:     true,
-      evalJS:       true
-    };
-    Object.extend(this.options, options || { });
-
-    this.options.method = this.options.method.toLowerCase();
-
-    if (Object.isHash(this.options.parameters))
-      this.options.parameters = this.options.parameters.toObject();
-  }
-});
-Ajax.Request = Class.create(Ajax.Base, {
-  _complete: false,
-
-  initialize: function($super, url, options) {
-    $super(options);
-    this.transport = Ajax.getTransport();
-    this.request(url);
-  },
-
-  request: function(url) {
-    this.url = url;
-    this.method = this.options.method;
-    var params = Object.isString(this.options.parameters) ?
-          this.options.parameters :
-          Object.toQueryString(this.options.parameters);
-
-    if (!['get', 'post'].include(this.method)) {
-      params += (params ? '&' : '') + "_method=" + this.method;
-      this.method = 'post';
-    }
-
-    if (params && this.method === 'get') {
-      this.url += (this.url.include('?') ? '&' : '?') + params;
-    }
-
-    this.parameters = params.toQueryParams();
-
-    try {
-      var response = new Ajax.Response(this);
-      if (this.options.onCreate) this.options.onCreate(response);
-      Ajax.Responders.dispatch('onCreate', this, response);
-
-      this.transport.open(this.method.toUpperCase(), this.url,
-        this.options.asynchronous);
-
-      if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);
-
-      this.transport.onreadystatechange = this.onStateChange.bind(this);
-      this.setRequestHeaders();
-
-      this.body = this.method == 'post' ? (this.options.postBody || params) : null;
-      this.transport.send(this.body);
-
-      /* Force Firefox to handle ready state 4 for synchronous requests */
-      if (!this.options.asynchronous && this.transport.overrideMimeType)
-        this.onStateChange();
-
-    }
-    catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  onStateChange: function() {
-    var readyState = this.transport.readyState;
-    if (readyState > 1 && !((readyState == 4) && this._complete))
-      this.respondToReadyState(this.transport.readyState);
-  },
-
-  setRequestHeaders: function() {
-    var headers = {
-      'X-Requested-With': 'XMLHttpRequest',
-      'X-Prototype-Version': Prototype.Version,
-      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
-    };
-
-    if (this.method == 'post') {
-      headers['Content-type'] = this.options.contentType +
-        (this.options.encoding ? '; charset=' + this.options.encoding : '');
-
-      /* Force "Connection: close" for older Mozilla browsers to work
-       * around a bug where XMLHttpRequest sends an incorrect
-       * Content-length header. See Mozilla Bugzilla #246651.
-       */
-      if (this.transport.overrideMimeType &&
-          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
-            headers['Connection'] = 'close';
-    }
-
-    if (typeof this.options.requestHeaders == 'object') {
-      var extras = this.options.requestHeaders;
-
-      if (Object.isFunction(extras.push))
-        for (var i = 0, length = extras.length; i < length; i += 2)
-          headers[extras[i]] = extras[i+1];
-      else
-        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
-    }
-
-    for (var name in headers)
-      if (headers[name] != null)
-        this.transport.setRequestHeader(name, headers[name]);
-  },
-
-  success: function() {
-    var status = this.getStatus();
-    return !status || (status >= 200 && status < 300) || status == 304;
-  },
-
-  getStatus: function() {
-    try {
-      if (this.transport.status === 1223) return 204;
-      return this.transport.status || 0;
-    } catch (e) { return 0 }
-  },
-
-  respondToReadyState: function(readyState) {
-    var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
-
-    if (state == 'Complete') {
-      try {
-        this._complete = true;
-        (this.options['on' + response.status]
-         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
-         || Prototype.emptyFunction)(response, response.headerJSON);
-      } catch (e) {
-        this.dispatchException(e);
-      }
-
-      var contentType = response.getHeader('Content-type');
-      if (this.options.evalJS == 'force'
-          || (this.options.evalJS && this.isSameOrigin() && contentType
-          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
-        this.evalResponse();
-    }
-
-    try {
-      (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
-      Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
-    } catch (e) {
-      this.dispatchException(e);
-    }
-
-    if (state == 'Complete') {
-      this.transport.onreadystatechange = Prototype.emptyFunction;
-    }
-  },
-
-  isSameOrigin: function() {
-    var m = this.url.match(/^\s*https?:\/\/[^\/]*/);
-    return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
-      protocol: location.protocol,
-      domain: document.domain,
-      port: location.port ? ':' + location.port : ''
-    }));
-  },
-
-  getHeader: function(name) {
-    try {
-      return this.transport.getResponseHeader(name) || null;
-    } catch (e) { return null; }
-  },
-
-  evalResponse: function() {
-    try {
-      return eval((this.transport.responseText || '').unfilterJSON());
-    } catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  dispatchException: function(exception) {
-    (this.options.onException || Prototype.emptyFunction)(this, exception);
-    Ajax.Responders.dispatch('onException', this, exception);
-  }
-});
-
-Ajax.Request.Events =
-  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
-
-
-
-
-
-
-
-
-Ajax.Response = Class.create({
-  initialize: function(request){
-    this.request = request;
-    var transport  = this.transport  = request.transport,
-        readyState = this.readyState = transport.readyState;
-
-    if ((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
-      this.status       = this.getStatus();
-      this.statusText   = this.getStatusText();
-      this.responseText = String.interpret(transport.responseText);
-      this.headerJSON   = this._getHeaderJSON();
-    }
-
-    if (readyState == 4) {
-      var xml = transport.responseXML;
-      this.responseXML  = Object.isUndefined(xml) ? null : xml;
-      this.responseJSON = this._getResponseJSON();
-    }
-  },
-
-  status:      0,
-
-  statusText: '',
-
-  getStatus: Ajax.Request.prototype.getStatus,
-
-  getStatusText: function() {
-    try {
-      return this.transport.statusText || '';
-    } catch (e) { return '' }
-  },
-
-  getHeader: Ajax.Request.prototype.getHeader,
-
-  getAllHeaders: function() {
-    try {
-      return this.getAllResponseHeaders();
-    } catch (e) { return null }
-  },
-
-  getResponseHeader: function(name) {
-    return this.transport.getResponseHeader(name);
-  },
-
-  getAllResponseHeaders: function() {
-    return this.transport.getAllResponseHeaders();
-  },
-
-  _getHeaderJSON: function() {
-    var json = this.getHeader('X-JSON');
-    if (!json) return null;
-
-    try {
-      json = decodeURIComponent(escape(json));
-    } catch(e) {
-    }
-
-    try {
-      return json.evalJSON(this.request.options.sanitizeJSON ||
-        !this.request.isSameOrigin());
-    } catch (e) {
-      this.request.dispatchException(e);
-    }
-  },
-
-  _getResponseJSON: function() {
-    var options = this.request.options;
-    if (!options.evalJSON || (options.evalJSON != 'force' &&
-      !(this.getHeader('Content-type') || '').include('application/json')) ||
-        this.responseText.blank())
-          return null;
-    try {
-      return this.responseText.evalJSON(options.sanitizeJSON ||
-        !this.request.isSameOrigin());
-    } catch (e) {
-      this.request.dispatchException(e);
-    }
-  }
-});
-
-Ajax.Updater = Class.create(Ajax.Request, {
-  initialize: function($super, container, url, options) {
-    this.container = {
-      success: (container.success || container),
-      failure: (container.failure || (container.success ? null : container))
-    };
-
-    options = Object.clone(options);
-    var onComplete = options.onComplete;
-    options.onComplete = (function(response, json) {
-      this.updateContent(response.responseText);
-      if (Object.isFunction(onComplete)) onComplete(response, json);
-    }).bind(this);
-
-    $super(url, options);
-  },
-
-  updateContent: function(responseText) {
-    var receiver = this.container[this.success() ? 'success' : 'failure'],
-        options = this.options;
-
-    if (!options.evalScripts) responseText = responseText.stripScripts();
-
-    if (receiver = $(receiver)) {
-      if (options.insertion) {
-        if (Object.isString(options.insertion)) {
-          var insertion = { }; insertion[options.insertion] = responseText;
-          receiver.insert(insertion);
-        }
-        else options.insertion(receiver, responseText);
-      }
-      else receiver.update(responseText);
-    }
-  }
-});
-
-Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
-  initialize: function($super, container, url, options) {
-    $super(options);
-    this.onComplete = this.options.onComplete;
-
-    this.frequency = (this.options.frequency || 2);
-    this.decay = (this.options.decay || 1);
-
-    this.updater = { };
-    this.container = container;
-    this.url = url;
-
-    this.start();
-  },
-
-  start: function() {
-    this.options.onComplete = this.updateComplete.bind(this);
-    this.onTimerEvent();
-  },
-
-  stop: function() {
-    this.updater.options.onComplete = undefined;
-    clearTimeout(this.timer);
-    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
-  },
-
-  updateComplete: function(response) {
-    if (this.options.decay) {
-      this.decay = (response.responseText == this.lastText ?
-        this.decay * this.options.decay : 1);
-
-      this.lastText = response.responseText;
-    }
-    this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency);
-  },
-
-  onTimerEvent: function() {
-    this.updater = new Ajax.Updater(this.container, this.url, this.options);
-  }
-});
-
-(function(GLOBAL) {
-
-  var UNDEFINED;
-  var SLICE = Array.prototype.slice;
-
-  var DIV = document.createElement('div');
-
-
-  function $(element) {
-    if (arguments.length > 1) {
-      for (var i = 0, elements = [], length = arguments.length; i < length; i++)
-        elements.push($(arguments[i]));
-      return elements;
-    }
-
-    if (Object.isString(element))
-      element = document.getElementById(element);
-    return Element.extend(element);
-  }
-
-  GLOBAL.$ = $;
-
-
-  if (!GLOBAL.Node) GLOBAL.Node = {};
-
-  if (!GLOBAL.Node.ELEMENT_NODE) {
-    Object.extend(GLOBAL.Node, {
-      ELEMENT_NODE:                1,
-      ATTRIBUTE_NODE:              2,
-      TEXT_NODE:                   3,
-      CDATA_SECTION_NODE:          4,
-      ENTITY_REFERENCE_NODE:       5,
-      ENTITY_NODE:                 6,
-      PROCESSING_INSTRUCTION_NODE: 7,
-      COMMENT_NODE:                8,
-      DOCUMENT_NODE:               9,
-      DOCUMENT_TYPE_NODE:         10,
-      DOCUMENT_FRAGMENT_NODE:     11,
-      NOTATION_NODE:              12
-    });
-  }
-
-  var ELEMENT_CACHE = {};
-
-  function shouldUseCreationCache(tagName, attributes) {
-    if (tagName === 'select') return false;
-    if ('type' in attributes) return false;
-    return true;
-  }
-
-  var HAS_EXTENDED_CREATE_ELEMENT_SYNTAX = (function(){
-    try {
-      var el = document.createElement('<input name="x">');
-      return el.tagName.toLowerCase() === 'input' && el.name === 'x';
-    }
-    catch(err) {
-      return false;
-    }
-  })();
-
-
-  var oldElement = GLOBAL.Element;
-  function Element(tagName, attributes) {
-    attributes = attributes || {};
-    tagName = tagName.toLowerCase();
-
-    if (HAS_EXTENDED_CREATE_ELEMENT_SYNTAX && attributes.name) {
-      tagName = '<' + tagName + ' name="' + attributes.name + '">';
-      delete attributes.name;
-      return Element.writeAttribute(document.createElement(tagName), attributes);
-    }
-
-    if (!ELEMENT_CACHE[tagName])
-      ELEMENT_CACHE[tagName] = Element.extend(document.createElement(tagName));
-
-    var node = shouldUseCreationCache(tagName, attributes) ?
-     ELEMENT_CACHE[tagName].cloneNode(false) : document.createElement(tagName);
-
-    return Element.writeAttribute(node, attributes);
-  }
-
-  GLOBAL.Element = Element;
-
-  Object.extend(GLOBAL.Element, oldElement || {});
-  if (oldElement) GLOBAL.Element.prototype = oldElement.prototype;
-
-  Element.Methods = { ByTag: {}, Simulated: {} };
-
-  var methods = {};
-
-  var INSPECT_ATTRIBUTES = { id: 'id', className: 'class' };
-  function inspect(element) {
-    element = $(element);
-    var result = '<' + element.tagName.toLowerCase();
-
-    var attribute, value;
-    for (var property in INSPECT_ATTRIBUTES) {
-      attribute = INSPECT_ATTRIBUTES[property];
-      value = (element[property] || '').toString();
-      if (value) result += ' ' + attribute + '=' + value.inspect(true);
-    }
-
-    return result + '>';
-  }
-
-  methods.inspect = inspect;
-
-
-  function visible(element) {
-    return $(element).getStyle('display') !== 'none';
-  }
-
-  function toggle(element, bool) {
-    element = $(element);
-    if (typeof bool !== 'boolean')
-      bool = !Element.visible(element);
-    Element[bool ? 'show' : 'hide'](element);
-
-    return element;
-  }
-
-  function hide(element) {
-    element = $(element);
-    element.style.display = 'none';
-    return element;
-  }
-
-  function show(element) {
-    element = $(element);
-    element.style.display = '';
-    return element;
-  }
-
-
-  Object.extend(methods, {
-    visible: visible,
-    toggle:  toggle,
-    hide:    hide,
-    show:    show
-  });
-
-
-  function remove(element) {
-    element = $(element);
-    element.parentNode.removeChild(element);
-    return element;
-  }
-
-  var SELECT_ELEMENT_INNERHTML_BUGGY = (function(){
-    var el = document.createElement("select"),
-        isBuggy = true;
-    el.innerHTML = "<option value=\"test\">test</option>";
-    if (el.options && el.options[0]) {
-      isBuggy = el.options[0].nodeName.toUpperCase() !== "OPTION";
-    }
-    el = null;
-    return isBuggy;
-  })();
-
-  var TABLE_ELEMENT_INNERHTML_BUGGY = (function(){
-    try {
-      var el = document.createElement("table");
-      if (el && el.tBodies) {
-        el.innerHTML = "<tbody><tr><td>test</td></tr></tbody>";
-        var isBuggy = typeof el.tBodies[0] == "undefined";
-        el = null;
-        return isBuggy;
-      }
-    } catch (e) {
-      return true;
-    }
-  })();
-
-  var LINK_ELEMENT_INNERHTML_BUGGY = (function() {
-    try {
-      var el = document.createElement('div');
-      el.innerHTML = "<link />";
-      var isBuggy = (el.childNodes.length === 0);
-      el = null;
-      return isBuggy;
-    } catch(e) {
-      return true;
-    }
-  })();
-
-  var ANY_INNERHTML_BUGGY = SELECT_ELEMENT_INNERHTML_BUGGY ||
-   TABLE_ELEMENT_INNERHTML_BUGGY || LINK_ELEMENT_INNERHTML_BUGGY;
-
-  var SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING = (function () {
-    var s = document.createElement("script"),
-        isBuggy = false;
-    try {
-      s.appendChild(document.createTextNode(""));
-      isBuggy = !s.firstChild ||
-        s.firstChild && s.firstChild.nodeType !== 3;
-    } catch (e) {
-      isBuggy = true;
-    }
-    s = null;
-    return isBuggy;
-  })();
-
-  function update(element, content) {
-    element = $(element);
-
-    var descendants = element.getElementsByTagName('*'),
-     i = descendants.length;
-    while (i--) purgeElement(descendants[i]);
-
-    if (content && content.toElement)
-      content = content.toElement();
-
-    if (Object.isElement(content))
-      return element.update().insert(content);
-
-
-    content = Object.toHTML(content);
-    var tagName = element.tagName.toUpperCase();
-
-    if (tagName === 'SCRIPT' && SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING) {
-      element.text = content;
-      return element;
-    }
-
-    if (ANY_INNERHTML_BUGGY) {
-      if (tagName in INSERTION_TRANSLATIONS.tags) {
-        while (element.firstChild)
-          element.removeChild(element.firstChild);
-
-        var nodes = getContentFromAnonymousElement(tagName, content.stripScripts());
-        for (var i = 0, node; node = nodes[i]; i++)
-          element.appendChild(node);
-
-      } else if (LINK_ELEMENT_INNERHTML_BUGGY && Object.isString(content) && content.indexOf('<link') > -1) {
-        while (element.firstChild)
-          element.removeChild(element.firstChild);
-
-        var nodes = getContentFromAnonymousElement(tagName,
-         content.stripScripts(), true);
-
-        for (var i = 0, node; node = nodes[i]; i++)
-          element.appendChild(node);
-      } else {
-        element.innerHTML = content.stripScripts();
-      }
-    } else {
-      element.innerHTML = content.stripScripts();
-    }
-
-    content.evalScripts.bind(content).defer();
-    return element;
-  }
-
-  function replace(element, content) {
-    element = $(element);
-
-    if (content && content.toElement) {
-      content = content.toElement();
-    } else if (!Object.isElement(content)) {
-      content = Object.toHTML(content);
-      var range = element.ownerDocument.createRange();
-      range.selectNode(element);
-      content.evalScripts.bind(content).defer();
-      content = range.createContextualFragment(content.stripScripts());
-    }
-
-    element.parentNode.replaceChild(content, element);
-    return element;
-  }
-
-  var INSERTION_TRANSLATIONS = {
-    before: function(element, node) {
-      element.parentNode.insertBefore(node, element);
-    },
-    top: function(element, node) {
-      element.insertBefore(node, element.firstChild);
-    },
-    bottom: function(element, node) {
-      element.appendChild(node);
-    },
-    after: function(element, node) {
-      element.parentNode.insertBefore(node, element.nextSibling);
-    },
-
-    tags: {
-      TABLE:  ['<table>',                '</table>',                   1],
-      TBODY:  ['<table><tbody>',         '</tbody></table>',           2],
-      TR:     ['<table><tbody><tr>',     '</tr></tbody></table>',      3],
-      TD:     ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
-      SELECT: ['<select>',               '</select>',                  1]
-    }
-  };
-
-  var tags = INSERTION_TRANSLATIONS.tags;
-
-  Object.extend(tags, {
-    THEAD: tags.TBODY,
-    TFOOT: tags.TBODY,
-    TH:    tags.TD
-  });
-
-  function replace_IE(element, content) {
-    element = $(element);
-    if (content && content.toElement)
-      content = content.toElement();
-    if (Object.isElement(content)) {
-      element.parentNode.replaceChild(content, element);
-      return element;
-    }
-
-    content = Object.toHTML(content);
-    var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
-
-    if (tagName in INSERTION_TRANSLATIONS.tags) {
-      var nextSibling = Element.next(element);
-      var fragments = getContentFromAnonymousElement(
-       tagName, content.stripScripts());
-
-      parent.removeChild(element);
-
-      var iterator;
-      if (nextSibling)
-        iterator = function(node) { parent.insertBefore(node, nextSibling) };
-      else
-        iterator = function(node) { parent.appendChild(node); }
-
-      fragments.each(iterator);
-    } else {
-      element.outerHTML = content.stripScripts();
-    }
-
-    content.evalScripts.bind(content).defer();
-    return element;
-  }
-
-  if ('outerHTML' in document.documentElement)
-    replace = replace_IE;
-
-  function isContent(content) {
-    if (Object.isUndefined(content) || content === null) return false;
-
-    if (Object.isString(content) || Object.isNumber(content)) return true;
-    if (Object.isElement(content)) return true;
-    if (content.toElement || content.toHTML) return true;
-
-    return false;
-  }
-
-  function insertContentAt(element, content, position) {
-    position   = position.toLowerCase();
-    var method = INSERTION_TRANSLATIONS[position];
-
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) {
-      method(element, content);
-      return element;
-    }
-
-    content = Object.toHTML(content);
-    var tagName = ((position === 'before' || position === 'after') ?
-     element.parentNode : element).tagName.toUpperCase();
-
-    var childNodes = getContentFromAnonymousElement(tagName, content.stripScripts());
-
-    if (position === 'top' || position === 'after') childNodes.reverse();
-
-    for (var i = 0, node; node = childNodes[i]; i++)
-      method(element, node);
-
-    content.evalScripts.bind(content).defer();
-  }
-
-  function insert(element, insertions) {
-    element = $(element);
-
-    if (isContent(insertions))
-      insertions = { bottom: insertions };
-
-    for (var position in insertions)
-      insertContentAt(element, insertions[position], position);
-
-    return element;
-  }
-
-  function wrap(element, wrapper, attributes) {
-    element = $(element);
-
-    if (Object.isElement(wrapper)) {
-      $(wrapper).writeAttribute(attributes || {});
-    } else if (Object.isString(wrapper)) {
-      wrapper = new Element(wrapper, attributes);
-    } else {
-      wrapper = new Element('div', wrapper);
-    }
-
-    if (element.parentNode)
-      element.parentNode.replaceChild(wrapper, element);
-
-    wrapper.appendChild(element);
-
-    return wrapper;
-  }
-
-  function cleanWhitespace(element) {
-    element = $(element);
-    var node = element.firstChild;
-
-    while (node) {
-      var nextNode = node.nextSibling;
-      if (node.nodeType === Node.TEXT_NODE && !/\S/.test(node.nodeValue))
-        element.removeChild(node);
-      node = nextNode;
-    }
-    return element;
-  }
-
-  function empty(element) {
-    return $(element).innerHTML.blank();
-  }
-
-  function getContentFromAnonymousElement(tagName, html, force) {
-    var t = INSERTION_TRANSLATIONS.tags[tagName], div = DIV;
-
-    var workaround = !!t;
-    if (!workaround && force) {
-      workaround = true;
-      t = ['', '', 0];
-    }
-
-    if (workaround) {
-      div.innerHTML = '&#160;' + t[0] + html + t[1];
-      div.removeChild(div.firstChild);
-      for (var i = t[2]; i--; )
-        div = div.firstChild;
-    } else {
-      div.innerHTML = html;
-    }
-
-    return $A(div.childNodes);
-  }
-
-  function clone(element, deep) {
-    if (!(element = $(element))) return;
-    var clone = element.cloneNode(deep);
-    if (!HAS_UNIQUE_ID_PROPERTY) {
-      clone._prototypeUID = UNDEFINED;
-      if (deep) {
-        var descendants = Element.select(clone, '*'),
-         i = descendants.length;
-        while (i--)
-          descendants[i]._prototypeUID = UNDEFINED;
-      }
-    }
-    return Element.extend(clone);
-  }
-
-  function purgeElement(element) {
-    var uid = getUniqueElementID(element);
-    if (uid) {
-      Element.stopObserving(element);
-      if (!HAS_UNIQUE_ID_PROPERTY)
-        element._prototypeUID = UNDEFINED;
-      delete Element.Storage[uid];
-    }
-  }
-
-  function purgeCollection(elements) {
-    var i = elements.length;
-    while (i--)
-      purgeElement(elements[i]);
-  }
-
-  function purgeCollection_IE(elements) {
-    var i = elements.length, element, uid;
-    while (i--) {
-      element = elements[i];
-      uid = getUniqueElementID(element);
-      delete Element.Storage[uid];
-      delete Event.cache[uid];
-    }
-  }
-
-  if (HAS_UNIQUE_ID_PROPERTY) {
-    purgeCollection = purgeCollection_IE;
-  }
-
-
-  function purge(element) {
-    if (!(element = $(element))) return;
-    purgeElement(element);
-
-    var descendants = element.getElementsByTagName('*'),
-     i = descendants.length;
-
-    while (i--) purgeElement(descendants[i]);
-
-    return null;
-  }
-
-  Object.extend(methods, {
-    remove:  remove,
-    update:  update,
-    replace: replace,
-    insert:  insert,
-    wrap:    wrap,
-    cleanWhitespace: cleanWhitespace,
-    empty:   empty,
-    clone:   clone,
-    purge:   purge
-  });
-
-
-
-  function recursivelyCollect(element, property, maximumLength) {
-    element = $(element);
-    maximumLength = maximumLength || -1;
-    var elements = [];
-
-    while (element = element[property]) {
-      if (element.nodeType === Node.ELEMENT_NODE)
-        elements.push(Element.extend(element));
-
-      if (elements.length === maximumLength) break;
-    }
-
-    return elements;
-  }
-
-
-  function ancestors(element) {
-    return recursivelyCollect(element, 'parentNode');
-  }
-
-  function descendants(element) {
-    return Element.select(element, '*');
-  }
-
-  function firstDescendant(element) {
-    element = $(element).firstChild;
-    while (element && element.nodeType !== Node.ELEMENT_NODE)
-      element = element.nextSibling;
-
-    return $(element);
-  }
-
-  function immediateDescendants(element) {
-    var results = [], child = $(element).firstChild;
-
-    while (child) {
-      if (child.nodeType === Node.ELEMENT_NODE)
-        results.push(Element.extend(child));
-
-      child = child.nextSibling;
-    }
-
-    return results;
-  }
-
-  function previousSiblings(element) {
-    return recursivelyCollect(element, 'previousSibling');
-  }
-
-  function nextSiblings(element) {
-    return recursivelyCollect(element, 'nextSibling');
-  }
-
-  function siblings(element) {
-    element = $(element);
-    var previous = previousSiblings(element),
-     next = nextSiblings(element);
-    return previous.reverse().concat(next);
-  }
-
-  function match(element, selector) {
-    element = $(element);
-
-    if (Object.isString(selector))
-      return Prototype.Selector.match(element, selector);
-
-    return selector.match(element);
-  }
-
-
-  function _recursivelyFind(element, property, expression, index) {
-    element = $(element), expression = expression || 0, index = index || 0;
-    if (Object.isNumber(expression)) {
-      index = expression, expression = null;
-    }
-
-    while (element = element[property]) {
-      if (element.nodeType !== 1) continue;
-      if (expression && !Prototype.Selector.match(element, expression))
-        continue;
-      if (--index >= 0) continue;
-
-      return Element.extend(element);
-    }
-  }
-
-
-  function up(element, expression, index) {
-    element = $(element);
-
-    if (arguments.length === 1) return $(element.parentNode);
-    return _recursivelyFind(element, 'parentNode', expression, index);
-  }
-
-  function down(element, expression, index) {
-    if (arguments.length === 1) return firstDescendant(element);
-    element = $(element), expression = expression || 0, index = index || 0;
-
-    if (Object.isNumber(expression))
-      index = expression, expression = '*';
-
-    var node = Prototype.Selector.select(expression, element)[index];
-    return Element.extend(node);
-  }
-
-  function previous(element, expression, index) {
-    return _recursivelyFind(element, 'previousSibling', expression, index);
-  }
-
-  function next(element, expression, index) {
-    return _recursivelyFind(element, 'nextSibling', expression, index);
-  }
-
-  function select(element) {
-    element = $(element);
-    var expressions = SLICE.call(arguments, 1).join(', ');
-    return Prototype.Selector.select(expressions, element);
-  }
-
-  function adjacent(element) {
-    element = $(element);
-    var expressions = SLICE.call(arguments, 1).join(', ');
-    var siblings = Element.siblings(element), results = [];
-    for (var i = 0, sibling; sibling = siblings[i]; i++) {
-      if (Prototype.Selector.match(sibling, expressions))
-        results.push(sibling);
-    }
-
-    return results;
-  }
-
-  function descendantOf_DOM(element, ancestor) {
-    element = $(element), ancestor = $(ancestor);
-    if (!element || !ancestor) return false;
-    while (element = element.parentNode)
-      if (element === ancestor) return true;
-    return false;
-  }
-
-  function descendantOf_contains(element, ancestor) {
-    element = $(element), ancestor = $(ancestor);
-    if (!element || !ancestor) return false;
-    if (!ancestor.contains) return descendantOf_DOM(element, ancestor);
-    return ancestor.contains(element) && ancestor !== element;
-  }
-
-  function descendantOf_compareDocumentPosition(element, ancestor) {
-    element = $(element), ancestor = $(ancestor);
-    if (!element || !ancestor) return false;
-    return (element.compareDocumentPosition(ancestor) & 8) === 8;
-  }
-
-  var descendantOf;
-  if (DIV.compareDocumentPosition) {
-    descendantOf = descendantOf_compareDocumentPosition;
-  } else if (DIV.contains) {
-    descendantOf = descendantOf_contains;
-  } else {
-    descendantOf = descendantOf_DOM;
-  }
-
-
-  Object.extend(methods, {
-    recursivelyCollect:   recursivelyCollect,
-    ancestors:            ancestors,
-    descendants:          descendants,
-    firstDescendant:      firstDescendant,
-    immediateDescendants: immediateDescendants,
-    previousSiblings:     previousSiblings,
-    nextSiblings:         nextSiblings,
-    siblings:             siblings,
-    match:                match,
-    up:                   up,
-    down:                 down,
-    previous:             previous,
-    next:                 next,
-    select:               select,
-    adjacent:             adjacent,
-    descendantOf:         descendantOf,
-
-    getElementsBySelector: select,
-
-    childElements:         immediateDescendants
-  });
-
-
-  var idCounter = 1;
-  function identify(element) {
-    element = $(element);
-    var id = Element.readAttribute(element, 'id');
-    if (id) return id;
-
-    do { id = 'anonymous_element_' + idCounter++ } while ($(id));
-
-    Element.writeAttribute(element, 'id', id);
-    return id;
-  }
-
-
-  function readAttribute(element, name) {
-    return $(element).getAttribute(name);
-  }
-
-  function readAttribute_IE(element, name) {
-    element = $(element);
-
-    var table = ATTRIBUTE_TRANSLATIONS.read;
-    if (table.values[name])
-      return table.values[name](element, name);
-
-    if (table.names[name]) name = table.names[name];
-
-    if (name.include(':')) {
-      if (!element.attributes || !element.attributes[name]) return null;
-      return element.attributes[name].value;
-    }
-
-    return element.getAttribute(name);
-  }
-
-  function readAttribute_Opera(element, name) {
-    if (name === 'title') return element.title;
-    return element.getAttribute(name);
-  }
-
-  var PROBLEMATIC_ATTRIBUTE_READING = (function() {
-    DIV.setAttribute('onclick', []);
-    var value = DIV.getAttribute('onclick');
-    var isFunction = Object.isArray(value);
-    DIV.removeAttribute('onclick');
-    return isFunction;
-  })();
-
-  if (PROBLEMATIC_ATTRIBUTE_READING) {
-    readAttribute = readAttribute_IE;
-  } else if (Prototype.Browser.Opera) {
-    readAttribute = readAttribute_Opera;
-  }
-
-
-  function writeAttribute(element, name, value) {
-    element = $(element);
-    var attributes = {}, table = ATTRIBUTE_TRANSLATIONS.write;
-
-    if (typeof name === 'object') {
-      attributes = name;
-    } else {
-      attributes[name] = Object.isUndefined(value) ? true : value;
-    }
-
-    for (var attr in attributes) {
-      name = table.names[attr] || attr;
-      value = attributes[attr];
-      if (table.values[attr]) {
-        value = table.values[attr](element, value);
-        if (Object.isUndefined(value)) continue;
-      }
-      if (value === false || value === null)
-        element.removeAttribute(name);
-      else if (value === true)
-        element.setAttribute(name, name);
-      else element.setAttribute(name, value);
-    }
-
-    return element;
-  }
-
-  var PROBLEMATIC_HAS_ATTRIBUTE_WITH_CHECKBOXES = (function () {
-    if (!HAS_EXTENDED_CREATE_ELEMENT_SYNTAX) {
-      return false;
-    }
-    var checkbox = document.createElement('<input type="checkbox">');
-    checkbox.checked = true;
-    var node = checkbox.getAttributeNode('checked');
-    return !node || !node.specified;
-  })();
-
-  function hasAttribute(element, attribute) {
-    attribute = ATTRIBUTE_TRANSLATIONS.has[attribute] || attribute;
-    var node = $(element).getAttributeNode(attribute);
-    return !!(node && node.specified);
-  }
-
-  function hasAttribute_IE(element, attribute) {
-    if (attribute === 'checked') {
-      return element.checked;
-    }
-    return hasAttribute(element, attribute);
-  }
-
-  GLOBAL.Element.Methods.Simulated.hasAttribute =
-   PROBLEMATIC_HAS_ATTRIBUTE_WITH_CHECKBOXES ?
-   hasAttribute_IE : hasAttribute;
-
-  function classNames(element) {
-    return new Element.ClassNames(element);
-  }
-
-  var regExpCache = {};
-  function getRegExpForClassName(className) {
-    if (regExpCache[className]) return regExpCache[className];
-
-    var re = new RegExp("(^|\\s+)" + className + "(\\s+|$)");
-    regExpCache[className] = re;
-    return re;
-  }
-
-  function hasClassName(element, className) {
-    if (!(element = $(element))) return;
-
-    var elementClassName = element.className;
-
-    if (elementClassName.length === 0) return false;
-    if (elementClassName === className) return true;
-
-    return getRegExpForClassName(className).test(elementClassName);
-  }
-
-  function addClassName(element, className) {
-    if (!(element = $(element))) return;
-
-    if (!hasClassName(element, className))
-      element.className += (element.className ? ' ' : '') + className;
-
-    return element;
-  }
-
-  function removeClassName(element, className) {
-    if (!(element = $(element))) return;
-
-    element.className = element.className.replace(
-     getRegExpForClassName(className), ' ').strip();
-
-    return element;
-  }
-
-  function toggleClassName(element, className, bool) {
-    if (!(element = $(element))) return;
-
-    if (Object.isUndefined(bool))
-      bool = !hasClassName(element, className);
-
-    var method = Element[bool ? 'addClassName' : 'removeClassName'];
-    return method(element, className);
-  }
-
-  var ATTRIBUTE_TRANSLATIONS = {};
-
-  var classProp = 'className', forProp = 'for';
-
-  DIV.setAttribute(classProp, 'x');
-  if (DIV.className !== 'x') {
-    DIV.setAttribute('class', 'x');
-    if (DIV.className === 'x')
-      classProp = 'class';
-  }
-
-  var LABEL = document.createElement('label');
-  LABEL.setAttribute(forProp, 'x');
-  if (LABEL.htmlFor !== 'x') {
-    LABEL.setAttribute('htmlFor', 'x');
-    if (LABEL.htmlFor === 'x')
-      forProp = 'htmlFor';
-  }
-  LABEL = null;
-
-  function _getAttr(element, attribute) {
-    return element.getAttribute(attribute);
-  }
-
-  function _getAttr2(element, attribute) {
-    return element.getAttribute(attribute, 2);
-  }
-
-  function _getAttrNode(element, attribute) {
-    var node = element.getAttributeNode(attribute);
-    return node ? node.value : '';
-  }
-
-  function _getFlag(element, attribute) {
-    return $(element).hasAttribute(attribute) ? attribute : null;
-  }
-
-  DIV.onclick = Prototype.emptyFunction;
-  var onclickValue = DIV.getAttribute('onclick');
-
-  var _getEv;
-
-  if (String(onclickValue).indexOf('{') > -1) {
-    _getEv = function(element, attribute) {
-      var value = element.getAttribute(attribute);
-      if (!value) return null;
-      value = value.toString();
-      value = value.split('{')[1];
-      value = value.split('}')[0];
-      return value.strip();
-    };
-  }
-  else if (onclickValue === '') {
-    _getEv = function(element, attribute) {
-      var value = element.getAttribute(attribute);
-      if (!value) return null;
-      return value.strip();
-    };
-  }
-
-  ATTRIBUTE_TRANSLATIONS.read = {
-    names: {
-      'class':     classProp,
-      'className': classProp,
-      'for':       forProp,
-      'htmlFor':   forProp
-    },
-
-    values: {
-      style: function(element) {
-        return element.style.cssText.toLowerCase();
-      },
-      title: function(element) {
-        return element.title;
-      }
-    }
-  };
-
-  ATTRIBUTE_TRANSLATIONS.write = {
-    names: {
-      className:   'class',
-      htmlFor:     'for',
-      cellpadding: 'cellPadding',
-      cellspacing: 'cellSpacing'
-    },
-
-    values: {
-      checked: function(element, value) {
-        value = !!value;
-        element.checked = value;
-        return value ? 'checked' : null;
-      },
-
-      style: function(element, value) {
-        element.style.cssText = value ? value : '';
-      }
-    }
-  };
-
-  ATTRIBUTE_TRANSLATIONS.has = { names: {} };
-
-  Object.extend(ATTRIBUTE_TRANSLATIONS.write.names,
-   ATTRIBUTE_TRANSLATIONS.read.names);
-
-  var CAMEL_CASED_ATTRIBUTE_NAMES = $w('colSpan rowSpan vAlign dateTime ' +
-   'accessKey tabIndex encType maxLength readOnly longDesc frameBorder');
-
-  for (var i = 0, attr; attr = CAMEL_CASED_ATTRIBUTE_NAMES[i]; i++) {
-    ATTRIBUTE_TRANSLATIONS.write.names[attr.toLowerCase()] = attr;
-    ATTRIBUTE_TRANSLATIONS.has.names[attr.toLowerCase()]   = attr;
-  }
-
-  Object.extend(ATTRIBUTE_TRANSLATIONS.read.values, {
-    href:        _getAttr2,
-    src:         _getAttr2,
-    type:        _getAttr,
-    action:      _getAttrNode,
-    disabled:    _getFlag,
-    checked:     _getFlag,
-    readonly:    _getFlag,
-    multiple:    _getFlag,
-    onload:      _getEv,
-    onunload:    _getEv,
-    onclick:     _getEv,
-    ondblclick:  _getEv,
-    onmousedown: _getEv,
-    onmouseup:   _getEv,
-    onmouseover: _getEv,
-    onmousemove: _getEv,
-    onmouseout:  _getEv,
-    onfocus:     _getEv,
-    onblur:      _getEv,
-    onkeypress:  _getEv,
-    onkeydown:   _getEv,
-    onkeyup:     _getEv,
-    onsubmit:    _getEv,
-    onreset:     _getEv,
-    onselect:    _getEv,
-    onchange:    _getEv
-  });
-
-
-  Object.extend(methods, {
-    identify:        identify,
-    readAttribute:   readAttribute,
-    writeAttribute:  writeAttribute,
-    classNames:      classNames,
-    hasClassName:    hasClassName,
-    addClassName:    addClassName,
-    removeClassName: removeClassName,
-    toggleClassName: toggleClassName
-  });
-
-
-  function normalizeStyleName(style) {
-    if (style === 'float' || style === 'styleFloat')
-      return 'cssFloat';
-    return style.camelize();
-  }
-
-  function normalizeStyleName_IE(style) {
-    if (style === 'float' || style === 'cssFloat')
-      return 'styleFloat';
-    return style.camelize();
-  }
-
-  function setStyle(element, styles) {
-    element = $(element);
-    var elementStyle = element.style, match;
-
-    if (Object.isString(styles)) {
-      elementStyle.cssText += ';' + styles;
-      if (styles.include('opacity')) {
-        var opacity = styles.match(/opacity:\s*(\d?\.?\d*)/)[1];
-        Element.setOpacity(element, opacity);
-      }
-      return element;
-    }
-
-    for (var property in styles) {
-      if (property === 'opacity') {
-        Element.setOpacity(element, styles[property]);
-      } else {
-        var value = styles[property];
-        if (property === 'float' || property === 'cssFloat') {
-          property = Object.isUndefined(elementStyle.styleFloat) ?
-           'cssFloat' : 'styleFloat';
-        }
-        elementStyle[property] = value;
-      }
-    }
-
-    return element;
-  }
-
-
-  function getStyle(element, style) {
-    element = $(element);
-    style = normalizeStyleName(style);
-
-    var value = element.style[style];
-    if (!value || value === 'auto') {
-      var css = document.defaultView.getComputedStyle(element, null);
-      value = css ? css[style] : null;
-    }
-
-    if (style === 'opacity') return value ? parseFloat(value) : 1.0;
-    return value === 'auto' ? null : value;
-  }
-
-  function getStyle_Opera(element, style) {
-    switch (style) {
-      case 'height': case 'width':
-        if (!Element.visible(element)) return null;
-
-        var dim = parseInt(getStyle(element, style), 10);
-
-        if (dim !== element['offset' + style.capitalize()])
-          return dim + 'px';
-
-        return Element.measure(element, style);
-
-      default: return getStyle(element, style);
-    }
-  }
-
-  function getStyle_IE(element, style) {
-    element = $(element);
-    style = normalizeStyleName_IE(style);
-
-    var value = element.style[style];
-    if (!value && element.currentStyle) {
-      value = element.currentStyle[style];
-    }
-
-    if (style === 'opacity') {
-      if (!STANDARD_CSS_OPACITY_SUPPORTED)
-        return getOpacity_IE(element);
-      else return value ? parseFloat(value) : 1.0;
-    }
-
-    if (value === 'auto') {
-      if ((style === 'width' || style === 'height') && Element.visible(element))
-        return Element.measure(element, style) + 'px';
-      return null;
-    }
-
-    return value;
-  }
-
-  function stripAlphaFromFilter_IE(filter) {
-    return (filter || '').replace(/alpha\([^\)]*\)/gi, '');
-  }
-
-  function hasLayout_IE(element) {
-    if (!element.currentStyle || !element.currentStyle.hasLayout)
-      element.style.zoom = 1;
-    return element;
-  }
-
-  var STANDARD_CSS_OPACITY_SUPPORTED = (function() {
-    DIV.style.cssText = "opacity:.55";
-    return /^0.55/.test(DIV.style.opacity);
-  })();
-
-  function setOpacity(element, value) {
-    element = $(element);
-    if (value == 1 || value === '') value = '';
-    else if (value < 0.00001) value = 0;
-    element.style.opacity = value;
-    return element;
-  }
-
-  function setOpacity_IE(element, value) {
-    if (STANDARD_CSS_OPACITY_SUPPORTED)
-      return setOpacity(element, value);
-
-    element = hasLayout_IE($(element));
-    var filter = Element.getStyle(element, 'filter'),
-     style = element.style;
-
-    if (value == 1 || value === '') {
-      filter = stripAlphaFromFilter_IE(filter);
-      if (filter) style.filter = filter;
-      else style.removeAttribute('filter');
-      return element;
-    }
-
-    if (value < 0.00001) value = 0;
-
-    style.filter = stripAlphaFromFilter_IE(filter) +
-     ' alpha(opacity=' + (value * 100) + ')';
-
-    return element;
-  }
-
-
-  function getOpacity(element) {
-    return Element.getStyle(element, 'opacity');
-  }
-
-  function getOpacity_IE(element) {
-    if (STANDARD_CSS_OPACITY_SUPPORTED)
-      return getOpacity(element);
-
-    var filter = Element.getStyle(element, 'filter');
-    if (filter.length === 0) return 1.0;
-    var match = (filter || '').match(/alpha\(opacity=(.*)\)/i);
-    if (match && match[1]) return parseFloat(match[1]) / 100;
-    return 1.0;
-  }
-
-
-  Object.extend(methods, {
-    setStyle:   setStyle,
-    getStyle:   getStyle,
-    setOpacity: setOpacity,
-    getOpacity: getOpacity
-  });
-
-  if ('styleFloat' in DIV.style) {
-    methods.getStyle = getStyle_IE;
-    methods.setOpacity = setOpacity_IE;
-    methods.getOpacity = getOpacity_IE;
-  }
-
-  var UID = 0;
-
-  GLOBAL.Element.Storage = { UID: 1 };
-
-  function getUniqueElementID(element) {
-    if (element === window) return 0;
-
-    if (typeof element._prototypeUID === 'undefined')
-      element._prototypeUID = Element.Storage.UID++;
-    return element._prototypeUID;
-  }
-
-  function getUniqueElementID_IE(element) {
-    if (element === window) return 0;
-    if (element == document) return 1;
-    return element.uniqueID;
-  }
-
-  var HAS_UNIQUE_ID_PROPERTY = ('uniqueID' in DIV);
-  if (HAS_UNIQUE_ID_PROPERTY)
-    getUniqueElementID = getUniqueElementID_IE;
-
-  function getStorage(element) {
-    if (!(element = $(element))) return;
-
-    var uid = getUniqueElementID(element);
-
-    if (!Element.Storage[uid])
-      Element.Storage[uid] = $H();
-
-    return Element.Storage[uid];
-  }
-
-  function store(element, key, value) {
-    if (!(element = $(element))) return;
-    var storage = getStorage(element);
-    if (arguments.length === 2) {
-      storage.update(key);
-    } else {
-      storage.set(key, value);
-    }
-    return element;
-  }
-
-  function retrieve(element, key, defaultValue) {
-    if (!(element = $(element))) return;
-    var storage = getStorage(element), value = storage.get(key);
-
-    if (Object.isUndefined(value)) {
-      storage.set(key, defaultValue);
-      value = defaultValue;
-    }
-
-    return value;
-  }
-
-
-  Object.extend(methods, {
-    getStorage: getStorage,
-    store:      store,
-    retrieve:   retrieve
-  });
-
-
-  var Methods = {}, ByTag = Element.Methods.ByTag,
-   F = Prototype.BrowserFeatures;
-
-  if (!F.ElementExtensions && ('__proto__' in DIV)) {
-    GLOBAL.HTMLElement = {};
-    GLOBAL.HTMLElement.prototype = DIV['__proto__'];
-    F.ElementExtensions = true;
-  }
-
-  function checkElementPrototypeDeficiency(tagName) {
-    if (typeof window.Element === 'undefined') return false;
-    if (!HAS_EXTENDED_CREATE_ELEMENT_SYNTAX) return false;
-    var proto = window.Element.prototype;
-    if (proto) {
-      var id = '_' + (Math.random() + '').slice(2),
-       el = document.createElement(tagName);
-      proto[id] = 'x';
-      var isBuggy = (el[id] !== 'x');
-      delete proto[id];
-      el = null;
-      return isBuggy;
-    }
-
-    return false;
-  }
-
-  var HTMLOBJECTELEMENT_PROTOTYPE_BUGGY =
-   checkElementPrototypeDeficiency('object');
-
-  function extendElementWith(element, methods) {
-    for (var property in methods) {
-      var value = methods[property];
-      if (Object.isFunction(value) && !(property in element))
-        element[property] = value.methodize();
-    }
-  }
-
-  var EXTENDED = {};
-  function elementIsExtended(element) {
-    var uid = getUniqueElementID(element);
-    return (uid in EXTENDED);
-  }
-
-  function extend(element) {
-    if (!element || elementIsExtended(element)) return element;
-    if (element.nodeType !== Node.ELEMENT_NODE || element == window)
-      return element;
-
-    var methods = Object.clone(Methods),
-     tagName = element.tagName.toUpperCase();
-
-    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
-
-    extendElementWith(element, methods);
-    EXTENDED[getUniqueElementID(element)] = true;
-    return element;
-  }
-
-  function extend_IE8(element) {
-    if (!element || elementIsExtended(element)) return element;
-
-    var t = element.tagName;
-    if (t && (/^(?:object|applet|embed)$/i.test(t))) {
-      extendElementWith(element, Element.Methods);
-      extendElementWith(element, Element.Methods.Simulated);
-      extendElementWith(element, Element.Methods.ByTag[t.toUpperCase()]);
-    }
-
-    return element;
-  }
-
-  if (F.SpecificElementExtensions) {
-    extend = HTMLOBJECTELEMENT_PROTOTYPE_BUGGY ? extend_IE8 : Prototype.K;
-  }
-
-  function addMethodsToTagName(tagName, methods) {
-    tagName = tagName.toUpperCase();
-    if (!ByTag[tagName]) ByTag[tagName] = {};
-    Object.extend(ByTag[tagName], methods);
-  }
-
-  function mergeMethods(destination, methods, onlyIfAbsent) {
-    if (Object.isUndefined(onlyIfAbsent)) onlyIfAbsent = false;
-    for (var property in methods) {
-      var value = methods[property];
-      if (!Object.isFunction(value)) continue;
-      if (!onlyIfAbsent || !(property in destination))
-        destination[property] = value.methodize();
-    }
-  }
-
-  function findDOMClass(tagName) {
-    var klass;
-    var trans = {
-      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
-      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
-      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
-      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
-      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
-      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
-      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
-      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
-      "FrameSet", "IFRAME": "IFrame"
-    };
-    if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName.capitalize() + 'Element';
-    if (window[klass]) return window[klass];
-
-    var element = document.createElement(tagName),
-     proto = element['__proto__'] || element.constructor.prototype;
-
-    element = null;
-    return proto;
-  }
-
-  function addMethods(methods) {
-    if (arguments.length === 0) addFormMethods();
-
-    if (arguments.length === 2) {
-      var tagName = methods;
-      methods = arguments[1];
-    }
-
-    if (!tagName) {
-      Object.extend(Element.Methods, methods || {});
-    } else {
-      if (Object.isArray(tagName)) {
-        for (var i = 0, tag; tag = tagName[i]; i++)
-          addMethodsToTagName(tag, methods);
-      } else {
-        addMethodsToTagName(tagName, methods);
-      }
-    }
-
-    var ELEMENT_PROTOTYPE = window.HTMLElement ? HTMLElement.prototype :
-     Element.prototype;
-
-    if (F.ElementExtensions) {
-      mergeMethods(ELEMENT_PROTOTYPE, Element.Methods);
-      mergeMethods(ELEMENT_PROTOTYPE, Element.Methods.Simulated, true);
-    }
-
-    if (F.SpecificElementExtensions) {
-      for (var tag in Element.Methods.ByTag) {
-        var klass = findDOMClass(tag);
-        if (Object.isUndefined(klass)) continue;
-        mergeMethods(klass.prototype, ByTag[tag]);
-      }
-    }
-
-    Object.extend(Element, Element.Methods);
-    Object.extend(Element, Element.Methods.Simulated);
-    delete Element.ByTag;
-    delete Element.Simulated;
-
-    Element.extend.refresh();
-
-    ELEMENT_CACHE = {};
-  }
-
-  Object.extend(GLOBAL.Element, {
-    extend:     extend,
-    addMethods: addMethods
-  });
-
-  if (extend === Prototype.K) {
-    GLOBAL.Element.extend.refresh = Prototype.emptyFunction;
-  } else {
-    GLOBAL.Element.extend.refresh = function() {
-      if (Prototype.BrowserFeatures.ElementExtensions) return;
-      Object.extend(Methods, Element.Methods);
-      Object.extend(Methods, Element.Methods.Simulated);
-
-      EXTENDED = {};
-    };
-  }
-
-  function addFormMethods() {
-    Object.extend(Form, Form.Methods);
-    Object.extend(Form.Element, Form.Element.Methods);
-    Object.extend(Element.Methods.ByTag, {
-      "FORM":     Object.clone(Form.Methods),
-      "INPUT":    Object.clone(Form.Element.Methods),
-      "SELECT":   Object.clone(Form.Element.Methods),
-      "TEXTAREA": Object.clone(Form.Element.Methods),
-      "BUTTON":   Object.clone(Form.Element.Methods)
-    });
-  }
-
-  Element.addMethods(methods);
-
-  function destroyCache_IE() {
-    DIV = null;
-    ELEMENT_CACHE = null;
-  }
-
-  if (window.attachEvent)
-    window.attachEvent('onunload', destroyCache_IE);
-
-})(this);
-(function() {
-
-  function toDecimal(pctString) {
-    var match = pctString.match(/^(\d+)%?$/i);
-    if (!match) return null;
-    return (Number(match[1]) / 100);
-  }
-
-  function getRawStyle(element, style) {
-    element = $(element);
-
-    var value = element.style[style];
-    if (!value || value === 'auto') {
-      var css = document.defaultView.getComputedStyle(element, null);
-      value = css ? css[style] : null;
-    }
-
-    if (style === 'opacity') return value ? parseFloat(value) : 1.0;
-    return value === 'auto' ? null : value;
-  }
-
-  function getRawStyle_IE(element, style) {
-    var value = element.style[style];
-    if (!value && element.currentStyle) {
-      value = element.currentStyle[style];
-    }
-    return value;
-  }
-
-  function getContentWidth(element, context) {
-    var boxWidth = element.offsetWidth;
-
-    var bl = getPixelValue(element, 'borderLeftWidth',  context) || 0;
-    var br = getPixelValue(element, 'borderRightWidth', context) || 0;
-    var pl = getPixelValue(element, 'paddingLeft',      context) || 0;
-    var pr = getPixelValue(element, 'paddingRight',     context) || 0;
-
-    return boxWidth - bl - br - pl - pr;
-  }
-
-  if (!Object.isUndefined(document.documentElement.currentStyle) && !Prototype.Browser.Opera) {
-    getRawStyle = getRawStyle_IE;
-  }
-
-
-  function getPixelValue(value, property, context) {
-    var element = null;
-    if (Object.isElement(value)) {
-      element = value;
-      value = getRawStyle(element, property);
-    }
-
-    if (value === null || Object.isUndefined(value)) {
-      return null;
-    }
-
-    if ((/^(?:-)?\d+(\.\d+)?(px)?$/i).test(value)) {
-      return window.parseFloat(value);
-    }
-
-    var isPercentage = value.include('%'), isViewport = (context === document.viewport);
-
-    if (/\d/.test(value) && element && element.runtimeStyle && !(isPercentage && isViewport)) {
-      var style = element.style.left, rStyle = element.runtimeStyle.left;
-      element.runtimeStyle.left = element.currentStyle.left;
-      element.style.left = value || 0;
-      value = element.style.pixelLeft;
-      element.style.left = style;
-      element.runtimeStyle.left = rStyle;
-
-      return value;
-    }
-
-    if (element && isPercentage) {
-      context = context || element.parentNode;
-      var decimal = toDecimal(value), whole = null;
-
-      var isHorizontal = property.include('left') || property.include('right') ||
-       property.include('width');
-
-      var isVertical   = property.include('top') || property.include('bottom') ||
-        property.include('height');
-
-      if (context === document.viewport) {
-        if (isHorizontal) {
-          whole = document.viewport.getWidth();
-        } else if (isVertical) {
-          whole = document.viewport.getHeight();
-        }
-      } else {
-        if (isHorizontal) {
-          whole = $(context).measure('width');
-        } else if (isVertical) {
-          whole = $(context).measure('height');
-        }
-      }
-
-      return (whole === null) ? 0 : whole * decimal;
-    }
-
-    return 0;
-  }
-
-  function toCSSPixels(number) {
-    if (Object.isString(number) && number.endsWith('px'))
-      return number;
-    return number + 'px';
-  }
-
-  function isDisplayed(element) {
-    while (element && element.parentNode) {
-      var display = element.getStyle('display');
-      if (display === 'none') {
-        return false;
-      }
-      element = $(element.parentNode);
-    }
-    return true;
-  }
-
-  var hasLayout = Prototype.K;
-  if ('currentStyle' in document.documentElement) {
-    hasLayout = function(element) {
-      if (!element.currentStyle.hasLayout) {
-        element.style.zoom = 1;
-      }
-      return element;
-    };
-  }
-
-  function cssNameFor(key) {
-    if (key.include('border')) key = key + '-width';
-    return key.camelize();
-  }
-
-  Element.Layout = Class.create(Hash, {
-    initialize: function($super, element, preCompute) {
-      $super();
-      this.element = $(element);
-
-      Element.Layout.PROPERTIES.each( function(property) {
-        this._set(property, null);
-      }, this);
-
-      if (preCompute) {
-        this._preComputing = true;
-        this._begin();
-        Element.Layout.PROPERTIES.each( this._compute, this );
-        this._end();
-        this._preComputing = false;
-      }
-    },
-
-    _set: function(property, value) {
-      return Hash.prototype.set.call(this, property, value);
-    },
-
-    set: function(property, value) {
-      throw "Properties of Element.Layout are read-only.";
-    },
-
-    get: function($super, property) {
-      var value = $super(property);
-      return value === null ? this._compute(property) : value;
-    },
-
-    _begin: function() {
-      if (this._isPrepared()) return;
-
-      var element = this.element;
-      if (isDisplayed(element)) {
-        this._setPrepared(true);
-        return;
-      }
-
-
-      var originalStyles = {
-        position:   element.style.position   || '',
-        width:      element.style.width      || '',
-        visibility: element.style.visibility || '',
-        display:    element.style.display    || ''
-      };
-
-      element.store('prototype_original_styles', originalStyles);
-
-      var position = getRawStyle(element, 'position'), width = element.offsetWidth;
-
-      if (width === 0 || width === null) {
-        element.style.display = 'block';
-        width = element.offsetWidth;
-      }
-
-      var context = (position === 'fixed') ? document.viewport :
-       element.parentNode;
-
-      var tempStyles = {
-        visibility: 'hidden',
-        display:    'block'
-      };
-
-      if (position !== 'fixed') tempStyles.position = 'absolute';
-
-      element.setStyle(tempStyles);
-
-      var positionedWidth = element.offsetWidth, newWidth;
-      if (width && (positionedWidth === width)) {
-        newWidth = getContentWidth(element, context);
-      } else if (position === 'absolute' || position === 'fixed') {
-        newWidth = getContentWidth(element, context);
-      } else {
-        var parent = element.parentNode, pLayout = $(parent).getLayout();
-
-        newWidth = pLayout.get('width') -
-         this.get('margin-left') -
-         this.get('border-left') -
-         this.get('padding-left') -
-         this.get('padding-right') -
-         this.get('border-right') -
-         this.get('margin-right');
-      }
-
-      element.setStyle({ width: newWidth + 'px' });
-
-      this._setPrepared(true);
-    },
-
-    _end: function() {
-      var element = this.element;
-      var originalStyles = element.retrieve('prototype_original_styles');
-      element.store('prototype_original_styles', null);
-      element.setStyle(originalStyles);
-      this._setPrepared(false);
-    },
-
-    _compute: function(property) {
-      var COMPUTATIONS = Element.Layout.COMPUTATIONS;
-      if (!(property in COMPUTATIONS)) {
-        throw "Property not found.";
-      }
-
-      return this._set(property, COMPUTATIONS[property].call(this, this.element));
-    },
-
-    _isPrepared: function() {
-      return this.element.retrieve('prototype_element_layout_prepared', false);
-    },
-
-    _setPrepared: function(bool) {
-      return this.element.store('prototype_element_layout_prepared', bool);
-    },
-
-    toObject: function() {
-      var args = $A(arguments);
-      var keys = (args.length === 0) ? Element.Layout.PROPERTIES :
-       args.join(' ').split(' ');
-      var obj = {};
-      keys.each( function(key) {
-        if (!Element.Layout.PROPERTIES.include(key)) return;
-        var value = this.get(key);
-        if (value != null) obj[key] = value;
-      }, this);
-      return obj;
-    },
-
-    toHash: function() {
-      var obj = this.toObject.apply(this, arguments);
-      return new Hash(obj);
-    },
-
-    toCSS: function() {
-      var args = $A(arguments);
-      var keys = (args.length === 0) ? Element.Layout.PROPERTIES :
-       args.join(' ').split(' ');
-      var css = {};
-
-      keys.each( function(key) {
-        if (!Element.Layout.PROPERTIES.include(key)) return;
-        if (Element.Layout.COMPOSITE_PROPERTIES.include(key)) return;
-
-        var value = this.get(key);
-        if (value != null) css[cssNameFor(key)] = value + 'px';
-      }, this);
-      return css;
-    },
-
-    inspect: function() {
-      return "#<Element.Layout>";
-    }
-  });
-
-  Object.extend(Element.Layout, {
-    PROPERTIES: $w('height width top left right bottom border-left border-right border-top border-bottom padding-left padding-right padding-top padding-bottom margin-top margin-bottom margin-left margin-right padding-box-width padding-box-height border-box-width border-box-height margin-box-width margin-box-height'),
-
-    COMPOSITE_PROPERTIES: $w('padding-box-width padding-box-height margin-box-width margin-box-height border-box-width border-box-height'),
-
-    COMPUTATIONS: {
-      'height': function(element) {
-        if (!this._preComputing) this._begin();
-
-        var bHeight = this.get('border-box-height');
-        if (bHeight <= 0) {
-          if (!this._preComputing) this._end();
-          return 0;
-        }
-
-        var bTop = this.get('border-top'),
-         bBottom = this.get('border-bottom');
-
-        var pTop = this.get('padding-top'),
-         pBottom = this.get('padding-bottom');
-
-        if (!this._preComputing) this._end();
-
-        return bHeight - bTop - bBottom - pTop - pBottom;
-      },
-
-      'width': function(element) {
-        if (!this._preComputing) this._begin();
-
-        var bWidth = this.get('border-box-width');
-        if (bWidth <= 0) {
-          if (!this._preComputing) this._end();
-          return 0;
-        }
-
-        var bLeft = this.get('border-left'),
-         bRight = this.get('border-right');
-
-        var pLeft = this.get('padding-left'),
-         pRight = this.get('padding-right');
-
-        if (!this._preComputing) this._end();
-        return bWidth - bLeft - bRight - pLeft - pRight;
-      },
-
-      'padding-box-height': function(element) {
-        var height = this.get('height'),
-         pTop = this.get('padding-top'),
-         pBottom = this.get('padding-bottom');
-
-        return height + pTop + pBottom;
-      },
-
-      'padding-box-width': function(element) {
-        var width = this.get('width'),
-         pLeft = this.get('padding-left'),
-         pRight = this.get('padding-right');
-
-        return width + pLeft + pRight;
-      },
-
-      'border-box-height': function(element) {
-        if (!this._preComputing) this._begin();
-        var height = element.offsetHeight;
-        if (!this._preComputing) this._end();
-        return height;
-      },
-
-      'border-box-width': function(element) {
-        if (!this._preComputing) this._begin();
-        var width = element.offsetWidth;
-        if (!this._preComputing) this._end();
-        return width;
-      },
-
-      'margin-box-height': function(element) {
-        var bHeight = this.get('border-box-height'),
-         mTop = this.get('margin-top'),
-         mBottom = this.get('margin-bottom');
-
-        if (bHeight <= 0) return 0;
-
-        return bHeight + mTop + mBottom;
-      },
-
-      'margin-box-width': function(element) {
-        var bWidth = this.get('border-box-width'),
-         mLeft = this.get('margin-left'),
-         mRight = this.get('margin-right');
-
-        if (bWidth <= 0) return 0;
-
-        return bWidth + mLeft + mRight;
-      },
-
-      'top': function(element) {
-        var offset = element.positionedOffset();
-        return offset.top;
-      },
-
-      'bottom': function(element) {
-        var offset = element.positionedOffset(),
-         parent = element.getOffsetParent(),
-         pHeight = parent.measure('height');
-
-        var mHeight = this.get('border-box-height');
-
-        return pHeight - mHeight - offset.top;
-      },
-
-      'left': function(element) {
-        var offset = element.positionedOffset();
-        return offset.left;
-      },
-
-      'right': function(element) {
-        var offset = element.positionedOffset(),
-         parent = element.getOffsetParent(),
-         pWidth = parent.measure('width');
-
-        var mWidth = this.get('border-box-width');
-
-        return pWidth - mWidth - offset.left;
-      },
-
-      'padding-top': function(element) {
-        return getPixelValue(element, 'paddingTop');
-      },
-
-      'padding-bottom': function(element) {
-        return getPixelValue(element, 'paddingBottom');
-      },
-
-      'padding-left': function(element) {
-        return getPixelValue(element, 'paddingLeft');
-      },
-
-      'padding-right': function(element) {
-        return getPixelValue(element, 'paddingRight');
-      },
-
-      'border-top': function(element) {
-        return getPixelValue(element, 'borderTopWidth');
-      },
-
-      'border-bottom': function(element) {
-        return getPixelValue(element, 'borderBottomWidth');
-      },
-
-      'border-left': function(element) {
-        return getPixelValue(element, 'borderLeftWidth');
-      },
-
-      'border-right': function(element) {
-        return getPixelValue(element, 'borderRightWidth');
-      },
-
-      'margin-top': function(element) {
-        return getPixelValue(element, 'marginTop');
-      },
-
-      'margin-bottom': function(element) {
-        return getPixelValue(element, 'marginBottom');
-      },
-
-      'margin-left': function(element) {
-        return getPixelValue(element, 'marginLeft');
-      },
-
-      'margin-right': function(element) {
-        return getPixelValue(element, 'marginRight');
-      }
-    }
-  });
-
-  if ('getBoundingClientRect' in document.documentElement) {
-    Object.extend(Element.Layout.COMPUTATIONS, {
-      'right': function(element) {
-        var parent = hasLayout(element.getOffsetParent());
-        var rect = element.getBoundingClientRect(),
-         pRect = parent.getBoundingClientRect();
-
-        return (pRect.right - rect.right).round();
-      },
-
-      'bottom': function(element) {
-        var parent = hasLayout(element.getOffsetParent());
-        var rect = element.getBoundingClientRect(),
-         pRect = parent.getBoundingClientRect();
-
-        return (pRect.bottom - rect.bottom).round();
-      }
-    });
-  }
-
-  Element.Offset = Class.create({
-    initialize: function(left, top) {
-      this.left = left.round();
-      this.top  = top.round();
-
-      this[0] = this.left;
-      this[1] = this.top;
-    },
-
-    relativeTo: function(offset) {
-      return new Element.Offset(
-        this.left - offset.left,
-        this.top  - offset.top
-      );
-    },
-
-    inspect: function() {
-      return "#<Element.Offset left: #{left} top: #{top}>".interpolate(this);
-    },
-
-    toString: function() {
-      return "[#{left}, #{top}]".interpolate(this);
-    },
-
-    toArray: function() {
-      return [this.left, this.top];
-    }
-  });
-
-  function getLayout(element, preCompute) {
-    return new Element.Layout(element, preCompute);
-  }
-
-  function measure(element, property) {
-    return $(element).getLayout().get(property);
-  }
-
-  function getHeight(element) {
-    return Element.getDimensions(element).height;
-  }
-
-  function getWidth(element) {
-    return Element.getDimensions(element).width;
-  }
-
-  function getDimensions(element) {
-    element = $(element);
-    var display = Element.getStyle(element, 'display');
-
-    if (display && display !== 'none') {
-      return { width: element.offsetWidth, height: element.offsetHeight };
-    }
-
-    var style = element.style;
-    var originalStyles = {
-      visibility: style.visibility,
-      position:   style.position,
-      display:    style.display
-    };
-
-    var newStyles = {
-      visibility: 'hidden',
-      display:    'block'
-    };
-
-    if (originalStyles.position !== 'fixed')
-      newStyles.position = 'absolute';
-
-    Element.setStyle(element, newStyles);
-
-    var dimensions = {
-      width:  element.offsetWidth,
-      height: element.offsetHeight
-    };
-
-    Element.setStyle(element, originalStyles);
-
-    return dimensions;
-  }
-
-  function getOffsetParent(element) {
-    element = $(element);
-
-    function selfOrBody(element) {
-      return isHtml(element) ? $(document.body) : $(element);
-    }
-
-    if (isDocument(element) || isDetached(element) || isBody(element) || isHtml(element))
-      return $(document.body);
-
-    var isInline = (Element.getStyle(element, 'display') === 'inline');
-    if (!isInline && element.offsetParent) return selfOrBody(element.offsetParent);
-
-    while ((element = element.parentNode) && element !== document.body) {
-      if (Element.getStyle(element, 'position') !== 'static') {
-        return selfOrBody(element);
-      }
-    }
-
-    return $(document.body);
-  }
-
-
-  function cumulativeOffset(element) {
-    element = $(element);
-    var valueT = 0, valueL = 0;
-    if (element.parentNode) {
-      do {
-        valueT += element.offsetTop  || 0;
-        valueL += element.offsetLeft || 0;
-        element = element.offsetParent;
-      } while (element);
-    }
-    return new Element.Offset(valueL, valueT);
-  }
-
-  function positionedOffset(element) {
-    element = $(element);
-
-    var layout = element.getLayout();
-
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-      if (element) {
-        if (isBody(element)) break;
-        var p = Element.getStyle(element, 'position');
-        if (p !== 'static') break;
-      }
-    } while (element);
-
-    valueL -= layout.get('margin-left');
-    valueT -= layout.get('margin-top');
-
-    return new Element.Offset(valueL, valueT);
-  }
-
-  function cumulativeScrollOffset(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      if (element === document.body) {
-        var bodyScrollNode = document.documentElement || document.body.parentNode || document.body;
-        valueT += !Object.isUndefined(window.pageYOffset) ? window.pageYOffset : bodyScrollNode.scrollTop || 0;
-        valueL += !Object.isUndefined(window.pageXOffset) ? window.pageXOffset : bodyScrollNode.scrollLeft || 0;
-        break;
-      } else {
-        valueT += element.scrollTop  || 0;
-        valueL += element.scrollLeft || 0;
-        element = element.parentNode;
-      }
-    } while (element);
-    return new Element.Offset(valueL, valueT);
-  }
-
-  function viewportOffset(forElement) {
-    var valueT = 0, valueL = 0, docBody = document.body;
-
-    forElement = $(forElement);
-    var element = forElement;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      if (element.offsetParent == docBody &&
-        Element.getStyle(element, 'position') == 'absolute') break;
-    } while (element = element.offsetParent);
-
-    element = forElement;
-    do {
-      if (element != docBody) {
-        valueT -= element.scrollTop  || 0;
-        valueL -= element.scrollLeft || 0;
-      }
-    } while (element = element.parentNode);
-    return new Element.Offset(valueL, valueT);
-  }
-
-  function absolutize(element) {
-    element = $(element);
-
-    if (Element.getStyle(element, 'position') === 'absolute') {
-      return element;
-    }
-
-    var offsetParent = getOffsetParent(element);
-    var eOffset = element.viewportOffset(),
-     pOffset = offsetParent.viewportOffset();
-
-    var offset = eOffset.relativeTo(pOffset);
-    var layout = element.getLayout();
-
-    element.store('prototype_absolutize_original_styles', {
-      position: element.getStyle('position'),
-      left:     element.getStyle('left'),
-      top:      element.getStyle('top'),
-      width:    element.getStyle('width'),
-      height:   element.getStyle('height')
-    });
-
-    element.setStyle({
-      position: 'absolute',
-      top:    offset.top + 'px',
-      left:   offset.left + 'px',
-      width:  layout.get('width') + 'px',
-      height: layout.get('height') + 'px'
-    });
-
-    return element;
-  }
-
-  function relativize(element) {
-    element = $(element);
-    if (Element.getStyle(element, 'position') === 'relative') {
-      return element;
-    }
-
-    var originalStyles =
-     element.retrieve('prototype_absolutize_original_styles');
-
-    if (originalStyles) element.setStyle(originalStyles);
-    return element;
-  }
-
-
-  function scrollTo(element) {
-    element = $(element);
-    var pos = Element.cumulativeOffset(element);
-    window.scrollTo(pos.left, pos.top);
-    return element;
-  }
-
-
-  function makePositioned(element) {
-    element = $(element);
-    var position = Element.getStyle(element, 'position'), styles = {};
-    if (position === 'static' || !position) {
-      styles.position = 'relative';
-      if (Prototype.Browser.Opera) {
-        styles.top  = 0;
-        styles.left = 0;
-      }
-      Element.setStyle(element, styles);
-      Element.store(element, 'prototype_made_positioned', true);
-    }
-    return element;
-  }
-
-  function undoPositioned(element) {
-    element = $(element);
-    var storage = Element.getStorage(element),
-     madePositioned = storage.get('prototype_made_positioned');
-
-    if (madePositioned) {
-      storage.unset('prototype_made_positioned');
-      Element.setStyle(element, {
-        position: '',
-        top:      '',
-        bottom:   '',
-        left:     '',
-        right:    ''
-      });
-    }
-    return element;
-  }
-
-  function makeClipping(element) {
-    element = $(element);
-
-    var storage = Element.getStorage(element),
-     madeClipping = storage.get('prototype_made_clipping');
-
-    if (Object.isUndefined(madeClipping)) {
-      var overflow = Element.getStyle(element, 'overflow');
-      storage.set('prototype_made_clipping', overflow);
-      if (overflow !== 'hidden')
-        element.style.overflow = 'hidden';
-    }
-
-    return element;
-  }
-
-  function undoClipping(element) {
-    element = $(element);
-    var storage = Element.getStorage(element),
-     overflow = storage.get('prototype_made_clipping');
-
-    if (!Object.isUndefined(overflow)) {
-      storage.unset('prototype_made_clipping');
-      element.style.overflow = overflow || '';
-    }
-
-    return element;
-  }
-
-  function clonePosition(element, source, options) {
-    options = Object.extend({
-      setLeft:    true,
-      setTop:     true,
-      setWidth:   true,
-      setHeight:  true,
-      offsetTop:  0,
-      offsetLeft: 0
-    }, options || {});
-
-    var docEl = document.documentElement;
-
-    source  = $(source);
-    element = $(element);
-    var p, delta, layout, styles = {};
-
-    if (options.setLeft || options.setTop) {
-      p = Element.viewportOffset(source);
-      delta = [0, 0];
-      if (Element.getStyle(element, 'position') === 'absolute') {
-        var parent = Element.getOffsetParent(element);
-        if (parent !== document.body) delta = Element.viewportOffset(parent);
-      }
-    }
-
-    function pageScrollXY() {
-      var x = 0, y = 0;
-      if (Object.isNumber(window.pageXOffset)) {
-        x = window.pageXOffset;
-        y = window.pageYOffset;
-      } else if (document.body && (document.body.scrollLeft || document.body.scrollTop)) {
-        x = document.body.scrollLeft;
-        y = document.body.scrollTop;
-      } else if (docEl && (docEl.scrollLeft || docEl.scrollTop)) {
-        x = docEl.scrollLeft;
-        y = docEl.scrollTop;
-      }
-      return { x: x, y: y };
-    }
-
-    var pageXY = pageScrollXY();
-
-
-    if (options.setWidth || options.setHeight) {
-      layout = Element.getLayout(source);
-    }
-
-    if (options.setLeft)
-      styles.left = (p[0] + pageXY.x - delta[0] + options.offsetLeft) + 'px';
-    if (options.setTop)
-      styles.top  = (p[1] + pageXY.y - delta[1] + options.offsetTop)  + 'px';
-
-    var currentLayout = element.getLayout();
-
-    if (options.setWidth) {
-      styles.width = layout.get('width')  + 'px';
-    }
-    if (options.setHeight) {
-      styles.height = layout.get('height') + 'px';
-    }
-
-    return Element.setStyle(element, styles);
-  }
-
-
-  if (Prototype.Browser.IE) {
-    getOffsetParent = getOffsetParent.wrap(
-      function(proceed, element) {
-        element = $(element);
-
-        if (isDocument(element) || isDetached(element) || isBody(element) || isHtml(element))
-          return $(document.body);
-
-        var position = element.getStyle('position');
-        if (position !== 'static') return proceed(element);
-
-        element.setStyle({ position: 'relative' });
-        var value = proceed(element);
-        element.setStyle({ position: position });
-        return value;
-      }
-    );
-
-    positionedOffset = positionedOffset.wrap(function(proceed, element) {
-      element = $(element);
-      if (!element.parentNode) return new Element.Offset(0, 0);
-      var position = element.getStyle('position');
-      if (position !== 'static') return proceed(element);
-
-      var offsetParent = element.getOffsetParent();
-      if (offsetParent && offsetParent.getStyle('position') === 'fixed')
-        hasLayout(offsetParent);
-
-      element.setStyle({ position: 'relative' });
-      var value = proceed(element);
-      element.setStyle({ position: position });
-      return value;
-    });
-  } else if (Prototype.Browser.Webkit) {
-    cumulativeOffset = function(element) {
-      element = $(element);
-      var valueT = 0, valueL = 0;
-      do {
-        valueT += element.offsetTop  || 0;
-        valueL += element.offsetLeft || 0;
-        if (element.offsetParent == document.body) {
-          if (Element.getStyle(element, 'position') == 'absolute') break;
-        }
-
-        element = element.offsetParent;
-      } while (element);
-
-      return new Element.Offset(valueL, valueT);
-    };
-  }
-
-
-  Element.addMethods({
-    getLayout:              getLayout,
-    measure:                measure,
-    getWidth:               getWidth,
-    getHeight:              getHeight,
-    getDimensions:          getDimensions,
-    getOffsetParent:        getOffsetParent,
-    cumulativeOffset:       cumulativeOffset,
-    positionedOffset:       positionedOffset,
-    cumulativeScrollOffset: cumulativeScrollOffset,
-    viewportOffset:         viewportOffset,
-    absolutize:             absolutize,
-    relativize:             relativize,
-    scrollTo:               scrollTo,
-    makePositioned:         makePositioned,
-    undoPositioned:         undoPositioned,
-    makeClipping:           makeClipping,
-    undoClipping:           undoClipping,
-    clonePosition:          clonePosition
-  });
-
-  function isBody(element) {
-    return element.nodeName.toUpperCase() === 'BODY';
-  }
-
-  function isHtml(element) {
-    return element.nodeName.toUpperCase() === 'HTML';
-  }
-
-  function isDocument(element) {
-    return element.nodeType === Node.DOCUMENT_NODE;
-  }
-
-  function isDetached(element) {
-    return element !== document.body &&
-     !Element.descendantOf(element, document.body);
-  }
-
-  if ('getBoundingClientRect' in document.documentElement) {
-    Element.addMethods({
-      viewportOffset: function(element) {
-        element = $(element);
-        if (isDetached(element)) return new Element.Offset(0, 0);
-
-        var rect = element.getBoundingClientRect(),
-         docEl = document.documentElement;
-        return new Element.Offset(rect.left - docEl.clientLeft,
-         rect.top - docEl.clientTop);
-      }
-    });
-  }
-
-
-})();
-
-(function() {
-
-  var IS_OLD_OPERA = Prototype.Browser.Opera &&
-   (window.parseFloat(window.opera.version()) < 9.5);
-  var ROOT = null;
-  function getRootElement() {
-    if (ROOT) return ROOT;
-    ROOT = IS_OLD_OPERA ? document.body : document.documentElement;
-    return ROOT;
-  }
-
-  function getDimensions() {
-    return { width: this.getWidth(), height: this.getHeight() };
-  }
-
-  function getWidth() {
-    return getRootElement().clientWidth;
-  }
-
-  function getHeight() {
-    return getRootElement().clientHeight;
-  }
-
-  function getScrollOffsets() {
-    var x = window.pageXOffset || document.documentElement.scrollLeft ||
-     document.body.scrollLeft;
-    var y = window.pageYOffset || document.documentElement.scrollTop ||
-     document.body.scrollTop;
-
-    return new Element.Offset(x, y);
-  }
-
-  document.viewport = {
-    getDimensions:    getDimensions,
-    getWidth:         getWidth,
-    getHeight:        getHeight,
-    getScrollOffsets: getScrollOffsets
-  };
-
-})();
-window.$$ = function() {
-  var expression = $A(arguments).join(', ');
-  return Prototype.Selector.select(expression, document);
-};
-
-Prototype.Selector = (function() {
-
-  function select() {
-    throw new Error('Method "Prototype.Selector.select" must be defined.');
-  }
-
-  function match() {
-    throw new Error('Method "Prototype.Selector.match" must be defined.');
-  }
-
-  function find(elements, expression, index) {
-    index = index || 0;
-    var match = Prototype.Selector.match, length = elements.length, matchIndex = 0, i;
-
-    for (i = 0; i < length; i++) {
-      if (match(elements[i], expression) && index == matchIndex++) {
-        return Element.extend(elements[i]);
-      }
-    }
-  }
-
-  function extendElements(elements) {
-    for (var i = 0, length = elements.length; i < length; i++) {
-      Element.extend(elements[i]);
-    }
-    return elements;
-  }
-
-
-  var K = Prototype.K;
-
-  return {
-    select: select,
-    match: match,
-    find: find,
-    extendElements: (Element.extend === K) ? K : extendElements,
-    extendElement: Element.extend
-  };
-})();
-Prototype._original_property = window.Sizzle;
-
-;(function () {
-  function fakeDefine(fn) {
-    Prototype._actual_sizzle = fn();
-  }
-  fakeDefine.amd = true;
-
-  if (typeof define !== 'undefined' && define.amd) {
-    Prototype._original_define = define;
-    Prototype._actual_sizzle = null;
-    window.define = fakeDefine;
-  }
-})();
-
-/*!
- * Sizzle CSS Selector Engine v1.10.18
- * http://sizzlejs.com/
- *
- * Copyright 2013 jQuery Foundation, Inc. and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2014-02-05
- */
-(function( window ) {
-
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	compile,
-	select,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
-
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-	rescape = /'|\\/g,
-
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		return high !== high || escapedWhitespace ?
-			escaped :
-			high < 0 ?
-				String.fromCharCode( high + 0x10000 ) :
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
-
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		i, groups, old, nid, newContext, newSelector;
-
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
-
-	context = context || document;
-	results = results || [];
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	if ( documentIsHTML && !seed ) {
-
-		if ( (match = rquickExpr.exec( selector )) ) {
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					if ( elem && elem.parentNode ) {
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
-
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
-
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
-
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context;
-				newSelector = groups.join(",");
-			}
-
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
-					}
-				}
-			}
-		}
-	}
-
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key + " " ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	if ( diff ) {
-		return diff;
-	}
-
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== strundefined && context;
-}
-
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare,
-		doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
-
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	document = doc;
-	docElem = doc.documentElement;
-
-	documentIsHTML = !isXML( doc );
-
-	if ( parent && parent !== parent.top ) {
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", function() {
-				setDocument();
-			}, false );
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", function() {
-				setDocument();
-			});
-		}
-	}
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	support.getElementsByClassName = rnative.test( doc.getElementsByClassName ) && assert(function( div ) {
-		div.innerHTML = "<div class='a'></div><div class='a i'></div>";
-
-		div.firstChild.className = "i";
-		return div.getElementsByClassName("i").length === 2;
-	});
-
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
-
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
-				var m = context.getElementById( id );
-				return m && m.parentNode ? [m] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
-			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
-
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-
-	rbuggyMatches = [];
-
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		assert(function( div ) {
-			div.innerHTML = "<select t=''><option selected=''></option></select>";
-
-			if ( div.querySelectorAll("[t^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
-
-			if ( div.querySelectorAll("[name=d]").length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			1;
-
-		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-			if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-				return -1;
-			}
-			if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-				return 1;
-			}
-
-			return sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			siblingCheck( ap[i], bp[i] ) :
-
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return doc;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			if ( ret || support.disconnectedMatch ||
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch(e) {}
-	}
-
-	return Sizzle( expr, document, null, [elem] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		while ( (node = elem[i++]) ) {
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[5] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			if ( match[3] && match[4] !== undefined ) {
-				match[2] = match[4];
-
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				(excess = tokenize( unquoted, true )) &&
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						if ( forward && useCache ) {
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
-
-						} else {
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
-									}
-
-									if ( node === elem ) {
-										break;
-									}
-								}
-							}
-						}
-
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		"not": markFunction(function( selector ) {
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		"lang": markFunction( function( lang ) {
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		"empty": function( elem ) {
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-		},
-
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( (tokens = []) );
-		}
-
-		matched = false;
-
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		function( elem, context, xml ) {
-			var oldCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (oldCache = outerCache[ dir ]) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							return (newCache[ 2 ] = oldCache[ 2 ]);
-						} else {
-							outerCache[ dir ] = newCache;
-
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					[] :
-
-					results :
-				matcherIn;
-
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			if ( matcher[ expando ] ) {
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-				len = elems.length;
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-			}
-
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				if ( bySet ) {
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					setMatched = condense( setMatched );
-				}
-
-				push.apply( results, setMatched );
-
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		if ( !match ) {
-			match = tokenize( selector );
-		}
-		i = match.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
-		cached.selector = selector;
-	}
-	return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- *  selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
-
-	results = results || [];
-
-	if ( match.length === 1 ) {
-
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
-
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-			if ( !context ) {
-				return results;
-
-			} else if ( compiled ) {
-				context = context.parentNode;
-			}
-
-			selector = selector.slice( tokens.shift().value.length );
-		}
-
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-		while ( i-- ) {
-			token = tokens[i];
-
-			if ( Expr.relative[ (type = token.type) ] ) {
-				break;
-			}
-			if ( (find = Expr.find[ type ]) ) {
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
-
-					tokens.splice( i, 1 );
-					selector = seed.length && toSelector( tokens );
-					if ( !selector ) {
-						push.apply( results, seed );
-						return results;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
-	( compiled || compile( selector, match ) )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-};
-
-
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-support.detectDuplicates = !!hasDuplicate;
-
-setDocument();
-
-support.sortDetached = assert(function( div1 ) {
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
-					val.value :
-				null;
-		}
-	});
-}
-
-if ( typeof define === "function" && define.amd ) {
-	define(function() { return Sizzle; });
-} else if ( typeof module !== "undefined" && module.exports ) {
-	module.exports = Sizzle;
-} else {
-	window.Sizzle = Sizzle;
-}
-
-})( window );
-
-;(function() {
-  if (typeof Sizzle !== 'undefined') {
-    return;
-  }
-
-  if (typeof define !== 'undefined' && define.amd) {
-    window.Sizzle = Prototype._actual_sizzle;
-    window.define = Prototype._original_define;
-    delete Prototype._actual_sizzle;
-    delete Prototype._original_define;
-  } else if (typeof module !== 'undefined' && module.exports) {
-    window.Sizzle = module.exports;
-    module.exports = {};
-  }
-})();
-
-;(function(engine) {
-  var extendElements = Prototype.Selector.extendElements;
-
-  function select(selector, scope) {
-    return extendElements(engine(selector, scope || document));
-  }
-
-  function match(element, selector) {
-    return engine.matches(selector, [element]).length == 1;
-  }
-
-  Prototype.Selector.engine = engine;
-  Prototype.Selector.select = select;
-  Prototype.Selector.match = match;
-})(Sizzle);
-
-window.Sizzle = Prototype._original_property;
-delete Prototype._original_property;
-
-var Form = {
-  reset: function(form) {
-    form = $(form);
-    form.reset();
-    return form;
-  },
-
-  serializeElements: function(elements, options) {
-    if (typeof options != 'object') options = { hash: !!options };
-    else if (Object.isUndefined(options.hash)) options.hash = true;
-    var key, value, submitted = false, submit = options.submit, accumulator, initial;
-
-    if (options.hash) {
-      initial = {};
-      accumulator = function(result, key, value) {
-        if (key in result) {
-          if (!Object.isArray(result[key])) result[key] = [result[key]];
-          result[key] = result[key].concat(value);
-        } else result[key] = value;
-        return result;
-      };
-    } else {
-      initial = '';
-      accumulator = function(result, key, values) {
-        if (!Object.isArray(values)) {values = [values];}
-        if (!values.length) {return result;}
-        var encodedKey = encodeURIComponent(key).gsub(/%20/, '+');
-        return result + (result ? "&" : "") + values.map(function (value) {
-          value = value.gsub(/(\r)?\n/, '\r\n');
-          value = encodeURIComponent(value);
-          value = value.gsub(/%20/, '+');
-          return encodedKey + "=" + value;
-        }).join("&");
-      };
-    }
-
-    return elements.inject(initial, function(result, element) {
-      if (!element.disabled && element.name) {
-        key = element.name; value = $(element).getValue();
-        if (value != null && element.type != 'file' && (element.type != 'submit' || (!submitted &&
-            submit !== false && (!submit || key == submit) && (submitted = true)))) {
-          result = accumulator(result, key, value);
-        }
-      }
-      return result;
-    });
-  }
-};
-
-Form.Methods = {
-  serialize: function(form, options) {
-    return Form.serializeElements(Form.getElements(form), options);
-  },
-
-
-  getElements: function(form) {
-    var elements = $(form).getElementsByTagName('*');
-    var element, results = [], serializers = Form.Element.Serializers;
-
-    for (var i = 0; element = elements[i]; i++) {
-      if (serializers[element.tagName.toLowerCase()])
-        results.push(Element.extend(element));
-    }
-    return results;
-  },
-
-  getInputs: function(form, typeName, name) {
-    form = $(form);
-    var inputs = form.getElementsByTagName('input');
-
-    if (!typeName && !name) return $A(inputs).map(Element.extend);
-
-    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
-      var input = inputs[i];
-      if ((typeName && input.type != typeName) || (name && input.name != name))
-        continue;
-      matchingInputs.push(Element.extend(input));
-    }
-
-    return matchingInputs;
-  },
-
-  disable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('disable');
-    return form;
-  },
-
-  enable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('enable');
-    return form;
-  },
-
-  findFirstElement: function(form) {
-    var elements = $(form).getElements().findAll(function(element) {
-      return 'hidden' != element.type && !element.disabled;
-    });
-    var firstByIndex = elements.findAll(function(element) {
-      return element.hasAttribute('tabIndex') && element.tabIndex >= 0;
-    }).sortBy(function(element) { return element.tabIndex }).first();
-
-    return firstByIndex ? firstByIndex : elements.find(function(element) {
-      return /^(?:input|select|textarea)$/i.test(element.tagName);
-    });
-  },
-
-  focusFirstElement: function(form) {
-    form = $(form);
-    var element = form.findFirstElement();
-    if (element) element.activate();
-    return form;
-  },
-
-  request: function(form, options) {
-    form = $(form), options = Object.clone(options || { });
-
-    var params = options.parameters, action = form.readAttribute('action') || '';
-    if (action.blank()) action = window.location.href;
-    options.parameters = form.serialize(true);
-
-    if (params) {
-      if (Object.isString(params)) params = params.toQueryParams();
-      Object.extend(options.parameters, params);
-    }
-
-    if (form.hasAttribute('method') && !options.method)
-      options.method = form.method;
-
-    return new Ajax.Request(action, options);
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-
-Form.Element = {
-  focus: function(element) {
-    $(element).focus();
-    return element;
-  },
-
-  select: function(element) {
-    $(element).select();
-    return element;
-  }
-};
-
-Form.Element.Methods = {
-
-  serialize: function(element) {
-    element = $(element);
-    if (!element.disabled && element.name) {
-      var value = element.getValue();
-      if (value != undefined) {
-        var pair = { };
-        pair[element.name] = value;
-        return Object.toQueryString(pair);
-      }
-    }
-    return '';
-  },
-
-  getValue: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    return Form.Element.Serializers[method](element);
-  },
-
-  setValue: function(element, value) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    Form.Element.Serializers[method](element, value);
-    return element;
-  },
-
-  clear: function(element) {
-    $(element).value = '';
-    return element;
-  },
-
-  present: function(element) {
-    return $(element).value != '';
-  },
-
-  activate: function(element) {
-    element = $(element);
-    try {
-      element.focus();
-      if (element.select && (element.tagName.toLowerCase() != 'input' ||
-          !(/^(?:button|reset|submit)$/i.test(element.type))))
-        element.select();
-    } catch (e) { }
-    return element;
-  },
-
-  disable: function(element) {
-    element = $(element);
-    element.disabled = true;
-    return element;
-  },
-
-  enable: function(element) {
-    element = $(element);
-    element.disabled = false;
-    return element;
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-var Field = Form.Element;
-
-var $F = Form.Element.Methods.getValue;
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element.Serializers = (function() {
-  function input(element, value) {
-    switch (element.type.toLowerCase()) {
-      case 'checkbox':
-      case 'radio':
-        return inputSelector(element, value);
-      default:
-        return valueSelector(element, value);
-    }
-  }
-
-  function inputSelector(element, value) {
-    if (Object.isUndefined(value))
-      return element.checked ? element.value : null;
-    else element.checked = !!value;
-  }
-
-  function valueSelector(element, value) {
-    if (Object.isUndefined(value)) return element.value;
-    else element.value = value;
-  }
-
-  function select(element, value) {
-    if (Object.isUndefined(value))
-      return (element.type === 'select-one' ? selectOne : selectMany)(element);
-
-    var opt, currentValue, single = !Object.isArray(value);
-    for (var i = 0, length = element.length; i < length; i++) {
-      opt = element.options[i];
-      currentValue = this.optionValue(opt);
-      if (single) {
-        if (currentValue == value) {
-          opt.selected = true;
-          return;
-        }
-      }
-      else opt.selected = value.include(currentValue);
-    }
-  }
-
-  function selectOne(element) {
-    var index = element.selectedIndex;
-    return index >= 0 ? optionValue(element.options[index]) : null;
-  }
-
-  function selectMany(element) {
-    var values, length = element.length;
-    if (!length) return null;
-
-    for (var i = 0, values = []; i < length; i++) {
-      var opt = element.options[i];
-      if (opt.selected) values.push(optionValue(opt));
-    }
-    return values;
-  }
-
-  function optionValue(opt) {
-    return Element.hasAttribute(opt, 'value') ? opt.value : opt.text;
-  }
-
-  return {
-    input:         input,
-    inputSelector: inputSelector,
-    textarea:      valueSelector,
-    select:        select,
-    selectOne:     selectOne,
-    selectMany:    selectMany,
-    optionValue:   optionValue,
-    button:        valueSelector
-  };
-})();
-
-/*--------------------------------------------------------------------------*/
-
-
-Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
-  initialize: function($super, element, frequency, callback) {
-    $super(callback, frequency);
-    this.element   = $(element);
-    this.lastValue = this.getValue();
-  },
-
-  execute: function() {
-    var value = this.getValue();
-    if (Object.isString(this.lastValue) && Object.isString(value) ?
-        this.lastValue != value : String(this.lastValue) != String(value)) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  }
-});
-
-Form.Element.Observer = Class.create(Abstract.TimedObserver, {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.Observer = Class.create(Abstract.TimedObserver, {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.EventObserver = Class.create({
-  initialize: function(element, callback) {
-    this.element  = $(element);
-    this.callback = callback;
-
-    this.lastValue = this.getValue();
-    if (this.element.tagName.toLowerCase() == 'form')
-      this.registerFormCallbacks();
-    else
-      this.registerCallback(this.element);
-  },
-
-  onElementEvent: function() {
-    var value = this.getValue();
-    if (this.lastValue != value) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  },
-
-  registerFormCallbacks: function() {
-    Form.getElements(this.element).each(this.registerCallback, this);
-  },
-
-  registerCallback: function(element) {
-    if (element.type) {
-      switch (element.type.toLowerCase()) {
-        case 'checkbox':
-        case 'radio':
-          Event.observe(element, 'click', this.onElementEvent.bind(this));
-          break;
-        default:
-          Event.observe(element, 'change', this.onElementEvent.bind(this));
-          break;
-      }
-    }
-  }
-});
-
-Form.Element.EventObserver = Class.create(Abstract.EventObserver, {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.EventObserver = Class.create(Abstract.EventObserver, {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-(function(GLOBAL) {
-  var DIV = document.createElement('div');
-  var docEl = document.documentElement;
-  var MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED = 'onmouseenter' in docEl
-   && 'onmouseleave' in docEl;
-
-  var Event = {
-    KEY_BACKSPACE: 8,
-    KEY_TAB:       9,
-    KEY_RETURN:   13,
-    KEY_ESC:      27,
-    KEY_LEFT:     37,
-    KEY_UP:       38,
-    KEY_RIGHT:    39,
-    KEY_DOWN:     40,
-    KEY_DELETE:   46,
-    KEY_HOME:     36,
-    KEY_END:      35,
-    KEY_PAGEUP:   33,
-    KEY_PAGEDOWN: 34,
-    KEY_INSERT:   45
-  };
-
-
-  var isIELegacyEvent = function(event) { return false; };
-
-  if (window.attachEvent) {
-    if (window.addEventListener) {
-      isIELegacyEvent = function(event) {
-        return !(event instanceof window.Event);
-      };
-    } else {
-      isIELegacyEvent = function(event) { return true; };
-    }
-  }
-
-  var _isButton;
-
-  function _isButtonForDOMEvents(event, code) {
-    return event.which ? (event.which === code + 1) : (event.button === code);
-  }
-
-  var legacyButtonMap = { 0: 1, 1: 4, 2: 2 };
-  function _isButtonForLegacyEvents(event, code) {
-    return event.button === legacyButtonMap[code];
-  }
-
-  function _isButtonForWebKit(event, code) {
-    switch (code) {
-      case 0: return event.which == 1 && !event.metaKey;
-      case 1: return event.which == 2 || (event.which == 1 && event.metaKey);
-      case 2: return event.which == 3;
-      default: return false;
-    }
-  }
-
-  if (window.attachEvent) {
-    if (!window.addEventListener) {
-      _isButton = _isButtonForLegacyEvents;
-    } else {
-      _isButton = function(event, code) {
-        return isIELegacyEvent(event) ? _isButtonForLegacyEvents(event, code) :
-         _isButtonForDOMEvents(event, code);
-      }
-    }
-  } else if (Prototype.Browser.WebKit) {
-    _isButton = _isButtonForWebKit;
-  } else {
-    _isButton = _isButtonForDOMEvents;
-  }
-
-  function isLeftClick(event)   { return _isButton(event, 0) }
-
-  function isMiddleClick(event) { return _isButton(event, 1) }
-
-  function isRightClick(event)  { return _isButton(event, 2) }
-
-  function element(event) {
-    return Element.extend(_element(event));
-  }
-
-  function _element(event) {
-    event = Event.extend(event);
-
-    var node = event.target, type = event.type,
-     currentTarget = event.currentTarget;
-
-    if (currentTarget && currentTarget.tagName) {
-      if (type === 'load' || type === 'error' ||
-        (type === 'click' && currentTarget.tagName.toLowerCase() === 'input'
-          && currentTarget.type === 'radio'))
-            node = currentTarget;
-    }
-
-    return node.nodeType == Node.TEXT_NODE ? node.parentNode : node;
-  }
-
-  function findElement(event, expression) {
-    var element = _element(event), selector = Prototype.Selector;
-    if (!expression) return Element.extend(element);
-    while (element) {
-      if (Object.isElement(element) && selector.match(element, expression))
-        return Element.extend(element);
-      element = element.parentNode;
-    }
-  }
-
-  function pointer(event) {
-    return { x: pointerX(event), y: pointerY(event) };
-  }
-
-  function pointerX(event) {
-    var docElement = document.documentElement,
-     body = document.body || { scrollLeft: 0 };
-
-    return event.pageX || (event.clientX +
-      (docElement.scrollLeft || body.scrollLeft) -
-      (docElement.clientLeft || 0));
-  }
-
-  function pointerY(event) {
-    var docElement = document.documentElement,
-     body = document.body || { scrollTop: 0 };
-
-    return  event.pageY || (event.clientY +
-       (docElement.scrollTop || body.scrollTop) -
-       (docElement.clientTop || 0));
-  }
-
-
-  function stop(event) {
-    Event.extend(event);
-    event.preventDefault();
-    event.stopPropagation();
-
-    event.stopped = true;
-  }
-
-
-  Event.Methods = {
-    isLeftClick:   isLeftClick,
-    isMiddleClick: isMiddleClick,
-    isRightClick:  isRightClick,
-
-    element:     element,
-    findElement: findElement,
-
-    pointer:  pointer,
-    pointerX: pointerX,
-    pointerY: pointerY,
-
-    stop: stop
-  };
-
-  var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
-    m[name] = Event.Methods[name].methodize();
-    return m;
-  });
-
-  if (window.attachEvent) {
-    function _relatedTarget(event) {
-      var element;
-      switch (event.type) {
-        case 'mouseover':
-        case 'mouseenter':
-          element = event.fromElement;
-          break;
-        case 'mouseout':
-        case 'mouseleave':
-          element = event.toElement;
-          break;
-        default:
-          return null;
-      }
-      return Element.extend(element);
-    }
-
-    var additionalMethods = {
-      stopPropagation: function() { this.cancelBubble = true },
-      preventDefault:  function() { this.returnValue = false },
-      inspect: function() { return '[object Event]' }
-    };
-
-    Event.extend = function(event, element) {
-      if (!event) return false;
-
-      if (!isIELegacyEvent(event)) return event;
-
-      if (event._extendedByPrototype) return event;
-      event._extendedByPrototype = Prototype.emptyFunction;
-
-      var pointer = Event.pointer(event);
-
-      Object.extend(event, {
-        target: event.srcElement || element,
-        relatedTarget: _relatedTarget(event),
-        pageX:  pointer.x,
-        pageY:  pointer.y
-      });
-
-      Object.extend(event, methods);
-      Object.extend(event, additionalMethods);
-
-      return event;
-    };
-  } else {
-    Event.extend = Prototype.K;
-  }
-
-  if (window.addEventListener) {
-    Event.prototype = window.Event.prototype || document.createEvent('HTMLEvents').__proto__;
-    Object.extend(Event.prototype, methods);
-  }
-
-  var EVENT_TRANSLATIONS = {
-    mouseenter: 'mouseover',
-    mouseleave: 'mouseout'
-  };
-
-  function getDOMEventName(eventName) {
-    return EVENT_TRANSLATIONS[eventName] || eventName;
-  }
-
-  if (MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED)
-    getDOMEventName = Prototype.K;
-
-  function getUniqueElementID(element) {
-    if (element === window) return 0;
-
-    if (typeof element._prototypeUID === 'undefined')
-      element._prototypeUID = Element.Storage.UID++;
-    return element._prototypeUID;
-  }
-
-  function getUniqueElementID_IE(element) {
-    if (element === window) return 0;
-    if (element == document) return 1;
-    return element.uniqueID;
-  }
-
-  if ('uniqueID' in DIV)
-    getUniqueElementID = getUniqueElementID_IE;
-
-  function isCustomEvent(eventName) {
-    return eventName.include(':');
-  }
-
-  Event._isCustomEvent = isCustomEvent;
-
-  function getOrCreateRegistryFor(element, uid) {
-    var CACHE = GLOBAL.Event.cache;
-    if (Object.isUndefined(uid))
-      uid = getUniqueElementID(element);
-    if (!CACHE[uid]) CACHE[uid] = { element: element };
-    return CACHE[uid];
-  }
-
-  function destroyRegistryForElement(element, uid) {
-    if (Object.isUndefined(uid))
-      uid = getUniqueElementID(element);
-    delete GLOBAL.Event.cache[uid];
-  }
-
-
-  function register(element, eventName, handler) {
-    var registry = getOrCreateRegistryFor(element);
-    if (!registry[eventName]) registry[eventName] = [];
-    var entries = registry[eventName];
-
-    var i = entries.length;
-    while (i--)
-      if (entries[i].handler === handler) return null;
-
-    var uid = getUniqueElementID(element);
-    var responder = GLOBAL.Event._createResponder(uid, eventName, handler);
-    var entry = {
-      responder: responder,
-      handler:   handler
-    };
-
-    entries.push(entry);
-    return entry;
-  }
-
-  function unregister(element, eventName, handler) {
-    var registry = getOrCreateRegistryFor(element);
-    var entries = registry[eventName] || [];
-
-    var i = entries.length, entry;
-    while (i--) {
-      if (entries[i].handler === handler) {
-        entry = entries[i];
-        break;
-      }
-    }
-
-    if (entry) {
-      var index = entries.indexOf(entry);
-      entries.splice(index, 1);
-    }
-
-    if (entries.length === 0) {
-      delete registry[eventName];
-      if (Object.keys(registry).length === 1 && ('element' in registry))
-        destroyRegistryForElement(element);
-    }
-
-    return entry;
-  }
-
-
-  function observe(element, eventName, handler) {
-    element = $(element);
-    var entry = register(element, eventName, handler);
-
-    if (entry === null) return element;
-
-    var responder = entry.responder;
-    if (isCustomEvent(eventName))
-      observeCustomEvent(element, eventName, responder);
-    else
-      observeStandardEvent(element, eventName, responder);
-
-    return element;
-  }
-
-  function observeStandardEvent(element, eventName, responder) {
-    var actualEventName = getDOMEventName(eventName);
-    if (element.addEventListener) {
-      element.addEventListener(actualEventName, responder, false);
-    } else {
-      element.attachEvent('on' + actualEventName, responder);
-    }
-  }
-
-  function observeCustomEvent(element, eventName, responder) {
-    if (element.addEventListener) {
-      element.addEventListener('dataavailable', responder, false);
-    } else {
-      element.attachEvent('ondataavailable', responder);
-      element.attachEvent('onlosecapture',   responder);
-    }
-  }
-
-  function stopObserving(element, eventName, handler) {
-    element = $(element);
-    var handlerGiven = !Object.isUndefined(handler),
-     eventNameGiven = !Object.isUndefined(eventName);
-
-    if (!eventNameGiven && !handlerGiven) {
-      stopObservingElement(element);
-      return element;
-    }
-
-    if (!handlerGiven) {
-      stopObservingEventName(element, eventName);
-      return element;
-    }
-
-    var entry = unregister(element, eventName, handler);
-
-    if (!entry) return element;
-    removeEvent(element, eventName, entry.responder);
-    return element;
-  }
-
-  function stopObservingStandardEvent(element, eventName, responder) {
-    var actualEventName = getDOMEventName(eventName);
-    if (element.removeEventListener) {
-      element.removeEventListener(actualEventName, responder, false);
-    } else {
-      element.detachEvent('on' + actualEventName, responder);
-    }
-  }
-
-  function stopObservingCustomEvent(element, eventName, responder) {
-    if (element.removeEventListener) {
-      element.removeEventListener('dataavailable', responder, false);
-    } else {
-      element.detachEvent('ondataavailable', responder);
-      element.detachEvent('onlosecapture',   responder);
-    }
-  }
-
-
-
-  function stopObservingElement(element) {
-    var uid = getUniqueElementID(element), registry = GLOBAL.Event.cache[uid];
-    if (!registry) return;
-
-    destroyRegistryForElement(element, uid);
-
-    var entries, i;
-    for (var eventName in registry) {
-      if (eventName === 'element') continue;
-
-      entries = registry[eventName];
-      i = entries.length;
-      while (i--)
-        removeEvent(element, eventName, entries[i].responder);
-    }
-  }
-
-  function stopObservingEventName(element, eventName) {
-    var registry = getOrCreateRegistryFor(element);
-    var entries = registry[eventName];
-    if (entries) {
-      delete registry[eventName];
-    }
-
-    entries = entries || [];
-
-    var i = entries.length;
-    while (i--)
-      removeEvent(element, eventName, entries[i].responder);
-
-    for (var name in registry) {
-      if (name === 'element') continue;
-      return; // There is another registered event
-    }
-
-    destroyRegistryForElement(element);
-  }
-
-
-  function removeEvent(element, eventName, handler) {
-    if (isCustomEvent(eventName))
-      stopObservingCustomEvent(element, eventName, handler);
-    else
-      stopObservingStandardEvent(element, eventName, handler);
-  }
-
-
-
-  function getFireTarget(element) {
-    if (element !== document) return element;
-    if (document.createEvent && !element.dispatchEvent)
-      return document.documentElement;
-    return element;
-  }
-
-  function fire(element, eventName, memo, bubble) {
-    element = getFireTarget($(element));
-    if (Object.isUndefined(bubble)) bubble = true;
-    memo = memo || {};
-
-    var event = fireEvent(element, eventName, memo, bubble);
-    return Event.extend(event);
-  }
-
-  function fireEvent_DOM(element, eventName, memo, bubble) {
-    var event = document.createEvent('HTMLEvents');
-    event.initEvent('dataavailable', bubble, true);
-
-    event.eventName = eventName;
-    event.memo = memo;
-
-    element.dispatchEvent(event);
-    return event;
-  }
-
-  function fireEvent_IE(element, eventName, memo, bubble) {
-    var event = document.createEventObject();
-    event.eventType = bubble ? 'ondataavailable' : 'onlosecapture';
-
-    event.eventName = eventName;
-    event.memo = memo;
-
-    element.fireEvent(event.eventType, event);
-    return event;
-  }
-
-  var fireEvent = document.createEvent ? fireEvent_DOM : fireEvent_IE;
-
-
-
-  Event.Handler = Class.create({
-    initialize: function(element, eventName, selector, callback) {
-      this.element   = $(element);
-      this.eventName = eventName;
-      this.selector  = selector;
-      this.callback  = callback;
-      this.handler   = this.handleEvent.bind(this);
-    },
-
-
-    start: function() {
-      Event.observe(this.element, this.eventName, this.handler);
-      return this;
-    },
-
-    stop: function() {
-      Event.stopObserving(this.element, this.eventName, this.handler);
-      return this;
-    },
-
-    handleEvent: function(event) {
-      var element = Event.findElement(event, this.selector);
-      if (element) this.callback.call(this.element, event, element);
-    }
-  });
-
-  function on(element, eventName, selector, callback) {
-    element = $(element);
-    if (Object.isFunction(selector) && Object.isUndefined(callback)) {
-      callback = selector, selector = null;
-    }
-
-    return new Event.Handler(element, eventName, selector, callback).start();
-  }
-
-  Object.extend(Event, Event.Methods);
-
-  Object.extend(Event, {
-    fire:          fire,
-    observe:       observe,
-    stopObserving: stopObserving,
-    p_on:            on
-  });
-
-  Element.addMethods({
-    fire:          fire,
-
-    observe:       observe,
-
-    stopObserving: stopObserving,
-
-    p_on:            on
-  });
-
-  Object.extend(document, {
-    fire:          fire.methodize(),
-
-    observe:       observe.methodize(),
-
-    stopObserving: stopObserving.methodize(),
-
-    p_on:            on.methodize(),
-
-    loaded:        false
-  });
-
-  if (GLOBAL.Event) Object.extend(window.Event, Event);
-  else GLOBAL.Event = Event;
-
-  GLOBAL.Event.cache = {};
-
-  function destroyCache_IE() {
-    GLOBAL.Event.cache = null;
-  }
-
-  if (window.attachEvent)
-    window.attachEvent('onunload', destroyCache_IE);
-
-  DIV = null;
-  docEl = null;
-})(this);
-
-(function(GLOBAL) {
-  /* Code for creating leak-free event responders is based on work by
-   John-David Dalton. */
-
-  var docEl = document.documentElement;
-  var MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED = 'onmouseenter' in docEl
-    && 'onmouseleave' in docEl;
-
-  function isSimulatedMouseEnterLeaveEvent(eventName) {
-    return !MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED &&
-     (eventName === 'mouseenter' || eventName === 'mouseleave');
-  }
-
-  function createResponder(uid, eventName, handler) {
-    if (Event._isCustomEvent(eventName))
-      return createResponderForCustomEvent(uid, eventName, handler);
-    if (isSimulatedMouseEnterLeaveEvent(eventName))
-      return createMouseEnterLeaveResponder(uid, eventName, handler);
-
-    return function(event) {
-      if (!Event.cache) return;
-
-      var element = Event.cache[uid].element;
-      Event.extend(event, element);
-      handler.call(element, event);
-    };
-  }
-
-  function createResponderForCustomEvent(uid, eventName, handler) {
-    return function(event) {
-      var cache = Event.cache[uid];
-      var element =  cache && cache.element;
-
-      if (Object.isUndefined(event.eventName))
-        return false;
-
-      if (event.eventName !== eventName)
-        return false;
-
-      Event.extend(event, element);
-      handler.call(element, event);
-    };
-  }
-
-  function createMouseEnterLeaveResponder(uid, eventName, handler) {
-    return function(event) {
-      var element = Event.cache[uid].element;
-
-      Event.extend(event, element);
-      var parent = event.relatedTarget;
-
-      while (parent && parent !== element) {
-        try { parent = parent.parentNode; }
-        catch(e) { parent = element; }
-      }
-
-      if (parent === element) return;
-      handler.call(element, event);
-    }
-  }
-
-  GLOBAL.Event._createResponder = createResponder;
-  docEl = null;
-})(this);
-
-(function(GLOBAL) {
-  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
-     Matthias Miller, Dean Edwards, John Resig, and Diego Perini. */
-
-  var TIMER;
-
-  function fireContentLoadedEvent() {
-    if (document.loaded) return;
-    if (TIMER) window.clearTimeout(TIMER);
-    document.loaded = true;
-    document.fire('dom:loaded');
-  }
-
-  function checkReadyState() {
-    if (document.readyState === 'complete') {
-      document.detachEvent('onreadystatechange', checkReadyState);
-      fireContentLoadedEvent();
-    }
-  }
-
-  function pollDoScroll() {
-    try {
-      document.documentElement.doScroll('left');
-    } catch (e) {
-      TIMER = pollDoScroll.defer();
-      return;
-    }
-
-    fireContentLoadedEvent();
-  }
-
-
-  if (document.readyState === 'complete') {
-    fireContentLoadedEvent();
-    return;
-  }
-
-  if (document.addEventListener) {
-    document.addEventListener('DOMContentLoaded', fireContentLoadedEvent, false);
-  } else {
-    document.attachEvent('onreadystatechange', checkReadyState);
-    if (window == top) TIMER = pollDoScroll.defer();
-  }
-
-  Event.observe(window, 'load', fireContentLoadedEvent);
-})(this);
-
-
-Element.addMethods();
-/*------------------------------- DEPRECATED -------------------------------*/
-
-Hash.toQueryString = Object.toQueryString;
-
-var Toggle = { display: Element.toggle };
-
-Element.addMethods({
-  childOf: Element.Methods.descendantOf
-});
-
-var Insertion = {
-  Before: function(element, content) {
-    return Element.insert(element, {before:content});
-  },
-
-  Top: function(element, content) {
-    return Element.insert(element, {top:content});
-  },
-
-  Bottom: function(element, content) {
-    return Element.insert(element, {bottom:content});
-  },
-
-  After: function(element, content) {
-    return Element.insert(element, {after:content});
-  }
-};
-
-var $continue = new Error('"throw $continue" is deprecated, use "return" instead');
-
-var Position = {
-  includeScrollOffsets: false,
-
-  prepare: function() {
-    this.deltaX =  window.pageXOffset
-                || document.documentElement.scrollLeft
-                || document.body.scrollLeft
-                || 0;
-    this.deltaY =  window.pageYOffset
-                || document.documentElement.scrollTop
-                || document.body.scrollTop
-                || 0;
-  },
-
-  within: function(element, x, y) {
-    if (this.includeScrollOffsets)
-      return this.withinIncludingScrolloffsets(element, x, y);
-    this.xcomp = x;
-    this.ycomp = y;
-    this.offset = Element.cumulativeOffset(element);
-
-    return (y >= this.offset[1] &&
-            y <  this.offset[1] + element.offsetHeight &&
-            x >= this.offset[0] &&
-            x <  this.offset[0] + element.offsetWidth);
-  },
-
-  withinIncludingScrolloffsets: function(element, x, y) {
-    var offsetcache = Element.cumulativeScrollOffset(element);
-
-    this.xcomp = x + offsetcache[0] - this.deltaX;
-    this.ycomp = y + offsetcache[1] - this.deltaY;
-    this.offset = Element.cumulativeOffset(element);
-
-    return (this.ycomp >= this.offset[1] &&
-            this.ycomp <  this.offset[1] + element.offsetHeight &&
-            this.xcomp >= this.offset[0] &&
-            this.xcomp <  this.offset[0] + element.offsetWidth);
-  },
-
-  overlap: function(mode, element) {
-    if (!mode) return 0;
-    if (mode == 'vertical')
-      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
-        element.offsetHeight;
-    if (mode == 'horizontal')
-      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
-        element.offsetWidth;
-  },
-
-
-  cumulativeOffset: Element.Methods.cumulativeOffset,
-
-  positionedOffset: Element.Methods.positionedOffset,
-
-  absolutize: function(element) {
-    Position.prepare();
-    return Element.absolutize(element);
-  },
-
-  relativize: function(element) {
-    Position.prepare();
-    return Element.relativize(element);
-  },
-
-  realOffset: Element.Methods.cumulativeScrollOffset,
-
-  offsetParent: Element.Methods.getOffsetParent,
-
-  page: Element.Methods.viewportOffset,
-
-  clone: function(source, target, options) {
-    options = options || { };
-    return Element.clonePosition(target, source, options);
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){
-  function iter(name) {
-    return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]";
-  }
-
-  instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
-  function(element, className) {
-    className = className.toString().strip();
-    var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className);
-    return cond ? document._getElementsByXPath('.//*' + cond, element) : [];
-  } : function(element, className) {
-    className = className.toString().strip();
-    var elements = [], classNames = (/\s/.test(className) ? $w(className) : null);
-    if (!classNames && !className) return elements;
-
-    var nodes = $(element).getElementsByTagName('*');
-    className = ' ' + className + ' ';
-
-    for (var i = 0, child, cn; child = nodes[i]; i++) {
-      if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) ||
-          (classNames && classNames.all(function(name) {
-            return !name.toString().blank() && cn.include(' ' + name + ' ');
-          }))))
-        elements.push(Element.extend(child));
-    }
-    return elements;
-  };
-
-  return function(className, parentElement) {
-    return $(parentElement || document.body).getElementsByClassName(className);
-  };
-}(Element.Methods);
-
-/*--------------------------------------------------------------------------*/
-
-Element.ClassNames = Class.create();
-Element.ClassNames.prototype = {
-  initialize: function(element) {
-    this.element = $(element);
-  },
-
-  _each: function(iterator, context) {
-    this.element.className.split(/\s+/).select(function(name) {
-      return name.length > 0;
-    })._each(iterator, context);
-  },
-
-  set: function(className) {
-    this.element.className = className;
-  },
-
-  add: function(classNameToAdd) {
-    if (this.include(classNameToAdd)) return;
-    this.set($A(this).concat(classNameToAdd).join(' '));
-  },
-
-  remove: function(classNameToRemove) {
-    if (!this.include(classNameToRemove)) return;
-    this.set($A(this).without(classNameToRemove).join(' '));
-  },
-
-  toString: function() {
-    return $A(this).join(' ');
-  }
-};
-
-Object.extend(Element.ClassNames.prototype, Enumerable);
-
-/*--------------------------------------------------------------------------*/
-
-(function() {
-  window.Selector = Class.create({
-    initialize: function(expression) {
-      this.expression = expression.strip();
-    },
-
-    findElements: function(rootElement) {
-      return Prototype.Selector.select(this.expression, rootElement);
-    },
-
-    match: function(element) {
-      return Prototype.Selector.match(element, this.expression);
-    },
-
-    toString: function() {
-      return this.expression;
-    },
-
-    inspect: function() {
-      return "#<Selector: " + this.expression + ">";
-    }
-  });
-
-  Object.extend(Selector, {
-    matchElements: function(elements, expression) {
-      var match = Prototype.Selector.match,
-          results = [];
-
-      for (var i = 0, length = elements.length; i < length; i++) {
-        var element = elements[i];
-        if (match(element, expression)) {
-          results.push(Element.extend(element));
-        }
-      }
-      return results;
-    },
-
-    findElement: function(elements, expression, index) {
-      index = index || 0;
-      var matchIndex = 0, element;
-      for (var i = 0, length = elements.length; i < length; i++) {
-        element = elements[i];
-        if (Prototype.Selector.match(element, expression) && index === matchIndex++) {
-          return Element.extend(element);
-        }
-      }
-    },
-
-    findChildElements: function(element, expressions) {
-      var selector = expressions.toArray().join(', ');
-      return Prototype.Selector.select(selector, element || document);
-    }
-  });
-})();
diff --git a/plugins/share/init.php b/plugins/share/init.php
index 4c47e29d3..0c975cfdd 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -156,7 +156,6 @@ class Share extends Plugin {
 				<head>
 					<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
 					<title><?= $line["title"] ?></title>
-					<?= javascript_tag("lib/prototype.js") ?>
 					<?= javascript_tag("js/utility.js") ?>
 					<style type='text/css'>
 						@media (prefers-color-scheme: dark) {
diff --git a/prefs.php b/prefs.php
index 71dc73b29..2b2af8452 100644
--- a/prefs.php
+++ b/prefs.php
@@ -59,8 +59,7 @@
 	</script>
 
 	<?php
-	foreach (array(#"lib/prototype.js",
-				"lib/dojo/dojo.js",
+	foreach (array("lib/dojo/dojo.js",
 				"lib/dojo/tt-rss-layer.js",
 				"js/common.js",
 				"js/prefs.js",
-- 
cgit v1.2.3-54-g00ecf


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

---
 classes/pref/prefs.php |  6 +++---
 js/App.js              |  2 --
 js/Article.js          | 10 ----------
 js/Feeds.js            |  8 --------
 js/common.js           |  2 +-
 plugins/note/note.js   |  2 +-
 6 files changed, 5 insertions(+), 25 deletions(-)

(limited to 'plugins')

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


From 6b43b788d909ce20f07f29f9f3ccd2f6a8715616 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 10:22:00 +0300
Subject: migrate xhrJson invocations to the new helper

---
 include/login_form.php         |  2 +-
 js/App.js                      |  2 +-
 js/Article.js                  |  4 ++--
 js/CommonDialogs.js            | 12 ++++++------
 js/Feeds.js                    |  2 +-
 js/PrefFeedTree.js             |  8 ++++----
 js/PrefHelpers.js              |  4 ++--
 js/PrefLabelTree.js            |  2 +-
 js/PrefUsers.js                |  2 +-
 js/common.js                   | 22 ++++++----------------
 plugins/af_readability/init.js |  2 +-
 plugins/mail/init.php          |  2 +-
 plugins/mail/mail.js           |  2 +-
 plugins/note/note.js           |  2 +-
 plugins/share/share.js         |  2 +-
 15 files changed, 30 insertions(+), 40 deletions(-)

(limited to 'plugins')

diff --git a/include/login_form.php b/include/login_form.php
index d1af23459..211302a87 100755
--- a/include/login_form.php
+++ b/include/login_form.php
@@ -59,7 +59,7 @@
 	        if (login && login != this.previousLogin) {
                 this.previousLogin = login;
 
-                xhrJson("public.php", {op: "getprofiles", login: login},
+                xhr.json("public.php", {op: "getprofiles", login: login},
                     (reply) => {
                         const profile = dijit.byId('profile');
 
diff --git a/js/App.js b/js/App.js
index d61c6ead0..0c12c7e6f 100644
--- a/js/App.js
+++ b/js/App.js
@@ -775,7 +775,7 @@ const App = {
    checkForUpdates: function() {
       console.log('checking for updates...');
 
-      xhrJson("backend.php", {op: 'rpc', method: 'checkforupdates'})
+      xhr.json("backend.php", {op: 'rpc', method: 'checkforupdates'})
          .then((reply) => {
             console.log('update reply', reply);
 
diff --git a/js/Article.js b/js/Article.js
index 90be90f7b..379e05644 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -115,7 +115,7 @@ const Article = {
 	displayUrl: function (id) {
 		const query = {op: "article", method: "getmetadatabyid", id: id};
 
-		xhrJson("backend.php", query, (reply) => {
+		xhr.json("backend.php", query, (reply) => {
 			if (reply && reply.link) {
 				prompt(__("Article URL:"), reply.link);
 			} else {
@@ -358,7 +358,7 @@ const Article = {
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhrJson("backend.php", {op: "article", method: "printArticleTags", id: id}, (reply) => {
+			xhr.json("backend.php", {op: "article", method: "printArticleTags", id: id}, (reply) => {
 
 				dijit.getEnclosingWidget(App.byId("tags_str"))
 					.attr('value', reply.tags.join(", "))
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index 6ace91c8c..3acd2b577 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -78,7 +78,7 @@ const	CommonDialogs = {
 			return false;
 		},
 		subscribeToFeed: function() {
-			xhrJson("backend.php",
+			xhr.json("backend.php",
 					{op: "feeds", method: "subscribeToFeed"},
 					(reply) => {
 						const dialog = new fox.SingleUseDialog({
@@ -265,7 +265,7 @@ const	CommonDialogs = {
 		},
 		showFeedsWithErrors: function() {
 
-			xhrJson("backend.php", {op: "pref-feeds", method: "feedsWithErrors"}, (reply) => {
+			xhr.json("backend.php", {op: "pref-feeds", method: "feedsWithErrors"}, (reply) => {
 
 				const dialog = new fox.SingleUseDialog({
 					id: "errorFeedsDlg",
@@ -446,7 +446,7 @@ const	CommonDialogs = {
 
 			Notify.progress("Loading, please wait...", true);
 
-			xhrJson("backend.php", {op: "pref-feeds", method: "getOPMLKey"}, (reply) => {
+			xhr.json("backend.php", {op: "pref-feeds", method: "getOPMLKey"}, (reply) => {
 				try {
 					const dialog = new fox.SingleUseDialog({
 						title: __("Public OPML URL"),
@@ -454,7 +454,7 @@ const	CommonDialogs = {
 							if (confirm(__("Replace current OPML publishing address with a new one?"))) {
 								Notify.progress("Trying to change address...", true);
 
-								xhrJson("backend.php", {op: "pref-feeds", method: "regenOPMLKey"}, (reply) => {
+								xhr.json("backend.php", {op: "pref-feeds", method: "regenOPMLKey"}, (reply) => {
 									if (reply) {
 										const new_link = reply.link;
 										const target = this.domNode.querySelector('.generated_url');
@@ -504,7 +504,7 @@ const	CommonDialogs = {
 
 			Notify.progress("Loading, please wait...", true);
 
-			xhrJson("backend.php", {op: "pref-feeds", method: "getsharedurl", id: feed, is_cat: is_cat, search: search}, (reply) => {
+			xhr.json("backend.php", {op: "pref-feeds", method: "getsharedurl", id: feed, is_cat: is_cat, search: search}, (reply) => {
 				try {
 					const dialog = new fox.SingleUseDialog({
 						title: __("Show as feed"),
@@ -515,7 +515,7 @@ const	CommonDialogs = {
 
 								const query = {op: "pref-feeds", method: "regenFeedKey", id: feed, is_cat: is_cat};
 
-								xhrJson("backend.php", query, (reply) => {
+								xhr.json("backend.php", query, (reply) => {
 									const new_link = reply.link;
 									const target = this.domNode.querySelector(".generated_url");
 
diff --git a/js/Feeds.js b/js/Feeds.js
index 67c78cbfe..7cefe2235 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -558,7 +558,7 @@ const	Feeds = {
 			return tree.model.store.getValue(nuf, 'bare_id');
 	},
 	search: function() {
-		xhrJson("backend.php",
+		xhr.json("backend.php",
 					{op: "feeds", method: "search"},
 					(reply) => {
 						try {
diff --git a/js/PrefFeedTree.js b/js/PrefFeedTree.js
index 92194e037..c7228e6ff 100644
--- a/js/PrefFeedTree.js
+++ b/js/PrefFeedTree.js
@@ -210,14 +210,14 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 			return false;
 		},
 		checkErrorFeeds: function() {
-			xhrJson("backend.php", {op: "pref-feeds", method: "feedsWithErrors"}, (reply) => {
+			xhr.json("backend.php", {op: "pref-feeds", method: "feedsWithErrors"}, (reply) => {
 				if (reply.length > 0) {
 					Element.show(dijit.byId("pref_feeds_errors_btn").domNode);
 				}
 			});
 		},
 		checkInactiveFeeds: function() {
-			xhrJson("backend.php", {op: "pref-feeds", method: "inactivefeeds"}, (reply) => {
+			xhr.json("backend.php", {op: "pref-feeds", method: "inactivefeeds"}, (reply) => {
 				if (reply.length > 0) {
 					Element.show(dijit.byId("pref_feeds_inactive_btn").domNode);
 				}
@@ -385,7 +385,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 			}
 		},
 		batchSubscribe: function() {
-			xhrJson("backend.php", {op: 'pref-feeds', method: 'batchSubscribe'}, (reply) => {
+			xhr.json("backend.php", {op: 'pref-feeds', method: 'batchSubscribe'}, (reply) => {
 				const dialog = new fox.SingleUseDialog({
 					id: "batchSubDlg",
 					title: __("Batch subscribe"),
@@ -458,7 +458,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
 			});
 		},
 		showInactiveFeeds: function() {
-			xhrJson("backend.php", {op: 'pref-feeds', method: 'inactivefeeds'}, function (reply) {
+			xhr.json("backend.php", {op: 'pref-feeds', method: 'inactivefeeds'}, function (reply) {
 
 				const dialog = new fox.SingleUseDialog({
 					id: "inactiveFeedsDlg",
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index d4db15c3b..c17966291 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -132,7 +132,7 @@ const	Helpers = {
 					}
 				},
 				refresh: function() {
-					xhrJson("backend.php", {op: 'pref-prefs', method: 'getprofiles'}, (reply) => {
+					xhr.json("backend.php", {op: 'pref-prefs', method: 'getprofiles'}, (reply) => {
 						dialog.attr('content', `
 							<div dojoType='fox.Toolbar'>
 								<div dojoType='fox.form.DropDownButton'>
@@ -212,7 +212,7 @@ const	Helpers = {
 	},
 	Prefs: {
 		customizeCSS: function() {
-			xhrJson("backend.php", {op: "pref-prefs", method: "customizeCSS"}, (reply) => {
+			xhr.json("backend.php", {op: "pref-prefs", method: "customizeCSS"}, (reply) => {
 
 				const dialog = new fox.SingleUseDialog({
 					title: __("Customize stylesheet"),
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 4392dfc44..9d16a147c 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -61,7 +61,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 			});
 		},
 		editLabel: function(id) {
-			xhrJson("backend.php", {op: "pref-labels", method: "edit", id: id}, (reply) => {
+			xhr.json("backend.php", {op: "pref-labels", method: "edit", id: id}, (reply) => {
 
 				console.log(reply);
 
diff --git a/js/PrefUsers.js b/js/PrefUsers.js
index 64466ef18..5b490a2a5 100644
--- a/js/PrefUsers.js
+++ b/js/PrefUsers.js
@@ -27,7 +27,7 @@ const	Users = {
 		}
 	},
 	edit: function(id) {
-		xhrJson('backend.php', {op: 'pref-users', method: 'edit', id: id}, (reply) => {
+		xhr.json('backend.php', {op: 'pref-users', method: 'edit', id: id}, (reply) => {
 			const user = reply.user;
 			const admin_disabled = (user.id == 1);
 
diff --git a/js/common.js b/js/common.js
index dbe1ae3c3..f3fcdd905 100755
--- a/js/common.js
+++ b/js/common.js
@@ -143,7 +143,7 @@ String.prototype.stripTags = function() {
 
 const xhr = {
 	post: function(url, params = {}, complete = undefined) {
-		console.log("xhr.post:", params);
+		console.log('xhr.post', '>>>', params);
 
 		return new Promise((resolve, reject) => {
 			if (typeof __csrf_token != "undefined")
@@ -156,6 +156,8 @@ const xhr = {
 					reject(error);
 				},
 				load: function(data, ioargs) {
+					//console.log('xhr.post', '<<<', data, ioargs);
+
 					if (complete != undefined)
 						complete(data, ioargs.xhr);
 
@@ -176,6 +178,8 @@ const xhr = {
 					reject(e);
 				}
 
+				console.log('xhr.json', '<<<', obj);
+
 				if (complete != undefined) complete(obj);
 
 				resolve(obj);
@@ -209,21 +213,7 @@ function xhrPost(url, params = {}, complete = undefined) {
 
 /* exported xhrJson */
 function xhrJson(url, params = {}, complete = undefined) {
-	return new Promise((resolve, reject) =>
-		xhrPost(url, params).then((reply) => {
-			let obj = null;
-
-			try {
-				obj = JSON.parse(reply.responseText);
-			} catch (e) {
-				console.error("xhrJson", e, reply);
-				reject(e);
-			}
-
-			if (complete != undefined) complete(obj);
-
-			resolve(obj);
-		}));
+	return xhr.json(url, params, complete);
 }
 
 /* common helpers not worthy of separate Dojo modules */
diff --git a/plugins/af_readability/init.js b/plugins/af_readability/init.js
index 6dec82f45..5297416b3 100644
--- a/plugins/af_readability/init.js
+++ b/plugins/af_readability/init.js
@@ -16,7 +16,7 @@ Plugins.Af_Readability = {
 
         Notify.progress("Loading, please wait...");
 
-        xhrJson("backend.php", App.getPhArgs("af_readability", "embed", {id: id}), (reply) => {
+        xhr.json("backend.php", App.getPhArgs("af_readability", "embed", {id: id}), (reply) => {
 
             if (content && reply.content) {
                 content.setAttribute(self.orig_attr_name, content.innerHTML);
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index d96006b21..16e22f342 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -152,7 +152,7 @@ class Mail extends Plugin {
 			<script type='dojo/method' event='onSubmit' args='evt'>
 				evt.preventDefault();
 				if (this.validate()) {
-					xhrJson("backend.php", this.getValues(), (reply) => {
+					xhr.json("backend.php", this.getValues(), (reply) => {
 						if (reply && reply.error)
 							Notify.error(reply.error);
 						else
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index 36b0baac5..fc0898085 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -17,7 +17,7 @@ Plugins.Mail = {
 			title: __("Forward article by email"),
 			execute: function () {
 				if (this.validate()) {
-					xhrJson("backend.php", this.attr('value'), (reply) => {
+					xhr.json("backend.php", this.attr('value'), (reply) => {
 						if (reply) {
 							const error = reply['error'];
 
diff --git a/plugins/note/note.js b/plugins/note/note.js
index d2d9c2b01..36bc426cd 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -8,7 +8,7 @@ Plugins.Note = {
 				if (this.validate()) {
 					Notify.progress("Saving article note...", true);
 
-					xhrJson("backend.php", this.attr('value'), (reply) => {
+					xhr.json("backend.php", this.attr('value'), (reply) => {
 						Notify.close();
 						dialog.hide();
 
diff --git a/plugins/share/share.js b/plugins/share/share.js
index a5f60d267..d7b8cd1f9 100644
--- a/plugins/share/share.js
+++ b/plugins/share/share.js
@@ -10,7 +10,7 @@ Plugins.Share = {
 
 					Notify.progress("Trying to change URL...", true);
 
-					xhrJson("backend.php", App.getPhArgs("share", "newkey", {id: id}), (reply) => {
+					xhr.json("backend.php", App.getPhArgs("share", "newkey", {id: id}), (reply) => {
 						if (reply) {
 							const new_link = reply.link;
 							const target = dialog.domNode.querySelector(".target-url");
-- 
cgit v1.2.3-54-g00ecf


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

---
 classes/pref/feeds.php          |   3 +-
 classes/pref/prefs.php          |  42 ++++++-------
 classes/rpc.php                 |   8 +++
 js/App.js                       | 134 ++++++++++++++++++++--------------------
 js/CommonDialogs.js             |   4 +-
 js/CommonFilters.js             |  28 ++++-----
 js/Feeds.js                     |  20 +++---
 js/Headlines.js                 |  34 ++++------
 js/PrefFeedTree.js              |   8 +--
 js/PrefFilterTree.js            |   6 +-
 js/PrefHelpers.js               |  29 +++++----
 js/PrefLabelTree.js             |   4 +-
 js/PrefUsers.js                 |  16 ++---
 js/common.js                    |   5 +-
 js/prefs.js                     |   1 +
 plugins/af_proxy_http/init.php  |   4 +-
 plugins/af_psql_trgm/init.js    |   6 +-
 plugins/af_psql_trgm/init.php   |   4 +-
 plugins/af_readability/init.php |   4 +-
 plugins/af_redditimgur/init.php |   4 +-
 plugins/mail/init.php           |   4 +-
 plugins/mail/mail.js            |   6 +-
 plugins/mailto/init.js          |   6 +-
 plugins/note/note.js            |   6 +-
 plugins/nsfw/init.php           |   4 +-
 plugins/share/share.js          |  10 +--
 plugins/share/share_prefs.js    |   6 +-
 prefs.php                       |   5 +-
 themes/compact.css              |  11 ++++
 themes/compact_night.css        |  11 ++++
 themes/light.css                |  11 ++++
 themes/light/tt-rss.less        |  13 ++++
 themes/night.css                |  11 ++++
 themes/night_blue.css           |  11 ++++
 34 files changed, 275 insertions(+), 204 deletions(-)

(limited to 'plugins')

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


From d445530fa08cdbe2088150a3e7d23596eab9b142 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 17:15:22 +0300
Subject: format note on the client

---
 classes/article.php   | 15 ---------------
 classes/feeds.php     |  5 -----
 js/Article.js         |  7 ++++++-
 js/Headlines.js       |  2 +-
 js/common.js          |  4 ++--
 plugins/note/init.php |  9 +++------
 plugins/note/note.js  | 14 ++++++--------
 7 files changed, 18 insertions(+), 38 deletions(-)

(limited to 'plugins')

diff --git a/classes/article.php b/classes/article.php
index 1e90c843e..e64c17a32 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -419,21 +419,6 @@ class Article extends Handler_Protected {
 		return $tags;
 	}
 
-	static function _format_note_html($id, $note, $allow_edit = true) {
-		if ($allow_edit) {
-			$onclick = "onclick='Plugins.Note.edit($id)'";
-			$note_class = 'editable';
-		} else {
-			$onclick = '';
-			$note_class = '';
-		}
-
-		return "<div class='article-note $note_class'>
-			<i class='material-icons'>note</i>
-			<div $onclick class='body'>$note</div>
-			</div>";
-	}
-
 	function getmetadatabyid() {
 		$id = clean($_REQUEST['id']);
 
diff --git a/classes/feeds.php b/classes/feeds.php
index 5ad21ded9..b95ade2f5 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -260,11 +260,6 @@ class Feeds extends Handler_Protected {
 
 				$this->_mark_timestamp("   disk_cache_rewrite");
 
-				if ($line['note'])
-					$line['note'] = Article::_format_note_html($id, $line['note']);
-				else
-					$line['note'] = "";
-
 				$this->_mark_timestamp("   note");
 
 				if (!get_pref("CDM_EXPANDED")) {
diff --git a/js/Article.js b/js/Article.js
index 21973518c..d039882ec 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -130,6 +130,11 @@ const Article = {
 
 		Headlines.toggleUnread(id, 0);
 	},
+	renderNote: function (id, note) {
+		return `<div class="article-note" data-note-for="${id}" style="display : ${note ? "" : "none"}">
+				${App.FormFields.icon('note')} <div onclick class='body'>${note ? App.escapeHtml(note) : ""}</div>
+			</div>`;
+	},
 	renderTags: function (id, tags) {
 		const tags_short = tags.length > 5 ? tags.slice(0, 5) : tags;
 
@@ -300,7 +305,7 @@ const Article = {
 							<div class="buttons right">${hl.buttons}</div>
 						</div>
 					</div>
-					<div id="POSTNOTE-${hl.id}">${hl.note}</div>
+					${Article.renderNote(hl.id, hl.note)}
 					<div class="content" lang="${hl.lang ? hl.lang : 'en'}">
 						${hl.content}
 						${Article.renderEnclosures(hl.enclosures)}
diff --git a/js/Headlines.js b/js/Headlines.js
index 9bc5747c2..60066164f 100755
--- a/js/Headlines.js
+++ b/js/Headlines.js
@@ -483,7 +483,7 @@ const Headlines = {
 						</div>
 
 						<div class="content" onclick="return Headlines.click(event, ${hl.id}, true);">
-							<div id="POSTNOTE-${hl.id}">${hl.note}</div>
+							${Article.renderNote(hl.id, hl.note)}
 							<div class="content-inner" lang="${hl.lang ? hl.lang : 'en'}">
 								<img src="${App.getInitParam('icon_indicator_white')}">
 							</div>
diff --git a/js/common.js b/js/common.js
index e88b62602..e616c70ba 100755
--- a/js/common.js
+++ b/js/common.js
@@ -71,9 +71,9 @@ Element.prototype.fadeOut = function() {
 	}());
 };
 
-Element.prototype.fadeIn = function(display){
+Element.prototype.fadeIn = function(display = undefined){
 	this.style.opacity = 0;
-	this.style.display = display || "block";
+	this.style.display = display == undefined ? "block" : display;
 	const self = this;
 
 	(function fade() {
diff --git a/plugins/note/init.php b/plugins/note/init.php
index 278cfe6c3..f4bdf45bc 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -55,17 +55,14 @@ class Note extends Plugin {
 	}
 
 	function setNote() {
-		$id = $_REQUEST["id"];
-		$note = trim(strip_tags($_REQUEST["note"]));
+		$id = (int)clean($_REQUEST["id"]);
+		$note = clean($_REQUEST["note"]);
 
 		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET note = ?
 			WHERE ref_id = ? AND owner_uid = ?");
 		$sth->execute([$note, $id, $_SESSION['uid']]);
 
-		$formatted_note = Article::_format_note_html($id, $note);
-
-		print json_encode(array("note" => $formatted_note,
-				"raw_length" => mb_strlen($note)));
+		print json_encode(["id" => $id, "note" => $note]);
 	}
 
 	function api_version() {
diff --git a/plugins/note/note.js b/plugins/note/note.js
index d42fca2c1..a46acb355 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -13,16 +13,14 @@ Plugins.Note = {
 						dialog.hide();
 
 						if (reply) {
-							const elem = App.byId("POSTNOTE-" + id);
+							App.findAll(`div[data-note-for="${reply.id}"]`).forEach((elem) => {
+								elem.querySelector(".body").innerHTML = reply.note;
 
-							if (elem) {
-								elem.innerHTML = reply.note;
-
-								if (reply.raw_length != 0)
-									Element.show(elem);
+								if (reply.note)
+									elem.show();
 								else
-									Element.hide(elem);
-							}
+									elem.hide();
+							});
 						}
 					});
 				}
-- 
cgit v1.2.3-54-g00ecf


From 5cec4eb0155735a2367701c5ae3a09f54e835a90 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 18:47:50 +0300
Subject: af_readability: fix selector

---
 plugins/af_readability/init.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_readability/init.js b/plugins/af_readability/init.js
index 5297416b3..0232ed32d 100644
--- a/plugins/af_readability/init.js
+++ b/plugins/af_readability/init.js
@@ -1,9 +1,11 @@
+/* global xhr, App, Plugins, Article, Notify */
+
 Plugins.Af_Readability = {
     orig_attr_name: 'data-readability-orig-content',
     self: this,
     embed: function(id) {
-        const content = App.find(App.isCombinedMode() ? ".cdm[data-article-id=" + id + "] .content-inner" :
-            ".post[data-article-id=" + id + "] .content");
+        const content = App.find(App.isCombinedMode() ? `.cdm[data-article-id="${id}"] .content-inner` :
+            `.post[data-article-id="${id}"] .content`);
 
         if (content.hasAttribute(self.orig_attr_name)) {
             content.innerHTML = content.getAttribute(self.orig_attr_name);
-- 
cgit v1.2.3-54-g00ecf


From cf249d7e8c55542ca6383b430ec77f07401e96ea Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 19:29:43 +0300
Subject: modify classname helpers to use element.classList; fix feed debugger
 & share--get

---
 classes/feeds.php      | 9 ++++-----
 js/common.js           | 6 +++---
 plugins/share/init.php | 1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins')

diff --git a/classes/feeds.php b/classes/feeds.php
index 98a9ed249..0c01ff25a 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -626,11 +626,10 @@ class Feeds extends Handler_Protected {
 					]
 				};
 			</script>
-			<?php
-				echo javascript_tag("js/utility.js");
-				echo javascript_tag("lib/dojo/dojo.js");
-				echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			?>
+			<?= javascript_tag("js/utility.js") ?>
+			<?= javascript_tag("js/common.js") ?>
+			<?= javascript_tag("lib/dojo/dojo.js") ?>
+			<?= javascript_tag("lib/dojo/tt-rss-layer.js") ?>
 		</head>
 		<body class="flat ttrss_utility feed_debugger css_loading">
 		<script type="text/javascript">
diff --git a/js/common.js b/js/common.js
index e616c70ba..6e8168357 100755
--- a/js/common.js
+++ b/js/common.js
@@ -17,15 +17,15 @@ function $$(query) {
 
 
 Element.prototype.hasClassName = function(className) {
-	return dojo.hasClass(this, className);
+	return this.classList.contains(className);
 };
 
 Element.prototype.addClassName = function(className) {
-	return dojo.addClass(this, className);
+	return this.classList.add(className);
 };
 
 Element.prototype.removeClassName = function(className) {
-	return dojo.removeClass(this, className);
+	return this.classList.remove(className);
 };
 
 Element.prototype.toggleClassName = function(className) {
diff --git a/plugins/share/init.php b/plugins/share/init.php
index 0c975cfdd..37799fba6 100644
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -156,6 +156,7 @@ class Share extends Plugin {
 				<head>
 					<meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
 					<title><?= $line["title"] ?></title>
+					<?= javascript_tag("js/common.js") ?>
 					<?= javascript_tag("js/utility.js") ?>
 					<style type='text/css'>
 						@media (prefers-color-scheme: dark) {
-- 
cgit v1.2.3-54-g00ecf


From fc0ebf089189ca42875d31b1bec4aa1c27852506 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 20:21:36 +0300
Subject: move bookmarklet-related methods out of public.php into the plugin

---
 classes/handler/public.php    | 321 +---------------------------------------
 classes/pluginhost.php        |   4 +-
 classes/userhelper.php        |   2 +-
 include/controls.php          |   4 +
 plugins/bookmarklets/init.php | 331 +++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 335 insertions(+), 327 deletions(-)

(limited to 'plugins')

diff --git a/classes/handler/public.php b/classes/handler/public.php
index de3165e2f..62543859c 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -98,7 +98,7 @@ class Handler_Public extends Handler {
 
 				$tpl->setVariable('ARTICLE_ID',
 					htmlspecialchars($orig_guid ? $line['link'] :
-							$this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
+							$this->_make_article_tag_uri($line['id'], $line['date_entered'])), true);
 				$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
 				$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
 				$tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
@@ -346,165 +346,6 @@ class Handler_Public extends Handler {
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK);
 	}
 
-	function sharepopup() {
-		if (SINGLE_USER_MODE) {
-			UserHelper::login_sequence();
-		}
-
-		header('Content-Type: text/html; charset=utf-8');
-		?>
-		<!DOCTYPE html>
-		<html>
-		<head>
-			<title><?= __("Share with Tiny Tiny RSS") ?></title>
-			<?php
-			echo javascript_tag("lib/dojo/dojo.js");
-			echo javascript_tag("js/utility.js");
-			echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			?>
-			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
-			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
-			<style type="text/css">
-				@media (prefers-color-scheme: dark) {
-					body {
-						background : #303030;
-					}
-				}
-
-				body.css_loading * {
-					display : none;
-				}
-			</style>
-		</head>
-		<body class='flat ttrss_utility share_popup css_loading'>
-		<script type="text/javascript">
-			const UtilityApp = {
-				init: function() {
-				  	require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox', 'dijit/form/Form',
-						'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'], function(parser, ready){
-						ready(function() {
-							parser.parse();
-
-							/* new Ajax.Autocompleter('labels_value', 'labels_choices',
-								"backend.php?op=rpc&method=completeLabels",
-								{ tokens: ',', paramName: "search" });
-							}); */
-				  	});
-				}
-			};
-		</script>
-		<div class="content">
-
-		<?php
-
-		$action = clean($_REQUEST["action"]);
-
-		if ($_SESSION["uid"]) {
-
-			if ($action == 'share') {
-
-				$title = strip_tags(clean($_REQUEST["title"]));
-				$url = strip_tags(clean($_REQUEST["url"]));
-				$content = strip_tags(clean($_REQUEST["content"]));
-				$labels = strip_tags(clean($_REQUEST["labels"]));
-
-				Article::_create_published_article($title, $url, $content, $labels,
-					$_SESSION["uid"]);
-
-				print "<script type='text/javascript'>";
-				print "window.close();";
-				print "</script>";
-
-			} else {
-				$title = htmlspecialchars(clean($_REQUEST["title"]));
-				$url = htmlspecialchars(clean($_REQUEST["url"]));
-
-				?>
-				<form id='share_form' name='share_form'>
-
-					<input type="hidden" name="op" value="sharepopup">
-					<input type="hidden" name="action" value="share">
-
-					<fieldset>
-						<label><?= __("Title:") ?></label>
-						<input style='width : 270px' dojoType='dijit.form.TextBox' name='title' value="<?= $title ?>">
-					</fieldset>
-
-					<fieldset>
-						<label><?= __("URL:") ?></label>
-						<input style='width : 270px' name='url' dojoType='dijit.form.TextBox' value="<?= $url ?>">
-					</fieldset>
-
-					<fieldset>
-						<label><?= __("Content:") ?></label>
-						<input style='width : 270px' name='content' dojoType='dijit.form.TextBox' value="">
-					</fieldset>
-
-					<fieldset>
-						<label><?= __("Labels:") ?></label>
-						<input style='width : 270px' name='labels' dojoType='dijit.form.TextBox' id="labels_value"
-						   placeholder='Alpha, Beta, Gamma' value="">
-						<div class="autocomplete" id="labels_choices"
-							 style="display : block"></div>
-					</fieldset>
-
-					<hr/>
-
-					<fieldset>
-						<button dojoType='dijit.form.Button' class="alt-primary" type="submit"><?= __('Share') ?></button>
-						<button dojoType='dijit.form.Button' onclick="return window.close()"><?= __('Cancel') ?></button>
-						<span class="text-muted small"><?= __("Shared article will appear in the Published feed.") ?></span>
-					</fieldset>
-
-				</form>
-				<?php
-
-			}
-
-		} else {
-
-			$return = urlencode(make_self_url());
-
-			?>
-
-			<?php print_error("Not logged in"); ?>
-
-			<form action="public.php?return=<?= $return ?>" method="post">
-
-				<input type="hidden" name="op" value="login">
-
-				<fieldset>
-					<label><?= __("Login:") ?></label>
-					<input name="login" id="login" dojoType="dijit.form.TextBox" type="text"
-						   onchange="fetchProfiles()" onfocus="fetchProfiles()" onblur="fetchProfiles()"
-						   required="1" value="<?= $_SESSION["fake_login"] ?>" />
-				</fieldset>
-
-				<fieldset>
-					<label><?= __("Password:") ?></label>
-
-					<input type="password" name="password" required="1"
-						   dojoType="dijit.form.TextBox"
-						   class="input input-text"
-						   value="<?= $_SESSION["fake_password"] ?>"/>
-				</fieldset>
-
-				<hr/>
-
-				<fieldset>
-					<label> </label>
-
-					<button dojoType="dijit.form.Button" type="submit" class="alt-primary"><?= __('Log in') ?></button>
-				</fieldset>
-
-			</form>
-			<?php
-		}
-
-		print "</div></body></html>";
-	}
-
 	function login() {
 		if (!SINGLE_USER_MODE) {
 
@@ -565,160 +406,6 @@ class Handler_Public extends Handler {
 		}
 	}
 
-	function subscribe() {
-		if (SINGLE_USER_MODE) {
-			UserHelper::login_sequence();
-		}
-
-		if (!empty($_SESSION["uid"])) {
-
-			$feed_url = clean($_REQUEST["feed_url"] ?? "");
-			$csrf_token = clean($_POST["csrf_token"] ?? "");
-
-			header('Content-Type: text/html; charset=utf-8');
-			?>
-			<!DOCTYPE html>
-			<html>
-			<head>
-				<title>Tiny Tiny RSS</title>
-				<?php
-					echo javascript_tag("js/utility.js");
-					echo javascript_tag("lib/dojo/dojo.js");
-					echo javascript_tag("lib/dojo/tt-rss-layer.js");
-				?>
-				<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-				<link rel="shortcut icon" type="image/png" href="images/favicon.png">
-				<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
-				<style type="text/css">
-					@media (prefers-color-scheme: dark) {
-						body {
-							background : #303030;
-						}
-					}
-
-					body.css_loading * {
-						display : none;
-					}
-				</style>
-			</head>
-			<body class='flat ttrss_utility css_loading'>
-			<script type="text/javascript">
-				const UtilityApp = {
-					init: function() {
-                        require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox', 'dijit/form/Form',
-                            'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'], function(parser, ready){
-                            ready(function() {
-                                parser.parse();
-                            });
-                        });
-					}
-				};
-			</script>
-			<div class="container">
-			<h1><?= __("Subscribe to feed...") ?></h1>
-			<div class='content'>
-			<?php
-
-			if (!$feed_url || !validate_csrf($csrf_token)) {
-				?>
-				<form method="post">
-					<input type="hidden" name="op" value="subscribe">
-					<?= \Controls\hidden_tag("csrf_token", $_SESSION["csrf_token"]) ?>
-					<fieldset>
-						<label>Feed or site URL:</label>
-						<input style="width: 300px" dojoType="dijit.form.ValidationTextBox" required="1" name="feed_url" value="<?= htmlspecialchars($feed_url) ?>">
-					</fieldset>
-
-					<button class="alt-primary" dojoType="dijit.form.Button" type="submit">
-						<?= __("Subscribe") ?>
-					</button>
-
-					<a href="index.php"><?= __("Return to Tiny Tiny RSS") ?></a>
-				</form>
-				<?php
-			} else {
-
-				$rc = Feeds::_subscribe($feed_url);
-				$feed_urls = false;
-
-				switch ($rc['code']) {
-					case 0:
-						print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 1:
-						print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 2:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
-						break;
-					case 3:
-						print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
-						break;
-					case 4:
-						$feed_urls = $rc["feeds"];
-						break;
-					case 5:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
-						break;
-				}
-
-				if ($feed_urls) {
-
-					print "<form action='public.php'>";
-					print "<input type='hidden' name='op' value='subscribe'>";
-					print \Controls\hidden_tag("csrf_token", $_SESSION["csrf_token"]);
-
-					print "<fieldset>";
-					print "<label style='display : inline'>" . __("Multiple feed URLs found:") . "</label>";
-					print "<select name='feed_url' dojoType='dijit.form.Select'>";
-
-					foreach ($feed_urls as $url => $name) {
-						$url = htmlspecialchars($url);
-						$name = htmlspecialchars($name);
-
-						print "<option value=\"$url\">$name</option>";
-					}
-
-					print "</select>";
-					print "</fieldset>";
-
-					print "<button class='alt-primary' dojoType='dijit.form.Button' type='submit'>".__("Subscribe to selected feed")."</button>";
-					print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
-
-					print "</form>";
-				}
-
-				$tp_uri = get_self_url_prefix() . "/prefs.php";
-
-				if ($rc['code'] <= 2){
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
-					feed_url = ? AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
-					$row = $sth->fetch();
-
-					$feed_id = $row["id"];
-				} else {
-					$feed_id = 0;
-				}
-
-				if ($feed_id) {
-					print "<form method='GET' action=\"$tp_uri\">
-					<input type='hidden' name='tab' value='feeds'>
-					<input type='hidden' name='method' value='editfeed'>
-					<input type='hidden' name='methodparam' value='$feed_id'>
-					<button dojoType='dijit.form.Button' class='alt-info' type='submit'>".__("Edit subscription options")."</button>
-					<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
-					</form>";
-				}
-			}
-
-			print "</div></div></body></html>";
-
-		} else {
-			$this->render_login_form();
-		}
-	}
-
 	function index() {
 		header("Content-Type: text/plain");
 		print error_json(13);
@@ -928,7 +615,7 @@ class Handler_Public extends Handler {
 
 		if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
 			$_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
-			$this->render_login_form();
+			$this->_render_login_form();
 			exit;
 		}
 
@@ -1066,7 +753,7 @@ class Handler_Public extends Handler {
 		}
 	}
 
-	private function make_article_tag_uri($id, $timestamp) {
+	private function _make_article_tag_uri($id, $timestamp) {
 
 		$timestamp = date("Y-m-d", strtotime($timestamp));
 
@@ -1108,7 +795,7 @@ class Handler_Public extends Handler {
 		}
 	}
 
-	static function render_login_form() {
+	static function _render_login_form() {
 		header('Cache-Control: public');
 
 		require_once "login_form.php";
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 065fa99c4..d50c5a706 100755
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -599,7 +599,7 @@ class PluginHost {
 	}
 
 	// handled by classes/pluginhandler.php, requires valid session
-	function get_method_url(Plugin $sender, string $method, $params)  {
+	function get_method_url(Plugin $sender, string $method, $params = [])  {
 		return get_self_url_prefix() . "/backend.php?" .
 			http_build_query(
 				array_merge(
@@ -623,7 +623,7 @@ class PluginHost {
 	} */
 
 	// WARNING: endpoint in public.php, exposed to unauthenticated users
-	function get_public_method_url(Plugin $sender, string $method, $params)  {
+	function get_public_method_url(Plugin $sender, string $method, $params = [])  {
 		if ($sender->is_public_method($method)) {
 			return get_self_url_prefix() . "/public.php?" .
 				http_build_query(
diff --git a/classes/userhelper.php b/classes/userhelper.php
index 42d50a0f4..7fe1e5557 100644
--- a/classes/userhelper.php
+++ b/classes/userhelper.php
@@ -107,7 +107,7 @@ class UserHelper {
 				if (empty($_SESSION["uid"])) {
 					UserHelper::logout();
 
-					Handler_Public::render_login_form();
+					Handler_Public::_render_login_form();
 					exit;
 				}
 
diff --git a/include/controls.php b/include/controls.php
index a60b1e0b0..ae5fba739 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -16,6 +16,10 @@
       return hidden_tag("op", strtolower(get_class($plugin) . \PluginHost::PUBLIC_METHOD_DELIMITER . $method));
    } */
 
+   function public_method_tags(\Plugin $plugin, string $method) {
+      return hidden_tag("op", strtolower(get_class($plugin) . \PluginHost::PUBLIC_METHOD_DELIMITER . $method));
+   }
+
    function pluginhandler_tags(\Plugin $plugin, string $method) {
       return hidden_tag("op", "pluginhandler") .
                hidden_tag("plugin", strtolower(get_class($plugin))) .
diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php
index a9dc3e69d..4c3bbf4cc 100644
--- a/plugins/bookmarklets/init.php
+++ b/plugins/bookmarklets/init.php
@@ -16,21 +16,338 @@ class Bookmarklets extends Plugin {
 		$host->add_hook($host::HOOK_PREFS_TAB, $this);
 	}
 
-	private function subscribe_to_feed_url() {
-		$url_path = get_self_url_prefix() .
-			"/public.php?op=subscribe&feed_url=%s";
-		return $url_path;
+	function is_public_method($method) {
+		return in_array($method, ["subscribe", "sharepopup"]);
 	}
 
+	function subscribe() {
+		if (SINGLE_USER_MODE) {
+			UserHelper::login_sequence();
+		}
+
+		if (!empty($_SESSION["uid"])) {
+
+			$feed_url = clean($_REQUEST["feed_url"] ?? "");
+			$csrf_token = clean($_POST["csrf_token"] ?? "");
+
+			header('Content-Type: text/html; charset=utf-8');
+			?>
+			<!DOCTYPE html>
+			<html>
+			<head>
+				<title><?= __("Subscribe to feed...") ?></title>
+				<?= javascript_tag("lib/dojo/dojo.js") ?>
+				<?= javascript_tag("js/utility.js") ?>
+				<?= javascript_tag("js/common.js") ?>
+				<?= javascript_tag("lib/dojo/tt-rss-layer.js") ?>
+				<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+				<link rel="shortcut icon" type="image/png" href="images/favicon.png">
+				<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
+				<style type="text/css">
+					@media (prefers-color-scheme: dark) {
+						body {
+							background : #303030;
+						}
+					}
+
+					body.css_loading * {
+						display : none;
+					}
+				</style>
+			</head>
+			<body class='flat ttrss_utility css_loading'>
+			<script type="text/javascript">
+				const UtilityApp = {
+					init: function() {
+                        require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox', 'dijit/form/Form',
+                            'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'], function(parser, ready){
+                            ready(function() {
+                                parser.parse();
+                            });
+                        });
+					}
+				};
+			</script>
+			<div class="container">
+			<h1><?= __("Subscribe to feed...") ?></h1>
+			<div class='content'>
+			<?php
+
+			if (!$feed_url || !validate_csrf($csrf_token)) {
+				?>
+				<form method="post" action='public.php'>
+					<?= \Controls\public_method_tags($this, "subscribe") ?>
+					<?= \Controls\hidden_tag("csrf_token", $_SESSION["csrf_token"]) ?>
+
+					<fieldset>
+						<label>Feed or site URL:</label>
+						<input style="width: 300px" dojoType="dijit.form.ValidationTextBox" required="1" name="feed_url" value="<?= htmlspecialchars($feed_url) ?>">
+					</fieldset>
+
+					<button class="alt-primary" dojoType="dijit.form.Button" type="submit">
+						<?= __("Subscribe") ?>
+					</button>
+
+					<a href="index.php"><?= __("Return to Tiny Tiny RSS") ?></a>
+				</form>
+				<?php
+			} else {
+
+				$rc = Feeds::_subscribe($feed_url);
+				$feed_urls = false;
+
+				switch ($rc['code']) {
+					case 0:
+						print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
+						break;
+					case 1:
+						print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
+						break;
+					case 2:
+						print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
+						break;
+					case 3:
+						print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
+						break;
+					case 4:
+						$feed_urls = $rc["feeds"];
+						break;
+					case 5:
+						print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
+						break;
+				}
+
+				if ($feed_urls) {
+
+					print "<form method='post' action='public.php'>";
+					print \Controls\public_method_tags($this, "subscribe");
+					print \Controls\hidden_tag("csrf_token", $_SESSION["csrf_token"]);
+
+					print "<fieldset>";
+					print "<label style='display : inline'>" . __("Multiple feed URLs found:") . "</label>";
+					print "<select name='feed_url' dojoType='dijit.form.Select'>";
+
+					foreach ($feed_urls as $url => $name) {
+						$url = htmlspecialchars($url);
+						$name = htmlspecialchars($name);
+
+						print "<option value=\"$url\">$name</option>";
+					}
+
+					print "</select>";
+					print "</fieldset>";
+
+					print "<button class='alt-primary' dojoType='dijit.form.Button' type='submit'>".__("Subscribe to selected feed")."</button>";
+					print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+
+					print "</form>";
+				}
+
+				$tp_uri = get_self_url_prefix() . "/prefs.php";
+
+				if ($rc['code'] <= 2){
+					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+					feed_url = ? AND owner_uid = ?");
+					$sth->execute([$feed_url, $_SESSION['uid']]);
+					$row = $sth->fetch();
+
+					$feed_id = $row["id"];
+				} else {
+					$feed_id = 0;
+				}
+
+				if ($feed_id) {
+					print "<form method='GET' action=\"$tp_uri\">
+					<input type='hidden' name='tab' value='feeds'>
+					<input type='hidden' name='method' value='editfeed'>
+					<input type='hidden' name='methodparam' value='$feed_id'>
+					<button dojoType='dijit.form.Button' class='alt-info' type='submit'>".__("Edit subscription options")."</button>
+					<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
+					</form>";
+				}
+			}
+
+			print "</div></div></body></html>";
+		} else {
+			Handler_Public::_render_login_form();
+		}
+	}
+
+	function sharepopup() {
+		if (SINGLE_USER_MODE) {
+			UserHelper::login_sequence();
+		}
+
+		header('Content-Type: text/html; charset=utf-8');
+		?>
+		<!DOCTYPE html>
+		<html>
+		<head>
+			<title><?= __("Share with Tiny Tiny RSS") ?></title>
+			<?= javascript_tag("lib/dojo/dojo.js") ?>
+			<?= javascript_tag("js/utility.js") ?>
+			<?= javascript_tag("js/common.js") ?>
+			<?= javascript_tag("lib/dojo/tt-rss-layer.js") ?>
+			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
+			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
+			<style type="text/css">
+				@media (prefers-color-scheme: dark) {
+					body {
+						background : #303030;
+					}
+				}
+
+				body.css_loading * {
+					display : none;
+				}
+			</style>
+		</head>
+		<body class='flat ttrss_utility share_popup css_loading'>
+			<script type="text/javascript">
+				const UtilityApp = {
+					init: function() {
+						require(['dojo/parser', "dojo/ready", 'dijit/form/Button','dijit/form/CheckBox', 'dijit/form/Form',
+							'dijit/form/Select','dijit/form/TextBox','dijit/form/ValidationTextBox'], function(parser, ready){
+							ready(function() {
+								parser.parse();
+
+								/* new Ajax.Autocompleter('labels_value', 'labels_choices',
+									"backend.php?op=rpc&method=completeLabels",
+									{ tokens: ',', paramName: "search" }); */
+								});
+						});
+					}
+				};
+			</script>
+		<div class="content">
+
+		<?php
+			if ($_SESSION["uid"]) {
+
+				$action = clean($_REQUEST["action"] ?? "");
+
+				if ($action == 'share') {
+
+					$title = strip_tags(clean($_REQUEST["title"]));
+					$url = strip_tags(clean($_REQUEST["url"]));
+					$content = strip_tags(clean($_REQUEST["content"]));
+					$labels = strip_tags(clean($_REQUEST["labels"]));
+
+					Article::_create_published_article($title, $url, $content, $labels,
+						$_SESSION["uid"]);
+
+					print "<script type='text/javascript'>";
+					print "window.close();";
+					print "</script>";
+
+				} else {
+					$title = htmlspecialchars(clean($_REQUEST["title"]));
+					$url = htmlspecialchars(clean($_REQUEST["url"]));
+
+					?>
+					<form method='post' action='public.php'>
+
+						<?= \Controls\public_method_tags($this, "sharepopup") ?>
+						<?= \Controls\hidden_tag("csrf_token", $_SESSION["csrf_token"]) ?>
+						<?= \Controls\hidden_tag("action", "share") ?>
+
+						<fieldset>
+							<label><?= __("Title:") ?></label>
+							<input style='width : 270px' dojoType='dijit.form.TextBox' name='title' value="<?= $title ?>">
+						</fieldset>
+
+						<fieldset>
+							<label><?= __("URL:") ?></label>
+							<input style='width : 270px' name='url' dojoType='dijit.form.TextBox' value="<?= $url ?>">
+						</fieldset>
+
+						<fieldset>
+							<label><?= __("Content:") ?></label>
+							<input style='width : 270px' name='content' dojoType='dijit.form.TextBox' value="">
+						</fieldset>
+
+						<fieldset>
+							<label><?= __("Labels:") ?></label>
+							<input style='width : 270px' name='labels' dojoType='dijit.form.TextBox' id="labels_value"
+								placeholder='Alpha, Beta, Gamma' value="">
+							<!-- <div class="autocomplete" id="labels_choices"
+								style="display : block"></div> -->
+						</fieldset>
+
+						<hr/>
+
+						<fieldset>
+							<?= \Controls\submit_tag(__("Share")) ?>
+							<?= \Controls\button_tag(__("Cancel"), "", ["onclick" => "window.close()"]) ?>
+							<span class="text-muted small"><?= __("Shared article will appear in the Published feed.") ?></span>
+						</fieldset>
+
+					</form>
+					<?php
+
+				}
+
+			} else {
+				print_error("Not logged in");
+			?>
+
+			<form action="public.php?return=<?= urlencode(make_self_url()) ?>" method="post">
+
+				<input type="hidden" name="op" value="login">
+
+				<fieldset>
+					<label><?= __("Login:") ?></label>
+					<input name="login" id="login" dojoType="dijit.form.TextBox" type="text"
+							onchange="fetchProfiles()" onfocus="fetchProfiles()" onblur="fetchProfiles()"
+							required="1" value="<?= $_SESSION["fake_login"] ?>" />
+				</fieldset>
+
+				<fieldset>
+					<label><?= __("Password:") ?></label>
+
+					<input type="password" name="password" required="1"
+							dojoType="dijit.form.TextBox"
+							class="input input-text"
+							value="<?= $_SESSION["fake_password"] ?>"/>
+				</fieldset>
+
+				<hr/>
+
+				<fieldset>
+					<label> </label>
+
+					<button dojoType="dijit.form.Button" type="submit" class="alt-primary"><?= __('Log in') ?></button>
+				</fieldset>
+
+			</form>
+			<?php
+			}
+		?>
+		</div>
+		</body>
+		</html>";
+		<?php
+	}
+
+
 	function hook_prefs_tab($args) {
 		if ($args != "prefFeeds")
 			return;
 
-			$bm_subscribe_url = str_replace('%s', '', $this->subscribe_to_feed_url());
+			$bm_subscribe_url = $this->host->get_public_method_url($this, "subscribe");
+			$bm_share_url = $this->host->get_public_method_url($this, "sharepopup");
+
 			$confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?'));
-			$bm_subscribe_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+encodeURIComponent(window.location.href)}");
 
-			$bm_share_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
+			$bm_subscribe_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url&feed_url='+encodeURIComponent(window.location.href)}");
+			$bm_share_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='$bm_share_url',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
+
+			//$bm_subscribe_url = str_replace('%s', '', $this->subscribe_to_feed_url());
+			//$confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?'));
+			//$bm_subscribe_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+encodeURIComponent(window.location.href)}");
+
+			//$bm_share_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
 		?>
 
 		<div dojoType="dijit.layout.AccordionPane"
-- 
cgit v1.2.3-54-g00ecf


From 545bcc3e4b65bb1f0914fd2b548fb62504ecf8c6 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 20 Feb 2021 08:49:40 +0300
Subject: bookmarklets: cleanup some more markup

---
 classes/feeds.php             | 12 ++++++
 plugins/bookmarklets/init.php | 92 ++++++++++++++++++++-----------------------
 2 files changed, 55 insertions(+), 49 deletions(-)

(limited to 'plugins')

diff --git a/classes/feeds.php b/classes/feeds.php
index 0c01ff25a..63b84edae 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1099,6 +1099,18 @@ class Feeds extends Handler_Protected {
 		return false;
 	}
 
+	static function _find_by_url($feed_url, $owner_uid) {
+		$sth = Db::pdo()->prepare("SELECT id FROM ttrss_feeds WHERE
+			feed_url = ? AND owner_uid = ?");
+		$sth->execute([$feed_url, $owner_uid]);
+
+		if ($row = $sth->fetch()) {
+			return $row["id"];
+		}
+
+		return false;
+	}
+
 	static function _get_title($id, $cat = false) {
 	    $pdo = Db::pdo();
 
diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php
index 4c3bbf4cc..caa8b39df 100644
--- a/plugins/bookmarklets/init.php
+++ b/plugins/bookmarklets/init.php
@@ -118,56 +118,54 @@ class Bookmarklets extends Plugin {
 				}
 
 				if ($feed_urls) {
+					?>
+					<form method='post' action='public.php'>
+						<?= \Controls\public_method_tags($this, "subscribe") ?>
+						<?= \Controls\hidden_tag("csrf_token", $_SESSION["csrf_token"]) ?>
 
-					print "<form method='post' action='public.php'>";
-					print \Controls\public_method_tags($this, "subscribe");
-					print \Controls\hidden_tag("csrf_token", $_SESSION["csrf_token"]);
-
-					print "<fieldset>";
-					print "<label style='display : inline'>" . __("Multiple feed URLs found:") . "</label>";
-					print "<select name='feed_url' dojoType='dijit.form.Select'>";
-
-					foreach ($feed_urls as $url => $name) {
-						$url = htmlspecialchars($url);
-						$name = htmlspecialchars($name);
-
-						print "<option value=\"$url\">$name</option>";
-					}
-
-					print "</select>";
-					print "</fieldset>";
-
-					print "<button class='alt-primary' dojoType='dijit.form.Button' type='submit'>".__("Subscribe to selected feed")."</button>";
-					print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+						<fieldset>
+							<label style='display : inline'><?= __("Multiple feed URLs found:") ?></label>
+							<select name='feed_url' dojoType='dijit.form.Select'>
+							<?php foreach ($feed_urls as $url => $name) { ?>
+								<option value="<?= htmlspecialchars($url) ?>"><?= htmlspecialchars($name) ?></option>
+							<?php } ?>
+							</select>
+						</fieldset>
 
-					print "</form>";
+						<button class='alt-primary' dojoType='dijit.form.Button' type='submit'><?= __("Subscribe to selected feed") ?></button>
+						<a href='index.php'><?= __("Return to Tiny Tiny RSS") ?></a>
+					</form>
+					<?php
 				}
 
-				$tp_uri = get_self_url_prefix() . "/prefs.php";
-
-				if ($rc['code'] <= 2){
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
-					feed_url = ? AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
-					$row = $sth->fetch();
-
-					$feed_id = $row["id"];
+				if ($rc['code'] <= 2) {
+					$feed_id = Feeds::_find_by_url($feed_url, $_SESSION["uid"]);
 				} else {
 					$feed_id = 0;
 				}
 
 				if ($feed_id) {
-					print "<form method='GET' action=\"$tp_uri\">
-					<input type='hidden' name='tab' value='feeds'>
-					<input type='hidden' name='method' value='editfeed'>
-					<input type='hidden' name='methodparam' value='$feed_id'>
-					<button dojoType='dijit.form.Button' class='alt-info' type='submit'>".__("Edit subscription options")."</button>
-					<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
-					</form>";
+					?>
+					<form method='GET' action="<?= htmlspecialchars(get_self_url_prefix() . "/prefs.php") ?>">
+						<input type='hidden' name='tab' value='feeds'>
+						<input type='hidden' name='method' value='editfeed'>
+						<input type='hidden' name='methodparam' value="<?= $feed_id ?>">
+						<button dojoType='dijit.form.Button' class='alt-info' type='submit'><?= __("Edit subscription options") ?></button>
+						<a href='index.php'><?= __("Return to Tiny Tiny RSS") ?></a>
+					</form>
+					<?php
+				} else {
+					?>
+					<a href='index.php'><?= __("Return to Tiny Tiny RSS") ?></a>
+					<?php
 				}
 			}
-
-			print "</div></div></body></html>";
+			?>
+			</div>
+		</div>
+		</body>
+		</html>
+			<?php
 		} else {
 			Handler_Public::_render_login_form();
 		}
@@ -237,9 +235,11 @@ class Bookmarklets extends Plugin {
 					Article::_create_published_article($title, $url, $content, $labels,
 						$_SESSION["uid"]);
 
-					print "<script type='text/javascript'>";
-					print "window.close();";
-					print "</script>";
+					?>
+					<script type="text/javascript">
+						window.close();
+					</script>
+					<?php
 
 				} else {
 					$title = htmlspecialchars(clean($_REQUEST["title"]));
@@ -326,7 +326,7 @@ class Bookmarklets extends Plugin {
 		?>
 		</div>
 		</body>
-		</html>";
+		</html>
 		<?php
 	}
 
@@ -342,12 +342,6 @@ class Bookmarklets extends Plugin {
 
 			$bm_subscribe_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url&feed_url='+encodeURIComponent(window.location.href)}");
 			$bm_share_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='$bm_share_url',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
-
-			//$bm_subscribe_url = str_replace('%s', '', $this->subscribe_to_feed_url());
-			//$confirm_str = str_replace("'", "\'", __('Subscribe to %s in Tiny Tiny RSS?'));
-			//$bm_subscribe_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+encodeURIComponent(window.location.href)}");
-
-			//$bm_share_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
 		?>
 
 		<div dojoType="dijit.layout.AccordionPane"
-- 
cgit v1.2.3-54-g00ecf


From 94560132ddf45a5a7c68ce520b40ecb10a6f89fe Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 21 Feb 2021 09:35:07 +0300
Subject: for the most part, deal with filter rules UI

---
 classes/labels.php                  |  15 +-
 classes/pref/filters.php            | 231 +++++++++++++++++++---------
 classes/rpc.php                     |   4 +-
 include/controls.php                |  16 +-
 js/CommonFilters.js                 | 294 +++++++++++++++++++++++++++++++-----
 plugins/auto_assign_labels/init.php |   1 +
 themes/compact.css                  |  20 +--
 themes/compact_night.css            |  20 +--
 themes/light.css                    |  20 +--
 themes/light/tt-rss.less            |   8 +-
 themes/night.css                    |  20 +--
 themes/night_blue.css               |  20 +--
 12 files changed, 495 insertions(+), 174 deletions(-)

(limited to 'plugins')

diff --git a/classes/labels.php b/classes/labels.php
index f72d7d84b..570f24f4f 100644
--- a/classes/labels.php
+++ b/classes/labels.php
@@ -37,7 +37,18 @@ class Labels
 		}
 	}
 
-	static function get_all_labels($owner_uid)	{
+	static function get_as_hash($owner_uid) {
+		$rv = [];
+		$labels = Labels::get_all($owner_uid);
+
+		foreach ($labels as $i => $label) {
+			$rv[$label["id"]] = $labels[$i];
+		}
+
+		return $rv;
+	}
+
+	static function get_all($owner_uid)	{
 		$rv = array();
 
 		$pdo = Db::pdo();
@@ -46,7 +57,7 @@ class Labels
 			WHERE owner_uid = ? ORDER BY caption");
 		$sth->execute([$owner_uid]);
 
-		while ($line = $sth->fetch()) {
+		while ($line = $sth->fetch(PDO::FETCH_ASSOC)) {
 			array_push($rv, $line);
 		}
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 9c250be19..4e52260c9 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -318,6 +318,84 @@ class Pref_Filters extends Handler_Protected {
 			WHERE id = ? AND owner_uid = ?");
 		$sth->execute([$filter_id, $_SESSION['uid']]);
 
+		if (empty($filter_id) || $row = $sth->fetch()) {
+			$rv = [
+				"id" => $filter_id,
+				"enabled" => $row["enabled"] ?? true,
+				"match_any_rule" => $row["match_any_rule"] ?? false,
+				"inverse" => $row["inverse"] ?? false,
+				"title" => $row["title"] ?? "",
+				"rules" => [],
+				"actions" => [],
+				"filter_types" => [],
+				"filter_actions" => [],
+				"labels" => Labels::get_all($_SESSION["uid"])
+			];
+
+			$res = $this->pdo->query("SELECT id,description
+				FROM ttrss_filter_types WHERE id != 5 ORDER BY description");
+
+			while ($line = $res->fetch()) {
+				$rv["filter_types"][$line["id"]] = __($line["description"]);
+			}
+
+			$res = $this->pdo->query("SELECT id,description FROM ttrss_filter_actions
+				ORDER BY name");
+
+			while ($line = $res->fetch()) {
+				$rv["filter_actions"][$line["id"]] = __($line["description"]);
+			}
+
+			if ($filter_id) {
+				$rules_sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2_rules
+					WHERE filter_id = ? ORDER BY reg_exp, id");
+				$rules_sth->execute([$filter_id]);
+
+				while ($rrow = $rules_sth->fetch(PDO::FETCH_ASSOC)) {
+					if ($rrow["match_on"]) {
+						$rrow["feed_id"] = json_decode($rrow["match_on"], true);
+					} else {
+						if ($rrow["cat_filter"]) {
+							$feed_id = "CAT:" . (int)$rrow["cat_id"];
+						} else {
+							$feed_id = (int)$rrow["feed_id"];
+						}
+
+						$rrow["feed_id"] = ["" . $feed_id]; // set item type to string for in_array()
+					}
+
+					unset($rrow["cat_filter"]);
+					unset($rrow["cat_id"]);
+					unset($rrow["filter_id"]);
+					unset($rrow["id"]);
+					if (!$rrow["inverse"]) unset($rrow["inverse"]);
+					unset($rrow["match_on"]);
+
+					$rrow["name"] = $this->_get_rule_name($rrow);
+
+					array_push($rv["rules"], $rrow);
+				}
+
+				$actions_sth = $this->pdo->prepare("SELECT * FROM ttrss_filters2_actions
+					WHERE filter_id = ? ORDER BY id");
+				$actions_sth->execute([$filter_id]);
+
+				while ($arow = $actions_sth->fetch(PDO::FETCH_ASSOC)) {
+					$arow["action_param_label"] = $arow["action_param"];
+
+					unset($arow["filter_id"]);
+					unset($arow["id"]);
+
+					$arow["name"] = $this->_get_action_name($arow);
+
+					array_push($rv["actions"], $arow);
+				}
+			}
+			print json_encode($rv);
+		}
+
+		/*return;
+
 		if (empty($filter_id) || $row = $sth->fetch()) {
 
 			$enabled = $row["enabled"] ?? true;
@@ -475,7 +553,7 @@ class Pref_Filters extends Handler_Protected {
 			}
 
 			print "</footer></form>";
-		}
+		} */
 	}
 
 	private function _get_rule_name($rule) {
@@ -592,8 +670,7 @@ class Pref_Filters extends Handler_Protected {
 		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
 	}
 
-	private function _save_rules_and_actions($filter_id)
-	{
+	private function _save_rules_and_actions($filter_id) {
 
 		$sth = $this->pdo->prepare("DELETE FROM ttrss_filters2_rules WHERE filter_id = ?");
 		$sth->execute([$filter_id]);
@@ -670,7 +747,7 @@ class Pref_Filters extends Handler_Protected {
 		}
 	}
 
-	function add() {
+	function add () {
 		$enabled = checkbox_to_sql_bool(clean($_REQUEST["enabled"] ?? false));
 		$match_any_rule = checkbox_to_sql_bool(clean($_REQUEST["match_any_rule"] ?? false));
 		$title = clean($_REQUEST["title"]);
@@ -764,7 +841,15 @@ class Pref_Filters extends Handler_Protected {
 		<?php
 	}
 
-	function newrule() {
+	function editrule() {
+		$feed_ids = explode(",", clean($_REQUEST["ids"]));
+
+		print json_encode([
+			"multiselect" => $this->feed_multi_select("feed_id", $feed_ids, 'style="width : 500px; height : 300px" dojoType="dijit.form.MultiSelect"')
+		]);
+
+		/*return;
+
 		$rule = json_decode(clean($_REQUEST["rule"]), true);
 
 		if ($rule) {
@@ -818,7 +903,7 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<fieldset>";
 		print "<span id='filterDlg_feeds'>";
-		$this->feed_multi_select("feed_id",
+		print $this->feed_multi_select("feed_id",
 			$feed_id,
 			'style="width : 500px; height : 300px" dojoType="dijit.form.MultiSelect"');
 		print "</span>";
@@ -840,7 +925,7 @@ class Pref_Filters extends Handler_Protected {
 
 		print "</footer>";
 
-		print "</form>";
+		print "</form>";*/
 	}
 
 	function newaction() {
@@ -1071,102 +1156,106 @@ class Pref_Filters extends Handler_Protected {
 						   $attributes = "", $include_all_feeds = true,
 						   $root_id = null, $nest_level = 0) {
 
-	$pdo = Db::pdo();
+		$pdo = Db::pdo();
 
-	//	print_r(in_array("CAT:6",$default_ids));
+		$rv = "";
 
-	if (!$root_id) {
-		print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
-		if ($include_all_feeds) {
-			$is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : "";
-			print "<option $is_selected value=\"0\">".__('All feeds')."</option>";
-		}
-	}
+		//	print_r(in_array("CAT:6",$default_ids));
 
-	if (get_pref('ENABLE_FEED_CATS')) {
+		if (!$root_id) {
+			$rv .= "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
+			if ($include_all_feeds) {
+				$is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : "";
+				$rv .= "<option $is_selected value=\"0\">".__('All feeds')."</option>";
+			}
+		}
 
-		if (!$root_id) $root_id = null;
+		if (get_pref('ENABLE_FEED_CATS')) {
 
-		$sth = $pdo->prepare("SELECT id,title,
-				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
-					c2.parent_cat = ttrss_feed_categories.id) AS num_children
-				FROM ttrss_feed_categories
-				WHERE owner_uid = :uid AND
-				(parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
+			if (!$root_id) $root_id = null;
 
-		$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
+			$sth = $pdo->prepare("SELECT id,title,
+					(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
+						c2.parent_cat = ttrss_feed_categories.id) AS num_children
+					FROM ttrss_feed_categories
+					WHERE owner_uid = :uid AND
+					(parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
 
-		while ($line = $sth->fetch()) {
+			$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
 
-			for ($i = 0; $i < $nest_level; $i++)
-				$line["title"] = " " . $line["title"];
+			while ($line = $sth->fetch()) {
 
-			$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
+				for ($i = 0; $i < $nest_level; $i++)
+					$line["title"] = " " . $line["title"];
 
-			printf("<option $is_selected value='CAT:%d'>%s</option>",
-				$line["id"], htmlspecialchars($line["title"]));
+				$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
 
-			if ($line["num_children"] > 0)
-				$this->feed_multi_select($id, $default_ids, $attributes,
-					$include_all_feeds, $line["id"], $nest_level+1);
+				$rv .= sprintf("<option $is_selected value='CAT:%d'>%s</option>",
+					$line["id"], htmlspecialchars($line["title"]));
 
-			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
-					WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
+				if ($line["num_children"] > 0)
+					$rv .= $this->feed_multi_select($id, $default_ids, $attributes,
+						$include_all_feeds, $line["id"], $nest_level+1);
 
-			$f_sth->execute([$line['id'], $_SESSION['uid']]);
+				$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+						WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
 
-			while ($fline = $f_sth->fetch()) {
-				$is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
+				$f_sth->execute([$line['id'], $_SESSION['uid']]);
 
-				$fline["title"] = " " . $fline["title"];
+				while ($fline = $f_sth->fetch()) {
+					$is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
 
-				for ($i = 0; $i < $nest_level; $i++)
 					$fline["title"] = " " . $fline["title"];
 
-				printf("<option $is_selected value='%d'>%s</option>",
-					$fline["id"], htmlspecialchars($fline["title"]));
-			}
-		}
+					for ($i = 0; $i < $nest_level; $i++)
+						$fline["title"] = " " . $fline["title"];
 
-		if (!$root_id) {
-			$is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : "";
+					$rv .= sprintf("<option $is_selected value='%d'>%s</option>",
+						$fline["id"], htmlspecialchars($fline["title"]));
+				}
+			}
 
-			printf("<option $is_selected value='CAT:0'>%s</option>",
-				__("Uncategorized"));
+			if (!$root_id) {
+				$is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : "";
 
-			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
-					WHERE cat_id IS NULL AND owner_uid = ? ORDER BY title");
-			$f_sth->execute([$_SESSION['uid']]);
+				$rv .= sprintf("<option $is_selected value='CAT:0'>%s</option>",
+					__("Uncategorized"));
 
-			while ($fline = $f_sth->fetch()) {
-				$is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
+				$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+						WHERE cat_id IS NULL AND owner_uid = ? ORDER BY title");
+				$f_sth->execute([$_SESSION['uid']]);
 
-				$fline["title"] = " " . $fline["title"];
+				while ($fline = $f_sth->fetch()) {
+					$is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
 
-				for ($i = 0; $i < $nest_level; $i++)
 					$fline["title"] = " " . $fline["title"];
 
-				printf("<option $is_selected value='%d'>%s</option>",
-					$fline["id"], htmlspecialchars($fline["title"]));
+					for ($i = 0; $i < $nest_level; $i++)
+						$fline["title"] = " " . $fline["title"];
+
+					$rv .= sprintf("<option $is_selected value='%d'>%s</option>",
+						$fline["id"], htmlspecialchars($fline["title"]));
+				}
 			}
-		}
 
-	} else {
-		$sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
-				WHERE owner_uid = ? ORDER BY title");
-		$sth->execute([$_SESSION['uid']]);
+		} else {
+			$sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+					WHERE owner_uid = ? ORDER BY title");
+			$sth->execute([$_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+			while ($line = $sth->fetch()) {
 
-			$is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : "";
+				$is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : "";
 
-			printf("<option $is_selected value='%d'>%s</option>",
-				$line["id"], htmlspecialchars($line["title"]));
+				$rv .= sprintf("<option $is_selected value='%d'>%s</option>",
+					$line["id"], htmlspecialchars($line["title"]));
+			}
 		}
-	}
 
-	if (!$root_id) {
-		print "</select>";
+		if (!$root_id) {
+			$rv .= "</select>";
+		}
+
+		return $rv;
 	}
 }
-}
diff --git a/classes/rpc.php b/classes/rpc.php
index 643ad29d8..20a11b994 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -399,7 +399,7 @@ class RPC extends Handler_Protected {
 
 		$params["icon_indicator_white"] = $this->image_to_base64("images/indicator_white.gif");
 
-		$params["labels"] = Labels::get_all_labels($_SESSION["uid"]);
+		$params["labels"] = Labels::get_all($_SESSION["uid"]);
 
 		return $params;
 	}
@@ -430,7 +430,7 @@ class RPC extends Handler_Protected {
 		$data["max_feed_id"] = (int) $max_feed_id;
 		$data["num_feeds"] = (int) $num_feeds;
 		$data['cdm_expanded'] = get_pref('CDM_EXPANDED');
-		$data["labels"] = Labels::get_all_labels($_SESSION["uid"]);
+		$data["labels"] = Labels::get_all($_SESSION["uid"]);
 
 		if (LOG_DESTINATION == 'sql' && $_SESSION['access_level'] >= 10) {
 			if (DB_TYPE == 'pgsql') {
diff --git a/include/controls.php b/include/controls.php
index ae5fba739..e3349d31b 100755
--- a/include/controls.php
+++ b/include/controls.php
@@ -60,21 +60,11 @@
       return $rv;
    }
 
-   function select_labels(string $name, string $value, array $attributes = [], string $id = "") {
-      $pdo = \Db::pdo();
-
-      $sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
-            WHERE owner_uid = ? ORDER BY caption");
-      $sth->execute([$_SESSION['uid']]);
-
-      $values = [];
-
-      while ($row = $sth->fetch()) {
-         array_push($values, $row["caption"]);
-      }
+   /*function select_labels(string $name, string $value, array $attributes = [], string $id = "") {
+      $values = \Labels::get_as_hash($_SESSION["uid"]);
 
       return select_tag($name, $value, $values, $attributes, $id);
-   }
+   }*/
 
    function select_hash(string $name, $value, array $values, array $attributes = [], string $id = "") {
       $attributes_str = attributes_to_string($attributes);
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index bd6808f59..75e1fa8af 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -7,26 +7,17 @@
 
 /* exported Filters */
 const	Filters = {
-	edit: function(id) { // if no id, new filter dialog
-		let query;
-
-		if (!App.isPrefs()) {
-			query = {
-				op: "pref-filters", method: "edit",
-				feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()
-			};
-		} else {
-			query = {op: "pref-filters", method: "edit", id: id};
-		}
+	edit: function(filter_id = null) { // if no id, new filter dialog
 
 		const dialog = new fox.SingleUseDialog({
 			id: "filterEditDlg",
-			title: id ? __("Edit Filter") : __("Create Filter"),
+			title: filter_id ? __("Edit Filter") : __("Create Filter"),
 			ACTION_TAG: 4,
 			ACTION_SCORE: 6,
 			ACTION_LABEL: 7,
 			ACTION_PLUGIN: 9,
 			PARAM_ACTIONS: [4, 6, 7, 9],
+			filter_info: {},
 			test: function() {
 				const test_dialog = new fox.SingleUseDialog({
 					title: "Test Filter",
@@ -116,16 +107,17 @@ const	Filters = {
 
 				test_dialog.show();
 			},
-			createNewRuleElement: function(parentNode, replaceNode) {
+			insertRule: function(parentNode, replaceNode) {
 				const rule = dojo.formToJson("filter_new_rule_form");
 
 				xhr.post("backend.php", {op: "pref-filters", method: "printrulename", rule: rule}, (reply) => {
 					try {
 						const li = document.createElement('li');
+						li.addClassName("rule");
 
-						li.innerHTML = `<input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
-								<span onclick='App.dialogOf(this).onRuleClicked(this)'>${reply}</span>
-							${App.FormFields.hidden_tag("rule[]", rule)}`;
+						li.innerHTML = `${App.FormFields.checkbox_tag("", false, {onclick: 'Lists.onRowChecked(this)'})}
+								<span class="name" onclick='App.dialogOf(this).onRuleClicked(this)'>${reply}</span>
+								<span class="payload" >${App.FormFields.hidden_tag("rule[]", rule)}</span>`;
 
 						dojo.parser.parse(li);
 
@@ -139,7 +131,7 @@ const	Filters = {
 					}
 				});
 			},
-			createNewActionElement: function(parentNode, replaceNode) {
+			insertAction: function(parentNode, replaceNode) {
 				const form = document.forms["filter_new_action_form"];
 
 				if (form.action_id.value == 7) {
@@ -153,10 +145,11 @@ const	Filters = {
 				xhr.post("backend.php", { op: "pref-filters", method: "printactionname", action: action }, (reply) => {
 					try {
 						const li = document.createElement('li');
+						li.addClassName("action");
 
-						li.innerHTML = `<input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
-								<span onclick='App.dialogOf(this).onActionClicked(this)'>${reply}</span>
-							${App.FormFields.hidden_tag("action[]", action)}`;
+						li.innerHTML = `${App.FormFields.checkbox_tag("", false, {onclick: 'Lists.onRowChecked(this)'})}
+								<span class="name" onclick='App.dialogOf(this).onActionClicked(this)'>${reply}</span>
+								<span class="payload">${App.FormFields.hidden_tag("action[]", action)}</span>`;
 
 						dojo.parser.parse(li);
 
@@ -171,30 +164,84 @@ const	Filters = {
 					}
 				});
 			},
-			editRule: function(replaceNode, ruleStr) {
+			editRule: function(replaceNode, ruleStr = null) {
 				const edit_rule_dialog = new fox.SingleUseDialog({
 					id: "filterNewRuleDlg",
 					title: ruleStr ? __("Edit rule") : __("Add rule"),
 					execute: function () {
 						if (this.validate()) {
-							dialog.createNewRuleElement(App.byId("filterDlg_Matches"), replaceNode);
+							dialog.insertRule(App.byId("filterDlg_Matches"), replaceNode);
 							this.hide();
 						}
 					},
 					content: __('Loading, please wait...'),
 				});
 
-				const tmph = dojo.connect(edit_rule_dialog, "onShow", null, function (/* e */) {
+				const tmph = dojo.connect(edit_rule_dialog, "onShow", null, function () {
 					dojo.disconnect(tmph);
 
-					xhr.post("backend.php", {op: 'pref-filters', method: 'newrule', rule: ruleStr}, (reply) => {
-						edit_rule_dialog.attr('content', reply);
+					let rule;
+
+					if (ruleStr) {
+						rule = JSON.parse(ruleStr);
+					} else {
+						rule = {
+							reg_exp: "",
+							filter_type: 1,
+							feed_id: ["0"],
+							inverse: false,
+						};
+					}
+
+					console.log(rule, dialog.filter_info);
+
+					xhr.json("backend.php", {op: "pref-filters", method: "editrule", ids: rule.feed_id.join(",")}, function (editrule) {
+						edit_rule_dialog.attr('content',
+							`
+							<form name="filter_new_rule_form" id="filter_new_rule_form" onsubmit="return false">
+
+								<section>
+									<textarea dojoType="fox.form.ValidationTextArea"
+										required="true" id="filterDlg_regExp" ValidRegExp="true"
+										rows="4" style="font-size : 14px; width : 530px; word-break: break-all"
+										name="reg_exp">${rule.reg_exp}</textarea>
+
+									<div dojoType="dijit.Tooltip" id="filterDlg_regExp_tip" connectId="filterDlg_regExp" position="below"></div>
+
+									<fieldset>
+										<label class="checkbox">".
+											${App.FormFields.checkbox_tag("inverse", rule.inverse)}
+											${__("Inverse regular expression matching")}
+										</label>
+									</fieldset>
+									<fieldset>
+										<label style="display : inline">${__("on field")}</label>
+										${App.FormFields.select_hash("filter_type", rule.filter_type, dialog.filter_info.filter_types)}
+										<label style="padding-left : 10px; display : inline">${__("in")}</label>
+									</fieldset>
+									<fieldset>
+										<span id="filterDlg_feeds">
+											${editrule.multiselect}
+										</span>
+									</fieldset>
+								</section>
+
+								<footer>
+									${App.FormFields.button_tag(App.FormFields.icon("help") + " " + __("More info"), "", {class: 'pull-left alt-info',
+										onclick: "window.open('https://tt-rss.org/wiki/ContentFilters')"})}
+									${App.FormFields.submit_tag(__("Save rule"), {onclick: "App.dialogOf(this).execute()"})}
+									${App.FormFields.cancel_dialog_tag(__("Cancel"))}
+								</footer>
+
+							</form>
+						`);
 					});
+
 				});
 
 				edit_rule_dialog.show();
 			},
-			editAction: function(replaceNode, actionStr) {
+			/*editAction: function(replaceNode, actionStr) {
 				const edit_action_dialog = new fox.SingleUseDialog({
 					title: actionStr ? __("Edit action") : __("Add action"),
 					hideOrShowActionParam: function(sender) {
@@ -221,7 +268,7 @@ const	Filters = {
 					}
 				});
 
-				const tmph = dojo.connect(edit_action_dialog, "onShow", null, function (/* e */) {
+				const tmph = dojo.connect(edit_action_dialog, "onShow", null, function () {
 					dojo.disconnect(tmph);
 
 					xhr.post("backend.php", {op: 'pref-filters', method: 'newaction', action: actionStr}, (reply) => {
@@ -234,22 +281,65 @@ const	Filters = {
 				});
 
 				edit_action_dialog.show();
-			},
+			}, */
+			/*editAction: function(replaceNode, actionStr) {
+				const edit_action_dialog = new fox.SingleUseDialog({
+					title: actionStr ? __("Edit action") : __("Add action"),
+					hideOrShowActionParam: function(sender) {
+						const action = parseInt(sender.value);
+
+						dijit.byId("filterDlg_actionParam").domNode.hide();
+						dijit.byId("filterDlg_actionParamLabel").domNode.hide();
+						dijit.byId("filterDlg_actionParamPlugin").domNode.hide();
+
+						// if selected action supports parameters, enable params field
+						if (action == dialog.ACTION_LABEL) {
+							dijit.byId("filterDlg_actionParamLabel").domNode.show();
+						} else if (action == dialog.ACTION_PLUGIN) {
+							dijit.byId("filterDlg_actionParamPlugin").domNode.show();
+						} else if (dialog.PARAM_ACTIONS.indexOf(action) != -1) {
+							dijit.byId("filterDlg_actionParam").domNode.show();
+						}
+					},
+					execute: function () {
+						if (this.validate()) {
+							dialog.createNewActionElement(App.byId("filterDlg_Actions"), replaceNode);
+							this.hide();
+						}
+					}
+				});
+
+				const tmph = dojo.connect(edit_action_dialog, "onShow", null, function () {
+					dojo.disconnect(tmph);
+
+					xhr.post("backend.php", {op: 'pref-filters', method: 'newaction', action: actionStr}, (reply) => {
+						edit_action_dialog.attr('content', reply);
+
+						setTimeout(() => {
+							edit_action_dialog.hideOrShowActionParam(dijit.byId("filterDlg_actionSelect").attr('value'));
+						}, 250);
+					});
+				});
+
+				edit_action_dialog.show();
+			},*/
 			selectRules: function (select) {
 				Lists.select("filterDlg_Matches", select);
 			},
 			selectActions: function (select) {
 				Lists.select("filterDlg_Actions", select);
 			},
-			onRuleClicked: function (e) {
-				const li = e.closest('li');
-				const rule = li.querySelector('input[name="rule[]"]').value
+			onRuleClicked: function (elem) {
+
+				const li = elem.closest('li');
+				const rule = li.querySelector('input[name="rule[]"]').value;
 
 				this.editRule(li, rule);
 			},
-			onActionClicked: function (e) {
-				const li = e.closest('li');
-				const action = li.querySelector('input[name="action[]"]').value
+			onActionClicked: function (elem) {
+
+				const li = elem.closest('li');
+				const action = li.querySelector('input[name="action[]"]').value;
 
 				this.editAction(li, action);
 			},
@@ -302,13 +392,141 @@ const	Filters = {
 			content: __("Loading, please wait...")
 		});
 
-
-
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhr.post("backend.php", query, function (reply) {
-				dialog.attr('content', reply);
+			const query = {op: "pref-filters", method: "edit", id: filter_id};
+
+			/*if (!App.isPrefs()) {
+				query = {
+					op: "pref-filters", method: "edit",
+					feed: Feeds.getActive(), is_cat: Feeds.activeIsCat()
+				};
+			} else {
+				query = {op: "pref-filters", method: "edit", id: id};
+			}*/
+
+			xhr.json("backend.php", query, function (filter) {
+
+				dialog.filter_info = filter;
+
+				const options = {
+					enabled: [ filter.enabled, __('Enabled') ],
+					match_any_rule: [ filter.match_any_rule, __('Match any rule') ],
+					inverse: [ filter.inverse, __('Inverse matching') ],
+				};
+
+				dialog.attr('content',
+				`
+					<form onsubmit='return false'>
+
+						${App.FormFields.hidden_tag("op", "pref-filters")}
+						${App.FormFields.hidden_tag("id", filter_id)}
+						${App.FormFields.hidden_tag("method", filter_id ? "editSave" : "add")}
+						${App.FormFields.hidden_tag("csrf_token", App.getInitParam('csrf_token'))}
+
+						<section>
+							<input required="true" dojoType="dijit.form.ValidationTextBox" style="width : 530px"
+								placeholder="${__("Title")}" name="title" value="${App.escapeHtml(filter.title)}">
+						</section>
+
+						<div dojoType="dijit.layout.TabContainer" style="height : 300px">
+							<div dojoType="dijit.layout.ContentPane" title="${__('Match')}">
+								<div style="padding : 0" dojoType="dijit.layout.BorderContainer" gutters="false">
+									<div dojoType="fox.Toolbar" region="top">
+										<div dojoType="fox.form.DropDownButton">
+											<span>${__("Select")}</span>
+											<div dojoType="dijit.Menu" style="display: none;">
+												<!-- can"t use App.dialogOf() here because DropDownButton is not a child of the Dialog -->
+												<div onclick="dijit.byId('filterEditDlg').selectRules(true)"
+													dojoType="dijit.MenuItem">${__("All")}</div>
+												<div onclick="dijit.byId('filterEditDlg').selectRules(false)"
+													dojoType="dijit.MenuItem">${__("None")}</div>
+											</div>
+										</div>
+										<button dojoType="dijit.form.Button" onclick="App.dialogOf(this).addRule()">
+											${__("Add")}
+										</button>
+										<button dojoType="dijit.form.Button" onclick="App.dialogOf(this).deleteRule()">
+											${__("Delete")}
+										</button>
+									</div>
+									<div dojoType="dijit.layout.ContentPane" region="center">
+										<ul id="filterDlg_Matches">
+											${filter.rules.map((rule) => `
+												<li class='rule'>
+													${App.FormFields.checkbox_tag("", false, "", {onclick: 'Lists.onRowChecked(this)'})}
+													<span class='name' onclick='App.dialogOf(this).onRuleClicked(this)'>${rule.name}</span>
+													<span class='payload'>${App.FormFields.hidden_tag("rule[]", JSON.stringify(rule))}</span>
+												</li>
+											`).join("")}
+										</ul>
+									</div>
+								</div>
+							</div>
+							<div dojoType="dijit.layout.ContentPane" title="${__('Apply actions')}">
+								<div style="padding : 0" dojoType="dijit.layout.BorderContainer" gutters="false">
+									<div dojoType="fox.Toolbar" region="top">
+										<div dojoType="fox.form.DropDownButton">
+											<span>${__("Select")}</span>
+											<div dojoType="dijit.Menu" style="display: none">
+												<div onclick="dijit.byId('filterEditDlg').selectActions(true)"
+													dojoType="dijit.MenuItem">${__("All")}</div>
+												<div onclick="dijit.byId('filterEditDlg').selectActions(false)"
+													dojoType="dijit.MenuItem">${__("None")}</div>
+												</div>
+											</div>
+										<button dojoType="dijit.form.Button" onclick="App.dialogOf(this).addAction()">".
+											${__("Add")}
+										</button>
+										<button dojoType="dijit.form.Button" onclick="App.dialogOf(this).deleteAction()">".
+											${__("Delete")}
+										</button>
+									</div>
+									<div dojoType="dijit.layout.ContentPane" region="center">
+										<ul id="filterDlg_Actions">
+											${filter.actions.map((action) => `
+											<li class='rule'>
+												${App.FormFields.checkbox_tag("", false, "", {onclick: 'Lists.onRowChecked(this)'})}
+												<span class='name' onclick='App.dialogOf(this).onRuleClicked(this)'>${App.escapeHtml(action.name)}</span>
+												<span class='payload'>${App.FormFields.hidden_tag("action[]", JSON.stringify(action))}</span>
+											</li>
+											`).join("")}
+										</ul>
+									</div>
+								</div>
+							</div>
+						</div>
+
+						<br/>
+
+						<section class="narrow">
+							${Object.keys(options).map((name) =>
+								`
+								<fieldset class='narrow'>
+									<label class="checkbox">
+										${App.FormFields.checkbox_tag(name, options[name][0])}
+										${options[name][1]}
+									</label>
+								</fieldset>
+								`).join("")}
+						</section>
+
+						<footer>
+							${filter_id ?
+							`
+								${App.FormFields.button_tag(__("Remove"), "", {class: "pull-left alt-danger", onclick: "App.dialogOf(this).removeFilter()"})}
+								${App.FormFields.button_tag(__("Test"), "", {class: "alt-info", onclick: "App.dialogOf(this).test()"})}
+								${App.FormFields.submit_tag(__("Save"), {onclick: "App.dialogOf(this).execute()"})}
+								${App.FormFields.cancel_dialog_tag(__("Cancel"))}
+							` : `
+								${App.FormFields.button_tag(__("Test"), "", {class: "alt-info", onclick: "App.dialogOf(this).test()"})}
+								${App.FormFields.submit_tag(__("Create"), {onclick: "App.dialogOf(this).execute()"})}
+								${App.FormFields.cancel_dialog_tag(__("Cancel"))}
+							`}
+						</footer>
+					</form>
+				`);
 
 				if (!App.isPrefs()) {
 					const selectedText = App.getSelectedText();
diff --git a/plugins/auto_assign_labels/init.php b/plugins/auto_assign_labels/init.php
index 3fa4ad8c0..341895cef 100755
--- a/plugins/auto_assign_labels/init.php
+++ b/plugins/auto_assign_labels/init.php
@@ -19,6 +19,7 @@ class Auto_Assign_Labels extends Plugin {
 	function get_all_labels_filter_format($owner_uid) {
 		$rv = array();
 
+		// TODO: use Labels::get_all()
 		$sth = $this->pdo->prepare("SELECT id, fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = ?");
 		$sth->execute([$owner_uid]);
 
diff --git a/themes/compact.css b/themes/compact.css
index 92e9928c8..16bdcf1f0 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -822,16 +822,18 @@ body.ttrss_main #headlines-spacer a:hover {
 }
 body.ttrss_main ul#filterDlg_Matches,
 body.ttrss_main ul#filterDlg_Actions {
-  max-height: 100px;
-  overflow: auto;
   list-style-type: none;
-  border-style: solid;
-  border-color: #ddd;
-  border-width: 1px 1px 1px 1px;
-  background-color: white;
-  margin: 0px 0px 5px 0px;
-  padding: 4px;
-  min-height: 16px;
+  margin: 0;
+  padding: 0;
+  /*max-height : 100px;
+		overflow : auto;
+		border-style : solid;
+		border-color : @border-default;
+		border-width : 1px 1px 1px 1px;
+		background-color : @default-bg;
+		margin : 0px 0px 5px 0px;
+		padding : 4px;
+		min-height : 16px;*/
 }
 body.ttrss_main ul#filterDlg_Matches li,
 body.ttrss_main ul#filterDlg_Actions li {
diff --git a/themes/compact_night.css b/themes/compact_night.css
index 29eff9cb9..37adf3fda 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -822,16 +822,18 @@ body.ttrss_main #headlines-spacer a:hover {
 }
 body.ttrss_main ul#filterDlg_Matches,
 body.ttrss_main ul#filterDlg_Actions {
-  max-height: 100px;
-  overflow: auto;
   list-style-type: none;
-  border-style: solid;
-  border-color: #222;
-  border-width: 1px 1px 1px 1px;
-  background-color: #333;
-  margin: 0px 0px 5px 0px;
-  padding: 4px;
-  min-height: 16px;
+  margin: 0;
+  padding: 0;
+  /*max-height : 100px;
+		overflow : auto;
+		border-style : solid;
+		border-color : @border-default;
+		border-width : 1px 1px 1px 1px;
+		background-color : @default-bg;
+		margin : 0px 0px 5px 0px;
+		padding : 4px;
+		min-height : 16px;*/
 }
 body.ttrss_main ul#filterDlg_Matches li,
 body.ttrss_main ul#filterDlg_Actions li {
diff --git a/themes/light.css b/themes/light.css
index 583f9cabb..0f2ffc1b6 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -822,16 +822,18 @@ body.ttrss_main #headlines-spacer a:hover {
 }
 body.ttrss_main ul#filterDlg_Matches,
 body.ttrss_main ul#filterDlg_Actions {
-  max-height: 100px;
-  overflow: auto;
   list-style-type: none;
-  border-style: solid;
-  border-color: #ddd;
-  border-width: 1px 1px 1px 1px;
-  background-color: white;
-  margin: 0px 0px 5px 0px;
-  padding: 4px;
-  min-height: 16px;
+  margin: 0;
+  padding: 0;
+  /*max-height : 100px;
+		overflow : auto;
+		border-style : solid;
+		border-color : @border-default;
+		border-width : 1px 1px 1px 1px;
+		background-color : @default-bg;
+		margin : 0px 0px 5px 0px;
+		padding : 4px;
+		min-height : 16px;*/
 }
 body.ttrss_main ul#filterDlg_Matches li,
 body.ttrss_main ul#filterDlg_Actions li {
diff --git a/themes/light/tt-rss.less b/themes/light/tt-rss.less
index b1895f318..2794d8177 100644
--- a/themes/light/tt-rss.less
+++ b/themes/light/tt-rss.less
@@ -955,16 +955,18 @@ body.ttrss_main {
 	}
 
 	ul#filterDlg_Matches, ul#filterDlg_Actions {
-		max-height : 100px;
-		overflow : auto;
 		list-style-type : none;
+		margin : 0;
+		padding: 0;
+		/*max-height : 100px;
+		overflow : auto;
 		border-style : solid;
 		border-color : @border-default;
 		border-width : 1px 1px 1px 1px;
 		background-color : @default-bg;
 		margin : 0px 0px 5px 0px;
 		padding : 4px;
-		min-height : 16px;
+		min-height : 16px;*/
 	}
 
 	ul#filterDlg_Matches li, ul#filterDlg_Actions li {
diff --git a/themes/night.css b/themes/night.css
index e428d8aa7..e012c92b2 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -823,16 +823,18 @@ body.ttrss_main #headlines-spacer a:hover {
 }
 body.ttrss_main ul#filterDlg_Matches,
 body.ttrss_main ul#filterDlg_Actions {
-  max-height: 100px;
-  overflow: auto;
   list-style-type: none;
-  border-style: solid;
-  border-color: #222;
-  border-width: 1px 1px 1px 1px;
-  background-color: #333;
-  margin: 0px 0px 5px 0px;
-  padding: 4px;
-  min-height: 16px;
+  margin: 0;
+  padding: 0;
+  /*max-height : 100px;
+		overflow : auto;
+		border-style : solid;
+		border-color : @border-default;
+		border-width : 1px 1px 1px 1px;
+		background-color : @default-bg;
+		margin : 0px 0px 5px 0px;
+		padding : 4px;
+		min-height : 16px;*/
 }
 body.ttrss_main ul#filterDlg_Matches li,
 body.ttrss_main ul#filterDlg_Actions li {
diff --git a/themes/night_blue.css b/themes/night_blue.css
index c9ccaf737..b49a496e3 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -823,16 +823,18 @@ body.ttrss_main #headlines-spacer a:hover {
 }
 body.ttrss_main ul#filterDlg_Matches,
 body.ttrss_main ul#filterDlg_Actions {
-  max-height: 100px;
-  overflow: auto;
   list-style-type: none;
-  border-style: solid;
-  border-color: #222;
-  border-width: 1px 1px 1px 1px;
-  background-color: #333;
-  margin: 0px 0px 5px 0px;
-  padding: 4px;
-  min-height: 16px;
+  margin: 0;
+  padding: 0;
+  /*max-height : 100px;
+		overflow : auto;
+		border-style : solid;
+		border-color : @border-default;
+		border-width : 1px 1px 1px 1px;
+		background-color : @default-bg;
+		margin : 0px 0px 5px 0px;
+		padding : 4px;
+		min-height : 16px;*/
 }
 body.ttrss_main ul#filterDlg_Matches li,
 body.ttrss_main ul#filterDlg_Actions li {
-- 
cgit v1.2.3-54-g00ecf


From 33fff2686946021314a24feef61032beaf48e7a4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 22 Feb 2021 10:00:50 +0300
Subject: reinstate HOOK_RENDER_ENCLOSURE

---
 classes/article.php               | 23 ++++++++++++++++++-----
 classes/pluginhost.php            |  4 ++--
 js/Article.js                     |  6 +-----
 plugins/af_youtube_embed/init.php |  6 +++---
 4 files changed, 24 insertions(+), 15 deletions(-)

(limited to 'plugins')

diff --git a/classes/article.php b/classes/article.php
index dd1470caa..acd83694c 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -343,6 +343,7 @@ class Article extends Handler_Protected {
 		}
 
 		$rv = [
+			'formatted' => '',
 			'entries' => []
 		];
 
@@ -358,12 +359,24 @@ class Article extends Handler_Protected {
 			// this is highly approximate
 			$enc["filename"] = basename($enc["content_url"]);
 
-			PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_ENCLOSURE_ENTRY,
-				function ($result) use (&$enc) {
-					$enc = $result;
+			$rendered_enc = "";
+			PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_RENDER_ENCLOSURE,
+				function ($result) use (&$rendered_enc) {
+					$rendered_enc = $result;
 				},
-				$enc, $id);
-			array_push($rv['entries'], $enc);
+				$enc, $id, $rv);
+
+			if ($rendered_enc) {
+				$rv['formatted'] .= $rendered_enc;
+			} else {
+				PluginHost::getInstance()->chain_hooks_callback(PluginHost::HOOK_ENCLOSURE_ENTRY,
+					function ($result) use (&$enc) {
+						$enc = $result;
+					},
+					$enc, $id, $rv);
+
+				array_push($rv['entries'], $enc);
+			}
 		}
 
 		return $rv;
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index d50c5a706..a05938111 100755
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -51,11 +51,11 @@ class PluginHost {
 	const HOOK_FORMAT_ENCLOSURES = "hook_format_enclosures";									// hook__format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images) (byref)
 	const HOOK_SUBSCRIBE_FEED = "hook_subscribe_feed";											// hook_subscribe_feed($contents, $url, $auth_login, $auth_pass) (byref)
 	const HOOK_HEADLINES_BEFORE = "hook_headlines_before";									// hook_headlines_before($feed, $is_cat, $qfh_ret)
-	const HOOK_RENDER_ENCLOSURE = "hook_render_enclosure";									// hook_render_enclosure($entry, $hide_images)
+	const HOOK_RENDER_ENCLOSURE = "hook_render_enclosure";									// hook_render_enclosure($entry, $id, $rv)
 	const HOOK_ARTICLE_FILTER_ACTION = "hook_article_filter_action";						// hook_article_filter_action($article, $action)
 	const HOOK_ARTICLE_EXPORT_FEED = "hook_article_export_feed";							// hook_article_export_feed($line, $feed, $is_cat, $owner_uid) (byref)
 	const HOOK_MAIN_TOOLBAR_BUTTON = "hook_main_toolbar_button";							// hook_main_toolbar_button()
-	const HOOK_ENCLOSURE_ENTRY = "hook_enclosure_entry";										// hook_enclosure_entry($row, $id) (byref)
+	const HOOK_ENCLOSURE_ENTRY = "hook_enclosure_entry";										// hook_enclosure_entry($entry, $id, $rv) (byref)
 	const HOOK_FORMAT_ARTICLE = "hook_format_article";											// hook_format_article($html, $row)
 	const HOOK_FORMAT_ARTICLE_CDM = "hook_format_article_cdm"; /* RIP */
 	const HOOK_FEED_BASIC_INFO = "hook_feed_basic_info";										// hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed_id, $auth_login, $auth_pass) (byref)
diff --git a/js/Article.js b/js/Article.js
index d039882ec..5f695561c 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -150,12 +150,8 @@ const Article = {
 		).join("")}</span>`;
 	},
 	renderEnclosures: function (enclosures) {
-
-		// enclosure list was handled by backend (HOOK_FORMAT_ENCLOSURES)
-		if (enclosures.formatted)
-			return enclosures.formatted;
-
 		return `
+				${enclosures.formatted}
 				${enclosures.can_inline ?
 					`<div class='attachments-inline'>
 						${enclosures.entries.map((enc) => {
diff --git a/plugins/af_youtube_embed/init.php b/plugins/af_youtube_embed/init.php
index db82dc9f5..6309aac02 100644
--- a/plugins/af_youtube_embed/init.php
+++ b/plugins/af_youtube_embed/init.php
@@ -23,9 +23,9 @@ class Af_Youtube_Embed extends Plugin {
 
 		$matches = array();
 
-		if (preg_match("/\/\/www\.youtube\.com\/v\/([\w-]+)/", $entry["url"], $matches) ||
-			preg_match("/\/\/www\.youtube\.com\/watch?v=([\w-]+)/", $entry["url"], $matches) ||
-			preg_match("/\/\/youtu.be\/([\w-]+)/", $entry["url"], $matches)) {
+		if (preg_match("/\/\/www\.youtube\.com\/v\/([\w-]+)/", $entry["content_url"], $matches) ||
+			preg_match("/\/\/www\.youtube\.com\/watch?v=([\w-]+)/", $entry["content_url"], $matches) ||
+			preg_match("/\/\/youtu.be\/([\w-]+)/", $entry["content_url"], $matches)) {
 
 			$vid_id = $matches[1];
 
-- 
cgit v1.2.3-54-g00ecf


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

---
 api/index.php                   |  4 ++--
 classes/api.php                 |  2 +-
 classes/digest.php              |  9 ---------
 classes/feeds.php               |  6 ------
 classes/handler/public.php      | 10 +++++-----
 classes/pluginhost.php          |  3 ++-
 classes/pref/prefs.php          |  7 -------
 include/functions.php           |  8 ++++----
 include/sanity_check.php        |  6 +++---
 include/sanity_config.php       |  4 ++--
 include/sessions.php            |  8 ++++----
 phpstan.neon                    |  4 +++-
 plugins/af_fsckportal/init.php  |  5 +----
 plugins/af_redditimgur/init.php |  5 ++++-
 update.php                      |  4 ++--
 utils/regen_config_checks.sh    |  4 ++--
 16 files changed, 35 insertions(+), 54 deletions(-)

(limited to 'plugins')

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


From 42173386b39bed4b06c5ac6c2fc0da510673b354 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 22 Feb 2021 17:38:46 +0300
Subject: dirname(__FILE__) -> __DIR__

---
 api/index.php            | 6 +++---
 backend.php              | 2 +-
 classes/pluginhost.php   | 4 ++--
 errors.php               | 2 +-
 include/errorhandler.php | 4 ++--
 include/functions.php    | 2 +-
 index.php                | 2 +-
 plugins/note/init.php    | 2 +-
 plugins/nsfw/init.php    | 2 +-
 prefs.php                | 2 +-
 public.php               | 2 +-
 update.php               | 4 ++--
 update_daemon2.php       | 4 ++--
 13 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'plugins')

diff --git a/api/index.php b/api/index.php
index 1b713d561..6b0071141 100644
--- a/api/index.php
+++ b/api/index.php
@@ -3,9 +3,9 @@
 
 	require_once "../config.php";
 
-	set_include_path(dirname(__FILE__) . PATH_SEPARATOR .
-		dirname(dirname(__FILE__)) . PATH_SEPARATOR .
-		dirname(dirname(__FILE__)) . "/include" . PATH_SEPARATOR .
+	set_include_path(__DIR__ . PATH_SEPARATOR .
+		dirname(__DIR__) . PATH_SEPARATOR .
+		dirname(__DIR__) . "/include" . PATH_SEPARATOR .
   		get_include_path());
 
 	chdir("..");
diff --git a/backend.php b/backend.php
index e64c6561f..b6b3e0030 100644
--- a/backend.php
+++ b/backend.php
@@ -1,5 +1,5 @@
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(__DIR__ ."/include" . PATH_SEPARATOR .
 		get_include_path());
 
 	$op = $_REQUEST["op"];
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 5121c8491..b6f645a9c 100755
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -274,8 +274,8 @@ class PluginHost {
 			$class = trim($class);
 			$class_file = strtolower(basename(clean($class)));
 
-			if (!is_dir(__DIR__."/../plugins/$class_file") &&
-					!is_dir(__DIR__."/../plugins.local/$class_file")) continue;
+			if (!is_dir(__DIR__ . "/../plugins/$class_file") &&
+					!is_dir(__DIR__ . "/../plugins.local/$class_file")) continue;
 
 			// try system plugin directory first
 			$file = __DIR__ . "/../plugins/$class_file/init.php";
diff --git a/errors.php b/errors.php
index 597c8429c..3195c4b64 100644
--- a/errors.php
+++ b/errors.php
@@ -1,5 +1,5 @@
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(__DIR__ ."/include" . PATH_SEPARATOR .
 		get_include_path());
 
 	require_once "functions.php";
diff --git a/include/errorhandler.php b/include/errorhandler.php
index fab559b76..68e2285c1 100644
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -48,7 +48,7 @@ function ttrss_error_handler($errno, $errstr, $file, $line) {
 
 	if (error_reporting() == 0 || !$errno) return false;
 
-	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
+	$file = substr(str_replace(dirname(__DIR__), "", $file), 1);
 
 	$context = format_backtrace(debug_backtrace());
 	$errstr = truncate_middle($errstr, 16384, " (...) ");
@@ -72,7 +72,7 @@ function ttrss_fatal_handler() {
 
 		$context = format_backtrace(debug_backtrace());
 
-		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
+		$file = substr(str_replace(dirname(__DIR__), "", $file), 1);
 
 		if ($last_query) $errstr .= " [Last query: $last_query]";
 
diff --git a/include/functions.php b/include/functions.php
index 1f25f6947..7c4e32963 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -620,7 +620,7 @@
 		$ttrss_version['version'] = "UNKNOWN (Unsupported)";
 
 		date_default_timezone_set('UTC');
-		$root_dir = dirname(dirname(__FILE__));
+		$root_dir = dirname(__DIR__);
 
 		if (PHP_OS === "Darwin") {
 			$ttrss_version['version'] = "UNKNOWN (Unsupported, Darwin)";
diff --git a/index.php b/index.php
index 4494082dd..eec54c55b 100644
--- a/index.php
+++ b/index.php
@@ -12,7 +12,7 @@
 		exit;
 	}
 
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(__DIR__ ."/include" . PATH_SEPARATOR .
 		get_include_path());
 
 	require_once "autoload.php";
diff --git a/plugins/note/init.php b/plugins/note/init.php
index f4bdf45bc..52f7be3eb 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -17,7 +17,7 @@ class Note extends Plugin {
 	}
 
 	function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/note.js");
+		return file_get_contents(__DIR__ . "/note.js");
 	}
 
 
diff --git a/plugins/nsfw/init.php b/plugins/nsfw/init.php
index 3205b436b..7c5b8d00f 100644
--- a/plugins/nsfw/init.php
+++ b/plugins/nsfw/init.php
@@ -19,7 +19,7 @@ class NSFW extends Plugin {
 	}
 
 	function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/init.js");
+		return file_get_contents(__DIR__ . "/init.js");
 	}
 
 	function hook_render_article($article) {
diff --git a/prefs.php b/prefs.php
index d11c6281e..f173d684b 100644
--- a/prefs.php
+++ b/prefs.php
@@ -1,5 +1,5 @@
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(__DIR__ ."/include" . PATH_SEPARATOR .
 		get_include_path());
 
 	if (!file_exists("config.php")) {
diff --git a/public.php b/public.php
index fadb2f14d..48fe675f8 100644
--- a/public.php
+++ b/public.php
@@ -1,5 +1,5 @@
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(__DIR__ ."/include" . PATH_SEPARATOR .
 		get_include_path());
 
 	require_once "autoload.php";
diff --git a/update.php b/update.php
index 71b8cf76c..ab6272c83 100755
--- a/update.php
+++ b/update.php
@@ -1,11 +1,11 @@
 #!/usr/bin/env php
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(__DIR__ ."/include" . PATH_SEPARATOR .
 		get_include_path());
 
 	define('DISABLE_SESSIONS', true);
 
-	chdir(dirname(__FILE__));
+	chdir(__DIR__);
 
 	require_once "autoload.php";
 	require_once "functions.php";
diff --git a/update_daemon2.php b/update_daemon2.php
index af4cdedc9..5d4d3759c 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,10 +1,10 @@
 #!/usr/bin/env php
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(__DIR__ ."/include" . PATH_SEPARATOR .
 		get_include_path());
 
 	declare(ticks = 1);
-	chdir(dirname(__FILE__));
+	chdir(__DIR__);
 
 	define('DISABLE_SESSIONS', true);
 
-- 
cgit v1.2.3-54-g00ecf


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

---
 backend.php                     |  2 +-
 classes/api.php                 |  9 ++++---
 classes/article.php             |  6 ++---
 classes/db.php                  | 12 ++++-----
 classes/digest.php              | 12 ++++-----
 classes/diskcache.php           |  6 ++---
 classes/feeditem/common.php     |  2 +-
 classes/feeds.php               | 36 +++++++++++++--------------
 classes/handler/public.php      | 18 +++++++-------
 classes/opml.php                |  2 +-
 classes/pref/feeds.php          | 18 +++++++-------
 classes/pref/prefs.php          | 16 ++++++------
 classes/rpc.php                 | 12 ++++-----
 classes/rssutils.php            | 40 +++++++++++++++---------------
 classes/userhelper.php          |  6 ++---
 include/autoload.php            |  2 --
 include/functions.php           | 24 +++++++++---------
 include/login_form.php          |  6 ++---
 include/sanity_check.php        | 54 ++++++++++++++---------------------------
 include/sanity_config.php       |  3 ---
 include/sessions.php            |  7 +++---
 index.php                       |  2 ++
 phpstan.neon                    |  2 +-
 plugins/af_psql_trgm/init.php   |  4 +--
 plugins/af_redditimgur/init.php |  2 +-
 plugins/auth_internal/init.php  |  2 +-
 plugins/bookmarklets/init.php   |  4 +--
 update.php                      | 28 ++++++++++-----------
 update_daemon2.php              | 10 ++++----
 utils/regen_config_checks.sh    | 17 -------------
 30 files changed, 165 insertions(+), 199 deletions(-)
 delete mode 100644 include/sanity_config.php
 delete mode 100755 utils/regen_config_checks.sh

(limited to 'plugins')

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


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

---
 classes/config.php                    | 192 ++++++++++++++++++++--------------
 classes/db.php                        |   4 +-
 classes/digest.php                    |   8 +-
 classes/diskcache.php                 |   2 +-
 classes/feeds.php                     |   6 +-
 classes/logger.php                    |   2 +-
 classes/mailer.php                    |   6 +-
 classes/pref/feeds.php                |   8 +-
 classes/pref/system.php               |   4 +-
 classes/pref/users.php                |   2 +-
 classes/rpc.php                       |  18 ++--
 classes/rssutils.php                  |  36 ++++---
 classes/urlhelper.php                 |  10 +-
 config.php-dist                       |   2 +-
 include/functions.php                 |  50 +--------
 include/login_form.php                |   4 +-
 include/sanity_check.php              |   4 +-
 index.php                             |   5 +-
 phpstan.neon                          |   1 +
 plugins/af_proxy_http/init.php        |   2 +-
 plugins/cache_starred_images/init.php |   2 +-
 prefs.php                             |   4 +-
 update.php                            |   6 +-
 update_daemon2.php                    |  17 +--
 24 files changed, 187 insertions(+), 208 deletions(-)

(limited to 'plugins')

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


From cae54dad564bc1372f0f6cc11101b6377caef9a9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 23 Feb 2021 00:27:52 +0300
Subject: af_redditimgur: fix an oopsie

---
 plugins/af_redditimgur/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 9cd046ba4..7d5aeff5a 100755
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -207,7 +207,7 @@ class Af_RedditImgur extends Plugin {
 		$found = false;
 
 		// embed before reddit <table> post layout
-		$anchor = $xpath->query('//_body/*')->item(0);
+		$anchor = $xpath->query('//body/*')->item(0);
 
 		// deal with json-provided media content first
 		if ($article["link"] && $anchor) {
-- 
cgit v1.2.3-54-g00ecf


From 2ae0b7059f2ed56b92a8f396c63224b36f71df09 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 23 Feb 2021 09:01:27 +0300
Subject: cleanup some defined-stuff

---
 api/index.php                   | 18 +-----------------
 classes/auth/base.php           |  2 +-
 classes/config.php              |  6 ++++++
 classes/db.php                  |  2 +-
 classes/pref/prefs.php          |  4 ++--
 classes/rpc.php                 |  2 +-
 classes/rssutils.php            |  8 ++++----
 classes/urlhelper.php           | 14 +++++++-------
 include/sessions.php            |  6 ++----
 plugins/af_redditimgur/init.php |  4 ++--
 plugins/af_unburn/init.php      |  8 ++++----
 plugins/auth_remote/init.php    |  2 +-
 12 files changed, 32 insertions(+), 44 deletions(-)

(limited to 'plugins')

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