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

---
 plugins/bookmarklets/init.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'plugins/bookmarklets/init.php')

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


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

---
 plugins/bookmarklets/init.php | 71 ++++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

(limited to 'plugins/bookmarklets/init.php')

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


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

---
 plugins/bookmarklets/init.php | 331 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 324 insertions(+), 7 deletions(-)

(limited to 'plugins/bookmarklets/init.php')

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


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

---
 plugins/bookmarklets/init.php | 92 ++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 49 deletions(-)

(limited to 'plugins/bookmarklets/init.php')

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


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

---
 plugins/bookmarklets/init.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/bookmarklets/init.php')

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