X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fpref%2Ffeeds.php;h=8249f756a75726cb46d2b71a4389e1b9cd4adf23;hb=81fc862e370a1dfbd3941206fd00076e3cbf0551;hp=a29b2accab59c36c301a935301cc6cf00cefc486;hpb=73dfda1da6c641ca86965b0501bb1ec54f5daa81;p=tt-rss.git

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
old mode 100644
new mode 100755
index a29b2acc..8249f756
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -17,35 +17,34 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function renamecat() {
-		$title = $this->dbh->escape_string($_REQUEST['title']);
-		$id = $this->dbh->escape_string($_REQUEST['id']);
+		$title = clean($_REQUEST['title']);
+		$id = clean($_REQUEST['id']);
 
 		if ($title) {
-			$this->dbh->query("UPDATE ttrss_feed_categories SET
-				title = '$title' WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+			$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories SET
+				title = ? WHERE id = ? AND owner_uid = ?");
+			$sth->execute([$title, $id, $_SESSION['uid']]);
 		}
-		return;
 	}
 
 	private function get_category_items($cat_id) {
 
-		if ($_REQUEST['mode'] != 2)
+		if (clean($_REQUEST['mode']) != 2)
 			$search = $_SESSION["prefs_feed_search"];
 		else
 			$search = "";
 
-		if ($search) $search_qpart = " AND LOWER(title) LIKE LOWER('%$search%')";
-
 		// first one is set by API
-		$show_empty_cats = $_REQUEST['force_show_empty'] ||
-			($_REQUEST['mode'] != 2 && !$search);
+		$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
+			(clean($_REQUEST['mode']) != 2 && !$search);
 
 		$items = array();
 
-		$result = $this->dbh->query("SELECT id, title FROM ttrss_feed_categories
-				WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat = '$cat_id' ORDER BY order_id, title");
+		$sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
+				WHERE owner_uid = ? AND parent_cat = ? ORDER BY order_id, title");
+		$sth->execute([$_SESSION['uid'], $cat_id]);
 
-		while ($line = $this->dbh->fetch_assoc($result)) {
+		while ($line = $sth->fetch()) {
 
 			$cat = array();
 			$cat['id'] = 'CAT:' . $line['id'];
@@ -62,20 +61,24 @@ class Pref_Feeds extends Handler_Protected {
 			$cat['items'] = $this->get_category_items($line['id']);
 
 			$num_children = $this->calculate_children_count($cat);
-			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', $num_children), $num_children);
+			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
 			if ($num_children > 0 || $show_empty_cats)
 				array_push($items, $cat);
 
 		}
 
-		$feed_result = $this->dbh->query("SELECT id, title, last_error,
-			".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+		$fsth = $this->pdo->prepare("SELECT id, title, last_error,
+			".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 			FROM ttrss_feeds
-			WHERE cat_id = '$cat_id' AND owner_uid = ".$_SESSION["uid"].
-			"$search_qpart ORDER BY order_id, title");
+			WHERE cat_id = :cat AND
+			owner_uid = :uid AND
+			(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
+			ORDER BY order_id, title");
+
+		$fsth->execute([":cat" => $cat_id, ":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
 
-		while ($feed_line = $this->dbh->fetch_assoc($feed_result)) {
+		while ($feed_line = $fsth->fetch()) {
 			$feed = array();
 			$feed['id'] = 'FEED:' . $feed_line['id'];
 			$feed['bare_id'] = (int)$feed_line['id'];
@@ -84,9 +87,10 @@ class Pref_Feeds extends Handler_Protected {
 			$feed['checkbox'] = false;
 			$feed['unread'] = 0;
 			$feed['error'] = $feed_line['last_error'];
-			$feed['icon'] = getFeedIcon($feed_line['id']);
+			$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
 			$feed['param'] = make_local_datetime(
 				$feed_line['last_updated'], true);
+			$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
 
 			array_push($items, $feed);
 		}
@@ -100,13 +104,11 @@ class Pref_Feeds extends Handler_Protected {
 
 	function makefeedtree() {
 
-		if ($_REQUEST['mode'] != 2)
+		if (clean($_REQUEST['mode']) != 2)
 			$search = $_SESSION["prefs_feed_search"];
 		else
 			$search = "";
 
-		if ($search) $search_qpart = " AND LOWER(title) LIKE LOWER('%$search%')";
-
 		$root = array();
 		$root['id'] = 'root';
 		$root['name'] = __('Feeds');
@@ -115,7 +117,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		$enable_cats = get_pref('ENABLE_FEED_CATS');
 
-		if ($_REQUEST['mode'] == 2) {
+		if (clean($_REQUEST['mode']) == 2) {
 
 			if ($enable_cats) {
 				$cat = $this->feedlist_init_cat(-1);
@@ -158,29 +160,31 @@ class Pref_Feeds extends Handler_Protected {
 				$root['items'] = array_merge($root['items'], $cat['items']);
 			}
 
-			$result = $this->dbh->query("SELECT * FROM
-				ttrss_labels2 WHERE owner_uid = ".$_SESSION['uid']." ORDER by caption");
-
-			if ($this->dbh->num_rows($result) > 0) {
+			$sth = $this->pdo->prepare("SELECT * FROM
+				ttrss_labels2 WHERE owner_uid = ? ORDER by caption");
+			$sth->execute([$_SESSION['uid']]);
 
-				if (get_pref('ENABLE_FEED_CATS')) {
-					$cat = $this->feedlist_init_cat(-2);
-				} else {
-					$cat['items'] = array();
-				}
+			if (get_pref('ENABLE_FEED_CATS')) {
+				$cat = $this->feedlist_init_cat(-2);
+			} else {
+				$cat['items'] = array();
+			}
 
-				while ($line = $this->dbh->fetch_assoc($result)) {
+			$num_labels = 0;
+			while ($line = $sth->fetch()) {
+				++$num_labels;
 
-					$label_id = label_to_feed_id($line['id']);
+				$label_id = Labels::label_to_feed_id($line['id']);
 
-					$feed = $this->feedlist_init_feed($label_id, false, 0);
+				$feed = $this->feedlist_init_feed($label_id, false, 0);
 
-					$feed['fg_color'] = $line['fg_color'];
-					$feed['bg_color'] = $line['bg_color'];
+				$feed['fg_color'] = $line['fg_color'];
+				$feed['bg_color'] = $line['bg_color'];
 
-					array_push($cat['items'], $feed);
-				}
+				array_push($cat['items'], $feed);
+			}
 
+			if ($num_labels) {
 				if ($enable_cats) {
 					array_push($root['items'], $cat);
 				} else {
@@ -190,13 +194,14 @@ class Pref_Feeds extends Handler_Protected {
 		}
 
 		if ($enable_cats) {
-			$show_empty_cats = $_REQUEST['force_show_empty'] ||
-				($_REQUEST['mode'] != 2 && !$search);
+			$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
+				(clean($_REQUEST['mode']) != 2 && !$search);
 
-			$result = $this->dbh->query("SELECT id, title FROM ttrss_feed_categories
-				WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat IS NULL ORDER BY order_id, title");
+			$sth = $this->pdo->prepare("SELECT id, title FROM ttrss_feed_categories
+				WHERE owner_uid = ? AND parent_cat IS NULL ORDER BY order_id, title");
+			$sth->execute([$_SESSION['uid']]);
 
-			while ($line = $this->dbh->fetch_assoc($result)) {
+			while ($line = $sth->fetch()) {
 				$cat = array();
 				$cat['id'] = 'CAT:' . $line['id'];
 				$cat['bare_id'] = (int)$line['id'];
@@ -211,7 +216,7 @@ class Pref_Feeds extends Handler_Protected {
 				$cat['items'] = $this->get_category_items($line['id']);
 
 				$num_children = $this->calculate_children_count($cat);
-				$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', $num_children), $num_children);
+				$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
 				if ($num_children > 0 || $show_empty_cats)
 					array_push($root['items'], $cat);
@@ -232,13 +237,16 @@ class Pref_Feeds extends Handler_Protected {
 			$cat['unread'] = 0;
 			$cat['child_unread'] = 0;
 
-			$feed_result = $this->dbh->query("SELECT id, title,last_error,
-				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+			$fsth = $this->pdo->prepare("SELECT id, title,last_error,
+				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 				FROM ttrss_feeds
-				WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"].
-				"$search_qpart ORDER BY order_id, title");
+				WHERE cat_id IS NULL AND
+				owner_uid = :uid AND
+				(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
+				ORDER BY order_id, title");
+			$fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
 
-			while ($feed_line = $this->dbh->fetch_assoc($feed_result)) {
+			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
 				$feed['id'] = 'FEED:' . $feed_line['id'];
 				$feed['bare_id'] = (int)$feed_line['id'];
@@ -246,11 +254,12 @@ class Pref_Feeds extends Handler_Protected {
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
 				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = getFeedIcon($feed_line['id']);
+				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
 				$feed['param'] = make_local_datetime(
 					$feed_line['last_updated'], true);
 				$feed['unread'] = 0;
 				$feed['type'] = 'feed';
+				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
 
 				array_push($cat['items'], $feed);
 			}
@@ -261,16 +270,18 @@ class Pref_Feeds extends Handler_Protected {
 				array_push($root['items'], $cat);
 
 			$num_children = $this->calculate_children_count($root);
-			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', $num_children), $num_children);
+			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
 		} else {
-			$feed_result = $this->dbh->query("SELECT id, title, last_error,
-				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+			$fsth = $this->pdo->prepare("SELECT id, title, last_error,
+				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
 				FROM ttrss_feeds
-				WHERE owner_uid = ".$_SESSION["uid"].
-				"$search_qpart ORDER BY order_id, title");
+				WHERE owner_uid = :uid AND
+				(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
+				ORDER BY order_id, title");
+			$fsth->execute([":uid" => $_SESSION['uid'], ":search" => $search ? "%$search%" : ""]);
 
-			while ($feed_line = $this->dbh->fetch_assoc($feed_result)) {
+			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
 				$feed['id'] = 'FEED:' . $feed_line['id'];
 				$feed['bare_id'] = (int)$feed_line['id'];
@@ -278,11 +289,12 @@ class Pref_Feeds extends Handler_Protected {
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
 				$feed['error'] = $feed_line['last_error'];
-				$feed['icon'] = getFeedIcon($feed_line['id']);
+				$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
 				$feed['param'] = make_local_datetime(
 					$feed_line['last_updated'], true);
 				$feed['unread'] = 0;
 				$feed['type'] = 'feed';
+				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
 
 				array_push($root['items'], $feed);
 			}
@@ -294,52 +306,52 @@ class Pref_Feeds extends Handler_Protected {
 		$fl['identifier'] = 'id';
 		$fl['label'] = 'name';
 
-		if ($_REQUEST['mode'] != 2) {
+		if (clean($_REQUEST['mode']) != 2) {
 			$fl['items'] = array($root);
 		} else {
-			$fl['items'] =& $root['items'];
+			$fl['items'] = $root['items'];
 		}
 
 		return $fl;
 	}
 
 	function catsortreset() {
-		$this->dbh->query("UPDATE ttrss_feed_categories
-				SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
-		return;
+		$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+				SET order_id = 0 WHERE owner_uid = ?");
+		$sth->execute([$_SESSION['uid']]);
 	}
 
 	function feedsortreset() {
-		$this->dbh->query("UPDATE ttrss_feeds
-				SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
-		return;
+		$sth = $this->pdo->prepare("UPDATE ttrss_feeds
+				SET order_id = 0 WHERE owner_uid = ?");
+		$sth->execute([$_SESSION['uid']]);
 	}
 
 	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
-		$debug = isset($_REQUEST["debug"]);
 
 		$prefix = "";
 		for ($i = 0; $i < $nest_level; $i++)
 			$prefix .= "   ";
 
-		if ($debug) _debug("$prefix C: $item_id P: $parent_id");
+		Debug::log("$prefix C: $item_id P: $parent_id");
 
 		$bare_item_id = substr($item_id, strpos($item_id, ':')+1);
 
 		if ($item_id != 'root') {
 			if ($parent_id && $parent_id != 'root') {
 				$parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
-				$parent_qpart = $this->dbh->escape_string($parent_bare_id);
+				$parent_qpart = $parent_bare_id;
 			} else {
-				$parent_qpart = 'NULL';
+				$parent_qpart = null;
 			}
 
-			$this->dbh->query("UPDATE ttrss_feed_categories
-				SET parent_cat = $parent_qpart WHERE id = '$bare_item_id' AND
-				owner_uid = " . $_SESSION["uid"]);
+			$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+				SET parent_cat = ? WHERE id = ? AND
+				owner_uid = ?");
+			$sth->execute([$parent_qpart, $bare_item_id, $_SESSION['uid']]);
 		}
 
-		$order_id = 0;
+		$order_id = 1;
 
 		$cat = $data_map[$item_id];
 
@@ -348,36 +360,28 @@ class Pref_Feeds extends Handler_Protected {
 				$id = $item['_reference'];
 				$bare_id = substr($id, strpos($id, ':')+1);
 
-				if ($debug) _debug("$prefix [$order_id] $id/$bare_id");
+				Debug::log("$prefix [$order_id] $id/$bare_id");
 
 				if ($item['_reference']) {
 
 					if (strpos($id, "FEED") === 0) {
 
-						$cat_id = ($item_id != "root") ?
-							$this->dbh->escape_string($bare_item_id) : "NULL";
+						$cat_id = ($item_id != "root") ? $bare_item_id : null;
 
-						$cat_qpart = ($cat_id != 0) ? "cat_id = '$cat_id'" :
-							"cat_id = NULL";
+						$sth = $this->pdo->prepare("UPDATE ttrss_feeds
+							SET order_id = ?, cat_id = ?
+							WHERE id = ? AND owner_uid = ?");
 
-						$this->dbh->query("UPDATE ttrss_feeds
-							SET order_id = $order_id, $cat_qpart
-							WHERE id = '$bare_id' AND
-								owner_uid = " . $_SESSION["uid"]);
+						$sth->execute([$order_id, $cat_id ? $cat_id : null, $bare_id, $_SESSION['uid']]);
 
 					} else if (strpos($id, "CAT:") === 0) {
 						$this->process_category_order($data_map, $item['_reference'], $item_id,
 							$nest_level+1);
 
-						if ($item_id != 'root') {
-							$parent_qpart = $this->dbh->escape_string($bare_id);
-						} else {
-							$parent_qpart = 'NULL';
-						}
-
-						$this->dbh->query("UPDATE ttrss_feed_categories
-								SET order_id = '$order_id' WHERE id = '$bare_id' AND
-								owner_uid = " . $_SESSION["uid"]);
+						$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
+								SET order_id = ? WHERE id = ? AND
+								owner_uid = ?");
+						$sth->execute([$order_id, $bare_id, $_SESSION['uid']]);
 					}
 				}
 
@@ -389,7 +393,7 @@ class Pref_Feeds extends Handler_Protected {
 	function savefeedorder() {
 		$data = json_decode($_POST['payload'], true);
 
-		#file_put_contents("/tmp/saveorder.json", $_POST['payload']);
+		#file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
 		#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
 
 		if (!is_array($data['items']))
@@ -410,7 +414,7 @@ class Pref_Feeds extends Handler_Protected {
 						if (isset($item['items']['_reference'])) {
 							$data_map[$item['id']] = array($item['items']);
 						} else {
-							$data_map[$item['id']] =& $item['items'];
+							$data_map[$item['id']] = $item['items'];
 						}
 					}
 				if ($item['id'] == 'root') {
@@ -419,67 +423,28 @@ class Pref_Feeds extends Handler_Protected {
 			}
 
 			$this->process_category_order($data_map, $root_item);
-
-			/* foreach ($data['items'][0]['items'] as $item) {
-				$id = $item['_reference'];
-				$bare_id = substr($id, strpos($id, ':')+1);
-
-				++$cat_order_id;
-
-				if ($bare_id > 0) {
-					$this->dbh->query("UPDATE ttrss_feed_categories
-						SET order_id = '$cat_order_id' WHERE id = '$bare_id' AND
-						owner_uid = " . $_SESSION["uid"]);
-				}
-
-				$feed_order_id = 0;
-
-				if (is_array($data_map[$id])) {
-					foreach ($data_map[$id] as $feed) {
-						$id = $feed['_reference'];
-						$feed_id = substr($id, strpos($id, ':')+1);
-
-						if ($bare_id != 0)
-							$cat_query = "cat_id = '$bare_id'";
-						else
-							$cat_query = "cat_id = NULL";
-
-						$this->dbh->query("UPDATE ttrss_feeds
-							SET order_id = '$feed_order_id',
-							$cat_query
-							WHERE id = '$feed_id' AND
-								owner_uid = " . $_SESSION["uid"]);
-
-						++$feed_order_id;
-					}
-				}
-			} */
 		}
-
-		return;
 	}
 
 	function removeicon() {
-		$feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
+		$feed_id = clean($_REQUEST["feed_id"]);
 
-		$result = $this->dbh->query("SELECT id FROM ttrss_feeds
-			WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
+		$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
+			WHERE id = ? AND owner_uid = ?");
+		$sth->execute([$feed_id, $_SESSION['uid']]);
 
-		if ($this->dbh->num_rows($result) != 0) {
+		if ($row = $sth->fetch()) {
 			@unlink(ICONS_DIR . "/$feed_id.ico");
 
-			$this->dbh->query("UPDATE ttrss_feeds SET favicon_avg_color = NULL
-				where id = '$feed_id'");
+			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL
+				where id = ?");
+			$sth->execute([$feed_id]);
 		}
-
-		return;
 	}
 
 	function uploadicon() {
 		header("Content-type: text/html");
 
-		$tmp_file = false;
-
 		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
 			$tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
 
@@ -494,20 +459,23 @@ class Pref_Feeds extends Handler_Protected {
 		}
 
 		$icon_file = $tmp_file;
-		$feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
+		$feed_id = clean($_REQUEST["feed_id"]);
 
 		if (is_file($icon_file) && $feed_id) {
 			if (filesize($icon_file) < 65535) {
 
-				$result = $this->dbh->query("SELECT id FROM ttrss_feeds
-					WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
+				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
+					WHERE id = ? AND owner_uid = ?");
+				$sth->execute([$feed_id, $_SESSION['uid']]);
 
-				if ($this->dbh->num_rows($result) != 0) {
+				if ($row = $sth->fetch()) {
 					@unlink(ICONS_DIR . "/$feed_id.ico");
 					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
-						$this->dbh->query("UPDATE ttrss_feeds SET
+
+						$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET
 							favicon_avg_color = ''
-							WHERE id = '$feed_id'");
+							WHERE id = ?");
+						$sth->execute([$feed_id]);
 
 						$rc = 0;
 					}
@@ -533,290 +501,296 @@ class Pref_Feeds extends Handler_Protected {
 		global $purge_intervals;
 		global $update_intervals;
 
-		print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
-        		<div dojoType="dijit.layout.ContentPane" title="'.__('General').'">';
 
-		$feed_id = $this->dbh->escape_string($_REQUEST["id"]);
+		$feed_id = clean($_REQUEST["id"]);
 
-		$result = $this->dbh->query(
-			"SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND
-				owner_uid = " . $_SESSION["uid"]);
+		$sth = $this->pdo->prepare("SELECT * FROM ttrss_feeds WHERE id = ? AND
+				owner_uid = ?");
+		$sth->execute([$feed_id, $_SESSION['uid']]);
 
-		$auth_pass_encrypted = sql_bool_to_bool($this->dbh->fetch_result($result, 0,
-			"auth_pass_encrypted"));
+		if ($row = $sth->fetch()) {
+			print '<div dojoType="dijit.layout.TabContainer" style="height : 450px">
+        		<div dojoType="dijit.layout.ContentPane" title="'.__('General').'">';
 
-		$title = htmlspecialchars($this->dbh->fetch_result($result,
-			0, "title"));
+			$title = htmlspecialchars($row["title"]);
 
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$feed_id\">";
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-feeds\">";
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"editSave\">";
+			print_hidden("id", "$feed_id");
+			print_hidden("op", "pref-feeds");
+			print_hidden("method", "editSave");
 
-		print "<div class=\"dlgSec\">".__("Feed")."</div>";
-		print "<div class=\"dlgSecCont\">";
+			print "<div class=\"dlgSec\">".__("Feed")."</div>";
+			print "<div class=\"dlgSecCont\">";
 
-		/* Title */
+			/* Title */
 
-		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
 			placeHolder=\"".__("Feed Title")."\"
 			style=\"font-size : 16px; width: 20em\" name=\"title\" value=\"$title\">";
 
-		/* Feed URL */
+			/* Feed URL */
 
-		$feed_url = $this->dbh->fetch_result($result, 0, "feed_url");
-		$feed_url = htmlspecialchars($this->dbh->fetch_result($result,
-			0, "feed_url"));
+			$feed_url = htmlspecialchars($row["feed_url"]);
 
-		print "<hr/>";
+			print "<hr/>";
 
-		print __('URL:') . " ";
-		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+			print __('URL:') . " ";
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
 			placeHolder=\"".__("Feed URL")."\"
 			regExp='^(http|https)://.*' style=\"width : 20em\"
 			name=\"feed_url\" value=\"$feed_url\">";
 
-		$last_error = $this->dbh->fetch_result($result, 0, "last_error");
+			$last_error = $row["last_error"];
 
-		if ($last_error) {
-			print "&nbsp;<img src=\"images/error.png\" alt=\"(error)\"
+			if ($last_error) {
+				print "&nbsp;<img src=\"images/error.png\" alt=\"(error)\"
 				style=\"vertical-align : middle\"
 				title=\"".htmlspecialchars($last_error)."\">";
 
-		}
+			}
 
-		/* Category */
+			/* Category */
 
-		if (get_pref('ENABLE_FEED_CATS')) {
+			if (get_pref('ENABLE_FEED_CATS')) {
 
-			$cat_id = $this->dbh->fetch_result($result, 0, "cat_id");
+				$cat_id = $row["cat_id"];
 
-			print "<hr/>";
+				print "<hr/>";
 
-			print __('Place in category:') . " ";
+				print __('Place in category:') . " ";
 
-			print_feed_cat_select("cat_id", $cat_id,
-				'dojoType="dijit.form.Select"');
-		}
+				print_feed_cat_select("cat_id", $cat_id,
+					'dojoType="dijit.form.Select"');
+			}
 
-		/* FTS Stemming Language */
+			/* Site URL  */
 
-		if (DB_TYPE == "pgsql") {
-			$feed_language = $this->dbh->fetch_result($result, 0, "feed_language");
+			$site_url = htmlspecialchars($row["site_url"]);
 
 			print "<hr/>";
 
-			print __('Language:') . " ";
-			print_select("feed_language", $feed_language, $this::$feed_languages,
-				'dojoType="dijit.form.Select"');
-		}
+			print __('Site URL:') . " ";
+			print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\"
+			placeHolder=\"".__("Site URL")."\"
+			regExp='^(http|https)://.*' style=\"width : 15em\"
+			name=\"site_url\" value=\"$site_url\">";
 
-		print "</div>";
+			/* FTS Stemming Language */
 
-		print "<div class=\"dlgSec\">".__("Update")."</div>";
-		print "<div class=\"dlgSecCont\">";
+			if (DB_TYPE == "pgsql") {
+				$feed_language = $row["feed_language"];
 
-		/* Update Interval */
+				print "<hr/>";
 
-		$update_interval = $this->dbh->fetch_result($result, 0, "update_interval");
+				print __('Language:') . " ";
+				print_select("feed_language", $feed_language, $this::$feed_languages,
+					'dojoType="dijit.form.Select"');
+			}
 
-		print_select_hash("update_interval", $update_interval, $update_intervals,
-			'dojoType="dijit.form.Select"');
+			print "</div>";
 
-		/* Purge intl */
+			print "<div class=\"dlgSec\">".__("Update")."</div>";
+			print "<div class=\"dlgSecCont\">";
 
-		$purge_interval = $this->dbh->fetch_result($result, 0, "purge_interval");
+			/* Update Interval */
 
-		print "<hr/>";
-		print __('Article purging:') . " ";
+			$update_interval = $row["update_interval"];
 
-		print_select_hash("purge_interval", $purge_interval, $purge_intervals,
-			'dojoType="dijit.form.Select" ' .
-				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
+			print_select_hash("update_interval", $update_interval, $update_intervals,
+				'dojoType="dijit.form.Select"');
 
-		print "</div>";
-		print "<div class=\"dlgSec\">".__("Authentication")."</div>";
-		print "<div class=\"dlgSecCont\">";
+			/* Purge intl */
 
-		$auth_login = htmlspecialchars($this->dbh->fetch_result($result, 0, "auth_login"));
+			$purge_interval = $row["purge_interval"];
 
-		print "<input dojoType=\"dijit.form.TextBox\" id=\"feedEditDlg_login\"
-			placeHolder=\"".__("Login")."\"
-			name=\"auth_login\" value=\"$auth_login\"><hr/>";
+			print "<hr/>";
+			print __('Article purging:') . " ";
+
+			print_select_hash("purge_interval", $purge_interval, $purge_intervals,
+				'dojoType="dijit.form.Select" ' .
+				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
 
-		$auth_pass = $this->dbh->fetch_result($result, 0, "auth_pass");
+			print "</div>";
 
-		if ($auth_pass_encrypted) {
-			require_once "crypt.php";
-			$auth_pass = decrypt_string($auth_pass);
-		}
+			$auth_login = htmlspecialchars($row["auth_login"]);
+			$auth_pass = htmlspecialchars($row["auth_pass"]);
+
+			$auth_enabled = $auth_login !== '' || $auth_pass !== '';
+
+			$auth_style = $auth_enabled ? '' : 'display: none';
+			print "<div id='feedEditDlg_loginContainer' style='$auth_style'>";
+			print "<div class=\"dlgSec\">".__("Authentication")."</div>";
+			print "<div class=\"dlgSecCont\">";
 
-		$auth_pass = htmlspecialchars($auth_pass);
+			print "<input dojoType=\"dijit.form.TextBox\" id=\"feedEditDlg_login\"
+			placeHolder=\"".__("Login")."\"
+			autocomplete=\"new-password\"
+			name=\"auth_login\" value=\"$auth_login\"><hr/>";
 
-		print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
+			print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
+			autocomplete=\"new-password\"
 			placeHolder=\"".__("Password")."\"
 			value=\"$auth_pass\">";
 
-		print "<div dojoType=\"dijit.Tooltip\" connectId=\"feedEditDlg_login\" position=\"below\">
+			print "<div dojoType=\"dijit.Tooltip\" connectId=\"feedEditDlg_login\" position=\"below\">
 			".__('<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds.')."
 			</div>";
 
-		print "</div>";
+			print "</div></div>";
 
-		print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">';
+			$auth_checked = $auth_enabled ? 'checked' : '';
+			print "<div style=\"clear : both\">
+				<input type=\"checkbox\" $auth_checked name=\"need_auth\" dojoType=\"dijit.form.CheckBox\" id=\"feedEditDlg_loginCheck\"
+						onclick='checkboxToggleElement(this, \"feedEditDlg_loginContainer\")'>
+					<label for=\"feedEditDlg_loginCheck\">".
+				__('This feed requires authentication.')."</div>";
 
-		//print "<div class=\"dlgSec\">".__("Options")."</div>";
-		print "<div class=\"dlgSecSimple\">";
+			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Options').'">';
 
-		$private = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "private"));
+			//print "<div class=\"dlgSec\">".__("Options")."</div>";
+			print "<div class=\"dlgSecSimple\">";
 
-		if ($private) {
-			$checked = "checked=\"1\"";
-		} else {
-			$checked = "";
-		}
+			$private = $row["private"];
+
+			if ($private) {
+				$checked = "checked=\"1\"";
+			} else {
+				$checked = "";
+			}
 
-		print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"private\" id=\"private\"
+			print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"private\" id=\"private\"
 			$checked>&nbsp;<label for=\"private\">".__('Hide from Popular feeds')."</label>";
 
-		$include_in_digest = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "include_in_digest"));
+		if (DIGEST_SUBJECT !== false) {
+			$include_in_digest = $row["include_in_digest"];
 
-		if ($include_in_digest) {
-			$checked = "checked=\"1\"";
-		} else {
-			$checked = "";
-		}
+			if ($include_in_digest) {
+				$checked = "checked=\"1\"";
+			} else {
+				$checked = "";
+			}
 
-		print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
+			print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
 			name=\"include_in_digest\"
 			$checked>&nbsp;<label for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
+		}
 
 
-		$always_display_enclosures = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "always_display_enclosures"));
+			$always_display_enclosures = $row["always_display_enclosures"];
 
-		if ($always_display_enclosures) {
-			$checked = "checked";
-		} else {
-			$checked = "";
-		}
+			if ($always_display_enclosures) {
+				$checked = "checked";
+			} else {
+				$checked = "";
+			}
 
-		print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
+			print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
 			name=\"always_display_enclosures\"
 			$checked>&nbsp;<label for=\"always_display_enclosures\">".__('Always display image attachments')."</label>";
 
-		$hide_images = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "hide_images"));
+			$hide_images = $row["hide_images"];
 
-		if ($hide_images) {
-			$checked = "checked=\"1\"";
-		} else {
-			$checked = "";
-		}
+			if ($hide_images) {
+				$checked = "checked=\"1\"";
+			} else {
+				$checked = "";
+			}
 
-		print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"hide_images\"
+			print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"hide_images\"
 		name=\"hide_images\"
 			$checked>&nbsp;<label for=\"hide_images\">".
-		__('Do not embed images')."</label>";
+				__('Do not embed media')."</label>";
 
-		$cache_images = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "cache_images"));
+			$cache_images = $row["cache_images"];
 
-		if ($cache_images) {
-			$checked = "checked=\"1\"";
-		} else {
-			$checked = "";
-		}
+			if ($cache_images) {
+				$checked = "checked=\"1\"";
+			} else {
+				$checked = "";
+			}
 
-		print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"cache_images\"
+			print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"cache_images\"
 		name=\"cache_images\"
 			$checked>&nbsp;<label for=\"cache_images\">".
-		__('Cache images locally')."</label>";
+				__('Cache media')."</label>";
 
-		$mark_unread_on_update = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "mark_unread_on_update"));
+			$mark_unread_on_update = $row["mark_unread_on_update"];
 
-		if ($mark_unread_on_update) {
-			$checked = "checked";
-		} else {
-			$checked = "";
-		}
+			if ($mark_unread_on_update) {
+				$checked = "checked";
+			} else {
+				$checked = "";
+			}
 
-		print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"mark_unread_on_update\"
+			print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"mark_unread_on_update\"
 			name=\"mark_unread_on_update\"
 			$checked>&nbsp;<label for=\"mark_unread_on_update\">".__('Mark updated articles as unread')."</label>";
 
-		print "</div>";
+			print "</div>";
 
-		print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">';
+			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Icon').'">';
 
-		/* Icon */
+			/* Icon */
 
-		print "<div class=\"dlgSecSimple\">";
+			print "<div class=\"dlgSecSimple\">";
 
-		print "<iframe name=\"icon_upload_iframe\"
-			style=\"width: 400px; height: 100px; display: none;\"></iframe>";
+			print "<img class=\"feedIcon\" src=\"".Feeds::getFeedIcon($feed_id)."\">";
 
-		print "<form style='display : block' target=\"icon_upload_iframe\"
+			print "<iframe name=\"icon_upload_iframe\"
+				style=\"width: 400px; height: 100px; display: none;\"></iframe>";
+
+			print "<form style='display : block' target=\"icon_upload_iframe\"
 			enctype=\"multipart/form-data\" method=\"POST\"
 			action=\"backend.php\">
-			<input id=\"icon_file\" size=\"10\" name=\"icon_file\" type=\"file\">
+			<label class=\"dijitButton\">".__("Choose file...")."
+				<input style=\"display: none\" id=\"icon_file\" size=\"10\" name=\"icon_file\" type=\"file\">
+			</label>
 			<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
 			<input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\">
-			<input type=\"hidden\" name=\"method\" value=\"uploadicon\"><p>
+			<input type=\"hidden\" name=\"method\" value=\"uploadicon\">
 			<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
 				type=\"submit\">".__('Replace')."</button>
-			<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
+			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
 				type=\"submit\">".__('Remove')."</button>
 			</form>";
 
-		print "</div>";
+			print "</div>";
 
-		print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">';
+			print '</div><div dojoType="dijit.layout.ContentPane" title="'.__('Plugins').'">';
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
-			"hook_prefs_edit_feed", $feed_id);
+			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
+				"hook_prefs_edit_feed", $feed_id);
 
 
-		print "</div></div>";
+			print "</div></div>";
 
-		$title = htmlspecialchars($title, ENT_QUOTES);
+			$title = htmlspecialchars($title, ENT_QUOTES);
 
-		print "<div class='dlgButtons'>
+			print "<div class='dlgButtons'>
 			<div style=\"float : left\">
-			<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+			<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
 				__('Unsubscribe')."</button>";
 
-		if (PUBSUBHUBBUB_ENABLED) {
-			$pubsub_state = $this->dbh->fetch_result($result, 0, "pubsub_state");
-			$pubsub_btn_disabled = ($pubsub_state == 2) ? "" : "disabled=\"1\"";
+			print "</div>";
 
-			print "<button dojoType=\"dijit.form.Button\" id=\"pubsubReset_Btn\" $pubsub_btn_disabled
-					onclick='return resetPubSub($feed_id, \"$title\")'>".__('Resubscribe to push updates').
-					"</button>";
+			print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').execute()\">".__('Save')."</button>
+				<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button>
+				</div>";
 		}
-
-		print "</div>";
-
-		print "<div dojoType=\"dijit.Tooltip\" connectId=\"pubsubReset_Btn\" position=\"below\">".
-			__('Resets PubSubHubbub subscription status for push-enabled feeds.')."</div>";
-
-		print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').execute()\">".__('Save')."</button>
-			<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button>
-		</div>";
-
-
-		return;
 	}
 
 	function editfeeds() {
 		global $purge_intervals;
 		global $update_intervals;
 
-		$feed_ids = $this->dbh->escape_string($_REQUEST["ids"]);
+		$feed_ids = clean($_REQUEST["ids"]);
 
 		print_notice("Enable the options you wish to apply using checkboxes on the right:");
 
 		print "<p>";
 
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"ids\" value=\"$feed_ids\">";
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-feeds\">";
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"batchEditSave\">";
+		print_hidden("ids", "$feed_ids");
+		print_hidden("op", "pref-feeds");
+		print_hidden("method", "batchEditSave");
 
 		print "<div class=\"dlgSec\">".__("Feed")."</div>";
 		print "<div class=\"dlgSecCont\">";
@@ -878,11 +852,13 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<input dojoType=\"dijit.form.TextBox\"
 			placeHolder=\"".__("Login")."\" disabled=\"1\"
+			autocomplete=\"new-password\"
 			name=\"auth_login\" value=\"\">";
 
 		$this->batch_edit_cbox("auth_login");
 
 		print "<hr/> <input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
+			autocomplete=\"new-password\"
 			placeHolder=\"".__("Password")."\" disabled=\"1\"
 			value=\"\">";
 
@@ -913,7 +889,7 @@ class Pref_Feeds extends Handler_Protected {
 			name=\"hide_images\"
 			dojoType=\"dijit.form.CheckBox\">&nbsp;<label class='insensitive' id=\"hide_images_l\"
 			for=\"hide_images\">".
-		__('Do not embed images')."</label>";
+		__('Do not embed media')."</label>";
 
 		print "&nbsp;"; $this->batch_edit_cbox("hide_images", "hide_images_l");
 
@@ -921,7 +897,7 @@ class Pref_Feeds extends Handler_Protected {
 			name=\"cache_images\"
 			dojoType=\"dijit.form.CheckBox\">&nbsp;<label class='insensitive' id=\"cache_images_l\"
 			for=\"cache_images\">".
-		__('Cache images locally')."</label>";
+		__('Cache media')."</label>";
 
 		print "&nbsp;"; $this->batch_edit_cbox("cache_images", "cache_images_l");
 
@@ -955,83 +931,84 @@ class Pref_Feeds extends Handler_Protected {
 
 	function editsaveops($batch) {
 
-		$feed_title = $this->dbh->escape_string(trim($_POST["title"]));
-		$feed_link = $this->dbh->escape_string(trim($_POST["feed_url"]));
-		$upd_intl = (int) $this->dbh->escape_string($_POST["update_interval"]);
-		$purge_intl = (int) $this->dbh->escape_string($_POST["purge_interval"]);
-		$feed_id = (int) $this->dbh->escape_string($_POST["id"]); /* editSave */
-		$feed_ids = $this->dbh->escape_string($_POST["ids"]); /* batchEditSave */
-		$cat_id = (int) $this->dbh->escape_string($_POST["cat_id"]);
-		$auth_login = $this->dbh->escape_string(trim($_POST["auth_login"]));
-		$auth_pass = trim($_POST["auth_pass"]);
-		$private = checkbox_to_sql_bool($this->dbh->escape_string($_POST["private"]));
+		$feed_title = trim(clean($_POST["title"]));
+		$feed_url = trim(clean($_POST["feed_url"]));
+		$site_url = trim(clean($_POST["site_url"]));
+		$upd_intl = (int) clean($_POST["update_interval"]);
+		$purge_intl = (int) clean($_POST["purge_interval"]);
+		$feed_id = (int) clean($_POST["id"]); /* editSave */
+		$feed_ids = explode(",", clean($_POST["ids"])); /* batchEditSave */
+		$cat_id = (int) clean($_POST["cat_id"]);
+		$auth_login = trim(clean($_POST["auth_login"]));
+		$auth_pass = trim(clean($_POST["auth_pass"]));
+		$private = checkbox_to_sql_bool(clean($_POST["private"]));
 		$include_in_digest = checkbox_to_sql_bool(
-			$this->dbh->escape_string($_POST["include_in_digest"]));
+			clean($_POST["include_in_digest"]));
 		$cache_images = checkbox_to_sql_bool(
-			$this->dbh->escape_string($_POST["cache_images"]));
+			clean($_POST["cache_images"]));
 		$hide_images = checkbox_to_sql_bool(
-			$this->dbh->escape_string($_POST["hide_images"]));
+			clean($_POST["hide_images"]));
 		$always_display_enclosures = checkbox_to_sql_bool(
-			$this->dbh->escape_string($_POST["always_display_enclosures"]));
+			clean($_POST["always_display_enclosures"]));
 
 		$mark_unread_on_update = checkbox_to_sql_bool(
-			$this->dbh->escape_string($_POST["mark_unread_on_update"]));
-
-		$feed_language = $this->dbh->escape_string(trim($_POST["feed_language"]));
-
-		if (strlen(FEED_CRYPT_KEY) > 0) {
-			require_once "crypt.php";
-			$auth_pass = substr(encrypt_string($auth_pass), 0, 250);
-			$auth_pass_encrypted = 'true';
-		} else {
-			$auth_pass_encrypted = 'false';
-		}
-
-		$auth_pass = $this->dbh->escape_string($auth_pass);
+			clean($_POST["mark_unread_on_update"]));
 
-		if (get_pref('ENABLE_FEED_CATS')) {
-			if ($cat_id && $cat_id != 0) {
-				$category_qpart = "cat_id = '$cat_id',";
-				$category_qpart_nocomma = "cat_id = '$cat_id'";
-			} else {
-				$category_qpart = 'cat_id = NULL,';
-				$category_qpart_nocomma = 'cat_id = NULL';
-			}
-		} else {
-			$category_qpart = "";
-			$category_qpart_nocomma = "";
-		}
+		$feed_language = trim(clean($_POST["feed_language"]));
 
 		if (!$batch) {
-
-			$result = db_query("SELECT feed_url FROM ttrss_feeds WHERE id = " . $feed_id);
-			$orig_feed_url = db_fetch_result($result, 0, "feed_url");
-
-			$reset_basic_info = $orig_feed_url != $feed_link;
-
-			$this->dbh->query("UPDATE ttrss_feeds SET
-				$category_qpart
-				title = '$feed_title', feed_url = '$feed_link',
-				update_interval = '$upd_intl',
-				purge_interval = '$purge_intl',
-				auth_login = '$auth_login',
-				auth_pass = '$auth_pass',
-				auth_pass_encrypted = $auth_pass_encrypted,
-				private = $private,
-				cache_images = $cache_images,
-				hide_images = $hide_images,
-				include_in_digest = $include_in_digest,
-				always_display_enclosures = $always_display_enclosures,
-				mark_unread_on_update = $mark_unread_on_update,
-				feed_language = '$feed_language'
-			WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
-
-			if ($reset_basic_info) {
-				require_once "rssfuncs.php";
-
-				set_basic_feed_info($feed_id);
+			if (clean($_POST["need_auth"]) !== 'on') {
+				$auth_login = '';
+				$auth_pass = '';
 			}
 
+			/* $sth = $this->pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?");
+			$sth->execute([$feed_id]);
+			$row = $sth->fetch();$orig_feed_url = $row["feed_url"];
+
+			$reset_basic_info = $orig_feed_url != $feed_url; */
+
+			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET
+				cat_id = :cat_id,
+				title = :title,
+				feed_url = :feed_url,
+				site_url = :site_url,
+				update_interval = :upd_intl,
+				purge_interval = :purge_intl,
+				auth_login = :auth_login,
+				auth_pass = :auth_pass,
+				auth_pass_encrypted = false,
+				private = :private,
+				cache_images = :cache_images,
+				hide_images = :hide_images,
+				include_in_digest = :include_in_digest,
+				always_display_enclosures = :always_display_enclosures,
+				mark_unread_on_update = :mark_unread_on_update,
+				feed_language = :feed_language
+			WHERE id = :id AND owner_uid = :uid");
+
+			$sth->execute([":title" => $feed_title,
+					":cat_id" => $cat_id ? $cat_id : null,
+					":feed_url" => $feed_url,
+					":site_url" => $site_url,
+					":upd_intl" => $upd_intl,
+					":purge_intl" => $purge_intl,
+					":auth_login" => $auth_login,
+					":auth_pass" => $auth_pass,
+					":private" => (int)$private,
+					":cache_images" => (int)$cache_images,
+					":hide_images" => (int)$hide_images,
+					":include_in_digest" => (int)$include_in_digest,
+					":always_display_enclosures" => (int)$always_display_enclosures,
+					":mark_unread_on_update" => (int)$mark_unread_on_update,
+					":feed_language" => $feed_language,
+					":id" => $feed_id,
+					":uid" => $_SESSION['uid']]);
+
+/*			if ($reset_basic_info) {
+				RSSUtils::set_basic_feed_info($feed_id);
+			} */
+
 			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED,
 				"hook_prefs_save_feed", $feed_id);
 
@@ -1040,11 +1017,13 @@ class Pref_Feeds extends Handler_Protected {
 
 			foreach (array_keys($_POST) as $k) {
 				if ($k != "op" && $k != "method" && $k != "ids") {
-					$feed_data[$k] = $_POST[$k];
+					$feed_data[$k] = clean($_POST[$k]);
 				}
 			}
 
-			$this->dbh->query("BEGIN");
+			$this->pdo->beginTransaction();
+
+			$feed_ids_qmarks = arr_qmarks($feed_ids);
 
 			foreach (array_keys($feed_data) as $k) {
 
@@ -1052,90 +1031,87 @@ class Pref_Feeds extends Handler_Protected {
 
 				switch ($k) {
 					case "title":
-						$qpart = "title = '$feed_title'";
+						$qpart = "title = " . $this->pdo->quote($feed_title);
 						break;
 
 					case "feed_url":
-						$qpart = "feed_url = '$feed_link'";
+						$qpart = "feed_url = " . $this->pdo->quote($feed_url);
 						break;
 
 					case "update_interval":
-						$qpart = "update_interval = '$upd_intl'";
+						$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
 						break;
 
 					case "purge_interval":
-						$qpart = "purge_interval = '$purge_intl'";
+						$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
 						break;
 
 					case "auth_login":
-						$qpart = "auth_login = '$auth_login'";
+						$qpart = "auth_login = " . $this->pdo->quote($auth_login);
 						break;
 
 					case "auth_pass":
-						$qpart = "auth_pass = '$auth_pass' AND
-							auth_pass_encrypted = $auth_pass_encrypted";
+						$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
 						break;
 
 					case "private":
-						$qpart = "private = $private";
+						$qpart = "private = " . $this->pdo->quote($private);
 						break;
 
 					case "include_in_digest":
-						$qpart = "include_in_digest = $include_in_digest";
+						$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
 						break;
 
 					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = $always_display_enclosures";
+						$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
 						break;
 
 					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = $mark_unread_on_update";
+						$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
 						break;
 
 					case "cache_images":
-						$qpart = "cache_images = $cache_images";
+						$qpart = "cache_images = " . $this->pdo->quote($cache_images);
 						break;
 
 					case "hide_images":
-						$qpart = "hide_images = $hide_images";
+						$qpart = "hide_images = " . $this->pdo->quote($hide_images);
 						break;
 
 					case "cat_id":
-						$qpart = $category_qpart_nocomma;
+						if (get_pref('ENABLE_FEED_CATS')) {
+							if ($cat_id) {
+								$qpart = "cat_id = " . $this->pdo->quote($cat_id);
+							} else {
+								$qpart = 'cat_id = NULL';
+							}
+						} else {
+							$qpart = "";
+						}
+
 						break;
 
 					case "feed_language":
-						$qpart = "feed_language = '$feed_language'";
+						$qpart = "feed_language = " . $this->pdo->quote($feed_language);
 						break;
 
 				}
 
 				if ($qpart) {
-					$this->dbh->query(
-						"UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids)
-						AND owner_uid = " . $_SESSION["uid"]);
-					print "<br/>";
+					$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids_qmarks)
+						AND owner_uid = ?");
+					$sth->execute(array_merge($feed_ids, [$_SESSION['uid']]));
 				}
 			}
 
-			$this->dbh->query("COMMIT");
+			$this->pdo->commit();
 		}
 		return;
 	}
 
-	function resetPubSub() {
-
-		$ids = $this->dbh->escape_string($_REQUEST["ids"]);
-
-		$this->dbh->query("UPDATE ttrss_feeds SET pubsub_state = 0 WHERE id IN ($ids)
-			AND owner_uid = " . $_SESSION["uid"]);
-
-		return;
-	}
-
 	function remove() {
 
-		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
+		$ids = explode(",", clean($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 			Pref_Feeds::remove_feed($id, $_SESSION["uid"]);
@@ -1144,152 +1120,15 @@ class Pref_Feeds extends Handler_Protected {
 		return;
 	}
 
-	function clear() {
-		$id = $this->dbh->escape_string($_REQUEST["id"]);
-		$this->clear_feed_articles($id);
-	}
-
-	function rescore() {
-		require_once "rssfuncs.php";
-
-		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
-
-		foreach ($ids as $id) {
-
-			$filters = load_filters($id, $_SESSION["uid"], 6);
-
-			$result = $this->dbh->query("SELECT
-				title, content, link, ref_id, author,".
-				SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
-			  	FROM
-					ttrss_user_entries, ttrss_entries
-					WHERE ref_id = id AND feed_id = '$id' AND
-						owner_uid = " .$_SESSION['uid']."
-					");
-
-			$scores = array();
-
-			while ($line = $this->dbh->fetch_assoc($result)) {
-
-				$tags = get_article_tags($line["ref_id"]);
-
-				$article_filters = get_article_filters($filters, $line['title'],
-					$line['content'], $line['link'], strtotime($line['updated']),
-					$line['author'], $tags);
-
-				$new_score = calculate_article_score($article_filters);
-
-				if (!$scores[$new_score]) $scores[$new_score] = array();
-
-				array_push($scores[$new_score], $line['ref_id']);
-			}
-
-			foreach (array_keys($scores) as $s) {
-				if ($s > 1000) {
-					$this->dbh->query("UPDATE ttrss_user_entries SET score = '$s',
-						marked = true WHERE
-						ref_id IN (" . join(',', $scores[$s]) . ")");
-				} else if ($s < -500) {
-					$this->dbh->query("UPDATE ttrss_user_entries SET score = '$s',
-						unread = false WHERE
-						ref_id IN (" . join(',', $scores[$s]) . ")");
-				} else {
-					$this->dbh->query("UPDATE ttrss_user_entries SET score = '$s' WHERE
-						ref_id IN (" . join(',', $scores[$s]) . ")");
-				}
-			}
-		}
-
-		print __("All done.");
-
-	}
-
-	function rescoreAll() {
-
-		$result = $this->dbh->query(
-			"SELECT id FROM ttrss_feeds WHERE owner_uid = " . $_SESSION['uid']);
-
-		while ($feed_line = $this->dbh->fetch_assoc($result)) {
-
-			$id = $feed_line["id"];
-
-			$filters = load_filters($id, $_SESSION["uid"], 6);
-
-			$tmp_result = $this->dbh->query("SELECT
-				title, content, link, ref_id, author,".
-				  	SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
-					FROM
-					ttrss_user_entries, ttrss_entries
-					WHERE ref_id = id AND feed_id = '$id' AND
-						owner_uid = " .$_SESSION['uid']."
-					");
-
-			$scores = array();
-
-			while ($line = $this->dbh->fetch_assoc($tmp_result)) {
-
-				$tags = get_article_tags($line["ref_id"]);
-
-				$article_filters = get_article_filters($filters, $line['title'],
-					$line['content'], $line['link'], strtotime($line['updated']),
-					$line['author'], $tags);
-
-				$new_score = calculate_article_score($article_filters);
-
-				if (!$scores[$new_score]) $scores[$new_score] = array();
-
-				array_push($scores[$new_score], $line['ref_id']);
-			}
-
-			foreach (array_keys($scores) as $s) {
-				if ($s > 1000) {
-					$this->dbh->query("UPDATE ttrss_user_entries SET score = '$s',
-						marked = true WHERE
-						ref_id IN (" . join(',', $scores[$s]) . ")");
-				} else {
-					$this->dbh->query("UPDATE ttrss_user_entries SET score = '$s' WHERE
-						ref_id IN (" . join(',', $scores[$s]) . ")");
-				}
-			}
-		}
-
-		print __("All done.");
-
-	}
-
-	function categorize() {
-		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
-
-		$cat_id = $this->dbh->escape_string($_REQUEST["cat_id"]);
-
-		if ($cat_id == 0) {
-			$cat_id_qpart = 'NULL';
-		} else {
-			$cat_id_qpart = "'$cat_id'";
-		}
-
-		$this->dbh->query("BEGIN");
-
-		foreach ($ids as $id) {
-
-			$this->dbh->query("UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
-				WHERE id = '$id'
-			  	AND owner_uid = " . $_SESSION["uid"]);
-
-		}
-
-		$this->dbh->query("COMMIT");
-	}
-
 	function removeCat() {
-		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
+		$ids = explode(",", clean($_REQUEST["ids"]));
 		foreach ($ids as $id) {
 			$this->remove_feed_category($id, $_SESSION["uid"]);
 		}
 	}
 
 	function addCat() {
-		$feed_cat = $this->dbh->escape_string(trim($_REQUEST["cat"]));
+		$feed_cat = trim(clean($_REQUEST["cat"]));
 
 		add_feed_category($feed_cat);
 	}
@@ -1299,10 +1138,15 @@ class Pref_Feeds extends Handler_Protected {
 		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
 		print "<div id=\"pref-feeds-feeds\" dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Feeds')."\">";
 
-		$result = $this->dbh->query("SELECT COUNT(id) AS num_errors
-			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
+		$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
+			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
+		$sth->execute([$_SESSION['uid']]);
 
-		$num_errors = $this->dbh->fetch_result($result, 0, "num_errors");
+		if ($row = $sth->fetch()) {
+			$num_errors = $row["num_errors"];
+		} else {
+			$num_errors = 0;
+		}
 
 		if ($num_errors > 0) {
 
@@ -1317,7 +1161,7 @@ class Pref_Feeds extends Handler_Protected {
 				onclick=\"showInactiveFeeds()\">" .
 				__("Inactive feeds") . "</button>";
 
-		$feed_search = $this->dbh->escape_string($_REQUEST["search"]);
+		$feed_search = clean($_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_feed_search"] = $feed_search;
@@ -1377,24 +1221,6 @@ class Pref_Feeds extends Handler_Protected {
 		print $error_button;
 		print $inactive_button;
 
-		if (defined('_ENABLE_FEED_DEBUGGING')) {
-
-			print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
-				<option value=\"facDefault\" selected>".__('More actions...')."</option>";
-
-			if (FORCE_ARTICLE_PURGE == 0) {
-				print
-					"<option value=\"facPurge\">".__('Manual purge')."</option>";
-			}
-
-			print "
-				<option value=\"facClear\">".__('Clear feed data')."</option>
-				<option value=\"facRescore\">".__('Rescore articles')."</option>";
-
-			print "</select>";
-
-		}
-
 		print "</div>"; # toolbar
 
 		//print '</div>';
@@ -1404,6 +1230,8 @@ class Pref_Feeds extends Handler_Protected {
 		<img src='images/indicator_tiny.gif'>".
 		 __("Loading, please wait...")."</div>";
 
+		$auto_expand = $feed_search != "" ? "true" : "false";
+
 		print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\"
 			url=\"backend.php?op=pref-feeds&method=getfeedtree\">
 		</div>
@@ -1414,6 +1242,7 @@ class Pref_Feeds extends Handler_Protected {
 		<div dojoType=\"fox.PrefFeedTree\" id=\"feedTree\"
 			dndController=\"dijit.tree.dndSource\"
 			betweenThreshold=\"5\"
+			autoExpand='$auto_expand'
 			model=\"feedModel\" openOnClick=\"false\">
 		<script type=\"dojo/method\" event=\"onClick\" args=\"item\">
 			var id = String(item.id);
@@ -1453,7 +1282,9 @@ class Pref_Feeds extends Handler_Protected {
 		print "<form  name=\"opml_form\" style='display : block' target=\"upload_iframe\"
 			enctype=\"multipart/form-data\" method=\"POST\"
 			action=\"backend.php\">
-			<input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
+			<label class=\"dijitButton\">".__("Choose file...")."
+				<input style=\"display : none\" id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
+			</label>
 			<input type=\"hidden\" name=\"op\" value=\"dlg\">
 			<input type=\"hidden\" name=\"method\" value=\"importOpml\">
 			<button dojoType=\"dijit.form.Button\" onclick=\"return opmlImport();\" type=\"submit\">" .
@@ -1461,8 +1292,10 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<hr>";
 
+		$opml_export_filename = "TinyTinyRSS_".date("Y-m-d").".opml";
+
 		print "<p>" . __('Filename:') .
-            " <input type=\"text\" id=\"filename\" value=\"TinyTinyRSS.opml\" />&nbsp;" .
+            " <input class=\"input input-text\" type=\"text\" id=\"filename\" value=\"$opml_export_filename\" />&nbsp;" .
 				__('Include settings') . "<input type=\"checkbox\" id=\"settings\" checked=\"1\"/>";
 
 		print "</p><button dojoType=\"dijit.form.Button\"
@@ -1483,25 +1316,6 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "</div>"; # pane
 
-		if (strpos($_SERVER['HTTP_USER_AGENT'], "Firefox") !== false) {
-
-			print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Firefox integration')."\">";
-
-			print_notice(__('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.'));
-
-			print "<p>";
-
-			print "<button onclick='window.navigator.registerContentHandler(" .
-                      "\"application/vnd.mozilla.maybe.feed\", " .
-                      "\"" . add_feed_url() . "\", " . " \"Tiny Tiny RSS\")'>" .
-							 __('Click here to register this site as a feed reader.') .
-				"</button>";
-
-			print "</p>";
-
-			print "</div>"; # pane
-		}
-
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Published & shared articles / Generated feeds')."\">";
 
 		print "<p>" . __('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.') . "</p>";
@@ -1535,14 +1349,14 @@ class Pref_Feeds extends Handler_Protected {
 		$cat_id = (int) $cat_id;
 
 		if ($cat_id > 0) {
-			$cat_unread = ccache_find($cat_id, $_SESSION["uid"], true);
+			$cat_unread = CCache::find($cat_id, $_SESSION["uid"], true);
 		} else if ($cat_id == 0 || $cat_id == -2) {
-			$cat_unread = getCategoryUnread($cat_id);
+			$cat_unread = Feeds::getCategoryUnread($cat_id);
 		}
 
 		$obj['id'] = 'CAT:' . $cat_id;
 		$obj['items'] = array();
-		$obj['name'] = getCategoryTitle($cat_id);
+		$obj['name'] = Feeds::getCategoryTitle($cat_id);
 		$obj['type'] = 'category';
 		$obj['unread'] = (int) $cat_unread;
 		$obj['bare_id'] = $cat_id;
@@ -1555,7 +1369,7 @@ class Pref_Feeds extends Handler_Protected {
 		$feed_id = (int) $feed_id;
 
 		if (!$title)
-			$title = getFeedTitle($feed_id, false);
+			$title = Feeds::getFeedTitle($feed_id, false);
 
 		if ($unread === false)
 			$unread = getFeedUnread($feed_id, false);
@@ -1566,7 +1380,7 @@ class Pref_Feeds extends Handler_Protected {
 		$obj['type'] = 'feed';
 		$obj['error'] = $error;
 		$obj['updated'] = $updated;
-		$obj['icon'] = getFeedIcon($feed_id);
+		$obj['icon'] = Feeds::getFeedIcon($feed_id);
 		$obj['bare_id'] = $feed_id;
 		$obj['auxcounter'] = 0;
 
@@ -1581,17 +1395,18 @@ class Pref_Feeds extends Handler_Protected {
 			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
 		}
 
-		$result = $this->dbh->query("SELECT ttrss_feeds.title, ttrss_feeds.site_url,
+		$sth = $this->pdo->prepare("SELECT ttrss_feeds.title, ttrss_feeds.site_url,
 		  		ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article
 			FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE
 				(SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
 					ttrss_entries.id = ref_id AND
 						ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart
-			AND ttrss_feeds.owner_uid = ".$_SESSION["uid"]." AND
+			AND ttrss_feeds.owner_uid = ? AND
 				ttrss_user_entries.feed_id = ttrss_feeds.id AND
 				ttrss_entries.id = ref_id
 			GROUP BY ttrss_feeds.title, ttrss_feeds.id, ttrss_feeds.site_url, ttrss_feeds.feed_url
 			ORDER BY last_article");
+		$sth->execute([$_SESSION['uid']]);
 
 		print "<p" .__("These feeds have not been updated with new content for 3 months (oldest first):") . "</p>";
 
@@ -1612,7 +1427,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		$lnum = 1;
 
-		while ($line = $this->dbh->fetch_assoc($result)) {
+		while ($line = $sth->fetch()) {
 
 			$feed_id = $line["id"];
 			$this_row_id = "id=\"FUPDD-$feed_id\"";
@@ -1644,7 +1459,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<div class='dlgButtons'>";
 		print "<div style='float : left'>";
-		print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
+		print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
 			.__('Unsubscribe from selected feeds')."</button> ";
 		print "</div>";
 
@@ -1656,8 +1471,9 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function feedsWithErrors() {
-		$result = $this->dbh->query("SELECT id,title,feed_url,last_error,site_url
-		FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
+		$sth = $this->pdo->prepare("SELECT id,title,feed_url,last_error,site_url
+			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
+		$sth->execute([$_SESSION['uid']]);
 
 		print "<div dojoType=\"dijit.Toolbar\">";
 		print "<div dojoType=\"dijit.form.DropDownButton\">".
@@ -1676,7 +1492,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		$lnum = 1;
 
-		while ($line = $this->dbh->fetch_assoc($result)) {
+		while ($line = $sth->fetch()) {
 
 			$feed_id = $line["id"];
 			$this_row_id = "id=\"FERDD-$feed_id\"";
@@ -1710,7 +1526,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<div class='dlgButtons'>";
 		print "<div style='float : left'>";
-		print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
+		print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
 			.__('Unsubscribe from selected feeds')."</button> ";
 		print "</div>";
 
@@ -1720,100 +1536,96 @@ class Pref_Feeds extends Handler_Protected {
 		print "</div>";
 	}
 
-	/**
-	 * Purge a feed contents, marked articles excepted.
-	 *
-	 * @param mixed $link The database connection.
-	 * @param integer $id The id of the feed to purge.
-	 * @return void
-	 */
-	private function clear_feed_articles($id) {
-
-		if ($id != 0) {
-			$result = $this->dbh->query("DELETE FROM ttrss_user_entries
-			WHERE feed_id = '$id' AND marked = false AND owner_uid = " . $_SESSION["uid"]);
-		} else {
-			$result = $this->dbh->query("DELETE FROM ttrss_user_entries
-			WHERE feed_id IS NULL AND marked = false AND owner_uid = " . $_SESSION["uid"]);
-		}
-
-		$result = $this->dbh->query("DELETE FROM ttrss_entries WHERE
-			(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
-
-		ccache_update($id, $_SESSION['uid']);
-	} // function clear_feed_articles
-
 	private function remove_feed_category($id, $owner_uid) {
 
-		$this->dbh->query("DELETE FROM ttrss_feed_categories
-			WHERE id = '$id' AND owner_uid = $owner_uid");
+		$sth = $this->pdo->prepare("DELETE FROM ttrss_feed_categories
+			WHERE id = ? AND owner_uid = ?");
+		$sth->execute([$id, $owner_uid]);
 
-		ccache_remove($id, $owner_uid, true);
+		CCache::remove($id, $owner_uid, true);
 	}
 
 	static function remove_feed($id, $owner_uid) {
+		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
+			if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
+                user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
+                return;
+			}
+		}
+
+		$pdo = Db::pdo();
 
 		if ($id > 0) {
+			$pdo->beginTransaction();
 
 			/* save starred articles in Archived feed */
 
-			db_query("BEGIN");
-
 			/* prepare feed if necessary */
 
-			$result = db_query("SELECT feed_url FROM ttrss_feeds WHERE id = $id
-				AND owner_uid = $owner_uid");
+			$sth = $pdo->prepare("SELECT feed_url FROM ttrss_feeds WHERE id = ?
+				AND owner_uid = ?");
+			$sth->execute([$id, $owner_uid]);
+
+			if ($row = $sth->fetch()) {
+				$feed_url = $row["feed_url"];
 
-			$feed_url = db_escape_string(db_fetch_result($result, 0, "feed_url"));
+				$sth = $pdo->prepare("SELECT id FROM ttrss_archived_feeds
+					WHERE feed_url = ? AND owner_uid = ?");
+				$sth->execute([$feed_url, $owner_uid]);
 
-			$result = db_query("SELECT id FROM ttrss_archived_feeds
-				WHERE feed_url = '$feed_url' AND owner_uid = $owner_uid");
+				if ($row = $sth->fetch()) {
+					$archive_id = $row["id"];
+				} else {
+					$res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
+					$row = $res->fetch();
 
-			if (db_num_rows($result) == 0) {
-				$result = db_query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
-				$new_feed_id = (int)db_fetch_result($result, 0, "id") + 1;
+					$new_feed_id = (int)$row['id'] + 1;
 
-				db_query("INSERT INTO ttrss_archived_feeds
-					(id, owner_uid, title, feed_url, site_url)
-				SELECT $new_feed_id, owner_uid, title, feed_url, site_url from ttrss_feeds
-				WHERE id = '$id'");
+					$sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
+						(id, owner_uid, title, feed_url, site_url)
+							SELECT ?, owner_uid, title, feed_url, site_url from ttrss_feeds
+							WHERE id = ?");
+					$sth->execute([$new_feed_id, $id]);
 
-				$archive_id = $new_feed_id;
-			} else {
-				$archive_id = db_fetch_result($result, 0, "id");
-			}
+					$archive_id = $new_feed_id;
+				}
 
-			db_query("UPDATE ttrss_user_entries SET feed_id = NULL,
-				orig_feed_id = '$archive_id' WHERE feed_id = '$id' AND
-					marked = true AND owner_uid = $owner_uid");
+				$sth = $pdo->prepare("UPDATE ttrss_user_entries SET feed_id = NULL,
+					orig_feed_id = ? WHERE feed_id = ? AND
+						marked = true AND owner_uid = ?");
 
-			/* Remove access key for the feed */
+				$sth->execute([$archive_id, $id, $owner_uid]);
 
-			db_query("DELETE FROM ttrss_access_keys WHERE
-				feed_id = '$id' AND owner_uid = $owner_uid");
+				/* Remove access key for the feed */
 
-			/* remove the feed */
+				$sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
+					feed_id = ? AND owner_uid = ?");
+				$sth->execute([$id, $owner_uid]);
 
-			db_query("DELETE FROM ttrss_feeds
-					WHERE id = '$id' AND owner_uid = $owner_uid");
+				/* remove the feed */
 
-			db_query("COMMIT");
+				$sth = $pdo->prepare("DELETE FROM ttrss_feeds
+					WHERE id = ? AND owner_uid = ?");
+				$sth->execute([$id, $owner_uid]);
+			}
+
+			$pdo->commit();
 
 			if (file_exists(ICONS_DIR . "/$id.ico")) {
 				unlink(ICONS_DIR . "/$id.ico");
 			}
 
-			ccache_remove($id, $owner_uid);
+			CCache::remove($id, $owner_uid);
 
 		} else {
-			label_remove(feed_to_label_id($id), $owner_uid);
-			//ccache_remove($id, $owner_uid); don't think labels are cached
+			Labels::remove(Labels::feed_to_label_id($id), $owner_uid);
+			//CCache::remove($id, $owner_uid); don't think labels are cached
 		}
 	}
 
 	function batchSubscribe() {
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-feeds\">";
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"batchaddfeeds\">";
+		print_hidden("op", "pref-feeds");
+		print_hidden("method", "batchaddfeeds");
 
 		print "<table width='100%'><tr><td>
 			".__("Add one valid RSS feed per line (no feed detection is done)")."
@@ -1838,6 +1650,7 @@ class Pref_Feeds extends Handler_Protected {
 				" <input
 					placeHolder=\"".__("Password")."\"
 					dojoType=\"dijit.form.TextBox\" type='password'
+					autocomplete=\"new-password\"
 					style=\"width : 10em;\" name='pass'\">".
 				"</div>";
 
@@ -1860,47 +1673,31 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function batchAddFeeds() {
-		$cat_id = $this->dbh->escape_string($_REQUEST['cat']);
-		$feeds = explode("\n", $_REQUEST['feeds']);
-		$login = $this->dbh->escape_string($_REQUEST['login']);
-		$pass = trim($_REQUEST['pass']);
+		$cat_id = clean($_REQUEST['cat']);
+		$feeds = explode("\n", clean($_REQUEST['feeds']));
+		$login = clean($_REQUEST['login']);
+		$pass = trim(clean($_REQUEST['pass']));
 
 		foreach ($feeds as $feed) {
-			$feed = $this->dbh->escape_string(trim($feed));
+			$feed = trim($feed);
 
 			if (validate_feed_url($feed)) {
 
-				$this->dbh->query("BEGIN");
-
-				if ($cat_id == "0" || !$cat_id) {
-					$cat_qpart = "NULL";
-				} else {
-					$cat_qpart = "'$cat_id'";
-				}
-
-				$result = $this->dbh->query(
-					"SELECT id FROM ttrss_feeds
-					WHERE feed_url = '$feed' AND owner_uid = ".$_SESSION["uid"]);
-
-				if (strlen(FEED_CRYPT_KEY) > 0) {
-					require_once "crypt.php";
-					$pass = substr(encrypt_string($pass), 0, 250);
-					$auth_pass_encrypted = 'true';
-				} else {
-					$auth_pass_encrypted = 'false';
-				}
+				$this->pdo->beginTransaction();
 
-				$pass = $this->dbh->escape_string($pass);
+				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
+						WHERE feed_url = ? AND owner_uid = ?");
+				$sth->execute([$feed, $_SESSION['uid']]);
 
-				if ($this->dbh->num_rows($result) == 0) {
-					$result = $this->dbh->query(
-						"INSERT INTO ttrss_feeds
+				if (!$sth->fetch()) {
+					$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method,auth_pass_encrypted)
-						VALUES ('".$_SESSION["uid"]."', '$feed',
-							'[Unknown]', $cat_qpart, '$login', '$pass', 0, $auth_pass_encrypted)");
+						VALUES (?, ?, '[Unknown]', ?, ?, ?, 0, false)");
+
+					$sth->execute([$_SESSION['uid'], $feed, $cat_id ? $cat_id : null, $login, $pass]);
 				}
 
-				$this->dbh->query("COMMIT");
+				$this->pdo->commit();
 			}
 		}
 	}
@@ -1915,42 +1712,31 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function regenFeedKey() {
-		$feed_id = $this->dbh->escape_string($_REQUEST['id']);
-		$is_cat = $this->dbh->escape_string($_REQUEST['is_cat']) == "true";
+		$feed_id = clean($_REQUEST['id']);
+		$is_cat = clean($_REQUEST['is_cat']);
 
 		$new_key = $this->update_feed_access_key($feed_id, $is_cat);
 
-		print json_encode(array("link" => $new_key));
+		print json_encode(["link" => $new_key]);
 	}
 
 
 	private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
 		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$sql_is_cat = bool_to_sql_bool($is_cat);
-
-		$result = $this->dbh->query("SELECT access_key FROM ttrss_access_keys
-			WHERE feed_id = '$feed_id'	AND is_cat = $sql_is_cat
-			AND owner_uid = " . $owner_uid);
-
-		if ($this->dbh->num_rows($result) == 1) {
-			$key = $this->dbh->escape_string(uniqid_short());
+		// clear old value and generate new one
+		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys
+			WHERE feed_id = ? AND is_cat = ? AND owner_uid = ?");
+		$sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]);
 
-			$this->dbh->query("UPDATE ttrss_access_keys SET access_key = '$key'
-				WHERE feed_id = '$feed_id' AND is_cat = $sql_is_cat
-				AND owner_uid = " . $owner_uid);
-
-			return $key;
-
-		} else {
-			return get_feed_access_key($feed_id, $is_cat, $owner_uid);
-		}
+		return get_feed_access_key($feed_id, $is_cat, $owner_uid);
 	}
 
 	// Silent
 	function clearKeys() {
-		$this->dbh->query("DELETE FROM ttrss_access_keys WHERE
-			owner_uid = " . $_SESSION["uid"]);
+		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys WHERE
+			owner_uid = ?");
+		$sth->execute([$_SESSION['uid']]);
 	}
 
 	private function calculate_children_count($cat) {
@@ -1974,13 +1760,22 @@ class Pref_Feeds extends Handler_Protected {
 			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
 		}
 
-		$result = $this->dbh->query("SELECT COUNT(*) AS num_inactive FROM ttrss_feeds WHERE
+		$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_inactive FROM ttrss_feeds WHERE
 				(SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
 					ttrss_entries.id = ref_id AND
 						ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart AND
-			  ttrss_feeds.owner_uid = ".$_SESSION["uid"]);
+			  ttrss_feeds.owner_uid = ?");
+		$sth->execute([$_SESSION['uid']]);
 
-		print (int) $this->dbh->fetch_result($result, 0, "num_inactive");
+		if ($row = $sth->fetch()) {
+			print (int)$row["num_inactive"];
+		}
+	}
+
+	static function subscribe_to_feed_url() {
+		$url_path = get_self_url_prefix() .
+			"/public.php?op=subscribe&feed_url=%s";
+		return $url_path;
 	}
+
 }
-?>