From 3306daecf4450555961490c11e70e7cf7fe7b86e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 11 Apr 2013 19:12:00 +0400
Subject: implement upload-related support for open_basedir

---
 classes/opml.php       | 30 +++++++++++++++++++++++++++---
 classes/pref/feeds.php | 25 +++++++++++++++++++++----
 2 files changed, 48 insertions(+), 7 deletions(-)

(limited to 'classes')

diff --git a/classes/opml.php b/classes/opml.php
index 7a49f757c..2ecae4237 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -461,11 +461,35 @@ class Opml extends Handler_Protected {
 
 #		if ($debug) $doc = DOMDocument::load("/tmp/test.opml");
 
-		if (is_file($_FILES['opml_file']['tmp_name'])) {
+		if ($_FILES['opml_file']['error'] != 0) {
+			print_error(T_sprintf("Upload failed with error code %d",
+				$_FILES['opml_file']['error']));
+			return;
+		}
+
+		$tmp_file = false;
+
+		if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) {
+			$tmp_file = tempnam(CACHE_DIR . '/upload', 'opml');
+
+			$result = move_uploaded_file($_FILES['opml_file']['tmp_name'],
+				$tmp_file);
+
+			if (!$result) {
+				print_error(__("Unable to move uploaded file."));
+				return;
+			}
+		} else {
+			print_error(__('Error: please upload OPML file.'));
+			return;
+		}
+
+		if (is_file($tmp_file)) {
 			$doc = new DOMDocument();
-			$doc->load($_FILES['opml_file']['tmp_name']);
+			$doc->load($tmp_file);
+			unlink($tmp_file);
 		} else if (!$doc) {
-			print_error(__('Error: please upload OPML file.'));
+			print_error(__('Error: unable to find moved OPML file.'));
 			return;
 		}
 
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 469ca1111..f57cc37d6 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -463,7 +463,7 @@ class Pref_Feeds extends Handler_Protected {
 			WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
 
 		if (db_num_rows($result) != 0) {
-			unlink(ICONS_DIR . "/$feed_id.ico");
+			@unlink(ICONS_DIR . "/$feed_id.ico");
 		}
 
 		return;
@@ -472,7 +472,22 @@ class Pref_Feeds extends Handler_Protected {
 	function uploadicon() {
 		header("Content-type: text/html");
 
-		$icon_file = $_FILES['icon_file']['tmp_name'];
+		$tmp_file = false;
+
+		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
+			$tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
+
+			$result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
+				$tmp_file);
+
+			if (!$result) {
+				return;
+			}
+		} else {
+			return;
+		}
+
+		$icon_file = $tmp_file;
 		$feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]);
 
 		if (is_file($icon_file) && $feed_id) {
@@ -482,8 +497,8 @@ class Pref_Feeds extends Handler_Protected {
 					WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
 
 				if (db_num_rows($result) != 0) {
-					unlink(ICONS_DIR . "/$feed_id.ico");
-					move_uploaded_file($icon_file, ICONS_DIR . "/$feed_id.ico");
+					@unlink(ICONS_DIR . "/$feed_id.ico");
+					rename($icon_file, ICONS_DIR . "/$feed_id.ico");
 					$rc = 0;
 				} else {
 					$rc = 2;
@@ -495,6 +510,8 @@ class Pref_Feeds extends Handler_Protected {
 			$rc = 2;
 		}
 
+		@unlink($icon_file);
+
 		print "<script type=\"text/javascript\">";
 		print "parent.uploadIconHandler($rc);";
 		print "</script>";
-- 
cgit v1.2.3


From 0192ffe5a5f8254d723cf46e4bda839220191c2c Mon Sep 17 00:00:00 2001
From: Pedro Silva <psilva+git@pedrosilva.pt>
Date: Thu, 11 Apr 2013 16:25:37 +0100
Subject: Add new API method: `getFeedStats'

`getFeedStats' calls the new static function `api_get_feed_stats' to
return an array of real feeds of the following form:

    [{
       "first" : 1127,
       "unread" : 873,
       "last" : 15460,
       "title" : "Some feed",
       "id" : 31,
       "total" : 1513
    }]

where "first", "last", "total" are the first, last and total number of
articles in the feed.

This adds the ability to nntp-oriented clients to efficiently retrieve
an "active file" without having to resort to `getHeadlines(limit=-1)'
---
 classes/api.php | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index 4427834eb..6f95db0be 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -110,6 +110,11 @@ class API extends Handler {
 		print $this->wrap(self::STATUS_OK, getAllCounters($this->link));
 	}
 
+	function getFeedStats() {
+		$feeds = $this->api_get_feed_stats($this->link);
+		print $this->wrap(self::STATUS_OK, $feeds);
+	}
+
 	function getFeeds() {
 		$cat_id = db_escape_string($this->link, $_REQUEST["cat_id"]);
 		$unread_only = sql_bool_to_bool($_REQUEST["unread_only"]);
@@ -480,6 +485,38 @@ class API extends Handler {
 		}
 	}
 
+	static function api_get_feed_stats($link) {
+
+        $feeds = array();
+
+        $result = db_query($link, "SELECT ttrss_feeds.id, ttrss_feeds.title,".
+                           " MIN(ttrss_entries.id) AS first, MAX(ttrss_entries.id) AS last,".
+                           " COUNT(ttrss_entries.id) AS total".
+                           " FROM ttrss_entries, ttrss_user_entries, ttrss_feeds".
+                           " WHERE ttrss_user_entries.feed_id = ttrss_feeds.id".
+                           " AND ttrss_user_entries.ref_id = ttrss_entries.id".
+                           " AND ttrss_user_entries.owner_uid = ".$_SESSION["uid"].
+                           " GROUP BY ttrss_feeds.title");
+
+        while ($line = db_fetch_assoc($result)) {
+
+            $unread = getFeedUnread($link, $line["id"]);
+
+            $row = array(
+                "id" => (int)$line["id"],
+                "title" => $line["title"],
+                "first" => (int)$line["first"],
+                "last" => (int)$line["last"],
+                "total" => (int)$line["total"],
+                "unread" => (int)$unread
+            );
+
+            array_push($feeds, $row);
+        }
+
+        return $feeds;
+}
+
 	static function api_get_feeds($link, $cat_id, $unread_only, $limit, $offset, $include_nested = false) {
 
 			$feeds = array();
-- 
cgit v1.2.3


From b91a1e4deb510252485044f8856d9eb178f822ae Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 11 Apr 2013 20:06:07 +0400
Subject: bump api level

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

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index 6f95db0be..a347237c9 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -2,7 +2,7 @@
 
 class API extends Handler {
 
-	const API_LEVEL  = 5;
+	const API_LEVEL  = 6;
 
 	const STATUS_OK  = 0;
 	const STATUS_ERR = 1;
-- 
cgit v1.2.3


From e1f76af0068bd2cf5ce4a4203b7727d5b3111c04 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 11 Apr 2013 22:01:02 +0400
Subject: block listing of several util directories; deny access to config.php

---
 classes/.htaccess | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 classes/.htaccess

(limited to 'classes')

diff --git a/classes/.htaccess b/classes/.htaccess
new file mode 100644
index 000000000..93169e4eb
--- /dev/null
+++ b/classes/.htaccess
@@ -0,0 +1,2 @@
+Order deny,allow
+Deny from all
-- 
cgit v1.2.3


From 8096a20a95cf9873ad31650521908467e719b1bb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 12 Apr 2013 07:53:14 +0400
Subject: Revert "Add new API method: `getFeedStats'"

This reverts commit 0192ffe5a5f8254d723cf46e4bda839220191c2c.
---
 classes/api.php | 37 -------------------------------------
 1 file changed, 37 deletions(-)

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index a347237c9..aaeb86dcf 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -110,11 +110,6 @@ class API extends Handler {
 		print $this->wrap(self::STATUS_OK, getAllCounters($this->link));
 	}
 
-	function getFeedStats() {
-		$feeds = $this->api_get_feed_stats($this->link);
-		print $this->wrap(self::STATUS_OK, $feeds);
-	}
-
 	function getFeeds() {
 		$cat_id = db_escape_string($this->link, $_REQUEST["cat_id"]);
 		$unread_only = sql_bool_to_bool($_REQUEST["unread_only"]);
@@ -485,38 +480,6 @@ class API extends Handler {
 		}
 	}
 
-	static function api_get_feed_stats($link) {
-
-        $feeds = array();
-
-        $result = db_query($link, "SELECT ttrss_feeds.id, ttrss_feeds.title,".
-                           " MIN(ttrss_entries.id) AS first, MAX(ttrss_entries.id) AS last,".
-                           " COUNT(ttrss_entries.id) AS total".
-                           " FROM ttrss_entries, ttrss_user_entries, ttrss_feeds".
-                           " WHERE ttrss_user_entries.feed_id = ttrss_feeds.id".
-                           " AND ttrss_user_entries.ref_id = ttrss_entries.id".
-                           " AND ttrss_user_entries.owner_uid = ".$_SESSION["uid"].
-                           " GROUP BY ttrss_feeds.title");
-
-        while ($line = db_fetch_assoc($result)) {
-
-            $unread = getFeedUnread($link, $line["id"]);
-
-            $row = array(
-                "id" => (int)$line["id"],
-                "title" => $line["title"],
-                "first" => (int)$line["first"],
-                "last" => (int)$line["last"],
-                "total" => (int)$line["total"],
-                "unread" => (int)$unread
-            );
-
-            array_push($feeds, $row);
-        }
-
-        return $feeds;
-}
-
 	static function api_get_feeds($link, $cat_id, $unread_only, $limit, $offset, $include_nested = false) {
 
 			$feeds = array();
-- 
cgit v1.2.3


From 79f9bef767ba0e0a35c8bf8411bb90feac35a551 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 12 Apr 2013 08:18:43 +0400
Subject: add support for plugins adding API methods

---
 classes/api.php        | 15 +++++++++++++--
 classes/pluginhost.php | 10 ++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index aaeb86dcf..0fcd65eb3 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -464,8 +464,19 @@ class API extends Handler {
 
 	}
 
-	function index() {
-		print $this->wrap(self::STATUS_ERR, array("error" => 'UNKNOWN_METHOD'));
+	function index($method) {
+		global $pluginhost;
+
+		$plugin = $pluginhost->get_api_method(strtolower($method));
+
+		if ($plugin && method_exists($plugin, $method)) {
+			$reply = $plugin->$method();
+
+			print $this->wrap($reply[0], $reply[1]);
+
+		} else {
+			print $this->wrap(self::STATUS_ERR, array("error" => 'UNKNOWN_METHOD', "method" => $method));
+		}
 	}
 
 	function shareToPublished() {
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 9ae7b809e..7c6fab9a0 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -7,6 +7,7 @@ class PluginHost {
 	private $commands = array();
 	private $storage = array();
 	private $feeds = array();
+	private $api_methods = array();
 	private $owner_uid;
 	private $debug;
 
@@ -347,5 +348,14 @@ class PluginHost {
 		return PLUGIN_FEED_BASE_INDEX - 1 + abs($feed);
 	}
 
+	function add_api_method($name, $sender) {
+		if ($this->is_system($sender)) {
+			$this->api_methods[strtolower($name)] = $sender;
+		}
+	}
+
+	function get_api_method($name) {
+		return $this->api_methods[$name];
+	}
 }
 ?>
-- 
cgit v1.2.3


From 3ab417c2775b95e5ad4896b0a2c54ef19550f4c4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 12 Apr 2013 15:02:44 +0400
Subject: remove label gradients

---
 classes/feeds.php | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 6427559e1..c3b5225a1 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -9,18 +9,6 @@ class Feeds extends Handler_Protected {
 		return array_search($method, $csrf_ignored) !== false;
 	}
 
-	private function make_gradient($end, $class) {
-		$start = $class == "even" ? "#f0f0f0" : "#ffffff";
-
-		return "style='background: linear-gradient(left , $start 6%, $end 100%);
-			background: -o-linear-gradient(left , $start 6%, $end 100%);
-			background: -moz-linear-gradient(left , $start 6%, $end 100%);
-			background: -webkit-linear-gradient(left , $start 6%, $end 100%);
-			background: -ms-linear-gradient(left , $start 6%, $end 100%);
-			background: -webkit-gradient(linear, left top, right top,
-				color-stop(0.06, $start), color-stop(1, $end));'";
-	}
-
 	private function format_headline_subtoolbar($feed_site_url, $feed_title,
 			$feed_id, $is_cat, $search,
 			$search_mode, $view_mode, $error) {
@@ -304,7 +292,6 @@ class Feeds extends Handler_Protected {
 				$feed_id = $line["feed_id"];
 				$label_cache = $line["label_cache"];
 				$labels = false;
-				$label_row_style = "";
 
 				if ($label_cache) {
 					$label_cache = json_decode($label_cache, true);
@@ -319,22 +306,6 @@ class Feeds extends Handler_Protected {
 
 				if (!is_array($labels)) $labels = get_article_labels($this->link, $id);
 
-				if (count($labels) > 0) {
-					for ($i = 0; $i < min(4, count($labels)); $i++) {
-						$bg = rgb2hsl(_color_unpack($labels[$i][3]));
-
-						if ($bg && $bg[1] > 0) {
-							$bg[1] = 0.1;
-							$bg[2] = 1;
-
-							$bg = _color_pack(hsl2rgb($bg));
-							$label_row_style = $this->make_gradient($bg, $class);;
-
-							break;
-						}
-					}
-				}
-
 				$labels_str = "<span id=\"HLLCTR-$id\">";
 				$labels_str .= format_article_labels($labels, $id);
 				$labels_str .= "</span>";
@@ -450,7 +421,7 @@ class Feeds extends Handler_Protected {
 					$mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
 						onmouseout='postMouseOut($id)'";
 
-					$reply['content'] .= "<div class='hl $class' id='RROW-$id' $label_row_style $mouseover_attrs>";
+					$reply['content'] .= "<div class='hl $class' id='RROW-$id' $mouseover_attrs>";
 
 					$reply['content'] .= "<div class='hlLeft'>";
 
-- 
cgit v1.2.3


From 5aaae215e8bf51d56227f216d2cf80bd4266c52f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 13 Apr 2013 10:59:26 +0400
Subject: api: add score to getHeadlines/getArticle

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

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index 0fcd65eb3..958256be4 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -307,7 +307,7 @@ class API extends Handler {
 		$article_id = join(",", array_filter(explode(",", db_escape_string($this->link, $_REQUEST["article_id"])), is_numeric));
 
 		$query = "SELECT id,title,link,content,cached_content,feed_id,comments,int_id,
-			marked,unread,published,
+			marked,unread,published,score,
 			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 			author
 			FROM ttrss_entries,ttrss_user_entries
@@ -337,7 +337,8 @@ class API extends Handler {
 					"updated" => (int) strtotime($line["updated"]),
 					"content" => $line["cached_content"] != "" ? $line["cached_content"] : $line["content"],
 					"feed_id" => $line["feed_id"],
-					"attachments" => $attachments
+					"attachments" => $attachments,
+					"score" => (int)$line["score"]
 				);
 
 				global $pluginhost;
@@ -694,6 +695,7 @@ class API extends Handler {
 				$headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]);
 
 				$headline_row["author"] = $line["author"];
+				$headline_row["score"] = (int)$line["score"];
 
 				global $pluginhost;
 				foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_API) as $p) {
-- 
cgit v1.2.3


From 044cff2d74ece46256201695346d1a0d1d66c746 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sat, 13 Apr 2013 18:24:27 +0400
Subject: implement basic feed authentication parameter encryption in the
 database (FEED_CRYPT_KEY)

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

(limited to 'classes')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index f57cc37d6..4a77ed8cf 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -528,6 +528,9 @@ class Pref_Feeds extends Handler_Protected {
 			"SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND
 				owner_uid = " . $_SESSION["uid"]);
 
+		$auth_pass_encrypted = sql_bool_to_bool(db_fetch_result($result, 0,
+			"auth_pass_encrypted"));
+
 		$title = htmlspecialchars(db_fetch_result($result,
 			0, "title"));
 
@@ -613,7 +616,14 @@ class Pref_Feeds extends Handler_Protected {
 			placeHolder=\"".__("Login")."\"
 			name=\"auth_login\" value=\"$auth_login\"><hr/>";
 
-		$auth_pass = htmlspecialchars(db_fetch_result($result, 0, "auth_pass"));
+		$auth_pass = db_fetch_result($result, 0, "auth_pass");
+
+		if ($auth_pass_encrypted) {
+			require_once "crypt.php";
+			$auth_pass = decrypt_string($auth_pass);
+		}
+
+		$auth_pass = htmlspecialchars($auth_pass);
 
 		print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
 			placeHolder=\"".__("Password")."\"
@@ -936,6 +946,14 @@ class Pref_Feeds extends Handler_Protected {
 		$mark_unread_on_update = checkbox_to_sql_bool(
 			db_escape_string($this->link, $_POST["mark_unread_on_update"]));
 
+		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';
+		}
+
 		if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
 			if ($cat_id && $cat_id != 0) {
 				$category_qpart = "cat_id = '$cat_id',";
@@ -958,6 +976,7 @@ class Pref_Feeds extends Handler_Protected {
 				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,
@@ -1003,7 +1022,8 @@ class Pref_Feeds extends Handler_Protected {
 						break;
 
 					case "auth_pass":
-						$qpart = "auth_pass = '$auth_pass'";
+						$qpart = "auth_pass = '$auth_pass' AND
+							auth_pass_encrypted = $auth_pass_encrypted";
 						break;
 
 					case "private":
@@ -1841,12 +1861,20 @@ class Pref_Feeds extends Handler_Protected {
 					"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';
+				}
+
 				if (db_num_rows($result) == 0) {
 					$result = db_query($this->link,
 						"INSERT INTO ttrss_feeds
-							(owner_uid,feed_url,title,cat_id,auth_login,auth_pass,update_method)
+							(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)");
+							'[Unknown]', $cat_qpart, '$login', '$pass', 0, $auth_pass_encrypted)");
 				}
 
 				db_query($this->link, "COMMIT");
-- 
cgit v1.2.3


From 41694a956d4cbe4da633a967c06908b69e942c17 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 13 Apr 2013 18:58:09 +0400
Subject: fix double-escaping possible with encrypted passwords

---
 classes/pref/feeds.php | 8 ++++++--
 classes/rpc.php        | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'classes')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 4a77ed8cf..c57cccc44 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -932,7 +932,7 @@ class Pref_Feeds extends Handler_Protected {
 		$feed_ids = db_escape_string($this->link, $_POST["ids"]); /* batchEditSave */
 		$cat_id = (int) db_escape_string($this->link, $_POST["cat_id"]);
 		$auth_login = db_escape_string($this->link, trim($_POST["auth_login"]));
-		$auth_pass = db_escape_string($this->link, trim($_POST["auth_pass"]));
+		$auth_pass = trim($_POST["auth_pass"]);
 		$private = checkbox_to_sql_bool(db_escape_string($this->link, $_POST["private"]));
 		$include_in_digest = checkbox_to_sql_bool(
 			db_escape_string($this->link, $_POST["include_in_digest"]));
@@ -954,6 +954,8 @@ class Pref_Feeds extends Handler_Protected {
 			$auth_pass_encrypted = 'false';
 		}
 
+		$auth_pass = db_escape_string($this->link, $auth_pass);
+
 		if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
 			if ($cat_id && $cat_id != 0) {
 				$category_qpart = "cat_id = '$cat_id',";
@@ -1842,7 +1844,7 @@ class Pref_Feeds extends Handler_Protected {
 		$cat_id = db_escape_string($this->link, $_REQUEST['cat']);
 		$feeds = explode("\n", $_REQUEST['feeds']);
 		$login = db_escape_string($this->link, $_REQUEST['login']);
-		$pass = db_escape_string($this->link, $_REQUEST['pass']);
+		$pass = trim($_REQUEST['pass']);
 
 		foreach ($feeds as $feed) {
 			$feed = db_escape_string($this->link, trim($feed));
@@ -1869,6 +1871,8 @@ class Pref_Feeds extends Handler_Protected {
 					$auth_pass_encrypted = 'false';
 				}
 
+				$pass = db_escape_string($this->link, $pass);
+
 				if (db_num_rows($result) == 0) {
 					$result = db_query($this->link,
 						"INSERT INTO ttrss_feeds
diff --git a/classes/rpc.php b/classes/rpc.php
index 508dd8d41..1569a9a35 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -104,7 +104,7 @@ class RPC extends Handler_Protected {
 		$feed = db_escape_string($this->link, $_REQUEST['feed']);
 		$cat = db_escape_string($this->link, $_REQUEST['cat']);
 		$login = db_escape_string($this->link, $_REQUEST['login']);
-		$pass = db_escape_string($this->link, $_REQUEST['pass']);
+		$pass = trim($_REQUEST['pass']); // escaped later
 
 		$rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass);
 
-- 
cgit v1.2.3


From 884f2aee91b18080938f862a980c3a9b2b95484f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 12:57:52 +0400
Subject: use mdash as a separator between title and author

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index c3b5225a1..2f8dcb5ec 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -385,7 +385,7 @@ class Feeds extends Handler_Protected {
 				$entry_author = $line["author"];
 
 				if ($entry_author) {
-					$entry_author = " - $entry_author";
+					$entry_author = " &mdash; $entry_author";
 				}
 
 				$has_feed_icon = feed_has_icon($feed_id);
-- 
cgit v1.2.3


From e43a9c4a01bf095b740e35711c79f6a0ca3374ba Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 13:16:14 +0400
Subject: add a %d articles selected element

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 2f8dcb5ec..c7b7a83e6 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -49,6 +49,7 @@ class Feeds extends Handler_Protected {
 		// right part
 
 		$reply .= "<span class='r'>";
+		$reply .= "<span id='selected_prompt'></span>";
 		$reply .= "<span id='feed_title'>";
 
 		if ($feed_site_url) {
-- 
cgit v1.2.3


From 2cfbb448fb197837c063c377c042beb3ba704a52 Mon Sep 17 00:00:00 2001
From: moontear <gaida@DE-ADN-F1FW4S1.adesso.local>
Date: Mon, 15 Apr 2013 12:28:52 +0200
Subject: Added average color calculation of feeds' favicons for banded
 display.

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index c7b7a83e6..64d1d8786 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -528,8 +528,9 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "<div class=\"cdm $expanded_class $class\"
 						id=\"RROW-$id\" $mouseover_attrs'>";
 
-					$reply['content'] .= "<div class=\"cdmHeader\">";
-
+					//setting feed headline background color, needs to change text color based on dark/light
+					$favColor = explode("|", $line['favicon_avg_color']);
+					$reply['content'] .= "<div class=\"cdmHeader\" style=\"background-color: rgb($favColor[0], $favColor[1], $favColor[2]);\">";
 					$reply['content'] .= "<div style=\"vertical-align : middle\">";
 
 					$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
-- 
cgit v1.2.3


From 63c323f73610d81216801d1023dca724cfd32699 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 15:17:12 +0400
Subject: only enable colored favicons in vfeeds; fix RGB triplet packing

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 64d1d8786..22c3497d4 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -529,8 +529,8 @@ class Feeds extends Handler_Protected {
 						id=\"RROW-$id\" $mouseover_attrs'>";
 
 					//setting feed headline background color, needs to change text color based on dark/light
-					$favColor = explode("|", $line['favicon_avg_color']);
-					$reply['content'] .= "<div class=\"cdmHeader\" style=\"background-color: rgb($favColor[0], $favColor[1], $favColor[2]);\">";
+					$fav_color = $line['favicon_avg_color'];
+					$reply['content'] .= "<div class=\"cdmHeader\" style=\"background-color: $fav_color;\">";
 					$reply['content'] .= "<div style=\"vertical-align : middle\">";
 
 					$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
-- 
cgit v1.2.3


From e0deff393383982d33045a2a1ec47862141b988b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 15:27:35 +0400
Subject: implement basic moz gradient for feedicon color

---
 classes/feeds.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 22c3497d4..07cc427a9 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -150,6 +150,8 @@ class Feeds extends Handler_Protected {
 
 		$reply = array();
 
+		$rgba_cache = array();
+
 		$timing_info = microtime(true);
 
 		$topmost_article_ids = array();
@@ -530,7 +532,22 @@ class Feeds extends Handler_Protected {
 
 					//setting feed headline background color, needs to change text color based on dark/light
 					$fav_color = $line['favicon_avg_color'];
-					$reply['content'] .= "<div class=\"cdmHeader\" style=\"background-color: $fav_color;\">";
+
+					require_once "colors.php";
+
+					if ($fav_color) {
+						if (!isset($rgba_cache[$feed_id]))
+							$rgba_cache[$feed_id] = join(",", _color_unpack($fav_color));
+
+						$rgba = $rgba_cache[$feed_id];
+
+						$row_background = "background-image : -moz-linear-gradient(left, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 95%";
+
+					} else {
+						$row_background = "";
+					}
+
+					$reply['content'] .= "<div class=\"cdmHeader\" style=\"$row_background\">";
 					$reply['content'] .= "<div style=\"vertical-align : middle\">";
 
 					$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
-- 
cgit v1.2.3


From 85eea71e0e8432349ffc38ef504f34fc34d70530 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 15:34:47 +0400
Subject: use w3c gradient definition

---
 classes/feeds.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 07cc427a9..10877bad5 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -541,7 +541,13 @@ class Feeds extends Handler_Protected {
 
 						$rgba = $rgba_cache[$feed_id];
 
-						$row_background = "background-image : -moz-linear-gradient(left, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 95%";
+						// W3C definition seems to work in FF and Chrome
+						$row_background = "background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);";
+
+						/* $row_background = "background-image : -moz-linear-gradient(left, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);".
+							"background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);";
+							"background-image : -webkit-gradient(linear, left top, right top, color-stop( 50%, rgba(255,255,255,0)),
+								color-stop(100%, rgba($rgba, 0.2)));"; */
 
 					} else {
 						$row_background = "";
-- 
cgit v1.2.3


From bfaf90e364e883790af2b354cfbb9db250a5a516 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 15:38:05 +0400
Subject: add row backgrounds in normal mode

---
 classes/feeds.php | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 10877bad5..79edca5d9 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -401,6 +401,28 @@ class Feeds extends Handler_Protected {
 
 				$entry_site_url = $line["site_url"];
 
+				//setting feed headline background color, needs to change text color based on dark/light
+				$fav_color = $line['favicon_avg_color'];
+
+				require_once "colors.php";
+
+				if ($fav_color) {
+					if (!isset($rgba_cache[$feed_id]))
+						$rgba_cache[$feed_id] = join(",", _color_unpack($fav_color));
+
+					$rgba = $rgba_cache[$feed_id];
+
+					// W3C definition seems to work in FF and Chrome
+					$row_background = "background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);";
+
+					/* $row_background = "background-image : -moz-linear-gradient(left, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);".
+						"background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);";
+						"background-image : -webkit-gradient(linear, left top, right top, color-stop( 50%, rgba(255,255,255,0)),
+							color-stop(100%, rgba($rgba, 0.2)));"; */
+				} else {
+					$row_background = "";
+				}
+
 				if (!get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {
 
 					if (get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
@@ -424,7 +446,7 @@ class Feeds extends Handler_Protected {
 					$mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
 						onmouseout='postMouseOut($id)'";
 
-					$reply['content'] .= "<div class='hl $class' id='RROW-$id' $mouseover_attrs>";
+					$reply['content'] .= "<div class='hl $class' id='RROW-$id' $mouseover_attrs style='$row_background'>";
 
 					$reply['content'] .= "<div class='hlLeft'>";
 
@@ -530,29 +552,6 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "<div class=\"cdm $expanded_class $class\"
 						id=\"RROW-$id\" $mouseover_attrs'>";
 
-					//setting feed headline background color, needs to change text color based on dark/light
-					$fav_color = $line['favicon_avg_color'];
-
-					require_once "colors.php";
-
-					if ($fav_color) {
-						if (!isset($rgba_cache[$feed_id]))
-							$rgba_cache[$feed_id] = join(",", _color_unpack($fav_color));
-
-						$rgba = $rgba_cache[$feed_id];
-
-						// W3C definition seems to work in FF and Chrome
-						$row_background = "background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);";
-
-						/* $row_background = "background-image : -moz-linear-gradient(left, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);".
-							"background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);";
-							"background-image : -webkit-gradient(linear, left top, right top, color-stop( 50%, rgba(255,255,255,0)),
-								color-stop(100%, rgba($rgba, 0.2)));"; */
-
-					} else {
-						$row_background = "";
-					}
-
 					$reply['content'] .= "<div class=\"cdmHeader\" style=\"$row_background\">";
 					$reply['content'] .= "<div style=\"vertical-align : middle\">";
 
-- 
cgit v1.2.3


From e7480cc13b55162510001b5b9d91af289606a9f1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 15:56:08 +0400
Subject: do not color predominantly white/black rows

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 79edca5d9..81729aacc 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -407,13 +407,22 @@ class Feeds extends Handler_Protected {
 				require_once "colors.php";
 
 				if ($fav_color) {
-					if (!isset($rgba_cache[$feed_id]))
-						$rgba_cache[$feed_id] = join(",", _color_unpack($fav_color));
+					if (!isset($rgba_cache[$feed_id])) {
+						$hsl = rgb2hsl(_color_unpack($fav_color));
+
+						if ($hsl[1] < 0.1)
+							$hsl[2] = 1;
+						else if ($hsl[2] < 0.25)
+							$hsl[2] = 0.25;
+
+						$rgba_cache[$feed_id] = join(",", hsl2rgb($hsl));
+
+					}
 
 					$rgba = $rgba_cache[$feed_id];
 
 					// W3C definition seems to work in FF and Chrome
-					$row_background = "background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);";
+					$row_background = "background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba($rgba, 0.3) 100%);";
 
 					/* $row_background = "background-image : -moz-linear-gradient(left, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);".
 						"background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);";
-- 
cgit v1.2.3


From 12a6bd28ace16ff20f1f920831cffe1041b36d5c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 17:07:06 +0400
Subject: remove hsl stuff from classes/feeds, we take care of this when
 choosing the color

---
 classes/feeds.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 81729aacc..6d15c99e8 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -408,15 +408,7 @@ class Feeds extends Handler_Protected {
 
 				if ($fav_color) {
 					if (!isset($rgba_cache[$feed_id])) {
-						$hsl = rgb2hsl(_color_unpack($fav_color));
-
-						if ($hsl[1] < 0.1)
-							$hsl[2] = 1;
-						else if ($hsl[2] < 0.25)
-							$hsl[2] = 0.25;
-
-						$rgba_cache[$feed_id] = join(",", hsl2rgb($hsl));
-
+						$rgba_cache[$feed_id] = join(",", _color_unpack($fav_color));
 					}
 
 					$rgba = $rgba_cache[$feed_id];
-- 
cgit v1.2.3


From 86f7d2a9f2b6468a34b20d7a26c7cfc3afbe00ee Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 18:09:48 +0400
Subject: make gradient less visible on read headlines

---
 classes/feeds.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 6d15c99e8..6ee5bad0b 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -413,8 +413,13 @@ class Feeds extends Handler_Protected {
 
 					$rgba = $rgba_cache[$feed_id];
 
+					if (sql_bool_to_bool($line["unread"]))
+						$endalpha = '0.3';
+					else
+						$endalpha = '0.1';
+
 					// W3C definition seems to work in FF and Chrome
-					$row_background = "background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba($rgba, 0.3) 100%);";
+					$row_background = "background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba($rgba, $endalpha) 100%);";
 
 					/* $row_background = "background-image : -moz-linear-gradient(left, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);".
 						"background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);";
-- 
cgit v1.2.3


From bc7a144dd589302025c3b024d6da71f2e53d6496 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 18:22:48 +0400
Subject: properly remove and replace favicon color when favicon gets manually
 removed/uploaded

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

(limited to 'classes')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index c57cccc44..c5d6245fe 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -464,6 +464,9 @@ class Pref_Feeds extends Handler_Protected {
 
 		if (db_num_rows($result) != 0) {
 			@unlink(ICONS_DIR . "/$feed_id.ico");
+
+			db_query($this->link, "UPDATE ttrss_feeds SET favicon_avg_color = NULL
+				where id = '$feed_id'");
 		}
 
 		return;
@@ -498,8 +501,19 @@ class Pref_Feeds extends Handler_Protected {
 
 				if (db_num_rows($result) != 0) {
 					@unlink(ICONS_DIR . "/$feed_id.ico");
-					rename($icon_file, ICONS_DIR . "/$feed_id.ico");
-					$rc = 0;
+					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
+
+						require_once "colors.php";
+
+						$favicon_color = db_escape_string($this->link,
+							calculate_avg_color(ICONS_DIR . "/$feed_id.ico"));
+
+						db_query($this->link, "UPDATE ttrss_feeds SET
+							favicon_avg_color = '$favicon_color'
+							WHERE id = '$feed_id'");
+
+						$rc = 0;
+					}
 				} else {
 					$rc = 2;
 				}
-- 
cgit v1.2.3


From 5e3d5480f7e154a897363770327001fe1b72f504 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 15 Apr 2013 19:28:11 +0400
Subject: use hashed guids in a hopefully backwards compatible fashion

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

(limited to 'classes')

diff --git a/classes/article.php b/classes/article.php
index 9a0970140..f31a225d1 100644
--- a/classes/article.php
+++ b/classes/article.php
@@ -88,7 +88,7 @@ class Article extends Handler_Protected {
 	static function create_published_article($link, $title, $url, $content, $labels_str,
 			$owner_uid) {
 
-		$guid = sha1($url . $owner_uid); // include owner_uid to prevent global GUID clash
+		$guid = 'SHA1:' . sha1("ttshared:" . $url . $owner_uid); // include owner_uid to prevent global GUID clash
 		$content_hash = sha1($content);
 
 		if ($labels_str != "") {
-- 
cgit v1.2.3


From 40fe2d73821788e7c202191dc7b94b025585d338 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 15:44:38 +0400
Subject: remove js-based player, better mp3 support detection for html5 audio

---
 classes/rpc.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'classes')

diff --git a/classes/rpc.php b/classes/rpc.php
index 1569a9a35..b6d552868 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -334,6 +334,7 @@ class RPC extends Handler_Protected {
 	function sanityCheck() {
 		$_SESSION["hasAudio"] = $_REQUEST["hasAudio"] === "true";
 		$_SESSION["hasSandbox"] = $_REQUEST["hasSandbox"] === "true";
+		$_SESSION["hasMp3"] = $_REQUEST["hasMp3"] === "true";
 
 		$reply = array();
 
-- 
cgit v1.2.3


From b9863a153c4a9295c3ddd214c1c1d21aa4807221 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 16:40:04 +0400
Subject: unify SMTP_HOST and SMTP_PORT as SMTP_SERVER

---
 classes/ttrssmailer.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'classes')

diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index 1eb9f1d3a..1f365c22e 100644
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -25,17 +25,20 @@ class ttrssMailer extends PHPMailer {
 
 	function __construct() {
 		$this->SetLanguage("en", "lib/phpmailer/language/");
-		//if SMTP_HOST is specified, use SMTP to send mail directly
+
 		if (SMTP_HOST) {
-			$Host = SMTP_HOST;
+			$pair = explode(":", SMTP_HOST, 2);
 			$Mailer = "smtp";
+
+			$Host = $pair[0];
+			$Port = $pair[1];
+
+			if (!$Port) $Port = 25;
+		} else {
+			$Host = '';
+			$Port = '';
 		}
-		//if SMTP_PORT is specified, assign it. Otherwise default to port 25
-		if(SMTP_PORT){
-			$Port = SMTP_PORT;
-		}else{
-			$Port = "25";
-		}
+
 
 		//if SMTP_LOGIN is specified, set credentials and enable auth
 		if(SMTP_LOGIN){
-- 
cgit v1.2.3


From 90df27a4c12d3be57744d0bb4cde048ff3174591 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 16:43:15 +0400
Subject: ttrssMailer: fix typo

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

(limited to 'classes')

diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index 1f365c22e..54d180620 100644
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -26,8 +26,8 @@ class ttrssMailer extends PHPMailer {
 	function __construct() {
 		$this->SetLanguage("en", "lib/phpmailer/language/");
 
-		if (SMTP_HOST) {
-			$pair = explode(":", SMTP_HOST, 2);
+		if (SMTP_SERVER) {
+			$pair = explode(":", SMTP_SERVER, 2);
 			$Mailer = "smtp";
 
 			$Host = $pair[0];
-- 
cgit v1.2.3


From 4f032700dbfbbfa35798e05497c8a868eb73476f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 16:50:22 +0400
Subject: ttrssMailer: actually use OOP properly

---
 classes/ttrssmailer.php | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'classes')

diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index 54d180620..fd7f969aa 100644
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -17,34 +17,29 @@ class ttrssMailer extends PHPMailer {
 		public $CharSet = "UTF-8";
 		public $PluginDir = "lib/phpmailer/";
 		public $ContentType = "text/html"; //default email type is HTML
-		public $Host;
-		public $Port;
-		public $SMTPAuth=False;
-		public $Username;
-		public $Password;
 
 	function __construct() {
 		$this->SetLanguage("en", "lib/phpmailer/language/");
 
 		if (SMTP_SERVER) {
 			$pair = explode(":", SMTP_SERVER, 2);
-			$Mailer = "smtp";
+			$this->Mailer = "smtp";
 
-			$Host = $pair[0];
-			$Port = $pair[1];
+			$this->Host = $pair[0];
+			$this->Port = $pair[1];
 
 			if (!$Port) $Port = 25;
 		} else {
-			$Host = '';
-			$Port = '';
+			$this->Host = '';
+			$this->Port = '';
 		}
 
 
 		//if SMTP_LOGIN is specified, set credentials and enable auth
 		if(SMTP_LOGIN){
-			$SMTPAuth = true;
-			$Username = SMTP_LOGIN;
-			$Password = SMTP_PASSWORD;
+			$this->SMTPAuth = true;
+			$this->Username = SMTP_LOGIN;
+			$this->Password = SMTP_PASSWORD;
 			}
 	}
 	/*	@brief a simple mail function to send email using the defaults
-- 
cgit v1.2.3


From 889a5f9f195309df5842f142986b3166212d8a58 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 16 Apr 2013 19:41:31 +0400
Subject: experimental SQL-based error logger

---
 classes/logger.php     | 24 ++++++++++++++++++++++++
 classes/logger/sql.php | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 classes/logger.php
 create mode 100644 classes/logger/sql.php

(limited to 'classes')

diff --git a/classes/logger.php b/classes/logger.php
new file mode 100644
index 000000000..6370e1425
--- /dev/null
+++ b/classes/logger.php
@@ -0,0 +1,24 @@
+<?php
+class Logger {
+
+	protected $errornames = array(
+		2			=> 'E_WARNING',
+		8			=> 'E_NOTICE',
+		256		=> 'E_USER_ERROR',
+		512		=> 'E_USER_WARNING',
+		1024		=> 'E_USER_NOTICE',
+		2048		=> 'E_STRICT',
+		4096		=> 'E_RECOVERABLE_ERROR',
+		8192		=> 'E_DEPRECATED',
+		16384		=> 'E_USER_DEPRECATED',
+		32767		=> 'E_ALL');
+
+	function log_error($errno, $errstr, $file, $line, $context) {
+		return false;
+	}
+
+	function log($string) {
+		return false;
+	}
+}
+?>
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
new file mode 100644
index 000000000..7ee22844e
--- /dev/null
+++ b/classes/logger/sql.php
@@ -0,0 +1,35 @@
+<?php
+class Logger_SQL {
+
+	private $link;
+
+	function __construct() {
+		$this->link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
+	}
+
+	function log_error($errno, $errstr, $file, $line, $context) {
+
+		if ($errno == E_NOTICE) return false;
+
+		if ($this->link) {
+			$errno = db_escape_string($this->link, $errno);
+			$errstr = db_escape_string($this->link, $errstr);
+			$file = db_escape_string($this->link, $file);
+			$line = db_escape_string($this->link, $line);
+			$context = db_escape_string($this->link, json_encode($context));
+
+			$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : "NULL";
+
+			$result = db_query($this->link,
+				"INSERT INTO ttrss_error_log
+				(errno, errstr, filename, lineno, context, owner_uid, created_at) VALUES
+				($errno, '$errstr', '$file', '$line', '$context', $owner_uid, NOW())");
+
+			return db_affected_rows($this->link, $result) != 0;
+
+		}
+		return false;
+	}
+
+}
+?>
-- 
cgit v1.2.3


From 4e53956addb597d99a76d10d302ab56faad88bf8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 20:16:15 +0400
Subject: implement error log viewer

---
 classes/logger.php     |  3 ++-
 classes/logger/sql.php |  3 ++-
 classes/pref/prefs.php | 45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/logger.php b/classes/logger.php
index 6370e1425..e0ca37363 100644
--- a/classes/logger.php
+++ b/classes/logger.php
@@ -1,7 +1,8 @@
 <?php
 class Logger {
 
-	protected $errornames = array(
+	public static $errornames = array(
+		1			=> 'E_ERROR',
 		2			=> 'E_WARNING',
 		8			=> 'E_NOTICE',
 		256		=> 'E_USER_ERROR',
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index 7ee22844e..a478e8928 100644
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -16,7 +16,8 @@ class Logger_SQL {
 			$errstr = db_escape_string($this->link, $errstr);
 			$file = db_escape_string($this->link, $file);
 			$line = db_escape_string($this->link, $line);
-			$context = db_escape_string($this->link, json_encode($context));
+			$context = ''; // backtrace is a lot of data which is not really critical to store
+			//$context = db_escape_string($this->link, serialize($context));
 
 			$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : "NULL";
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 29541e04d..c6d41c15b 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -723,6 +723,51 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "</div>"; #pane
 
+		if ($_SESSION["access_level"] == 10) {
+
+			print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
+			print "<h2>".__("Error Log")."</h2>";
+
+			$result = db_query($this->link, "SELECT errno, errstr, filename, lineno,
+				created_at, login FROM ttrss_error_log
+				LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
+				ORDER BY ttrss_error_log.id DESC
+				LIMIT 100");
+
+			print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
+
+			print "<tr class=\"title\">
+				<td width='5%'>".__("Error")."</td>
+				<td>".__("Filename")."</td>
+				<td>".__("Message")."</td>
+				<td width='5%'>".__("User")."</td>
+				<td width='5%'>".__("Date")."</td>
+				</tr>";
+
+			while ($line = db_fetch_assoc($result)) {
+				print "<tr class=\"errrow\">";
+
+				foreach ($line as $k => $v) {
+					$line[$k] = htmlspecialchars($v);
+				}
+
+				print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
+				print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
+				print "<td class='errstr'>" . $line["errstr"] . "</td>";
+				print "<td class='login'>" . $line["login"] . "</td>";
+
+				print "<td class='timestamp'>" .
+					make_local_datetime($this->link,
+					$line["created_at"], false) . "</td>";
+
+				print "</tr>";
+			}
+
+			print "</table>";
+
+			print "</div>";
+		}
+
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Plugins')."\">";
 
 		print "<h2>".__("Plugins")."</h2>";
-- 
cgit v1.2.3


From b8c7f8357d4858ec1bf42bd8c990413ce75dd080 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 20:20:38 +0400
Subject: do not try to load plugins which aren't directories

---
 classes/pluginhost.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'classes')

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 7c6fab9a0..bbfa2ca2a 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -103,6 +103,9 @@ class PluginHost {
 		foreach ($plugins as $class) {
 			$class = trim($class);
 			$class_file = strtolower(basename($class));
+
+			if (!is_dir(dirname(__FILE__)."/../plugins/$class_file")) continue;
+
 			$file = dirname(__FILE__)."/../plugins/$class_file/init.php";
 
 			if (!isset($this->plugins[$class])) {
-- 
cgit v1.2.3


From e2261e177bc9f5308185d91783ca128000c6fd87 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 20:34:20 +0400
Subject: implement old log entry purging in update_daemon_common; add some
 more error types; tweak error log display

---
 classes/logger.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'classes')

diff --git a/classes/logger.php b/classes/logger.php
index e0ca37363..3c501eb92 100644
--- a/classes/logger.php
+++ b/classes/logger.php
@@ -4,7 +4,12 @@ class Logger {
 	public static $errornames = array(
 		1			=> 'E_ERROR',
 		2			=> 'E_WARNING',
+		4			=> 'E_PARSE',
 		8			=> 'E_NOTICE',
+		16			=> 'E_CORE_ERROR',
+		32			=> 'E_CORE_WARNING',
+		64			=> 'E_COMPILE_ERROR',
+		128		=> 'E_COMPILE_WARNING',
 		256		=> 'E_USER_ERROR',
 		512		=> 'E_USER_WARNING',
 		1024		=> 'E_USER_NOTICE',
-- 
cgit v1.2.3


From a5680acbe86c0e01295f9f3a475f6ae0e7e1bdb0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 20:40:23 +0400
Subject: replace split with explode

---
 classes/pref/feeds.php   | 8 ++++----
 classes/pref/filters.php | 2 +-
 classes/pref/labels.php  | 6 +++---
 classes/pref/users.php   | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'classes')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index c5d6245fe..9dc515556 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1097,7 +1097,7 @@ class Pref_Feeds extends Handler_Protected {
 
 	function remove() {
 
-		$ids = split(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 			Pref_Feeds::remove_feed($this->link, $id, $_SESSION["uid"]);
@@ -1114,7 +1114,7 @@ class Pref_Feeds extends Handler_Protected {
 	function rescore() {
 		require_once "rssfuncs.php";
 
-		$ids = split(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 
@@ -1220,7 +1220,7 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function categorize() {
-		$ids = split(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
 
 		$cat_id = db_escape_string($this->link, $_REQUEST["cat_id"]);
 
@@ -1244,7 +1244,7 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function removeCat() {
-		$ids = split(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
 		foreach ($ids as $id) {
 			$this->remove_feed_category($this->link, $id, $_SESSION["uid"]);
 		}
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 4be1cdae5..586626dd7 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -482,7 +482,7 @@ class Pref_Filters extends Handler_Protected {
 
 	function remove() {
 
-		$ids = split(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 			db_query($this->link, "DELETE FROM ttrss_filters2 WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index b45354c94..15fa7b20b 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -119,7 +119,7 @@ class Pref_Labels extends Handler_Protected {
 
 	function colorset() {
 		$kind = db_escape_string($this->link, $_REQUEST["kind"]);
-		$ids = split(',', db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(',', db_escape_string($this->link, $_REQUEST["ids"]));
 		$color = db_escape_string($this->link, $_REQUEST["color"]);
 		$fg = db_escape_string($this->link, $_REQUEST["fg"]);
 		$bg = db_escape_string($this->link, $_REQUEST["bg"]);
@@ -149,7 +149,7 @@ class Pref_Labels extends Handler_Protected {
 	}
 
 	function colorreset() {
-		$ids = split(',', db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(',', db_escape_string($this->link, $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 			db_query($this->link, "UPDATE ttrss_labels2 SET
@@ -213,7 +213,7 @@ class Pref_Labels extends Handler_Protected {
 
 	function remove() {
 
-		$ids = split(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 			label_remove($this->link, $id, $_SESSION["uid"]);
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 891a69a52..bd2fff735 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -202,7 +202,7 @@ class Pref_Users extends Handler_Protected {
 		}
 
 		function remove() {
-			$ids = split(",", db_escape_string($this->link, $_REQUEST["ids"]));
+			$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
 
 			foreach ($ids as $id) {
 				if ($id != $_SESSION["uid"] && $id != 1) {
@@ -367,7 +367,7 @@ class Pref_Users extends Handler_Protected {
 
 			if ($user_search) {
 
-				$user_search = split(" ", $user_search);
+				$user_search = explode(" ", $user_search);
 				$tokens = array();
 
 				foreach ($user_search as $token) {
-- 
cgit v1.2.3


From 9deca86d96ba34253f05a4c5d5f1e48c543062be Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 21:07:26 +0400
Subject: require entering current one time code to enable otp

---
 classes/pref/prefs.php | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

(limited to 'classes')

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index c6d41c15b..dcd83ae26 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -399,8 +399,8 @@ class Pref_Prefs extends Handler_Protected {
 							parameters: dojo.objectToQuery(this.getValues()),
 							onComplete: function(transport) {
 								notify('');
-								if (transport.responseText.indexOf('ERROR: ') == 0) {
-									notify_error(transport.responseText.replace('ERROR: ', ''));
+								if (transport.responseText.indexOf('ERROR:') == 0) {
+									notify_error(transport.responseText.replace('ERROR:', ''));
 								} else {
 									window.location.reload();
 								}
@@ -416,11 +416,13 @@ class Pref_Prefs extends Handler_Protected {
 					print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\"
 						name=\"password\"></td></tr>";
 
-					print "<tr><td colspan=\"2\">";
+					print "<tr><td width=\"40%\">".__("Enter the generated one time password")."</td>";
+
+					print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" autocomplete=\"off\"
+						required=\"1\"
+						name=\"otp\"></td></tr>";
 
-					print "<input dojoType=\"dijit.form.CheckBox\" required=\"1\"
-						type=\"checkbox\" id=\"enable_otp\" name=\"enable_otp\"/> ";
-					print "<label for=\"enable_otp\">".__("I have scanned the code and would like to enable OTP")."</label>";
+					print "<tr><td colspan=\"2\">";
 
 					print "</td></tr><tr><td colspan=\"2\">";
 
@@ -957,22 +959,39 @@ class Pref_Prefs extends Handler_Protected {
 	}
 
 	function otpenable() {
-		$password = db_escape_string($this->link, $_REQUEST["password"]);
-		$enable_otp = $_REQUEST["enable_otp"] == "on";
+		require_once "lib/otphp/vendor/base32.php";
+		require_once "lib/otphp/lib/otp.php";
+		require_once "lib/otphp/lib/totp.php";
+
+		$password = $_REQUEST["password"];
+		$otp = $_REQUEST["otp"];
 
 		global $pluginhost;
 		$authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
 
 		if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-			if ($enable_otp) {
+			$result = db_query($this->link, "SELECT salt
+				FROM ttrss_users
+				WHERE id = ".$_SESSION["uid"]);
+
+			$base32 = new Base32();
+
+			$secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt")));
+			$topt = new \OTPHP\TOTP($secret);
+
+			$otp_check = $topt->now();
+
+			if ($otp == $otp_check) {
 				db_query($this->link, "UPDATE ttrss_users SET otp_enabled = true WHERE
 					id = " . $_SESSION["uid"]);
 
 				print "OK";
+			} else {
+				print "ERROR:".__("Incorrect one time password");
 			}
 		} else {
-			print "ERROR: ".__("Incorrect password");
+			print "ERROR:".__("Incorrect password");
 		}
 
 	}
-- 
cgit v1.2.3


From 2cbdc95bb00faad46df8976cf9b33e1bc188ec91 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 08:42:39 +0400
Subject: add a separate tab for the logger

---
 classes/pref/prefs.php  | 45 ----------------------------
 classes/pref/system.php | 78 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 45 deletions(-)
 create mode 100644 classes/pref/system.php

(limited to 'classes')

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index dcd83ae26..2f316b48b 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -725,51 +725,6 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "</div>"; #pane
 
-		if ($_SESSION["access_level"] == 10) {
-
-			print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
-			print "<h2>".__("Error Log")."</h2>";
-
-			$result = db_query($this->link, "SELECT errno, errstr, filename, lineno,
-				created_at, login FROM ttrss_error_log
-				LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
-				ORDER BY ttrss_error_log.id DESC
-				LIMIT 100");
-
-			print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
-
-			print "<tr class=\"title\">
-				<td width='5%'>".__("Error")."</td>
-				<td>".__("Filename")."</td>
-				<td>".__("Message")."</td>
-				<td width='5%'>".__("User")."</td>
-				<td width='5%'>".__("Date")."</td>
-				</tr>";
-
-			while ($line = db_fetch_assoc($result)) {
-				print "<tr class=\"errrow\">";
-
-				foreach ($line as $k => $v) {
-					$line[$k] = htmlspecialchars($v);
-				}
-
-				print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
-				print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
-				print "<td class='errstr'>" . $line["errstr"] . "</td>";
-				print "<td class='login'>" . $line["login"] . "</td>";
-
-				print "<td class='timestamp'>" .
-					make_local_datetime($this->link,
-					$line["created_at"], false) . "</td>";
-
-				print "</tr>";
-			}
-
-			print "</table>";
-
-			print "</div>";
-		}
-
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Plugins')."\">";
 
 		print "<h2>".__("Plugins")."</h2>";
diff --git a/classes/pref/system.php b/classes/pref/system.php
new file mode 100644
index 000000000..2957b7b96
--- /dev/null
+++ b/classes/pref/system.php
@@ -0,0 +1,78 @@
+<?php
+
+class Pref_System extends Handler_Protected {
+
+	function __construct($link, $args) {
+		parent::__construct($link, $args);
+	}
+
+	function before($method) {
+		if (parent::before($method)) {
+			if ($_SESSION["access_level"] < 10) {
+				print __("Your access level is insufficient to open this tab.");
+				return false;
+			}
+			return true;
+		}
+		return false;
+	}
+
+	function csrf_ignore($method) {
+		$csrf_ignored = array("index");
+
+		return array_search($method, $csrf_ignored) !== false;
+	}
+
+	function index() {
+
+		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
+		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
+
+		$result = db_query($this->link, "SELECT errno, errstr, filename, lineno,
+			created_at, login FROM ttrss_error_log
+			LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
+			ORDER BY ttrss_error_log.id DESC
+			LIMIT 100");
+
+		print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
+
+		print "<tr class=\"title\">
+			<td width='5%'>".__("Error")."</td>
+			<td>".__("Filename")."</td>
+			<td>".__("Message")."</td>
+			<td width='5%'>".__("User")."</td>
+			<td width='5%'>".__("Date")."</td>
+			</tr>";
+
+		while ($line = db_fetch_assoc($result)) {
+			print "<tr class=\"errrow\">";
+
+			foreach ($line as $k => $v) {
+				$line[$k] = htmlspecialchars($v);
+			}
+
+			print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
+			print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
+			print "<td class='errstr'>" . $line["errstr"] . "</td>";
+			print "<td class='login'>" . $line["login"] . "</td>";
+
+			print "<td class='timestamp'>" .
+				make_local_datetime($this->link,
+				$line["created_at"], false) . "</td>";
+
+			print "</tr>";
+		}
+
+		print "</table>";
+
+		print "</div>";
+
+		global $pluginhost;
+		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+			"hook_prefs_tab", "prefSystem");
+
+		print "</div>"; #container
+	}
+
+}
+?>
-- 
cgit v1.2.3


From 9594791782bb9adbf29018c444ea427fbaeb5ee4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 13:08:36 +0400
Subject: experimental singleton-based Db connection

---
 classes/db.php         | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++
 classes/db/mysql.php   | 59 ++++++++++++++++++++++++++++++++++++++++
 classes/db/pgsql.php   | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++
 classes/idb.php        | 13 +++++++++
 classes/logger/sql.php | 20 +++++---------
 5 files changed, 225 insertions(+), 13 deletions(-)
 create mode 100644 classes/db.php
 create mode 100644 classes/db/mysql.php
 create mode 100644 classes/db/pgsql.php
 create mode 100644 classes/idb.php

(limited to 'classes')

diff --git a/classes/db.php b/classes/db.php
new file mode 100644
index 000000000..403cbc93a
--- /dev/null
+++ b/classes/db.php
@@ -0,0 +1,73 @@
+<?php
+class Db implements IDb {
+	private static $instance;
+	private $adapter;
+
+	private function __construct() {
+		switch (DB_TYPE) {
+		case "mysql":
+			$this->adapter = new Db_Mysql();
+			break;
+		case "pgsql":
+			$this->adapter = new Db_Pgsql();
+			break;
+		default:
+			die("Unknown DB_TYPE: " . DB_TYPE);
+		}
+
+		$this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT);
+	}
+
+	private function __clone() {
+		//
+	}
+
+	public static function get() {
+		if (self::$instance == null)
+			self::$instance = new self();
+
+		return self::$instance;
+	}
+
+	static function quote($str){
+		return("'$str'");
+	}
+
+	function connect($host, $user, $pass, $db, $port) {
+		//return $this->adapter->connect($host, $user, $pass, $db, $port);
+	}
+
+	function escape_string($s, $strip_tags = true) {
+		return $this->adapter->escape_string($s, $strip_tags);
+	}
+
+	function query($query, $die_on_error = true) {
+		return $this->adapter->query($query, $die_on_error);
+	}
+
+	function fetch_assoc($result) {
+		return $this->adapter->fetch_assoc($result);
+	}
+
+	function num_rows($result) {
+		return $this->adapter->num_rows($result);
+	}
+
+	function fetch_result($result, $row, $param) {
+		return $this->adapter->fetch_result($result, $row, $param);
+	}
+
+	function close() {
+		return $this->adapter->close();
+	}
+
+	function affected_rows($result) {
+		return $this->adapter->affected_rows($result);
+	}
+
+	function last_error() {
+		return $this->adapter->last_error();
+	}
+
+}
+?>
diff --git a/classes/db/mysql.php b/classes/db/mysql.php
new file mode 100644
index 000000000..512ea3894
--- /dev/null
+++ b/classes/db/mysql.php
@@ -0,0 +1,59 @@
+<?php
+class Db_Mysql implements IDb {
+	private $link;
+
+	function connect($host, $user, $pass, $db, $port) {
+		$this->link = mysql_connect($host, $user, $pass);
+		if ($this->link) {
+			$result = mysql_select_db($db, $this->link);
+			if (!$result) {
+				die("Can't select DB: " . mysql_error($this->link));
+			}
+			return $this->link;
+		} else {
+			die("Unable to connect to database (as $user to $host, database $db): " . mysql_error());
+		}
+	}
+
+	function escape_string($s, $strip_tags = true) {
+		return mysql_real_escape_string($s, $this->link);
+	}
+
+	function query($query, $die_on_error = true) {
+		$result = mysql_query($query, $this->link);
+		if (!$result) {
+			$query = htmlspecialchars($query);
+			if ($die_on_error) {
+				die("Query <i>$query</i> failed: " . ($this->link ? mysql_error($link) : "No connection"));
+			}
+		}
+		return $result;
+	}
+
+	function fetch_assoc($result) {
+		return mysql_fetch_assoc($result);
+	}
+
+
+	function num_rows($result) {
+		return mysql_num_rows($result);
+	}
+
+	function fetch_result($result, $row, $param) {
+		return mysql_result($result, $row, $param);
+	}
+
+	function close() {
+		return mysql_close($this->link);
+	}
+
+	function affected_rows($result) {
+		return mysql_affected_rows($this->link);
+	}
+
+	function last_error() {
+		return mysql_affected_rows($this->link);
+	}
+
+}
+?>
diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
new file mode 100644
index 000000000..87c2abefd
--- /dev/null
+++ b/classes/db/pgsql.php
@@ -0,0 +1,73 @@
+<?php
+class Db_Pgsql implements IDb {
+	private $link;
+
+	function connect($host, $user, $pass, $db, $port) {
+		$string = "dbname=$db user=$user";
+
+		if ($pass) {
+			$string .= " password=$pass";
+		}
+
+		if ($host) {
+			$string .= " host=$host";
+		}
+
+		if (is_numeric($port) && $port > 0) {
+			$string = "$string port=" . $port;
+		}
+
+		$this->link = pg_connect($string);
+
+		if (!$this->link) {
+			die("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
+		}
+
+		return $this->link;
+	}
+
+	function escape_string($s, $strip_tags = true) {
+		if ($strip_tags) $s = strip_tags($s);
+
+		return pg_escape_string($this->link, $s);
+	}
+
+	function query($query, $die_on_error = true) {
+		$result = pg_query($this->link, $query);
+
+		if (!$result) {
+			$query = htmlspecialchars($query); // just in case
+			if ($die_on_error) {
+				die("Query <i>$query</i> failed [$result]: " . ($this->link ? pg_last_error($this->link) : "No connection"));
+			}
+		}
+		return $result;
+	}
+
+	function fetch_assoc($result) {
+		return pg_fetch_assoc($result);
+	}
+
+
+	function num_rows($result) {
+		return pg_num_rows($result);
+	}
+
+	function fetch_result($result, $row, $param) {
+		return pg_fetch_result($result, $row, $param);
+	}
+
+	function close() {
+		return pg_close($this->link);
+	}
+
+	function affected_rows($result) {
+		return pg_affected_rows($result);
+	}
+
+	function last_error() {
+		return pg_last_error($this->link);
+	}
+
+}
+?>
diff --git a/classes/idb.php b/classes/idb.php
new file mode 100644
index 000000000..16f760bf6
--- /dev/null
+++ b/classes/idb.php
@@ -0,0 +1,13 @@
+<?php
+interface IDb {
+	function connect($host, $user, $pass, $db, $port);
+	function escape_string($s, $strip_tags = true);
+	function query($query, $die_on_error = true);
+	function fetch_assoc($result);
+	function num_rows($result);
+	function fetch_result($result, $row, $param);
+	function close();
+	function affected_rows($result);
+	function last_error();
+}
+?>
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index a478e8928..c45841600 100644
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -1,32 +1,26 @@
 <?php
 class Logger_SQL {
 
-	private $link;
-
-	function __construct() {
-		$this->link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-	}
-
 	function log_error($errno, $errstr, $file, $line, $context) {
 
 		if ($errno == E_NOTICE) return false;
 
-		if ($this->link) {
-			$errno = db_escape_string($this->link, $errno);
-			$errstr = db_escape_string($this->link, $errstr);
-			$file = db_escape_string($this->link, $file);
-			$line = db_escape_string($this->link, $line);
+		if (Db::get()) {
+			$errno = Db::get()->escape_string($errno);
+			$errstr = Db::get()->escape_string($errstr);
+			$file = Db::get()->escape_string($file);
+			$line = Db::get()->escape_string($line);
 			$context = ''; // backtrace is a lot of data which is not really critical to store
 			//$context = db_escape_string($this->link, serialize($context));
 
 			$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : "NULL";
 
-			$result = db_query($this->link,
+			$result = Db::get()->query(
 				"INSERT INTO ttrss_error_log
 				(errno, errstr, filename, lineno, context, owner_uid, created_at) VALUES
 				($errno, '$errstr', '$file', '$line', '$context', $owner_uid, NOW())");
 
-			return db_affected_rows($this->link, $result) != 0;
+			return Db::get()->affected_rows($result) != 0;
 
 		}
 		return false;
-- 
cgit v1.2.3


From ba68b6815ab31d17cda113e7990eeb07558b02a9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 14:23:35 +0400
Subject: db updates, remove init_connection()

---
 classes/db.php       |  5 +++++
 classes/db/mysql.php | 10 ++++++++++
 classes/db/pgsql.php |  8 ++++++++
 classes/idb.php      |  1 +
 4 files changed, 24 insertions(+)

(limited to 'classes')

diff --git a/classes/db.php b/classes/db.php
index 403cbc93a..71fc01ae1 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -16,6 +16,7 @@ class Db implements IDb {
 		}
 
 		$this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT);
+		$this->adapter->init();
 	}
 
 	private function __clone() {
@@ -33,6 +34,10 @@ class Db implements IDb {
 		return("'$str'");
 	}
 
+	function init() {
+		//
+	}
+
 	function connect($host, $user, $pass, $db, $port) {
 		//return $this->adapter->connect($host, $user, $pass, $db, $port);
 	}
diff --git a/classes/db/mysql.php b/classes/db/mysql.php
index 512ea3894..fa97dcff1 100644
--- a/classes/db/mysql.php
+++ b/classes/db/mysql.php
@@ -55,5 +55,15 @@ class Db_Mysql implements IDb {
 		return mysql_affected_rows($this->link);
 	}
 
+	function init() {
+		$this->query("SET time_zone = '+0:0'");
+
+		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+			$this->query("SET NAMES " . MYSQL_CHARSET);
+		}
+
+		return true;
+	}
+
 }
 ?>
diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index 87c2abefd..c9ec33887 100644
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -69,5 +69,13 @@ class Db_Pgsql implements IDb {
 		return pg_last_error($this->link);
 	}
 
+	function init() {
+		$this->query("set client_encoding = 'UTF-8'");
+		pg_set_client_encoding("UNICODE");
+		$this->query("set datestyle = 'ISO, european'");
+		$this->query("set TIME ZONE 0");
+
+		return true;
+	}
 }
 ?>
diff --git a/classes/idb.php b/classes/idb.php
index 16f760bf6..1ca6925b4 100644
--- a/classes/idb.php
+++ b/classes/idb.php
@@ -1,6 +1,7 @@
 <?php
 interface IDb {
 	function connect($host, $user, $pass, $db, $port);
+	function init();
 	function escape_string($s, $strip_tags = true);
 	function query($query, $die_on_error = true);
 	function fetch_assoc($result);
-- 
cgit v1.2.3


From 404e2e3603c852a3f82a21c14b8888005e2b3f99 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 15:36:34 +0400
Subject: more work on singleton-based DB

---
 classes/db.php             |  8 +++--
 classes/db/mysql.php       |  3 ++
 classes/db/pgsql.php       |  2 ++
 classes/sessionhandler.php | 73 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 classes/sessionhandler.php

(limited to 'classes')

diff --git a/classes/db.php b/classes/db.php
index 71fc01ae1..558d3e6b7 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -2,6 +2,7 @@
 class Db implements IDb {
 	private static $instance;
 	private $adapter;
+	private $link;
 
 	private function __construct() {
 		switch (DB_TYPE) {
@@ -12,11 +13,11 @@ class Db implements IDb {
 			$this->adapter = new Db_Pgsql();
 			break;
 		default:
-			die("Unknown DB_TYPE: " . DB_TYPE);
+			user_error("Unknown DB_TYPE: " . DB_TYPE);
 		}
 
-		$this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT);
-		$this->adapter->init();
+		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT);
+
 	}
 
 	private function __clone() {
@@ -40,6 +41,7 @@ class Db implements IDb {
 
 	function connect($host, $user, $pass, $db, $port) {
 		//return $this->adapter->connect($host, $user, $pass, $db, $port);
+		return $this->link;
 	}
 
 	function escape_string($s, $strip_tags = true) {
diff --git a/classes/db/mysql.php b/classes/db/mysql.php
index fa97dcff1..64c35ebdc 100644
--- a/classes/db/mysql.php
+++ b/classes/db/mysql.php
@@ -9,6 +9,9 @@ class Db_Mysql implements IDb {
 			if (!$result) {
 				die("Can't select DB: " . mysql_error($this->link));
 			}
+
+			$this->init();
+
 			return $this->link;
 		} else {
 			die("Unable to connect to database (as $user to $host, database $db): " . mysql_error());
diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index c9ec33887..0f38fb8cb 100644
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -23,6 +23,8 @@ class Db_Pgsql implements IDb {
 			die("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
 		}
 
+		$this->init();
+
 		return $this->link;
 	}
 
diff --git a/classes/sessionhandler.php b/classes/sessionhandler.php
new file mode 100644
index 000000000..66d8dd86c
--- /dev/null
+++ b/classes/sessionhandler.php
@@ -0,0 +1,73 @@
+<?php
+class SessionHandler implements SessionHandlerInterface {
+	private static $instance;
+	private $db;
+
+	public static function get() {
+		if (self::$instance == null)
+			self::$instance = new self();
+
+		return self::$instance;
+	}
+
+	private function __construct() {
+		$this->db = Db::get();
+
+		session_set_save_handler("SessionHandler::open", "SessionHandler::close",
+			"SessionHandler::read", "SessionHandler::write", "SessionHandler::destroy",
+			"SessionHandler::gc");
+	}
+
+	public static function open($save_path, $name) { }
+
+
+	public static function read ($id){
+
+		$query = "SELECT data FROM ttrss_sessions WHERE id='$id'";
+
+		$res = $this->db->query("SELECT data FROM ttrss_sessions WHERE id='$id'");
+
+		if ($this->db->num_rows($res) != 1) {
+
+			"INSERT INTO ttrss_sessions (id, data, expire)
+					VALUES ('$id', '$data', '$expire')";
+
+
+
+		} else {
+			$data = $this->db->fetch_result($res, 0, "data");
+			return base64_decode($data);
+		}
+
+	}
+
+	public static function write($id, $data) {
+		if (! $data) {
+			return false;
+		}
+
+		$data = $this->db->escape_string( base64_encode($data), false);
+
+		$expire = time() + max(SESSION_COOKIE_LIFETIME, 86400);
+
+	 	$query = "UPDATE ttrss_sessions SET data='$data',
+				expire = '$expire' WHERE id='$id'";
+
+		$this->db->query( $query);
+		return true;
+	}
+
+	public static function close () { }
+
+	public static function destroy($session_id) {
+		$this->db->query("DELETE FROM ttrss_sessions WHERE id = '$session_id'");
+		return true;
+	}
+
+	public static function gc($maxLifeTime) {
+		$this->db->query("DELETE FROM ttrss_sessions WHERE expire < " time() - $maxLifeTime);
+		return true;
+	}
+
+}
+?>
-- 
cgit v1.2.3


From aca75cb5cb323535099c7aef46a78ea3cec082f2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 16:05:52 +0400
Subject: reinstate error handlers; better DB error reporting on failed queries

---
 classes/db.php         | 7 +------
 classes/db/mysql.php   | 6 ++----
 classes/db/pgsql.php   | 5 ++---
 classes/idb.php        | 1 -
 classes/logger/sql.php | 3 ++-
 5 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'classes')

diff --git a/classes/db.php b/classes/db.php
index 558d3e6b7..c3b627096 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -13,11 +13,10 @@ class Db implements IDb {
 			$this->adapter = new Db_Pgsql();
 			break;
 		default:
-			user_error("Unknown DB_TYPE: " . DB_TYPE);
+			die("Unknown DB_TYPE: " . DB_TYPE);
 		}
 
 		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT);
-
 	}
 
 	private function __clone() {
@@ -35,10 +34,6 @@ class Db implements IDb {
 		return("'$str'");
 	}
 
-	function init() {
-		//
-	}
-
 	function connect($host, $user, $pass, $db, $port) {
 		//return $this->adapter->connect($host, $user, $pass, $db, $port);
 		return $this->link;
diff --git a/classes/db/mysql.php b/classes/db/mysql.php
index 64c35ebdc..241d2a063 100644
--- a/classes/db/mysql.php
+++ b/classes/db/mysql.php
@@ -25,10 +25,8 @@ class Db_Mysql implements IDb {
 	function query($query, $die_on_error = true) {
 		$result = mysql_query($query, $this->link);
 		if (!$result) {
-			$query = htmlspecialchars($query);
-			if ($die_on_error) {
-				die("Query <i>$query</i> failed: " . ($this->link ? mysql_error($link) : "No connection"));
-			}
+			user_error("Query $query failed: " . ($this->link ? mysql_error($this->link) : "No connection"),
+				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 		return $result;
 	}
diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index 0f38fb8cb..bafd54ab2 100644
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -39,9 +39,8 @@ class Db_Pgsql implements IDb {
 
 		if (!$result) {
 			$query = htmlspecialchars($query); // just in case
-			if ($die_on_error) {
-				die("Query <i>$query</i> failed [$result]: " . ($this->link ? pg_last_error($this->link) : "No connection"));
-			}
+			user_error("Query $query failed: " . ($this->link ? pg_last_error($this->link) : "No connection"),
+				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 		return $result;
 	}
diff --git a/classes/idb.php b/classes/idb.php
index 1ca6925b4..16f760bf6 100644
--- a/classes/idb.php
+++ b/classes/idb.php
@@ -1,7 +1,6 @@
 <?php
 interface IDb {
 	function connect($host, $user, $pass, $db, $port);
-	function init();
 	function escape_string($s, $strip_tags = true);
 	function query($query, $die_on_error = true);
 	function fetch_assoc($result);
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index c45841600..b0e0b0db5 100644
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -6,6 +6,7 @@ class Logger_SQL {
 		if ($errno == E_NOTICE) return false;
 
 		if (Db::get()) {
+
 			$errno = Db::get()->escape_string($errno);
 			$errstr = Db::get()->escape_string($errstr);
 			$file = Db::get()->escape_string($file);
@@ -21,8 +22,8 @@ class Logger_SQL {
 				($errno, '$errstr', '$file', '$line', '$context', $owner_uid, NOW())");
 
 			return Db::get()->affected_rows($result) != 0;
-
 		}
+
 		return false;
 	}
 
-- 
cgit v1.2.3


From 6322ac79a020ab584d412d782d62b2ee77d7c6cf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 16:23:15 +0400
Subject: remove $link

---
 classes/api.php            | 180 ++++++++++++++--------------
 classes/article.php        | 104 ++++++++--------
 classes/auth/base.php      |  14 +--
 classes/backend.php        |   6 +-
 classes/db.php             |   2 +-
 classes/db/pgsql.php       |   4 +-
 classes/dbupdater.php      |  16 +--
 classes/dlg.php            |  20 ++--
 classes/feeds.php          | 134 ++++++++++-----------
 classes/handler.php        |   6 +-
 classes/handler/public.php | 140 +++++++++++-----------
 classes/logger/sql.php     |   2 +-
 classes/opml.php           | 102 ++++++++--------
 classes/plugin.php         |   4 +-
 classes/pluginhost.php     |  31 +++--
 classes/pref/feeds.php     | 290 ++++++++++++++++++++++-----------------------
 classes/pref/filters.php   | 132 ++++++++++-----------
 classes/pref/labels.php    |  66 +++++------
 classes/pref/prefs.php     |  56 ++++-----
 classes/pref/system.php    |   8 +-
 classes/pref/users.php     |  54 ++++-----
 classes/rpc.php            | 224 +++++++++++++++++-----------------
 22 files changed, 795 insertions(+), 800 deletions(-)

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index 958256be4..10e511919 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -18,7 +18,7 @@ class API extends Handler {
 				return false;
 			}
 
-			if ($_SESSION["uid"] && $method != "logout" && !get_pref($this->link, 'ENABLE_API_ACCESS')) {
+			if ($_SESSION["uid"] && $method != "logout" && !get_pref( 'ENABLE_API_ACCESS')) {
 				print $this->wrap(self::STATUS_ERR, array("error" => 'API_DISABLED'));
 				return false;
 			}
@@ -50,13 +50,13 @@ class API extends Handler {
 		@session_destroy();
 		@session_start();
 
-		$login = db_escape_string($this->link, $_REQUEST["user"]);
+		$login = db_escape_string( $_REQUEST["user"]);
 		$password = $_REQUEST["password"];
 		$password_base64 = base64_decode($_REQUEST["password"]);
 
 		if (SINGLE_USER_MODE) $login = "admin";
 
-		$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE login = '$login'");
+		$result = db_query( "SELECT id FROM ttrss_users WHERE login = '$login'");
 
 		if (db_num_rows($result) != 0) {
 			$uid = db_fetch_result($result, 0, "id");
@@ -69,11 +69,11 @@ class API extends Handler {
 			return;
 		}
 
-		if (get_pref($this->link, "ENABLE_API_ACCESS", $uid)) {
-			if (authenticate_user($this->link, $login, $password)) {               // try login with normal password
+		if (get_pref( "ENABLE_API_ACCESS", $uid)) {
+			if (authenticate_user( $login, $password)) {               // try login with normal password
 				print $this->wrap(self::STATUS_OK, array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
-			} else if (authenticate_user($this->link, $login, $password_base64)) { // else try with base64_decoded password
+			} else if (authenticate_user( $login, $password_base64)) { // else try with base64_decoded password
 				print $this->wrap(self::STATUS_OK,	array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
 			} else {                                                         // else we are not logged in
@@ -95,29 +95,29 @@ class API extends Handler {
 	}
 
 	function getUnread() {
-		$feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]);
-		$is_cat = db_escape_string($this->link, $_REQUEST["is_cat"]);
+		$feed_id = db_escape_string( $_REQUEST["feed_id"]);
+		$is_cat = db_escape_string( $_REQUEST["is_cat"]);
 
 		if ($feed_id) {
-			print $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($this->link, $feed_id, $is_cat)));
+			print $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread( $feed_id, $is_cat)));
 		} else {
-			print $this->wrap(self::STATUS_OK, array("unread" => getGlobalUnread($this->link)));
+			print $this->wrap(self::STATUS_OK, array("unread" => getGlobalUnread()));
 		}
 	}
 
 	/* Method added for ttrss-reader for Android */
 	function getCounters() {
-		print $this->wrap(self::STATUS_OK, getAllCounters($this->link));
+		print $this->wrap(self::STATUS_OK, getAllCounters());
 	}
 
 	function getFeeds() {
-		$cat_id = db_escape_string($this->link, $_REQUEST["cat_id"]);
+		$cat_id = db_escape_string( $_REQUEST["cat_id"]);
 		$unread_only = sql_bool_to_bool($_REQUEST["unread_only"]);
-		$limit = (int) db_escape_string($this->link, $_REQUEST["limit"]);
-		$offset = (int) db_escape_string($this->link, $_REQUEST["offset"]);
+		$limit = (int) db_escape_string( $_REQUEST["limit"]);
+		$offset = (int) db_escape_string( $_REQUEST["offset"]);
 		$include_nested = sql_bool_to_bool($_REQUEST["include_nested"]);
 
-		$feeds = $this->api_get_feeds($this->link, $cat_id, $unread_only, $limit, $offset, $include_nested);
+		$feeds = $this->api_get_feeds( $cat_id, $unread_only, $limit, $offset, $include_nested);
 
 		print $this->wrap(self::STATUS_OK, $feeds);
 	}
@@ -134,7 +134,7 @@ class API extends Handler {
 		else
 			$nested_qpart = "true";
 
-		$result = db_query($this->link, "SELECT
+		$result = db_query( "SELECT
 				id, title, order_id, (SELECT COUNT(id) FROM
 				ttrss_feeds WHERE
 				ttrss_feed_categories.id IS NOT NULL AND cat_id = ttrss_feed_categories.id) AS num_feeds,
@@ -149,10 +149,10 @@ class API extends Handler {
 
 		while ($line = db_fetch_assoc($result)) {
 			if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
-				$unread = getFeedUnread($this->link, $line["id"], true);
+				$unread = getFeedUnread( $line["id"], true);
 
 				if ($enable_nested)
-					$unread += getCategoryChildrenUnread($this->link, $line["id"]);
+					$unread += getCategoryChildrenUnread( $line["id"]);
 
 				if ($unread || !$unread_only) {
 					array_push($cats, array("id" => $line["id"],
@@ -166,11 +166,11 @@ class API extends Handler {
 
 		foreach (array(-2,-1,0) as $cat_id) {
 			if ($include_empty || !$this->isCategoryEmpty($cat_id)) {
-				$unread = getFeedUnread($this->link, $cat_id, true);
+				$unread = getFeedUnread( $cat_id, true);
 
 				if ($unread || !$unread_only) {
 					array_push($cats, array("id" => $cat_id,
-						"title" => getCategoryTitle($this->link, $cat_id),
+						"title" => getCategoryTitle( $cat_id),
 						"unread" => $unread));
 				}
 			}
@@ -180,22 +180,22 @@ class API extends Handler {
 	}
 
 	function getHeadlines() {
-		$feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]);
+		$feed_id = db_escape_string( $_REQUEST["feed_id"]);
 		if ($feed_id != "") {
 
-			$limit = (int)db_escape_string($this->link, $_REQUEST["limit"]);
+			$limit = (int)db_escape_string( $_REQUEST["limit"]);
 
 			if (!$limit || $limit >= 60) $limit = 60;
 
-			$offset = (int)db_escape_string($this->link, $_REQUEST["skip"]);
-			$filter = db_escape_string($this->link, $_REQUEST["filter"]);
+			$offset = (int)db_escape_string( $_REQUEST["skip"]);
+			$filter = db_escape_string( $_REQUEST["filter"]);
 			$is_cat = sql_bool_to_bool($_REQUEST["is_cat"]);
 			$show_excerpt = sql_bool_to_bool($_REQUEST["show_excerpt"]);
 			$show_content = sql_bool_to_bool($_REQUEST["show_content"]);
 			/* all_articles, unread, adaptive, marked, updated */
-			$view_mode = db_escape_string($this->link, $_REQUEST["view_mode"]);
+			$view_mode = db_escape_string( $_REQUEST["view_mode"]);
 			$include_attachments = sql_bool_to_bool($_REQUEST["include_attachments"]);
-			$since_id = (int)db_escape_string($this->link, $_REQUEST["since_id"]);
+			$since_id = (int)db_escape_string( $_REQUEST["since_id"]);
 			$include_nested = sql_bool_to_bool($_REQUEST["include_nested"]);
 			$sanitize_content = true;
 
@@ -211,10 +211,10 @@ class API extends Handler {
 
 			/* do not rely on params below */
 
-			$search = db_escape_string($this->link, $_REQUEST["search"]);
-			$search_mode = db_escape_string($this->link, $_REQUEST["search_mode"]);
+			$search = db_escape_string( $_REQUEST["search"]);
+			$search_mode = db_escape_string( $_REQUEST["search_mode"]);
 
-			$headlines = $this->api_get_headlines($this->link, $feed_id, $limit, $offset,
+			$headlines = $this->api_get_headlines( $feed_id, $limit, $offset,
 				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order,
 				$include_attachments, $since_id, $search, $search_mode,
 				$include_nested, $sanitize_content);
@@ -226,10 +226,10 @@ class API extends Handler {
 	}
 
 	function updateArticle() {
-		$article_ids = array_filter(explode(",", db_escape_string($this->link, $_REQUEST["article_ids"])), is_numeric);
-		$mode = (int) db_escape_string($this->link, $_REQUEST["mode"]);
-		$data = db_escape_string($this->link, $_REQUEST["data"]);
-		$field_raw = (int)db_escape_string($this->link, $_REQUEST["field"]);
+		$article_ids = array_filter(explode(",", db_escape_string( $_REQUEST["article_ids"])), is_numeric);
+		$mode = (int) db_escape_string( $_REQUEST["mode"]);
+		$data = db_escape_string( $_REQUEST["data"]);
+		$field_raw = (int)db_escape_string( $_REQUEST["field"]);
 
 		$field = "";
 		$set_to = "";
@@ -269,16 +269,16 @@ class API extends Handler {
 
 			$article_ids = join(", ", $article_ids);
 
-			$result = db_query($this->link, "UPDATE ttrss_user_entries SET $field = $set_to $additional_fields WHERE ref_id IN ($article_ids) AND owner_uid = " . $_SESSION["uid"]);
+			$result = db_query( "UPDATE ttrss_user_entries SET $field = $set_to $additional_fields WHERE ref_id IN ($article_ids) AND owner_uid = " . $_SESSION["uid"]);
 
-			$num_updated = db_affected_rows($this->link, $result);
+			$num_updated = db_affected_rows( $result);
 
 			if ($num_updated > 0 && $field == "unread") {
-				$result = db_query($this->link, "SELECT DISTINCT feed_id FROM ttrss_user_entries
+				$result = db_query( "SELECT DISTINCT feed_id FROM ttrss_user_entries
 					WHERE ref_id IN ($article_ids)");
 
 				while ($line = db_fetch_assoc($result)) {
-					ccache_update($this->link, $line["feed_id"], $_SESSION["uid"]);
+					ccache_update( $line["feed_id"], $_SESSION["uid"]);
 				}
 			}
 
@@ -286,7 +286,7 @@ class API extends Handler {
 				if (PUBSUBHUBBUB_HUB) {
 					$rss_link = get_self_url_prefix() .
 						"/public.php?op=rss&id=-2&key=" .
-						get_feed_access_key($this->link, -2, false);
+						get_feed_access_key( -2, false);
 
 					$p = new Publisher(PUBSUBHUBBUB_HUB);
 					$pubsub_result = $p->publish_update($rss_link);
@@ -304,7 +304,7 @@ class API extends Handler {
 
 	function getArticle() {
 
-		$article_id = join(",", array_filter(explode(",", db_escape_string($this->link, $_REQUEST["article_id"])), is_numeric));
+		$article_id = join(",", array_filter(explode(",", db_escape_string( $_REQUEST["article_id"])), is_numeric));
 
 		$query = "SELECT id,title,link,content,cached_content,feed_id,comments,int_id,
 			marked,unread,published,score,
@@ -314,7 +314,7 @@ class API extends Handler {
 			WHERE	id IN ($article_id) AND ref_id = id AND owner_uid = " .
 				$_SESSION["uid"] ;
 
-		$result = db_query($this->link, $query);
+		$result = db_query( $query);
 
 		$articles = array();
 
@@ -322,13 +322,13 @@ class API extends Handler {
 
 			while ($line = db_fetch_assoc($result)) {
 
-				$attachments = get_article_enclosures($this->link, $line['id']);
+				$attachments = get_article_enclosures( $line['id']);
 
 				$article = array(
 					"id" => $line["id"],
 					"title" => $line["title"],
 					"link" => $line["link"],
-					"labels" => get_article_labels($this->link, $line['id']),
+					"labels" => get_article_labels( $line['id']),
 					"unread" => sql_bool_to_bool($line["unread"]),
 					"marked" => sql_bool_to_bool($line["marked"]),
 					"published" => sql_bool_to_bool($line["published"]),
@@ -363,7 +363,7 @@ class API extends Handler {
 
 		$config["daemon_is_running"] = file_is_locked("update_daemon.lock");
 
-		$result = db_query($this->link, "SELECT COUNT(*) AS cf FROM
+		$result = db_query( "SELECT COUNT(*) AS cf FROM
 			ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
 		$num_feeds = db_fetch_result($result, 0, "cf");
@@ -376,41 +376,41 @@ class API extends Handler {
 	function updateFeed() {
 		require_once "include/rssfuncs.php";
 
-		$feed_id = (int) db_escape_string($this->link, $_REQUEST["feed_id"]);
+		$feed_id = (int) db_escape_string( $_REQUEST["feed_id"]);
 
-		update_rss_feed($this->link, $feed_id, true);
+		update_rss_feed( $feed_id, true);
 
 		print $this->wrap(self::STATUS_OK, array("status" => "OK"));
 	}
 
 	function catchupFeed() {
-		$feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]);
-		$is_cat = db_escape_string($this->link, $_REQUEST["is_cat"]);
+		$feed_id = db_escape_string( $_REQUEST["feed_id"]);
+		$is_cat = db_escape_string( $_REQUEST["is_cat"]);
 
-		catchup_feed($this->link, $feed_id, $is_cat);
+		catchup_feed( $feed_id, $is_cat);
 
 		print $this->wrap(self::STATUS_OK, array("status" => "OK"));
 	}
 
 	function getPref() {
-		$pref_name = db_escape_string($this->link, $_REQUEST["pref_name"]);
+		$pref_name = db_escape_string( $_REQUEST["pref_name"]);
 
-		print $this->wrap(self::STATUS_OK, array("value" => get_pref($this->link, $pref_name)));
+		print $this->wrap(self::STATUS_OK, array("value" => get_pref( $pref_name)));
 	}
 
 	function getLabels() {
-		//$article_ids = array_filter(explode(",", db_escape_string($this->link, $_REQUEST["article_ids"])), is_numeric);
+		//$article_ids = array_filter(explode(",", db_escape_string( $_REQUEST["article_ids"])), is_numeric);
 
 		$article_id = (int)$_REQUEST['article_id'];
 
 		$rv = array();
 
-		$result = db_query($this->link, "SELECT id, caption, fg_color, bg_color
+		$result = db_query( "SELECT id, caption, fg_color, bg_color
 			FROM ttrss_labels2
 			WHERE owner_uid = '".$_SESSION['uid']."' ORDER BY caption");
 
 		if ($article_id)
-			$article_labels = get_article_labels($this->link, $article_id);
+			$article_labels = get_article_labels( $article_id);
 		else
 			$article_labels = array();
 
@@ -437,11 +437,11 @@ class API extends Handler {
 
 	function setArticleLabel() {
 
-		$article_ids = array_filter(explode(",", db_escape_string($this->link, $_REQUEST["article_ids"])), is_numeric);
-		$label_id = (int) db_escape_string($this->link, $_REQUEST['label_id']);
-		$assign = (bool) db_escape_string($this->link, $_REQUEST['assign']) == "true";
+		$article_ids = array_filter(explode(",", db_escape_string( $_REQUEST["article_ids"])), is_numeric);
+		$label_id = (int) db_escape_string( $_REQUEST['label_id']);
+		$assign = (bool) db_escape_string( $_REQUEST['assign']) == "true";
 
-		$label = db_escape_string($this->link, label_find_caption($this->link,
+		$label = db_escape_string( label_find_caption(
 			$label_id, $_SESSION["uid"]));
 
 		$num_updated = 0;
@@ -451,9 +451,9 @@ class API extends Handler {
 			foreach ($article_ids as $id) {
 
 				if ($assign)
-					label_add_article($this->link, $id, $label, $_SESSION["uid"]);
+					label_add_article( $id, $label, $_SESSION["uid"]);
 				else
-					label_remove_article($this->link, $id, $label, $_SESSION["uid"]);
+					label_remove_article( $id, $label, $_SESSION["uid"]);
 
 				++$num_updated;
 
@@ -481,25 +481,25 @@ class API extends Handler {
 	}
 
 	function shareToPublished() {
-		$title = db_escape_string($this->link, strip_tags($_REQUEST["title"]));
-		$url = db_escape_string($this->link, strip_tags($_REQUEST["url"]));
-		$content = db_escape_string($this->link, strip_tags($_REQUEST["content"]));
+		$title = db_escape_string( strip_tags($_REQUEST["title"]));
+		$url = db_escape_string( strip_tags($_REQUEST["url"]));
+		$content = db_escape_string( strip_tags($_REQUEST["content"]));
 
-		if (Article::create_published_article($this->link, $title, $url, $content, "", $_SESSION["uid"])) {
+		if (Article::create_published_article( $title, $url, $content, "", $_SESSION["uid"])) {
 			print $this->wrap(self::STATUS_OK, array("status" => 'OK'));
 		} else {
 			print $this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
 		}
 	}
 
-	static function api_get_feeds($link, $cat_id, $unread_only, $limit, $offset, $include_nested = false) {
+	static function api_get_feeds( $cat_id, $unread_only, $limit, $offset, $include_nested = false) {
 
 			$feeds = array();
 
 			/* Labels */
 
 			if ($cat_id == -4 || $cat_id == -2) {
-				$counters = getLabelCounters($link, true);
+				$counters = getLabelCounters( true);
 
 				foreach (array_values($counters) as $cv) {
 
@@ -523,10 +523,10 @@ class API extends Handler {
 
 			if ($cat_id == -4 || $cat_id == -1) {
 				foreach (array(-1, -2, -3, -4, -6, 0) as $i) {
-					$unread = getFeedUnread($link, $i);
+					$unread = getFeedUnread( $i);
 
 					if ($unread || !$unread_only) {
-						$title = getFeedTitle($link, $i);
+						$title = getFeedTitle( $i);
 
 						$row = array(
 								"id" => $i,
@@ -543,14 +543,14 @@ class API extends Handler {
 			/* Child cats */
 
 			if ($include_nested && $cat_id) {
-				$result = db_query($link, "SELECT
+				$result = db_query( "SELECT
 					id, title FROM ttrss_feed_categories
 					WHERE parent_cat = '$cat_id' AND owner_uid = " . $_SESSION["uid"] .
 				" ORDER BY id, title");
 
 				while ($line = db_fetch_assoc($result)) {
-					$unread = getFeedUnread($link, $line["id"], true) +
-						getCategoryChildrenUnread($link, $line["id"]);
+					$unread = getFeedUnread( $line["id"], true) +
+						getCategoryChildrenUnread( $line["id"]);
 
 					if ($unread || !$unread_only) {
 						$row = array(
@@ -573,7 +573,7 @@ class API extends Handler {
 			}
 
 			if ($cat_id == -4 || $cat_id == -3) {
-				$result = db_query($link, "SELECT
+				$result = db_query( "SELECT
 					id, feed_url, cat_id, title, order_id, ".
 						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 						FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] .
@@ -585,7 +585,7 @@ class API extends Handler {
 				else
 					$cat_qpart = "cat_id IS NULL";
 
-				$result = db_query($link, "SELECT
+				$result = db_query( "SELECT
 					id, feed_url, cat_id, title, order_id, ".
 						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 						FROM ttrss_feeds WHERE
@@ -595,7 +595,7 @@ class API extends Handler {
 
 			while ($line = db_fetch_assoc($result)) {
 
-				$unread = getFeedUnread($link, $line["id"]);
+				$unread = getFeedUnread( $line["id"]);
 
 				$has_icon = feed_has_icon($line['id']);
 
@@ -619,13 +619,13 @@ class API extends Handler {
 		return $feeds;
 	}
 
-	static function api_get_headlines($link, $feed_id, $limit, $offset,
+	static function api_get_headlines( $feed_id, $limit, $offset,
 				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
 				$include_attachments, $since_id,
 				$search = "", $search_mode = "",
 				$include_nested = false, $sanitize_content = true) {
 
-			$qfh_ret = queryFeedHeadlines($link, $feed_id, $limit,
+			$qfh_ret = queryFeedHeadlines( $feed_id, $limit,
 				$view_mode, $is_cat, $search, $search_mode,
 				$order, $offset, 0, false, $since_id, $include_nested);
 
@@ -641,8 +641,8 @@ class API extends Handler {
 				$tags = explode(",", $line["tag_cache"]);
 				$labels = json_decode($line["label_cache"], true);
 
-				//if (!$tags) $tags = get_article_tags($link, $line["id"]);
-				//if (!$labels) $labels = get_article_labels($link, $line["id"]);
+				//if (!$tags) $tags = get_article_tags( $line["id"]);
+				//if (!$labels) $labels = get_article_labels( $line["id"]);
 
 				$headline_row = array(
 						"id" => (int)$line["id"],
@@ -658,7 +658,7 @@ class API extends Handler {
 					);
 
 					if ($include_attachments)
-						$headline_row['attachments'] = get_article_enclosures($link,
+						$headline_row['attachments'] = get_article_enclosures(
 							$line['id']);
 
 				if ($show_excerpt) {
@@ -673,7 +673,7 @@ class API extends Handler {
 					}
 
 					if ($sanitize_content) {
-						$headline_row["content"] = sanitize($link,
+						$headline_row["content"] = sanitize(
 							$line["content_preview"],
 							sql_bool_to_bool($line['hide_images']),
 							false, $line["site_url"]);
@@ -709,13 +709,13 @@ class API extends Handler {
 	}
 
 	function unsubscribeFeed() {
-		$feed_id = (int) db_escape_string($this->link, $_REQUEST["feed_id"]);
+		$feed_id = (int) db_escape_string( $_REQUEST["feed_id"]);
 
-		$result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+		$result = db_query( "SELECT id FROM ttrss_feeds WHERE
 			id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
 
 		if (db_num_rows($result) != 0) {
-			Pref_Feeds::remove_feed($this->link, $feed_id, $_SESSION["uid"]);
+			Pref_Feeds::remove_feed( $feed_id, $_SESSION["uid"]);
 			print $this->wrap(self::STATUS_OK, array("status" => "OK"));
 		} else {
 			print $this->wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
@@ -723,13 +723,13 @@ class API extends Handler {
 	}
 
 	function subscribeToFeed() {
-		$feed_url = db_escape_string($this->link, $_REQUEST["feed_url"]);
-		$category_id = (int) db_escape_string($this->link, $_REQUEST["category_id"]);
-		$login = db_escape_string($this->link, $_REQUEST["login"]);
-		$password = db_escape_string($this->link, $_REQUEST["password"]);
+		$feed_url = db_escape_string( $_REQUEST["feed_url"]);
+		$category_id = (int) db_escape_string( $_REQUEST["category_id"]);
+		$login = db_escape_string( $_REQUEST["login"]);
+		$password = db_escape_string( $_REQUEST["password"]);
 
 		if ($feed_url) {
-			$rc = subscribe_to_feed($this->link, $feed_url, $category_id,
+			$rc = subscribe_to_feed( $feed_url, $category_id,
 				$login, $password, false);
 
 			print $this->wrap(self::STATUS_OK, array("status" => $rc));
@@ -741,7 +741,7 @@ class API extends Handler {
 	function getFeedTree() {
 		$include_empty = sql_bool_to_bool($_REQUEST['include_empty']);
 
-		$pf = new Pref_Feeds($this->link, $_REQUEST);
+		$pf = new Pref_Feeds( $_REQUEST);
 
 		$_REQUEST['mode'] = 2;
 		$_REQUEST['force_show_empty'] = $include_empty;
@@ -760,13 +760,13 @@ class API extends Handler {
 	private function isCategoryEmpty($id) {
 
 		if ($id == -2) {
-			$result = db_query($this->link, "SELECT COUNT(*) AS count FROM ttrss_labels2
+			$result = db_query( "SELECT COUNT(*) AS count FROM ttrss_labels2
 				WHERE owner_uid = " . $_SESSION["uid"]);
 
 			return db_fetch_result($result, 0, "count") == 0;
 
 		} else if ($id == 0) {
-			$result = db_query($this->link, "SELECT COUNT(*) AS count FROM ttrss_feeds
+			$result = db_query( "SELECT COUNT(*) AS count FROM ttrss_feeds
 				WHERE cat_id IS NULL AND owner_uid = " . $_SESSION["uid"]);
 
 			return db_fetch_result($result, 0, "count") == 0;
diff --git a/classes/article.php b/classes/article.php
index f31a225d1..9917d4d06 100644
--- a/classes/article.php
+++ b/classes/article.php
@@ -8,9 +8,9 @@ class Article extends Handler_Protected {
 	}
 
 	function redirect() {
-		$id = db_escape_string($this->link, $_REQUEST['id']);
+		$id = db_escape_string( $_REQUEST['id']);
 
-		$result = db_query($this->link, "SELECT link FROM ttrss_entries, ttrss_user_entries
+		$result = db_query( "SELECT link FROM ttrss_entries, ttrss_user_entries
 						WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'
 						LIMIT 1");
 
@@ -27,10 +27,10 @@ class Article extends Handler_Protected {
 	}
 
 	function view() {
-		$id = db_escape_string($this->link, $_REQUEST["id"]);
-		$cids = explode(",", db_escape_string($this->link, $_REQUEST["cids"]));
-		$mode = db_escape_string($this->link, $_REQUEST["mode"]);
-		$omode = db_escape_string($this->link, $_REQUEST["omode"]);
+		$id = db_escape_string( $_REQUEST["id"]);
+		$cids = explode(",", db_escape_string( $_REQUEST["cids"]));
+		$mode = db_escape_string( $_REQUEST["mode"]);
+		$omode = db_escape_string( $_REQUEST["omode"]);
 
 		// in prefetch mode we only output requested cids, main article
 		// just gets marked as read (it already exists in client cache)
@@ -38,26 +38,26 @@ class Article extends Handler_Protected {
 		$articles = array();
 
 		if ($mode == "") {
-			array_push($articles, format_article($this->link, $id, false));
+			array_push($articles, format_article( $id, false));
 		} else if ($mode == "zoom") {
-			array_push($articles, format_article($this->link, $id, true, true));
+			array_push($articles, format_article( $id, true, true));
 		} else if ($mode == "raw") {
 			if ($_REQUEST['html']) {
 				header("Content-Type: text/html");
 				print '<link rel="stylesheet" type="text/css" href="tt-rss.css"/>';
 			}
 
-			$article = format_article($this->link, $id, false);
+			$article = format_article( $id, false);
 			print $article['content'];
 			return;
 		}
 
-		$this->catchupArticleById($this->link, $id, 0);
+		$this->catchupArticleById( $id, 0);
 
 		if (!$_SESSION["bw_limit"]) {
 			foreach ($cids as $cid) {
 				if ($cid) {
-					array_push($articles, format_article($this->link, $cid, false, false));
+					array_push($articles, format_article( $cid, false, false));
 				}
 			}
 		}
@@ -65,27 +65,27 @@ class Article extends Handler_Protected {
 		print json_encode($articles);
 	}
 
-	private function catchupArticleById($link, $id, $cmode) {
+	private function catchupArticleById( $id, $cmode) {
 
 		if ($cmode == 0) {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			unread = false,last_read = NOW()
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		} else if ($cmode == 1) {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			unread = true
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			unread = NOT unread,last_read = NOW()
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		}
 
-		$feed_id = getArticleFeed($link, $id);
-		ccache_update($link, $feed_id, $_SESSION["uid"]);
+		$feed_id = getArticleFeed( $id);
+		ccache_update( $feed_id, $_SESSION["uid"]);
 	}
 
-	static function create_published_article($link, $title, $url, $content, $labels_str,
+	static function create_published_article( $title, $url, $content, $labels_str,
 			$owner_uid) {
 
 		$guid = 'SHA1:' . sha1("ttshared:" . $url . $owner_uid); // include owner_uid to prevent global GUID clash
@@ -104,30 +104,30 @@ class Article extends Handler_Protected {
 
 		if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) return false;
 
-		db_query($link, "BEGIN");
+		db_query( "BEGIN");
 
 		// only check for our user data here, others might have shared this with different content etc
-		$result = db_query($link, "SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
+		$result = db_query( "SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
 			link = '$url' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
 
 		if (db_num_rows($result) != 0) {
 			$ref_id = db_fetch_result($result, 0, "id");
 
-			$result = db_query($link, "SELECT int_id FROM ttrss_user_entries WHERE
+			$result = db_query( "SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = '$ref_id' AND owner_uid = '$owner_uid' LIMIT 1");
 
 			if (db_num_rows($result) != 0) {
 				$int_id = db_fetch_result($result, 0, "int_id");
 
-				db_query($link, "UPDATE ttrss_entries SET
+				db_query( "UPDATE ttrss_entries SET
 					content = '$content', content_hash = '$content_hash' WHERE id = '$ref_id'");
 
-				db_query($link, "UPDATE ttrss_user_entries SET published = true,
+				db_query( "UPDATE ttrss_user_entries SET published = true,
 						last_published = NOW() WHERE
 						int_id = '$int_id' AND owner_uid = '$owner_uid'");
 			} else {
 
-				db_query($link, "INSERT INTO ttrss_user_entries
+				db_query( "INSERT INTO ttrss_user_entries
 					(ref_id, uuid, feed_id, orig_feed_id, owner_uid, published, tag_cache, label_cache,
 						last_read, note, unread, last_published)
 					VALUES
@@ -136,24 +136,24 @@ class Article extends Handler_Protected {
 
 			if (count($labels) != 0) {
 				foreach ($labels as $label) {
-					label_add_article($link, $ref_id, trim($label), $owner_uid);
+					label_add_article( $ref_id, trim($label), $owner_uid);
 				}
 			}
 
 			$rc = true;
 
 		} else {
-			$result = db_query($link, "INSERT INTO ttrss_entries
+			$result = db_query( "INSERT INTO ttrss_entries
 				(title, guid, link, updated, content, content_hash, date_entered, date_updated)
 				VALUES
 				('$title', '$guid', '$url', NOW(), '$content', '$content_hash', NOW(), NOW())");
 
-			$result = db_query($link, "SELECT id FROM ttrss_entries WHERE guid = '$guid'");
+			$result = db_query( "SELECT id FROM ttrss_entries WHERE guid = '$guid'");
 
 			if (db_num_rows($result) != 0) {
 				$ref_id = db_fetch_result($result, 0, "id");
 
-				db_query($link, "INSERT INTO ttrss_user_entries
+				db_query( "INSERT INTO ttrss_user_entries
 					(ref_id, uuid, feed_id, orig_feed_id, owner_uid, published, tag_cache, label_cache,
 						last_read, note, unread, last_published)
 					VALUES
@@ -161,7 +161,7 @@ class Article extends Handler_Protected {
 
 				if (count($labels) != 0) {
 					foreach ($labels as $label) {
-						label_add_article($link, $ref_id, trim($label), $owner_uid);
+						label_add_article( $ref_id, trim($label), $owner_uid);
 					}
 				}
 
@@ -169,7 +169,7 @@ class Article extends Handler_Protected {
 			}
 		}
 
-		db_query($link, "COMMIT");
+		db_query( "COMMIT");
 
 		return $rc;
 	}
@@ -178,9 +178,9 @@ class Article extends Handler_Protected {
 
 		print __("Tags for this article (separated by commas):")."<br>";
 
-		$param = db_escape_string($this->link, $_REQUEST['param']);
+		$param = db_escape_string( $_REQUEST['param']);
 
-		$tags = get_article_tags($this->link, db_escape_string($this->link, $param));
+		$tags = get_article_tags( db_escape_string( $param));
 
 		$tags_str = join(", ", $tags);
 
@@ -209,10 +209,10 @@ class Article extends Handler_Protected {
 	}
 
 	function setScore() {
-		$ids = db_escape_string($this->link, $_REQUEST['id']);
-		$score = (int)db_escape_string($this->link, $_REQUEST['score']);
+		$ids = db_escape_string( $_REQUEST['id']);
+		$score = (int)db_escape_string( $_REQUEST['score']);
 
-		db_query($this->link, "UPDATE ttrss_user_entries SET
+		db_query( "UPDATE ttrss_user_entries SET
 			score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
 		print json_encode(array("id" => $id,
@@ -222,14 +222,14 @@ class Article extends Handler_Protected {
 
 	function setArticleTags() {
 
-		$id = db_escape_string($this->link, $_REQUEST["id"]);
+		$id = db_escape_string( $_REQUEST["id"]);
 
-		$tags_str = db_escape_string($this->link, $_REQUEST["tags_str"]);
+		$tags_str = db_escape_string( $_REQUEST["tags_str"]);
 		$tags = array_unique(trim_array(explode(",", $tags_str)));
 
-		db_query($this->link, "BEGIN");
+		db_query( "BEGIN");
 
-		$result = db_query($this->link, "SELECT int_id FROM ttrss_user_entries WHERE
+		$result = db_query( "SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = '$id' AND owner_uid = '".$_SESSION["uid"]."' LIMIT 1");
 
 		if (db_num_rows($result) == 1) {
@@ -238,7 +238,7 @@ class Article extends Handler_Protected {
 
 			$int_id = db_fetch_result($result, 0, "int_id");
 
-			db_query($this->link, "DELETE FROM ttrss_tags WHERE
+			db_query( "DELETE FROM ttrss_tags WHERE
 				post_int_id = $int_id AND owner_uid = '".$_SESSION["uid"]."'");
 
 			foreach ($tags as $tag) {
@@ -255,7 +255,7 @@ class Article extends Handler_Protected {
 				//					print "<!-- $id : $int_id : $tag -->";
 
 				if ($tag != '') {
-					db_query($this->link, "INSERT INTO ttrss_tags
+					db_query( "INSERT INTO ttrss_tags
 								(post_int_id, owner_uid, tag_name) VALUES ('$int_id', '".$_SESSION["uid"]."', '$tag')");
 				}
 
@@ -267,14 +267,14 @@ class Article extends Handler_Protected {
 			sort($tags_to_cache);
 			$tags_str = join(",", $tags_to_cache);
 
-			db_query($this->link, "UPDATE ttrss_user_entries
+			db_query( "UPDATE ttrss_user_entries
 				SET tag_cache = '$tags_str' WHERE ref_id = '$id'
 						AND owner_uid = " . $_SESSION["uid"]);
 		}
 
-		db_query($this->link, "COMMIT");
+		db_query( "COMMIT");
 
-		$tags = get_article_tags($this->link, $id);
+		$tags = get_article_tags( $id);
 		$tags_str = format_tags_string($tags, $id);
 		$tags_str_full = join(", ", $tags);
 
@@ -286,9 +286,9 @@ class Article extends Handler_Protected {
 
 
 	function completeTags() {
-		$search = db_escape_string($this->link, $_REQUEST["search"]);
+		$search = db_escape_string( $_REQUEST["search"]);
 
-		$result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags
+		$result = db_query( "SELECT DISTINCT tag_name FROM ttrss_tags
 				WHERE owner_uid = '".$_SESSION["uid"]."' AND
 				tag_name LIKE '$search%' ORDER BY tag_name
 				LIMIT 10");
@@ -311,10 +311,10 @@ class Article extends Handler_Protected {
 	private function labelops($assign) {
 		$reply = array();
 
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
-		$label_id = db_escape_string($this->link, $_REQUEST["lid"]);
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$label_id = db_escape_string( $_REQUEST["lid"]);
 
-		$label = db_escape_string($this->link, label_find_caption($this->link, $label_id,
+		$label = db_escape_string( label_find_caption( $label_id,
 		$_SESSION["uid"]));
 
 		$reply["info-for-headlines"] = array();
@@ -324,11 +324,11 @@ class Article extends Handler_Protected {
 			foreach ($ids as $id) {
 
 				if ($assign)
-					label_add_article($this->link, $id, $label, $_SESSION["uid"]);
+					label_add_article( $id, $label, $_SESSION["uid"]);
 				else
-					label_remove_article($this->link, $id, $label, $_SESSION["uid"]);
+					label_remove_article( $id, $label, $_SESSION["uid"]);
 
-				$labels = get_article_labels($this->link, $id, $_SESSION["uid"]);
+				$labels = get_article_labels( $id, $_SESSION["uid"]);
 
 				array_push($reply["info-for-headlines"],
 				array("id" => $id, "labels" => format_article_labels($labels, $id)));
diff --git a/classes/auth/base.php b/classes/auth/base.php
index ad7ff3646..c2a6bd704 100644
--- a/classes/auth/base.php
+++ b/classes/auth/base.php
@@ -1,9 +1,9 @@
 <?php
 class Auth_Base {
-	protected $link;
+	protected $dbh;
 
-	function __construct($link) {
-		$this->link = $link;
+	function __construct($dbh) {
+		$this->dbh = $dbh;
 	}
 
 	function check_password($owner_uid, $password) {
@@ -21,7 +21,7 @@ class Auth_Base {
 			$user_id = $this->find_user_by_login($login);
 
 			if (!$user_id) {
-				$login = db_escape_string($this->link, $login);
+				$login = db_escape_string( $login);
 				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 				$pwd_hash = encrypt_password($password, $salt, true);
 
@@ -29,7 +29,7 @@ class Auth_Base {
 						(login,access_level,last_login,created,pwd_hash,salt)
 						VALUES ('$login', 0, null, NOW(), '$pwd_hash','$salt')";
 
-				db_query($this->link, $query);
+				db_query( $query);
 
 				return $this->find_user_by_login($login);
 
@@ -42,9 +42,9 @@ class Auth_Base {
 	}
 
 	function find_user_by_login($login) {
-		$login = db_escape_string($this->link, $login);
+		$login = db_escape_string( $login);
 
-		$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
+		$result = db_query( "SELECT id FROM ttrss_users WHERE
 			login = '$login'");
 
 		if (db_num_rows($result) > 0) {
diff --git a/classes/backend.php b/classes/backend.php
index c03d583db..a04168108 100644
--- a/classes/backend.php
+++ b/classes/backend.php
@@ -11,7 +11,7 @@ class Backend extends Handler {
 
 		require_once "digest.php";
 
-		$rv = prepare_headlines_digest($this->link, $_SESSION['uid'], 1, 1000);
+		$rv = prepare_headlines_digest( $_SESSION['uid'], 1, 1000);
 
 		$rv[3] = "<pre>" . $rv[3] . "</pre>";
 
@@ -19,8 +19,8 @@ class Backend extends Handler {
 	}
 
 	private function display_main_help() {
-		$info = get_hotkeys_info($this->link);
-		$imap = get_hotkeys_map($this->link);
+		$info = get_hotkeys_info();
+		$imap = get_hotkeys_map();
 		$omap = array();
 
 		foreach ($imap[1] as $sequence => $action) {
diff --git a/classes/db.php b/classes/db.php
index c3b627096..6dc31a22e 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -36,7 +36,7 @@ class Db implements IDb {
 
 	function connect($host, $user, $pass, $db, $port) {
 		//return $this->adapter->connect($host, $user, $pass, $db, $port);
-		return $this->link;
+		return ;
 	}
 
 	function escape_string($s, $strip_tags = true) {
diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index bafd54ab2..0cb737978 100644
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -31,11 +31,11 @@ class Db_Pgsql implements IDb {
 	function escape_string($s, $strip_tags = true) {
 		if ($strip_tags) $s = strip_tags($s);
 
-		return pg_escape_string($this->link, $s);
+		return pg_escape_string( $s);
 	}
 
 	function query($query, $die_on_error = true) {
-		$result = pg_query($this->link, $query);
+		$result = pg_query( $query);
 
 		if (!$result) {
 			$query = htmlspecialchars($query); // just in case
diff --git a/classes/dbupdater.php b/classes/dbupdater.php
index a9a713273..ffcac7cf7 100644
--- a/classes/dbupdater.php
+++ b/classes/dbupdater.php
@@ -1,18 +1,18 @@
 <?php
 class DbUpdater {
 
-	private $link;
+	private $dbh;
 	private $db_type;
 	private $need_version;
 
-	function __construct($link, $db_type, $need_version) {
-		$this->link = $link;
+	function __construct($dbh, $db_type, $need_version) {
+		$this->dbh = $dbh;
 		$this->db_type = $db_type;
 		$this->need_version = (int) $need_version;
 	}
 
 	function getSchemaVersion() {
-		$result = db_query($this->link, "SELECT schema_version FROM ttrss_version");
+		$result = db_query( "SELECT schema_version FROM ttrss_version");
 		return (int) db_fetch_result($result, 0, "schema_version");
 	}
 
@@ -37,21 +37,21 @@ class DbUpdater {
 
 			if (is_array($lines)) {
 
-				db_query($this->link, "BEGIN");
+				db_query( "BEGIN");
 
 				foreach ($lines as $line) {
 					if (strpos($line, "--") !== 0 && $line) {
-						db_query($this->link, $line);
+						db_query( $line);
 					}
 				}
 
 				$db_version = $this->getSchemaVersion();
 
 				if ($db_version == $version) {
-					db_query($this->link, "COMMIT");
+					db_query( "COMMIT");
 					return true;
 				} else {
-					db_query($this->link, "ROLLBACK");
+					db_query( "ROLLBACK");
 					return false;
 				}
 			} else {
diff --git a/classes/dlg.php b/classes/dlg.php
index e56560a47..99cd7cffa 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -6,7 +6,7 @@ class Dlg extends Handler_Protected {
 		if (parent::before($method)) {
 			header("Content-Type: text/html"); # required for iframe
 
-			$this->param = db_escape_string($this->link, $_REQUEST["param"]);
+			$this->param = db_escape_string( $_REQUEST["param"]);
 			return true;
 		}
 		return false;
@@ -18,15 +18,15 @@ class Dlg extends Handler_Protected {
 		print "<div class=\"prefFeedOPMLHolder\">";
 		$owner_uid = $_SESSION["uid"];
 
-		db_query($this->link, "BEGIN");
+		db_query( "BEGIN");
 
 		print "<ul class='nomarks'>";
 
-		$opml = new Opml($this->link, $_REQUEST);
+		$opml = new Opml( $_REQUEST);
 
 		$opml->opml_import($_SESSION["uid"]);
 
-		db_query($this->link, "COMMIT");
+		db_query( "COMMIT");
 
 		print "</ul>";
 		print "</div>";
@@ -43,7 +43,7 @@ class Dlg extends Handler_Protected {
 	}
 
 	function pubOPMLUrl() {
-		$url_path = Opml::opml_publish_url($this->link);
+		$url_path = Opml::opml_publish_url();
 
 		print __("Your Public OPML URL is:");
 
@@ -106,7 +106,7 @@ class Dlg extends Handler_Protected {
 			FROM ttrss_tags WHERE owner_uid = ".$_SESSION["uid"]."
 			GROUP BY tag_name ORDER BY count DESC LIMIT 50";
 
-		$result = db_query($this->link, $query);
+		$result = db_query( $query);
 
 		$tags = array();
 
@@ -171,7 +171,7 @@ class Dlg extends Handler_Protected {
 		print "<label for=\"tag_mode_all\">".__("All tags.")."</input>";
 
 		print "<select id=\"all_tags\" name=\"all_tags\" title=\"" . __('Which Tags?') . "\" multiple=\"multiple\" size=\"10\" style=\"width : 100%\">";
-		$result = db_query($this->link, "SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
+		$result = db_query( "SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
 			AND LENGTH(tag_name) <= 30 ORDER BY tag_name ASC");
 
 		while ($row = db_fetch_assoc($result)) {
@@ -195,10 +195,10 @@ class Dlg extends Handler_Protected {
 	function generatedFeed() {
 
 		$this->params = explode(":", $this->param, 3);
-		$feed_id = db_escape_string($this->link, $this->params[0]);
+		$feed_id = db_escape_string( $this->params[0]);
 		$is_cat = (bool) $this->params[1];
 
-		$key = get_feed_access_key($this->link, $feed_id, $is_cat);
+		$key = get_feed_access_key( $feed_id, $is_cat);
 
 		$url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
 
@@ -223,7 +223,7 @@ class Dlg extends Handler_Protected {
 
 	function newVersion() {
 
-		$version_data = check_for_update($this->link);
+		$version_data = check_for_update();
 		$version = $version_data['version'];
 		$id = $version_data['version_id'];
 
diff --git a/classes/feeds.php b/classes/feeds.php
index 6ee5bad0b..1c3ad58c5 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -164,7 +164,7 @@ class Feeds extends Handler_Protected {
 		if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {
 			// Update the feed if required with some basic flood control
 
-			$result = db_query($this->link,
+			$result = db_query(
 				"SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 					FROM ttrss_feeds WHERE id = '$feed'");
 
@@ -174,22 +174,22 @@ class Feeds extends Handler_Protected {
 
 					if (!$cache_images && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {
 						include "rssfuncs.php";
-						update_rss_feed($this->link, $feed, true, true);
+						update_rss_feed( $feed, true, true);
 					} else {
-						db_query($this->link, "UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
+						db_query( "UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
 							WHERE id = '$feed'");
 					}
 				}
 		}
 
 		if ($method_split[0] == "MarkAllReadGR")  {
-			catchup_feed($this->link, $method_split[1], false);
+			catchup_feed( $method_split[1], false);
 		}
 
 		// FIXME: might break tag display?
 
 		if (is_numeric($feed) && $feed > 0 && !$cat_view) {
-			$result = db_query($this->link,
+			$result = db_query(
 				"SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1");
 
 			if (db_num_rows($result) == 0) {
@@ -197,13 +197,13 @@ class Feeds extends Handler_Protected {
 			}
 		}
 
-		@$search = db_escape_string($this->link, $_REQUEST["query"]);
+		@$search = db_escape_string( $_REQUEST["query"]);
 
 		if ($search) {
 			$disable_cache = true;
 		}
 
-		@$search_mode = db_escape_string($this->link, $_REQUEST["search_mode"]);
+		@$search_mode = db_escape_string( $_REQUEST["search_mode"]);
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
 
@@ -219,7 +219,7 @@ class Feeds extends Handler_Protected {
 			$handler = $pluginhost->get_feed_handler(
 				PluginHost::feed_to_pfeed_id($feed));
 
-		//	function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false) {
+		//	function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false) {
 
 			if ($handler) {
 				$options = array(
@@ -240,7 +240,7 @@ class Feeds extends Handler_Protected {
 			}
 
 		} else {
-			$qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view,
+			$qfh_ret = queryFeedHeadlines( $feed, $limit, $view_mode, $cat_view,
 				$search, $search_mode, $override_order, $offset, 0,
 				false, 0, $include_children);
 		}
@@ -261,13 +261,13 @@ class Feeds extends Handler_Protected {
 
 		$headlines_count = db_num_rows($result);
 
-		/* if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {
+		/* if (get_pref( 'COMBINED_DISPLAY_MODE')) {
 			$button_plugins = array();
 			foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {
 				$pclass = "button_" . trim($p);
 
 				if (class_exists($pclass)) {
-					$plugin = new $pclass($link);
+					$plugin = new $pclass();
 					array_push($button_plugins, $plugin);
 				}
 			}
@@ -282,11 +282,11 @@ class Feeds extends Handler_Protected {
 			$num_unread = 0;
 			$cur_feed_title = '';
 
-			$fresh_intl = get_pref($this->link, "FRESH_ARTICLE_MAX_AGE") * 60 * 60;
+			$fresh_intl = get_pref( "FRESH_ARTICLE_MAX_AGE") * 60 * 60;
 
 			if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);
 
-			$expand_cdm = get_pref($this->link, 'CDM_EXPANDED');
+			$expand_cdm = get_pref( 'CDM_EXPANDED');
 
 			while ($line = db_fetch_assoc($result)) {
 				$class = ($lnum % 2) ? "even" : "odd";
@@ -307,7 +307,7 @@ class Feeds extends Handler_Protected {
 					}
 				}
 
-				if (!is_array($labels)) $labels = get_article_labels($this->link, $id);
+				if (!is_array($labels)) $labels = get_article_labels( $id);
 
 				$labels_str = "<span id=\"HLLCTR-$id\">";
 				$labels_str .= format_article_labels($labels, $id);
@@ -357,11 +357,11 @@ class Feeds extends Handler_Protected {
 #				$content_link = "<a href=\"javascript:viewContentUrl('".$line["link"]."');\">" .
 #					$line["title"] . "</a>";
 
-				$updated_fmt = make_local_datetime($this->link, $line["updated"], false);
+				$updated_fmt = make_local_datetime( $line["updated"], false);
 				$date_entered_fmt = T_sprintf("Imported at %s",
-					make_local_datetime($this->link, $line["date_entered"], false));
+					make_local_datetime( $line["date_entered"], false));
 
-				if (get_pref($this->link, 'SHOW_CONTENT_PREVIEW')) {
+				if (get_pref( 'SHOW_CONTENT_PREVIEW')) {
 					$content_preview = truncate_string(strip_tags($line["content_preview"]),
 						100);
 				}
@@ -429,9 +429,9 @@ class Feeds extends Handler_Protected {
 					$row_background = "";
 				}
 
-				if (!get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {
+				if (!get_pref( 'COMBINED_DISPLAY_MODE')) {
 
-					if (get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
+					if (get_pref( 'VFEED_GROUP_BY_FEED')) {
 						if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
 
 							$cur_feed_title = $line["feed_title"];
@@ -472,7 +472,7 @@ class Feeds extends Handler_Protected {
 						onclick=\"\">" .
 						truncate_string($line["title"], 200);
 
-					if (get_pref($this->link, 'SHOW_CONTENT_PREVIEW')) {
+					if (get_pref( 'SHOW_CONTENT_PREVIEW')) {
 						if ($content_preview) {
 							$reply['content'] .= "<span class=\"contentPreview\"> - $content_preview</span>";
 						}
@@ -486,7 +486,7 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "<span class=\"hlUpdated\">";
 
-					if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
+					if (!get_pref( 'VFEED_GROUP_BY_FEED')) {
 						if (@$line["feed_title"]) {
 							$reply['content'] .= "<div class=\"hlFeed\">
 								<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
@@ -502,7 +502,7 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= $score_pic;
 
-					if ($line["feed_title"] && !get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
+					if ($line["feed_title"] && !get_pref( 'VFEED_GROUP_BY_FEED')) {
 
 						$reply['content'] .= "<span onclick=\"viewfeed($feed_id)\"
 							style=\"cursor : pointer\"
@@ -515,17 +515,17 @@ class Feeds extends Handler_Protected {
 
 				} else {
 
-					$line["tags"] = get_article_tags($this->link, $id, $_SESSION["uid"], $line["tag_cache"]);
+					$line["tags"] = get_article_tags( $id, $_SESSION["uid"], $line["tag_cache"]);
 					unset($line["tag_cache"]);
 
-					$line["content"] = sanitize($this->link, $line["content_preview"],
+					$line["content"] = sanitize( $line["content_preview"],
 							sql_bool_to_bool($line['hide_images']), false, $entry_site_url);
 
 					foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_CDM) as $p) {
 						$line = $p->hook_render_article_cdm($line);
 					}
 
-					if (get_pref($this->link, 'VFEED_GROUP_BY_FEED') && $line["feed_title"]) {
+					if (get_pref( 'VFEED_GROUP_BY_FEED') && $line["feed_title"]) {
 						if ($feed_id != $vgroup_last_feed) {
 
 							$cur_feed_title = $line["feed_title"];
@@ -594,7 +594,7 @@ class Feeds extends Handler_Protected {
 						id=\"CEXC-$id\" class=\"cdmExcerpt\"> - $content_preview</span>";
 					$reply['content'] .= "</span>";
 
-					if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
+					if (!get_pref( 'VFEED_GROUP_BY_FEED')) {
 						if (@$line["feed_title"]) {
 							$reply['content'] .= "<div class=\"hlFeed\">
 								<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
@@ -609,7 +609,7 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "<div style=\"vertical-align : middle\">";
 					$reply['content'] .= "$score_pic";
 
-					if (!get_pref($this->link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
+					if (!get_pref( "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
 						$reply['content'] .= "<span style=\"cursor : pointer\"
 							title=\"".htmlspecialchars($line["feed_title"])."\"
 							onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
@@ -633,7 +633,7 @@ class Feeds extends Handler_Protected {
 
 			if ($line["orig_feed_id"]) {
 
-				$tmp_result = db_query($this->link, "SELECT * FROM ttrss_archived_feeds
+				$tmp_result = db_query( "SELECT * FROM ttrss_archived_feeds
 					WHERE id = ".$line["orig_feed_id"]);
 
 						if (db_num_rows($tmp_result) != 0) {
@@ -673,7 +673,7 @@ class Feeds extends Handler_Protected {
 
 					$always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
 
-					$reply['content'] .= format_article_enclosures($this->link, $id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
+					$reply['content'] .= format_article_enclosures( $id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
 
 					$reply['content'] .= "</div>";
 
@@ -757,15 +757,15 @@ class Feeds extends Handler_Protected {
 
 				$reply['content'] .= "<p><span class=\"insensitive\">";
 
-				$result = db_query($this->link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+				$result = db_query( "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
 					WHERE owner_uid = " . $_SESSION['uid']);
 
 				$last_updated = db_fetch_result($result, 0, "last_updated");
-				$last_updated = make_local_datetime($this->link, $last_updated, false);
+				$last_updated = make_local_datetime( $last_updated, false);
 
 				$reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
 
-				$result = db_query($this->link, "SELECT COUNT(id) AS num_errors
+				$result = db_query( "SELECT COUNT(id) AS num_errors
 					FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
 				$num_errors = db_fetch_result($result, 0, "num_errors");
@@ -786,9 +786,9 @@ class Feeds extends Handler_Protected {
 	}
 
 	function catchupAll() {
-		db_query($this->link, "UPDATE ttrss_user_entries SET
+		db_query( "UPDATE ttrss_user_entries SET
 						last_read = NOW(), unread = false WHERE unread = true AND owner_uid = " . $_SESSION["uid"]);
-		ccache_zero_all($this->link, $_SESSION["uid"]);
+		ccache_zero_all( $_SESSION["uid"]);
 	}
 
 	function view() {
@@ -798,17 +798,17 @@ class Feeds extends Handler_Protected {
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("0", $timing_info);
 
-		$omode = db_escape_string($this->link, $_REQUEST["omode"]);
+		$omode = db_escape_string( $_REQUEST["omode"]);
 
-		$feed = db_escape_string($this->link, $_REQUEST["feed"]);
-		$method = db_escape_string($this->link, $_REQUEST["m"]);
-		$view_mode = db_escape_string($this->link, $_REQUEST["view_mode"]);
+		$feed = db_escape_string( $_REQUEST["feed"]);
+		$method = db_escape_string( $_REQUEST["m"]);
+		$view_mode = db_escape_string( $_REQUEST["view_mode"]);
 		$limit = 30;
 		@$cat_view = $_REQUEST["cat"] == "true";
-		@$next_unread_feed = db_escape_string($this->link, $_REQUEST["nuf"]);
-		@$offset = db_escape_string($this->link, $_REQUEST["skip"]);
-		@$vgroup_last_feed = db_escape_string($this->link, $_REQUEST["vgrlf"]);
-		$order_by = db_escape_string($this->link, $_REQUEST["order_by"]);
+		@$next_unread_feed = db_escape_string( $_REQUEST["nuf"]);
+		@$offset = db_escape_string( $_REQUEST["skip"]);
+		@$vgroup_last_feed = db_escape_string( $_REQUEST["vgrlf"]);
+		$order_by = db_escape_string( $_REQUEST["order_by"]);
 
 		if (is_numeric($feed)) $feed = (int) $feed;
 
@@ -816,7 +816,7 @@ class Feeds extends Handler_Protected {
 		 * when there's nothing to load - e.g. no stuff in fresh feed */
 
 		if ($feed == -5) {
-			print json_encode($this->generate_dashboard_feed($this->link));
+			print json_encode($this->generate_dashboard_feed());
 			return;
 		}
 
@@ -824,18 +824,18 @@ class Feeds extends Handler_Protected {
 
 		if ($feed < LABEL_BASE_INDEX) {
 			$label_feed = feed_to_label_id($feed);
-			$result = db_query($this->link, "SELECT id FROM ttrss_labels2 WHERE
+			$result = db_query( "SELECT id FROM ttrss_labels2 WHERE
 							id = '$label_feed' AND owner_uid = " . $_SESSION['uid']);
 		} else if (!$cat_view && is_numeric($feed) && $feed > 0) {
-			$result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+			$result = db_query( "SELECT id FROM ttrss_feeds WHERE
 							id = '$feed' AND owner_uid = " . $_SESSION['uid']);
 		} else if ($cat_view && is_numeric($feed) && $feed > 0) {
-			$result = db_query($this->link, "SELECT id FROM ttrss_feed_categories WHERE
+			$result = db_query( "SELECT id FROM ttrss_feed_categories WHERE
 							id = '$feed' AND owner_uid = " . $_SESSION['uid']);
 		}
 
 		if ($result && db_num_rows($result) == 0) {
-			print json_encode($this->generate_error_feed($this->link, __("Feed not found.")));
+			print json_encode($this->generate_error_feed( __("Feed not found.")));
 			return;
 		}
 
@@ -843,21 +843,21 @@ class Feeds extends Handler_Protected {
 		 * so for performance reasons we don't do that here */
 
 		if ($feed >= 0) {
-			ccache_update($this->link, $feed, $_SESSION["uid"], $cat_view);
+			ccache_update( $feed, $_SESSION["uid"], $cat_view);
 		}
 
-		set_pref($this->link, "_DEFAULT_VIEW_MODE", $view_mode);
-		set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);
+		set_pref( "_DEFAULT_VIEW_MODE", $view_mode);
+		set_pref( "_DEFAULT_VIEW_ORDER_BY", $order_by);
 
 		/* bump login timestamp if needed */
 		if (time() - $_SESSION["last_login_update"] > 3600) {
-			db_query($this->link, "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
+			db_query( "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
 				$_SESSION["uid"]);
 			$_SESSION["last_login_update"] = time();
 		}
 
 		if (!$cat_view && is_numeric($feed) && $feed > 0) {
-			db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()
+			db_query( "UPDATE ttrss_feeds SET last_viewed = NOW()
 							WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
 		}
 
@@ -907,13 +907,13 @@ class Feeds extends Handler_Protected {
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("30", $timing_info);
 
-		$reply['runtime-info'] = make_runtime_info($this->link);
+		$reply['runtime-info'] = make_runtime_info();
 
 		print json_encode($reply);
 
 	}
 
-	private function generate_dashboard_feed($link) {
+	private function generate_dashboard_feed() {
 		$reply = array();
 
 		$reply['headlines']['id'] = -5;
@@ -924,15 +924,15 @@ class Feeds extends Handler_Protected {
 
 		$reply['headlines']['content'] .= "<p><span class=\"insensitive\">";
 
-		$result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+		$result = db_query( "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
 			WHERE owner_uid = " . $_SESSION['uid']);
 
 		$last_updated = db_fetch_result($result, 0, "last_updated");
-		$last_updated = make_local_datetime($link, $last_updated, false);
+		$last_updated = make_local_datetime( $last_updated, false);
 
 		$reply['headlines']['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
 
-		$result = db_query($link, "SELECT COUNT(id) AS num_errors
+		$result = db_query( "SELECT COUNT(id) AS num_errors
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
 		$num_errors = db_fetch_result($result, 0, "num_errors");
@@ -952,7 +952,7 @@ class Feeds extends Handler_Protected {
 		return $reply;
 	}
 
-	private function generate_error_feed($link, $error) {
+	private function generate_error_feed( $error) {
 		$reply = array();
 
 		$reply['headlines']['id'] = -6;
@@ -986,9 +986,9 @@ class Feeds extends Handler_Protected {
 
 		print "<hr/>";
 
-		if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
+		if (get_pref( 'ENABLE_FEED_CATS')) {
 			print __('Place in category:') . " ";
-			print_feed_cat_select($this->link, "cat", false, 'dojoType="dijit.form.Select"');
+			print_feed_cat_select( "cat", false, 'dojoType="dijit.form.Select"');
 		}
 
 		print "</div>";
@@ -1044,7 +1044,7 @@ class Feeds extends Handler_Protected {
 	function feedBrowser() {
 		if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
 
-		$browser_search = db_escape_string($this->link, $_REQUEST["search"]);
+		$browser_search = db_escape_string( $_REQUEST["search"]);
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"updateFeedBrowser\">";
@@ -1081,7 +1081,7 @@ class Feeds extends Handler_Protected {
 		require_once "feedbrowser.php";
 
 		print "<ul class='browseFeedList' id='browseFeedList'>";
-		print make_feed_browser($this->link, $search, 25);
+		print make_feed_browser( $search, 25);
 		print "</ul>";
 
 		print "<div align='center'>
@@ -1092,7 +1092,7 @@ class Feeds extends Handler_Protected {
 	}
 
 	function search() {
-		$this->params = explode(":", db_escape_string($this->link, $_REQUEST["param"]), 2);
+		$this->params = explode(":", db_escape_string( $_REQUEST["param"]), 2);
 
 		$active_feed_id = sprintf("%d", $this->params[0]);
 		$is_cat = $this->params[1] != "false";
@@ -1110,12 +1110,12 @@ class Feeds extends Handler_Protected {
 		print "<select name=\"search_mode\" dojoType=\"dijit.form.Select\">
 			<option value=\"all_feeds\">".__('All feeds')."</option>";
 
-		$feed_title = getFeedTitle($this->link, $active_feed_id);
+		$feed_title = getFeedTitle( $active_feed_id);
 
 		if (!$is_cat) {
-			$feed_cat_title = getFeedCatTitle($this->link, $active_feed_id);
+			$feed_cat_title = getFeedCatTitle( $active_feed_id);
 		} else {
-			$feed_cat_title = getCategoryTitle($this->link, $active_feed_id);
+			$feed_cat_title = getCategoryTitle( $active_feed_id);
 		}
 
 		if ($active_feed_id && !$is_cat) {
@@ -1128,7 +1128,7 @@ class Feeds extends Handler_Protected {
 		  	$cat_preselected = "selected=\"1\"";
 		}
 
-		if (get_pref($this->link, 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
+		if (get_pref( 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
 			print "<option $cat_preselected value=\"this_cat\">$feed_cat_title</option>";
 		} else {
 			//print "<option disabled>".__('This category')."</option>";
diff --git a/classes/handler.php b/classes/handler.php
index 68b16eac1..d8e2a3025 100644
--- a/classes/handler.php
+++ b/classes/handler.php
@@ -1,10 +1,10 @@
 <?php
 class Handler implements IHandler {
-	protected $link;
+	protected $dbh;
 	protected $args;
 
-	function __construct($link, $args) {
-		$this->link = $link;
+	function __construct($dbh, $args) {
+		$this->dbh = $dbh;
 		$this->args = $args;
 	}
 
diff --git a/classes/handler/public.php b/classes/handler/public.php
index e95f118bb..1e96bef00 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -21,7 +21,7 @@ class Handler_Public extends Handler {
 		else if ($feed == -1)
 			$date_sort_field = "last_marked DESC";
 
-		$qfh_ret = queryFeedHeadlines($this->link, $feed,
+		$qfh_ret = queryFeedHeadlines( $feed,
 			1, $view_mode, $is_cat, $search, $search_mode,
 			$date_sort_field, $offset, $owner_uid,
 			false, 0, false, true);
@@ -41,7 +41,7 @@ class Handler_Public extends Handler {
 			header("Last-Modified: $last_modified", true);
 		}
 
-		$qfh_ret = queryFeedHeadlines($this->link, $feed,
+		$qfh_ret = queryFeedHeadlines( $feed,
 			$limit, $view_mode, $is_cat, $search, $search_mode,
 			$date_sort_field, $offset, $owner_uid,
 			false, 0, false, true);
@@ -54,7 +54,7 @@ class Handler_Public extends Handler {
 
 		$feed_self_url = get_self_url_prefix() .
 			"/public.php?op=rss&id=-2&key=" .
-			get_feed_access_key($this->link, -2, false, $owner_uid);
+			get_feed_access_key( -2, false, $owner_uid);
 
 		if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
 
@@ -82,7 +82,7 @@ class Handler_Public extends Handler {
 				$tpl->setVariable('ARTICLE_EXCERPT',
 					truncate_string(strip_tags($line["content_preview"]), 100, '...'), true);
 
-				$content = sanitize($this->link, $line["content_preview"], false, $owner_uid);
+				$content = sanitize( $line["content_preview"], false, $owner_uid);
 
 				if ($line['note']) {
 					$content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
@@ -99,14 +99,14 @@ class Handler_Public extends Handler {
 
 				$tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
 
-				$tags = get_article_tags($this->link, $line["id"], $owner_uid);
+				$tags = get_article_tags( $line["id"], $owner_uid);
 
 				foreach ($tags as $tag) {
 					$tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
 					$tpl->addBlock('category');
 				}
 
-				$enclosures = get_article_enclosures($this->link, $line["id"]);
+				$enclosures = get_article_enclosures( $line["id"]);
 
 				foreach ($enclosures as $e) {
 					$type = htmlspecialchars($e['content_type']);
@@ -158,13 +158,13 @@ class Handler_Public extends Handler {
 				$article['link']	= $line['link'];
 				$article['title'] = $line['title'];
 				$article['excerpt'] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
-				$article['content'] = sanitize($this->link, $line["content_preview"], false, $owner_uid);
+				$article['content'] = sanitize( $line["content_preview"], false, $owner_uid);
 				$article['updated'] = date('c', strtotime($line["updated"]));
 
 				if ($line['note']) $article['note'] = $line['note'];
 				if ($article['author']) $article['author'] = $line['author'];
 
-				$tags = get_article_tags($this->link, $line["id"], $owner_uid);
+				$tags = get_article_tags( $line["id"], $owner_uid);
 
 				if (count($tags) > 0) {
 					$article['tags'] = array();
@@ -174,7 +174,7 @@ class Handler_Public extends Handler {
 					}
 				}
 
-				$enclosures = get_article_enclosures($this->link, $line["id"]);
+				$enclosures = get_article_enclosures( $line["id"]);
 
 				if (count($enclosures) > 0) {
 					$article['enclosures'] = array();
@@ -201,19 +201,19 @@ class Handler_Public extends Handler {
 	}
 
 	function getUnread() {
-		$login = db_escape_string($this->link, $_REQUEST["login"]);
+		$login = db_escape_string( $_REQUEST["login"]);
 		$fresh = $_REQUEST["fresh"] == "1";
 
-		$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE login = '$login'");
+		$result = db_query( "SELECT id FROM ttrss_users WHERE login = '$login'");
 
 		if (db_num_rows($result) == 1) {
 			$uid = db_fetch_result($result, 0, "id");
 
-			print getGlobalUnread($this->link, $uid);
+			print getGlobalUnread( $uid);
 
 			if ($fresh) {
 				print ";";
-				print getFeedArticles($this->link, -3, false, true, $uid);
+				print getFeedArticles( -3, false, true, $uid);
 			}
 
 		} else {
@@ -223,9 +223,9 @@ class Handler_Public extends Handler {
 	}
 
 	function getProfiles() {
-		$login = db_escape_string($this->link, $_REQUEST["login"]);
+		$login = db_escape_string( $_REQUEST["login"]);
 
-		$result = db_query($this->link, "SELECT * FROM ttrss_settings_profiles,ttrss_users
+		$result = db_query( "SELECT * FROM ttrss_settings_profiles,ttrss_users
 			WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = '$login' ORDER BY title");
 
 		print "<select dojoType='dijit.form.Select' style='width : 220px; margin : 0px' name='profile'>";
@@ -243,9 +243,9 @@ class Handler_Public extends Handler {
 	}
 
 	function pubsub() {
-		$mode = db_escape_string($this->link, $_REQUEST['hub_mode']);
-		$feed_id = (int) db_escape_string($this->link, $_REQUEST['id']);
-		$feed_url = db_escape_string($this->link, $_REQUEST['hub_topic']);
+		$mode = db_escape_string( $_REQUEST['hub_mode']);
+		$feed_id = (int) db_escape_string( $_REQUEST['id']);
+		$feed_url = db_escape_string( $_REQUEST['hub_topic']);
 
 		if (!PUBSUBHUBBUB_ENABLED) {
 			header('HTTP/1.0 404 Not Found');
@@ -255,7 +255,7 @@ class Handler_Public extends Handler {
 
 		// TODO: implement hub_verifytoken checking
 
-		$result = db_query($this->link, "SELECT feed_url FROM ttrss_feeds
+		$result = db_query( "SELECT feed_url FROM ttrss_feeds
 			WHERE id = '$feed_id'");
 
 		if (db_num_rows($result) != 0) {
@@ -265,7 +265,7 @@ class Handler_Public extends Handler {
 			if ($check_feed_url && ($check_feed_url == $feed_url || !$feed_url)) {
 				if ($mode == "subscribe") {
 
-					db_query($this->link, "UPDATE ttrss_feeds SET pubsub_state = 2
+					db_query( "UPDATE ttrss_feeds SET pubsub_state = 2
 						WHERE id = '$feed_id'");
 
 					print $_REQUEST['hub_challenge'];
@@ -273,7 +273,7 @@ class Handler_Public extends Handler {
 
 				} else if ($mode == "unsubscribe") {
 
-					db_query($this->link, "UPDATE ttrss_feeds SET pubsub_state = 0
+					db_query( "UPDATE ttrss_feeds SET pubsub_state = 0
 						WHERE id = '$feed_id'");
 
 					print $_REQUEST['hub_challenge'];
@@ -282,9 +282,9 @@ class Handler_Public extends Handler {
 				} else if (!$mode) {
 
 					// Received update ping, schedule feed update.
-					//update_rss_feed($this->link, $feed_id, true, true);
+					//update_rss_feed( $feed_id, true, true);
 
-					db_query($this->link, "UPDATE ttrss_feeds SET
+					db_query( "UPDATE ttrss_feeds SET
 						last_update_started = '1970-01-01',
 						last_updated = '1970-01-01' WHERE id = '$feed_id'");
 
@@ -306,9 +306,9 @@ class Handler_Public extends Handler {
 	}
 
 	function share() {
-		$uuid = db_escape_string($this->link, $_REQUEST["key"]);
+		$uuid = db_escape_string( $_REQUEST["key"]);
 
-		$result = db_query($this->link, "SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE
+		$result = db_query( "SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE
 			uuid = '$uuid'");
 
 		if (db_num_rows($result) != 0) {
@@ -317,7 +317,7 @@ class Handler_Public extends Handler {
 			$id = db_fetch_result($result, 0, "ref_id");
 			$owner_uid = db_fetch_result($result, 0, "owner_uid");
 
-			$article = format_article($this->link, $id, false, true, $owner_uid);
+			$article = format_article( $id, false, true, $owner_uid);
 
 			print_r($article['content']);
 
@@ -328,28 +328,28 @@ class Handler_Public extends Handler {
 	}
 
 	function rss() {
-		$feed = db_escape_string($this->link, $_REQUEST["id"]);
-		$key = db_escape_string($this->link, $_REQUEST["key"]);
+		$feed = db_escape_string( $_REQUEST["id"]);
+		$key = db_escape_string( $_REQUEST["key"]);
 		$is_cat = $_REQUEST["is_cat"] != false;
-		$limit = (int)db_escape_string($this->link, $_REQUEST["limit"]);
-		$offset = (int)db_escape_string($this->link, $_REQUEST["offset"]);
+		$limit = (int)db_escape_string( $_REQUEST["limit"]);
+		$offset = (int)db_escape_string( $_REQUEST["offset"]);
 
-		$search = db_escape_string($this->link, $_REQUEST["q"]);
-		$search_mode = db_escape_string($this->link, $_REQUEST["smode"]);
-		$view_mode = db_escape_string($this->link, $_REQUEST["view-mode"]);
+		$search = db_escape_string( $_REQUEST["q"]);
+		$search_mode = db_escape_string( $_REQUEST["smode"]);
+		$view_mode = db_escape_string( $_REQUEST["view-mode"]);
 
-		$format = db_escape_string($this->link, $_REQUEST['format']);
+		$format = db_escape_string( $_REQUEST['format']);
 
 		if (!$format) $format = 'atom';
 
 		if (SINGLE_USER_MODE) {
-			authenticate_user($this->link, "admin", null);
+			authenticate_user( "admin", null);
 		}
 
 		$owner_id = false;
 
 		if ($key) {
-			$result = db_query($this->link, "SELECT owner_uid FROM
+			$result = db_query( "SELECT owner_uid FROM
 				ttrss_access_keys WHERE access_key = '$key' AND feed_id = '$feed'");
 
 			if (db_num_rows($result) == 1)
@@ -367,15 +367,15 @@ class Handler_Public extends Handler {
 	function globalUpdateFeeds() {
 		include "rssfuncs.php";
 		// Update all feeds needing a update.
-		update_daemon_common($this->link, 0, true, false);
+		update_daemon_common( 0, true, false);
 
 		// Update feedbrowser
-		update_feedbrowser_cache($this->link);
+		update_feedbrowser_cache();
 
 		// Purge orphans and cleanup tags
-		purge_orphans($this->link);
+		purge_orphans();
 
-		cleanup_tags($this->link, 14, 50000);
+		cleanup_tags( 14, 50000);
 
 		global $pluginhost;
 		$pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
@@ -384,7 +384,7 @@ class Handler_Public extends Handler {
 
 	function sharepopup() {
 		if (SINGLE_USER_MODE) {
-			login_sequence($this->link);
+			login_sequence();
 		}
 
 		header('Content-Type: text/html; charset=utf-8');
@@ -402,12 +402,12 @@ class Handler_Public extends Handler {
 
 			if ($action == 'share') {
 
-				$title = db_escape_string($this->link, strip_tags($_REQUEST["title"]));
-				$url = db_escape_string($this->link, strip_tags($_REQUEST["url"]));
-				$content = db_escape_string($this->link, strip_tags($_REQUEST["content"]));
-				$labels = db_escape_string($this->link, strip_tags($_REQUEST["labels"]));
+				$title = db_escape_string( strip_tags($_REQUEST["title"]));
+				$url = db_escape_string( strip_tags($_REQUEST["url"]));
+				$content = db_escape_string( strip_tags($_REQUEST["content"]));
+				$labels = db_escape_string( strip_tags($_REQUEST["labels"]));
 
-				Article::create_published_article($this->link, $title, $url, $content, $labels,
+				Article::create_published_article( $title, $url, $content, $labels,
 					$_SESSION["uid"]);
 
 				print "<script type='text/javascript'>";
@@ -513,7 +513,7 @@ class Handler_Public extends Handler {
 
 		if (!SINGLE_USER_MODE) {
 
-			$login = db_escape_string($this->link, $_POST["login"]);
+			$login = db_escape_string( $_POST["login"]);
 			$password = $_POST["password"];
 			$remember_me = $_POST["remember_me"];
 
@@ -525,18 +525,18 @@ class Handler_Public extends Handler {
 
 			@session_start();
 
-			if (authenticate_user($this->link, $login, $password)) {
+			if (authenticate_user( $login, $password)) {
 				$_POST["password"] = "";
 
 				$_SESSION["language"] = $_POST["language"];
-				$_SESSION["ref_schema_version"] = get_schema_version($this->link, true);
+				$_SESSION["ref_schema_version"] = get_schema_version( true);
 				$_SESSION["bw_limit"] = !!$_POST["bw_limit"];
 
 				if ($_POST["profile"]) {
 
-					$profile = db_escape_string($this->link, $_POST["profile"]);
+					$profile = db_escape_string( $_POST["profile"]);
 
-					$result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles
+					$result = db_query( "SELECT id FROM ttrss_settings_profiles
 						WHERE id = '$profile' AND owner_uid = " . $_SESSION["uid"]);
 
 					if (db_num_rows($result) != 0) {
@@ -558,12 +558,12 @@ class Handler_Public extends Handler {
 
 	function subscribe() {
 		if (SINGLE_USER_MODE) {
-			login_sequence($this->link);
+			login_sequence();
 		}
 
 		if ($_SESSION["uid"]) {
 
-			$feed_url = db_escape_string($this->link, trim($_REQUEST["feed_url"]));
+			$feed_url = db_escape_string( trim($_REQUEST["feed_url"]));
 
 			header('Content-Type: text/html; charset=utf-8');
 			print "<html>
@@ -577,7 +577,7 @@ class Handler_Public extends Handler {
 			  		alt=\"Tiny Tiny RSS\"/>
 					<h1>".__("Subscribe to feed...")."</h1><div class='content'>";
 
-			$rc = subscribe_to_feed($this->link, $feed_url);
+			$rc = subscribe_to_feed( $feed_url);
 
 			switch ($rc['code']) {
 			case 0:
@@ -625,7 +625,7 @@ class Handler_Public extends Handler {
 			$tt_uri = get_self_url_prefix();
 
 			if ($rc['code'] <= 2){
-				$result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+				$result = db_query( "SELECT id FROM ttrss_feeds WHERE
 					feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
 				$feed_id = db_fetch_result($result, 0, "id");
@@ -651,21 +651,21 @@ class Handler_Public extends Handler {
 			print "</div></body></html>";
 
 		} else {
-			render_login_form($this->link);
+			render_login_form();
 		}
 	}
 
 	function subscribe2() {
-		$feed_url = db_escape_string($this->link, trim($_REQUEST["feed_url"]));
-		$cat_id = db_escape_string($this->link, $_REQUEST["cat_id"]);
-		$from = db_escape_string($this->link, $_REQUEST["from"]);
+		$feed_url = db_escape_string( trim($_REQUEST["feed_url"]));
+		$cat_id = db_escape_string( $_REQUEST["cat_id"]);
+		$from = db_escape_string( $_REQUEST["from"]);
 
 		/* only read authentication information from POST */
 
-		$auth_login = db_escape_string($this->link, trim($_POST["auth_login"]));
-		$auth_pass = db_escape_string($this->link, trim($_POST["auth_pass"]));
+		$auth_login = db_escape_string( trim($_POST["auth_login"]));
+		$auth_pass = db_escape_string( trim($_POST["auth_pass"]));
 
-		$rc = subscribe_to_feed($this->link, $feed_url, $cat_id, $auth_login, $auth_pass);
+		$rc = subscribe_to_feed( $feed_url, $cat_id, $auth_login, $auth_pass);
 
 		switch ($rc) {
 		case 1:
@@ -712,7 +712,7 @@ class Handler_Public extends Handler {
 		$tt_uri = get_self_url_prefix();
 
 		if ($rc <= 2){
-			$result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+			$result = db_query( "SELECT id FROM ttrss_feeds WHERE
 				feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
 			$feed_id = db_fetch_result($result, 0, "id");
@@ -788,9 +788,9 @@ class Handler_Public extends Handler {
 			print "</form>";
 		} else if ($method == 'do') {
 
-			$login = db_escape_string($this->link, $_POST["login"]);
-			$email = db_escape_string($this->link, $_POST["email"]);
-			$test = db_escape_string($this->link, $_POST["test"]);
+			$login = db_escape_string( $_POST["login"]);
+			$email = db_escape_string( $_POST["email"]);
+			$test = db_escape_string( $_POST["test"]);
 
 			if (($test != 4 && $test != 'four') || !$email || !$login) {
 				print_error(__('Some of the required form parameters are missing or incorrect.'));
@@ -802,13 +802,13 @@ class Handler_Public extends Handler {
 
 			} else {
 
-				$result = db_query($this->link, "SELECT id FROM ttrss_users
+				$result = db_query( "SELECT id FROM ttrss_users
 					WHERE login = '$login' AND email = '$email'");
 
 				if (db_num_rows($result) != 0) {
 					$id = db_fetch_result($result, 0, "id");
 
-					Pref_Users::resetUserPassword($this->link, $id, false);
+					Pref_Users::resetUserPassword( $id, false);
 
 					print "<p>";
 
@@ -840,7 +840,7 @@ class Handler_Public extends Handler {
 	function dbupdate() {
 		if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
 			$_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
-			render_login_form($link);
+			render_login_form();
 			exit;
 		}
 
@@ -869,7 +869,7 @@ class Handler_Public extends Handler {
 
 			<?php
 				@$op = $_REQUEST["subop"];
-				$updater = new DbUpdater($this->link, DB_TYPE, SCHEMA_VERSION);
+				$updater = new DbUpdater( DB_TYPE, SCHEMA_VERSION);
 
 				if ($op == "performupdate") {
 					if ($updater->isUpdateRequired()) {
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index b0e0b0db5..387478c10 100644
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -12,7 +12,7 @@ class Logger_SQL {
 			$file = Db::get()->escape_string($file);
 			$line = Db::get()->escape_string($line);
 			$context = ''; // backtrace is a lot of data which is not really critical to store
-			//$context = db_escape_string($this->link, serialize($context));
+			//$context = db_escape_string( serialize($context));
 
 			$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : "NULL";
 
diff --git a/classes/opml.php b/classes/opml.php
index 2ecae4237..a800880e4 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -32,7 +32,7 @@ class Opml extends Handler_Protected {
 			<div class=\"floatingLogo\"><img src=\"images/logo_small.png\"></div>
 			<h1>".__('OPML Utility')."</h1><div class='content'>";
 
-		add_feed_category($this->link, "Imported feeds");
+		add_feed_category( "Imported feeds");
 
 		$this->opml_notice(__("Importing OPML..."));
 		$this->opml_import($owner_uid);
@@ -66,14 +66,14 @@ class Opml extends Handler_Protected {
 		$out = "";
 
 		if ($cat_id) {
-			$result = db_query($this->link, "SELECT title FROM ttrss_feed_categories WHERE id = '$cat_id'
+			$result = db_query( "SELECT title FROM ttrss_feed_categories WHERE id = '$cat_id'
 				AND owner_uid = '$owner_uid'");
 			$cat_title = htmlspecialchars(db_fetch_result($result, 0, "title"));
 		}
 
 		if ($cat_title) $out .= "<outline text=\"$cat_title\">\n";
 
-		$result = db_query($this->link, "SELECT id,title
+		$result = db_query( "SELECT id,title
 			FROM ttrss_feed_categories WHERE
 			$cat_qpart AND owner_uid = '$owner_uid' ORDER BY order_id, title");
 
@@ -82,7 +82,7 @@ class Opml extends Handler_Protected {
 			$out .= $this->opml_export_category($owner_uid, $line["id"], $hide_private_feeds);
 		}
 
-		$feeds_result = db_query($this->link, "select title, feed_url, site_url
+		$feeds_result = db_query( "select title, feed_url, site_url
 				from ttrss_feeds where $feed_cat_qpart AND owner_uid = '$owner_uid' AND $hide_qpart
 				order by order_id, title");
 
@@ -131,7 +131,7 @@ class Opml extends Handler_Protected {
 		if ($include_settings) {
 			$out .= "<outline text=\"tt-rss-prefs\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$result = db_query($this->link, "SELECT pref_name, value FROM ttrss_user_prefs WHERE
+			$result = db_query( "SELECT pref_name, value FROM ttrss_user_prefs WHERE
 			   profile IS NULL AND owner_uid = " . $_SESSION["uid"] . " ORDER BY pref_name");
 
 			while ($line = db_fetch_assoc($result)) {
@@ -145,7 +145,7 @@ class Opml extends Handler_Protected {
 
 			$out .= "<outline text=\"tt-rss-labels\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$result = db_query($this->link, "SELECT * FROM ttrss_labels2 WHERE
+			$result = db_query( "SELECT * FROM ttrss_labels2 WHERE
 				owner_uid = " . $_SESSION['uid']);
 
 			while ($line = db_fetch_assoc($result)) {
@@ -161,7 +161,7 @@ class Opml extends Handler_Protected {
 
 			$out .= "<outline text=\"tt-rss-filters\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$result = db_query($this->link, "SELECT * FROM ttrss_filters2
+			$result = db_query( "SELECT * FROM ttrss_filters2
 				WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY id");
 
 			while ($line = db_fetch_assoc($result)) {
@@ -172,7 +172,7 @@ class Opml extends Handler_Protected {
 				$line["rules"] = array();
 				$line["actions"] = array();
 
-				$tmp_result = db_query($this->link, "SELECT * FROM ttrss_filters2_rules
+				$tmp_result = db_query( "SELECT * FROM ttrss_filters2_rules
 					WHERE filter_id = ".$line["id"]);
 
 				while ($tmp_line = db_fetch_assoc($tmp_result)) {
@@ -182,7 +182,7 @@ class Opml extends Handler_Protected {
 					$cat_filter = sql_bool_to_bool($tmp_line["cat_filter"]);
 
 					if ($cat_filter && $tmp_line["cat_id"] || $tmp_line["feed_id"]) {
-						$tmp_line["feed"] = getFeedTitle($this->link,
+						$tmp_line["feed"] = getFeedTitle(
 							$cat_filter ? $tmp_line["cat_id"] : $tmp_line["feed_id"],
 							$cat_filter);
 					} else {
@@ -197,7 +197,7 @@ class Opml extends Handler_Protected {
 					array_push($line["rules"], $tmp_line);
 				}
 
-				$tmp_result = db_query($this->link, "SELECT * FROM ttrss_filters2_actions
+				$tmp_result = db_query( "SELECT * FROM ttrss_filters2_actions
 					WHERE filter_id = ".$line["id"]);
 
 				while ($tmp_line = db_fetch_assoc($tmp_result)) {
@@ -253,16 +253,16 @@ class Opml extends Handler_Protected {
 	private function opml_import_feed($doc, $node, $cat_id, $owner_uid) {
 		$attrs = $node->attributes;
 
-		$feed_title = db_escape_string($this->link, mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250));
-		if (!$feed_title) $feed_title = db_escape_string($this->link, mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250));
+		$feed_title = db_escape_string( mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250));
+		if (!$feed_title) $feed_title = db_escape_string( mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250));
 
-		$feed_url = db_escape_string($this->link, mb_substr($attrs->getNamedItem('xmlUrl')->nodeValue, 0, 250));
-		if (!$feed_url) $feed_url = db_escape_string($this->link, mb_substr($attrs->getNamedItem('xmlURL')->nodeValue, 0, 250));
+		$feed_url = db_escape_string( mb_substr($attrs->getNamedItem('xmlUrl')->nodeValue, 0, 250));
+		if (!$feed_url) $feed_url = db_escape_string( mb_substr($attrs->getNamedItem('xmlURL')->nodeValue, 0, 250));
 
-		$site_url = db_escape_string($this->link, mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250));
+		$site_url = db_escape_string( mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250));
 
 		if ($feed_url && $feed_title) {
-			$result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+			$result = db_query( "SELECT id FROM ttrss_feeds WHERE
 				feed_url = '$feed_url' AND owner_uid = '$owner_uid'");
 
 			if (db_num_rows($result) == 0) {
@@ -275,7 +275,7 @@ class Opml extends Handler_Protected {
 					(title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES
 					('$feed_title', '$feed_url', '$owner_uid',
 					$cat_id, '$site_url', 0)";
-				db_query($this->link, $query);
+				db_query( $query);
 
 			} else {
 				$this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title));
@@ -285,15 +285,15 @@ class Opml extends Handler_Protected {
 
 	private function opml_import_label($doc, $node, $owner_uid) {
 		$attrs = $node->attributes;
-		$label_name = db_escape_string($this->link, $attrs->getNamedItem('label-name')->nodeValue);
+		$label_name = db_escape_string( $attrs->getNamedItem('label-name')->nodeValue);
 
 		if ($label_name) {
-			$fg_color = db_escape_string($this->link, $attrs->getNamedItem('label-fg-color')->nodeValue);
-			$bg_color = db_escape_string($this->link, $attrs->getNamedItem('label-bg-color')->nodeValue);
+			$fg_color = db_escape_string( $attrs->getNamedItem('label-fg-color')->nodeValue);
+			$bg_color = db_escape_string( $attrs->getNamedItem('label-bg-color')->nodeValue);
 
-			if (!label_find_id($this->link, $label_name, $_SESSION['uid'])) {
+			if (!label_find_id( $label_name, $_SESSION['uid'])) {
 				$this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)));
-				label_create($this->link, $label_name, $fg_color, $bg_color, $owner_uid);
+				label_create( $label_name, $fg_color, $bg_color, $owner_uid);
 			} else {
 				$this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)));
 			}
@@ -302,22 +302,22 @@ class Opml extends Handler_Protected {
 
 	private function opml_import_preference($doc, $node, $owner_uid) {
 		$attrs = $node->attributes;
-		$pref_name = db_escape_string($this->link, $attrs->getNamedItem('pref-name')->nodeValue);
+		$pref_name = db_escape_string( $attrs->getNamedItem('pref-name')->nodeValue);
 
 		if ($pref_name) {
-			$pref_value = db_escape_string($this->link, $attrs->getNamedItem('value')->nodeValue);
+			$pref_value = db_escape_string( $attrs->getNamedItem('value')->nodeValue);
 
 			$this->opml_notice(T_sprintf("Setting preference key %s to %s",
 				$pref_name, $pref_value));
 
-			set_pref($this->link, $pref_name, $pref_value);
+			set_pref( $pref_name, $pref_value);
 		}
 	}
 
 	private function opml_import_filter($doc, $node, $owner_uid) {
 		$attrs = $node->attributes;
 
-		$filter_type = db_escape_string($this->link, $attrs->getNamedItem('filter-type')->nodeValue);
+		$filter_type = db_escape_string( $attrs->getNamedItem('filter-type')->nodeValue);
 
 		if ($filter_type == '2') {
 			$filter = json_decode($node->nodeValue, true);
@@ -326,12 +326,12 @@ class Opml extends Handler_Protected {
 				$match_any_rule = bool_to_sql_bool($filter["match_any_rule"]);
 				$enabled = bool_to_sql_bool($filter["enabled"]);
 
-				db_query($this->link, "BEGIN");
+				db_query( "BEGIN");
 
-				db_query($this->link, "INSERT INTO ttrss_filters2 (match_any_rule,enabled,owner_uid)
+				db_query( "INSERT INTO ttrss_filters2 (match_any_rule,enabled,owner_uid)
 					VALUES ($match_any_rule, $enabled,".$_SESSION["uid"].")");
 
-				$result = db_query($this->link, "SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
+				$result = db_query( "SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
 					owner_uid = ".$_SESSION["uid"]);
 				$filter_id = db_fetch_result($result, 0, "id");
 
@@ -343,14 +343,14 @@ class Opml extends Handler_Protected {
 						$cat_id = "NULL";
 
 						if (!$rule["cat_filter"]) {
-							$tmp_result = db_query($this->link, "SELECT id FROM ttrss_feeds
-								WHERE title = '".db_escape_string($this->link, $rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
+							$tmp_result = db_query( "SELECT id FROM ttrss_feeds
+								WHERE title = '".db_escape_string( $rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
 							if (db_num_rows($tmp_result) > 0) {
 								$feed_id = db_fetch_result($tmp_result, 0, "id");
 							}
 						} else {
-							$tmp_result = db_query($this->link, "SELECT id FROM ttrss_feed_categories
-								WHERE title = '".db_escape_string($this->link, $rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
+							$tmp_result = db_query( "SELECT id FROM ttrss_feed_categories
+								WHERE title = '".db_escape_string( $rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
 
 							if (db_num_rows($tmp_result) > 0) {
 								$cat_id = db_fetch_result($tmp_result, 0, "id");
@@ -358,24 +358,24 @@ class Opml extends Handler_Protected {
 						}
 
 						$cat_filter = bool_to_sql_bool($rule["cat_filter"]);
-						$reg_exp = db_escape_string($this->link, $rule["reg_exp"]);
+						$reg_exp = db_escape_string( $rule["reg_exp"]);
 						$filter_type = (int)$rule["filter_type"];
 
-						db_query($this->link, "INSERT INTO ttrss_filters2_rules (feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter)
+						db_query( "INSERT INTO ttrss_filters2_rules (feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter)
 							VALUES ($feed_id, $cat_id, $filter_id, $filter_type, '$reg_exp', $cat_filter)");
 					}
 
 					foreach ($filter["actions"] as $action) {
 
 						$action_id = (int)$action["action_id"];
-						$action_param = db_escape_string($this->link, $action["action_param"]);
+						$action_param = db_escape_string( $action["action_param"]);
 
-						db_query($this->link, "INSERT INTO ttrss_filters2_actions (filter_id,action_id,action_param)
+						db_query( "INSERT INTO ttrss_filters2_actions (filter_id,action_id,action_param)
 							VALUES ($filter_id, $action_id, '$action_param')");
 					}
 				}
 
-				db_query($this->link, "COMMIT");
+				db_query( "COMMIT");
 			}
 		}
 	}
@@ -383,22 +383,22 @@ class Opml extends Handler_Protected {
 	private function opml_import_category($doc, $root_node, $owner_uid, $parent_id) {
 		$body = $doc->getElementsByTagName('body');
 
-		$default_cat_id = (int) get_feed_category($this->link, 'Imported feeds', false);
+		$default_cat_id = (int) get_feed_category( 'Imported feeds', false);
 
 		if ($root_node) {
-			$cat_title = db_escape_string($this->link, mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250));
+			$cat_title = db_escape_string( mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250));
 
 			if (!$cat_title)
-				$cat_title = db_escape_string($this->link, mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250));
+				$cat_title = db_escape_string( mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250));
 
 			if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
-				$cat_id = get_feed_category($this->link, $cat_title, $parent_id);
-				db_query($this->link, "BEGIN");
+				$cat_id = get_feed_category( $cat_title, $parent_id);
+				db_query( "BEGIN");
 				if ($cat_id === false) {
-					add_feed_category($this->link, $cat_title, $parent_id);
-					$cat_id = get_feed_category($this->link, $cat_title, $parent_id);
+					add_feed_category( $cat_title, $parent_id);
+					$cat_id = get_feed_category( $cat_title, $parent_id);
 				}
-				db_query($this->link, "COMMIT");
+				db_query( "COMMIT");
 			} else {
 				$cat_id = 0;
 			}
@@ -418,12 +418,12 @@ class Opml extends Handler_Protected {
 		foreach ($outlines as $node) {
 			if ($node->hasAttributes() && strtolower($node->tagName) == "outline") {
 				$attrs = $node->attributes;
-				$node_cat_title = db_escape_string($this->link, $attrs->getNamedItem('text')->nodeValue);
+				$node_cat_title = db_escape_string( $attrs->getNamedItem('text')->nodeValue);
 
 				if (!$node_cat_title)
-					$node_cat_title = db_escape_string($this->link, $attrs->getNamedItem('title')->nodeValue);
+					$node_cat_title = db_escape_string( $attrs->getNamedItem('title')->nodeValue);
 
-				$node_feed_url = db_escape_string($this->link, $attrs->getNamedItem('xmlUrl')->nodeValue);
+				$node_feed_url = db_escape_string( $attrs->getNamedItem('xmlUrl')->nodeValue);
 
 				if ($node_cat_title && !$node_feed_url) {
 					$this->opml_import_category($doc, $node, $owner_uid, $cat_id);
@@ -504,11 +504,11 @@ class Opml extends Handler_Protected {
 		print "$msg<br/>";
 	}
 
-	static function opml_publish_url($link){
+	static function opml_publish_url(){
 
 		$url_path = get_self_url_prefix();
 		$url_path .= "/opml.php?op=publish&key=" .
-			get_feed_access_key($link, 'OPML:Publish', false, $_SESSION["uid"]);
+			get_feed_access_key( 'OPML:Publish', false, $_SESSION["uid"]);
 
 		return $url_path;
 	}
diff --git a/classes/plugin.php b/classes/plugin.php
index e655a2062..60f127633 100644
--- a/classes/plugin.php
+++ b/classes/plugin.php
@@ -1,10 +1,10 @@
 <?php
 class Plugin {
-	private $link;
+	private $dbh;
 	private $host;
 
 	function init($host) {
-		$this->link = $host->get_link();
+		$this->dbh = $host->get_dbh();
 		$this->host = $host;
 	}
 
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index bbfa2ca2a..36c3dfbb3 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -1,6 +1,6 @@
 <?php
 class PluginHost {
-	private $link;
+	private $dbh;
 	private $hooks = array();
 	private $plugins = array();
 	private $handlers = array();
@@ -35,9 +35,8 @@ class PluginHost {
 	const KIND_SYSTEM = 2;
 	const KIND_USER = 3;
 
-	function __construct($link) {
-		$this->link = $link;
-
+	function __construct($dbh) {
+		$this->dbh = $dbh;
 		$this->storage = $_SESSION["plugin_storage"];
 
 		if (!$this->storage) $this->storage = array();
@@ -48,8 +47,8 @@ class PluginHost {
 		$this->plugins[$name] = $plugin;
 	}
 
-	function get_link() {
-		return $this->link;
+	function get_dbh() {
+		return $this->dbh;
 	}
 
 	function get_plugins() {
@@ -223,9 +222,9 @@ class PluginHost {
 
 	function load_data($force = false) {
 		if ($this->owner_uid && (!$_SESSION["plugin_storage"] || $force))  {
-			$plugin = db_escape_string($this->link, $plugin);
+			$plugin = db_escape_string( $plugin);
 
-			$result = db_query($this->link, "SELECT name, content FROM ttrss_plugin_storage
+			$result = db_query( "SELECT name, content FROM ttrss_plugin_storage
 				WHERE owner_uid = '".$this->owner_uid."'");
 
 			while ($line = db_fetch_assoc($result)) {
@@ -238,29 +237,29 @@ class PluginHost {
 
 	private function save_data($plugin) {
 		if ($this->owner_uid) {
-			$plugin = db_escape_string($this->link, $plugin);
+			$plugin = db_escape_string( $plugin);
 
-			db_query($this->link, "BEGIN");
+			db_query( "BEGIN");
 
-			$result = db_query($this->link,"SELECT id FROM ttrss_plugin_storage WHERE
+			$result = db_query("SELECT id FROM ttrss_plugin_storage WHERE
 				owner_uid= '".$this->owner_uid."' AND name = '$plugin'");
 
 			if (!isset($this->storage[$plugin]))
 				$this->storage[$plugin] = array();
 
-			$content = db_escape_string($this->link, serialize($this->storage[$plugin]));
+			$content = db_escape_string( serialize($this->storage[$plugin]));
 
 			if (db_num_rows($result) != 0) {
-				db_query($this->link, "UPDATE ttrss_plugin_storage SET content = '$content'
+				db_query( "UPDATE ttrss_plugin_storage SET content = '$content'
 					WHERE owner_uid= '".$this->owner_uid."' AND name = '$plugin'");
 
 			} else {
-				db_query($this->link, "INSERT INTO ttrss_plugin_storage
+				db_query( "INSERT INTO ttrss_plugin_storage
 					(name,owner_uid,content) VALUES
 					('$plugin','".$this->owner_uid."','$content')");
 			}
 
-			db_query($this->link, "COMMIT");
+			db_query( "COMMIT");
 		}
 	}
 
@@ -299,7 +298,7 @@ class PluginHost {
 
 			unset($this->storage[$idx]);
 
-			db_query($this->link, "DELETE FROM ttrss_plugin_storage WHERE name = '$idx'
+			db_query( "DELETE FROM ttrss_plugin_storage WHERE name = '$idx'
 				AND owner_uid = " . $this->owner_uid);
 
 			$_SESSION["plugin_storage"] = $this->storage;
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 9dc515556..27e03f0e2 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -15,11 +15,11 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function renamecat() {
-		$title = db_escape_string($this->link, $_REQUEST['title']);
-		$id = db_escape_string($this->link, $_REQUEST['id']);
+		$title = db_escape_string( $_REQUEST['title']);
+		$id = db_escape_string( $_REQUEST['id']);
 
 		if ($title) {
-			db_query($this->link, "UPDATE ttrss_feed_categories SET
+			db_query( "UPDATE ttrss_feed_categories SET
 				title = '$title' WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		}
 		return;
@@ -37,11 +37,11 @@ class Pref_Feeds extends Handler_Protected {
 		// first one is set by API
 		$show_empty_cats = $_REQUEST['force_show_empty'] ||
 			($_REQUEST['mode'] != 2 && !$search &&
-				get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS'));
+				get_pref( '_PREFS_SHOW_EMPTY_CATS'));
 
 		$items = array();
 
-		$result = db_query($this->link, "SELECT id, title FROM ttrss_feed_categories
+		$result = db_query( "SELECT id, title FROM ttrss_feed_categories
 				WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat = '$cat_id' ORDER BY order_id, title");
 
 		while ($line = db_fetch_assoc($result)) {
@@ -65,7 +65,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		}
 
-		$feed_result = db_query($this->link, "SELECT id, title, last_error,
+		$feed_result = db_query( "SELECT id, title, last_error,
 			".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 			FROM ttrss_feeds
 			WHERE cat_id = '$cat_id' AND owner_uid = ".$_SESSION["uid"].
@@ -80,7 +80,7 @@ class Pref_Feeds extends Handler_Protected {
 			$feed['unread'] = 0;
 			$feed['error'] = $feed_line['last_error'];
 			$feed['icon'] = getFeedIcon($feed_line['id']);
-			$feed['param'] = make_local_datetime($this->link,
+			$feed['param'] = make_local_datetime(
 				$feed_line['last_updated'], true);
 
 			array_push($items, $feed);
@@ -108,7 +108,7 @@ class Pref_Feeds extends Handler_Protected {
 		$root['items'] = array();
 		$root['type'] = 'category';
 
-		$enable_cats = get_pref($this->link, 'ENABLE_FEED_CATS');
+		$enable_cats = get_pref( 'ENABLE_FEED_CATS');
 
 		if ($_REQUEST['mode'] == 2) {
 
@@ -154,12 +154,12 @@ class Pref_Feeds extends Handler_Protected {
 				$root['items'] = array_merge($root['items'], $cat['items']);
 			}
 
-			$result = db_query($this->link, "SELECT * FROM
+			$result = db_query( "SELECT * FROM
 				ttrss_labels2 WHERE owner_uid = ".$_SESSION['uid']." ORDER by caption");
 
 			if (db_num_rows($result) > 0) {
 
-				if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
+				if (get_pref( 'ENABLE_FEED_CATS')) {
 					$cat = $this->feedlist_init_cat(-2);
 				} else {
 					$cat['items'] = array();
@@ -188,9 +188,9 @@ class Pref_Feeds extends Handler_Protected {
 		if ($enable_cats) {
 			$show_empty_cats = $_REQUEST['force_show_empty'] ||
 				($_REQUEST['mode'] != 2 && !$search &&
-				get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS'));
+				get_pref( '_PREFS_SHOW_EMPTY_CATS'));
 
-			$result = db_query($this->link, "SELECT id, title FROM ttrss_feed_categories
+			$result = db_query( "SELECT id, title FROM ttrss_feed_categories
 				WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat IS NULL ORDER BY order_id, title");
 
 			while ($line = db_fetch_assoc($result)) {
@@ -226,7 +226,7 @@ class Pref_Feeds extends Handler_Protected {
 			$cat['unread'] = 0;
 			$cat['child_unread'] = 0;
 
-			$feed_result = db_query($this->link, "SELECT id, title,last_error,
+			$feed_result = db_query( "SELECT id, title,last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 				FROM ttrss_feeds
 				WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"].
@@ -240,7 +240,7 @@ class Pref_Feeds extends Handler_Protected {
 				$feed['checkbox'] = false;
 				$feed['error'] = $feed_line['last_error'];
 				$feed['icon'] = getFeedIcon($feed_line['id']);
-				$feed['param'] = make_local_datetime($this->link,
+				$feed['param'] = make_local_datetime(
 					$feed_line['last_updated'], true);
 				$feed['unread'] = 0;
 				$feed['type'] = 'feed';
@@ -257,7 +257,7 @@ class Pref_Feeds extends Handler_Protected {
 			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
 
 		} else {
-			$feed_result = db_query($this->link, "SELECT id, title, last_error,
+			$feed_result = db_query( "SELECT id, title, last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 				FROM ttrss_feeds
 				WHERE owner_uid = ".$_SESSION["uid"].
@@ -271,7 +271,7 @@ class Pref_Feeds extends Handler_Protected {
 				$feed['checkbox'] = false;
 				$feed['error'] = $feed_line['last_error'];
 				$feed['icon'] = getFeedIcon($feed_line['id']);
-				$feed['param'] = make_local_datetime($this->link,
+				$feed['param'] = make_local_datetime(
 					$feed_line['last_updated'], true);
 				$feed['unread'] = 0;
 				$feed['type'] = 'feed';
@@ -296,20 +296,20 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function catsortreset() {
-		db_query($this->link, "UPDATE ttrss_feed_categories
+		db_query( "UPDATE ttrss_feed_categories
 				SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
 		return;
 	}
 
 	function feedsortreset() {
-		db_query($this->link, "UPDATE ttrss_feeds
+		db_query( "UPDATE ttrss_feeds
 				SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
 		return;
 	}
 
 	function togglehiddenfeedcats() {
-		set_pref($this->link, '_PREFS_SHOW_EMPTY_CATS',
-			(get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS') ? 'false' : 'true'));
+		set_pref( '_PREFS_SHOW_EMPTY_CATS',
+			(get_pref( '_PREFS_SHOW_EMPTY_CATS') ? 'false' : 'true'));
 	}
 
 	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
@@ -326,12 +326,12 @@ class Pref_Feeds extends Handler_Protected {
 		if ($item_id != 'root') {
 			if ($parent_id && $parent_id != 'root') {
 				$parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
-				$parent_qpart = db_escape_string($this->link, $parent_bare_id);
+				$parent_qpart = db_escape_string( $parent_bare_id);
 			} else {
 				$parent_qpart = 'NULL';
 			}
 
-			db_query($this->link, "UPDATE ttrss_feed_categories
+			db_query( "UPDATE ttrss_feed_categories
 				SET parent_cat = $parent_qpart WHERE id = '$bare_item_id' AND
 				owner_uid = " . $_SESSION["uid"]);
 		}
@@ -352,12 +352,12 @@ class Pref_Feeds extends Handler_Protected {
 					if (strpos($id, "FEED") === 0) {
 
 						$cat_id = ($item_id != "root") ?
-							db_escape_string($this->link, $bare_item_id) : "NULL";
+							db_escape_string( $bare_item_id) : "NULL";
 
 						$cat_qpart = ($cat_id != 0) ? "cat_id = '$cat_id'" :
 							"cat_id = NULL";
 
-						db_query($this->link, "UPDATE ttrss_feeds
+						db_query( "UPDATE ttrss_feeds
 							SET order_id = $order_id, $cat_qpart
 							WHERE id = '$bare_id' AND
 								owner_uid = " . $_SESSION["uid"]);
@@ -367,12 +367,12 @@ class Pref_Feeds extends Handler_Protected {
 							$nest_level+1);
 
 						if ($item_id != 'root') {
-							$parent_qpart = db_escape_string($this->link, $bare_id);
+							$parent_qpart = db_escape_string( $bare_id);
 						} else {
 							$parent_qpart = 'NULL';
 						}
 
-						db_query($this->link, "UPDATE ttrss_feed_categories
+						db_query( "UPDATE ttrss_feed_categories
 								SET order_id = '$order_id' WHERE id = '$bare_id' AND
 								owner_uid = " . $_SESSION["uid"]);
 					}
@@ -424,7 +424,7 @@ class Pref_Feeds extends Handler_Protected {
 				++$cat_order_id;
 
 				if ($bare_id > 0) {
-					db_query($this->link, "UPDATE ttrss_feed_categories
+					db_query( "UPDATE ttrss_feed_categories
 						SET order_id = '$cat_order_id' WHERE id = '$bare_id' AND
 						owner_uid = " . $_SESSION["uid"]);
 				}
@@ -441,7 +441,7 @@ class Pref_Feeds extends Handler_Protected {
 						else
 							$cat_query = "cat_id = NULL";
 
-						db_query($this->link, "UPDATE ttrss_feeds
+						db_query( "UPDATE ttrss_feeds
 							SET order_id = '$feed_order_id',
 							$cat_query
 							WHERE id = '$feed_id' AND
@@ -457,15 +457,15 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function removeicon() {
-		$feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]);
+		$feed_id = db_escape_string( $_REQUEST["feed_id"]);
 
-		$result = db_query($this->link, "SELECT id FROM ttrss_feeds
+		$result = db_query( "SELECT id FROM ttrss_feeds
 			WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
 
 		if (db_num_rows($result) != 0) {
 			@unlink(ICONS_DIR . "/$feed_id.ico");
 
-			db_query($this->link, "UPDATE ttrss_feeds SET favicon_avg_color = NULL
+			db_query( "UPDATE ttrss_feeds SET favicon_avg_color = NULL
 				where id = '$feed_id'");
 		}
 
@@ -491,12 +491,12 @@ class Pref_Feeds extends Handler_Protected {
 		}
 
 		$icon_file = $tmp_file;
-		$feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]);
+		$feed_id = db_escape_string( $_REQUEST["feed_id"]);
 
 		if (is_file($icon_file) && $feed_id) {
 			if (filesize($icon_file) < 20000) {
 
-				$result = db_query($this->link, "SELECT id FROM ttrss_feeds
+				$result = db_query( "SELECT id FROM ttrss_feeds
 					WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
 
 				if (db_num_rows($result) != 0) {
@@ -505,10 +505,10 @@ class Pref_Feeds extends Handler_Protected {
 
 						require_once "colors.php";
 
-						$favicon_color = db_escape_string($this->link,
+						$favicon_color = db_escape_string(
 							calculate_avg_color(ICONS_DIR . "/$feed_id.ico"));
 
-						db_query($this->link, "UPDATE ttrss_feeds SET
+						db_query( "UPDATE ttrss_feeds SET
 							favicon_avg_color = '$favicon_color'
 							WHERE id = '$feed_id'");
 
@@ -536,9 +536,9 @@ class Pref_Feeds extends Handler_Protected {
 		global $purge_intervals;
 		global $update_intervals;
 
-		$feed_id = db_escape_string($this->link, $_REQUEST["id"]);
+		$feed_id = db_escape_string( $_REQUEST["id"]);
 
-		$result = db_query($this->link,
+		$result = db_query(
 			"SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND
 				owner_uid = " . $_SESSION["uid"]);
 
@@ -585,7 +585,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		/* Category */
 
-		if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
+		if (get_pref( 'ENABLE_FEED_CATS')) {
 
 			$cat_id = db_fetch_result($result, 0, "cat_id");
 
@@ -593,7 +593,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print __('Place in category:') . " ";
 
-			print_feed_cat_select($this->link, "cat_id", $cat_id,
+			print_feed_cat_select( "cat_id", $cat_id,
 				'dojoType="dijit.form.Select"');
 		}
 
@@ -782,7 +782,7 @@ class Pref_Feeds extends Handler_Protected {
 		global $purge_intervals;
 		global $update_intervals;
 
-		$feed_ids = db_escape_string($this->link, $_REQUEST["ids"]);
+		$feed_ids = db_escape_string( $_REQUEST["ids"]);
 
 		print_notice("Enable the options you wish to apply using checkboxes on the right:");
 
@@ -816,13 +816,13 @@ class Pref_Feeds extends Handler_Protected {
 
 		/* Category */
 
-		if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
+		if (get_pref( 'ENABLE_FEED_CATS')) {
 
 			print "<br/>";
 
 			print __('Place in category:') . " ";
 
-			print_feed_cat_select($this->link, "cat_id", $cat_id,
+			print_feed_cat_select( "cat_id", $cat_id,
 				'disabled="1" dojoType="dijit.form.Select"');
 
 			$this->batch_edit_cbox("cat_id");
@@ -938,27 +938,27 @@ class Pref_Feeds extends Handler_Protected {
 
 	function editsaveops($batch) {
 
-		$feed_title = db_escape_string($this->link, trim($_POST["title"]));
-		$feed_link = db_escape_string($this->link, trim($_POST["feed_url"]));
-		$upd_intl = (int) db_escape_string($this->link, $_POST["update_interval"]);
-		$purge_intl = (int) db_escape_string($this->link, $_POST["purge_interval"]);
-		$feed_id = (int) db_escape_string($this->link, $_POST["id"]); /* editSave */
-		$feed_ids = db_escape_string($this->link, $_POST["ids"]); /* batchEditSave */
-		$cat_id = (int) db_escape_string($this->link, $_POST["cat_id"]);
-		$auth_login = db_escape_string($this->link, trim($_POST["auth_login"]));
+		$feed_title = db_escape_string( trim($_POST["title"]));
+		$feed_link = db_escape_string( trim($_POST["feed_url"]));
+		$upd_intl = (int) db_escape_string( $_POST["update_interval"]);
+		$purge_intl = (int) db_escape_string( $_POST["purge_interval"]);
+		$feed_id = (int) db_escape_string( $_POST["id"]); /* editSave */
+		$feed_ids = db_escape_string( $_POST["ids"]); /* batchEditSave */
+		$cat_id = (int) db_escape_string( $_POST["cat_id"]);
+		$auth_login = db_escape_string( trim($_POST["auth_login"]));
 		$auth_pass = trim($_POST["auth_pass"]);
-		$private = checkbox_to_sql_bool(db_escape_string($this->link, $_POST["private"]));
+		$private = checkbox_to_sql_bool(db_escape_string( $_POST["private"]));
 		$include_in_digest = checkbox_to_sql_bool(
-			db_escape_string($this->link, $_POST["include_in_digest"]));
+			db_escape_string( $_POST["include_in_digest"]));
 		$cache_images = checkbox_to_sql_bool(
-			db_escape_string($this->link, $_POST["cache_images"]));
+			db_escape_string( $_POST["cache_images"]));
 		$hide_images = checkbox_to_sql_bool(
-			db_escape_string($this->link, $_POST["hide_images"]));
+			db_escape_string( $_POST["hide_images"]));
 		$always_display_enclosures = checkbox_to_sql_bool(
-			db_escape_string($this->link, $_POST["always_display_enclosures"]));
+			db_escape_string( $_POST["always_display_enclosures"]));
 
 		$mark_unread_on_update = checkbox_to_sql_bool(
-			db_escape_string($this->link, $_POST["mark_unread_on_update"]));
+			db_escape_string( $_POST["mark_unread_on_update"]));
 
 		if (strlen(FEED_CRYPT_KEY) > 0) {
 			require_once "crypt.php";
@@ -968,9 +968,9 @@ class Pref_Feeds extends Handler_Protected {
 			$auth_pass_encrypted = 'false';
 		}
 
-		$auth_pass = db_escape_string($this->link, $auth_pass);
+		$auth_pass = db_escape_string( $auth_pass);
 
-		if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
+		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'";
@@ -985,7 +985,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		if (!$batch) {
 
-			$result = db_query($this->link, "UPDATE ttrss_feeds SET
+			$result = db_query( "UPDATE ttrss_feeds SET
 				$category_qpart
 				title = '$feed_title', feed_url = '$feed_link',
 				update_interval = '$upd_intl',
@@ -1010,7 +1010,7 @@ class Pref_Feeds extends Handler_Protected {
 				}
 			}
 
-			db_query($this->link, "BEGIN");
+			db_query( "BEGIN");
 
 			foreach (array_keys($feed_data) as $k) {
 
@@ -1073,23 +1073,23 @@ class Pref_Feeds extends Handler_Protected {
 				}
 
 				if ($qpart) {
-					db_query($this->link,
+					db_query(
 						"UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids)
 						AND owner_uid = " . $_SESSION["uid"]);
 					print "<br/>";
 				}
 			}
 
-			db_query($this->link, "COMMIT");
+			db_query( "COMMIT");
 		}
 		return;
 	}
 
 	function resetPubSub() {
 
-		$ids = db_escape_string($this->link, $_REQUEST["ids"]);
+		$ids = db_escape_string( $_REQUEST["ids"]);
 
-		db_query($this->link, "UPDATE ttrss_feeds SET pubsub_state = 0 WHERE id IN ($ids)
+		db_query( "UPDATE ttrss_feeds SET pubsub_state = 0 WHERE id IN ($ids)
 			AND owner_uid = " . $_SESSION["uid"]);
 
 		return;
@@ -1097,30 +1097,30 @@ class Pref_Feeds extends Handler_Protected {
 
 	function remove() {
 
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			Pref_Feeds::remove_feed($this->link, $id, $_SESSION["uid"]);
+			Pref_Feeds::remove_feed( $id, $_SESSION["uid"]);
 		}
 
 		return;
 	}
 
 	function clear() {
-		$id = db_escape_string($this->link, $_REQUEST["id"]);
-		$this->clear_feed_articles($this->link, $id);
+		$id = db_escape_string( $_REQUEST["id"]);
+		$this->clear_feed_articles( $id);
 	}
 
 	function rescore() {
 		require_once "rssfuncs.php";
 
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 
-			$filters = load_filters($this->link, $id, $_SESSION["uid"], 6);
+			$filters = load_filters( $id, $_SESSION["uid"], 6);
 
-			$result = db_query($this->link, "SELECT
+			$result = db_query( "SELECT
 				title, content, link, ref_id, author,".
 				SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
 			  	FROM
@@ -1133,7 +1133,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			while ($line = db_fetch_assoc($result)) {
 
-				$tags = get_article_tags($this->link, $line["ref_id"]);
+				$tags = get_article_tags( $line["ref_id"]);
 
 				$article_filters = get_article_filters($filters, $line['title'],
 					$line['content'], $line['link'], strtotime($line['updated']),
@@ -1148,15 +1148,15 @@ class Pref_Feeds extends Handler_Protected {
 
 			foreach (array_keys($scores) as $s) {
 				if ($s > 1000) {
-					db_query($this->link, "UPDATE ttrss_user_entries SET score = '$s',
+					db_query( "UPDATE ttrss_user_entries SET score = '$s',
 						marked = true WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				} else if ($s < -500) {
-					db_query($this->link, "UPDATE ttrss_user_entries SET score = '$s',
+					db_query( "UPDATE ttrss_user_entries SET score = '$s',
 						unread = false WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				} else {
-					db_query($this->link, "UPDATE ttrss_user_entries SET score = '$s' WHERE
+					db_query( "UPDATE ttrss_user_entries SET score = '$s' WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				}
 			}
@@ -1168,16 +1168,16 @@ class Pref_Feeds extends Handler_Protected {
 
 	function rescoreAll() {
 
-		$result = db_query($this->link,
+		$result = db_query(
 			"SELECT id FROM ttrss_feeds WHERE owner_uid = " . $_SESSION['uid']);
 
 		while ($feed_line = db_fetch_assoc($result)) {
 
 			$id = $feed_line["id"];
 
-			$filters = load_filters($this->link, $id, $_SESSION["uid"], 6);
+			$filters = load_filters( $id, $_SESSION["uid"], 6);
 
-			$tmp_result = db_query($this->link, "SELECT
+			$tmp_result = db_query( "SELECT
 				title, content, link, ref_id, author,".
 				  	SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
 					FROM
@@ -1190,7 +1190,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			while ($line = db_fetch_assoc($tmp_result)) {
 
-				$tags = get_article_tags($this->link, $line["ref_id"]);
+				$tags = get_article_tags( $line["ref_id"]);
 
 				$article_filters = get_article_filters($filters, $line['title'],
 					$line['content'], $line['link'], strtotime($line['updated']),
@@ -1205,11 +1205,11 @@ class Pref_Feeds extends Handler_Protected {
 
 			foreach (array_keys($scores) as $s) {
 				if ($s > 1000) {
-					db_query($this->link, "UPDATE ttrss_user_entries SET score = '$s',
+					db_query( "UPDATE ttrss_user_entries SET score = '$s',
 						marked = true WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				} else {
-					db_query($this->link, "UPDATE ttrss_user_entries SET score = '$s' WHERE
+					db_query( "UPDATE ttrss_user_entries SET score = '$s' WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				}
 			}
@@ -1220,9 +1220,9 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function categorize() {
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
-		$cat_id = db_escape_string($this->link, $_REQUEST["cat_id"]);
+		$cat_id = db_escape_string( $_REQUEST["cat_id"]);
 
 		if ($cat_id == 0) {
 			$cat_id_qpart = 'NULL';
@@ -1230,30 +1230,30 @@ class Pref_Feeds extends Handler_Protected {
 			$cat_id_qpart = "'$cat_id'";
 		}
 
-		db_query($this->link, "BEGIN");
+		db_query( "BEGIN");
 
 		foreach ($ids as $id) {
 
-			db_query($this->link, "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
+			db_query( "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
 				WHERE id = '$id'
 			  	AND owner_uid = " . $_SESSION["uid"]);
 
 		}
 
-		db_query($this->link, "COMMIT");
+		db_query( "COMMIT");
 	}
 
 	function removeCat() {
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 		foreach ($ids as $id) {
-			$this->remove_feed_category($this->link, $id, $_SESSION["uid"]);
+			$this->remove_feed_category( $id, $_SESSION["uid"]);
 		}
 	}
 
 	function addCat() {
-		$feed_cat = db_escape_string($this->link, trim($_REQUEST["cat"]));
+		$feed_cat = db_escape_string( trim($_REQUEST["cat"]));
 
-		add_feed_category($this->link, $feed_cat);
+		add_feed_category( $feed_cat);
 	}
 
 	function index() {
@@ -1261,7 +1261,7 @@ 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 = db_query($this->link, "SELECT COUNT(id) AS num_errors
+		$result = db_query( "SELECT COUNT(id) AS num_errors
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
 		$num_errors = db_fetch_result($result, 0, "num_errors");
@@ -1279,7 +1279,7 @@ class Pref_Feeds extends Handler_Protected {
 			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
 		}
 
-		$result = db_query($this->link, "SELECT COUNT(*) AS num_inactive FROM ttrss_feeds WHERE
+		$result = db_query( "SELECT COUNT(*) 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
@@ -1293,7 +1293,7 @@ class Pref_Feeds extends Handler_Protected {
 					__("Inactive feeds") . "</button>";
 		}
 
-		$feed_search = db_escape_string($this->link, $_REQUEST["search"]);
+		$feed_search = db_escape_string( $_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_feed_search"] = $feed_search;
@@ -1336,7 +1336,7 @@ class Pref_Feeds extends Handler_Protected {
 			.__('Unsubscribe')."</div> ";
 		print "</div></div>";
 
-		if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
+		if (get_pref( 'ENABLE_FEED_CATS')) {
 			print "<div dojoType=\"dijit.form.DropDownButton\">".
 					"<span>" . __('Categories')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
@@ -1522,14 +1522,14 @@ class Pref_Feeds extends Handler_Protected {
 		$cat_id = (int) $cat_id;
 
 		if ($cat_id > 0) {
-			$cat_unread = ccache_find($this->link, $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($this->link, $cat_id);
+			$cat_unread = getCategoryUnread( $cat_id);
 		}
 
 		$obj['id'] = 'CAT:' . $cat_id;
 		$obj['items'] = array();
-		$obj['name'] = getCategoryTitle($this->link, $cat_id);
+		$obj['name'] = getCategoryTitle( $cat_id);
 		$obj['type'] = 'category';
 		$obj['unread'] = (int) $cat_unread;
 		$obj['bare_id'] = $cat_id;
@@ -1542,10 +1542,10 @@ class Pref_Feeds extends Handler_Protected {
 		$feed_id = (int) $feed_id;
 
 		if (!$title)
-			$title = getFeedTitle($this->link, $feed_id, false);
+			$title = getFeedTitle( $feed_id, false);
 
 		if ($unread === false)
-			$unread = getFeedUnread($this->link, $feed_id, false);
+			$unread = getFeedUnread( $feed_id, false);
 
 		$obj['id'] = 'FEED:' . $feed_id;
 		$obj['name'] = $title;
@@ -1567,7 +1567,7 @@ class Pref_Feeds extends Handler_Protected {
 			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
 		}
 
-		$result = db_query($this->link, "SELECT ttrss_feeds.title, ttrss_feeds.site_url,
+		$result = db_query( "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
@@ -1621,7 +1621,7 @@ class Pref_Feeds extends Handler_Protected {
 				htmlspecialchars($line["title"])."</a>";
 
 			print "</td><td class=\"insensitive\" align='right'>";
-			print make_local_datetime($this->link, $line['last_article'], false);
+			print make_local_datetime( $line['last_article'], false);
 			print "</td>";
 			print "</tr>";
 
@@ -1648,7 +1648,7 @@ class Pref_Feeds extends Handler_Protected {
 		print "<h2>" . __("These feeds have not been updated because of errors:") .
 			"</h2>";
 
-		$result = db_query($this->link, "SELECT id,title,feed_url,last_error,site_url
+		$result = db_query( "SELECT id,title,feed_url,last_error,site_url
 		FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
 		print "<div dojoType=\"dijit.Toolbar\">";
@@ -1722,53 +1722,53 @@ class Pref_Feeds extends Handler_Protected {
 	 * @param integer $id The id of the feed to purge.
 	 * @return void
 	 */
-	private function clear_feed_articles($link, $id) {
+	private function clear_feed_articles($id) {
 
 		if ($id != 0) {
-			$result = db_query($link, "DELETE FROM ttrss_user_entries
+			$result = db_query( "DELETE FROM ttrss_user_entries
 			WHERE feed_id = '$id' AND marked = false AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			$result = db_query($link, "DELETE FROM ttrss_user_entries
+			$result = db_query( "DELETE FROM ttrss_user_entries
 			WHERE feed_id IS NULL AND marked = false AND owner_uid = " . $_SESSION["uid"]);
 		}
 
-		$result = db_query($link, "DELETE FROM ttrss_entries WHERE
+		$result = db_query( "DELETE FROM ttrss_entries WHERE
 			(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
 
-		ccache_update($link, $id, $_SESSION['uid']);
+		ccache_update( $id, $_SESSION['uid']);
 	} // function clear_feed_articles
 
-	private function remove_feed_category($link, $id, $owner_uid) {
+	private function remove_feed_category( $id, $owner_uid) {
 
-		db_query($link, "DELETE FROM ttrss_feed_categories
+		db_query( "DELETE FROM ttrss_feed_categories
 			WHERE id = '$id' AND owner_uid = $owner_uid");
 
-		ccache_remove($link, $id, $owner_uid, true);
+		ccache_remove( $id, $owner_uid, true);
 	}
 
-	static function remove_feed($link, $id, $owner_uid) {
+	static function remove_feed( $id, $owner_uid) {
 
 		if ($id > 0) {
 
 			/* save starred articles in Archived feed */
 
-			db_query($link, "BEGIN");
+			db_query( "BEGIN");
 
 			/* prepare feed if necessary */
 
-			$result = db_query($link, "SELECT feed_url FROM ttrss_feeds WHERE id = $id
+			$result = db_query( "SELECT feed_url FROM ttrss_feeds WHERE id = $id
 				AND owner_uid = $owner_uid");
 
-			$feed_url = db_escape_string($link, db_fetch_result($result, 0, "feed_url"));
+			$feed_url = db_escape_string( db_fetch_result($result, 0, "feed_url"));
 
-			$result = db_query($link, "SELECT id FROM ttrss_archived_feeds
+			$result = db_query( "SELECT id FROM ttrss_archived_feeds
 				WHERE feed_url = '$feed_url' AND owner_uid = $owner_uid");
 
 			if (db_num_rows($result) == 0) {
-				$result = db_query($link, "SELECT MAX(id) AS id FROM ttrss_archived_feeds");
+				$result = db_query( "SELECT MAX(id) AS id FROM ttrss_archived_feeds");
 				$new_feed_id = (int)db_fetch_result($result, 0, "id") + 1;
 
-				db_query($link, "INSERT INTO ttrss_archived_feeds
+				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'");
@@ -1778,31 +1778,31 @@ class Pref_Feeds extends Handler_Protected {
 				$archive_id = db_fetch_result($result, 0, "id");
 			}
 
-			db_query($link, "UPDATE ttrss_user_entries SET feed_id = NULL,
+			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");
 
 			/* Remove access key for the feed */
 
-			db_query($link, "DELETE FROM ttrss_access_keys WHERE
+			db_query( "DELETE FROM ttrss_access_keys WHERE
 				feed_id = '$id' AND owner_uid = $owner_uid");
 
 			/* remove the feed */
 
-			db_query($link, "DELETE FROM ttrss_feeds
+			db_query( "DELETE FROM ttrss_feeds
 					WHERE id = '$id' AND owner_uid = $owner_uid");
 
-			db_query($link, "COMMIT");
+			db_query( "COMMIT");
 
 			if (file_exists(ICONS_DIR . "/$id.ico")) {
 				unlink(ICONS_DIR . "/$id.ico");
 			}
 
-			ccache_remove($link, $id, $owner_uid);
+			ccache_remove( $id, $owner_uid);
 
 		} else {
-			label_remove($link, feed_to_label_id($id), $owner_uid);
-			//ccache_remove($link, $id, $owner_uid); don't think labels are cached
+			label_remove( feed_to_label_id($id), $owner_uid);
+			//ccache_remove( $id, $owner_uid); don't think labels are cached
 		}
 	}
 
@@ -1813,9 +1813,9 @@ class Pref_Feeds extends Handler_Protected {
 		print "<table width='100%'><tr><td>
 			".__("Add one valid RSS feed per line (no feed detection is done)")."
 		</td><td align='right'>";
-		if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
+		if (get_pref( 'ENABLE_FEED_CATS')) {
 			print __('Place in category:') . " ";
-			print_feed_cat_select($this->link, "cat", false, 'dojoType="dijit.form.Select"');
+			print_feed_cat_select( "cat", false, 'dojoType="dijit.form.Select"');
 		}
 		print "</td></tr><tr><td colspan='2'>";
 		print "<textarea
@@ -1855,17 +1855,17 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function batchAddFeeds() {
-		$cat_id = db_escape_string($this->link, $_REQUEST['cat']);
+		$cat_id = db_escape_string( $_REQUEST['cat']);
 		$feeds = explode("\n", $_REQUEST['feeds']);
-		$login = db_escape_string($this->link, $_REQUEST['login']);
+		$login = db_escape_string( $_REQUEST['login']);
 		$pass = trim($_REQUEST['pass']);
 
 		foreach ($feeds as $feed) {
-			$feed = db_escape_string($this->link, trim($feed));
+			$feed = db_escape_string( trim($feed));
 
 			if (validate_feed_url($feed)) {
 
-				db_query($this->link, "BEGIN");
+				db_query( "BEGIN");
 
 				if ($cat_id == "0" || !$cat_id) {
 					$cat_qpart = "NULL";
@@ -1873,7 +1873,7 @@ class Pref_Feeds extends Handler_Protected {
 					$cat_qpart = "'$cat_id'";
 				}
 
-				$result = db_query($this->link,
+				$result = db_query(
 					"SELECT id FROM ttrss_feeds
 					WHERE feed_url = '$feed' AND owner_uid = ".$_SESSION["uid"]);
 
@@ -1885,66 +1885,66 @@ class Pref_Feeds extends Handler_Protected {
 					$auth_pass_encrypted = 'false';
 				}
 
-				$pass = db_escape_string($this->link, $pass);
+				$pass = db_escape_string( $pass);
 
 				if (db_num_rows($result) == 0) {
-					$result = db_query($this->link,
+					$result = db_query(
 						"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)");
 				}
 
-				db_query($this->link, "COMMIT");
+				db_query( "COMMIT");
 			}
 		}
 	}
 
 	function regenOPMLKey() {
-		$this->update_feed_access_key($this->link, 'OPML:Publish',
+		$this->update_feed_access_key( 'OPML:Publish',
 		false, $_SESSION["uid"]);
 
-		$new_link = Opml::opml_publish_url($this->link);
+		$new_link = Opml::opml_publish_url();
 
 		print json_encode(array("link" => $new_link));
 	}
 
 	function regenFeedKey() {
-		$feed_id = db_escape_string($this->link, $_REQUEST['id']);
-		$is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
+		$feed_id = db_escape_string( $_REQUEST['id']);
+		$is_cat = db_escape_string( $_REQUEST['is_cat']) == "true";
 
-		$new_key = $this->update_feed_access_key($this->link, $feed_id, $is_cat);
+		$new_key = $this->update_feed_access_key( $feed_id, $is_cat);
 
 		print json_encode(array("link" => $new_key));
 	}
 
 
-	private function update_feed_access_key($link, $feed_id, $is_cat, $owner_uid = false) {
+	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 = db_query($link, "SELECT access_key FROM ttrss_access_keys
+		$result = db_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 (db_num_rows($result) == 1) {
-			$key = db_escape_string($this->link, sha1(uniqid(rand(), true)));
+			$key = db_escape_string( sha1(uniqid(rand(), true)));
 
-			db_query($link, "UPDATE ttrss_access_keys SET access_key = '$key'
+			db_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($link, $feed_id, $is_cat, $owner_uid);
+			return get_feed_access_key( $feed_id, $is_cat, $owner_uid);
 		}
 	}
 
 	// Silent
 	function clearKeys() {
-		db_query($this->link, "DELETE FROM ttrss_access_keys WHERE
+		db_query( "DELETE FROM ttrss_access_keys WHERE
 			owner_uid = " . $_SESSION["uid"]);
 	}
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 586626dd7..12c2f271c 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -9,7 +9,7 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	function filtersortreset() {
-		db_query($this->link, "UPDATE ttrss_filters2
+		db_query( "UPDATE ttrss_filters2
 				SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
 		return;
 	}
@@ -31,7 +31,7 @@ class Pref_Filters extends Handler_Protected {
 
 				if ($filter_id > 0) {
 
-					db_query($this->link, "UPDATE ttrss_filters2 SET
+					db_query( "UPDATE ttrss_filters2 SET
 						order_id = $index WHERE id = '$filter_id' AND
 						owner_uid = " .$_SESSION["uid"]);
 
@@ -49,13 +49,13 @@ class Pref_Filters extends Handler_Protected {
 
 		$filter["enabled"] = true;
 		$filter["match_any_rule"] = sql_bool_to_bool(
-			checkbox_to_sql_bool(db_escape_string($this->link, $_REQUEST["match_any_rule"])));
+			checkbox_to_sql_bool(db_escape_string( $_REQUEST["match_any_rule"])));
 		$filter["inverse"] = sql_bool_to_bool(
-			checkbox_to_sql_bool(db_escape_string($this->link, $_REQUEST["inverse"])));
+			checkbox_to_sql_bool(db_escape_string( $_REQUEST["inverse"])));
 
 		$filter["rules"] = array();
 
-		$result = db_query($this->link, "SELECT id,name FROM ttrss_filter_types");
+		$result = db_query( "SELECT id,name FROM ttrss_filter_types");
 
 		$filter_types = array();
 		while ($line = db_fetch_assoc($result)) {
@@ -83,9 +83,9 @@ class Pref_Filters extends Handler_Protected {
 			}
 		}
 
-		$feed_title = getFeedTitle($this->link, $feed);
+		$feed_title = getFeedTitle( $feed);
 
-		$qfh_ret = queryFeedHeadlines($this->link, -4, 30, "", false, false, false,
+		$qfh_ret = queryFeedHeadlines( -4, 30, "", false, false, false,
 			"date_entered DESC", 0, $_SESSION["uid"], $filter);
 
 		$result = $qfh_ret[0];
@@ -101,7 +101,7 @@ class Pref_Filters extends Handler_Protected {
 		while ($line = db_fetch_assoc($result)) {
 
 			$entry_timestamp = strtotime($line["updated"]);
-			$entry_tags = get_article_tags($this->link, $line["id"], $_SESSION["uid"]);
+			$entry_tags = get_article_tags( $line["id"], $_SESSION["uid"]);
 
 			$content_preview = truncate_string(
 				strip_tags($line["content_preview"]), 100, '...');
@@ -158,7 +158,7 @@ class Pref_Filters extends Handler_Protected {
 
 		$filter_search = $_SESSION["prefs_filter_search"];
 
-		$result = db_query($this->link, "SELECT *,
+		$result = db_query( "SELECT *,
 			(SELECT action_param FROM ttrss_filters2_actions
 				WHERE filter_id = ttrss_filters2.id ORDER BY id LIMIT 1) AS action_param,
 			(SELECT action_id FROM ttrss_filters2_actions
@@ -194,7 +194,7 @@ class Pref_Filters extends Handler_Protected {
 
 			$match_ok = false;
 			if ($filter_search) {
-				$rules_result = db_query($this->link,
+				$rules_result = db_query(
 					"SELECT reg_exp FROM ttrss_filters2_rules WHERE filter_id = ".$line["id"]);
 
 				while ($rule_line = db_fetch_assoc($rules_result)) {
@@ -206,8 +206,8 @@ class Pref_Filters extends Handler_Protected {
 			}
 
 			if ($line['action_id'] == 7) {
-				$label_result = db_query($this->link, "SELECT fg_color, bg_color
-					FROM ttrss_labels2 WHERE caption = '".db_escape_string($this->link, $line['action_param'])."' AND
+				$label_result = db_query( "SELECT fg_color, bg_color
+					FROM ttrss_labels2 WHERE caption = '".db_escape_string( $line['action_param'])."' AND
 						owner_uid = " . $_SESSION["uid"]);
 
 				if (db_num_rows($label_result) > 0) {
@@ -248,9 +248,9 @@ class Pref_Filters extends Handler_Protected {
 
 	function edit() {
 
-		$filter_id = db_escape_string($this->link, $_REQUEST["id"]);
+		$filter_id = db_escape_string( $_REQUEST["id"]);
 
-		$result = db_query($this->link,
+		$result = db_query(
 			"SELECT * FROM ttrss_filters2 WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]);
 
 		$enabled = sql_bool_to_bool(db_fetch_result($result, 0, "enabled"));
@@ -294,7 +294,7 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<ul id='filterDlg_Matches'>";
 
-		$rules_result = db_query($this->link, "SELECT * FROM ttrss_filters2_rules
+		$rules_result = db_query( "SELECT * FROM ttrss_filters2_rules
 			WHERE filter_id = '$filter_id' ORDER BY reg_exp, id");
 
 		while ($line = db_fetch_assoc($rules_result)) {
@@ -342,7 +342,7 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<ul id='filterDlg_Actions'>";
 
-		$actions_result = db_query($this->link, "SELECT * FROM ttrss_filters2_actions
+		$actions_result = db_query( "SELECT * FROM ttrss_filters2_actions
 			WHERE filter_id = '$filter_id' ORDER BY id");
 
 		while ($line = db_fetch_assoc($actions_result)) {
@@ -417,17 +417,17 @@ class Pref_Filters extends Handler_Protected {
 
 		if (strpos($feed_id, "CAT:") === 0) {
 			$feed_id = (int) substr($feed_id, 4);
-			$feed = getCategoryTitle($this->link, $feed_id);
+			$feed = getCategoryTitle( $feed_id);
 		} else {
 			$feed_id = (int) $feed_id;
 
 			if ($rule["feed_id"])
-				$feed = getFeedTitle($this->link, (int)$rule["feed_id"]);
+				$feed = getFeedTitle( (int)$rule["feed_id"]);
 			else
 				$feed = __("All feeds");
 		}
 
-		$result = db_query($this->link, "SELECT description FROM ttrss_filter_types
+		$result = db_query( "SELECT description FROM ttrss_filter_types
 			WHERE id = ".(int)$rule["filter_type"]);
 		$filter_type = db_fetch_result($result, 0, "description");
 
@@ -440,7 +440,7 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	private function getActionName($action) {
-		$result = db_query($this->link, "SELECT description FROM
+		$result = db_query( "SELECT description FROM
 			ttrss_filter_actions WHERE id = " .(int)$action["action_id"]);
 
 		$title = __(db_fetch_result($result, 0, "description"));
@@ -463,13 +463,13 @@ class Pref_Filters extends Handler_Protected {
 
 #		print_r($_REQUEST);
 
-		$filter_id = db_escape_string($this->link, $_REQUEST["id"]);
-		$enabled = checkbox_to_sql_bool(db_escape_string($this->link, $_REQUEST["enabled"]));
-		$match_any_rule = checkbox_to_sql_bool(db_escape_string($this->link, $_REQUEST["match_any_rule"]));
-		$inverse = checkbox_to_sql_bool(db_escape_string($this->link, $_REQUEST["inverse"]));
-		$title = db_escape_string($this->link, $_REQUEST["title"]);
+		$filter_id = db_escape_string( $_REQUEST["id"]);
+		$enabled = checkbox_to_sql_bool(db_escape_string( $_REQUEST["enabled"]));
+		$match_any_rule = checkbox_to_sql_bool(db_escape_string( $_REQUEST["match_any_rule"]));
+		$inverse = checkbox_to_sql_bool(db_escape_string( $_REQUEST["inverse"]));
+		$title = db_escape_string( $_REQUEST["title"]);
 
-		$result = db_query($this->link, "UPDATE ttrss_filters2 SET enabled = $enabled,
+		$result = db_query( "UPDATE ttrss_filters2 SET enabled = $enabled,
 			match_any_rule = $match_any_rule,
 			inverse = $inverse,
 			title = '$title'
@@ -482,17 +482,17 @@ class Pref_Filters extends Handler_Protected {
 
 	function remove() {
 
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			db_query($this->link, "DELETE FROM ttrss_filters2 WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
+			db_query( "DELETE FROM ttrss_filters2 WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
 		}
 	}
 
 	private function saveRulesAndActions($filter_id) {
 
-		db_query($this->link, "DELETE FROM ttrss_filters2_rules WHERE filter_id = '$filter_id'");
-		db_query($this->link, "DELETE FROM ttrss_filters2_actions WHERE filter_id = '$filter_id'");
+		db_query( "DELETE FROM ttrss_filters2_rules WHERE filter_id = '$filter_id'");
+		db_query( "DELETE FROM ttrss_filters2_actions WHERE filter_id = '$filter_id'");
 
 		if ($filter_id) {
 			/* create rules */
@@ -521,11 +521,11 @@ class Pref_Filters extends Handler_Protected {
 			foreach ($rules as $rule) {
 				if ($rule) {
 
-					$reg_exp = strip_tags(db_escape_string($this->link, trim($rule["reg_exp"])));
+					$reg_exp = strip_tags(db_escape_string( trim($rule["reg_exp"])));
 					$inverse = isset($rule["inverse"]) ? "true" : "false";
 
-					$filter_type = (int) db_escape_string($this->link, trim($rule["filter_type"]));
-					$feed_id = db_escape_string($this->link, trim($rule["feed_id"]));
+					$filter_type = (int) db_escape_string( trim($rule["filter_type"]));
+					$feed_id = db_escape_string( trim($rule["feed_id"]));
 
 					if (strpos($feed_id, "CAT:") === 0) {
 
@@ -546,16 +546,16 @@ class Pref_Filters extends Handler_Protected {
 						(filter_id, reg_exp,filter_type,feed_id,cat_id,cat_filter,inverse) VALUES
 						('$filter_id', '$reg_exp', '$filter_type', $feed_id, $cat_id, $cat_filter, $inverse)";
 
-					db_query($this->link, $query);
+					db_query( $query);
 				}
 			}
 
 			foreach ($actions as $action) {
 				if ($action) {
 
-					$action_id = (int) db_escape_string($this->link, $action["action_id"]);
-					$action_param = db_escape_string($this->link, $action["action_param"]);
-					$action_param_label = db_escape_string($this->link, $action["action_param_label"]);
+					$action_id = (int) db_escape_string( $action["action_id"]);
+					$action_param = db_escape_string( $action["action_param"]);
+					$action_param_label = db_escape_string( $action["action_param_label"]);
 
 					if ($action_id == 7) {
 						$action_param = $action_param_label;
@@ -569,7 +569,7 @@ class Pref_Filters extends Handler_Protected {
 						(filter_id, action_id, action_param) VALUES
 						('$filter_id', '$action_id', '$action_param')";
 
-					db_query($this->link, $query);
+					db_query( $query);
 				}
 			}
 		}
@@ -586,35 +586,35 @@ class Pref_Filters extends Handler_Protected {
 
 		$enabled = checkbox_to_sql_bool($_REQUEST["enabled"]);
 		$match_any_rule = checkbox_to_sql_bool($_REQUEST["match_any_rule"]);
-		$title = db_escape_string($this->link, $_REQUEST["title"]);
+		$title = db_escape_string( $_REQUEST["title"]);
 
-		db_query($this->link, "BEGIN");
+		db_query( "BEGIN");
 
 		/* create base filter */
 
-		$result = db_query($this->link, "INSERT INTO ttrss_filters2
+		$result = db_query( "INSERT INTO ttrss_filters2
 			(owner_uid, match_any_rule, enabled, title) VALUES
 			(".$_SESSION["uid"].",$match_any_rule,$enabled, '$title')");
 
-		$result = db_query($this->link, "SELECT MAX(id) AS id FROM ttrss_filters2
+		$result = db_query( "SELECT MAX(id) AS id FROM ttrss_filters2
 			WHERE owner_uid = ".$_SESSION["uid"]);
 
 		$filter_id = db_fetch_result($result, 0, "id");
 
 		$this->saveRulesAndActions($filter_id);
 
-		db_query($this->link, "COMMIT");
+		db_query( "COMMIT");
 	}
 
 	function index() {
 
-		$sort = db_escape_string($this->link, $_REQUEST["sort"]);
+		$sort = db_escape_string( $_REQUEST["sort"]);
 
 		if (!$sort || $sort == "undefined") {
 			$sort = "reg_exp";
 		}
 
-		$filter_search = db_escape_string($this->link, $_REQUEST["search"]);
+		$filter_search = db_escape_string( $_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_filter_search"] = $filter_search;
@@ -626,7 +626,7 @@ class Pref_Filters extends Handler_Protected {
 		print "<div id=\"pref-filter-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">";
 		print "<div id=\"pref-filter-toolbar\" dojoType=\"dijit.Toolbar\">";
 
-		$filter_search = db_escape_string($this->link, $_REQUEST["search"]);
+		$filter_search = db_escape_string( $_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_filter_search"] = $filter_search;
@@ -832,7 +832,7 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<form name='filter_new_rule_form' id='filter_new_rule_form'>";
 
-		$result = db_query($this->link, "SELECT id,description
+		$result = db_query( "SELECT id,description
 			FROM ttrss_filter_types WHERE id != 5 ORDER BY description");
 
 		$filter_types = array();
@@ -864,7 +864,7 @@ class Pref_Filters extends Handler_Protected {
 		print __("in") . " ";
 
 		print "<span id='filterDlg_feeds'>";
-		print_feed_select($this->link, "feed_id",
+		print_feed_select( "feed_id",
 			$cat_filter ? "CAT:$feed_id" : $feed_id,
 			'dojoType="dijit.form.FilteringSelect"');
 		print "</span>";
@@ -888,7 +888,7 @@ class Pref_Filters extends Handler_Protected {
 		$action = json_decode($_REQUEST["action"], true);
 
 		if ($action) {
-			$action_param = db_escape_string($this->link, $action["action_param"]);
+			$action_param = db_escape_string( $action["action_param"]);
 			$action_id = (int)$action["action_id"];
 		} else {
 			$action_param = "";
@@ -904,7 +904,7 @@ class Pref_Filters extends Handler_Protected {
 		print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
 			onchange=\"filterDlgCheckAction(this)\">";
 
-		$result = db_query($this->link, "SELECT id,description FROM ttrss_filter_actions
+		$result = db_query( "SELECT id,description FROM ttrss_filter_actions
 			ORDER BY name");
 
 		while ($line = db_fetch_assoc($result)) {
@@ -928,7 +928,7 @@ class Pref_Filters extends Handler_Protected {
 			id=\"filterDlg_actionParam\" style=\"$param_hidden\"
 			name=\"action_param\" value=\"$action_param\">";
 
-		print_label_select($this->link, "action_param_label", $action_param,
+		print_label_select( "action_param_label", $action_param,
 			"id=\"filterDlg_actionParamLabel\" style=\"$label_param_hidden\"
 			dojoType=\"dijit.form.Select\"");
 
@@ -953,7 +953,7 @@ class Pref_Filters extends Handler_Protected {
 
 	private function getFilterName($id) {
 
-		$result = db_query($this->link,
+		$result = db_query(
 			"SELECT title,COUNT(DISTINCT r.id) AS num_rules,COUNT(DISTINCT a.id) AS num_actions
 				FROM ttrss_filters2 AS f LEFT JOIN ttrss_filters2_rules AS r
 					ON (r.filter_id = f.id)
@@ -968,7 +968,7 @@ class Pref_Filters extends Handler_Protected {
 
 		$title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", $num_rules), $title, $num_rules);
 
-		$result = db_query($this->link,
+		$result = db_query(
 			"SELECT * FROM ttrss_filters2_actions WHERE filter_id = '$id' ORDER BY id LIMIT 1");
 
 		$actions = "";
@@ -987,22 +987,22 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	function join() {
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
 		if (count($ids) > 1) {
 			$base_id = array_shift($ids);
 			$ids_str = join(",", $ids);
 
-			db_query($this->link, "BEGIN");
-			db_query($this->link, "UPDATE ttrss_filters2_rules
+			db_query( "BEGIN");
+			db_query( "UPDATE ttrss_filters2_rules
 				SET filter_id = '$base_id' WHERE filter_id IN ($ids_str)");
-			db_query($this->link, "UPDATE ttrss_filters2_actions
+			db_query( "UPDATE ttrss_filters2_actions
 				SET filter_id = '$base_id' WHERE filter_id IN ($ids_str)");
 
-			db_query($this->link, "DELETE FROM ttrss_filters2 WHERE id IN ($ids_str)");
-			db_query($this->link, "UPDATE ttrss_filters2 SET match_any_rule = true WHERE id = '$base_id'");
+			db_query( "DELETE FROM ttrss_filters2 WHERE id IN ($ids_str)");
+			db_query( "UPDATE ttrss_filters2 SET match_any_rule = true WHERE id = '$base_id'");
 
-			db_query($this->link, "COMMIT");
+			db_query( "COMMIT");
 
 			$this->optimizeFilter($base_id);
 
@@ -1010,8 +1010,8 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	private function optimizeFilter($id) {
-		db_query($this->link, "BEGIN");
-		$result = db_query($this->link, "SELECT * FROM ttrss_filters2_actions
+		db_query( "BEGIN");
+		$result = db_query( "SELECT * FROM ttrss_filters2_actions
 			WHERE filter_id = '$id'");
 
 		$tmp = array();
@@ -1030,11 +1030,11 @@ class Pref_Filters extends Handler_Protected {
 
 		if (count($dupe_ids) > 0) {
 			$ids_str = join(",", $dupe_ids);
-			db_query($this->link, "DELETE FROM ttrss_filters2_actions
+			db_query( "DELETE FROM ttrss_filters2_actions
 				WHERE id IN ($ids_str)");
 		}
 
-		$result = db_query($this->link, "SELECT * FROM ttrss_filters2_rules
+		$result = db_query( "SELECT * FROM ttrss_filters2_rules
 			WHERE filter_id = '$id'");
 
 		$tmp = array();
@@ -1053,11 +1053,11 @@ class Pref_Filters extends Handler_Protected {
 
 		if (count($dupe_ids) > 0) {
 			$ids_str = join(",", $dupe_ids);
-			db_query($this->link, "DELETE FROM ttrss_filters2_rules
+			db_query( "DELETE FROM ttrss_filters2_rules
 				WHERE id IN ($ids_str)");
 		}
 
-		db_query($this->link, "COMMIT");
+		db_query( "COMMIT");
 	}
 }
 ?>
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 15fa7b20b..e0b118e81 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -8,9 +8,9 @@ class Pref_Labels extends Handler_Protected {
 	}
 
 	function edit() {
-		$label_id = db_escape_string($this->link, $_REQUEST['id']);
+		$label_id = db_escape_string( $_REQUEST['id']);
 
-		$result = db_query($this->link, "SELECT * FROM ttrss_labels2 WHERE
+		$result = db_query( "SELECT * FROM ttrss_labels2 WHERE
 			id = '$label_id' AND owner_uid = " . $_SESSION["uid"]);
 
 		$line = db_fetch_assoc($result);
@@ -90,7 +90,7 @@ class Pref_Labels extends Handler_Protected {
 		$root['name'] = __('Labels');
 		$root['items'] = array();
 
-		$result = db_query($this->link, "SELECT *
+		$result = db_query( "SELECT *
 			FROM ttrss_labels2
 			WHERE owner_uid = ".$_SESSION["uid"]."
 			ORDER BY caption");
@@ -118,29 +118,29 @@ class Pref_Labels extends Handler_Protected {
 	}
 
 	function colorset() {
-		$kind = db_escape_string($this->link, $_REQUEST["kind"]);
-		$ids = explode(',', db_escape_string($this->link, $_REQUEST["ids"]));
-		$color = db_escape_string($this->link, $_REQUEST["color"]);
-		$fg = db_escape_string($this->link, $_REQUEST["fg"]);
-		$bg = db_escape_string($this->link, $_REQUEST["bg"]);
+		$kind = db_escape_string( $_REQUEST["kind"]);
+		$ids = explode(',', db_escape_string( $_REQUEST["ids"]));
+		$color = db_escape_string( $_REQUEST["color"]);
+		$fg = db_escape_string( $_REQUEST["fg"]);
+		$bg = db_escape_string( $_REQUEST["bg"]);
 
 		foreach ($ids as $id) {
 
 			if ($kind == "fg" || $kind == "bg") {
-				db_query($this->link, "UPDATE ttrss_labels2 SET
+				db_query( "UPDATE ttrss_labels2 SET
 					${kind}_color = '$color' WHERE id = '$id'
 					AND owner_uid = " . $_SESSION["uid"]);
 			} else {
-				db_query($this->link, "UPDATE ttrss_labels2 SET
+				db_query( "UPDATE ttrss_labels2 SET
 					fg_color = '$fg', bg_color = '$bg' WHERE id = '$id'
 					AND owner_uid = " . $_SESSION["uid"]);
 			}
 
-			$caption = db_escape_string($this->link, label_find_caption($this->link, $id, $_SESSION["uid"]));
+			$caption = db_escape_string( label_find_caption($id, $_SESSION["uid"]));
 
 			/* Remove cached data */
 
-			db_query($this->link, "UPDATE ttrss_user_entries SET label_cache = ''
+			db_query( "UPDATE ttrss_user_entries SET label_cache = ''
 				WHERE label_cache LIKE '%$caption%' AND owner_uid = " . $_SESSION["uid"]);
 
 		}
@@ -149,18 +149,18 @@ class Pref_Labels extends Handler_Protected {
 	}
 
 	function colorreset() {
-		$ids = explode(',', db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(',', db_escape_string( $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			db_query($this->link, "UPDATE ttrss_labels2 SET
+			db_query( "UPDATE ttrss_labels2 SET
 				fg_color = '', bg_color = '' WHERE id = '$id'
 				AND owner_uid = " . $_SESSION["uid"]);
 
-			$caption = db_escape_string($this->link, label_find_caption($this->link, $id, $_SESSION["uid"]));
+			$caption = db_escape_string( label_find_caption($id, $_SESSION["uid"]));
 
 			/* Remove cached data */
 
-			db_query($this->link, "UPDATE ttrss_user_entries SET label_cache = ''
+			db_query( "UPDATE ttrss_user_entries SET label_cache = ''
 				WHERE label_cache LIKE '%$caption%' AND owner_uid = " . $_SESSION["uid"]);
 		}
 
@@ -168,31 +168,31 @@ class Pref_Labels extends Handler_Protected {
 
 	function save() {
 
-		$id = db_escape_string($this->link, $_REQUEST["id"]);
-		$caption = db_escape_string($this->link, trim($_REQUEST["caption"]));
+		$id = db_escape_string( $_REQUEST["id"]);
+		$caption = db_escape_string( trim($_REQUEST["caption"]));
 
-		db_query($this->link, "BEGIN");
+		db_query( "BEGIN");
 
-		$result = db_query($this->link, "SELECT caption FROM ttrss_labels2
+		$result = db_query( "SELECT caption FROM ttrss_labels2
 			WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
 
 		if (db_num_rows($result) != 0) {
 			$old_caption = db_fetch_result($result, 0, "caption");
 
-			$result = db_query($this->link, "SELECT id FROM ttrss_labels2
+			$result = db_query( "SELECT id FROM ttrss_labels2
 				WHERE caption = '$caption' AND owner_uid = ". $_SESSION["uid"]);
 
 			if (db_num_rows($result) == 0) {
 				if ($caption) {
-					$result = db_query($this->link, "UPDATE ttrss_labels2 SET
+					$result = db_query( "UPDATE ttrss_labels2 SET
 						caption = '$caption' WHERE id = '$id' AND
 						owner_uid = " . $_SESSION["uid"]);
 
 					/* Update filters that reference label being renamed */
 
-					$old_caption = db_escape_string($this->link, $old_caption);
+					$old_caption = db_escape_string( $old_caption);
 
-					db_query($this->link, "UPDATE ttrss_filters2_actions SET
+					db_query( "UPDATE ttrss_filters2_actions SET
 						action_param = '$caption' WHERE action_param = '$old_caption'
 						AND action_id = 7
 						AND filter_id IN (SELECT id FROM ttrss_filters2 WHERE owner_uid = ".$_SESSION["uid"].")");
@@ -206,28 +206,28 @@ class Pref_Labels extends Handler_Protected {
 			}
 		}
 
-		db_query($this->link, "COMMIT");
+		db_query( "COMMIT");
 
 		return;
 	}
 
 	function remove() {
 
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			label_remove($this->link, $id, $_SESSION["uid"]);
+			label_remove( $id, $_SESSION["uid"]);
 		}
 
 	}
 
 	function add() {
-		$caption = db_escape_string($this->link, $_REQUEST["caption"]);
-		$output = db_escape_string($this->link, $_REQUEST["output"]);
+		$caption = db_escape_string( $_REQUEST["caption"]);
+		$output = db_escape_string( $_REQUEST["output"]);
 
 		if ($caption) {
 
-			if (label_create($this->link, $caption)) {
+			if (label_create( $caption)) {
 				if (!$output) {
 					print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption));
 				}
@@ -238,7 +238,7 @@ class Pref_Labels extends Handler_Protected {
 
 				print "<rpc-reply><payload>";
 
-				print_label_select($this->link, "select_label",
+				print_label_select( "select_label",
 					$caption, "");
 
 				print "</payload></rpc-reply>";
@@ -250,13 +250,13 @@ class Pref_Labels extends Handler_Protected {
 
 	function index() {
 
-		$sort = db_escape_string($this->link, $_REQUEST["sort"]);
+		$sort = db_escape_string( $_REQUEST["sort"]);
 
 		if (!$sort || $sort == "undefined") {
 			$sort = "caption";
 		}
 
-		$label_search = db_escape_string($this->link, $_REQUEST["search"]);
+		$label_search = db_escape_string( $_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_label_search"] = $label_search;
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 2f316b48b..faab69235 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -103,13 +103,13 @@ class Pref_Prefs extends Handler_Protected {
 
 		foreach (array_keys($_POST) as $pref_name) {
 
-			$pref_name = db_escape_string($this->link, $pref_name);
-			$value = db_escape_string($this->link, $_POST[$pref_name]);
+			$pref_name = db_escape_string( $pref_name);
+			$value = db_escape_string( $_POST[$pref_name]);
 
 			if ($pref_name == 'DIGEST_PREFERRED_TIME') {
-				if (get_pref($this->link, 'DIGEST_PREFERRED_TIME') != $value) {
+				if (get_pref( 'DIGEST_PREFERRED_TIME') != $value) {
 
-					db_query($this->link, "UPDATE ttrss_users SET
+					db_query( "UPDATE ttrss_users SET
 						last_digest_sent = NULL WHERE id = " . $_SESSION['uid']);
 
 				}
@@ -124,7 +124,7 @@ class Pref_Prefs extends Handler_Protected {
 					$need_reload = true;
 				}
 			} else {
-				set_pref($this->link, $pref_name, $value);
+				set_pref( $pref_name, $value);
 			}
 
 		}
@@ -138,9 +138,9 @@ class Pref_Prefs extends Handler_Protected {
 
 	function getHelp() {
 
-		$pref_name = db_escape_string($this->link, $_REQUEST["pn"]);
+		$pref_name = db_escape_string( $_REQUEST["pn"]);
 
-		$result = db_query($this->link, "SELECT help_text FROM ttrss_prefs
+		$result = db_query( "SELECT help_text FROM ttrss_prefs
 			WHERE pref_name = '$pref_name'");
 
 		if (db_num_rows($result) > 0) {
@@ -153,12 +153,12 @@ class Pref_Prefs extends Handler_Protected {
 
 	function changeemail() {
 
-		$email = db_escape_string($this->link, $_POST["email"]);
-		$full_name = db_escape_string($this->link, $_POST["full_name"]);
+		$email = db_escape_string( $_POST["email"]);
+		$full_name = db_escape_string( $_POST["full_name"]);
 
 		$active_uid = $_SESSION["uid"];
 
-		db_query($this->link, "UPDATE ttrss_users SET email = '$email',
+		db_query( "UPDATE ttrss_users SET email = '$email',
 			full_name = '$full_name' WHERE id = '$active_uid'");
 
 		print __("Your personal data has been saved.");
@@ -176,10 +176,10 @@ class Pref_Prefs extends Handler_Protected {
 			$profile_qpart = "profile IS NULL";
 		}
 
-		db_query($this->link, "DELETE FROM ttrss_user_prefs
+		db_query( "DELETE FROM ttrss_user_prefs
 			WHERE $profile_qpart AND owner_uid = ".$_SESSION["uid"]);
 
-		initialize_user_prefs($this->link, $_SESSION["uid"], $_SESSION["profile"]);
+		initialize_user_prefs( $_SESSION["uid"], $_SESSION["profile"]);
 
 		echo __("Your preferences are now set to default values.");
 	}
@@ -225,7 +225,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "<h2>" . __("Personal data") . "</h2>";
 
-		$result = db_query($this->link, "SELECT email,full_name,otp_enabled,
+		$result = db_query( "SELECT email,full_name,otp_enabled,
 			access_level FROM ttrss_users
 			WHERE id = ".$_SESSION["uid"]);
 
@@ -270,7 +270,7 @@ class Pref_Prefs extends Handler_Protected {
 
 			print "<h2>" . __("Password") . "</h2>";
 
-			$result = db_query($this->link, "SELECT id FROM ttrss_users
+			$result = db_query( "SELECT id FROM ttrss_users
 				WHERE id = ".$_SESSION["uid"]." AND pwd_hash
 				= 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'");
 
@@ -480,10 +480,10 @@ class Pref_Prefs extends Handler_Protected {
 		}
 
 		if ($_SESSION["profile"]) {
-			initialize_user_prefs($this->link, $_SESSION["uid"], $_SESSION["profile"]);
+			initialize_user_prefs( $_SESSION["uid"], $_SESSION["profile"]);
 			$profile_qpart = "profile = '" . $_SESSION["profile"] . "'";
 		} else {
-			initialize_user_prefs($this->link, $_SESSION["uid"]);
+			initialize_user_prefs( $_SESSION["uid"]);
 			$profile_qpart = "profile IS NULL";
 		}
 
@@ -494,7 +494,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		$access_query = 'true';
 
-		$result = db_query($this->link, "SELECT DISTINCT
+		$result = db_query( "SELECT DISTINCT
 			ttrss_user_prefs.pref_name,value,type_name,
 			ttrss_prefs_sections.order_id,
 			def_value,section_id
@@ -767,9 +767,9 @@ class Pref_Prefs extends Handler_Protected {
 				<td width='10%'>".__('Author')."</td></tr>";
 
 		$system_enabled = array_map("trim", explode(",", PLUGINS));
-		$user_enabled = array_map("trim", explode(",", get_pref($this->link, "_ENABLED_PLUGINS")));
+		$user_enabled = array_map("trim", explode(",", get_pref( "_ENABLED_PLUGINS")));
 
-		$tmppluginhost = new PluginHost($this->link);
+		$tmppluginhost = new PluginHost();
 		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
 		$tmppluginhost->load_data(true);
 
@@ -897,7 +897,7 @@ class Pref_Prefs extends Handler_Protected {
 		require_once "lib/otphp/lib/totp.php";
 		require_once "lib/phpqrcode/phpqrcode.php";
 
-		$result = db_query($this->link, "SELECT login,salt,otp_enabled
+		$result = db_query( "SELECT login,salt,otp_enabled
 			FROM ttrss_users
 			WHERE id = ".$_SESSION["uid"]);
 
@@ -926,7 +926,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-			$result = db_query($this->link, "SELECT salt
+			$result = db_query( "SELECT salt
 				FROM ttrss_users
 				WHERE id = ".$_SESSION["uid"]);
 
@@ -938,7 +938,7 @@ class Pref_Prefs extends Handler_Protected {
 			$otp_check = $topt->now();
 
 			if ($otp == $otp_check) {
-				db_query($this->link, "UPDATE ttrss_users SET otp_enabled = true WHERE
+				db_query( "UPDATE ttrss_users SET otp_enabled = true WHERE
 					id = " . $_SESSION["uid"]);
 
 				print "OK";
@@ -952,14 +952,14 @@ class Pref_Prefs extends Handler_Protected {
 	}
 
 	function otpdisable() {
-		$password = db_escape_string($this->link, $_REQUEST["password"]);
+		$password = db_escape_string( $_REQUEST["password"]);
 
 		global $pluginhost;
 		$authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
 
 		if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-			db_query($this->link, "UPDATE ttrss_users SET otp_enabled = false WHERE
+			db_query( "UPDATE ttrss_users SET otp_enabled = false WHERE
 				id = " . $_SESSION["uid"]);
 
 			print "OK";
@@ -975,18 +975,18 @@ class Pref_Prefs extends Handler_Protected {
 		else
 			$plugins = "";
 
-		set_pref($this->link, "_ENABLED_PLUGINS", $plugins);
+		set_pref( "_ENABLED_PLUGINS", $plugins);
 	}
 
 	function clearplugindata() {
-		$name = db_escape_string($this->link, $_REQUEST["name"]);
+		$name = db_escape_string( $_REQUEST["name"]);
 
 		global $pluginhost;
 		$pluginhost->clear_data($pluginhost->get_plugin($name));
 	}
 
 	function customizeCSS() {
-		$value = get_pref($this->link, "USER_STYLESHEET");
+		$value = get_pref( "USER_STYLESHEET");
 
 		$value = str_replace("<br/>", "\n", $value);
 
@@ -1034,7 +1034,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "</div>";
 
-		$result = db_query($this->link, "SELECT title,id FROM ttrss_settings_profiles
+		$result = db_query( "SELECT title,id FROM ttrss_settings_profiles
 			WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
 		print "<div class=\"prefProfileHolder\">";
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 2957b7b96..0282b2d73 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -2,10 +2,6 @@
 
 class Pref_System extends Handler_Protected {
 
-	function __construct($link, $args) {
-		parent::__construct($link, $args);
-	}
-
 	function before($method) {
 		if (parent::before($method)) {
 			if ($_SESSION["access_level"] < 10) {
@@ -28,7 +24,7 @@ class Pref_System extends Handler_Protected {
 		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
 
-		$result = db_query($this->link, "SELECT errno, errstr, filename, lineno,
+		$result = db_query( "SELECT errno, errstr, filename, lineno,
 			created_at, login FROM ttrss_error_log
 			LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
 			ORDER BY ttrss_error_log.id DESC
@@ -57,7 +53,7 @@ class Pref_System extends Handler_Protected {
 			print "<td class='login'>" . $line["login"] . "</td>";
 
 			print "<td class='timestamp'>" .
-				make_local_datetime($this->link,
+				make_local_datetime(
 				$line["created_at"], false) . "</td>";
 
 			print "</tr>";
diff --git a/classes/pref/users.php b/classes/pref/users.php
index bd2fff735..a9c3689fd 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -21,7 +21,7 @@ class Pref_Users extends Handler_Protected {
 
 			$uid = sprintf("%d", $_REQUEST["id"]);
 
-			$result = db_query($this->link, "SELECT login,
+			$result = db_query( "SELECT login,
 				".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
 				access_level,
 				(SELECT COUNT(int_id) FROM ttrss_user_entries
@@ -41,10 +41,10 @@ class Pref_Users extends Handler_Protected {
 
 			print "<table width='100%'>";
 
-			$last_login = make_local_datetime($this->link,
+			$last_login = make_local_datetime(
 				db_fetch_result($result, 0, "last_login"), true);
 
-			$created = make_local_datetime($this->link,
+			$created = make_local_datetime(
 				db_fetch_result($result, 0, "created"), true);
 
 			$access_level = db_fetch_result($result, 0, "access_level");
@@ -53,7 +53,7 @@ class Pref_Users extends Handler_Protected {
 			print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
 			print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
 
-			$result = db_query($this->link, "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
+			$result = db_query( "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
 				WHERE owner_uid = '$uid'");
 
 			$num_feeds = db_fetch_result($result, 0, "num_feeds");
@@ -64,7 +64,7 @@ class Pref_Users extends Handler_Protected {
 
 			print "<h1>".__('Subscribed feeds')."</h1>";
 
-			$result = db_query($this->link, "SELECT id,title,site_url FROM ttrss_feeds
+			$result = db_query( "SELECT id,title,site_url FROM ttrss_feeds
 				WHERE owner_uid = '$uid' ORDER BY title");
 
 			print "<ul class=\"userFeedList\">";
@@ -105,14 +105,14 @@ class Pref_Users extends Handler_Protected {
 		function edit() {
 			global $access_level_names;
 
-			$id = db_escape_string($this->link, $_REQUEST["id"]);
+			$id = db_escape_string( $_REQUEST["id"]);
 			print "<form id=\"user_edit_form\" onsubmit='return false'>";
 
 			print "<input type=\"hidden\" name=\"id\" value=\"$id\">";
 			print "<input type=\"hidden\" name=\"op\" value=\"pref-users\">";
 			print "<input type=\"hidden\" name=\"method\" value=\"editSave\">";
 
-			$result = db_query($this->link, "SELECT * FROM ttrss_users WHERE id = '$id'");
+			$result = db_query( "SELECT * FROM ttrss_users WHERE id = '$id'");
 
 			$login = db_fetch_result($result, 0, "login");
 			$access_level = db_fetch_result($result, 0, "access_level");
@@ -181,10 +181,10 @@ class Pref_Users extends Handler_Protected {
 		}
 
 		function editSave() {
-			$login = db_escape_string($this->link, trim($_REQUEST["login"]));
-			$uid = db_escape_string($this->link, $_REQUEST["id"]);
+			$login = db_escape_string( trim($_REQUEST["login"]));
+			$uid = db_escape_string( $_REQUEST["id"]);
 			$access_level = (int) $_REQUEST["access_level"];
-			$email = db_escape_string($this->link, trim($_REQUEST["email"]));
+			$email = db_escape_string( trim($_REQUEST["email"]));
 			$password = $_REQUEST["password"];
 
 			if ($password) {
@@ -195,42 +195,42 @@ class Pref_Users extends Handler_Protected {
 				$pass_query_part = "";
 			}
 
-			db_query($this->link, "UPDATE ttrss_users SET $pass_query_part login = '$login',
+			db_query( "UPDATE ttrss_users SET $pass_query_part login = '$login',
 				access_level = '$access_level', email = '$email', otp_enabled = false
 				WHERE id = '$uid'");
 
 		}
 
 		function remove() {
-			$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+			$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
 			foreach ($ids as $id) {
 				if ($id != $_SESSION["uid"] && $id != 1) {
-					db_query($this->link, "DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
-					db_query($this->link, "DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
-					db_query($this->link, "DELETE FROM ttrss_users WHERE id = '$id'");
+					db_query( "DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
+					db_query( "DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
+					db_query( "DELETE FROM ttrss_users WHERE id = '$id'");
 				}
 			}
 		}
 
 		function add() {
 
-			$login = db_escape_string($this->link, trim($_REQUEST["login"]));
+			$login = db_escape_string( trim($_REQUEST["login"]));
 			$tmp_user_pwd = make_password(8);
 			$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 			$pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
 
-			$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
+			$result = db_query( "SELECT id FROM ttrss_users WHERE
 				login = '$login'");
 
 			if (db_num_rows($result) == 0) {
 
-				db_query($this->link, "INSERT INTO ttrss_users
+				db_query( "INSERT INTO ttrss_users
 					(login,pwd_hash,access_level,last_login,created, salt)
 					VALUES ('$login', '$pwd_hash', 0, null, NOW(), '$salt')");
 
 
-				$result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
+				$result = db_query( "SELECT id FROM ttrss_users WHERE
 					login = '$login' AND pwd_hash = '$pwd_hash'");
 
 				if (db_num_rows($result) == 1) {
@@ -240,7 +240,7 @@ class Pref_Users extends Handler_Protected {
 					print format_notice(T_sprintf("Added user <b>%s</b> with password <b>%s</b>",
 						$login, $tmp_user_pwd));
 
-					initialize_user($this->link, $new_uid);
+					initialize_user( $new_uid);
 
 				} else {
 
@@ -304,8 +304,8 @@ class Pref_Users extends Handler_Protected {
 		}
 
 		function resetPass() {
-			$uid = db_escape_string($this->link, $_REQUEST["id"]);
-			Pref_Users::resetUserPassword($this->link, $uid, true);
+			$uid = db_escape_string( $_REQUEST["id"]);
+			Pref_Users::resetUserPassword( $uid, true);
 		}
 
 		function index() {
@@ -317,7 +317,7 @@ class Pref_Users extends Handler_Protected {
 
 			print "<div id=\"pref-user-toolbar\" dojoType=\"dijit.Toolbar\">";
 
-			$user_search = db_escape_string($this->link, $_REQUEST["search"]);
+			$user_search = db_escape_string( $_REQUEST["search"]);
 
 			if (array_key_exists("search", $_REQUEST)) {
 				$_SESSION["prefs_user_search"] = $user_search;
@@ -332,7 +332,7 @@ class Pref_Users extends Handler_Protected {
 					__('Search')."</button>
 				</div>";
 
-			$sort = db_escape_string($this->link, $_REQUEST["sort"]);
+			$sort = db_escape_string( $_REQUEST["sort"]);
 
 			if (!$sort || $sort == "undefined") {
 				$sort = "login";
@@ -381,7 +381,7 @@ class Pref_Users extends Handler_Protected {
 				$user_search_query = "";
 			}
 
-			$result = db_query($this->link, "SELECT
+			$result = db_query( "SELECT
 					id,login,access_level,email,
 					".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login,
 					".SUBSTRING_FOR_DATE."(created,1,16) as created
@@ -416,8 +416,8 @@ class Pref_Users extends Handler_Protected {
 
 				$line["login"] = htmlspecialchars($line["login"]);
 
-				$line["created"] = make_local_datetime($this->link, $line["created"], false);
-				$line["last_login"] = make_local_datetime($this->link, $line["last_login"], false);
+				$line["created"] = make_local_datetime( $line["created"], false);
+				$line["last_login"] = make_local_datetime( $line["last_login"], false);
 
 				print "<td align='center'><input onclick='toggleSelectRow2(this);'
 					dojoType=\"dijit.form.CheckBox\" type=\"checkbox\"
diff --git a/classes/rpc.php b/classes/rpc.php
index b6d552868..c46d61d30 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -8,18 +8,18 @@ class RPC extends Handler_Protected {
 	}
 
 	function setprofile() {
-		$id = db_escape_string($this->link, $_REQUEST["id"]);
+		$id = db_escape_string( $_REQUEST["id"]);
 
 		$_SESSION["profile"] = $id;
 		$_SESSION["prefs_cache"] = array();
 	}
 
 	function remprofiles() {
-		$ids = explode(",", db_escape_string($this->link, trim($_REQUEST["ids"])));
+		$ids = explode(",", db_escape_string( trim($_REQUEST["ids"])));
 
 		foreach ($ids as $id) {
 			if ($_SESSION["profile"] != $id) {
-				db_query($this->link, "DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
+				db_query( "DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
 							owner_uid = " . $_SESSION["uid"]);
 			}
 		}
@@ -27,38 +27,38 @@ class RPC extends Handler_Protected {
 
 	// Silent
 	function addprofile() {
-		$title = db_escape_string($this->link, trim($_REQUEST["title"]));
+		$title = db_escape_string( trim($_REQUEST["title"]));
 		if ($title) {
-			db_query($this->link, "BEGIN");
+			db_query( "BEGIN");
 
-			$result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles
+			$result = db_query( "SELECT id FROM ttrss_settings_profiles
 				WHERE title = '$title' AND owner_uid = " . $_SESSION["uid"]);
 
 			if (db_num_rows($result) == 0) {
 
-				db_query($this->link, "INSERT INTO ttrss_settings_profiles (title, owner_uid)
+				db_query( "INSERT INTO ttrss_settings_profiles (title, owner_uid)
 							VALUES ('$title', ".$_SESSION["uid"] .")");
 
-				$result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles WHERE
+				$result = db_query( "SELECT id FROM ttrss_settings_profiles WHERE
 					title = '$title'");
 
 				if (db_num_rows($result) != 0) {
 					$profile_id = db_fetch_result($result, 0, "id");
 
 					if ($profile_id) {
-						initialize_user_prefs($this->link, $_SESSION["uid"], $profile_id);
+						initialize_user_prefs( $_SESSION["uid"], $profile_id);
 					}
 				}
 			}
 
-			db_query($this->link, "COMMIT");
+			db_query( "COMMIT");
 		}
 	}
 
 	// Silent
 	function saveprofile() {
-		$id = db_escape_string($this->link, $_REQUEST["id"]);
-		$title = db_escape_string($this->link, trim($_REQUEST["value"]));
+		$id = db_escape_string( $_REQUEST["id"]);
+		$title = db_escape_string( trim($_REQUEST["value"]));
 
 		if ($id == 0) {
 			print __("Default profile");
@@ -66,55 +66,55 @@ class RPC extends Handler_Protected {
 		}
 
 		if ($title) {
-			db_query($this->link, "BEGIN");
+			db_query( "BEGIN");
 
-			$result = db_query($this->link, "SELECT id FROM ttrss_settings_profiles
+			$result = db_query( "SELECT id FROM ttrss_settings_profiles
 				WHERE title = '$title' AND owner_uid =" . $_SESSION["uid"]);
 
 			if (db_num_rows($result) == 0) {
-				db_query($this->link, "UPDATE ttrss_settings_profiles
+				db_query( "UPDATE ttrss_settings_profiles
 							SET title = '$title' WHERE id = '$id' AND
 							owner_uid = " . $_SESSION["uid"]);
 				print $title;
 			} else {
-				$result = db_query($this->link, "SELECT title FROM ttrss_settings_profiles
+				$result = db_query( "SELECT title FROM ttrss_settings_profiles
 							WHERE id = '$id' AND owner_uid =" . $_SESSION["uid"]);
 				print db_fetch_result($result, 0, "title");
 			}
 
-			db_query($this->link, "COMMIT");
+			db_query( "COMMIT");
 		}
 	}
 
 	// Silent
 	function remarchive() {
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			$result = db_query($this->link, "DELETE FROM ttrss_archived_feeds WHERE
+			$result = db_query( "DELETE FROM ttrss_archived_feeds WHERE
 		(SELECT COUNT(*) FROM ttrss_user_entries
 							WHERE orig_feed_id = '$id') = 0 AND
 		id = '$id' AND owner_uid = ".$_SESSION["uid"]);
 
-			$rc = db_affected_rows($this->link, $result);
+			$rc = db_affected_rows( $result);
 		}
 	}
 
 	function addfeed() {
-		$feed = db_escape_string($this->link, $_REQUEST['feed']);
-		$cat = db_escape_string($this->link, $_REQUEST['cat']);
-		$login = db_escape_string($this->link, $_REQUEST['login']);
+		$feed = db_escape_string( $_REQUEST['feed']);
+		$cat = db_escape_string( $_REQUEST['cat']);
+		$login = db_escape_string( $_REQUEST['login']);
 		$pass = trim($_REQUEST['pass']); // escaped later
 
-		$rc = subscribe_to_feed($this->link, $feed, $cat, $login, $pass);
+		$rc = subscribe_to_feed( $feed, $cat, $login, $pass);
 
 		print json_encode(array("result" => $rc));
 	}
 
 	function togglepref() {
-		$key = db_escape_string($this->link, $_REQUEST["key"]);
-		set_pref($this->link, $key, !get_pref($this->link, $key));
-		$value = get_pref($this->link, $key);
+		$key = db_escape_string( $_REQUEST["key"]);
+		set_pref( $key, !get_pref( $key));
+		$value = get_pref( $key);
 
 		print json_encode(array("param" =>$key, "value" => $value));
 	}
@@ -124,14 +124,14 @@ class RPC extends Handler_Protected {
 		$key = $_REQUEST['key'];
 		$value = str_replace("\n", "<br/>", $_REQUEST['value']);
 
-		set_pref($this->link, $key, $value, $_SESSION['uid'], $key != 'USER_STYLESHEET');
+		set_pref( $key, $value, $_SESSION['uid'], $key != 'USER_STYLESHEET');
 
 		print json_encode(array("param" =>$key, "value" => $value));
 	}
 
 	function mark() {
 		$mark = $_REQUEST["mark"];
-		$id = db_escape_string($this->link, $_REQUEST["id"]);
+		$id = db_escape_string( $_REQUEST["id"]);
 
 		if ($mark == "1") {
 			$mark = "true";
@@ -139,7 +139,7 @@ class RPC extends Handler_Protected {
 			$mark = "false";
 		}
 
-		$result = db_query($this->link, "UPDATE ttrss_user_entries SET marked = $mark,
+		$result = db_query( "UPDATE ttrss_user_entries SET marked = $mark,
 					last_marked = NOW()
 					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
@@ -147,12 +147,12 @@ class RPC extends Handler_Protected {
 	}
 
 	function delete() {
-		$ids = db_escape_string($this->link, $_REQUEST["ids"]);
+		$ids = db_escape_string( $_REQUEST["ids"]);
 
-		$result = db_query($this->link, "DELETE FROM ttrss_user_entries
+		$result = db_query( "DELETE FROM ttrss_user_entries
 		WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
-		purge_orphans($this->link);
+		purge_orphans();
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
@@ -161,26 +161,26 @@ class RPC extends Handler_Protected {
 		$ids = explode(",", $_REQUEST["ids"]);
 
 		foreach ($ids as $id) {
-			$id = db_escape_string($this->link, trim($id));
-			db_query($this->link, "BEGIN");
+			$id = db_escape_string( trim($id));
+			db_query( "BEGIN");
 
-			$result = db_query($this->link, "SELECT feed_url,site_url,title FROM ttrss_archived_feeds
+			$result = db_query( "SELECT feed_url,site_url,title FROM ttrss_archived_feeds
 				WHERE id = (SELECT orig_feed_id FROM ttrss_user_entries WHERE ref_id = $id
 				AND owner_uid = ".$_SESSION["uid"].")");
 
 			if (db_num_rows($result) != 0) {
-				$feed_url = db_escape_string($this->link, db_fetch_result($result, 0, "feed_url"));
-				$site_url = db_escape_string($this->link, db_fetch_result($result, 0, "site_url"));
-				$title = db_escape_string($this->link, db_fetch_result($result, 0, "title"));
+				$feed_url = db_escape_string( db_fetch_result($result, 0, "feed_url"));
+				$site_url = db_escape_string( db_fetch_result($result, 0, "site_url"));
+				$title = db_escape_string( db_fetch_result($result, 0, "title"));
 
-				$result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
+				$result = db_query( "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
 					AND owner_uid = " .$_SESSION["uid"]);
 
 				if (db_num_rows($result) == 0) {
 
 					if (!$title) $title = '[Unknown]';
 
-					$result = db_query($this->link,
+					$result = db_query(
 						"INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
 							VALUES (".$_SESSION["uid"].",
@@ -189,7 +189,7 @@ class RPC extends Handler_Protected {
 							'$title',
 							NULL, '', '', 0)");
 
-					$result = db_query($this->link,
+					$result = db_query(
 						"SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
 						AND owner_uid = ".$_SESSION["uid"]);
 
@@ -202,32 +202,32 @@ class RPC extends Handler_Protected {
 				}
 
 				if ($feed_id) {
-					$result = db_query($this->link, "UPDATE ttrss_user_entries
+					$result = db_query( "UPDATE ttrss_user_entries
 						SET feed_id = '$feed_id', orig_feed_id = NULL
 						WHERE ref_id = $id AND owner_uid = " . $_SESSION["uid"]);
 				}
 			}
 
-			db_query($this->link, "COMMIT");
+			db_query( "COMMIT");
 		}
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
 	function archive() {
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			$this->archive_article($this->link, $id, $_SESSION["uid"]);
+			$this->archive_article( $id, $_SESSION["uid"]);
 		}
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
-	private function archive_article($link, $id, $owner_uid) {
-		db_query($link, "BEGIN");
+	private function archive_article( $id, $owner_uid) {
+		db_query( "BEGIN");
 
-		$result = db_query($link, "SELECT feed_id FROM ttrss_user_entries
+		$result = db_query( "SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = '$id' AND owner_uid = $owner_uid");
 
 		if (db_num_rows($result) != 0) {
@@ -237,29 +237,29 @@ class RPC extends Handler_Protected {
 			$feed_id = (int) db_fetch_result($result, 0, "feed_id");
 
 			if ($feed_id) {
-				$result = db_query($link, "SELECT id FROM ttrss_archived_feeds
+				$result = db_query( "SELECT id FROM ttrss_archived_feeds
 					WHERE id = '$feed_id'");
 
 				if (db_num_rows($result) == 0) {
-					db_query($link, "INSERT INTO ttrss_archived_feeds
+					db_query( "INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url)
 					SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds
 				  	WHERE id = '$feed_id'");
 				}
 
-				db_query($link, "UPDATE ttrss_user_entries
+				db_query( "UPDATE ttrss_user_entries
 					SET orig_feed_id = feed_id, feed_id = NULL
 					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 			}
 		}
 
-		db_query($link, "COMMIT");
+		db_query( "COMMIT");
 	}
 
 	function publ() {
 		$pub = $_REQUEST["pub"];
-		$id = db_escape_string($this->link, $_REQUEST["id"]);
-		$note = trim(strip_tags(db_escape_string($this->link, $_REQUEST["note"])));
+		$id = db_escape_string( $_REQUEST["id"]);
+		$note = trim(strip_tags(db_escape_string( $_REQUEST["note"])));
 
 		if ($pub == "1") {
 			$pub = "true";
@@ -267,7 +267,7 @@ class RPC extends Handler_Protected {
 			$pub = "false";
 		}
 
-		$result = db_query($this->link, "UPDATE ttrss_user_entries SET
+		$result = db_query( "UPDATE ttrss_user_entries SET
 			published = $pub, last_published = NOW()
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
@@ -276,7 +276,7 @@ class RPC extends Handler_Protected {
 		if (PUBSUBHUBBUB_HUB) {
 			$rss_link = get_self_url_prefix() .
 				"/public.php?op=rss&id=-2&key=" .
-				get_feed_access_key($this->link, -2, false);
+				get_feed_access_key( -2, false);
 
 			$p = new Publisher(PUBSUBHUBBUB_HUB);
 
@@ -294,39 +294,39 @@ class RPC extends Handler_Protected {
 
 		if ($seq) $reply['seq'] = $seq;
 
-		if ($last_article_id != getLastArticleId($this->link)) {
-			$reply['counters'] = getAllCounters($this->link);
+		if ($last_article_id != getLastArticleId()) {
+			$reply['counters'] = getAllCounters();
 		}
 
-		$reply['runtime-info'] = make_runtime_info($this->link);
+		$reply['runtime-info'] = make_runtime_info();
 
 		print json_encode($reply);
 	}
 
 	/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
 	function catchupSelected() {
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 		$cmode = sprintf("%d", $_REQUEST["cmode"]);
 
-		catchupArticlesById($this->link, $ids, $cmode);
+		catchupArticlesById( $ids, $cmode);
 
 		print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
 	}
 
 	function markSelected() {
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 		$cmode = sprintf("%d", $_REQUEST["cmode"]);
 
-		$this->markArticlesById($this->link, $ids, $cmode);
+		$this->markArticlesById( $ids, $cmode);
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
 	function publishSelected() {
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 		$cmode = sprintf("%d", $_REQUEST["cmode"]);
 
-		$this->publishArticlesById($this->link, $ids, $cmode);
+		$this->publishArticlesById( $ids, $cmode);
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
@@ -338,20 +338,20 @@ class RPC extends Handler_Protected {
 
 		$reply = array();
 
-		$reply['error'] = sanity_check($this->link);
+		$reply['error'] = sanity_check();
 
 		if ($reply['error']['code'] == 0) {
-			$reply['init-params'] = make_init_params($this->link);
-			$reply['runtime-info'] = make_runtime_info($this->link);
+			$reply['init-params'] = make_init_params();
+			$reply['runtime-info'] = make_runtime_info();
 		}
 
 		print json_encode($reply);
 	}
 
 	function completeLabels() {
-		$search = db_escape_string($this->link, $_REQUEST["search"]);
+		$search = db_escape_string( $_REQUEST["search"]);
 
-		$result = db_query($this->link, "SELECT DISTINCT caption FROM
+		$result = db_query( "SELECT DISTINCT caption FROM
 				ttrss_labels2
 				WHERE owner_uid = '".$_SESSION["uid"]."' AND
 				LOWER(caption) LIKE LOWER('$search%') ORDER BY caption
@@ -365,29 +365,29 @@ class RPC extends Handler_Protected {
 	}
 
 	function purge() {
-		$ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 		$days = sprintf("%d", $_REQUEST["days"]);
 
 		foreach ($ids as $id) {
 
-			$result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+			$result = db_query( "SELECT id FROM ttrss_feeds WHERE
 				id = '$id' AND owner_uid = ".$_SESSION["uid"]);
 
 			if (db_num_rows($result) == 1) {
-				purge_feed($this->link, $id, $days);
+				purge_feed( $id, $days);
 			}
 		}
 	}
 
 	function updateFeedBrowser() {
-		$search = db_escape_string($this->link, $_REQUEST["search"]);
-		$limit = db_escape_string($this->link, $_REQUEST["limit"]);
-		$mode = (int) db_escape_string($this->link, $_REQUEST["mode"]);
+		$search = db_escape_string( $_REQUEST["search"]);
+		$limit = db_escape_string( $_REQUEST["limit"]);
+		$mode = (int) db_escape_string( $_REQUEST["mode"]);
 
 		require_once "feedbrowser.php";
 
 		print json_encode(array("content" =>
-			make_feed_browser($this->link, $search, $limit, $mode),
+			make_feed_browser( $search, $limit, $mode),
 				"mode" => $mode));
 	}
 
@@ -402,14 +402,14 @@ class RPC extends Handler_Protected {
 		if ($mode == 1) {
 			foreach ($payload as $feed) {
 
-				$title = db_escape_string($this->link, $feed[0]);
-				$feed_url = db_escape_string($this->link, $feed[1]);
+				$title = db_escape_string( $feed[0]);
+				$feed_url = db_escape_string( $feed[1]);
 
-				$result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+				$result = db_query( "SELECT id FROM ttrss_feeds WHERE
 					feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
 				if (db_num_rows($result) == 0) {
-					$result = db_query($this->link, "INSERT INTO ttrss_feeds
+					$result = db_query( "INSERT INTO ttrss_feeds
 									(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES ('".$_SESSION["uid"]."',
 									'$feed_url', '$title', NULL, '')");
@@ -418,19 +418,19 @@ class RPC extends Handler_Protected {
 		} else if ($mode == 2) {
 			// feed archive
 			foreach ($payload as $id) {
-				$result = db_query($this->link, "SELECT * FROM ttrss_archived_feeds
+				$result = db_query( "SELECT * FROM ttrss_archived_feeds
 					WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
 				if (db_num_rows($result) != 0) {
-					$site_url = db_escape_string($this->link, db_fetch_result($result, 0, "site_url"));
-					$feed_url = db_escape_string($this->link, db_fetch_result($result, 0, "feed_url"));
-					$title = db_escape_string($this->link, db_fetch_result($result, 0, "title"));
+					$site_url = db_escape_string( db_fetch_result($result, 0, "site_url"));
+					$feed_url = db_escape_string( db_fetch_result($result, 0, "feed_url"));
+					$title = db_escape_string( db_fetch_result($result, 0, "title"));
 
-					$result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+					$result = db_query( "SELECT id FROM ttrss_feeds WHERE
 						feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
 					if (db_num_rows($result) == 0) {
-						$result = db_query($this->link, "INSERT INTO ttrss_feeds
+						$result = db_query( "INSERT INTO ttrss_feeds
 										(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES ('$id','".$_SESSION["uid"]."',
 									'$feed_url', '$title', NULL, '$site_url')");
@@ -441,21 +441,21 @@ class RPC extends Handler_Protected {
 	}
 
 	function catchupFeed() {
-		$feed_id = db_escape_string($this->link, $_REQUEST['feed_id']);
-		$is_cat = db_escape_string($this->link, $_REQUEST['is_cat']) == "true";
-		$mode = db_escape_string($this->link, $_REQUEST['mode']);
+		$feed_id = db_escape_string( $_REQUEST['feed_id']);
+		$is_cat = db_escape_string( $_REQUEST['is_cat']) == "true";
+		$mode = db_escape_string( $_REQUEST['mode']);
 
-		catchup_feed($this->link, $feed_id, $is_cat, false, false, $mode);
+		catchup_feed( $feed_id, $is_cat, false, false, $mode);
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
 	function quickAddCat() {
-		$cat = db_escape_string($this->link, $_REQUEST["cat"]);
+		$cat = db_escape_string( $_REQUEST["cat"]);
 
-		add_feed_category($this->link, $cat);
+		add_feed_category( $cat);
 
-		$result = db_query($this->link, "SELECT id FROM ttrss_feed_categories WHERE
+		$result = db_query( "SELECT id FROM ttrss_feed_categories WHERE
 			title = '$cat' AND owner_uid = " . $_SESSION["uid"]);
 
 		if (db_num_rows($result) == 1) {
@@ -464,12 +464,12 @@ class RPC extends Handler_Protected {
 			$id = 0;
 		}
 
-		print_feed_cat_select($this->link, "cat_id", $id);
+		print_feed_cat_select( "cat_id", $id);
 	}
 
 	// Silent
 	function clearArticleKeys() {
-		db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '' WHERE
+		db_query( "UPDATE ttrss_user_entries SET uuid = '' WHERE
 			owner_uid = " . $_SESSION["uid"]);
 
 		return;
@@ -516,7 +516,7 @@ class RPC extends Handler_Protected {
 		$random_qpart = sql_random_function();
 
 		// We search for feed needing update.
-		$result = db_query($this->link, "SELECT ttrss_feeds.feed_url,ttrss_feeds.id
+		$result = db_query( "SELECT ttrss_feeds.feed_url,ttrss_feeds.id
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -539,7 +539,7 @@ class RPC extends Handler_Protected {
 			$feed_id = $line["id"];
 
 			if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
-				update_rss_feed($this->link, $feed_id, true);
+				update_rss_feed( $feed_id, true);
 				++$num_updated;
 			} else {
 				break;
@@ -547,8 +547,8 @@ class RPC extends Handler_Protected {
 		}
 
 		// Purge orphans and cleanup tags
-		purge_orphans($this->link);
-		cleanup_tags($this->link, 14, 50000);
+		purge_orphans();
+		cleanup_tags( 14, 50000);
 
 		if ($num_updated > 0) {
 			print json_encode(array("message" => "UPDATE_COUNTERS",
@@ -559,7 +559,7 @@ class RPC extends Handler_Protected {
 
 	}
 
-	private function markArticlesById($link, $ids, $cmode) {
+	private function markArticlesById( $ids, $cmode) {
 
 		$tmp_ids = array();
 
@@ -570,21 +570,21 @@ class RPC extends Handler_Protected {
 		$ids_qpart = join(" OR ", $tmp_ids);
 
 		if ($cmode == 0) {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			marked = false, last_marked = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else if ($cmode == 1) {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			marked = true, last_marked = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			marked = NOT marked,last_marked = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		}
 	}
 
-	private function publishArticlesById($link, $ids, $cmode) {
+	private function publishArticlesById( $ids, $cmode) {
 
 		$tmp_ids = array();
 
@@ -595,15 +595,15 @@ class RPC extends Handler_Protected {
 		$ids_qpart = join(" OR ", $tmp_ids);
 
 		if ($cmode == 0) {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			published = false,last_published = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else if ($cmode == 1) {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			published = true,last_published = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			db_query($link, "UPDATE ttrss_user_entries SET
+			db_query( "UPDATE ttrss_user_entries SET
 			published = NOT published,last_published = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		}
@@ -611,7 +611,7 @@ class RPC extends Handler_Protected {
 		if (PUBSUBHUBBUB_HUB) {
 			$rss_link = get_self_url_prefix() .
 				"/public.php?op=rss&id=-2&key=" .
-				get_feed_access_key($link, -2, false);
+				get_feed_access_key( -2, false);
 
 			$p = new Publisher(PUBSUBHUBBUB_HUB);
 
@@ -620,9 +620,9 @@ class RPC extends Handler_Protected {
 	}
 
 	function getlinktitlebyid() {
-		$id = db_escape_string($this->link, $_REQUEST['id']);
+		$id = db_escape_string( $_REQUEST['id']);
 
-		$result = db_query($this->link, "SELECT link, title FROM ttrss_entries, ttrss_user_entries
+		$result = db_query( "SELECT link, title FROM ttrss_entries, ttrss_user_entries
 			WHERE ref_id = '$id' AND ref_id = id AND owner_uid = ". $_SESSION["uid"]);
 
 		if (db_num_rows($result) != 0) {
-- 
cgit v1.2.3


From eefaa2df381686f771396baae2d0ae71b345c2e7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 17:00:24 +0400
Subject: remove db_connect, db_close; CLI fixes

---
 classes/db/mysql.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'classes')

diff --git a/classes/db/mysql.php b/classes/db/mysql.php
index 241d2a063..fe5d05e2f 100644
--- a/classes/db/mysql.php
+++ b/classes/db/mysql.php
@@ -4,6 +4,7 @@ class Db_Mysql implements IDb {
 
 	function connect($host, $user, $pass, $db, $port) {
 		$this->link = mysql_connect($host, $user, $pass);
+
 		if ($this->link) {
 			$result = mysql_select_db($db, $this->link);
 			if (!$result) {
-- 
cgit v1.2.3


From a0ed0d38d467a7ceb5e576e8b363b5ee1af05ab1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 18:27:41 +0400
Subject: auth_remote: fix typo

---
 classes/auth/base.php | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'classes')

diff --git a/classes/auth/base.php b/classes/auth/base.php
index c2a6bd704..102a19778 100644
--- a/classes/auth/base.php
+++ b/classes/auth/base.php
@@ -1,11 +1,5 @@
 <?php
 class Auth_Base {
-	protected $dbh;
-
-	function __construct($dbh) {
-		$this->dbh = $dbh;
-	}
-
 	function check_password($owner_uid, $password) {
 		return false;
 	}
-- 
cgit v1.2.3


From 72ff0137298f60970c664f0be24327b120bf4ac7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 18:30:22 +0400
Subject: fix pluginhost created without dbh

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

(limited to 'classes')

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index faab69235..514f0a2e3 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -769,7 +769,7 @@ class Pref_Prefs extends Handler_Protected {
 		$system_enabled = array_map("trim", explode(",", PLUGINS));
 		$user_enabled = array_map("trim", explode(",", get_pref( "_ENABLED_PLUGINS")));
 
-		$tmppluginhost = new PluginHost();
+		$tmppluginhost = new PluginHost(Db::get());
 		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
 		$tmppluginhost->load_data(true);
 
-- 
cgit v1.2.3


From a42c55f02b7e313ab61bf826794d0888f2dceae1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 18:34:18 +0400
Subject: fix blank character after opening bracket in function calls

---
 classes/api.php            | 172 ++++++++++++++---------------
 classes/article.php        | 104 +++++++++---------
 classes/auth/base.php      |   8 +-
 classes/backend.php        |   2 +-
 classes/db/pgsql.php       |   4 +-
 classes/dbupdater.php      |  10 +-
 classes/dlg.php            |  18 +--
 classes/feeds.php          | 124 ++++++++++-----------
 classes/handler/public.php | 128 +++++++++++-----------
 classes/logger/sql.php     |   2 +-
 classes/opml.php           |  98 ++++++++---------
 classes/pluginhost.php     |  18 +--
 classes/pref/feeds.php     | 268 ++++++++++++++++++++++-----------------------
 classes/pref/filters.php   | 124 ++++++++++-----------
 classes/pref/labels.php    |  66 +++++------
 classes/pref/prefs.php     |  54 ++++-----
 classes/pref/system.php    |   2 +-
 classes/pref/users.php     |  50 ++++-----
 classes/rpc.php            | 204 +++++++++++++++++-----------------
 classes/sessionhandler.php |   4 +-
 20 files changed, 730 insertions(+), 730 deletions(-)

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index 10e511919..422fc5a1b 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -18,7 +18,7 @@ class API extends Handler {
 				return false;
 			}
 
-			if ($_SESSION["uid"] && $method != "logout" && !get_pref( 'ENABLE_API_ACCESS')) {
+			if ($_SESSION["uid"] && $method != "logout" && !get_pref('ENABLE_API_ACCESS')) {
 				print $this->wrap(self::STATUS_ERR, array("error" => 'API_DISABLED'));
 				return false;
 			}
@@ -50,13 +50,13 @@ class API extends Handler {
 		@session_destroy();
 		@session_start();
 
-		$login = db_escape_string( $_REQUEST["user"]);
+		$login = db_escape_string($_REQUEST["user"]);
 		$password = $_REQUEST["password"];
 		$password_base64 = base64_decode($_REQUEST["password"]);
 
 		if (SINGLE_USER_MODE) $login = "admin";
 
-		$result = db_query( "SELECT id FROM ttrss_users WHERE login = '$login'");
+		$result = db_query("SELECT id FROM ttrss_users WHERE login = '$login'");
 
 		if (db_num_rows($result) != 0) {
 			$uid = db_fetch_result($result, 0, "id");
@@ -69,11 +69,11 @@ class API extends Handler {
 			return;
 		}
 
-		if (get_pref( "ENABLE_API_ACCESS", $uid)) {
-			if (authenticate_user( $login, $password)) {               // try login with normal password
+		if (get_pref("ENABLE_API_ACCESS", $uid)) {
+			if (authenticate_user($login, $password)) {               // try login with normal password
 				print $this->wrap(self::STATUS_OK, array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
-			} else if (authenticate_user( $login, $password_base64)) { // else try with base64_decoded password
+			} else if (authenticate_user($login, $password_base64)) { // else try with base64_decoded password
 				print $this->wrap(self::STATUS_OK,	array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
 			} else {                                                         // else we are not logged in
@@ -95,11 +95,11 @@ class API extends Handler {
 	}
 
 	function getUnread() {
-		$feed_id = db_escape_string( $_REQUEST["feed_id"]);
-		$is_cat = db_escape_string( $_REQUEST["is_cat"]);
+		$feed_id = db_escape_string($_REQUEST["feed_id"]);
+		$is_cat = db_escape_string($_REQUEST["is_cat"]);
 
 		if ($feed_id) {
-			print $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread( $feed_id, $is_cat)));
+			print $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
 		} else {
 			print $this->wrap(self::STATUS_OK, array("unread" => getGlobalUnread()));
 		}
@@ -111,13 +111,13 @@ class API extends Handler {
 	}
 
 	function getFeeds() {
-		$cat_id = db_escape_string( $_REQUEST["cat_id"]);
+		$cat_id = db_escape_string($_REQUEST["cat_id"]);
 		$unread_only = sql_bool_to_bool($_REQUEST["unread_only"]);
-		$limit = (int) db_escape_string( $_REQUEST["limit"]);
-		$offset = (int) db_escape_string( $_REQUEST["offset"]);
+		$limit = (int) db_escape_string($_REQUEST["limit"]);
+		$offset = (int) db_escape_string($_REQUEST["offset"]);
 		$include_nested = sql_bool_to_bool($_REQUEST["include_nested"]);
 
-		$feeds = $this->api_get_feeds( $cat_id, $unread_only, $limit, $offset, $include_nested);
+		$feeds = $this->api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested);
 
 		print $this->wrap(self::STATUS_OK, $feeds);
 	}
@@ -134,7 +134,7 @@ class API extends Handler {
 		else
 			$nested_qpart = "true";
 
-		$result = db_query( "SELECT
+		$result = db_query("SELECT
 				id, title, order_id, (SELECT COUNT(id) FROM
 				ttrss_feeds WHERE
 				ttrss_feed_categories.id IS NOT NULL AND cat_id = ttrss_feed_categories.id) AS num_feeds,
@@ -149,10 +149,10 @@ class API extends Handler {
 
 		while ($line = db_fetch_assoc($result)) {
 			if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
-				$unread = getFeedUnread( $line["id"], true);
+				$unread = getFeedUnread($line["id"], true);
 
 				if ($enable_nested)
-					$unread += getCategoryChildrenUnread( $line["id"]);
+					$unread += getCategoryChildrenUnread($line["id"]);
 
 				if ($unread || !$unread_only) {
 					array_push($cats, array("id" => $line["id"],
@@ -166,11 +166,11 @@ class API extends Handler {
 
 		foreach (array(-2,-1,0) as $cat_id) {
 			if ($include_empty || !$this->isCategoryEmpty($cat_id)) {
-				$unread = getFeedUnread( $cat_id, true);
+				$unread = getFeedUnread($cat_id, true);
 
 				if ($unread || !$unread_only) {
 					array_push($cats, array("id" => $cat_id,
-						"title" => getCategoryTitle( $cat_id),
+						"title" => getCategoryTitle($cat_id),
 						"unread" => $unread));
 				}
 			}
@@ -180,22 +180,22 @@ class API extends Handler {
 	}
 
 	function getHeadlines() {
-		$feed_id = db_escape_string( $_REQUEST["feed_id"]);
+		$feed_id = db_escape_string($_REQUEST["feed_id"]);
 		if ($feed_id != "") {
 
-			$limit = (int)db_escape_string( $_REQUEST["limit"]);
+			$limit = (int)db_escape_string($_REQUEST["limit"]);
 
 			if (!$limit || $limit >= 60) $limit = 60;
 
-			$offset = (int)db_escape_string( $_REQUEST["skip"]);
-			$filter = db_escape_string( $_REQUEST["filter"]);
+			$offset = (int)db_escape_string($_REQUEST["skip"]);
+			$filter = db_escape_string($_REQUEST["filter"]);
 			$is_cat = sql_bool_to_bool($_REQUEST["is_cat"]);
 			$show_excerpt = sql_bool_to_bool($_REQUEST["show_excerpt"]);
 			$show_content = sql_bool_to_bool($_REQUEST["show_content"]);
 			/* all_articles, unread, adaptive, marked, updated */
-			$view_mode = db_escape_string( $_REQUEST["view_mode"]);
+			$view_mode = db_escape_string($_REQUEST["view_mode"]);
 			$include_attachments = sql_bool_to_bool($_REQUEST["include_attachments"]);
-			$since_id = (int)db_escape_string( $_REQUEST["since_id"]);
+			$since_id = (int)db_escape_string($_REQUEST["since_id"]);
 			$include_nested = sql_bool_to_bool($_REQUEST["include_nested"]);
 			$sanitize_content = true;
 
@@ -211,10 +211,10 @@ class API extends Handler {
 
 			/* do not rely on params below */
 
-			$search = db_escape_string( $_REQUEST["search"]);
-			$search_mode = db_escape_string( $_REQUEST["search_mode"]);
+			$search = db_escape_string($_REQUEST["search"]);
+			$search_mode = db_escape_string($_REQUEST["search_mode"]);
 
-			$headlines = $this->api_get_headlines( $feed_id, $limit, $offset,
+			$headlines = $this->api_get_headlines($feed_id, $limit, $offset,
 				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order,
 				$include_attachments, $since_id, $search, $search_mode,
 				$include_nested, $sanitize_content);
@@ -226,10 +226,10 @@ class API extends Handler {
 	}
 
 	function updateArticle() {
-		$article_ids = array_filter(explode(",", db_escape_string( $_REQUEST["article_ids"])), is_numeric);
-		$mode = (int) db_escape_string( $_REQUEST["mode"]);
-		$data = db_escape_string( $_REQUEST["data"]);
-		$field_raw = (int)db_escape_string( $_REQUEST["field"]);
+		$article_ids = array_filter(explode(",", db_escape_string($_REQUEST["article_ids"])), is_numeric);
+		$mode = (int) db_escape_string($_REQUEST["mode"]);
+		$data = db_escape_string($_REQUEST["data"]);
+		$field_raw = (int)db_escape_string($_REQUEST["field"]);
 
 		$field = "";
 		$set_to = "";
@@ -269,16 +269,16 @@ class API extends Handler {
 
 			$article_ids = join(", ", $article_ids);
 
-			$result = db_query( "UPDATE ttrss_user_entries SET $field = $set_to $additional_fields WHERE ref_id IN ($article_ids) AND owner_uid = " . $_SESSION["uid"]);
+			$result = db_query("UPDATE ttrss_user_entries SET $field = $set_to $additional_fields WHERE ref_id IN ($article_ids) AND owner_uid = " . $_SESSION["uid"]);
 
-			$num_updated = db_affected_rows( $result);
+			$num_updated = db_affected_rows($result);
 
 			if ($num_updated > 0 && $field == "unread") {
-				$result = db_query( "SELECT DISTINCT feed_id FROM ttrss_user_entries
+				$result = db_query("SELECT DISTINCT feed_id FROM ttrss_user_entries
 					WHERE ref_id IN ($article_ids)");
 
 				while ($line = db_fetch_assoc($result)) {
-					ccache_update( $line["feed_id"], $_SESSION["uid"]);
+					ccache_update($line["feed_id"], $_SESSION["uid"]);
 				}
 			}
 
@@ -286,7 +286,7 @@ class API extends Handler {
 				if (PUBSUBHUBBUB_HUB) {
 					$rss_link = get_self_url_prefix() .
 						"/public.php?op=rss&id=-2&key=" .
-						get_feed_access_key( -2, false);
+						get_feed_access_key(-2, false);
 
 					$p = new Publisher(PUBSUBHUBBUB_HUB);
 					$pubsub_result = $p->publish_update($rss_link);
@@ -304,7 +304,7 @@ class API extends Handler {
 
 	function getArticle() {
 
-		$article_id = join(",", array_filter(explode(",", db_escape_string( $_REQUEST["article_id"])), is_numeric));
+		$article_id = join(",", array_filter(explode(",", db_escape_string($_REQUEST["article_id"])), is_numeric));
 
 		$query = "SELECT id,title,link,content,cached_content,feed_id,comments,int_id,
 			marked,unread,published,score,
@@ -314,7 +314,7 @@ class API extends Handler {
 			WHERE	id IN ($article_id) AND ref_id = id AND owner_uid = " .
 				$_SESSION["uid"] ;
 
-		$result = db_query( $query);
+		$result = db_query($query);
 
 		$articles = array();
 
@@ -322,13 +322,13 @@ class API extends Handler {
 
 			while ($line = db_fetch_assoc($result)) {
 
-				$attachments = get_article_enclosures( $line['id']);
+				$attachments = get_article_enclosures($line['id']);
 
 				$article = array(
 					"id" => $line["id"],
 					"title" => $line["title"],
 					"link" => $line["link"],
-					"labels" => get_article_labels( $line['id']),
+					"labels" => get_article_labels($line['id']),
 					"unread" => sql_bool_to_bool($line["unread"]),
 					"marked" => sql_bool_to_bool($line["marked"]),
 					"published" => sql_bool_to_bool($line["published"]),
@@ -363,7 +363,7 @@ class API extends Handler {
 
 		$config["daemon_is_running"] = file_is_locked("update_daemon.lock");
 
-		$result = db_query( "SELECT COUNT(*) AS cf FROM
+		$result = db_query("SELECT COUNT(*) AS cf FROM
 			ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
 		$num_feeds = db_fetch_result($result, 0, "cf");
@@ -376,41 +376,41 @@ class API extends Handler {
 	function updateFeed() {
 		require_once "include/rssfuncs.php";
 
-		$feed_id = (int) db_escape_string( $_REQUEST["feed_id"]);
+		$feed_id = (int) db_escape_string($_REQUEST["feed_id"]);
 
-		update_rss_feed( $feed_id, true);
+		update_rss_feed($feed_id, true);
 
 		print $this->wrap(self::STATUS_OK, array("status" => "OK"));
 	}
 
 	function catchupFeed() {
-		$feed_id = db_escape_string( $_REQUEST["feed_id"]);
-		$is_cat = db_escape_string( $_REQUEST["is_cat"]);
+		$feed_id = db_escape_string($_REQUEST["feed_id"]);
+		$is_cat = db_escape_string($_REQUEST["is_cat"]);
 
-		catchup_feed( $feed_id, $is_cat);
+		catchup_feed($feed_id, $is_cat);
 
 		print $this->wrap(self::STATUS_OK, array("status" => "OK"));
 	}
 
 	function getPref() {
-		$pref_name = db_escape_string( $_REQUEST["pref_name"]);
+		$pref_name = db_escape_string($_REQUEST["pref_name"]);
 
-		print $this->wrap(self::STATUS_OK, array("value" => get_pref( $pref_name)));
+		print $this->wrap(self::STATUS_OK, array("value" => get_pref($pref_name)));
 	}
 
 	function getLabels() {
-		//$article_ids = array_filter(explode(",", db_escape_string( $_REQUEST["article_ids"])), is_numeric);
+		//$article_ids = array_filter(explode(",", db_escape_string($_REQUEST["article_ids"])), is_numeric);
 
 		$article_id = (int)$_REQUEST['article_id'];
 
 		$rv = array();
 
-		$result = db_query( "SELECT id, caption, fg_color, bg_color
+		$result = db_query("SELECT id, caption, fg_color, bg_color
 			FROM ttrss_labels2
 			WHERE owner_uid = '".$_SESSION['uid']."' ORDER BY caption");
 
 		if ($article_id)
-			$article_labels = get_article_labels( $article_id);
+			$article_labels = get_article_labels($article_id);
 		else
 			$article_labels = array();
 
@@ -437,11 +437,11 @@ class API extends Handler {
 
 	function setArticleLabel() {
 
-		$article_ids = array_filter(explode(",", db_escape_string( $_REQUEST["article_ids"])), is_numeric);
-		$label_id = (int) db_escape_string( $_REQUEST['label_id']);
-		$assign = (bool) db_escape_string( $_REQUEST['assign']) == "true";
+		$article_ids = array_filter(explode(",", db_escape_string($_REQUEST["article_ids"])), is_numeric);
+		$label_id = (int) db_escape_string($_REQUEST['label_id']);
+		$assign = (bool) db_escape_string($_REQUEST['assign']) == "true";
 
-		$label = db_escape_string( label_find_caption(
+		$label = db_escape_string(label_find_caption(
 			$label_id, $_SESSION["uid"]));
 
 		$num_updated = 0;
@@ -451,9 +451,9 @@ class API extends Handler {
 			foreach ($article_ids as $id) {
 
 				if ($assign)
-					label_add_article( $id, $label, $_SESSION["uid"]);
+					label_add_article($id, $label, $_SESSION["uid"]);
 				else
-					label_remove_article( $id, $label, $_SESSION["uid"]);
+					label_remove_article($id, $label, $_SESSION["uid"]);
 
 				++$num_updated;
 
@@ -481,25 +481,25 @@ class API extends Handler {
 	}
 
 	function shareToPublished() {
-		$title = db_escape_string( strip_tags($_REQUEST["title"]));
-		$url = db_escape_string( strip_tags($_REQUEST["url"]));
-		$content = db_escape_string( strip_tags($_REQUEST["content"]));
+		$title = db_escape_string(strip_tags($_REQUEST["title"]));
+		$url = db_escape_string(strip_tags($_REQUEST["url"]));
+		$content = db_escape_string(strip_tags($_REQUEST["content"]));
 
-		if (Article::create_published_article( $title, $url, $content, "", $_SESSION["uid"])) {
+		if (Article::create_published_article($title, $url, $content, "", $_SESSION["uid"])) {
 			print $this->wrap(self::STATUS_OK, array("status" => 'OK'));
 		} else {
 			print $this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
 		}
 	}
 
-	static function api_get_feeds( $cat_id, $unread_only, $limit, $offset, $include_nested = false) {
+	static function api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested = false) {
 
 			$feeds = array();
 
 			/* Labels */
 
 			if ($cat_id == -4 || $cat_id == -2) {
-				$counters = getLabelCounters( true);
+				$counters = getLabelCounters(true);
 
 				foreach (array_values($counters) as $cv) {
 
@@ -523,10 +523,10 @@ class API extends Handler {
 
 			if ($cat_id == -4 || $cat_id == -1) {
 				foreach (array(-1, -2, -3, -4, -6, 0) as $i) {
-					$unread = getFeedUnread( $i);
+					$unread = getFeedUnread($i);
 
 					if ($unread || !$unread_only) {
-						$title = getFeedTitle( $i);
+						$title = getFeedTitle($i);
 
 						$row = array(
 								"id" => $i,
@@ -543,14 +543,14 @@ class API extends Handler {
 			/* Child cats */
 
 			if ($include_nested && $cat_id) {
-				$result = db_query( "SELECT
+				$result = db_query("SELECT
 					id, title FROM ttrss_feed_categories
 					WHERE parent_cat = '$cat_id' AND owner_uid = " . $_SESSION["uid"] .
 				" ORDER BY id, title");
 
 				while ($line = db_fetch_assoc($result)) {
-					$unread = getFeedUnread( $line["id"], true) +
-						getCategoryChildrenUnread( $line["id"]);
+					$unread = getFeedUnread($line["id"], true) +
+						getCategoryChildrenUnread($line["id"]);
 
 					if ($unread || !$unread_only) {
 						$row = array(
@@ -573,7 +573,7 @@ class API extends Handler {
 			}
 
 			if ($cat_id == -4 || $cat_id == -3) {
-				$result = db_query( "SELECT
+				$result = db_query("SELECT
 					id, feed_url, cat_id, title, order_id, ".
 						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 						FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] .
@@ -585,7 +585,7 @@ class API extends Handler {
 				else
 					$cat_qpart = "cat_id IS NULL";
 
-				$result = db_query( "SELECT
+				$result = db_query("SELECT
 					id, feed_url, cat_id, title, order_id, ".
 						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 						FROM ttrss_feeds WHERE
@@ -595,7 +595,7 @@ class API extends Handler {
 
 			while ($line = db_fetch_assoc($result)) {
 
-				$unread = getFeedUnread( $line["id"]);
+				$unread = getFeedUnread($line["id"]);
 
 				$has_icon = feed_has_icon($line['id']);
 
@@ -619,13 +619,13 @@ class API extends Handler {
 		return $feeds;
 	}
 
-	static function api_get_headlines( $feed_id, $limit, $offset,
+	static function api_get_headlines($feed_id, $limit, $offset,
 				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
 				$include_attachments, $since_id,
 				$search = "", $search_mode = "",
 				$include_nested = false, $sanitize_content = true) {
 
-			$qfh_ret = queryFeedHeadlines( $feed_id, $limit,
+			$qfh_ret = queryFeedHeadlines($feed_id, $limit,
 				$view_mode, $is_cat, $search, $search_mode,
 				$order, $offset, 0, false, $since_id, $include_nested);
 
@@ -641,8 +641,8 @@ class API extends Handler {
 				$tags = explode(",", $line["tag_cache"]);
 				$labels = json_decode($line["label_cache"], true);
 
-				//if (!$tags) $tags = get_article_tags( $line["id"]);
-				//if (!$labels) $labels = get_article_labels( $line["id"]);
+				//if (!$tags) $tags = get_article_tags($line["id"]);
+				//if (!$labels) $labels = get_article_labels($line["id"]);
 
 				$headline_row = array(
 						"id" => (int)$line["id"],
@@ -709,13 +709,13 @@ class API extends Handler {
 	}
 
 	function unsubscribeFeed() {
-		$feed_id = (int) db_escape_string( $_REQUEST["feed_id"]);
+		$feed_id = (int) db_escape_string($_REQUEST["feed_id"]);
 
-		$result = db_query( "SELECT id FROM ttrss_feeds WHERE
+		$result = db_query("SELECT id FROM ttrss_feeds WHERE
 			id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
 
 		if (db_num_rows($result) != 0) {
-			Pref_Feeds::remove_feed( $feed_id, $_SESSION["uid"]);
+			Pref_Feeds::remove_feed($feed_id, $_SESSION["uid"]);
 			print $this->wrap(self::STATUS_OK, array("status" => "OK"));
 		} else {
 			print $this->wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
@@ -723,13 +723,13 @@ class API extends Handler {
 	}
 
 	function subscribeToFeed() {
-		$feed_url = db_escape_string( $_REQUEST["feed_url"]);
-		$category_id = (int) db_escape_string( $_REQUEST["category_id"]);
-		$login = db_escape_string( $_REQUEST["login"]);
-		$password = db_escape_string( $_REQUEST["password"]);
+		$feed_url = db_escape_string($_REQUEST["feed_url"]);
+		$category_id = (int) db_escape_string($_REQUEST["category_id"]);
+		$login = db_escape_string($_REQUEST["login"]);
+		$password = db_escape_string($_REQUEST["password"]);
 
 		if ($feed_url) {
-			$rc = subscribe_to_feed( $feed_url, $category_id,
+			$rc = subscribe_to_feed($feed_url, $category_id,
 				$login, $password, false);
 
 			print $this->wrap(self::STATUS_OK, array("status" => $rc));
@@ -741,7 +741,7 @@ class API extends Handler {
 	function getFeedTree() {
 		$include_empty = sql_bool_to_bool($_REQUEST['include_empty']);
 
-		$pf = new Pref_Feeds( $_REQUEST);
+		$pf = new Pref_Feeds($_REQUEST);
 
 		$_REQUEST['mode'] = 2;
 		$_REQUEST['force_show_empty'] = $include_empty;
@@ -760,13 +760,13 @@ class API extends Handler {
 	private function isCategoryEmpty($id) {
 
 		if ($id == -2) {
-			$result = db_query( "SELECT COUNT(*) AS count FROM ttrss_labels2
+			$result = db_query("SELECT COUNT(*) AS count FROM ttrss_labels2
 				WHERE owner_uid = " . $_SESSION["uid"]);
 
 			return db_fetch_result($result, 0, "count") == 0;
 
 		} else if ($id == 0) {
-			$result = db_query( "SELECT COUNT(*) AS count FROM ttrss_feeds
+			$result = db_query("SELECT COUNT(*) AS count FROM ttrss_feeds
 				WHERE cat_id IS NULL AND owner_uid = " . $_SESSION["uid"]);
 
 			return db_fetch_result($result, 0, "count") == 0;
diff --git a/classes/article.php b/classes/article.php
index 9917d4d06..df850daca 100644
--- a/classes/article.php
+++ b/classes/article.php
@@ -8,9 +8,9 @@ class Article extends Handler_Protected {
 	}
 
 	function redirect() {
-		$id = db_escape_string( $_REQUEST['id']);
+		$id = db_escape_string($_REQUEST['id']);
 
-		$result = db_query( "SELECT link FROM ttrss_entries, ttrss_user_entries
+		$result = db_query("SELECT link FROM ttrss_entries, ttrss_user_entries
 						WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'
 						LIMIT 1");
 
@@ -27,10 +27,10 @@ class Article extends Handler_Protected {
 	}
 
 	function view() {
-		$id = db_escape_string( $_REQUEST["id"]);
-		$cids = explode(",", db_escape_string( $_REQUEST["cids"]));
-		$mode = db_escape_string( $_REQUEST["mode"]);
-		$omode = db_escape_string( $_REQUEST["omode"]);
+		$id = db_escape_string($_REQUEST["id"]);
+		$cids = explode(",", db_escape_string($_REQUEST["cids"]));
+		$mode = db_escape_string($_REQUEST["mode"]);
+		$omode = db_escape_string($_REQUEST["omode"]);
 
 		// in prefetch mode we only output requested cids, main article
 		// just gets marked as read (it already exists in client cache)
@@ -38,26 +38,26 @@ class Article extends Handler_Protected {
 		$articles = array();
 
 		if ($mode == "") {
-			array_push($articles, format_article( $id, false));
+			array_push($articles, format_article($id, false));
 		} else if ($mode == "zoom") {
-			array_push($articles, format_article( $id, true, true));
+			array_push($articles, format_article($id, true, true));
 		} else if ($mode == "raw") {
 			if ($_REQUEST['html']) {
 				header("Content-Type: text/html");
 				print '<link rel="stylesheet" type="text/css" href="tt-rss.css"/>';
 			}
 
-			$article = format_article( $id, false);
+			$article = format_article($id, false);
 			print $article['content'];
 			return;
 		}
 
-		$this->catchupArticleById( $id, 0);
+		$this->catchupArticleById($id, 0);
 
 		if (!$_SESSION["bw_limit"]) {
 			foreach ($cids as $cid) {
 				if ($cid) {
-					array_push($articles, format_article( $cid, false, false));
+					array_push($articles, format_article($cid, false, false));
 				}
 			}
 		}
@@ -65,27 +65,27 @@ class Article extends Handler_Protected {
 		print json_encode($articles);
 	}
 
-	private function catchupArticleById( $id, $cmode) {
+	private function catchupArticleById($id, $cmode) {
 
 		if ($cmode == 0) {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			unread = false,last_read = NOW()
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		} else if ($cmode == 1) {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			unread = true
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			unread = NOT unread,last_read = NOW()
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		}
 
-		$feed_id = getArticleFeed( $id);
-		ccache_update( $feed_id, $_SESSION["uid"]);
+		$feed_id = getArticleFeed($id);
+		ccache_update($feed_id, $_SESSION["uid"]);
 	}
 
-	static function create_published_article( $title, $url, $content, $labels_str,
+	static function create_published_article($title, $url, $content, $labels_str,
 			$owner_uid) {
 
 		$guid = 'SHA1:' . sha1("ttshared:" . $url . $owner_uid); // include owner_uid to prevent global GUID clash
@@ -104,30 +104,30 @@ class Article extends Handler_Protected {
 
 		if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) return false;
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
 		// only check for our user data here, others might have shared this with different content etc
-		$result = db_query( "SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
+		$result = db_query("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
 			link = '$url' AND ref_id = id AND owner_uid = '$owner_uid' LIMIT 1");
 
 		if (db_num_rows($result) != 0) {
 			$ref_id = db_fetch_result($result, 0, "id");
 
-			$result = db_query( "SELECT int_id FROM ttrss_user_entries WHERE
+			$result = db_query("SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = '$ref_id' AND owner_uid = '$owner_uid' LIMIT 1");
 
 			if (db_num_rows($result) != 0) {
 				$int_id = db_fetch_result($result, 0, "int_id");
 
-				db_query( "UPDATE ttrss_entries SET
+				db_query("UPDATE ttrss_entries SET
 					content = '$content', content_hash = '$content_hash' WHERE id = '$ref_id'");
 
-				db_query( "UPDATE ttrss_user_entries SET published = true,
+				db_query("UPDATE ttrss_user_entries SET published = true,
 						last_published = NOW() WHERE
 						int_id = '$int_id' AND owner_uid = '$owner_uid'");
 			} else {
 
-				db_query( "INSERT INTO ttrss_user_entries
+				db_query("INSERT INTO ttrss_user_entries
 					(ref_id, uuid, feed_id, orig_feed_id, owner_uid, published, tag_cache, label_cache,
 						last_read, note, unread, last_published)
 					VALUES
@@ -136,24 +136,24 @@ class Article extends Handler_Protected {
 
 			if (count($labels) != 0) {
 				foreach ($labels as $label) {
-					label_add_article( $ref_id, trim($label), $owner_uid);
+					label_add_article($ref_id, trim($label), $owner_uid);
 				}
 			}
 
 			$rc = true;
 
 		} else {
-			$result = db_query( "INSERT INTO ttrss_entries
+			$result = db_query("INSERT INTO ttrss_entries
 				(title, guid, link, updated, content, content_hash, date_entered, date_updated)
 				VALUES
 				('$title', '$guid', '$url', NOW(), '$content', '$content_hash', NOW(), NOW())");
 
-			$result = db_query( "SELECT id FROM ttrss_entries WHERE guid = '$guid'");
+			$result = db_query("SELECT id FROM ttrss_entries WHERE guid = '$guid'");
 
 			if (db_num_rows($result) != 0) {
 				$ref_id = db_fetch_result($result, 0, "id");
 
-				db_query( "INSERT INTO ttrss_user_entries
+				db_query("INSERT INTO ttrss_user_entries
 					(ref_id, uuid, feed_id, orig_feed_id, owner_uid, published, tag_cache, label_cache,
 						last_read, note, unread, last_published)
 					VALUES
@@ -161,7 +161,7 @@ class Article extends Handler_Protected {
 
 				if (count($labels) != 0) {
 					foreach ($labels as $label) {
-						label_add_article( $ref_id, trim($label), $owner_uid);
+						label_add_article($ref_id, trim($label), $owner_uid);
 					}
 				}
 
@@ -169,7 +169,7 @@ class Article extends Handler_Protected {
 			}
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 
 		return $rc;
 	}
@@ -178,9 +178,9 @@ class Article extends Handler_Protected {
 
 		print __("Tags for this article (separated by commas):")."<br>";
 
-		$param = db_escape_string( $_REQUEST['param']);
+		$param = db_escape_string($_REQUEST['param']);
 
-		$tags = get_article_tags( db_escape_string( $param));
+		$tags = get_article_tags(db_escape_string($param));
 
 		$tags_str = join(", ", $tags);
 
@@ -209,10 +209,10 @@ class Article extends Handler_Protected {
 	}
 
 	function setScore() {
-		$ids = db_escape_string( $_REQUEST['id']);
-		$score = (int)db_escape_string( $_REQUEST['score']);
+		$ids = db_escape_string($_REQUEST['id']);
+		$score = (int)db_escape_string($_REQUEST['score']);
 
-		db_query( "UPDATE ttrss_user_entries SET
+		db_query("UPDATE ttrss_user_entries SET
 			score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
 		print json_encode(array("id" => $id,
@@ -222,14 +222,14 @@ class Article extends Handler_Protected {
 
 	function setArticleTags() {
 
-		$id = db_escape_string( $_REQUEST["id"]);
+		$id = db_escape_string($_REQUEST["id"]);
 
-		$tags_str = db_escape_string( $_REQUEST["tags_str"]);
+		$tags_str = db_escape_string($_REQUEST["tags_str"]);
 		$tags = array_unique(trim_array(explode(",", $tags_str)));
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
-		$result = db_query( "SELECT int_id FROM ttrss_user_entries WHERE
+		$result = db_query("SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = '$id' AND owner_uid = '".$_SESSION["uid"]."' LIMIT 1");
 
 		if (db_num_rows($result) == 1) {
@@ -238,7 +238,7 @@ class Article extends Handler_Protected {
 
 			$int_id = db_fetch_result($result, 0, "int_id");
 
-			db_query( "DELETE FROM ttrss_tags WHERE
+			db_query("DELETE FROM ttrss_tags WHERE
 				post_int_id = $int_id AND owner_uid = '".$_SESSION["uid"]."'");
 
 			foreach ($tags as $tag) {
@@ -255,7 +255,7 @@ class Article extends Handler_Protected {
 				//					print "<!-- $id : $int_id : $tag -->";
 
 				if ($tag != '') {
-					db_query( "INSERT INTO ttrss_tags
+					db_query("INSERT INTO ttrss_tags
 								(post_int_id, owner_uid, tag_name) VALUES ('$int_id', '".$_SESSION["uid"]."', '$tag')");
 				}
 
@@ -267,14 +267,14 @@ class Article extends Handler_Protected {
 			sort($tags_to_cache);
 			$tags_str = join(",", $tags_to_cache);
 
-			db_query( "UPDATE ttrss_user_entries
+			db_query("UPDATE ttrss_user_entries
 				SET tag_cache = '$tags_str' WHERE ref_id = '$id'
 						AND owner_uid = " . $_SESSION["uid"]);
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 
-		$tags = get_article_tags( $id);
+		$tags = get_article_tags($id);
 		$tags_str = format_tags_string($tags, $id);
 		$tags_str_full = join(", ", $tags);
 
@@ -286,9 +286,9 @@ class Article extends Handler_Protected {
 
 
 	function completeTags() {
-		$search = db_escape_string( $_REQUEST["search"]);
+		$search = db_escape_string($_REQUEST["search"]);
 
-		$result = db_query( "SELECT DISTINCT tag_name FROM ttrss_tags
+		$result = db_query("SELECT DISTINCT tag_name FROM ttrss_tags
 				WHERE owner_uid = '".$_SESSION["uid"]."' AND
 				tag_name LIKE '$search%' ORDER BY tag_name
 				LIMIT 10");
@@ -311,10 +311,10 @@ class Article extends Handler_Protected {
 	private function labelops($assign) {
 		$reply = array();
 
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
-		$label_id = db_escape_string( $_REQUEST["lid"]);
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$label_id = db_escape_string($_REQUEST["lid"]);
 
-		$label = db_escape_string( label_find_caption( $label_id,
+		$label = db_escape_string(label_find_caption($label_id,
 		$_SESSION["uid"]));
 
 		$reply["info-for-headlines"] = array();
@@ -324,11 +324,11 @@ class Article extends Handler_Protected {
 			foreach ($ids as $id) {
 
 				if ($assign)
-					label_add_article( $id, $label, $_SESSION["uid"]);
+					label_add_article($id, $label, $_SESSION["uid"]);
 				else
-					label_remove_article( $id, $label, $_SESSION["uid"]);
+					label_remove_article($id, $label, $_SESSION["uid"]);
 
-				$labels = get_article_labels( $id, $_SESSION["uid"]);
+				$labels = get_article_labels($id, $_SESSION["uid"]);
 
 				array_push($reply["info-for-headlines"],
 				array("id" => $id, "labels" => format_article_labels($labels, $id)));
diff --git a/classes/auth/base.php b/classes/auth/base.php
index 102a19778..782848a79 100644
--- a/classes/auth/base.php
+++ b/classes/auth/base.php
@@ -15,7 +15,7 @@ class Auth_Base {
 			$user_id = $this->find_user_by_login($login);
 
 			if (!$user_id) {
-				$login = db_escape_string( $login);
+				$login = db_escape_string($login);
 				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 				$pwd_hash = encrypt_password($password, $salt, true);
 
@@ -23,7 +23,7 @@ class Auth_Base {
 						(login,access_level,last_login,created,pwd_hash,salt)
 						VALUES ('$login', 0, null, NOW(), '$pwd_hash','$salt')";
 
-				db_query( $query);
+				db_query($query);
 
 				return $this->find_user_by_login($login);
 
@@ -36,9 +36,9 @@ class Auth_Base {
 	}
 
 	function find_user_by_login($login) {
-		$login = db_escape_string( $login);
+		$login = db_escape_string($login);
 
-		$result = db_query( "SELECT id FROM ttrss_users WHERE
+		$result = db_query("SELECT id FROM ttrss_users WHERE
 			login = '$login'");
 
 		if (db_num_rows($result) > 0) {
diff --git a/classes/backend.php b/classes/backend.php
index a04168108..7737df0f6 100644
--- a/classes/backend.php
+++ b/classes/backend.php
@@ -11,7 +11,7 @@ class Backend extends Handler {
 
 		require_once "digest.php";
 
-		$rv = prepare_headlines_digest( $_SESSION['uid'], 1, 1000);
+		$rv = prepare_headlines_digest($_SESSION['uid'], 1, 1000);
 
 		$rv[3] = "<pre>" . $rv[3] . "</pre>";
 
diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index 0cb737978..4d860790b 100644
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -31,11 +31,11 @@ class Db_Pgsql implements IDb {
 	function escape_string($s, $strip_tags = true) {
 		if ($strip_tags) $s = strip_tags($s);
 
-		return pg_escape_string( $s);
+		return pg_escape_string($s);
 	}
 
 	function query($query, $die_on_error = true) {
-		$result = pg_query( $query);
+		$result = pg_query($query);
 
 		if (!$result) {
 			$query = htmlspecialchars($query); // just in case
diff --git a/classes/dbupdater.php b/classes/dbupdater.php
index ffcac7cf7..a319da03d 100644
--- a/classes/dbupdater.php
+++ b/classes/dbupdater.php
@@ -12,7 +12,7 @@ class DbUpdater {
 	}
 
 	function getSchemaVersion() {
-		$result = db_query( "SELECT schema_version FROM ttrss_version");
+		$result = db_query("SELECT schema_version FROM ttrss_version");
 		return (int) db_fetch_result($result, 0, "schema_version");
 	}
 
@@ -37,21 +37,21 @@ class DbUpdater {
 
 			if (is_array($lines)) {
 
-				db_query( "BEGIN");
+				db_query("BEGIN");
 
 				foreach ($lines as $line) {
 					if (strpos($line, "--") !== 0 && $line) {
-						db_query( $line);
+						db_query($line);
 					}
 				}
 
 				$db_version = $this->getSchemaVersion();
 
 				if ($db_version == $version) {
-					db_query( "COMMIT");
+					db_query("COMMIT");
 					return true;
 				} else {
-					db_query( "ROLLBACK");
+					db_query("ROLLBACK");
 					return false;
 				}
 			} else {
diff --git a/classes/dlg.php b/classes/dlg.php
index 99cd7cffa..5e14690c4 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -6,7 +6,7 @@ class Dlg extends Handler_Protected {
 		if (parent::before($method)) {
 			header("Content-Type: text/html"); # required for iframe
 
-			$this->param = db_escape_string( $_REQUEST["param"]);
+			$this->param = db_escape_string($_REQUEST["param"]);
 			return true;
 		}
 		return false;
@@ -18,15 +18,15 @@ class Dlg extends Handler_Protected {
 		print "<div class=\"prefFeedOPMLHolder\">";
 		$owner_uid = $_SESSION["uid"];
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
 		print "<ul class='nomarks'>";
 
-		$opml = new Opml( $_REQUEST);
+		$opml = new Opml($_REQUEST);
 
 		$opml->opml_import($_SESSION["uid"]);
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 
 		print "</ul>";
 		print "</div>";
@@ -106,7 +106,7 @@ class Dlg extends Handler_Protected {
 			FROM ttrss_tags WHERE owner_uid = ".$_SESSION["uid"]."
 			GROUP BY tag_name ORDER BY count DESC LIMIT 50";
 
-		$result = db_query( $query);
+		$result = db_query($query);
 
 		$tags = array();
 
@@ -114,7 +114,7 @@ class Dlg extends Handler_Protected {
 			$tags[$line["tag_name"]] = $line["count"];
 		}
 
-        if( count($tags) == 0 ){ return; }
+        if(count($tags) == 0 ){ return; }
 
 		ksort($tags);
 
@@ -171,7 +171,7 @@ class Dlg extends Handler_Protected {
 		print "<label for=\"tag_mode_all\">".__("All tags.")."</input>";
 
 		print "<select id=\"all_tags\" name=\"all_tags\" title=\"" . __('Which Tags?') . "\" multiple=\"multiple\" size=\"10\" style=\"width : 100%\">";
-		$result = db_query( "SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
+		$result = db_query("SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
 			AND LENGTH(tag_name) <= 30 ORDER BY tag_name ASC");
 
 		while ($row = db_fetch_assoc($result)) {
@@ -195,10 +195,10 @@ class Dlg extends Handler_Protected {
 	function generatedFeed() {
 
 		$this->params = explode(":", $this->param, 3);
-		$feed_id = db_escape_string( $this->params[0]);
+		$feed_id = db_escape_string($this->params[0]);
 		$is_cat = (bool) $this->params[1];
 
-		$key = get_feed_access_key( $feed_id, $is_cat);
+		$key = get_feed_access_key($feed_id, $is_cat);
 
 		$url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
 
diff --git a/classes/feeds.php b/classes/feeds.php
index 1c3ad58c5..153c0f5aa 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -174,16 +174,16 @@ class Feeds extends Handler_Protected {
 
 					if (!$cache_images && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {
 						include "rssfuncs.php";
-						update_rss_feed( $feed, true, true);
+						update_rss_feed($feed, true, true);
 					} else {
-						db_query( "UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
+						db_query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
 							WHERE id = '$feed'");
 					}
 				}
 		}
 
 		if ($method_split[0] == "MarkAllReadGR")  {
-			catchup_feed( $method_split[1], false);
+			catchup_feed($method_split[1], false);
 		}
 
 		// FIXME: might break tag display?
@@ -197,18 +197,18 @@ class Feeds extends Handler_Protected {
 			}
 		}
 
-		@$search = db_escape_string( $_REQUEST["query"]);
+		@$search = db_escape_string($_REQUEST["query"]);
 
 		if ($search) {
 			$disable_cache = true;
 		}
 
-		@$search_mode = db_escape_string( $_REQUEST["search_mode"]);
+		@$search_mode = db_escape_string($_REQUEST["search_mode"]);
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
 
 //		error_log("format_headlines_list: [" . $feed . "] method [" . $method . "]");
-		if( $search_mode == '' && $method != '' ){
+		if($search_mode == '' && $method != '' ){
 		    $search_mode = $method;
 		}
 //		error_log("search_mode: " . $search_mode);
@@ -240,7 +240,7 @@ class Feeds extends Handler_Protected {
 			}
 
 		} else {
-			$qfh_ret = queryFeedHeadlines( $feed, $limit, $view_mode, $cat_view,
+			$qfh_ret = queryFeedHeadlines($feed, $limit, $view_mode, $cat_view,
 				$search, $search_mode, $override_order, $offset, 0,
 				false, 0, $include_children);
 		}
@@ -261,7 +261,7 @@ class Feeds extends Handler_Protected {
 
 		$headlines_count = db_num_rows($result);
 
-		/* if (get_pref( 'COMBINED_DISPLAY_MODE')) {
+		/* if (get_pref('COMBINED_DISPLAY_MODE')) {
 			$button_plugins = array();
 			foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {
 				$pclass = "button_" . trim($p);
@@ -282,11 +282,11 @@ class Feeds extends Handler_Protected {
 			$num_unread = 0;
 			$cur_feed_title = '';
 
-			$fresh_intl = get_pref( "FRESH_ARTICLE_MAX_AGE") * 60 * 60;
+			$fresh_intl = get_pref("FRESH_ARTICLE_MAX_AGE") * 60 * 60;
 
 			if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);
 
-			$expand_cdm = get_pref( 'CDM_EXPANDED');
+			$expand_cdm = get_pref('CDM_EXPANDED');
 
 			while ($line = db_fetch_assoc($result)) {
 				$class = ($lnum % 2) ? "even" : "odd";
@@ -307,7 +307,7 @@ class Feeds extends Handler_Protected {
 					}
 				}
 
-				if (!is_array($labels)) $labels = get_article_labels( $id);
+				if (!is_array($labels)) $labels = get_article_labels($id);
 
 				$labels_str = "<span id=\"HLLCTR-$id\">";
 				$labels_str .= format_article_labels($labels, $id);
@@ -357,11 +357,11 @@ class Feeds extends Handler_Protected {
 #				$content_link = "<a href=\"javascript:viewContentUrl('".$line["link"]."');\">" .
 #					$line["title"] . "</a>";
 
-				$updated_fmt = make_local_datetime( $line["updated"], false);
+				$updated_fmt = make_local_datetime($line["updated"], false);
 				$date_entered_fmt = T_sprintf("Imported at %s",
-					make_local_datetime( $line["date_entered"], false));
+					make_local_datetime($line["date_entered"], false));
 
-				if (get_pref( 'SHOW_CONTENT_PREVIEW')) {
+				if (get_pref('SHOW_CONTENT_PREVIEW')) {
 					$content_preview = truncate_string(strip_tags($line["content_preview"]),
 						100);
 				}
@@ -423,15 +423,15 @@ class Feeds extends Handler_Protected {
 
 					/* $row_background = "background-image : -moz-linear-gradient(left, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);".
 						"background-image : linear-gradient(to right, rgba(255, 255, 255, 0) 50%, rgba($rgba, 0.2) 100%);";
-						"background-image : -webkit-gradient(linear, left top, right top, color-stop( 50%, rgba(255,255,255,0)),
+						"background-image : -webkit-gradient(linear, left top, right top, color-stop(50%, rgba(255,255,255,0)),
 							color-stop(100%, rgba($rgba, 0.2)));"; */
 				} else {
 					$row_background = "";
 				}
 
-				if (!get_pref( 'COMBINED_DISPLAY_MODE')) {
+				if (!get_pref('COMBINED_DISPLAY_MODE')) {
 
-					if (get_pref( 'VFEED_GROUP_BY_FEED')) {
+					if (get_pref('VFEED_GROUP_BY_FEED')) {
 						if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
 
 							$cur_feed_title = $line["feed_title"];
@@ -472,7 +472,7 @@ class Feeds extends Handler_Protected {
 						onclick=\"\">" .
 						truncate_string($line["title"], 200);
 
-					if (get_pref( 'SHOW_CONTENT_PREVIEW')) {
+					if (get_pref('SHOW_CONTENT_PREVIEW')) {
 						if ($content_preview) {
 							$reply['content'] .= "<span class=\"contentPreview\"> - $content_preview</span>";
 						}
@@ -486,7 +486,7 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "<span class=\"hlUpdated\">";
 
-					if (!get_pref( 'VFEED_GROUP_BY_FEED')) {
+					if (!get_pref('VFEED_GROUP_BY_FEED')) {
 						if (@$line["feed_title"]) {
 							$reply['content'] .= "<div class=\"hlFeed\">
 								<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
@@ -502,7 +502,7 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= $score_pic;
 
-					if ($line["feed_title"] && !get_pref( 'VFEED_GROUP_BY_FEED')) {
+					if ($line["feed_title"] && !get_pref('VFEED_GROUP_BY_FEED')) {
 
 						$reply['content'] .= "<span onclick=\"viewfeed($feed_id)\"
 							style=\"cursor : pointer\"
@@ -515,17 +515,17 @@ class Feeds extends Handler_Protected {
 
 				} else {
 
-					$line["tags"] = get_article_tags( $id, $_SESSION["uid"], $line["tag_cache"]);
+					$line["tags"] = get_article_tags($id, $_SESSION["uid"], $line["tag_cache"]);
 					unset($line["tag_cache"]);
 
-					$line["content"] = sanitize( $line["content_preview"],
+					$line["content"] = sanitize($line["content_preview"],
 							sql_bool_to_bool($line['hide_images']), false, $entry_site_url);
 
 					foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_CDM) as $p) {
 						$line = $p->hook_render_article_cdm($line);
 					}
 
-					if (get_pref( 'VFEED_GROUP_BY_FEED') && $line["feed_title"]) {
+					if (get_pref('VFEED_GROUP_BY_FEED') && $line["feed_title"]) {
 						if ($feed_id != $vgroup_last_feed) {
 
 							$cur_feed_title = $line["feed_title"];
@@ -594,7 +594,7 @@ class Feeds extends Handler_Protected {
 						id=\"CEXC-$id\" class=\"cdmExcerpt\"> - $content_preview</span>";
 					$reply['content'] .= "</span>";
 
-					if (!get_pref( 'VFEED_GROUP_BY_FEED')) {
+					if (!get_pref('VFEED_GROUP_BY_FEED')) {
 						if (@$line["feed_title"]) {
 							$reply['content'] .= "<div class=\"hlFeed\">
 								<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
@@ -609,7 +609,7 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "<div style=\"vertical-align : middle\">";
 					$reply['content'] .= "$score_pic";
 
-					if (!get_pref( "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
+					if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
 						$reply['content'] .= "<span style=\"cursor : pointer\"
 							title=\"".htmlspecialchars($line["feed_title"])."\"
 							onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
@@ -633,7 +633,7 @@ class Feeds extends Handler_Protected {
 
 			if ($line["orig_feed_id"]) {
 
-				$tmp_result = db_query( "SELECT * FROM ttrss_archived_feeds
+				$tmp_result = db_query("SELECT * FROM ttrss_archived_feeds
 					WHERE id = ".$line["orig_feed_id"]);
 
 						if (db_num_rows($tmp_result) != 0) {
@@ -673,7 +673,7 @@ class Feeds extends Handler_Protected {
 
 					$always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
 
-					$reply['content'] .= format_article_enclosures( $id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
+					$reply['content'] .= format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
 
 					$reply['content'] .= "</div>";
 
@@ -757,15 +757,15 @@ class Feeds extends Handler_Protected {
 
 				$reply['content'] .= "<p><span class=\"insensitive\">";
 
-				$result = db_query( "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+				$result = db_query("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
 					WHERE owner_uid = " . $_SESSION['uid']);
 
 				$last_updated = db_fetch_result($result, 0, "last_updated");
-				$last_updated = make_local_datetime( $last_updated, false);
+				$last_updated = make_local_datetime($last_updated, false);
 
 				$reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
 
-				$result = db_query( "SELECT COUNT(id) AS num_errors
+				$result = db_query("SELECT COUNT(id) AS num_errors
 					FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
 				$num_errors = db_fetch_result($result, 0, "num_errors");
@@ -786,9 +786,9 @@ class Feeds extends Handler_Protected {
 	}
 
 	function catchupAll() {
-		db_query( "UPDATE ttrss_user_entries SET
+		db_query("UPDATE ttrss_user_entries SET
 						last_read = NOW(), unread = false WHERE unread = true AND owner_uid = " . $_SESSION["uid"]);
-		ccache_zero_all( $_SESSION["uid"]);
+		ccache_zero_all($_SESSION["uid"]);
 	}
 
 	function view() {
@@ -798,17 +798,17 @@ class Feeds extends Handler_Protected {
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("0", $timing_info);
 
-		$omode = db_escape_string( $_REQUEST["omode"]);
+		$omode = db_escape_string($_REQUEST["omode"]);
 
-		$feed = db_escape_string( $_REQUEST["feed"]);
-		$method = db_escape_string( $_REQUEST["m"]);
-		$view_mode = db_escape_string( $_REQUEST["view_mode"]);
+		$feed = db_escape_string($_REQUEST["feed"]);
+		$method = db_escape_string($_REQUEST["m"]);
+		$view_mode = db_escape_string($_REQUEST["view_mode"]);
 		$limit = 30;
 		@$cat_view = $_REQUEST["cat"] == "true";
-		@$next_unread_feed = db_escape_string( $_REQUEST["nuf"]);
-		@$offset = db_escape_string( $_REQUEST["skip"]);
-		@$vgroup_last_feed = db_escape_string( $_REQUEST["vgrlf"]);
-		$order_by = db_escape_string( $_REQUEST["order_by"]);
+		@$next_unread_feed = db_escape_string($_REQUEST["nuf"]);
+		@$offset = db_escape_string($_REQUEST["skip"]);
+		@$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);
+		$order_by = db_escape_string($_REQUEST["order_by"]);
 
 		if (is_numeric($feed)) $feed = (int) $feed;
 
@@ -824,18 +824,18 @@ class Feeds extends Handler_Protected {
 
 		if ($feed < LABEL_BASE_INDEX) {
 			$label_feed = feed_to_label_id($feed);
-			$result = db_query( "SELECT id FROM ttrss_labels2 WHERE
+			$result = db_query("SELECT id FROM ttrss_labels2 WHERE
 							id = '$label_feed' AND owner_uid = " . $_SESSION['uid']);
 		} else if (!$cat_view && is_numeric($feed) && $feed > 0) {
-			$result = db_query( "SELECT id FROM ttrss_feeds WHERE
+			$result = db_query("SELECT id FROM ttrss_feeds WHERE
 							id = '$feed' AND owner_uid = " . $_SESSION['uid']);
 		} else if ($cat_view && is_numeric($feed) && $feed > 0) {
-			$result = db_query( "SELECT id FROM ttrss_feed_categories WHERE
+			$result = db_query("SELECT id FROM ttrss_feed_categories WHERE
 							id = '$feed' AND owner_uid = " . $_SESSION['uid']);
 		}
 
 		if ($result && db_num_rows($result) == 0) {
-			print json_encode($this->generate_error_feed( __("Feed not found.")));
+			print json_encode($this->generate_error_feed(__("Feed not found.")));
 			return;
 		}
 
@@ -843,21 +843,21 @@ class Feeds extends Handler_Protected {
 		 * so for performance reasons we don't do that here */
 
 		if ($feed >= 0) {
-			ccache_update( $feed, $_SESSION["uid"], $cat_view);
+			ccache_update($feed, $_SESSION["uid"], $cat_view);
 		}
 
-		set_pref( "_DEFAULT_VIEW_MODE", $view_mode);
-		set_pref( "_DEFAULT_VIEW_ORDER_BY", $order_by);
+		set_pref("_DEFAULT_VIEW_MODE", $view_mode);
+		set_pref("_DEFAULT_VIEW_ORDER_BY", $order_by);
 
 		/* bump login timestamp if needed */
 		if (time() - $_SESSION["last_login_update"] > 3600) {
-			db_query( "UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
+			db_query("UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
 				$_SESSION["uid"]);
 			$_SESSION["last_login_update"] = time();
 		}
 
 		if (!$cat_view && is_numeric($feed) && $feed > 0) {
-			db_query( "UPDATE ttrss_feeds SET last_viewed = NOW()
+			db_query("UPDATE ttrss_feeds SET last_viewed = NOW()
 							WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
 		}
 
@@ -924,15 +924,15 @@ class Feeds extends Handler_Protected {
 
 		$reply['headlines']['content'] .= "<p><span class=\"insensitive\">";
 
-		$result = db_query( "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+		$result = db_query("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
 			WHERE owner_uid = " . $_SESSION['uid']);
 
 		$last_updated = db_fetch_result($result, 0, "last_updated");
-		$last_updated = make_local_datetime( $last_updated, false);
+		$last_updated = make_local_datetime($last_updated, false);
 
 		$reply['headlines']['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
 
-		$result = db_query( "SELECT COUNT(id) AS num_errors
+		$result = db_query("SELECT COUNT(id) AS num_errors
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
 		$num_errors = db_fetch_result($result, 0, "num_errors");
@@ -952,7 +952,7 @@ class Feeds extends Handler_Protected {
 		return $reply;
 	}
 
-	private function generate_error_feed( $error) {
+	private function generate_error_feed($error) {
 		$reply = array();
 
 		$reply['headlines']['id'] = -6;
@@ -986,9 +986,9 @@ class Feeds extends Handler_Protected {
 
 		print "<hr/>";
 
-		if (get_pref( 'ENABLE_FEED_CATS')) {
+		if (get_pref('ENABLE_FEED_CATS')) {
 			print __('Place in category:') . " ";
-			print_feed_cat_select( "cat", false, 'dojoType="dijit.form.Select"');
+			print_feed_cat_select("cat", false, 'dojoType="dijit.form.Select"');
 		}
 
 		print "</div>";
@@ -1044,7 +1044,7 @@ class Feeds extends Handler_Protected {
 	function feedBrowser() {
 		if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
 
-		$browser_search = db_escape_string( $_REQUEST["search"]);
+		$browser_search = db_escape_string($_REQUEST["search"]);
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"updateFeedBrowser\">";
@@ -1081,7 +1081,7 @@ class Feeds extends Handler_Protected {
 		require_once "feedbrowser.php";
 
 		print "<ul class='browseFeedList' id='browseFeedList'>";
-		print make_feed_browser( $search, 25);
+		print make_feed_browser($search, 25);
 		print "</ul>";
 
 		print "<div align='center'>
@@ -1092,7 +1092,7 @@ class Feeds extends Handler_Protected {
 	}
 
 	function search() {
-		$this->params = explode(":", db_escape_string( $_REQUEST["param"]), 2);
+		$this->params = explode(":", db_escape_string($_REQUEST["param"]), 2);
 
 		$active_feed_id = sprintf("%d", $this->params[0]);
 		$is_cat = $this->params[1] != "false";
@@ -1110,12 +1110,12 @@ class Feeds extends Handler_Protected {
 		print "<select name=\"search_mode\" dojoType=\"dijit.form.Select\">
 			<option value=\"all_feeds\">".__('All feeds')."</option>";
 
-		$feed_title = getFeedTitle( $active_feed_id);
+		$feed_title = getFeedTitle($active_feed_id);
 
 		if (!$is_cat) {
-			$feed_cat_title = getFeedCatTitle( $active_feed_id);
+			$feed_cat_title = getFeedCatTitle($active_feed_id);
 		} else {
-			$feed_cat_title = getCategoryTitle( $active_feed_id);
+			$feed_cat_title = getCategoryTitle($active_feed_id);
 		}
 
 		if ($active_feed_id && !$is_cat) {
@@ -1128,7 +1128,7 @@ class Feeds extends Handler_Protected {
 		  	$cat_preselected = "selected=\"1\"";
 		}
 
-		if (get_pref( 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
+		if (get_pref('ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
 			print "<option $cat_preselected value=\"this_cat\">$feed_cat_title</option>";
 		} else {
 			//print "<option disabled>".__('This category')."</option>";
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 1e96bef00..5af416adc 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -21,7 +21,7 @@ class Handler_Public extends Handler {
 		else if ($feed == -1)
 			$date_sort_field = "last_marked DESC";
 
-		$qfh_ret = queryFeedHeadlines( $feed,
+		$qfh_ret = queryFeedHeadlines($feed,
 			1, $view_mode, $is_cat, $search, $search_mode,
 			$date_sort_field, $offset, $owner_uid,
 			false, 0, false, true);
@@ -41,7 +41,7 @@ class Handler_Public extends Handler {
 			header("Last-Modified: $last_modified", true);
 		}
 
-		$qfh_ret = queryFeedHeadlines( $feed,
+		$qfh_ret = queryFeedHeadlines($feed,
 			$limit, $view_mode, $is_cat, $search, $search_mode,
 			$date_sort_field, $offset, $owner_uid,
 			false, 0, false, true);
@@ -54,7 +54,7 @@ class Handler_Public extends Handler {
 
 		$feed_self_url = get_self_url_prefix() .
 			"/public.php?op=rss&id=-2&key=" .
-			get_feed_access_key( -2, false, $owner_uid);
+			get_feed_access_key(-2, false, $owner_uid);
 
 		if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
 
@@ -82,7 +82,7 @@ class Handler_Public extends Handler {
 				$tpl->setVariable('ARTICLE_EXCERPT',
 					truncate_string(strip_tags($line["content_preview"]), 100, '...'), true);
 
-				$content = sanitize( $line["content_preview"], false, $owner_uid);
+				$content = sanitize($line["content_preview"], false, $owner_uid);
 
 				if ($line['note']) {
 					$content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
@@ -99,14 +99,14 @@ class Handler_Public extends Handler {
 
 				$tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
 
-				$tags = get_article_tags( $line["id"], $owner_uid);
+				$tags = get_article_tags($line["id"], $owner_uid);
 
 				foreach ($tags as $tag) {
 					$tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
 					$tpl->addBlock('category');
 				}
 
-				$enclosures = get_article_enclosures( $line["id"]);
+				$enclosures = get_article_enclosures($line["id"]);
 
 				foreach ($enclosures as $e) {
 					$type = htmlspecialchars($e['content_type']);
@@ -158,13 +158,13 @@ class Handler_Public extends Handler {
 				$article['link']	= $line['link'];
 				$article['title'] = $line['title'];
 				$article['excerpt'] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
-				$article['content'] = sanitize( $line["content_preview"], false, $owner_uid);
+				$article['content'] = sanitize($line["content_preview"], false, $owner_uid);
 				$article['updated'] = date('c', strtotime($line["updated"]));
 
 				if ($line['note']) $article['note'] = $line['note'];
 				if ($article['author']) $article['author'] = $line['author'];
 
-				$tags = get_article_tags( $line["id"], $owner_uid);
+				$tags = get_article_tags($line["id"], $owner_uid);
 
 				if (count($tags) > 0) {
 					$article['tags'] = array();
@@ -174,7 +174,7 @@ class Handler_Public extends Handler {
 					}
 				}
 
-				$enclosures = get_article_enclosures( $line["id"]);
+				$enclosures = get_article_enclosures($line["id"]);
 
 				if (count($enclosures) > 0) {
 					$article['enclosures'] = array();
@@ -201,19 +201,19 @@ class Handler_Public extends Handler {
 	}
 
 	function getUnread() {
-		$login = db_escape_string( $_REQUEST["login"]);
+		$login = db_escape_string($_REQUEST["login"]);
 		$fresh = $_REQUEST["fresh"] == "1";
 
-		$result = db_query( "SELECT id FROM ttrss_users WHERE login = '$login'");
+		$result = db_query("SELECT id FROM ttrss_users WHERE login = '$login'");
 
 		if (db_num_rows($result) == 1) {
 			$uid = db_fetch_result($result, 0, "id");
 
-			print getGlobalUnread( $uid);
+			print getGlobalUnread($uid);
 
 			if ($fresh) {
 				print ";";
-				print getFeedArticles( -3, false, true, $uid);
+				print getFeedArticles(-3, false, true, $uid);
 			}
 
 		} else {
@@ -223,9 +223,9 @@ class Handler_Public extends Handler {
 	}
 
 	function getProfiles() {
-		$login = db_escape_string( $_REQUEST["login"]);
+		$login = db_escape_string($_REQUEST["login"]);
 
-		$result = db_query( "SELECT * FROM ttrss_settings_profiles,ttrss_users
+		$result = db_query("SELECT * FROM ttrss_settings_profiles,ttrss_users
 			WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = '$login' ORDER BY title");
 
 		print "<select dojoType='dijit.form.Select' style='width : 220px; margin : 0px' name='profile'>";
@@ -243,9 +243,9 @@ class Handler_Public extends Handler {
 	}
 
 	function pubsub() {
-		$mode = db_escape_string( $_REQUEST['hub_mode']);
-		$feed_id = (int) db_escape_string( $_REQUEST['id']);
-		$feed_url = db_escape_string( $_REQUEST['hub_topic']);
+		$mode = db_escape_string($_REQUEST['hub_mode']);
+		$feed_id = (int) db_escape_string($_REQUEST['id']);
+		$feed_url = db_escape_string($_REQUEST['hub_topic']);
 
 		if (!PUBSUBHUBBUB_ENABLED) {
 			header('HTTP/1.0 404 Not Found');
@@ -255,7 +255,7 @@ class Handler_Public extends Handler {
 
 		// TODO: implement hub_verifytoken checking
 
-		$result = db_query( "SELECT feed_url FROM ttrss_feeds
+		$result = db_query("SELECT feed_url FROM ttrss_feeds
 			WHERE id = '$feed_id'");
 
 		if (db_num_rows($result) != 0) {
@@ -265,7 +265,7 @@ class Handler_Public extends Handler {
 			if ($check_feed_url && ($check_feed_url == $feed_url || !$feed_url)) {
 				if ($mode == "subscribe") {
 
-					db_query( "UPDATE ttrss_feeds SET pubsub_state = 2
+					db_query("UPDATE ttrss_feeds SET pubsub_state = 2
 						WHERE id = '$feed_id'");
 
 					print $_REQUEST['hub_challenge'];
@@ -273,7 +273,7 @@ class Handler_Public extends Handler {
 
 				} else if ($mode == "unsubscribe") {
 
-					db_query( "UPDATE ttrss_feeds SET pubsub_state = 0
+					db_query("UPDATE ttrss_feeds SET pubsub_state = 0
 						WHERE id = '$feed_id'");
 
 					print $_REQUEST['hub_challenge'];
@@ -282,9 +282,9 @@ class Handler_Public extends Handler {
 				} else if (!$mode) {
 
 					// Received update ping, schedule feed update.
-					//update_rss_feed( $feed_id, true, true);
+					//update_rss_feed($feed_id, true, true);
 
-					db_query( "UPDATE ttrss_feeds SET
+					db_query("UPDATE ttrss_feeds SET
 						last_update_started = '1970-01-01',
 						last_updated = '1970-01-01' WHERE id = '$feed_id'");
 
@@ -306,9 +306,9 @@ class Handler_Public extends Handler {
 	}
 
 	function share() {
-		$uuid = db_escape_string( $_REQUEST["key"]);
+		$uuid = db_escape_string($_REQUEST["key"]);
 
-		$result = db_query( "SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE
+		$result = db_query("SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE
 			uuid = '$uuid'");
 
 		if (db_num_rows($result) != 0) {
@@ -317,7 +317,7 @@ class Handler_Public extends Handler {
 			$id = db_fetch_result($result, 0, "ref_id");
 			$owner_uid = db_fetch_result($result, 0, "owner_uid");
 
-			$article = format_article( $id, false, true, $owner_uid);
+			$article = format_article($id, false, true, $owner_uid);
 
 			print_r($article['content']);
 
@@ -328,28 +328,28 @@ class Handler_Public extends Handler {
 	}
 
 	function rss() {
-		$feed = db_escape_string( $_REQUEST["id"]);
-		$key = db_escape_string( $_REQUEST["key"]);
+		$feed = db_escape_string($_REQUEST["id"]);
+		$key = db_escape_string($_REQUEST["key"]);
 		$is_cat = $_REQUEST["is_cat"] != false;
-		$limit = (int)db_escape_string( $_REQUEST["limit"]);
-		$offset = (int)db_escape_string( $_REQUEST["offset"]);
+		$limit = (int)db_escape_string($_REQUEST["limit"]);
+		$offset = (int)db_escape_string($_REQUEST["offset"]);
 
-		$search = db_escape_string( $_REQUEST["q"]);
-		$search_mode = db_escape_string( $_REQUEST["smode"]);
-		$view_mode = db_escape_string( $_REQUEST["view-mode"]);
+		$search = db_escape_string($_REQUEST["q"]);
+		$search_mode = db_escape_string($_REQUEST["smode"]);
+		$view_mode = db_escape_string($_REQUEST["view-mode"]);
 
-		$format = db_escape_string( $_REQUEST['format']);
+		$format = db_escape_string($_REQUEST['format']);
 
 		if (!$format) $format = 'atom';
 
 		if (SINGLE_USER_MODE) {
-			authenticate_user( "admin", null);
+			authenticate_user("admin", null);
 		}
 
 		$owner_id = false;
 
 		if ($key) {
-			$result = db_query( "SELECT owner_uid FROM
+			$result = db_query("SELECT owner_uid FROM
 				ttrss_access_keys WHERE access_key = '$key' AND feed_id = '$feed'");
 
 			if (db_num_rows($result) == 1)
@@ -367,7 +367,7 @@ class Handler_Public extends Handler {
 	function globalUpdateFeeds() {
 		include "rssfuncs.php";
 		// Update all feeds needing a update.
-		update_daemon_common( 0, true, false);
+		update_daemon_common(0, true, false);
 
 		// Update feedbrowser
 		update_feedbrowser_cache();
@@ -375,7 +375,7 @@ class Handler_Public extends Handler {
 		// Purge orphans and cleanup tags
 		purge_orphans();
 
-		cleanup_tags( 14, 50000);
+		cleanup_tags(14, 50000);
 
 		global $pluginhost;
 		$pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
@@ -402,12 +402,12 @@ class Handler_Public extends Handler {
 
 			if ($action == 'share') {
 
-				$title = db_escape_string( strip_tags($_REQUEST["title"]));
-				$url = db_escape_string( strip_tags($_REQUEST["url"]));
-				$content = db_escape_string( strip_tags($_REQUEST["content"]));
-				$labels = db_escape_string( strip_tags($_REQUEST["labels"]));
+				$title = db_escape_string(strip_tags($_REQUEST["title"]));
+				$url = db_escape_string(strip_tags($_REQUEST["url"]));
+				$content = db_escape_string(strip_tags($_REQUEST["content"]));
+				$labels = db_escape_string(strip_tags($_REQUEST["labels"]));
 
-				Article::create_published_article( $title, $url, $content, $labels,
+				Article::create_published_article($title, $url, $content, $labels,
 					$_SESSION["uid"]);
 
 				print "<script type='text/javascript'>";
@@ -513,7 +513,7 @@ class Handler_Public extends Handler {
 
 		if (!SINGLE_USER_MODE) {
 
-			$login = db_escape_string( $_POST["login"]);
+			$login = db_escape_string($_POST["login"]);
 			$password = $_POST["password"];
 			$remember_me = $_POST["remember_me"];
 
@@ -525,18 +525,18 @@ class Handler_Public extends Handler {
 
 			@session_start();
 
-			if (authenticate_user( $login, $password)) {
+			if (authenticate_user($login, $password)) {
 				$_POST["password"] = "";
 
 				$_SESSION["language"] = $_POST["language"];
-				$_SESSION["ref_schema_version"] = get_schema_version( true);
+				$_SESSION["ref_schema_version"] = get_schema_version(true);
 				$_SESSION["bw_limit"] = !!$_POST["bw_limit"];
 
 				if ($_POST["profile"]) {
 
-					$profile = db_escape_string( $_POST["profile"]);
+					$profile = db_escape_string($_POST["profile"]);
 
-					$result = db_query( "SELECT id FROM ttrss_settings_profiles
+					$result = db_query("SELECT id FROM ttrss_settings_profiles
 						WHERE id = '$profile' AND owner_uid = " . $_SESSION["uid"]);
 
 					if (db_num_rows($result) != 0) {
@@ -563,7 +563,7 @@ class Handler_Public extends Handler {
 
 		if ($_SESSION["uid"]) {
 
-			$feed_url = db_escape_string( trim($_REQUEST["feed_url"]));
+			$feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
 
 			header('Content-Type: text/html; charset=utf-8');
 			print "<html>
@@ -577,7 +577,7 @@ class Handler_Public extends Handler {
 			  		alt=\"Tiny Tiny RSS\"/>
 					<h1>".__("Subscribe to feed...")."</h1><div class='content'>";
 
-			$rc = subscribe_to_feed( $feed_url);
+			$rc = subscribe_to_feed($feed_url);
 
 			switch ($rc['code']) {
 			case 0:
@@ -625,7 +625,7 @@ class Handler_Public extends Handler {
 			$tt_uri = get_self_url_prefix();
 
 			if ($rc['code'] <= 2){
-				$result = db_query( "SELECT id FROM ttrss_feeds WHERE
+				$result = db_query("SELECT id FROM ttrss_feeds WHERE
 					feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
 				$feed_id = db_fetch_result($result, 0, "id");
@@ -656,16 +656,16 @@ class Handler_Public extends Handler {
 	}
 
 	function subscribe2() {
-		$feed_url = db_escape_string( trim($_REQUEST["feed_url"]));
-		$cat_id = db_escape_string( $_REQUEST["cat_id"]);
-		$from = db_escape_string( $_REQUEST["from"]);
+		$feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
+		$cat_id = db_escape_string($_REQUEST["cat_id"]);
+		$from = db_escape_string($_REQUEST["from"]);
 
 		/* only read authentication information from POST */
 
-		$auth_login = db_escape_string( trim($_POST["auth_login"]));
-		$auth_pass = db_escape_string( trim($_POST["auth_pass"]));
+		$auth_login = db_escape_string(trim($_POST["auth_login"]));
+		$auth_pass = db_escape_string(trim($_POST["auth_pass"]));
 
-		$rc = subscribe_to_feed( $feed_url, $cat_id, $auth_login, $auth_pass);
+		$rc = subscribe_to_feed($feed_url, $cat_id, $auth_login, $auth_pass);
 
 		switch ($rc) {
 		case 1:
@@ -712,7 +712,7 @@ class Handler_Public extends Handler {
 		$tt_uri = get_self_url_prefix();
 
 		if ($rc <= 2){
-			$result = db_query( "SELECT id FROM ttrss_feeds WHERE
+			$result = db_query("SELECT id FROM ttrss_feeds WHERE
 				feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
 			$feed_id = db_fetch_result($result, 0, "id");
@@ -788,9 +788,9 @@ class Handler_Public extends Handler {
 			print "</form>";
 		} else if ($method == 'do') {
 
-			$login = db_escape_string( $_POST["login"]);
-			$email = db_escape_string( $_POST["email"]);
-			$test = db_escape_string( $_POST["test"]);
+			$login = db_escape_string($_POST["login"]);
+			$email = db_escape_string($_POST["email"]);
+			$test = db_escape_string($_POST["test"]);
 
 			if (($test != 4 && $test != 'four') || !$email || !$login) {
 				print_error(__('Some of the required form parameters are missing or incorrect.'));
@@ -802,13 +802,13 @@ class Handler_Public extends Handler {
 
 			} else {
 
-				$result = db_query( "SELECT id FROM ttrss_users
+				$result = db_query("SELECT id FROM ttrss_users
 					WHERE login = '$login' AND email = '$email'");
 
 				if (db_num_rows($result) != 0) {
 					$id = db_fetch_result($result, 0, "id");
 
-					Pref_Users::resetUserPassword( $id, false);
+					Pref_Users::resetUserPassword($id, false);
 
 					print "<p>";
 
@@ -869,7 +869,7 @@ class Handler_Public extends Handler {
 
 			<?php
 				@$op = $_REQUEST["subop"];
-				$updater = new DbUpdater( DB_TYPE, SCHEMA_VERSION);
+				$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
 
 				if ($op == "performupdate") {
 					if ($updater->isUpdateRequired()) {
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index 387478c10..888ef67dd 100644
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -12,7 +12,7 @@ class Logger_SQL {
 			$file = Db::get()->escape_string($file);
 			$line = Db::get()->escape_string($line);
 			$context = ''; // backtrace is a lot of data which is not really critical to store
-			//$context = db_escape_string( serialize($context));
+			//$context = db_escape_string(serialize($context));
 
 			$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : "NULL";
 
diff --git a/classes/opml.php b/classes/opml.php
index a800880e4..986386378 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -32,7 +32,7 @@ class Opml extends Handler_Protected {
 			<div class=\"floatingLogo\"><img src=\"images/logo_small.png\"></div>
 			<h1>".__('OPML Utility')."</h1><div class='content'>";
 
-		add_feed_category( "Imported feeds");
+		add_feed_category("Imported feeds");
 
 		$this->opml_notice(__("Importing OPML..."));
 		$this->opml_import($owner_uid);
@@ -66,14 +66,14 @@ class Opml extends Handler_Protected {
 		$out = "";
 
 		if ($cat_id) {
-			$result = db_query( "SELECT title FROM ttrss_feed_categories WHERE id = '$cat_id'
+			$result = db_query("SELECT title FROM ttrss_feed_categories WHERE id = '$cat_id'
 				AND owner_uid = '$owner_uid'");
 			$cat_title = htmlspecialchars(db_fetch_result($result, 0, "title"));
 		}
 
 		if ($cat_title) $out .= "<outline text=\"$cat_title\">\n";
 
-		$result = db_query( "SELECT id,title
+		$result = db_query("SELECT id,title
 			FROM ttrss_feed_categories WHERE
 			$cat_qpart AND owner_uid = '$owner_uid' ORDER BY order_id, title");
 
@@ -82,7 +82,7 @@ class Opml extends Handler_Protected {
 			$out .= $this->opml_export_category($owner_uid, $line["id"], $hide_private_feeds);
 		}
 
-		$feeds_result = db_query( "select title, feed_url, site_url
+		$feeds_result = db_query("select title, feed_url, site_url
 				from ttrss_feeds where $feed_cat_qpart AND owner_uid = '$owner_uid' AND $hide_qpart
 				order by order_id, title");
 
@@ -131,7 +131,7 @@ class Opml extends Handler_Protected {
 		if ($include_settings) {
 			$out .= "<outline text=\"tt-rss-prefs\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$result = db_query( "SELECT pref_name, value FROM ttrss_user_prefs WHERE
+			$result = db_query("SELECT pref_name, value FROM ttrss_user_prefs WHERE
 			   profile IS NULL AND owner_uid = " . $_SESSION["uid"] . " ORDER BY pref_name");
 
 			while ($line = db_fetch_assoc($result)) {
@@ -145,7 +145,7 @@ class Opml extends Handler_Protected {
 
 			$out .= "<outline text=\"tt-rss-labels\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$result = db_query( "SELECT * FROM ttrss_labels2 WHERE
+			$result = db_query("SELECT * FROM ttrss_labels2 WHERE
 				owner_uid = " . $_SESSION['uid']);
 
 			while ($line = db_fetch_assoc($result)) {
@@ -161,7 +161,7 @@ class Opml extends Handler_Protected {
 
 			$out .= "<outline text=\"tt-rss-filters\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$result = db_query( "SELECT * FROM ttrss_filters2
+			$result = db_query("SELECT * FROM ttrss_filters2
 				WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY id");
 
 			while ($line = db_fetch_assoc($result)) {
@@ -172,7 +172,7 @@ class Opml extends Handler_Protected {
 				$line["rules"] = array();
 				$line["actions"] = array();
 
-				$tmp_result = db_query( "SELECT * FROM ttrss_filters2_rules
+				$tmp_result = db_query("SELECT * FROM ttrss_filters2_rules
 					WHERE filter_id = ".$line["id"]);
 
 				while ($tmp_line = db_fetch_assoc($tmp_result)) {
@@ -197,7 +197,7 @@ class Opml extends Handler_Protected {
 					array_push($line["rules"], $tmp_line);
 				}
 
-				$tmp_result = db_query( "SELECT * FROM ttrss_filters2_actions
+				$tmp_result = db_query("SELECT * FROM ttrss_filters2_actions
 					WHERE filter_id = ".$line["id"]);
 
 				while ($tmp_line = db_fetch_assoc($tmp_result)) {
@@ -253,16 +253,16 @@ class Opml extends Handler_Protected {
 	private function opml_import_feed($doc, $node, $cat_id, $owner_uid) {
 		$attrs = $node->attributes;
 
-		$feed_title = db_escape_string( mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250));
-		if (!$feed_title) $feed_title = db_escape_string( mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250));
+		$feed_title = db_escape_string(mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250));
+		if (!$feed_title) $feed_title = db_escape_string(mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250));
 
-		$feed_url = db_escape_string( mb_substr($attrs->getNamedItem('xmlUrl')->nodeValue, 0, 250));
-		if (!$feed_url) $feed_url = db_escape_string( mb_substr($attrs->getNamedItem('xmlURL')->nodeValue, 0, 250));
+		$feed_url = db_escape_string(mb_substr($attrs->getNamedItem('xmlUrl')->nodeValue, 0, 250));
+		if (!$feed_url) $feed_url = db_escape_string(mb_substr($attrs->getNamedItem('xmlURL')->nodeValue, 0, 250));
 
-		$site_url = db_escape_string( mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250));
+		$site_url = db_escape_string(mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250));
 
 		if ($feed_url && $feed_title) {
-			$result = db_query( "SELECT id FROM ttrss_feeds WHERE
+			$result = db_query("SELECT id FROM ttrss_feeds WHERE
 				feed_url = '$feed_url' AND owner_uid = '$owner_uid'");
 
 			if (db_num_rows($result) == 0) {
@@ -275,7 +275,7 @@ class Opml extends Handler_Protected {
 					(title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES
 					('$feed_title', '$feed_url', '$owner_uid',
 					$cat_id, '$site_url', 0)";
-				db_query( $query);
+				db_query($query);
 
 			} else {
 				$this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title));
@@ -285,15 +285,15 @@ class Opml extends Handler_Protected {
 
 	private function opml_import_label($doc, $node, $owner_uid) {
 		$attrs = $node->attributes;
-		$label_name = db_escape_string( $attrs->getNamedItem('label-name')->nodeValue);
+		$label_name = db_escape_string($attrs->getNamedItem('label-name')->nodeValue);
 
 		if ($label_name) {
-			$fg_color = db_escape_string( $attrs->getNamedItem('label-fg-color')->nodeValue);
-			$bg_color = db_escape_string( $attrs->getNamedItem('label-bg-color')->nodeValue);
+			$fg_color = db_escape_string($attrs->getNamedItem('label-fg-color')->nodeValue);
+			$bg_color = db_escape_string($attrs->getNamedItem('label-bg-color')->nodeValue);
 
-			if (!label_find_id( $label_name, $_SESSION['uid'])) {
+			if (!label_find_id($label_name, $_SESSION['uid'])) {
 				$this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)));
-				label_create( $label_name, $fg_color, $bg_color, $owner_uid);
+				label_create($label_name, $fg_color, $bg_color, $owner_uid);
 			} else {
 				$this->opml_notice(T_sprintf("Duplicate label: %s", htmlspecialchars($label_name)));
 			}
@@ -302,22 +302,22 @@ class Opml extends Handler_Protected {
 
 	private function opml_import_preference($doc, $node, $owner_uid) {
 		$attrs = $node->attributes;
-		$pref_name = db_escape_string( $attrs->getNamedItem('pref-name')->nodeValue);
+		$pref_name = db_escape_string($attrs->getNamedItem('pref-name')->nodeValue);
 
 		if ($pref_name) {
-			$pref_value = db_escape_string( $attrs->getNamedItem('value')->nodeValue);
+			$pref_value = db_escape_string($attrs->getNamedItem('value')->nodeValue);
 
 			$this->opml_notice(T_sprintf("Setting preference key %s to %s",
 				$pref_name, $pref_value));
 
-			set_pref( $pref_name, $pref_value);
+			set_pref($pref_name, $pref_value);
 		}
 	}
 
 	private function opml_import_filter($doc, $node, $owner_uid) {
 		$attrs = $node->attributes;
 
-		$filter_type = db_escape_string( $attrs->getNamedItem('filter-type')->nodeValue);
+		$filter_type = db_escape_string($attrs->getNamedItem('filter-type')->nodeValue);
 
 		if ($filter_type == '2') {
 			$filter = json_decode($node->nodeValue, true);
@@ -326,12 +326,12 @@ class Opml extends Handler_Protected {
 				$match_any_rule = bool_to_sql_bool($filter["match_any_rule"]);
 				$enabled = bool_to_sql_bool($filter["enabled"]);
 
-				db_query( "BEGIN");
+				db_query("BEGIN");
 
-				db_query( "INSERT INTO ttrss_filters2 (match_any_rule,enabled,owner_uid)
+				db_query("INSERT INTO ttrss_filters2 (match_any_rule,enabled,owner_uid)
 					VALUES ($match_any_rule, $enabled,".$_SESSION["uid"].")");
 
-				$result = db_query( "SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
+				$result = db_query("SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
 					owner_uid = ".$_SESSION["uid"]);
 				$filter_id = db_fetch_result($result, 0, "id");
 
@@ -343,14 +343,14 @@ class Opml extends Handler_Protected {
 						$cat_id = "NULL";
 
 						if (!$rule["cat_filter"]) {
-							$tmp_result = db_query( "SELECT id FROM ttrss_feeds
-								WHERE title = '".db_escape_string( $rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
+							$tmp_result = db_query("SELECT id FROM ttrss_feeds
+								WHERE title = '".db_escape_string($rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
 							if (db_num_rows($tmp_result) > 0) {
 								$feed_id = db_fetch_result($tmp_result, 0, "id");
 							}
 						} else {
-							$tmp_result = db_query( "SELECT id FROM ttrss_feed_categories
-								WHERE title = '".db_escape_string( $rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
+							$tmp_result = db_query("SELECT id FROM ttrss_feed_categories
+								WHERE title = '".db_escape_string($rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
 
 							if (db_num_rows($tmp_result) > 0) {
 								$cat_id = db_fetch_result($tmp_result, 0, "id");
@@ -358,24 +358,24 @@ class Opml extends Handler_Protected {
 						}
 
 						$cat_filter = bool_to_sql_bool($rule["cat_filter"]);
-						$reg_exp = db_escape_string( $rule["reg_exp"]);
+						$reg_exp = db_escape_string($rule["reg_exp"]);
 						$filter_type = (int)$rule["filter_type"];
 
-						db_query( "INSERT INTO ttrss_filters2_rules (feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter)
+						db_query("INSERT INTO ttrss_filters2_rules (feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter)
 							VALUES ($feed_id, $cat_id, $filter_id, $filter_type, '$reg_exp', $cat_filter)");
 					}
 
 					foreach ($filter["actions"] as $action) {
 
 						$action_id = (int)$action["action_id"];
-						$action_param = db_escape_string( $action["action_param"]);
+						$action_param = db_escape_string($action["action_param"]);
 
-						db_query( "INSERT INTO ttrss_filters2_actions (filter_id,action_id,action_param)
+						db_query("INSERT INTO ttrss_filters2_actions (filter_id,action_id,action_param)
 							VALUES ($filter_id, $action_id, '$action_param')");
 					}
 				}
 
-				db_query( "COMMIT");
+				db_query("COMMIT");
 			}
 		}
 	}
@@ -383,22 +383,22 @@ class Opml extends Handler_Protected {
 	private function opml_import_category($doc, $root_node, $owner_uid, $parent_id) {
 		$body = $doc->getElementsByTagName('body');
 
-		$default_cat_id = (int) get_feed_category( 'Imported feeds', false);
+		$default_cat_id = (int) get_feed_category('Imported feeds', false);
 
 		if ($root_node) {
-			$cat_title = db_escape_string( mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250));
+			$cat_title = db_escape_string(mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250));
 
 			if (!$cat_title)
-				$cat_title = db_escape_string( mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250));
+				$cat_title = db_escape_string(mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250));
 
 			if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
-				$cat_id = get_feed_category( $cat_title, $parent_id);
-				db_query( "BEGIN");
+				$cat_id = get_feed_category($cat_title, $parent_id);
+				db_query("BEGIN");
 				if ($cat_id === false) {
-					add_feed_category( $cat_title, $parent_id);
-					$cat_id = get_feed_category( $cat_title, $parent_id);
+					add_feed_category($cat_title, $parent_id);
+					$cat_id = get_feed_category($cat_title, $parent_id);
 				}
-				db_query( "COMMIT");
+				db_query("COMMIT");
 			} else {
 				$cat_id = 0;
 			}
@@ -418,12 +418,12 @@ class Opml extends Handler_Protected {
 		foreach ($outlines as $node) {
 			if ($node->hasAttributes() && strtolower($node->tagName) == "outline") {
 				$attrs = $node->attributes;
-				$node_cat_title = db_escape_string( $attrs->getNamedItem('text')->nodeValue);
+				$node_cat_title = db_escape_string($attrs->getNamedItem('text')->nodeValue);
 
 				if (!$node_cat_title)
-					$node_cat_title = db_escape_string( $attrs->getNamedItem('title')->nodeValue);
+					$node_cat_title = db_escape_string($attrs->getNamedItem('title')->nodeValue);
 
-				$node_feed_url = db_escape_string( $attrs->getNamedItem('xmlUrl')->nodeValue);
+				$node_feed_url = db_escape_string($attrs->getNamedItem('xmlUrl')->nodeValue);
 
 				if ($node_cat_title && !$node_feed_url) {
 					$this->opml_import_category($doc, $node, $owner_uid, $cat_id);
@@ -508,7 +508,7 @@ class Opml extends Handler_Protected {
 
 		$url_path = get_self_url_prefix();
 		$url_path .= "/opml.php?op=publish&key=" .
-			get_feed_access_key( 'OPML:Publish', false, $_SESSION["uid"]);
+			get_feed_access_key('OPML:Publish', false, $_SESSION["uid"]);
 
 		return $url_path;
 	}
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 36c3dfbb3..0fbf0422e 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -222,9 +222,9 @@ class PluginHost {
 
 	function load_data($force = false) {
 		if ($this->owner_uid && (!$_SESSION["plugin_storage"] || $force))  {
-			$plugin = db_escape_string( $plugin);
+			$plugin = db_escape_string($plugin);
 
-			$result = db_query( "SELECT name, content FROM ttrss_plugin_storage
+			$result = db_query("SELECT name, content FROM ttrss_plugin_storage
 				WHERE owner_uid = '".$this->owner_uid."'");
 
 			while ($line = db_fetch_assoc($result)) {
@@ -237,9 +237,9 @@ class PluginHost {
 
 	private function save_data($plugin) {
 		if ($this->owner_uid) {
-			$plugin = db_escape_string( $plugin);
+			$plugin = db_escape_string($plugin);
 
-			db_query( "BEGIN");
+			db_query("BEGIN");
 
 			$result = db_query("SELECT id FROM ttrss_plugin_storage WHERE
 				owner_uid= '".$this->owner_uid."' AND name = '$plugin'");
@@ -247,19 +247,19 @@ class PluginHost {
 			if (!isset($this->storage[$plugin]))
 				$this->storage[$plugin] = array();
 
-			$content = db_escape_string( serialize($this->storage[$plugin]));
+			$content = db_escape_string(serialize($this->storage[$plugin]));
 
 			if (db_num_rows($result) != 0) {
-				db_query( "UPDATE ttrss_plugin_storage SET content = '$content'
+				db_query("UPDATE ttrss_plugin_storage SET content = '$content'
 					WHERE owner_uid= '".$this->owner_uid."' AND name = '$plugin'");
 
 			} else {
-				db_query( "INSERT INTO ttrss_plugin_storage
+				db_query("INSERT INTO ttrss_plugin_storage
 					(name,owner_uid,content) VALUES
 					('$plugin','".$this->owner_uid."','$content')");
 			}
 
-			db_query( "COMMIT");
+			db_query("COMMIT");
 		}
 	}
 
@@ -298,7 +298,7 @@ class PluginHost {
 
 			unset($this->storage[$idx]);
 
-			db_query( "DELETE FROM ttrss_plugin_storage WHERE name = '$idx'
+			db_query("DELETE FROM ttrss_plugin_storage WHERE name = '$idx'
 				AND owner_uid = " . $this->owner_uid);
 
 			$_SESSION["plugin_storage"] = $this->storage;
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 27e03f0e2..970b88822 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -15,11 +15,11 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function renamecat() {
-		$title = db_escape_string( $_REQUEST['title']);
-		$id = db_escape_string( $_REQUEST['id']);
+		$title = db_escape_string($_REQUEST['title']);
+		$id = db_escape_string($_REQUEST['id']);
 
 		if ($title) {
-			db_query( "UPDATE ttrss_feed_categories SET
+			db_query("UPDATE ttrss_feed_categories SET
 				title = '$title' WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		}
 		return;
@@ -37,11 +37,11 @@ class Pref_Feeds extends Handler_Protected {
 		// first one is set by API
 		$show_empty_cats = $_REQUEST['force_show_empty'] ||
 			($_REQUEST['mode'] != 2 && !$search &&
-				get_pref( '_PREFS_SHOW_EMPTY_CATS'));
+				get_pref('_PREFS_SHOW_EMPTY_CATS'));
 
 		$items = array();
 
-		$result = db_query( "SELECT id, title FROM ttrss_feed_categories
+		$result = db_query("SELECT id, title FROM ttrss_feed_categories
 				WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat = '$cat_id' ORDER BY order_id, title");
 
 		while ($line = db_fetch_assoc($result)) {
@@ -65,7 +65,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		}
 
-		$feed_result = db_query( "SELECT id, title, last_error,
+		$feed_result = db_query("SELECT id, title, last_error,
 			".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 			FROM ttrss_feeds
 			WHERE cat_id = '$cat_id' AND owner_uid = ".$_SESSION["uid"].
@@ -108,7 +108,7 @@ class Pref_Feeds extends Handler_Protected {
 		$root['items'] = array();
 		$root['type'] = 'category';
 
-		$enable_cats = get_pref( 'ENABLE_FEED_CATS');
+		$enable_cats = get_pref('ENABLE_FEED_CATS');
 
 		if ($_REQUEST['mode'] == 2) {
 
@@ -154,12 +154,12 @@ class Pref_Feeds extends Handler_Protected {
 				$root['items'] = array_merge($root['items'], $cat['items']);
 			}
 
-			$result = db_query( "SELECT * FROM
+			$result = db_query("SELECT * FROM
 				ttrss_labels2 WHERE owner_uid = ".$_SESSION['uid']." ORDER by caption");
 
 			if (db_num_rows($result) > 0) {
 
-				if (get_pref( 'ENABLE_FEED_CATS')) {
+				if (get_pref('ENABLE_FEED_CATS')) {
 					$cat = $this->feedlist_init_cat(-2);
 				} else {
 					$cat['items'] = array();
@@ -188,9 +188,9 @@ class Pref_Feeds extends Handler_Protected {
 		if ($enable_cats) {
 			$show_empty_cats = $_REQUEST['force_show_empty'] ||
 				($_REQUEST['mode'] != 2 && !$search &&
-				get_pref( '_PREFS_SHOW_EMPTY_CATS'));
+				get_pref('_PREFS_SHOW_EMPTY_CATS'));
 
-			$result = db_query( "SELECT id, title FROM ttrss_feed_categories
+			$result = db_query("SELECT id, title FROM ttrss_feed_categories
 				WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat IS NULL ORDER BY order_id, title");
 
 			while ($line = db_fetch_assoc($result)) {
@@ -226,7 +226,7 @@ class Pref_Feeds extends Handler_Protected {
 			$cat['unread'] = 0;
 			$cat['child_unread'] = 0;
 
-			$feed_result = db_query( "SELECT id, title,last_error,
+			$feed_result = db_query("SELECT id, title,last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 				FROM ttrss_feeds
 				WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"].
@@ -257,7 +257,7 @@ class Pref_Feeds extends Handler_Protected {
 			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
 
 		} else {
-			$feed_result = db_query( "SELECT id, title, last_error,
+			$feed_result = db_query("SELECT id, title, last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 				FROM ttrss_feeds
 				WHERE owner_uid = ".$_SESSION["uid"].
@@ -296,20 +296,20 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function catsortreset() {
-		db_query( "UPDATE ttrss_feed_categories
+		db_query("UPDATE ttrss_feed_categories
 				SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
 		return;
 	}
 
 	function feedsortreset() {
-		db_query( "UPDATE ttrss_feeds
+		db_query("UPDATE ttrss_feeds
 				SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
 		return;
 	}
 
 	function togglehiddenfeedcats() {
-		set_pref( '_PREFS_SHOW_EMPTY_CATS',
-			(get_pref( '_PREFS_SHOW_EMPTY_CATS') ? 'false' : 'true'));
+		set_pref('_PREFS_SHOW_EMPTY_CATS',
+			(get_pref('_PREFS_SHOW_EMPTY_CATS') ? 'false' : 'true'));
 	}
 
 	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
@@ -326,12 +326,12 @@ class Pref_Feeds extends Handler_Protected {
 		if ($item_id != 'root') {
 			if ($parent_id && $parent_id != 'root') {
 				$parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
-				$parent_qpart = db_escape_string( $parent_bare_id);
+				$parent_qpart = db_escape_string($parent_bare_id);
 			} else {
 				$parent_qpart = 'NULL';
 			}
 
-			db_query( "UPDATE ttrss_feed_categories
+			db_query("UPDATE ttrss_feed_categories
 				SET parent_cat = $parent_qpart WHERE id = '$bare_item_id' AND
 				owner_uid = " . $_SESSION["uid"]);
 		}
@@ -352,12 +352,12 @@ class Pref_Feeds extends Handler_Protected {
 					if (strpos($id, "FEED") === 0) {
 
 						$cat_id = ($item_id != "root") ?
-							db_escape_string( $bare_item_id) : "NULL";
+							db_escape_string($bare_item_id) : "NULL";
 
 						$cat_qpart = ($cat_id != 0) ? "cat_id = '$cat_id'" :
 							"cat_id = NULL";
 
-						db_query( "UPDATE ttrss_feeds
+						db_query("UPDATE ttrss_feeds
 							SET order_id = $order_id, $cat_qpart
 							WHERE id = '$bare_id' AND
 								owner_uid = " . $_SESSION["uid"]);
@@ -367,12 +367,12 @@ class Pref_Feeds extends Handler_Protected {
 							$nest_level+1);
 
 						if ($item_id != 'root') {
-							$parent_qpart = db_escape_string( $bare_id);
+							$parent_qpart = db_escape_string($bare_id);
 						} else {
 							$parent_qpart = 'NULL';
 						}
 
-						db_query( "UPDATE ttrss_feed_categories
+						db_query("UPDATE ttrss_feed_categories
 								SET order_id = '$order_id' WHERE id = '$bare_id' AND
 								owner_uid = " . $_SESSION["uid"]);
 					}
@@ -424,7 +424,7 @@ class Pref_Feeds extends Handler_Protected {
 				++$cat_order_id;
 
 				if ($bare_id > 0) {
-					db_query( "UPDATE ttrss_feed_categories
+					db_query("UPDATE ttrss_feed_categories
 						SET order_id = '$cat_order_id' WHERE id = '$bare_id' AND
 						owner_uid = " . $_SESSION["uid"]);
 				}
@@ -441,7 +441,7 @@ class Pref_Feeds extends Handler_Protected {
 						else
 							$cat_query = "cat_id = NULL";
 
-						db_query( "UPDATE ttrss_feeds
+						db_query("UPDATE ttrss_feeds
 							SET order_id = '$feed_order_id',
 							$cat_query
 							WHERE id = '$feed_id' AND
@@ -457,15 +457,15 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function removeicon() {
-		$feed_id = db_escape_string( $_REQUEST["feed_id"]);
+		$feed_id = db_escape_string($_REQUEST["feed_id"]);
 
-		$result = db_query( "SELECT id FROM ttrss_feeds
+		$result = db_query("SELECT id FROM ttrss_feeds
 			WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
 
 		if (db_num_rows($result) != 0) {
 			@unlink(ICONS_DIR . "/$feed_id.ico");
 
-			db_query( "UPDATE ttrss_feeds SET favicon_avg_color = NULL
+			db_query("UPDATE ttrss_feeds SET favicon_avg_color = NULL
 				where id = '$feed_id'");
 		}
 
@@ -491,12 +491,12 @@ class Pref_Feeds extends Handler_Protected {
 		}
 
 		$icon_file = $tmp_file;
-		$feed_id = db_escape_string( $_REQUEST["feed_id"]);
+		$feed_id = db_escape_string($_REQUEST["feed_id"]);
 
 		if (is_file($icon_file) && $feed_id) {
 			if (filesize($icon_file) < 20000) {
 
-				$result = db_query( "SELECT id FROM ttrss_feeds
+				$result = db_query("SELECT id FROM ttrss_feeds
 					WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
 
 				if (db_num_rows($result) != 0) {
@@ -508,7 +508,7 @@ class Pref_Feeds extends Handler_Protected {
 						$favicon_color = db_escape_string(
 							calculate_avg_color(ICONS_DIR . "/$feed_id.ico"));
 
-						db_query( "UPDATE ttrss_feeds SET
+						db_query("UPDATE ttrss_feeds SET
 							favicon_avg_color = '$favicon_color'
 							WHERE id = '$feed_id'");
 
@@ -536,7 +536,7 @@ class Pref_Feeds extends Handler_Protected {
 		global $purge_intervals;
 		global $update_intervals;
 
-		$feed_id = db_escape_string( $_REQUEST["id"]);
+		$feed_id = db_escape_string($_REQUEST["id"]);
 
 		$result = db_query(
 			"SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND
@@ -585,7 +585,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		/* Category */
 
-		if (get_pref( 'ENABLE_FEED_CATS')) {
+		if (get_pref('ENABLE_FEED_CATS')) {
 
 			$cat_id = db_fetch_result($result, 0, "cat_id");
 
@@ -593,7 +593,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print __('Place in category:') . " ";
 
-			print_feed_cat_select( "cat_id", $cat_id,
+			print_feed_cat_select("cat_id", $cat_id,
 				'dojoType="dijit.form.Select"');
 		}
 
@@ -782,7 +782,7 @@ class Pref_Feeds extends Handler_Protected {
 		global $purge_intervals;
 		global $update_intervals;
 
-		$feed_ids = db_escape_string( $_REQUEST["ids"]);
+		$feed_ids = db_escape_string($_REQUEST["ids"]);
 
 		print_notice("Enable the options you wish to apply using checkboxes on the right:");
 
@@ -816,13 +816,13 @@ class Pref_Feeds extends Handler_Protected {
 
 		/* Category */
 
-		if (get_pref( 'ENABLE_FEED_CATS')) {
+		if (get_pref('ENABLE_FEED_CATS')) {
 
 			print "<br/>";
 
 			print __('Place in category:') . " ";
 
-			print_feed_cat_select( "cat_id", $cat_id,
+			print_feed_cat_select("cat_id", $cat_id,
 				'disabled="1" dojoType="dijit.form.Select"');
 
 			$this->batch_edit_cbox("cat_id");
@@ -938,27 +938,27 @@ class Pref_Feeds extends Handler_Protected {
 
 	function editsaveops($batch) {
 
-		$feed_title = db_escape_string( trim($_POST["title"]));
-		$feed_link = db_escape_string( trim($_POST["feed_url"]));
-		$upd_intl = (int) db_escape_string( $_POST["update_interval"]);
-		$purge_intl = (int) db_escape_string( $_POST["purge_interval"]);
-		$feed_id = (int) db_escape_string( $_POST["id"]); /* editSave */
-		$feed_ids = db_escape_string( $_POST["ids"]); /* batchEditSave */
-		$cat_id = (int) db_escape_string( $_POST["cat_id"]);
-		$auth_login = db_escape_string( trim($_POST["auth_login"]));
+		$feed_title = db_escape_string(trim($_POST["title"]));
+		$feed_link = db_escape_string(trim($_POST["feed_url"]));
+		$upd_intl = (int) db_escape_string($_POST["update_interval"]);
+		$purge_intl = (int) db_escape_string($_POST["purge_interval"]);
+		$feed_id = (int) db_escape_string($_POST["id"]); /* editSave */
+		$feed_ids = db_escape_string($_POST["ids"]); /* batchEditSave */
+		$cat_id = (int) db_escape_string($_POST["cat_id"]);
+		$auth_login = db_escape_string(trim($_POST["auth_login"]));
 		$auth_pass = trim($_POST["auth_pass"]);
-		$private = checkbox_to_sql_bool(db_escape_string( $_POST["private"]));
+		$private = checkbox_to_sql_bool(db_escape_string($_POST["private"]));
 		$include_in_digest = checkbox_to_sql_bool(
-			db_escape_string( $_POST["include_in_digest"]));
+			db_escape_string($_POST["include_in_digest"]));
 		$cache_images = checkbox_to_sql_bool(
-			db_escape_string( $_POST["cache_images"]));
+			db_escape_string($_POST["cache_images"]));
 		$hide_images = checkbox_to_sql_bool(
-			db_escape_string( $_POST["hide_images"]));
+			db_escape_string($_POST["hide_images"]));
 		$always_display_enclosures = checkbox_to_sql_bool(
-			db_escape_string( $_POST["always_display_enclosures"]));
+			db_escape_string($_POST["always_display_enclosures"]));
 
 		$mark_unread_on_update = checkbox_to_sql_bool(
-			db_escape_string( $_POST["mark_unread_on_update"]));
+			db_escape_string($_POST["mark_unread_on_update"]));
 
 		if (strlen(FEED_CRYPT_KEY) > 0) {
 			require_once "crypt.php";
@@ -968,9 +968,9 @@ class Pref_Feeds extends Handler_Protected {
 			$auth_pass_encrypted = 'false';
 		}
 
-		$auth_pass = db_escape_string( $auth_pass);
+		$auth_pass = db_escape_string($auth_pass);
 
-		if (get_pref( 'ENABLE_FEED_CATS')) {
+		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'";
@@ -985,7 +985,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		if (!$batch) {
 
-			$result = db_query( "UPDATE ttrss_feeds SET
+			$result = db_query("UPDATE ttrss_feeds SET
 				$category_qpart
 				title = '$feed_title', feed_url = '$feed_link',
 				update_interval = '$upd_intl',
@@ -1010,7 +1010,7 @@ class Pref_Feeds extends Handler_Protected {
 				}
 			}
 
-			db_query( "BEGIN");
+			db_query("BEGIN");
 
 			foreach (array_keys($feed_data) as $k) {
 
@@ -1080,16 +1080,16 @@ class Pref_Feeds extends Handler_Protected {
 				}
 			}
 
-			db_query( "COMMIT");
+			db_query("COMMIT");
 		}
 		return;
 	}
 
 	function resetPubSub() {
 
-		$ids = db_escape_string( $_REQUEST["ids"]);
+		$ids = db_escape_string($_REQUEST["ids"]);
 
-		db_query( "UPDATE ttrss_feeds SET pubsub_state = 0 WHERE id IN ($ids)
+		db_query("UPDATE ttrss_feeds SET pubsub_state = 0 WHERE id IN ($ids)
 			AND owner_uid = " . $_SESSION["uid"]);
 
 		return;
@@ -1097,30 +1097,30 @@ class Pref_Feeds extends Handler_Protected {
 
 	function remove() {
 
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			Pref_Feeds::remove_feed( $id, $_SESSION["uid"]);
+			Pref_Feeds::remove_feed($id, $_SESSION["uid"]);
 		}
 
 		return;
 	}
 
 	function clear() {
-		$id = db_escape_string( $_REQUEST["id"]);
-		$this->clear_feed_articles( $id);
+		$id = db_escape_string($_REQUEST["id"]);
+		$this->clear_feed_articles($id);
 	}
 
 	function rescore() {
 		require_once "rssfuncs.php";
 
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 
-			$filters = load_filters( $id, $_SESSION["uid"], 6);
+			$filters = load_filters($id, $_SESSION["uid"], 6);
 
-			$result = db_query( "SELECT
+			$result = db_query("SELECT
 				title, content, link, ref_id, author,".
 				SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
 			  	FROM
@@ -1133,7 +1133,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			while ($line = db_fetch_assoc($result)) {
 
-				$tags = get_article_tags( $line["ref_id"]);
+				$tags = get_article_tags($line["ref_id"]);
 
 				$article_filters = get_article_filters($filters, $line['title'],
 					$line['content'], $line['link'], strtotime($line['updated']),
@@ -1148,15 +1148,15 @@ class Pref_Feeds extends Handler_Protected {
 
 			foreach (array_keys($scores) as $s) {
 				if ($s > 1000) {
-					db_query( "UPDATE ttrss_user_entries SET score = '$s',
+					db_query("UPDATE ttrss_user_entries SET score = '$s',
 						marked = true WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				} else if ($s < -500) {
-					db_query( "UPDATE ttrss_user_entries SET score = '$s',
+					db_query("UPDATE ttrss_user_entries SET score = '$s',
 						unread = false WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				} else {
-					db_query( "UPDATE ttrss_user_entries SET score = '$s' WHERE
+					db_query("UPDATE ttrss_user_entries SET score = '$s' WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				}
 			}
@@ -1175,9 +1175,9 @@ class Pref_Feeds extends Handler_Protected {
 
 			$id = $feed_line["id"];
 
-			$filters = load_filters( $id, $_SESSION["uid"], 6);
+			$filters = load_filters($id, $_SESSION["uid"], 6);
 
-			$tmp_result = db_query( "SELECT
+			$tmp_result = db_query("SELECT
 				title, content, link, ref_id, author,".
 				  	SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
 					FROM
@@ -1190,7 +1190,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			while ($line = db_fetch_assoc($tmp_result)) {
 
-				$tags = get_article_tags( $line["ref_id"]);
+				$tags = get_article_tags($line["ref_id"]);
 
 				$article_filters = get_article_filters($filters, $line['title'],
 					$line['content'], $line['link'], strtotime($line['updated']),
@@ -1205,11 +1205,11 @@ class Pref_Feeds extends Handler_Protected {
 
 			foreach (array_keys($scores) as $s) {
 				if ($s > 1000) {
-					db_query( "UPDATE ttrss_user_entries SET score = '$s',
+					db_query("UPDATE ttrss_user_entries SET score = '$s',
 						marked = true WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				} else {
-					db_query( "UPDATE ttrss_user_entries SET score = '$s' WHERE
+					db_query("UPDATE ttrss_user_entries SET score = '$s' WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				}
 			}
@@ -1220,9 +1220,9 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function categorize() {
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 
-		$cat_id = db_escape_string( $_REQUEST["cat_id"]);
+		$cat_id = db_escape_string($_REQUEST["cat_id"]);
 
 		if ($cat_id == 0) {
 			$cat_id_qpart = 'NULL';
@@ -1230,30 +1230,30 @@ class Pref_Feeds extends Handler_Protected {
 			$cat_id_qpart = "'$cat_id'";
 		}
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
 		foreach ($ids as $id) {
 
-			db_query( "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
+			db_query("UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
 				WHERE id = '$id'
 			  	AND owner_uid = " . $_SESSION["uid"]);
 
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 	}
 
 	function removeCat() {
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 		foreach ($ids as $id) {
-			$this->remove_feed_category( $id, $_SESSION["uid"]);
+			$this->remove_feed_category($id, $_SESSION["uid"]);
 		}
 	}
 
 	function addCat() {
-		$feed_cat = db_escape_string( trim($_REQUEST["cat"]));
+		$feed_cat = db_escape_string(trim($_REQUEST["cat"]));
 
-		add_feed_category( $feed_cat);
+		add_feed_category($feed_cat);
 	}
 
 	function index() {
@@ -1261,7 +1261,7 @@ 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 = db_query( "SELECT COUNT(id) AS num_errors
+		$result = db_query("SELECT COUNT(id) AS num_errors
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
 		$num_errors = db_fetch_result($result, 0, "num_errors");
@@ -1279,7 +1279,7 @@ class Pref_Feeds extends Handler_Protected {
 			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
 		}
 
-		$result = db_query( "SELECT COUNT(*) AS num_inactive FROM ttrss_feeds WHERE
+		$result = db_query("SELECT COUNT(*) 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
@@ -1293,7 +1293,7 @@ class Pref_Feeds extends Handler_Protected {
 					__("Inactive feeds") . "</button>";
 		}
 
-		$feed_search = db_escape_string( $_REQUEST["search"]);
+		$feed_search = db_escape_string($_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_feed_search"] = $feed_search;
@@ -1336,7 +1336,7 @@ class Pref_Feeds extends Handler_Protected {
 			.__('Unsubscribe')."</div> ";
 		print "</div></div>";
 
-		if (get_pref( 'ENABLE_FEED_CATS')) {
+		if (get_pref('ENABLE_FEED_CATS')) {
 			print "<div dojoType=\"dijit.form.DropDownButton\">".
 					"<span>" . __('Categories')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
@@ -1522,14 +1522,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 = getCategoryUnread($cat_id);
 		}
 
 		$obj['id'] = 'CAT:' . $cat_id;
 		$obj['items'] = array();
-		$obj['name'] = getCategoryTitle( $cat_id);
+		$obj['name'] = getCategoryTitle($cat_id);
 		$obj['type'] = 'category';
 		$obj['unread'] = (int) $cat_unread;
 		$obj['bare_id'] = $cat_id;
@@ -1542,10 +1542,10 @@ class Pref_Feeds extends Handler_Protected {
 		$feed_id = (int) $feed_id;
 
 		if (!$title)
-			$title = getFeedTitle( $feed_id, false);
+			$title = getFeedTitle($feed_id, false);
 
 		if ($unread === false)
-			$unread = getFeedUnread( $feed_id, false);
+			$unread = getFeedUnread($feed_id, false);
 
 		$obj['id'] = 'FEED:' . $feed_id;
 		$obj['name'] = $title;
@@ -1567,7 +1567,7 @@ class Pref_Feeds extends Handler_Protected {
 			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
 		}
 
-		$result = db_query( "SELECT ttrss_feeds.title, ttrss_feeds.site_url,
+		$result = db_query("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
@@ -1621,7 +1621,7 @@ class Pref_Feeds extends Handler_Protected {
 				htmlspecialchars($line["title"])."</a>";
 
 			print "</td><td class=\"insensitive\" align='right'>";
-			print make_local_datetime( $line['last_article'], false);
+			print make_local_datetime($line['last_article'], false);
 			print "</td>";
 			print "</tr>";
 
@@ -1648,7 +1648,7 @@ class Pref_Feeds extends Handler_Protected {
 		print "<h2>" . __("These feeds have not been updated because of errors:") .
 			"</h2>";
 
-		$result = db_query( "SELECT id,title,feed_url,last_error,site_url
+		$result = db_query("SELECT id,title,feed_url,last_error,site_url
 		FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
 		print "<div dojoType=\"dijit.Toolbar\">";
@@ -1725,50 +1725,50 @@ class Pref_Feeds extends Handler_Protected {
 	private function clear_feed_articles($id) {
 
 		if ($id != 0) {
-			$result = db_query( "DELETE FROM ttrss_user_entries
+			$result = db_query("DELETE FROM ttrss_user_entries
 			WHERE feed_id = '$id' AND marked = false AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			$result = db_query( "DELETE FROM ttrss_user_entries
+			$result = db_query("DELETE FROM ttrss_user_entries
 			WHERE feed_id IS NULL AND marked = false AND owner_uid = " . $_SESSION["uid"]);
 		}
 
-		$result = db_query( "DELETE FROM ttrss_entries WHERE
+		$result = db_query("DELETE FROM ttrss_entries WHERE
 			(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
 
-		ccache_update( $id, $_SESSION['uid']);
+		ccache_update($id, $_SESSION['uid']);
 	} // function clear_feed_articles
 
-	private function remove_feed_category( $id, $owner_uid) {
+	private function remove_feed_category($id, $owner_uid) {
 
-		db_query( "DELETE FROM ttrss_feed_categories
+		db_query("DELETE FROM ttrss_feed_categories
 			WHERE id = '$id' AND owner_uid = $owner_uid");
 
-		ccache_remove( $id, $owner_uid, true);
+		ccache_remove($id, $owner_uid, true);
 	}
 
-	static function remove_feed( $id, $owner_uid) {
+	static function remove_feed($id, $owner_uid) {
 
 		if ($id > 0) {
 
 			/* save starred articles in Archived feed */
 
-			db_query( "BEGIN");
+			db_query("BEGIN");
 
 			/* prepare feed if necessary */
 
-			$result = db_query( "SELECT feed_url FROM ttrss_feeds WHERE id = $id
+			$result = db_query("SELECT feed_url FROM ttrss_feeds WHERE id = $id
 				AND owner_uid = $owner_uid");
 
-			$feed_url = db_escape_string( db_fetch_result($result, 0, "feed_url"));
+			$feed_url = db_escape_string(db_fetch_result($result, 0, "feed_url"));
 
-			$result = db_query( "SELECT id FROM ttrss_archived_feeds
+			$result = db_query("SELECT id FROM ttrss_archived_feeds
 				WHERE feed_url = '$feed_url' AND owner_uid = $owner_uid");
 
 			if (db_num_rows($result) == 0) {
-				$result = db_query( "SELECT MAX(id) AS id FROM ttrss_archived_feeds");
+				$result = db_query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
 				$new_feed_id = (int)db_fetch_result($result, 0, "id") + 1;
 
-				db_query( "INSERT INTO ttrss_archived_feeds
+				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'");
@@ -1778,31 +1778,31 @@ class Pref_Feeds extends Handler_Protected {
 				$archive_id = db_fetch_result($result, 0, "id");
 			}
 
-			db_query( "UPDATE ttrss_user_entries SET feed_id = NULL,
+			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");
 
 			/* Remove access key for the feed */
 
-			db_query( "DELETE FROM ttrss_access_keys WHERE
+			db_query("DELETE FROM ttrss_access_keys WHERE
 				feed_id = '$id' AND owner_uid = $owner_uid");
 
 			/* remove the feed */
 
-			db_query( "DELETE FROM ttrss_feeds
+			db_query("DELETE FROM ttrss_feeds
 					WHERE id = '$id' AND owner_uid = $owner_uid");
 
-			db_query( "COMMIT");
+			db_query("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
+			label_remove(feed_to_label_id($id), $owner_uid);
+			//ccache_remove($id, $owner_uid); don't think labels are cached
 		}
 	}
 
@@ -1813,9 +1813,9 @@ class Pref_Feeds extends Handler_Protected {
 		print "<table width='100%'><tr><td>
 			".__("Add one valid RSS feed per line (no feed detection is done)")."
 		</td><td align='right'>";
-		if (get_pref( 'ENABLE_FEED_CATS')) {
+		if (get_pref('ENABLE_FEED_CATS')) {
 			print __('Place in category:') . " ";
-			print_feed_cat_select( "cat", false, 'dojoType="dijit.form.Select"');
+			print_feed_cat_select("cat", false, 'dojoType="dijit.form.Select"');
 		}
 		print "</td></tr><tr><td colspan='2'>";
 		print "<textarea
@@ -1855,17 +1855,17 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function batchAddFeeds() {
-		$cat_id = db_escape_string( $_REQUEST['cat']);
+		$cat_id = db_escape_string($_REQUEST['cat']);
 		$feeds = explode("\n", $_REQUEST['feeds']);
-		$login = db_escape_string( $_REQUEST['login']);
+		$login = db_escape_string($_REQUEST['login']);
 		$pass = trim($_REQUEST['pass']);
 
 		foreach ($feeds as $feed) {
-			$feed = db_escape_string( trim($feed));
+			$feed = db_escape_string(trim($feed));
 
 			if (validate_feed_url($feed)) {
 
-				db_query( "BEGIN");
+				db_query("BEGIN");
 
 				if ($cat_id == "0" || !$cat_id) {
 					$cat_qpart = "NULL";
@@ -1885,7 +1885,7 @@ class Pref_Feeds extends Handler_Protected {
 					$auth_pass_encrypted = 'false';
 				}
 
-				$pass = db_escape_string( $pass);
+				$pass = db_escape_string($pass);
 
 				if (db_num_rows($result) == 0) {
 					$result = db_query(
@@ -1895,13 +1895,13 @@ class Pref_Feeds extends Handler_Protected {
 							'[Unknown]', $cat_qpart, '$login', '$pass', 0, $auth_pass_encrypted)");
 				}
 
-				db_query( "COMMIT");
+				db_query("COMMIT");
 			}
 		}
 	}
 
 	function regenOPMLKey() {
-		$this->update_feed_access_key( 'OPML:Publish',
+		$this->update_feed_access_key('OPML:Publish',
 		false, $_SESSION["uid"]);
 
 		$new_link = Opml::opml_publish_url();
@@ -1910,41 +1910,41 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function regenFeedKey() {
-		$feed_id = db_escape_string( $_REQUEST['id']);
-		$is_cat = db_escape_string( $_REQUEST['is_cat']) == "true";
+		$feed_id = db_escape_string($_REQUEST['id']);
+		$is_cat = db_escape_string($_REQUEST['is_cat']) == "true";
 
-		$new_key = $this->update_feed_access_key( $feed_id, $is_cat);
+		$new_key = $this->update_feed_access_key($feed_id, $is_cat);
 
 		print json_encode(array("link" => $new_key));
 	}
 
 
-	private function update_feed_access_key( $feed_id, $is_cat, $owner_uid = false) {
+	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 = db_query( "SELECT access_key FROM ttrss_access_keys
+		$result = db_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 (db_num_rows($result) == 1) {
-			$key = db_escape_string( sha1(uniqid(rand(), true)));
+			$key = db_escape_string(sha1(uniqid(rand(), true)));
 
-			db_query( "UPDATE ttrss_access_keys SET access_key = '$key'
+			db_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() {
-		db_query( "DELETE FROM ttrss_access_keys WHERE
+		db_query("DELETE FROM ttrss_access_keys WHERE
 			owner_uid = " . $_SESSION["uid"]);
 	}
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 12c2f271c..18a830f4b 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -9,7 +9,7 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	function filtersortreset() {
-		db_query( "UPDATE ttrss_filters2
+		db_query("UPDATE ttrss_filters2
 				SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
 		return;
 	}
@@ -31,7 +31,7 @@ class Pref_Filters extends Handler_Protected {
 
 				if ($filter_id > 0) {
 
-					db_query( "UPDATE ttrss_filters2 SET
+					db_query("UPDATE ttrss_filters2 SET
 						order_id = $index WHERE id = '$filter_id' AND
 						owner_uid = " .$_SESSION["uid"]);
 
@@ -49,13 +49,13 @@ class Pref_Filters extends Handler_Protected {
 
 		$filter["enabled"] = true;
 		$filter["match_any_rule"] = sql_bool_to_bool(
-			checkbox_to_sql_bool(db_escape_string( $_REQUEST["match_any_rule"])));
+			checkbox_to_sql_bool(db_escape_string($_REQUEST["match_any_rule"])));
 		$filter["inverse"] = sql_bool_to_bool(
-			checkbox_to_sql_bool(db_escape_string( $_REQUEST["inverse"])));
+			checkbox_to_sql_bool(db_escape_string($_REQUEST["inverse"])));
 
 		$filter["rules"] = array();
 
-		$result = db_query( "SELECT id,name FROM ttrss_filter_types");
+		$result = db_query("SELECT id,name FROM ttrss_filter_types");
 
 		$filter_types = array();
 		while ($line = db_fetch_assoc($result)) {
@@ -83,9 +83,9 @@ class Pref_Filters extends Handler_Protected {
 			}
 		}
 
-		$feed_title = getFeedTitle( $feed);
+		$feed_title = getFeedTitle($feed);
 
-		$qfh_ret = queryFeedHeadlines( -4, 30, "", false, false, false,
+		$qfh_ret = queryFeedHeadlines(-4, 30, "", false, false, false,
 			"date_entered DESC", 0, $_SESSION["uid"], $filter);
 
 		$result = $qfh_ret[0];
@@ -101,7 +101,7 @@ class Pref_Filters extends Handler_Protected {
 		while ($line = db_fetch_assoc($result)) {
 
 			$entry_timestamp = strtotime($line["updated"]);
-			$entry_tags = get_article_tags( $line["id"], $_SESSION["uid"]);
+			$entry_tags = get_article_tags($line["id"], $_SESSION["uid"]);
 
 			$content_preview = truncate_string(
 				strip_tags($line["content_preview"]), 100, '...');
@@ -158,7 +158,7 @@ class Pref_Filters extends Handler_Protected {
 
 		$filter_search = $_SESSION["prefs_filter_search"];
 
-		$result = db_query( "SELECT *,
+		$result = db_query("SELECT *,
 			(SELECT action_param FROM ttrss_filters2_actions
 				WHERE filter_id = ttrss_filters2.id ORDER BY id LIMIT 1) AS action_param,
 			(SELECT action_id FROM ttrss_filters2_actions
@@ -206,8 +206,8 @@ class Pref_Filters extends Handler_Protected {
 			}
 
 			if ($line['action_id'] == 7) {
-				$label_result = db_query( "SELECT fg_color, bg_color
-					FROM ttrss_labels2 WHERE caption = '".db_escape_string( $line['action_param'])."' AND
+				$label_result = db_query("SELECT fg_color, bg_color
+					FROM ttrss_labels2 WHERE caption = '".db_escape_string($line['action_param'])."' AND
 						owner_uid = " . $_SESSION["uid"]);
 
 				if (db_num_rows($label_result) > 0) {
@@ -248,7 +248,7 @@ class Pref_Filters extends Handler_Protected {
 
 	function edit() {
 
-		$filter_id = db_escape_string( $_REQUEST["id"]);
+		$filter_id = db_escape_string($_REQUEST["id"]);
 
 		$result = db_query(
 			"SELECT * FROM ttrss_filters2 WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]);
@@ -294,7 +294,7 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<ul id='filterDlg_Matches'>";
 
-		$rules_result = db_query( "SELECT * FROM ttrss_filters2_rules
+		$rules_result = db_query("SELECT * FROM ttrss_filters2_rules
 			WHERE filter_id = '$filter_id' ORDER BY reg_exp, id");
 
 		while ($line = db_fetch_assoc($rules_result)) {
@@ -342,7 +342,7 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<ul id='filterDlg_Actions'>";
 
-		$actions_result = db_query( "SELECT * FROM ttrss_filters2_actions
+		$actions_result = db_query("SELECT * FROM ttrss_filters2_actions
 			WHERE filter_id = '$filter_id' ORDER BY id");
 
 		while ($line = db_fetch_assoc($actions_result)) {
@@ -417,17 +417,17 @@ class Pref_Filters extends Handler_Protected {
 
 		if (strpos($feed_id, "CAT:") === 0) {
 			$feed_id = (int) substr($feed_id, 4);
-			$feed = getCategoryTitle( $feed_id);
+			$feed = getCategoryTitle($feed_id);
 		} else {
 			$feed_id = (int) $feed_id;
 
 			if ($rule["feed_id"])
-				$feed = getFeedTitle( (int)$rule["feed_id"]);
+				$feed = getFeedTitle((int)$rule["feed_id"]);
 			else
 				$feed = __("All feeds");
 		}
 
-		$result = db_query( "SELECT description FROM ttrss_filter_types
+		$result = db_query("SELECT description FROM ttrss_filter_types
 			WHERE id = ".(int)$rule["filter_type"]);
 		$filter_type = db_fetch_result($result, 0, "description");
 
@@ -440,7 +440,7 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	private function getActionName($action) {
-		$result = db_query( "SELECT description FROM
+		$result = db_query("SELECT description FROM
 			ttrss_filter_actions WHERE id = " .(int)$action["action_id"]);
 
 		$title = __(db_fetch_result($result, 0, "description"));
@@ -463,13 +463,13 @@ class Pref_Filters extends Handler_Protected {
 
 #		print_r($_REQUEST);
 
-		$filter_id = db_escape_string( $_REQUEST["id"]);
-		$enabled = checkbox_to_sql_bool(db_escape_string( $_REQUEST["enabled"]));
-		$match_any_rule = checkbox_to_sql_bool(db_escape_string( $_REQUEST["match_any_rule"]));
-		$inverse = checkbox_to_sql_bool(db_escape_string( $_REQUEST["inverse"]));
-		$title = db_escape_string( $_REQUEST["title"]);
+		$filter_id = db_escape_string($_REQUEST["id"]);
+		$enabled = checkbox_to_sql_bool(db_escape_string($_REQUEST["enabled"]));
+		$match_any_rule = checkbox_to_sql_bool(db_escape_string($_REQUEST["match_any_rule"]));
+		$inverse = checkbox_to_sql_bool(db_escape_string($_REQUEST["inverse"]));
+		$title = db_escape_string($_REQUEST["title"]);
 
-		$result = db_query( "UPDATE ttrss_filters2 SET enabled = $enabled,
+		$result = db_query("UPDATE ttrss_filters2 SET enabled = $enabled,
 			match_any_rule = $match_any_rule,
 			inverse = $inverse,
 			title = '$title'
@@ -482,17 +482,17 @@ class Pref_Filters extends Handler_Protected {
 
 	function remove() {
 
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			db_query( "DELETE FROM ttrss_filters2 WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
+			db_query("DELETE FROM ttrss_filters2 WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
 		}
 	}
 
 	private function saveRulesAndActions($filter_id) {
 
-		db_query( "DELETE FROM ttrss_filters2_rules WHERE filter_id = '$filter_id'");
-		db_query( "DELETE FROM ttrss_filters2_actions WHERE filter_id = '$filter_id'");
+		db_query("DELETE FROM ttrss_filters2_rules WHERE filter_id = '$filter_id'");
+		db_query("DELETE FROM ttrss_filters2_actions WHERE filter_id = '$filter_id'");
 
 		if ($filter_id) {
 			/* create rules */
@@ -521,11 +521,11 @@ class Pref_Filters extends Handler_Protected {
 			foreach ($rules as $rule) {
 				if ($rule) {
 
-					$reg_exp = strip_tags(db_escape_string( trim($rule["reg_exp"])));
+					$reg_exp = strip_tags(db_escape_string(trim($rule["reg_exp"])));
 					$inverse = isset($rule["inverse"]) ? "true" : "false";
 
-					$filter_type = (int) db_escape_string( trim($rule["filter_type"]));
-					$feed_id = db_escape_string( trim($rule["feed_id"]));
+					$filter_type = (int) db_escape_string(trim($rule["filter_type"]));
+					$feed_id = db_escape_string(trim($rule["feed_id"]));
 
 					if (strpos($feed_id, "CAT:") === 0) {
 
@@ -546,16 +546,16 @@ class Pref_Filters extends Handler_Protected {
 						(filter_id, reg_exp,filter_type,feed_id,cat_id,cat_filter,inverse) VALUES
 						('$filter_id', '$reg_exp', '$filter_type', $feed_id, $cat_id, $cat_filter, $inverse)";
 
-					db_query( $query);
+					db_query($query);
 				}
 			}
 
 			foreach ($actions as $action) {
 				if ($action) {
 
-					$action_id = (int) db_escape_string( $action["action_id"]);
-					$action_param = db_escape_string( $action["action_param"]);
-					$action_param_label = db_escape_string( $action["action_param_label"]);
+					$action_id = (int) db_escape_string($action["action_id"]);
+					$action_param = db_escape_string($action["action_param"]);
+					$action_param_label = db_escape_string($action["action_param_label"]);
 
 					if ($action_id == 7) {
 						$action_param = $action_param_label;
@@ -569,7 +569,7 @@ class Pref_Filters extends Handler_Protected {
 						(filter_id, action_id, action_param) VALUES
 						('$filter_id', '$action_id', '$action_param')";
 
-					db_query( $query);
+					db_query($query);
 				}
 			}
 		}
@@ -586,35 +586,35 @@ class Pref_Filters extends Handler_Protected {
 
 		$enabled = checkbox_to_sql_bool($_REQUEST["enabled"]);
 		$match_any_rule = checkbox_to_sql_bool($_REQUEST["match_any_rule"]);
-		$title = db_escape_string( $_REQUEST["title"]);
+		$title = db_escape_string($_REQUEST["title"]);
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
 		/* create base filter */
 
-		$result = db_query( "INSERT INTO ttrss_filters2
+		$result = db_query("INSERT INTO ttrss_filters2
 			(owner_uid, match_any_rule, enabled, title) VALUES
 			(".$_SESSION["uid"].",$match_any_rule,$enabled, '$title')");
 
-		$result = db_query( "SELECT MAX(id) AS id FROM ttrss_filters2
+		$result = db_query("SELECT MAX(id) AS id FROM ttrss_filters2
 			WHERE owner_uid = ".$_SESSION["uid"]);
 
 		$filter_id = db_fetch_result($result, 0, "id");
 
 		$this->saveRulesAndActions($filter_id);
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 	}
 
 	function index() {
 
-		$sort = db_escape_string( $_REQUEST["sort"]);
+		$sort = db_escape_string($_REQUEST["sort"]);
 
 		if (!$sort || $sort == "undefined") {
 			$sort = "reg_exp";
 		}
 
-		$filter_search = db_escape_string( $_REQUEST["search"]);
+		$filter_search = db_escape_string($_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_filter_search"] = $filter_search;
@@ -626,7 +626,7 @@ class Pref_Filters extends Handler_Protected {
 		print "<div id=\"pref-filter-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">";
 		print "<div id=\"pref-filter-toolbar\" dojoType=\"dijit.Toolbar\">";
 
-		$filter_search = db_escape_string( $_REQUEST["search"]);
+		$filter_search = db_escape_string($_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_filter_search"] = $filter_search;
@@ -832,7 +832,7 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<form name='filter_new_rule_form' id='filter_new_rule_form'>";
 
-		$result = db_query( "SELECT id,description
+		$result = db_query("SELECT id,description
 			FROM ttrss_filter_types WHERE id != 5 ORDER BY description");
 
 		$filter_types = array();
@@ -864,7 +864,7 @@ class Pref_Filters extends Handler_Protected {
 		print __("in") . " ";
 
 		print "<span id='filterDlg_feeds'>";
-		print_feed_select( "feed_id",
+		print_feed_select("feed_id",
 			$cat_filter ? "CAT:$feed_id" : $feed_id,
 			'dojoType="dijit.form.FilteringSelect"');
 		print "</span>";
@@ -888,7 +888,7 @@ class Pref_Filters extends Handler_Protected {
 		$action = json_decode($_REQUEST["action"], true);
 
 		if ($action) {
-			$action_param = db_escape_string( $action["action_param"]);
+			$action_param = db_escape_string($action["action_param"]);
 			$action_id = (int)$action["action_id"];
 		} else {
 			$action_param = "";
@@ -904,7 +904,7 @@ class Pref_Filters extends Handler_Protected {
 		print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
 			onchange=\"filterDlgCheckAction(this)\">";
 
-		$result = db_query( "SELECT id,description FROM ttrss_filter_actions
+		$result = db_query("SELECT id,description FROM ttrss_filter_actions
 			ORDER BY name");
 
 		while ($line = db_fetch_assoc($result)) {
@@ -928,7 +928,7 @@ class Pref_Filters extends Handler_Protected {
 			id=\"filterDlg_actionParam\" style=\"$param_hidden\"
 			name=\"action_param\" value=\"$action_param\">";
 
-		print_label_select( "action_param_label", $action_param,
+		print_label_select("action_param_label", $action_param,
 			"id=\"filterDlg_actionParamLabel\" style=\"$label_param_hidden\"
 			dojoType=\"dijit.form.Select\"");
 
@@ -987,22 +987,22 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	function join() {
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 
 		if (count($ids) > 1) {
 			$base_id = array_shift($ids);
 			$ids_str = join(",", $ids);
 
-			db_query( "BEGIN");
-			db_query( "UPDATE ttrss_filters2_rules
+			db_query("BEGIN");
+			db_query("UPDATE ttrss_filters2_rules
 				SET filter_id = '$base_id' WHERE filter_id IN ($ids_str)");
-			db_query( "UPDATE ttrss_filters2_actions
+			db_query("UPDATE ttrss_filters2_actions
 				SET filter_id = '$base_id' WHERE filter_id IN ($ids_str)");
 
-			db_query( "DELETE FROM ttrss_filters2 WHERE id IN ($ids_str)");
-			db_query( "UPDATE ttrss_filters2 SET match_any_rule = true WHERE id = '$base_id'");
+			db_query("DELETE FROM ttrss_filters2 WHERE id IN ($ids_str)");
+			db_query("UPDATE ttrss_filters2 SET match_any_rule = true WHERE id = '$base_id'");
 
-			db_query( "COMMIT");
+			db_query("COMMIT");
 
 			$this->optimizeFilter($base_id);
 
@@ -1010,8 +1010,8 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	private function optimizeFilter($id) {
-		db_query( "BEGIN");
-		$result = db_query( "SELECT * FROM ttrss_filters2_actions
+		db_query("BEGIN");
+		$result = db_query("SELECT * FROM ttrss_filters2_actions
 			WHERE filter_id = '$id'");
 
 		$tmp = array();
@@ -1030,11 +1030,11 @@ class Pref_Filters extends Handler_Protected {
 
 		if (count($dupe_ids) > 0) {
 			$ids_str = join(",", $dupe_ids);
-			db_query( "DELETE FROM ttrss_filters2_actions
+			db_query("DELETE FROM ttrss_filters2_actions
 				WHERE id IN ($ids_str)");
 		}
 
-		$result = db_query( "SELECT * FROM ttrss_filters2_rules
+		$result = db_query("SELECT * FROM ttrss_filters2_rules
 			WHERE filter_id = '$id'");
 
 		$tmp = array();
@@ -1053,11 +1053,11 @@ class Pref_Filters extends Handler_Protected {
 
 		if (count($dupe_ids) > 0) {
 			$ids_str = join(",", $dupe_ids);
-			db_query( "DELETE FROM ttrss_filters2_rules
+			db_query("DELETE FROM ttrss_filters2_rules
 				WHERE id IN ($ids_str)");
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 	}
 }
 ?>
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index e0b118e81..38056ed6c 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -8,9 +8,9 @@ class Pref_Labels extends Handler_Protected {
 	}
 
 	function edit() {
-		$label_id = db_escape_string( $_REQUEST['id']);
+		$label_id = db_escape_string($_REQUEST['id']);
 
-		$result = db_query( "SELECT * FROM ttrss_labels2 WHERE
+		$result = db_query("SELECT * FROM ttrss_labels2 WHERE
 			id = '$label_id' AND owner_uid = " . $_SESSION["uid"]);
 
 		$line = db_fetch_assoc($result);
@@ -90,7 +90,7 @@ class Pref_Labels extends Handler_Protected {
 		$root['name'] = __('Labels');
 		$root['items'] = array();
 
-		$result = db_query( "SELECT *
+		$result = db_query("SELECT *
 			FROM ttrss_labels2
 			WHERE owner_uid = ".$_SESSION["uid"]."
 			ORDER BY caption");
@@ -118,29 +118,29 @@ class Pref_Labels extends Handler_Protected {
 	}
 
 	function colorset() {
-		$kind = db_escape_string( $_REQUEST["kind"]);
-		$ids = explode(',', db_escape_string( $_REQUEST["ids"]));
-		$color = db_escape_string( $_REQUEST["color"]);
-		$fg = db_escape_string( $_REQUEST["fg"]);
-		$bg = db_escape_string( $_REQUEST["bg"]);
+		$kind = db_escape_string($_REQUEST["kind"]);
+		$ids = explode(',', db_escape_string($_REQUEST["ids"]));
+		$color = db_escape_string($_REQUEST["color"]);
+		$fg = db_escape_string($_REQUEST["fg"]);
+		$bg = db_escape_string($_REQUEST["bg"]);
 
 		foreach ($ids as $id) {
 
 			if ($kind == "fg" || $kind == "bg") {
-				db_query( "UPDATE ttrss_labels2 SET
+				db_query("UPDATE ttrss_labels2 SET
 					${kind}_color = '$color' WHERE id = '$id'
 					AND owner_uid = " . $_SESSION["uid"]);
 			} else {
-				db_query( "UPDATE ttrss_labels2 SET
+				db_query("UPDATE ttrss_labels2 SET
 					fg_color = '$fg', bg_color = '$bg' WHERE id = '$id'
 					AND owner_uid = " . $_SESSION["uid"]);
 			}
 
-			$caption = db_escape_string( label_find_caption($id, $_SESSION["uid"]));
+			$caption = db_escape_string(label_find_caption($id, $_SESSION["uid"]));
 
 			/* Remove cached data */
 
-			db_query( "UPDATE ttrss_user_entries SET label_cache = ''
+			db_query("UPDATE ttrss_user_entries SET label_cache = ''
 				WHERE label_cache LIKE '%$caption%' AND owner_uid = " . $_SESSION["uid"]);
 
 		}
@@ -149,18 +149,18 @@ class Pref_Labels extends Handler_Protected {
 	}
 
 	function colorreset() {
-		$ids = explode(',', db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(',', db_escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			db_query( "UPDATE ttrss_labels2 SET
+			db_query("UPDATE ttrss_labels2 SET
 				fg_color = '', bg_color = '' WHERE id = '$id'
 				AND owner_uid = " . $_SESSION["uid"]);
 
-			$caption = db_escape_string( label_find_caption($id, $_SESSION["uid"]));
+			$caption = db_escape_string(label_find_caption($id, $_SESSION["uid"]));
 
 			/* Remove cached data */
 
-			db_query( "UPDATE ttrss_user_entries SET label_cache = ''
+			db_query("UPDATE ttrss_user_entries SET label_cache = ''
 				WHERE label_cache LIKE '%$caption%' AND owner_uid = " . $_SESSION["uid"]);
 		}
 
@@ -168,31 +168,31 @@ class Pref_Labels extends Handler_Protected {
 
 	function save() {
 
-		$id = db_escape_string( $_REQUEST["id"]);
-		$caption = db_escape_string( trim($_REQUEST["caption"]));
+		$id = db_escape_string($_REQUEST["id"]);
+		$caption = db_escape_string(trim($_REQUEST["caption"]));
 
-		db_query( "BEGIN");
+		db_query("BEGIN");
 
-		$result = db_query( "SELECT caption FROM ttrss_labels2
+		$result = db_query("SELECT caption FROM ttrss_labels2
 			WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
 
 		if (db_num_rows($result) != 0) {
 			$old_caption = db_fetch_result($result, 0, "caption");
 
-			$result = db_query( "SELECT id FROM ttrss_labels2
+			$result = db_query("SELECT id FROM ttrss_labels2
 				WHERE caption = '$caption' AND owner_uid = ". $_SESSION["uid"]);
 
 			if (db_num_rows($result) == 0) {
 				if ($caption) {
-					$result = db_query( "UPDATE ttrss_labels2 SET
+					$result = db_query("UPDATE ttrss_labels2 SET
 						caption = '$caption' WHERE id = '$id' AND
 						owner_uid = " . $_SESSION["uid"]);
 
 					/* Update filters that reference label being renamed */
 
-					$old_caption = db_escape_string( $old_caption);
+					$old_caption = db_escape_string($old_caption);
 
-					db_query( "UPDATE ttrss_filters2_actions SET
+					db_query("UPDATE ttrss_filters2_actions SET
 						action_param = '$caption' WHERE action_param = '$old_caption'
 						AND action_id = 7
 						AND filter_id IN (SELECT id FROM ttrss_filters2 WHERE owner_uid = ".$_SESSION["uid"].")");
@@ -206,28 +206,28 @@ class Pref_Labels extends Handler_Protected {
 			}
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 
 		return;
 	}
 
 	function remove() {
 
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			label_remove( $id, $_SESSION["uid"]);
+			label_remove($id, $_SESSION["uid"]);
 		}
 
 	}
 
 	function add() {
-		$caption = db_escape_string( $_REQUEST["caption"]);
-		$output = db_escape_string( $_REQUEST["output"]);
+		$caption = db_escape_string($_REQUEST["caption"]);
+		$output = db_escape_string($_REQUEST["output"]);
 
 		if ($caption) {
 
-			if (label_create( $caption)) {
+			if (label_create($caption)) {
 				if (!$output) {
 					print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption));
 				}
@@ -238,7 +238,7 @@ class Pref_Labels extends Handler_Protected {
 
 				print "<rpc-reply><payload>";
 
-				print_label_select( "select_label",
+				print_label_select("select_label",
 					$caption, "");
 
 				print "</payload></rpc-reply>";
@@ -250,13 +250,13 @@ class Pref_Labels extends Handler_Protected {
 
 	function index() {
 
-		$sort = db_escape_string( $_REQUEST["sort"]);
+		$sort = db_escape_string($_REQUEST["sort"]);
 
 		if (!$sort || $sort == "undefined") {
 			$sort = "caption";
 		}
 
-		$label_search = db_escape_string( $_REQUEST["search"]);
+		$label_search = db_escape_string($_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_label_search"] = $label_search;
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 514f0a2e3..8e8abb5eb 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -103,13 +103,13 @@ class Pref_Prefs extends Handler_Protected {
 
 		foreach (array_keys($_POST) as $pref_name) {
 
-			$pref_name = db_escape_string( $pref_name);
-			$value = db_escape_string( $_POST[$pref_name]);
+			$pref_name = db_escape_string($pref_name);
+			$value = db_escape_string($_POST[$pref_name]);
 
 			if ($pref_name == 'DIGEST_PREFERRED_TIME') {
-				if (get_pref( 'DIGEST_PREFERRED_TIME') != $value) {
+				if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
 
-					db_query( "UPDATE ttrss_users SET
+					db_query("UPDATE ttrss_users SET
 						last_digest_sent = NULL WHERE id = " . $_SESSION['uid']);
 
 				}
@@ -124,7 +124,7 @@ class Pref_Prefs extends Handler_Protected {
 					$need_reload = true;
 				}
 			} else {
-				set_pref( $pref_name, $value);
+				set_pref($pref_name, $value);
 			}
 
 		}
@@ -138,9 +138,9 @@ class Pref_Prefs extends Handler_Protected {
 
 	function getHelp() {
 
-		$pref_name = db_escape_string( $_REQUEST["pn"]);
+		$pref_name = db_escape_string($_REQUEST["pn"]);
 
-		$result = db_query( "SELECT help_text FROM ttrss_prefs
+		$result = db_query("SELECT help_text FROM ttrss_prefs
 			WHERE pref_name = '$pref_name'");
 
 		if (db_num_rows($result) > 0) {
@@ -153,12 +153,12 @@ class Pref_Prefs extends Handler_Protected {
 
 	function changeemail() {
 
-		$email = db_escape_string( $_POST["email"]);
-		$full_name = db_escape_string( $_POST["full_name"]);
+		$email = db_escape_string($_POST["email"]);
+		$full_name = db_escape_string($_POST["full_name"]);
 
 		$active_uid = $_SESSION["uid"];
 
-		db_query( "UPDATE ttrss_users SET email = '$email',
+		db_query("UPDATE ttrss_users SET email = '$email',
 			full_name = '$full_name' WHERE id = '$active_uid'");
 
 		print __("Your personal data has been saved.");
@@ -176,10 +176,10 @@ class Pref_Prefs extends Handler_Protected {
 			$profile_qpart = "profile IS NULL";
 		}
 
-		db_query( "DELETE FROM ttrss_user_prefs
+		db_query("DELETE FROM ttrss_user_prefs
 			WHERE $profile_qpart AND owner_uid = ".$_SESSION["uid"]);
 
-		initialize_user_prefs( $_SESSION["uid"], $_SESSION["profile"]);
+		initialize_user_prefs($_SESSION["uid"], $_SESSION["profile"]);
 
 		echo __("Your preferences are now set to default values.");
 	}
@@ -225,7 +225,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "<h2>" . __("Personal data") . "</h2>";
 
-		$result = db_query( "SELECT email,full_name,otp_enabled,
+		$result = db_query("SELECT email,full_name,otp_enabled,
 			access_level FROM ttrss_users
 			WHERE id = ".$_SESSION["uid"]);
 
@@ -270,7 +270,7 @@ class Pref_Prefs extends Handler_Protected {
 
 			print "<h2>" . __("Password") . "</h2>";
 
-			$result = db_query( "SELECT id FROM ttrss_users
+			$result = db_query("SELECT id FROM ttrss_users
 				WHERE id = ".$_SESSION["uid"]." AND pwd_hash
 				= 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'");
 
@@ -480,10 +480,10 @@ class Pref_Prefs extends Handler_Protected {
 		}
 
 		if ($_SESSION["profile"]) {
-			initialize_user_prefs( $_SESSION["uid"], $_SESSION["profile"]);
+			initialize_user_prefs($_SESSION["uid"], $_SESSION["profile"]);
 			$profile_qpart = "profile = '" . $_SESSION["profile"] . "'";
 		} else {
-			initialize_user_prefs( $_SESSION["uid"]);
+			initialize_user_prefs($_SESSION["uid"]);
 			$profile_qpart = "profile IS NULL";
 		}
 
@@ -494,7 +494,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		$access_query = 'true';
 
-		$result = db_query( "SELECT DISTINCT
+		$result = db_query("SELECT DISTINCT
 			ttrss_user_prefs.pref_name,value,type_name,
 			ttrss_prefs_sections.order_id,
 			def_value,section_id
@@ -767,7 +767,7 @@ class Pref_Prefs extends Handler_Protected {
 				<td width='10%'>".__('Author')."</td></tr>";
 
 		$system_enabled = array_map("trim", explode(",", PLUGINS));
-		$user_enabled = array_map("trim", explode(",", get_pref( "_ENABLED_PLUGINS")));
+		$user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
 
 		$tmppluginhost = new PluginHost(Db::get());
 		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
@@ -897,7 +897,7 @@ class Pref_Prefs extends Handler_Protected {
 		require_once "lib/otphp/lib/totp.php";
 		require_once "lib/phpqrcode/phpqrcode.php";
 
-		$result = db_query( "SELECT login,salt,otp_enabled
+		$result = db_query("SELECT login,salt,otp_enabled
 			FROM ttrss_users
 			WHERE id = ".$_SESSION["uid"]);
 
@@ -926,7 +926,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-			$result = db_query( "SELECT salt
+			$result = db_query("SELECT salt
 				FROM ttrss_users
 				WHERE id = ".$_SESSION["uid"]);
 
@@ -938,7 +938,7 @@ class Pref_Prefs extends Handler_Protected {
 			$otp_check = $topt->now();
 
 			if ($otp == $otp_check) {
-				db_query( "UPDATE ttrss_users SET otp_enabled = true WHERE
+				db_query("UPDATE ttrss_users SET otp_enabled = true WHERE
 					id = " . $_SESSION["uid"]);
 
 				print "OK";
@@ -952,14 +952,14 @@ class Pref_Prefs extends Handler_Protected {
 	}
 
 	function otpdisable() {
-		$password = db_escape_string( $_REQUEST["password"]);
+		$password = db_escape_string($_REQUEST["password"]);
 
 		global $pluginhost;
 		$authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
 
 		if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-			db_query( "UPDATE ttrss_users SET otp_enabled = false WHERE
+			db_query("UPDATE ttrss_users SET otp_enabled = false WHERE
 				id = " . $_SESSION["uid"]);
 
 			print "OK";
@@ -975,18 +975,18 @@ class Pref_Prefs extends Handler_Protected {
 		else
 			$plugins = "";
 
-		set_pref( "_ENABLED_PLUGINS", $plugins);
+		set_pref("_ENABLED_PLUGINS", $plugins);
 	}
 
 	function clearplugindata() {
-		$name = db_escape_string( $_REQUEST["name"]);
+		$name = db_escape_string($_REQUEST["name"]);
 
 		global $pluginhost;
 		$pluginhost->clear_data($pluginhost->get_plugin($name));
 	}
 
 	function customizeCSS() {
-		$value = get_pref( "USER_STYLESHEET");
+		$value = get_pref("USER_STYLESHEET");
 
 		$value = str_replace("<br/>", "\n", $value);
 
@@ -1034,7 +1034,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "</div>";
 
-		$result = db_query( "SELECT title,id FROM ttrss_settings_profiles
+		$result = db_query("SELECT title,id FROM ttrss_settings_profiles
 			WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
 		print "<div class=\"prefProfileHolder\">";
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 0282b2d73..6d44fd2ea 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -24,7 +24,7 @@ class Pref_System extends Handler_Protected {
 		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
 
-		$result = db_query( "SELECT errno, errstr, filename, lineno,
+		$result = db_query("SELECT errno, errstr, filename, lineno,
 			created_at, login FROM ttrss_error_log
 			LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
 			ORDER BY ttrss_error_log.id DESC
diff --git a/classes/pref/users.php b/classes/pref/users.php
index a9c3689fd..7541625fd 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -21,7 +21,7 @@ class Pref_Users extends Handler_Protected {
 
 			$uid = sprintf("%d", $_REQUEST["id"]);
 
-			$result = db_query( "SELECT login,
+			$result = db_query("SELECT login,
 				".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
 				access_level,
 				(SELECT COUNT(int_id) FROM ttrss_user_entries
@@ -53,7 +53,7 @@ class Pref_Users extends Handler_Protected {
 			print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
 			print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
 
-			$result = db_query( "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
+			$result = db_query("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
 				WHERE owner_uid = '$uid'");
 
 			$num_feeds = db_fetch_result($result, 0, "num_feeds");
@@ -64,7 +64,7 @@ class Pref_Users extends Handler_Protected {
 
 			print "<h1>".__('Subscribed feeds')."</h1>";
 
-			$result = db_query( "SELECT id,title,site_url FROM ttrss_feeds
+			$result = db_query("SELECT id,title,site_url FROM ttrss_feeds
 				WHERE owner_uid = '$uid' ORDER BY title");
 
 			print "<ul class=\"userFeedList\">";
@@ -105,14 +105,14 @@ class Pref_Users extends Handler_Protected {
 		function edit() {
 			global $access_level_names;
 
-			$id = db_escape_string( $_REQUEST["id"]);
+			$id = db_escape_string($_REQUEST["id"]);
 			print "<form id=\"user_edit_form\" onsubmit='return false'>";
 
 			print "<input type=\"hidden\" name=\"id\" value=\"$id\">";
 			print "<input type=\"hidden\" name=\"op\" value=\"pref-users\">";
 			print "<input type=\"hidden\" name=\"method\" value=\"editSave\">";
 
-			$result = db_query( "SELECT * FROM ttrss_users WHERE id = '$id'");
+			$result = db_query("SELECT * FROM ttrss_users WHERE id = '$id'");
 
 			$login = db_fetch_result($result, 0, "login");
 			$access_level = db_fetch_result($result, 0, "access_level");
@@ -181,10 +181,10 @@ class Pref_Users extends Handler_Protected {
 		}
 
 		function editSave() {
-			$login = db_escape_string( trim($_REQUEST["login"]));
-			$uid = db_escape_string( $_REQUEST["id"]);
+			$login = db_escape_string(trim($_REQUEST["login"]));
+			$uid = db_escape_string($_REQUEST["id"]);
 			$access_level = (int) $_REQUEST["access_level"];
-			$email = db_escape_string( trim($_REQUEST["email"]));
+			$email = db_escape_string(trim($_REQUEST["email"]));
 			$password = $_REQUEST["password"];
 
 			if ($password) {
@@ -195,42 +195,42 @@ class Pref_Users extends Handler_Protected {
 				$pass_query_part = "";
 			}
 
-			db_query( "UPDATE ttrss_users SET $pass_query_part login = '$login',
+			db_query("UPDATE ttrss_users SET $pass_query_part login = '$login',
 				access_level = '$access_level', email = '$email', otp_enabled = false
 				WHERE id = '$uid'");
 
 		}
 
 		function remove() {
-			$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+			$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 
 			foreach ($ids as $id) {
 				if ($id != $_SESSION["uid"] && $id != 1) {
-					db_query( "DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
-					db_query( "DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
-					db_query( "DELETE FROM ttrss_users WHERE id = '$id'");
+					db_query("DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
+					db_query("DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
+					db_query("DELETE FROM ttrss_users WHERE id = '$id'");
 				}
 			}
 		}
 
 		function add() {
 
-			$login = db_escape_string( trim($_REQUEST["login"]));
+			$login = db_escape_string(trim($_REQUEST["login"]));
 			$tmp_user_pwd = make_password(8);
 			$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 			$pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
 
-			$result = db_query( "SELECT id FROM ttrss_users WHERE
+			$result = db_query("SELECT id FROM ttrss_users WHERE
 				login = '$login'");
 
 			if (db_num_rows($result) == 0) {
 
-				db_query( "INSERT INTO ttrss_users
+				db_query("INSERT INTO ttrss_users
 					(login,pwd_hash,access_level,last_login,created, salt)
 					VALUES ('$login', '$pwd_hash', 0, null, NOW(), '$salt')");
 
 
-				$result = db_query( "SELECT id FROM ttrss_users WHERE
+				$result = db_query("SELECT id FROM ttrss_users WHERE
 					login = '$login' AND pwd_hash = '$pwd_hash'");
 
 				if (db_num_rows($result) == 1) {
@@ -240,7 +240,7 @@ class Pref_Users extends Handler_Protected {
 					print format_notice(T_sprintf("Added user <b>%s</b> with password <b>%s</b>",
 						$login, $tmp_user_pwd));
 
-					initialize_user( $new_uid);
+					initialize_user($new_uid);
 
 				} else {
 
@@ -304,8 +304,8 @@ class Pref_Users extends Handler_Protected {
 		}
 
 		function resetPass() {
-			$uid = db_escape_string( $_REQUEST["id"]);
-			Pref_Users::resetUserPassword( $uid, true);
+			$uid = db_escape_string($_REQUEST["id"]);
+			Pref_Users::resetUserPassword($uid, true);
 		}
 
 		function index() {
@@ -317,7 +317,7 @@ class Pref_Users extends Handler_Protected {
 
 			print "<div id=\"pref-user-toolbar\" dojoType=\"dijit.Toolbar\">";
 
-			$user_search = db_escape_string( $_REQUEST["search"]);
+			$user_search = db_escape_string($_REQUEST["search"]);
 
 			if (array_key_exists("search", $_REQUEST)) {
 				$_SESSION["prefs_user_search"] = $user_search;
@@ -332,7 +332,7 @@ class Pref_Users extends Handler_Protected {
 					__('Search')."</button>
 				</div>";
 
-			$sort = db_escape_string( $_REQUEST["sort"]);
+			$sort = db_escape_string($_REQUEST["sort"]);
 
 			if (!$sort || $sort == "undefined") {
 				$sort = "login";
@@ -381,7 +381,7 @@ class Pref_Users extends Handler_Protected {
 				$user_search_query = "";
 			}
 
-			$result = db_query( "SELECT
+			$result = db_query("SELECT
 					id,login,access_level,email,
 					".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login,
 					".SUBSTRING_FOR_DATE."(created,1,16) as created
@@ -416,8 +416,8 @@ class Pref_Users extends Handler_Protected {
 
 				$line["login"] = htmlspecialchars($line["login"]);
 
-				$line["created"] = make_local_datetime( $line["created"], false);
-				$line["last_login"] = make_local_datetime( $line["last_login"], false);
+				$line["created"] = make_local_datetime($line["created"], false);
+				$line["last_login"] = make_local_datetime($line["last_login"], false);
 
 				print "<td align='center'><input onclick='toggleSelectRow2(this);'
 					dojoType=\"dijit.form.CheckBox\" type=\"checkbox\"
diff --git a/classes/rpc.php b/classes/rpc.php
index c46d61d30..3b753f118 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -8,18 +8,18 @@ class RPC extends Handler_Protected {
 	}
 
 	function setprofile() {
-		$id = db_escape_string( $_REQUEST["id"]);
+		$id = db_escape_string($_REQUEST["id"]);
 
 		$_SESSION["profile"] = $id;
 		$_SESSION["prefs_cache"] = array();
 	}
 
 	function remprofiles() {
-		$ids = explode(",", db_escape_string( trim($_REQUEST["ids"])));
+		$ids = explode(",", db_escape_string(trim($_REQUEST["ids"])));
 
 		foreach ($ids as $id) {
 			if ($_SESSION["profile"] != $id) {
-				db_query( "DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
+				db_query("DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
 							owner_uid = " . $_SESSION["uid"]);
 			}
 		}
@@ -27,38 +27,38 @@ class RPC extends Handler_Protected {
 
 	// Silent
 	function addprofile() {
-		$title = db_escape_string( trim($_REQUEST["title"]));
+		$title = db_escape_string(trim($_REQUEST["title"]));
 		if ($title) {
-			db_query( "BEGIN");
+			db_query("BEGIN");
 
-			$result = db_query( "SELECT id FROM ttrss_settings_profiles
+			$result = db_query("SELECT id FROM ttrss_settings_profiles
 				WHERE title = '$title' AND owner_uid = " . $_SESSION["uid"]);
 
 			if (db_num_rows($result) == 0) {
 
-				db_query( "INSERT INTO ttrss_settings_profiles (title, owner_uid)
+				db_query("INSERT INTO ttrss_settings_profiles (title, owner_uid)
 							VALUES ('$title', ".$_SESSION["uid"] .")");
 
-				$result = db_query( "SELECT id FROM ttrss_settings_profiles WHERE
+				$result = db_query("SELECT id FROM ttrss_settings_profiles WHERE
 					title = '$title'");
 
 				if (db_num_rows($result) != 0) {
 					$profile_id = db_fetch_result($result, 0, "id");
 
 					if ($profile_id) {
-						initialize_user_prefs( $_SESSION["uid"], $profile_id);
+						initialize_user_prefs($_SESSION["uid"], $profile_id);
 					}
 				}
 			}
 
-			db_query( "COMMIT");
+			db_query("COMMIT");
 		}
 	}
 
 	// Silent
 	function saveprofile() {
-		$id = db_escape_string( $_REQUEST["id"]);
-		$title = db_escape_string( trim($_REQUEST["value"]));
+		$id = db_escape_string($_REQUEST["id"]);
+		$title = db_escape_string(trim($_REQUEST["value"]));
 
 		if ($id == 0) {
 			print __("Default profile");
@@ -66,55 +66,55 @@ class RPC extends Handler_Protected {
 		}
 
 		if ($title) {
-			db_query( "BEGIN");
+			db_query("BEGIN");
 
-			$result = db_query( "SELECT id FROM ttrss_settings_profiles
+			$result = db_query("SELECT id FROM ttrss_settings_profiles
 				WHERE title = '$title' AND owner_uid =" . $_SESSION["uid"]);
 
 			if (db_num_rows($result) == 0) {
-				db_query( "UPDATE ttrss_settings_profiles
+				db_query("UPDATE ttrss_settings_profiles
 							SET title = '$title' WHERE id = '$id' AND
 							owner_uid = " . $_SESSION["uid"]);
 				print $title;
 			} else {
-				$result = db_query( "SELECT title FROM ttrss_settings_profiles
+				$result = db_query("SELECT title FROM ttrss_settings_profiles
 							WHERE id = '$id' AND owner_uid =" . $_SESSION["uid"]);
 				print db_fetch_result($result, 0, "title");
 			}
 
-			db_query( "COMMIT");
+			db_query("COMMIT");
 		}
 	}
 
 	// Silent
 	function remarchive() {
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			$result = db_query( "DELETE FROM ttrss_archived_feeds WHERE
+			$result = db_query("DELETE FROM ttrss_archived_feeds WHERE
 		(SELECT COUNT(*) FROM ttrss_user_entries
 							WHERE orig_feed_id = '$id') = 0 AND
 		id = '$id' AND owner_uid = ".$_SESSION["uid"]);
 
-			$rc = db_affected_rows( $result);
+			$rc = db_affected_rows($result);
 		}
 	}
 
 	function addfeed() {
-		$feed = db_escape_string( $_REQUEST['feed']);
-		$cat = db_escape_string( $_REQUEST['cat']);
-		$login = db_escape_string( $_REQUEST['login']);
+		$feed = db_escape_string($_REQUEST['feed']);
+		$cat = db_escape_string($_REQUEST['cat']);
+		$login = db_escape_string($_REQUEST['login']);
 		$pass = trim($_REQUEST['pass']); // escaped later
 
-		$rc = subscribe_to_feed( $feed, $cat, $login, $pass);
+		$rc = subscribe_to_feed($feed, $cat, $login, $pass);
 
 		print json_encode(array("result" => $rc));
 	}
 
 	function togglepref() {
-		$key = db_escape_string( $_REQUEST["key"]);
-		set_pref( $key, !get_pref( $key));
-		$value = get_pref( $key);
+		$key = db_escape_string($_REQUEST["key"]);
+		set_pref($key, !get_pref($key));
+		$value = get_pref($key);
 
 		print json_encode(array("param" =>$key, "value" => $value));
 	}
@@ -124,14 +124,14 @@ class RPC extends Handler_Protected {
 		$key = $_REQUEST['key'];
 		$value = str_replace("\n", "<br/>", $_REQUEST['value']);
 
-		set_pref( $key, $value, $_SESSION['uid'], $key != 'USER_STYLESHEET');
+		set_pref($key, $value, $_SESSION['uid'], $key != 'USER_STYLESHEET');
 
 		print json_encode(array("param" =>$key, "value" => $value));
 	}
 
 	function mark() {
 		$mark = $_REQUEST["mark"];
-		$id = db_escape_string( $_REQUEST["id"]);
+		$id = db_escape_string($_REQUEST["id"]);
 
 		if ($mark == "1") {
 			$mark = "true";
@@ -139,7 +139,7 @@ class RPC extends Handler_Protected {
 			$mark = "false";
 		}
 
-		$result = db_query( "UPDATE ttrss_user_entries SET marked = $mark,
+		$result = db_query("UPDATE ttrss_user_entries SET marked = $mark,
 					last_marked = NOW()
 					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
@@ -147,9 +147,9 @@ class RPC extends Handler_Protected {
 	}
 
 	function delete() {
-		$ids = db_escape_string( $_REQUEST["ids"]);
+		$ids = db_escape_string($_REQUEST["ids"]);
 
-		$result = db_query( "DELETE FROM ttrss_user_entries
+		$result = db_query("DELETE FROM ttrss_user_entries
 		WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
 		purge_orphans();
@@ -161,19 +161,19 @@ class RPC extends Handler_Protected {
 		$ids = explode(",", $_REQUEST["ids"]);
 
 		foreach ($ids as $id) {
-			$id = db_escape_string( trim($id));
-			db_query( "BEGIN");
+			$id = db_escape_string(trim($id));
+			db_query("BEGIN");
 
-			$result = db_query( "SELECT feed_url,site_url,title FROM ttrss_archived_feeds
+			$result = db_query("SELECT feed_url,site_url,title FROM ttrss_archived_feeds
 				WHERE id = (SELECT orig_feed_id FROM ttrss_user_entries WHERE ref_id = $id
 				AND owner_uid = ".$_SESSION["uid"].")");
 
 			if (db_num_rows($result) != 0) {
-				$feed_url = db_escape_string( db_fetch_result($result, 0, "feed_url"));
-				$site_url = db_escape_string( db_fetch_result($result, 0, "site_url"));
-				$title = db_escape_string( db_fetch_result($result, 0, "title"));
+				$feed_url = db_escape_string(db_fetch_result($result, 0, "feed_url"));
+				$site_url = db_escape_string(db_fetch_result($result, 0, "site_url"));
+				$title = db_escape_string(db_fetch_result($result, 0, "title"));
 
-				$result = db_query( "SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
+				$result = db_query("SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
 					AND owner_uid = " .$_SESSION["uid"]);
 
 				if (db_num_rows($result) == 0) {
@@ -202,32 +202,32 @@ class RPC extends Handler_Protected {
 				}
 
 				if ($feed_id) {
-					$result = db_query( "UPDATE ttrss_user_entries
+					$result = db_query("UPDATE ttrss_user_entries
 						SET feed_id = '$feed_id', orig_feed_id = NULL
 						WHERE ref_id = $id AND owner_uid = " . $_SESSION["uid"]);
 				}
 			}
 
-			db_query( "COMMIT");
+			db_query("COMMIT");
 		}
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
 	function archive() {
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			$this->archive_article( $id, $_SESSION["uid"]);
+			$this->archive_article($id, $_SESSION["uid"]);
 		}
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
-	private function archive_article( $id, $owner_uid) {
-		db_query( "BEGIN");
+	private function archive_article($id, $owner_uid) {
+		db_query("BEGIN");
 
-		$result = db_query( "SELECT feed_id FROM ttrss_user_entries
+		$result = db_query("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = '$id' AND owner_uid = $owner_uid");
 
 		if (db_num_rows($result) != 0) {
@@ -237,29 +237,29 @@ class RPC extends Handler_Protected {
 			$feed_id = (int) db_fetch_result($result, 0, "feed_id");
 
 			if ($feed_id) {
-				$result = db_query( "SELECT id FROM ttrss_archived_feeds
+				$result = db_query("SELECT id FROM ttrss_archived_feeds
 					WHERE id = '$feed_id'");
 
 				if (db_num_rows($result) == 0) {
-					db_query( "INSERT INTO ttrss_archived_feeds
+					db_query("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url)
 					SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds
 				  	WHERE id = '$feed_id'");
 				}
 
-				db_query( "UPDATE ttrss_user_entries
+				db_query("UPDATE ttrss_user_entries
 					SET orig_feed_id = feed_id, feed_id = NULL
 					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 			}
 		}
 
-		db_query( "COMMIT");
+		db_query("COMMIT");
 	}
 
 	function publ() {
 		$pub = $_REQUEST["pub"];
-		$id = db_escape_string( $_REQUEST["id"]);
-		$note = trim(strip_tags(db_escape_string( $_REQUEST["note"])));
+		$id = db_escape_string($_REQUEST["id"]);
+		$note = trim(strip_tags(db_escape_string($_REQUEST["note"])));
 
 		if ($pub == "1") {
 			$pub = "true";
@@ -267,7 +267,7 @@ class RPC extends Handler_Protected {
 			$pub = "false";
 		}
 
-		$result = db_query( "UPDATE ttrss_user_entries SET
+		$result = db_query("UPDATE ttrss_user_entries SET
 			published = $pub, last_published = NOW()
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
@@ -276,7 +276,7 @@ class RPC extends Handler_Protected {
 		if (PUBSUBHUBBUB_HUB) {
 			$rss_link = get_self_url_prefix() .
 				"/public.php?op=rss&id=-2&key=" .
-				get_feed_access_key( -2, false);
+				get_feed_access_key(-2, false);
 
 			$p = new Publisher(PUBSUBHUBBUB_HUB);
 
@@ -305,28 +305,28 @@ class RPC extends Handler_Protected {
 
 	/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
 	function catchupSelected() {
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 		$cmode = sprintf("%d", $_REQUEST["cmode"]);
 
-		catchupArticlesById( $ids, $cmode);
+		catchupArticlesById($ids, $cmode);
 
 		print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
 	}
 
 	function markSelected() {
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 		$cmode = sprintf("%d", $_REQUEST["cmode"]);
 
-		$this->markArticlesById( $ids, $cmode);
+		$this->markArticlesById($ids, $cmode);
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
 	function publishSelected() {
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 		$cmode = sprintf("%d", $_REQUEST["cmode"]);
 
-		$this->publishArticlesById( $ids, $cmode);
+		$this->publishArticlesById($ids, $cmode);
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
@@ -349,9 +349,9 @@ class RPC extends Handler_Protected {
 	}
 
 	function completeLabels() {
-		$search = db_escape_string( $_REQUEST["search"]);
+		$search = db_escape_string($_REQUEST["search"]);
 
-		$result = db_query( "SELECT DISTINCT caption FROM
+		$result = db_query("SELECT DISTINCT caption FROM
 				ttrss_labels2
 				WHERE owner_uid = '".$_SESSION["uid"]."' AND
 				LOWER(caption) LIKE LOWER('$search%') ORDER BY caption
@@ -365,29 +365,29 @@ class RPC extends Handler_Protected {
 	}
 
 	function purge() {
-		$ids = explode(",", db_escape_string( $_REQUEST["ids"]));
+		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
 		$days = sprintf("%d", $_REQUEST["days"]);
 
 		foreach ($ids as $id) {
 
-			$result = db_query( "SELECT id FROM ttrss_feeds WHERE
+			$result = db_query("SELECT id FROM ttrss_feeds WHERE
 				id = '$id' AND owner_uid = ".$_SESSION["uid"]);
 
 			if (db_num_rows($result) == 1) {
-				purge_feed( $id, $days);
+				purge_feed($id, $days);
 			}
 		}
 	}
 
 	function updateFeedBrowser() {
-		$search = db_escape_string( $_REQUEST["search"]);
-		$limit = db_escape_string( $_REQUEST["limit"]);
-		$mode = (int) db_escape_string( $_REQUEST["mode"]);
+		$search = db_escape_string($_REQUEST["search"]);
+		$limit = db_escape_string($_REQUEST["limit"]);
+		$mode = (int) db_escape_string($_REQUEST["mode"]);
 
 		require_once "feedbrowser.php";
 
 		print json_encode(array("content" =>
-			make_feed_browser( $search, $limit, $mode),
+			make_feed_browser($search, $limit, $mode),
 				"mode" => $mode));
 	}
 
@@ -402,14 +402,14 @@ class RPC extends Handler_Protected {
 		if ($mode == 1) {
 			foreach ($payload as $feed) {
 
-				$title = db_escape_string( $feed[0]);
-				$feed_url = db_escape_string( $feed[1]);
+				$title = db_escape_string($feed[0]);
+				$feed_url = db_escape_string($feed[1]);
 
-				$result = db_query( "SELECT id FROM ttrss_feeds WHERE
+				$result = db_query("SELECT id FROM ttrss_feeds WHERE
 					feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
 				if (db_num_rows($result) == 0) {
-					$result = db_query( "INSERT INTO ttrss_feeds
+					$result = db_query("INSERT INTO ttrss_feeds
 									(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES ('".$_SESSION["uid"]."',
 									'$feed_url', '$title', NULL, '')");
@@ -418,19 +418,19 @@ class RPC extends Handler_Protected {
 		} else if ($mode == 2) {
 			// feed archive
 			foreach ($payload as $id) {
-				$result = db_query( "SELECT * FROM ttrss_archived_feeds
+				$result = db_query("SELECT * FROM ttrss_archived_feeds
 					WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
 				if (db_num_rows($result) != 0) {
-					$site_url = db_escape_string( db_fetch_result($result, 0, "site_url"));
-					$feed_url = db_escape_string( db_fetch_result($result, 0, "feed_url"));
-					$title = db_escape_string( db_fetch_result($result, 0, "title"));
+					$site_url = db_escape_string(db_fetch_result($result, 0, "site_url"));
+					$feed_url = db_escape_string(db_fetch_result($result, 0, "feed_url"));
+					$title = db_escape_string(db_fetch_result($result, 0, "title"));
 
-					$result = db_query( "SELECT id FROM ttrss_feeds WHERE
+					$result = db_query("SELECT id FROM ttrss_feeds WHERE
 						feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
 					if (db_num_rows($result) == 0) {
-						$result = db_query( "INSERT INTO ttrss_feeds
+						$result = db_query("INSERT INTO ttrss_feeds
 										(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES ('$id','".$_SESSION["uid"]."',
 									'$feed_url', '$title', NULL, '$site_url')");
@@ -441,21 +441,21 @@ class RPC extends Handler_Protected {
 	}
 
 	function catchupFeed() {
-		$feed_id = db_escape_string( $_REQUEST['feed_id']);
-		$is_cat = db_escape_string( $_REQUEST['is_cat']) == "true";
-		$mode = db_escape_string( $_REQUEST['mode']);
+		$feed_id = db_escape_string($_REQUEST['feed_id']);
+		$is_cat = db_escape_string($_REQUEST['is_cat']) == "true";
+		$mode = db_escape_string($_REQUEST['mode']);
 
-		catchup_feed( $feed_id, $is_cat, false, false, $mode);
+		catchup_feed($feed_id, $is_cat, false, false, $mode);
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
 	function quickAddCat() {
-		$cat = db_escape_string( $_REQUEST["cat"]);
+		$cat = db_escape_string($_REQUEST["cat"]);
 
-		add_feed_category( $cat);
+		add_feed_category($cat);
 
-		$result = db_query( "SELECT id FROM ttrss_feed_categories WHERE
+		$result = db_query("SELECT id FROM ttrss_feed_categories WHERE
 			title = '$cat' AND owner_uid = " . $_SESSION["uid"]);
 
 		if (db_num_rows($result) == 1) {
@@ -464,12 +464,12 @@ class RPC extends Handler_Protected {
 			$id = 0;
 		}
 
-		print_feed_cat_select( "cat_id", $id);
+		print_feed_cat_select("cat_id", $id);
 	}
 
 	// Silent
 	function clearArticleKeys() {
-		db_query( "UPDATE ttrss_user_entries SET uuid = '' WHERE
+		db_query("UPDATE ttrss_user_entries SET uuid = '' WHERE
 			owner_uid = " . $_SESSION["uid"]);
 
 		return;
@@ -516,7 +516,7 @@ class RPC extends Handler_Protected {
 		$random_qpart = sql_random_function();
 
 		// We search for feed needing update.
-		$result = db_query( "SELECT ttrss_feeds.feed_url,ttrss_feeds.id
+		$result = db_query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -539,7 +539,7 @@ class RPC extends Handler_Protected {
 			$feed_id = $line["id"];
 
 			if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
-				update_rss_feed( $feed_id, true);
+				update_rss_feed($feed_id, true);
 				++$num_updated;
 			} else {
 				break;
@@ -548,7 +548,7 @@ class RPC extends Handler_Protected {
 
 		// Purge orphans and cleanup tags
 		purge_orphans();
-		cleanup_tags( 14, 50000);
+		cleanup_tags(14, 50000);
 
 		if ($num_updated > 0) {
 			print json_encode(array("message" => "UPDATE_COUNTERS",
@@ -559,7 +559,7 @@ class RPC extends Handler_Protected {
 
 	}
 
-	private function markArticlesById( $ids, $cmode) {
+	private function markArticlesById($ids, $cmode) {
 
 		$tmp_ids = array();
 
@@ -570,21 +570,21 @@ class RPC extends Handler_Protected {
 		$ids_qpart = join(" OR ", $tmp_ids);
 
 		if ($cmode == 0) {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			marked = false, last_marked = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else if ($cmode == 1) {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			marked = true, last_marked = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			marked = NOT marked,last_marked = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		}
 	}
 
-	private function publishArticlesById( $ids, $cmode) {
+	private function publishArticlesById($ids, $cmode) {
 
 		$tmp_ids = array();
 
@@ -595,15 +595,15 @@ class RPC extends Handler_Protected {
 		$ids_qpart = join(" OR ", $tmp_ids);
 
 		if ($cmode == 0) {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			published = false,last_published = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else if ($cmode == 1) {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			published = true,last_published = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			db_query( "UPDATE ttrss_user_entries SET
+			db_query("UPDATE ttrss_user_entries SET
 			published = NOT published,last_published = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		}
@@ -611,7 +611,7 @@ class RPC extends Handler_Protected {
 		if (PUBSUBHUBBUB_HUB) {
 			$rss_link = get_self_url_prefix() .
 				"/public.php?op=rss&id=-2&key=" .
-				get_feed_access_key( -2, false);
+				get_feed_access_key(-2, false);
 
 			$p = new Publisher(PUBSUBHUBBUB_HUB);
 
@@ -620,9 +620,9 @@ class RPC extends Handler_Protected {
 	}
 
 	function getlinktitlebyid() {
-		$id = db_escape_string( $_REQUEST['id']);
+		$id = db_escape_string($_REQUEST['id']);
 
-		$result = db_query( "SELECT link, title FROM ttrss_entries, ttrss_user_entries
+		$result = db_query("SELECT link, title FROM ttrss_entries, ttrss_user_entries
 			WHERE ref_id = '$id' AND ref_id = id AND owner_uid = ". $_SESSION["uid"]);
 
 		if (db_num_rows($result) != 0) {
diff --git a/classes/sessionhandler.php b/classes/sessionhandler.php
index 66d8dd86c..5b072343a 100644
--- a/classes/sessionhandler.php
+++ b/classes/sessionhandler.php
@@ -46,14 +46,14 @@ class SessionHandler implements SessionHandlerInterface {
 			return false;
 		}
 
-		$data = $this->db->escape_string( base64_encode($data), false);
+		$data = $this->db->escape_string(base64_encode($data), false);
 
 		$expire = time() + max(SESSION_COOKIE_LIFETIME, 86400);
 
 	 	$query = "UPDATE ttrss_sessions SET data='$data',
 				expire = '$expire' WHERE id='$id'";
 
-		$this->db->query( $query);
+		$this->db->query($query);
 		return true;
 	}
 
-- 
cgit v1.2.3


From ae35bb87ebcf08007a6086f136b98cba2448d34f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 18:56:13 +0400
Subject: support mysqli when available

---
 classes/db.php        |  8 ++++--
 classes/db/mysql.php  |  4 ++-
 classes/db/mysqli.php | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 classes/db/mysqli.php

(limited to 'classes')

diff --git a/classes/db.php b/classes/db.php
index 6dc31a22e..c9d9ad5ea 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -7,7 +7,11 @@ class Db implements IDb {
 	private function __construct() {
 		switch (DB_TYPE) {
 		case "mysql":
-			$this->adapter = new Db_Mysql();
+			if (function_exists("mysqli_connect")) {
+				$this->adapter = new Db_Mysqli();
+			} else {
+				$this->adapter = new Db_Mysql();
+			}
 			break;
 		case "pgsql":
 			$this->adapter = new Db_Pgsql();
@@ -16,7 +20,7 @@ class Db implements IDb {
 			die("Unknown DB_TYPE: " . DB_TYPE);
 		}
 
-		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, DB_PORT);
+		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : false);
 	}
 
 	private function __clone() {
diff --git a/classes/db/mysql.php b/classes/db/mysql.php
index fe5d05e2f..aab05aca2 100644
--- a/classes/db/mysql.php
+++ b/classes/db/mysql.php
@@ -20,6 +20,8 @@ class Db_Mysql implements IDb {
 	}
 
 	function escape_string($s, $strip_tags = true) {
+		if ($strip_tags) $s = strip_tags($s);
+
 		return mysql_real_escape_string($s, $this->link);
 	}
 
@@ -54,7 +56,7 @@ class Db_Mysql implements IDb {
 	}
 
 	function last_error() {
-		return mysql_affected_rows($this->link);
+		return mysql_error();
 	}
 
 	function init() {
diff --git a/classes/db/mysqli.php b/classes/db/mysqli.php
new file mode 100644
index 000000000..e82f66300
--- /dev/null
+++ b/classes/db/mysqli.php
@@ -0,0 +1,74 @@
+<?php
+class Db_Mysqli implements IDb {
+	private $link;
+
+	function connect($host, $user, $pass, $db, $port) {
+		$this->link = mysqli_connect($host, $user, $pass, $db, $port);
+
+		if ($this->link) {
+			$this->init();
+
+			return $this->link;
+		} else {
+			die("Unable to connect to database (as $user to $host, database $db): " . mysqli_error());
+		}
+	}
+
+	function escape_string($s, $strip_tags = true) {
+		if ($strip_tags) $s = strip_tags($s);
+
+		return mysqli_real_escape_string($this->link, $s);
+	}
+
+	function query($query, $die_on_error = true) {
+		$result = mysqli_query($this->link, $query);
+		if (!$result) {
+			user_error("Query $query failed: " . ($this->link ? mysqli_error($this->link) : "No connection"),
+				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
+		}
+
+		return $result;
+	}
+
+	function fetch_assoc($result) {
+		return mysqli_fetch_assoc($result);
+	}
+
+
+	function num_rows($result) {
+		return mysqli_num_rows($result);
+	}
+
+	function fetch_result($result, $row, $param) {
+		if (mysqli_data_seek($result, $row)) {
+			$line = mysqli_fetch_assoc($result);
+			return $line[$param];
+		} else {
+			return false;
+		}
+	}
+
+	function close() {
+		return mysqli_close($this->link);
+	}
+
+	function affected_rows($result) {
+		return mysqli_affected_rows($this->link);
+	}
+
+	function last_error() {
+		return mysqli_error();
+	}
+
+	function init() {
+		$this->query("SET time_zone = '+0:0'");
+
+		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+			$this->query("SET NAMES " . MYSQL_CHARSET);
+		}
+
+		return true;
+	}
+
+}
+?>
-- 
cgit v1.2.3


From 01568557b5085e7943d196b919b46c94d6d04b5c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 17 Apr 2013 19:00:15 +0400
Subject: log viewer: add refresh button

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

(limited to 'classes')

diff --git a/classes/pref/system.php b/classes/pref/system.php
index 6d44fd2ea..23f5a4328 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -30,6 +30,9 @@ class Pref_System extends Handler_Protected {
 			ORDER BY ttrss_error_log.id DESC
 			LIMIT 100");
 
+		print "<button dojoType=\"dijit.form.Button\"
+			onclick=\"updateSystemList()\">".__('Refresh')."</button> ";
+
 		print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
 
 		print "<tr class=\"title\">
-- 
cgit v1.2.3


From b4b45b4534e87026f7f07167cb78e44456144179 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 20:10:21 +0400
Subject: remove sessionhandler

---
 classes/sessionhandler.php | 73 ----------------------------------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 classes/sessionhandler.php

(limited to 'classes')

diff --git a/classes/sessionhandler.php b/classes/sessionhandler.php
deleted file mode 100644
index 5b072343a..000000000
--- a/classes/sessionhandler.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-class SessionHandler implements SessionHandlerInterface {
-	private static $instance;
-	private $db;
-
-	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
-
-		return self::$instance;
-	}
-
-	private function __construct() {
-		$this->db = Db::get();
-
-		session_set_save_handler("SessionHandler::open", "SessionHandler::close",
-			"SessionHandler::read", "SessionHandler::write", "SessionHandler::destroy",
-			"SessionHandler::gc");
-	}
-
-	public static function open($save_path, $name) { }
-
-
-	public static function read ($id){
-
-		$query = "SELECT data FROM ttrss_sessions WHERE id='$id'";
-
-		$res = $this->db->query("SELECT data FROM ttrss_sessions WHERE id='$id'");
-
-		if ($this->db->num_rows($res) != 1) {
-
-			"INSERT INTO ttrss_sessions (id, data, expire)
-					VALUES ('$id', '$data', '$expire')";
-
-
-
-		} else {
-			$data = $this->db->fetch_result($res, 0, "data");
-			return base64_decode($data);
-		}
-
-	}
-
-	public static function write($id, $data) {
-		if (! $data) {
-			return false;
-		}
-
-		$data = $this->db->escape_string(base64_encode($data), false);
-
-		$expire = time() + max(SESSION_COOKIE_LIFETIME, 86400);
-
-	 	$query = "UPDATE ttrss_sessions SET data='$data',
-				expire = '$expire' WHERE id='$id'";
-
-		$this->db->query($query);
-		return true;
-	}
-
-	public static function close () { }
-
-	public static function destroy($session_id) {
-		$this->db->query("DELETE FROM ttrss_sessions WHERE id = '$session_id'");
-		return true;
-	}
-
-	public static function gc($maxLifeTime) {
-		$this->db->query("DELETE FROM ttrss_sessions WHERE expire < " time() - $maxLifeTime);
-		return true;
-	}
-
-}
-?>
-- 
cgit v1.2.3


From d9c85e0f112034ca3e3f4d34213f6dcccf9d54e1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 20:12:14 +0400
Subject: classes: use OO DB interface

---
 classes/api.php            | 116 ++++++++++-----------
 classes/article.php        |  64 ++++++------
 classes/auth/base.php      |  12 +--
 classes/dbupdater.php      |  24 ++---
 classes/dlg.php            |  16 +--
 classes/feeds.php          |  80 +++++++-------
 classes/handler/public.php | 120 ++++++++++-----------
 classes/logger/sql.php     |   2 +-
 classes/opml.php           | 108 +++++++++----------
 classes/pluginhost.php     |  24 ++---
 classes/pref/feeds.php     | 252 ++++++++++++++++++++++-----------------------
 classes/pref/filters.php   | 168 +++++++++++++++---------------
 classes/pref/labels.php    |  70 ++++++-------
 classes/pref/prefs.php     |  64 ++++++------
 classes/pref/system.php    |   4 +-
 classes/pref/users.php     |  76 +++++++-------
 classes/rpc.php            | 214 +++++++++++++++++++-------------------
 17 files changed, 707 insertions(+), 707 deletions(-)

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index 422fc5a1b..945496bcf 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -50,16 +50,16 @@ class API extends Handler {
 		@session_destroy();
 		@session_start();
 
-		$login = db_escape_string($_REQUEST["user"]);
+		$login = $this->dbh->escape_string($_REQUEST["user"]);
 		$password = $_REQUEST["password"];
 		$password_base64 = base64_decode($_REQUEST["password"]);
 
 		if (SINGLE_USER_MODE) $login = "admin";
 
-		$result = db_query("SELECT id FROM ttrss_users WHERE login = '$login'");
+		$result = $this->dbh->query("SELECT id FROM ttrss_users WHERE login = '$login'");
 
-		if (db_num_rows($result) != 0) {
-			$uid = db_fetch_result($result, 0, "id");
+		if ($this->dbh->num_rows($result) != 0) {
+			$uid = $this->dbh->fetch_result($result, 0, "id");
 		} else {
 			$uid = 0;
 		}
@@ -95,8 +95,8 @@ class API extends Handler {
 	}
 
 	function getUnread() {
-		$feed_id = db_escape_string($_REQUEST["feed_id"]);
-		$is_cat = db_escape_string($_REQUEST["is_cat"]);
+		$feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
+		$is_cat = $this->dbh->escape_string($_REQUEST["is_cat"]);
 
 		if ($feed_id) {
 			print $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
@@ -111,10 +111,10 @@ class API extends Handler {
 	}
 
 	function getFeeds() {
-		$cat_id = db_escape_string($_REQUEST["cat_id"]);
+		$cat_id = $this->dbh->escape_string($_REQUEST["cat_id"]);
 		$unread_only = sql_bool_to_bool($_REQUEST["unread_only"]);
-		$limit = (int) db_escape_string($_REQUEST["limit"]);
-		$offset = (int) db_escape_string($_REQUEST["offset"]);
+		$limit = (int) $this->dbh->escape_string($_REQUEST["limit"]);
+		$offset = (int) $this->dbh->escape_string($_REQUEST["offset"]);
 		$include_nested = sql_bool_to_bool($_REQUEST["include_nested"]);
 
 		$feeds = $this->api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested);
@@ -134,7 +134,7 @@ class API extends Handler {
 		else
 			$nested_qpart = "true";
 
-		$result = db_query("SELECT
+		$result = $this->dbh->query("SELECT
 				id, title, order_id, (SELECT COUNT(id) FROM
 				ttrss_feeds WHERE
 				ttrss_feed_categories.id IS NOT NULL AND cat_id = ttrss_feed_categories.id) AS num_feeds,
@@ -147,7 +147,7 @@ class API extends Handler {
 
 		$cats = array();
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
 				$unread = getFeedUnread($line["id"], true);
 
@@ -180,22 +180,22 @@ class API extends Handler {
 	}
 
 	function getHeadlines() {
-		$feed_id = db_escape_string($_REQUEST["feed_id"]);
+		$feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
 		if ($feed_id != "") {
 
-			$limit = (int)db_escape_string($_REQUEST["limit"]);
+			$limit = (int)$this->dbh->escape_string($_REQUEST["limit"]);
 
 			if (!$limit || $limit >= 60) $limit = 60;
 
-			$offset = (int)db_escape_string($_REQUEST["skip"]);
-			$filter = db_escape_string($_REQUEST["filter"]);
+			$offset = (int)$this->dbh->escape_string($_REQUEST["skip"]);
+			$filter = $this->dbh->escape_string($_REQUEST["filter"]);
 			$is_cat = sql_bool_to_bool($_REQUEST["is_cat"]);
 			$show_excerpt = sql_bool_to_bool($_REQUEST["show_excerpt"]);
 			$show_content = sql_bool_to_bool($_REQUEST["show_content"]);
 			/* all_articles, unread, adaptive, marked, updated */
-			$view_mode = db_escape_string($_REQUEST["view_mode"]);
+			$view_mode = $this->dbh->escape_string($_REQUEST["view_mode"]);
 			$include_attachments = sql_bool_to_bool($_REQUEST["include_attachments"]);
-			$since_id = (int)db_escape_string($_REQUEST["since_id"]);
+			$since_id = (int)$this->dbh->escape_string($_REQUEST["since_id"]);
 			$include_nested = sql_bool_to_bool($_REQUEST["include_nested"]);
 			$sanitize_content = true;
 
@@ -211,8 +211,8 @@ class API extends Handler {
 
 			/* do not rely on params below */
 
-			$search = db_escape_string($_REQUEST["search"]);
-			$search_mode = db_escape_string($_REQUEST["search_mode"]);
+			$search = $this->dbh->escape_string($_REQUEST["search"]);
+			$search_mode = $this->dbh->escape_string($_REQUEST["search_mode"]);
 
 			$headlines = $this->api_get_headlines($feed_id, $limit, $offset,
 				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order,
@@ -226,10 +226,10 @@ class API extends Handler {
 	}
 
 	function updateArticle() {
-		$article_ids = array_filter(explode(",", db_escape_string($_REQUEST["article_ids"])), is_numeric);
-		$mode = (int) db_escape_string($_REQUEST["mode"]);
-		$data = db_escape_string($_REQUEST["data"]);
-		$field_raw = (int)db_escape_string($_REQUEST["field"]);
+		$article_ids = array_filter(explode(",", $this->dbh->escape_string($_REQUEST["article_ids"])), is_numeric);
+		$mode = (int) $this->dbh->escape_string($_REQUEST["mode"]);
+		$data = $this->dbh->escape_string($_REQUEST["data"]);
+		$field_raw = (int)$this->dbh->escape_string($_REQUEST["field"]);
 
 		$field = "";
 		$set_to = "";
@@ -269,15 +269,15 @@ class API extends Handler {
 
 			$article_ids = join(", ", $article_ids);
 
-			$result = db_query("UPDATE ttrss_user_entries SET $field = $set_to $additional_fields WHERE ref_id IN ($article_ids) AND owner_uid = " . $_SESSION["uid"]);
+			$result = $this->dbh->query("UPDATE ttrss_user_entries SET $field = $set_to $additional_fields WHERE ref_id IN ($article_ids) AND owner_uid = " . $_SESSION["uid"]);
 
-			$num_updated = db_affected_rows($result);
+			$num_updated = $this->dbh->affected_rows($result);
 
 			if ($num_updated > 0 && $field == "unread") {
-				$result = db_query("SELECT DISTINCT feed_id FROM ttrss_user_entries
+				$result = $this->dbh->query("SELECT DISTINCT feed_id FROM ttrss_user_entries
 					WHERE ref_id IN ($article_ids)");
 
-				while ($line = db_fetch_assoc($result)) {
+				while ($line = $this->dbh->fetch_assoc($result)) {
 					ccache_update($line["feed_id"], $_SESSION["uid"]);
 				}
 			}
@@ -304,7 +304,7 @@ class API extends Handler {
 
 	function getArticle() {
 
-		$article_id = join(",", array_filter(explode(",", db_escape_string($_REQUEST["article_id"])), is_numeric));
+		$article_id = join(",", array_filter(explode(",", $this->dbh->escape_string($_REQUEST["article_id"])), is_numeric));
 
 		$query = "SELECT id,title,link,content,cached_content,feed_id,comments,int_id,
 			marked,unread,published,score,
@@ -314,13 +314,13 @@ class API extends Handler {
 			WHERE	id IN ($article_id) AND ref_id = id AND owner_uid = " .
 				$_SESSION["uid"] ;
 
-		$result = db_query($query);
+		$result = $this->dbh->query($query);
 
 		$articles = array();
 
-		if (db_num_rows($result) != 0) {
+		if ($this->dbh->num_rows($result) != 0) {
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 
 				$attachments = get_article_enclosures($line['id']);
 
@@ -363,10 +363,10 @@ class API extends Handler {
 
 		$config["daemon_is_running"] = file_is_locked("update_daemon.lock");
 
-		$result = db_query("SELECT COUNT(*) AS cf FROM
+		$result = $this->dbh->query("SELECT COUNT(*) AS cf FROM
 			ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
 
-		$num_feeds = db_fetch_result($result, 0, "cf");
+		$num_feeds = $this->dbh->fetch_result($result, 0, "cf");
 
 		$config["num_feeds"] = (int)$num_feeds;
 
@@ -376,7 +376,7 @@ class API extends Handler {
 	function updateFeed() {
 		require_once "include/rssfuncs.php";
 
-		$feed_id = (int) db_escape_string($_REQUEST["feed_id"]);
+		$feed_id = (int) $this->dbh->escape_string($_REQUEST["feed_id"]);
 
 		update_rss_feed($feed_id, true);
 
@@ -384,8 +384,8 @@ class API extends Handler {
 	}
 
 	function catchupFeed() {
-		$feed_id = db_escape_string($_REQUEST["feed_id"]);
-		$is_cat = db_escape_string($_REQUEST["is_cat"]);
+		$feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
+		$is_cat = $this->dbh->escape_string($_REQUEST["is_cat"]);
 
 		catchup_feed($feed_id, $is_cat);
 
@@ -393,19 +393,19 @@ class API extends Handler {
 	}
 
 	function getPref() {
-		$pref_name = db_escape_string($_REQUEST["pref_name"]);
+		$pref_name = $this->dbh->escape_string($_REQUEST["pref_name"]);
 
 		print $this->wrap(self::STATUS_OK, array("value" => get_pref($pref_name)));
 	}
 
 	function getLabels() {
-		//$article_ids = array_filter(explode(",", db_escape_string($_REQUEST["article_ids"])), is_numeric);
+		//$article_ids = array_filter(explode(",", $this->dbh->escape_string($_REQUEST["article_ids"])), is_numeric);
 
 		$article_id = (int)$_REQUEST['article_id'];
 
 		$rv = array();
 
-		$result = db_query("SELECT id, caption, fg_color, bg_color
+		$result = $this->dbh->query("SELECT id, caption, fg_color, bg_color
 			FROM ttrss_labels2
 			WHERE owner_uid = '".$_SESSION['uid']."' ORDER BY caption");
 
@@ -414,7 +414,7 @@ class API extends Handler {
 		else
 			$article_labels = array();
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 
 			$checked = false;
 			foreach ($article_labels as $al) {
@@ -437,11 +437,11 @@ class API extends Handler {
 
 	function setArticleLabel() {
 
-		$article_ids = array_filter(explode(",", db_escape_string($_REQUEST["article_ids"])), is_numeric);
-		$label_id = (int) db_escape_string($_REQUEST['label_id']);
-		$assign = (bool) db_escape_string($_REQUEST['assign']) == "true";
+		$article_ids = array_filter(explode(",", $this->dbh->escape_string($_REQUEST["article_ids"])), is_numeric);
+		$label_id = (int) $this->dbh->escape_string($_REQUEST['label_id']);
+		$assign = (bool) $this->dbh->escape_string($_REQUEST['assign']) == "true";
 
-		$label = db_escape_string(label_find_caption(
+		$label = $this->dbh->escape_string(label_find_caption(
 			$label_id, $_SESSION["uid"]));
 
 		$num_updated = 0;
@@ -481,9 +481,9 @@ class API extends Handler {
 	}
 
 	function shareToPublished() {
-		$title = db_escape_string(strip_tags($_REQUEST["title"]));
-		$url = db_escape_string(strip_tags($_REQUEST["url"]));
-		$content = db_escape_string(strip_tags($_REQUEST["content"]));
+		$title = $this->dbh->escape_string(strip_tags($_REQUEST["title"]));
+		$url = $this->dbh->escape_string(strip_tags($_REQUEST["url"]));
+		$content = $this->dbh->escape_string(strip_tags($_REQUEST["content"]));
 
 		if (Article::create_published_article($title, $url, $content, "", $_SESSION["uid"])) {
 			print $this->wrap(self::STATUS_OK, array("status" => 'OK'));
@@ -709,12 +709,12 @@ class API extends Handler {
 	}
 
 	function unsubscribeFeed() {
-		$feed_id = (int) db_escape_string($_REQUEST["feed_id"]);
+		$feed_id = (int) $this->dbh->escape_string($_REQUEST["feed_id"]);
 
-		$result = db_query("SELECT id FROM ttrss_feeds WHERE
+		$result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
 			id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
 
-		if (db_num_rows($result) != 0) {
+		if ($this->dbh->num_rows($result) != 0) {
 			Pref_Feeds::remove_feed($feed_id, $_SESSION["uid"]);
 			print $this->wrap(self::STATUS_OK, array("status" => "OK"));
 		} else {
@@ -723,10 +723,10 @@ class API extends Handler {
 	}
 
 	function subscribeToFeed() {
-		$feed_url = db_escape_string($_REQUEST["feed_url"]);
-		$category_id = (int) db_escape_string($_REQUEST["category_id"]);
-		$login = db_escape_string($_REQUEST["login"]);
-		$password = db_escape_string($_REQUEST["password"]);
+		$feed_url = $this->dbh->escape_string($_REQUEST["feed_url"]);
+		$category_id = (int) $this->dbh->escape_string($_REQUEST["category_id"]);
+		$login = $this->dbh->escape_string($_REQUEST["login"]);
+		$password = $this->dbh->escape_string($_REQUEST["password"]);
 
 		if ($feed_url) {
 			$rc = subscribe_to_feed($feed_url, $category_id,
@@ -760,16 +760,16 @@ class API extends Handler {
 	private function isCategoryEmpty($id) {
 
 		if ($id == -2) {
-			$result = db_query("SELECT COUNT(*) AS count FROM ttrss_labels2
+			$result = $this->dbh->query("SELECT COUNT(*) AS count FROM ttrss_labels2
 				WHERE owner_uid = " . $_SESSION["uid"]);
 
-			return db_fetch_result($result, 0, "count") == 0;
+			return $this->dbh->fetch_result($result, 0, "count") == 0;
 
 		} else if ($id == 0) {
-			$result = db_query("SELECT COUNT(*) AS count FROM ttrss_feeds
+			$result = $this->dbh->query("SELECT COUNT(*) AS count FROM ttrss_feeds
 				WHERE cat_id IS NULL AND owner_uid = " . $_SESSION["uid"]);
 
-			return db_fetch_result($result, 0, "count") == 0;
+			return $this->dbh->fetch_result($result, 0, "count") == 0;
 
 		}
 
diff --git a/classes/article.php b/classes/article.php
index df850daca..1198eefa9 100644
--- a/classes/article.php
+++ b/classes/article.php
@@ -8,14 +8,14 @@ class Article extends Handler_Protected {
 	}
 
 	function redirect() {
-		$id = db_escape_string($_REQUEST['id']);
+		$id = $this->dbh->escape_string($_REQUEST['id']);
 
-		$result = db_query("SELECT link FROM ttrss_entries, ttrss_user_entries
+		$result = $this->dbh->query("SELECT link FROM ttrss_entries, ttrss_user_entries
 						WHERE id = '$id' AND id = ref_id AND owner_uid = '".$_SESSION['uid']."'
 						LIMIT 1");
 
-		if (db_num_rows($result) == 1) {
-			$article_url = db_fetch_result($result, 0, 'link');
+		if ($this->dbh->num_rows($result) == 1) {
+			$article_url = $this->dbh->fetch_result($result, 0, 'link');
 			$article_url = str_replace("\n", "", $article_url);
 
 			header("Location: $article_url");
@@ -27,10 +27,10 @@ class Article extends Handler_Protected {
 	}
 
 	function view() {
-		$id = db_escape_string($_REQUEST["id"]);
-		$cids = explode(",", db_escape_string($_REQUEST["cids"]));
-		$mode = db_escape_string($_REQUEST["mode"]);
-		$omode = db_escape_string($_REQUEST["omode"]);
+		$id = $this->dbh->escape_string($_REQUEST["id"]);
+		$cids = explode(",", $this->dbh->escape_string($_REQUEST["cids"]));
+		$mode = $this->dbh->escape_string($_REQUEST["mode"]);
+		$omode = $this->dbh->escape_string($_REQUEST["omode"]);
 
 		// in prefetch mode we only output requested cids, main article
 		// just gets marked as read (it already exists in client cache)
@@ -68,15 +68,15 @@ class Article extends Handler_Protected {
 	private function catchupArticleById($id, $cmode) {
 
 		if ($cmode == 0) {
-			db_query("UPDATE ttrss_user_entries SET
+			$this->dbh->query("UPDATE ttrss_user_entries SET
 			unread = false,last_read = NOW()
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		} else if ($cmode == 1) {
-			db_query("UPDATE ttrss_user_entries SET
+			$this->dbh->query("UPDATE ttrss_user_entries SET
 			unread = true
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			db_query("UPDATE ttrss_user_entries SET
+			$this->dbh->query("UPDATE ttrss_user_entries SET
 			unread = NOT unread,last_read = NOW()
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		}
@@ -178,9 +178,9 @@ class Article extends Handler_Protected {
 
 		print __("Tags for this article (separated by commas):")."<br>";
 
-		$param = db_escape_string($_REQUEST['param']);
+		$param = $this->dbh->escape_string($_REQUEST['param']);
 
-		$tags = get_article_tags(db_escape_string($param));
+		$tags = get_article_tags($this->dbh->escape_string($param));
 
 		$tags_str = join(", ", $tags);
 
@@ -209,10 +209,10 @@ class Article extends Handler_Protected {
 	}
 
 	function setScore() {
-		$ids = db_escape_string($_REQUEST['id']);
-		$score = (int)db_escape_string($_REQUEST['score']);
+		$ids = $this->dbh->escape_string($_REQUEST['id']);
+		$score = (int)$this->dbh->escape_string($_REQUEST['score']);
 
-		db_query("UPDATE ttrss_user_entries SET
+		$this->dbh->query("UPDATE ttrss_user_entries SET
 			score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
 		print json_encode(array("id" => $id,
@@ -222,23 +222,23 @@ class Article extends Handler_Protected {
 
 	function setArticleTags() {
 
-		$id = db_escape_string($_REQUEST["id"]);
+		$id = $this->dbh->escape_string($_REQUEST["id"]);
 
-		$tags_str = db_escape_string($_REQUEST["tags_str"]);
+		$tags_str = $this->dbh->escape_string($_REQUEST["tags_str"]);
 		$tags = array_unique(trim_array(explode(",", $tags_str)));
 
-		db_query("BEGIN");
+		$this->dbh->query("BEGIN");
 
-		$result = db_query("SELECT int_id FROM ttrss_user_entries WHERE
+		$result = $this->dbh->query("SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = '$id' AND owner_uid = '".$_SESSION["uid"]."' LIMIT 1");
 
-		if (db_num_rows($result) == 1) {
+		if ($this->dbh->num_rows($result) == 1) {
 
 			$tags_to_cache = array();
 
-			$int_id = db_fetch_result($result, 0, "int_id");
+			$int_id = $this->dbh->fetch_result($result, 0, "int_id");
 
-			db_query("DELETE FROM ttrss_tags WHERE
+			$this->dbh->query("DELETE FROM ttrss_tags WHERE
 				post_int_id = $int_id AND owner_uid = '".$_SESSION["uid"]."'");
 
 			foreach ($tags as $tag) {
@@ -255,7 +255,7 @@ class Article extends Handler_Protected {
 				//					print "<!-- $id : $int_id : $tag -->";
 
 				if ($tag != '') {
-					db_query("INSERT INTO ttrss_tags
+					$this->dbh->query("INSERT INTO ttrss_tags
 								(post_int_id, owner_uid, tag_name) VALUES ('$int_id', '".$_SESSION["uid"]."', '$tag')");
 				}
 
@@ -267,12 +267,12 @@ class Article extends Handler_Protected {
 			sort($tags_to_cache);
 			$tags_str = join(",", $tags_to_cache);
 
-			db_query("UPDATE ttrss_user_entries
+			$this->dbh->query("UPDATE ttrss_user_entries
 				SET tag_cache = '$tags_str' WHERE ref_id = '$id'
 						AND owner_uid = " . $_SESSION["uid"]);
 		}
 
-		db_query("COMMIT");
+		$this->dbh->query("COMMIT");
 
 		$tags = get_article_tags($id);
 		$tags_str = format_tags_string($tags, $id);
@@ -286,15 +286,15 @@ class Article extends Handler_Protected {
 
 
 	function completeTags() {
-		$search = db_escape_string($_REQUEST["search"]);
+		$search = $this->dbh->escape_string($_REQUEST["search"]);
 
-		$result = db_query("SELECT DISTINCT tag_name FROM ttrss_tags
+		$result = $this->dbh->query("SELECT DISTINCT tag_name FROM ttrss_tags
 				WHERE owner_uid = '".$_SESSION["uid"]."' AND
 				tag_name LIKE '$search%' ORDER BY tag_name
 				LIMIT 10");
 
 		print "<ul>";
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			print "<li>" . $line["tag_name"] . "</li>";
 		}
 		print "</ul>";
@@ -311,10 +311,10 @@ class Article extends Handler_Protected {
 	private function labelops($assign) {
 		$reply = array();
 
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
-		$label_id = db_escape_string($_REQUEST["lid"]);
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
+		$label_id = $this->dbh->escape_string($_REQUEST["lid"]);
 
-		$label = db_escape_string(label_find_caption($label_id,
+		$label = $this->dbh->escape_string(label_find_caption($label_id,
 		$_SESSION["uid"]));
 
 		$reply["info-for-headlines"] = array();
diff --git a/classes/auth/base.php b/classes/auth/base.php
index 782848a79..284ac1d38 100644
--- a/classes/auth/base.php
+++ b/classes/auth/base.php
@@ -15,7 +15,7 @@ class Auth_Base {
 			$user_id = $this->find_user_by_login($login);
 
 			if (!$user_id) {
-				$login = db_escape_string($login);
+				$login = $this->dbh->escape_string($login);
 				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 				$pwd_hash = encrypt_password($password, $salt, true);
 
@@ -23,7 +23,7 @@ class Auth_Base {
 						(login,access_level,last_login,created,pwd_hash,salt)
 						VALUES ('$login', 0, null, NOW(), '$pwd_hash','$salt')";
 
-				db_query($query);
+				$this->dbh->query($query);
 
 				return $this->find_user_by_login($login);
 
@@ -36,13 +36,13 @@ class Auth_Base {
 	}
 
 	function find_user_by_login($login) {
-		$login = db_escape_string($login);
+		$login = $this->dbh->escape_string($login);
 
-		$result = db_query("SELECT id FROM ttrss_users WHERE
+		$result = $this->dbh->query("SELECT id FROM ttrss_users WHERE
 			login = '$login'");
 
-		if (db_num_rows($result) > 0) {
-			return db_fetch_result($result, 0, "id");
+		if ($this->dbh->num_rows($result) > 0) {
+			return $this->dbh->fetch_result($result, 0, "id");
 		} else {
 			return false;
 		}
diff --git a/classes/dbupdater.php b/classes/dbupdater.php
index a319da03d..f157342d4 100644
--- a/classes/dbupdater.php
+++ b/classes/dbupdater.php
@@ -2,18 +2,18 @@
 class DbUpdater {
 
 	private $dbh;
-	private $db_type;
+	private $$this->dbh->type;
 	private $need_version;
 
-	function __construct($dbh, $db_type, $need_version) {
+	function __construct($dbh, $$this->dbh->type, $need_version) {
 		$this->dbh = $dbh;
-		$this->db_type = $db_type;
+		$this->$this->dbh->type = $db_type;
 		$this->need_version = (int) $need_version;
 	}
 
 	function getSchemaVersion() {
-		$result = db_query("SELECT schema_version FROM ttrss_version");
-		return (int) db_fetch_result($result, 0, "schema_version");
+		$result = $this->dbh->query("SELECT schema_version FROM ttrss_version");
+		return (int) $this->dbh->fetch_result($result, 0, "schema_version");
 	}
 
 	function isUpdateRequired() {
@@ -21,7 +21,7 @@ class DbUpdater {
 	}
 
 	function getSchemaLines($version) {
-		$filename = "schema/versions/".$this->db_type."/$version.sql";
+		$filename = "schema/versions/".$this->$this->dbh->type."/$version.sql";
 
 		if (file_exists($filename)) {
 			return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename)));
@@ -37,21 +37,21 @@ class DbUpdater {
 
 			if (is_array($lines)) {
 
-				db_query("BEGIN");
+				$this->dbh->query("BEGIN");
 
 				foreach ($lines as $line) {
 					if (strpos($line, "--") !== 0 && $line) {
-						db_query($line);
+						$this->dbh->query($line);
 					}
 				}
 
-				$db_version = $this->getSchemaVersion();
+				$$this->dbh->version = $this->getSchemaVersion();
 
-				if ($db_version == $version) {
-					db_query("COMMIT");
+				if ($$this->dbh->version == $version) {
+					$this->dbh->query("COMMIT");
 					return true;
 				} else {
-					db_query("ROLLBACK");
+					$this->dbh->query("ROLLBACK");
 					return false;
 				}
 			} else {
diff --git a/classes/dlg.php b/classes/dlg.php
index 5e14690c4..cfa960d9a 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -6,7 +6,7 @@ class Dlg extends Handler_Protected {
 		if (parent::before($method)) {
 			header("Content-Type: text/html"); # required for iframe
 
-			$this->param = db_escape_string($_REQUEST["param"]);
+			$this->param = $this->dbh->escape_string($_REQUEST["param"]);
 			return true;
 		}
 		return false;
@@ -18,7 +18,7 @@ class Dlg extends Handler_Protected {
 		print "<div class=\"prefFeedOPMLHolder\">";
 		$owner_uid = $_SESSION["uid"];
 
-		db_query("BEGIN");
+		$this->dbh->query("BEGIN");
 
 		print "<ul class='nomarks'>";
 
@@ -26,7 +26,7 @@ class Dlg extends Handler_Protected {
 
 		$opml->opml_import($_SESSION["uid"]);
 
-		db_query("COMMIT");
+		$this->dbh->query("COMMIT");
 
 		print "</ul>";
 		print "</div>";
@@ -106,11 +106,11 @@ class Dlg extends Handler_Protected {
 			FROM ttrss_tags WHERE owner_uid = ".$_SESSION["uid"]."
 			GROUP BY tag_name ORDER BY count DESC LIMIT 50";
 
-		$result = db_query($query);
+		$result = $this->dbh->query($query);
 
 		$tags = array();
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			$tags[$line["tag_name"]] = $line["count"];
 		}
 
@@ -171,10 +171,10 @@ class Dlg extends Handler_Protected {
 		print "<label for=\"tag_mode_all\">".__("All tags.")."</input>";
 
 		print "<select id=\"all_tags\" name=\"all_tags\" title=\"" . __('Which Tags?') . "\" multiple=\"multiple\" size=\"10\" style=\"width : 100%\">";
-		$result = db_query("SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
+		$result = $this->dbh->query("SELECT DISTINCT tag_name FROM ttrss_tags WHERE owner_uid = ".$_SESSION['uid']."
 			AND LENGTH(tag_name) <= 30 ORDER BY tag_name ASC");
 
-		while ($row = db_fetch_assoc($result)) {
+		while ($row = $this->dbh->fetch_assoc($result)) {
 			$tmp = htmlspecialchars($row["tag_name"]);
 			print "<option value=\"" . str_replace(" ", "%20", $tmp) . "\">$tmp</option>";
 		}
@@ -195,7 +195,7 @@ class Dlg extends Handler_Protected {
 	function generatedFeed() {
 
 		$this->params = explode(":", $this->param, 3);
-		$feed_id = db_escape_string($this->params[0]);
+		$feed_id = $this->dbh->escape_string($this->params[0]);
 		$is_cat = (bool) $this->params[1];
 
 		$key = get_feed_access_key($feed_id, $is_cat);
diff --git a/classes/feeds.php b/classes/feeds.php
index 153c0f5aa..969c25db1 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -164,19 +164,19 @@ class Feeds extends Handler_Protected {
 		if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {
 			// Update the feed if required with some basic flood control
 
-			$result = db_query(
+			$result = $this->dbh->query(
 				"SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 					FROM ttrss_feeds WHERE id = '$feed'");
 
-				if (db_num_rows($result) != 0) {
-					$last_updated = strtotime(db_fetch_result($result, 0, "last_updated"));
-					$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
+				if ($this->dbh->num_rows($result) != 0) {
+					$last_updated = strtotime($this->dbh->fetch_result($result, 0, "last_updated"));
+					$cache_images = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "cache_images"));
 
 					if (!$cache_images && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {
 						include "rssfuncs.php";
 						update_rss_feed($feed, true, true);
 					} else {
-						db_query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
+						$this->dbh->query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
 							WHERE id = '$feed'");
 					}
 				}
@@ -189,21 +189,21 @@ class Feeds extends Handler_Protected {
 		// FIXME: might break tag display?
 
 		if (is_numeric($feed) && $feed > 0 && !$cat_view) {
-			$result = db_query(
+			$result = $this->dbh->query(
 				"SELECT id FROM ttrss_feeds WHERE id = '$feed' LIMIT 1");
 
-			if (db_num_rows($result) == 0) {
+			if ($this->dbh->num_rows($result) == 0) {
 				$reply['content'] = "<div align='center'>".__('Feed not found.')."</div>";
 			}
 		}
 
-		@$search = db_escape_string($_REQUEST["query"]);
+		@$search = $this->dbh->escape_string($_REQUEST["query"]);
 
 		if ($search) {
 			$disable_cache = true;
 		}
 
-		@$search_mode = db_escape_string($_REQUEST["search_mode"]);
+		@$search_mode = $this->dbh->escape_string($_REQUEST["search_mode"]);
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
 
@@ -259,7 +259,7 @@ class Feeds extends Handler_Protected {
 			$feed, $cat_view, $search, $search_mode, $view_mode,
 			$last_error);
 
-		$headlines_count = db_num_rows($result);
+		$headlines_count = $this->dbh->num_rows($result);
 
 		/* if (get_pref('COMBINED_DISPLAY_MODE')) {
 			$button_plugins = array();
@@ -275,7 +275,7 @@ class Feeds extends Handler_Protected {
 
 		global $pluginhost;
 
-		if (db_num_rows($result) > 0) {
+		if ($this->dbh->num_rows($result) > 0) {
 
 			$lnum = $offset;
 
@@ -288,7 +288,7 @@ class Feeds extends Handler_Protected {
 
 			$expand_cdm = get_pref('CDM_EXPANDED');
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 				$class = ($lnum % 2) ? "even" : "odd";
 
 				$id = $line["id"];
@@ -633,17 +633,17 @@ class Feeds extends Handler_Protected {
 
 			if ($line["orig_feed_id"]) {
 
-				$tmp_result = db_query("SELECT * FROM ttrss_archived_feeds
+				$tmp_result = $this->dbh->query("SELECT * FROM ttrss_archived_feeds
 					WHERE id = ".$line["orig_feed_id"]);
 
-						if (db_num_rows($tmp_result) != 0) {
+						if ($this->dbh->num_rows($tmp_result) != 0) {
 
 							$reply['content'] .= "<div clear='both'>";
 							$reply['content'] .= __("Originally from:");
 
 							$reply['content'] .= "&nbsp;";
 
-							$tmp_line = db_fetch_assoc($tmp_result);
+							$tmp_line = $this->dbh->fetch_assoc($tmp_result);
 
 							$reply['content'] .= "<a target='_blank'
 								href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
@@ -757,18 +757,18 @@ class Feeds extends Handler_Protected {
 
 				$reply['content'] .= "<p><span class=\"insensitive\">";
 
-				$result = db_query("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+				$result = $this->dbh->query("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
 					WHERE owner_uid = " . $_SESSION['uid']);
 
-				$last_updated = db_fetch_result($result, 0, "last_updated");
+				$last_updated = $this->dbh->fetch_result($result, 0, "last_updated");
 				$last_updated = make_local_datetime($last_updated, false);
 
 				$reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
 
-				$result = db_query("SELECT COUNT(id) AS num_errors
+				$result = $this->dbh->query("SELECT COUNT(id) AS num_errors
 					FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
-				$num_errors = db_fetch_result($result, 0, "num_errors");
+				$num_errors = $this->dbh->fetch_result($result, 0, "num_errors");
 
 				if ($num_errors > 0) {
 					$reply['content'] .= "<br/>";
@@ -786,7 +786,7 @@ class Feeds extends Handler_Protected {
 	}
 
 	function catchupAll() {
-		db_query("UPDATE ttrss_user_entries SET
+		$this->dbh->query("UPDATE ttrss_user_entries SET
 						last_read = NOW(), unread = false WHERE unread = true AND owner_uid = " . $_SESSION["uid"]);
 		ccache_zero_all($_SESSION["uid"]);
 	}
@@ -798,17 +798,17 @@ class Feeds extends Handler_Protected {
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("0", $timing_info);
 
-		$omode = db_escape_string($_REQUEST["omode"]);
+		$omode = $this->dbh->escape_string($_REQUEST["omode"]);
 
-		$feed = db_escape_string($_REQUEST["feed"]);
-		$method = db_escape_string($_REQUEST["m"]);
-		$view_mode = db_escape_string($_REQUEST["view_mode"]);
+		$feed = $this->dbh->escape_string($_REQUEST["feed"]);
+		$method = $this->dbh->escape_string($_REQUEST["m"]);
+		$view_mode = $this->dbh->escape_string($_REQUEST["view_mode"]);
 		$limit = 30;
 		@$cat_view = $_REQUEST["cat"] == "true";
-		@$next_unread_feed = db_escape_string($_REQUEST["nuf"]);
-		@$offset = db_escape_string($_REQUEST["skip"]);
-		@$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);
-		$order_by = db_escape_string($_REQUEST["order_by"]);
+		@$next_unread_feed = $this->dbh->escape_string($_REQUEST["nuf"]);
+		@$offset = $this->dbh->escape_string($_REQUEST["skip"]);
+		@$vgroup_last_feed = $this->dbh->escape_string($_REQUEST["vgrlf"]);
+		$order_by = $this->dbh->escape_string($_REQUEST["order_by"]);
 
 		if (is_numeric($feed)) $feed = (int) $feed;
 
@@ -824,17 +824,17 @@ class Feeds extends Handler_Protected {
 
 		if ($feed < LABEL_BASE_INDEX) {
 			$label_feed = feed_to_label_id($feed);
-			$result = db_query("SELECT id FROM ttrss_labels2 WHERE
+			$result = $this->dbh->query("SELECT id FROM ttrss_labels2 WHERE
 							id = '$label_feed' AND owner_uid = " . $_SESSION['uid']);
 		} else if (!$cat_view && is_numeric($feed) && $feed > 0) {
-			$result = db_query("SELECT id FROM ttrss_feeds WHERE
+			$result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
 							id = '$feed' AND owner_uid = " . $_SESSION['uid']);
 		} else if ($cat_view && is_numeric($feed) && $feed > 0) {
-			$result = db_query("SELECT id FROM ttrss_feed_categories WHERE
+			$result = $this->dbh->query("SELECT id FROM ttrss_feed_categories WHERE
 							id = '$feed' AND owner_uid = " . $_SESSION['uid']);
 		}
 
-		if ($result && db_num_rows($result) == 0) {
+		if ($result && $this->dbh->num_rows($result) == 0) {
 			print json_encode($this->generate_error_feed(__("Feed not found.")));
 			return;
 		}
@@ -851,13 +851,13 @@ class Feeds extends Handler_Protected {
 
 		/* bump login timestamp if needed */
 		if (time() - $_SESSION["last_login_update"] > 3600) {
-			db_query("UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
+			$this->dbh->query("UPDATE ttrss_users SET last_login = NOW() WHERE id = " .
 				$_SESSION["uid"]);
 			$_SESSION["last_login_update"] = time();
 		}
 
 		if (!$cat_view && is_numeric($feed) && $feed > 0) {
-			db_query("UPDATE ttrss_feeds SET last_viewed = NOW()
+			$this->dbh->query("UPDATE ttrss_feeds SET last_viewed = NOW()
 							WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);
 		}
 
@@ -924,18 +924,18 @@ class Feeds extends Handler_Protected {
 
 		$reply['headlines']['content'] .= "<p><span class=\"insensitive\">";
 
-		$result = db_query("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+		$result = $this->dbh->query("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
 			WHERE owner_uid = " . $_SESSION['uid']);
 
-		$last_updated = db_fetch_result($result, 0, "last_updated");
+		$last_updated = $this->dbh->fetch_result($result, 0, "last_updated");
 		$last_updated = make_local_datetime($last_updated, false);
 
 		$reply['headlines']['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
 
-		$result = db_query("SELECT COUNT(id) AS num_errors
+		$result = $this->dbh->query("SELECT COUNT(id) AS num_errors
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
-		$num_errors = db_fetch_result($result, 0, "num_errors");
+		$num_errors = $this->dbh->fetch_result($result, 0, "num_errors");
 
 		if ($num_errors > 0) {
 			$reply['headlines']['content'] .= "<br/>";
@@ -1044,7 +1044,7 @@ class Feeds extends Handler_Protected {
 	function feedBrowser() {
 		if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
 
-		$browser_search = db_escape_string($_REQUEST["search"]);
+		$browser_search = $this->dbh->escape_string($_REQUEST["search"]);
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"updateFeedBrowser\">";
@@ -1092,7 +1092,7 @@ class Feeds extends Handler_Protected {
 	}
 
 	function search() {
-		$this->params = explode(":", db_escape_string($_REQUEST["param"]), 2);
+		$this->params = explode(":", $this->dbh->escape_string($_REQUEST["param"]), 2);
 
 		$active_feed_id = sprintf("%d", $this->params[0]);
 		$is_cat = $this->params[1] != "false";
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 5af416adc..439cc7d4d 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -28,8 +28,8 @@ class Handler_Public extends Handler {
 
 		$result = $qfh_ret[0];
 
-		if (db_num_rows($result) != 0) {
-			$ts = strtotime(db_fetch_result($result, 0, "date_entered"));
+		if ($this->dbh->num_rows($result) != 0) {
+			$ts = strtotime($this->dbh->fetch_result($result, 0, "date_entered"));
 
 			if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
 					strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) >= $ts) {
@@ -74,7 +74,7 @@ class Handler_Public extends Handler {
 
 			$tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 
 				$tpl->setVariable('ARTICLE_ID', htmlspecialchars($line['link']), true);
 				$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
@@ -151,7 +151,7 @@ class Handler_Public extends Handler {
 
 			$feed['articles'] = array();
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 				$article = array();
 
 				$article['id'] = $line['link'];
@@ -201,13 +201,13 @@ class Handler_Public extends Handler {
 	}
 
 	function getUnread() {
-		$login = db_escape_string($_REQUEST["login"]);
+		$login = $this->dbh->escape_string($_REQUEST["login"]);
 		$fresh = $_REQUEST["fresh"] == "1";
 
-		$result = db_query("SELECT id FROM ttrss_users WHERE login = '$login'");
+		$result = $this->dbh->query("SELECT id FROM ttrss_users WHERE login = '$login'");
 
-		if (db_num_rows($result) == 1) {
-			$uid = db_fetch_result($result, 0, "id");
+		if ($this->dbh->num_rows($result) == 1) {
+			$uid = $this->dbh->fetch_result($result, 0, "id");
 
 			print getGlobalUnread($uid);
 
@@ -223,16 +223,16 @@ class Handler_Public extends Handler {
 	}
 
 	function getProfiles() {
-		$login = db_escape_string($_REQUEST["login"]);
+		$login = $this->dbh->escape_string($_REQUEST["login"]);
 
-		$result = db_query("SELECT * FROM ttrss_settings_profiles,ttrss_users
+		$result = $this->dbh->query("SELECT * FROM ttrss_settings_profiles,ttrss_users
 			WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = '$login' ORDER BY title");
 
 		print "<select dojoType='dijit.form.Select' style='width : 220px; margin : 0px' name='profile'>";
 
 		print "<option value='0'>" . __("Default profile") . "</option>";
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			$id = $line["id"];
 			$title = $line["title"];
 
@@ -243,9 +243,9 @@ class Handler_Public extends Handler {
 	}
 
 	function pubsub() {
-		$mode = db_escape_string($_REQUEST['hub_mode']);
-		$feed_id = (int) db_escape_string($_REQUEST['id']);
-		$feed_url = db_escape_string($_REQUEST['hub_topic']);
+		$mode = $this->dbh->escape_string($_REQUEST['hub_mode']);
+		$feed_id = (int) $this->dbh->escape_string($_REQUEST['id']);
+		$feed_url = $this->dbh->escape_string($_REQUEST['hub_topic']);
 
 		if (!PUBSUBHUBBUB_ENABLED) {
 			header('HTTP/1.0 404 Not Found');
@@ -255,17 +255,17 @@ class Handler_Public extends Handler {
 
 		// TODO: implement hub_verifytoken checking
 
-		$result = db_query("SELECT feed_url FROM ttrss_feeds
+		$result = $this->dbh->query("SELECT feed_url FROM ttrss_feeds
 			WHERE id = '$feed_id'");
 
-		if (db_num_rows($result) != 0) {
+		if ($this->dbh->num_rows($result) != 0) {
 
-			$check_feed_url = db_fetch_result($result, 0, "feed_url");
+			$check_feed_url = $this->dbh->fetch_result($result, 0, "feed_url");
 
 			if ($check_feed_url && ($check_feed_url == $feed_url || !$feed_url)) {
 				if ($mode == "subscribe") {
 
-					db_query("UPDATE ttrss_feeds SET pubsub_state = 2
+					$this->dbh->query("UPDATE ttrss_feeds SET pubsub_state = 2
 						WHERE id = '$feed_id'");
 
 					print $_REQUEST['hub_challenge'];
@@ -273,7 +273,7 @@ class Handler_Public extends Handler {
 
 				} else if ($mode == "unsubscribe") {
 
-					db_query("UPDATE ttrss_feeds SET pubsub_state = 0
+					$this->dbh->query("UPDATE ttrss_feeds SET pubsub_state = 0
 						WHERE id = '$feed_id'");
 
 					print $_REQUEST['hub_challenge'];
@@ -284,7 +284,7 @@ class Handler_Public extends Handler {
 					// Received update ping, schedule feed update.
 					//update_rss_feed($feed_id, true, true);
 
-					db_query("UPDATE ttrss_feeds SET
+					$this->dbh->query("UPDATE ttrss_feeds SET
 						last_update_started = '1970-01-01',
 						last_updated = '1970-01-01' WHERE id = '$feed_id'");
 
@@ -306,16 +306,16 @@ class Handler_Public extends Handler {
 	}
 
 	function share() {
-		$uuid = db_escape_string($_REQUEST["key"]);
+		$uuid = $this->dbh->escape_string($_REQUEST["key"]);
 
-		$result = db_query("SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE
+		$result = $this->dbh->query("SELECT ref_id, owner_uid FROM ttrss_user_entries WHERE
 			uuid = '$uuid'");
 
-		if (db_num_rows($result) != 0) {
+		if ($this->dbh->num_rows($result) != 0) {
 			header("Content-Type: text/html");
 
-			$id = db_fetch_result($result, 0, "ref_id");
-			$owner_uid = db_fetch_result($result, 0, "owner_uid");
+			$id = $this->dbh->fetch_result($result, 0, "ref_id");
+			$owner_uid = $this->dbh->fetch_result($result, 0, "owner_uid");
 
 			$article = format_article($id, false, true, $owner_uid);
 
@@ -328,17 +328,17 @@ class Handler_Public extends Handler {
 	}
 
 	function rss() {
-		$feed = db_escape_string($_REQUEST["id"]);
-		$key = db_escape_string($_REQUEST["key"]);
+		$feed = $this->dbh->escape_string($_REQUEST["id"]);
+		$key = $this->dbh->escape_string($_REQUEST["key"]);
 		$is_cat = $_REQUEST["is_cat"] != false;
-		$limit = (int)db_escape_string($_REQUEST["limit"]);
-		$offset = (int)db_escape_string($_REQUEST["offset"]);
+		$limit = (int)$this->dbh->escape_string($_REQUEST["limit"]);
+		$offset = (int)$this->dbh->escape_string($_REQUEST["offset"]);
 
-		$search = db_escape_string($_REQUEST["q"]);
-		$search_mode = db_escape_string($_REQUEST["smode"]);
-		$view_mode = db_escape_string($_REQUEST["view-mode"]);
+		$search = $this->dbh->escape_string($_REQUEST["q"]);
+		$search_mode = $this->dbh->escape_string($_REQUEST["smode"]);
+		$view_mode = $this->dbh->escape_string($_REQUEST["view-mode"]);
 
-		$format = db_escape_string($_REQUEST['format']);
+		$format = $this->dbh->escape_string($_REQUEST['format']);
 
 		if (!$format) $format = 'atom';
 
@@ -349,11 +349,11 @@ class Handler_Public extends Handler {
 		$owner_id = false;
 
 		if ($key) {
-			$result = db_query("SELECT owner_uid FROM
+			$result = $this->dbh->query("SELECT owner_uid FROM
 				ttrss_access_keys WHERE access_key = '$key' AND feed_id = '$feed'");
 
-			if (db_num_rows($result) == 1)
-				$owner_id = db_fetch_result($result, 0, "owner_uid");
+			if ($this->dbh->num_rows($result) == 1)
+				$owner_id = $this->dbh->fetch_result($result, 0, "owner_uid");
 		}
 
 		if ($owner_id) {
@@ -402,10 +402,10 @@ class Handler_Public extends Handler {
 
 			if ($action == 'share') {
 
-				$title = db_escape_string(strip_tags($_REQUEST["title"]));
-				$url = db_escape_string(strip_tags($_REQUEST["url"]));
-				$content = db_escape_string(strip_tags($_REQUEST["content"]));
-				$labels = db_escape_string(strip_tags($_REQUEST["labels"]));
+				$title = $this->dbh->escape_string(strip_tags($_REQUEST["title"]));
+				$url = $this->dbh->escape_string(strip_tags($_REQUEST["url"]));
+				$content = $this->dbh->escape_string(strip_tags($_REQUEST["content"]));
+				$labels = $this->dbh->escape_string(strip_tags($_REQUEST["labels"]));
 
 				Article::create_published_article($title, $url, $content, $labels,
 					$_SESSION["uid"]);
@@ -513,7 +513,7 @@ class Handler_Public extends Handler {
 
 		if (!SINGLE_USER_MODE) {
 
-			$login = db_escape_string($_POST["login"]);
+			$login = $this->dbh->escape_string($_POST["login"]);
 			$password = $_POST["password"];
 			$remember_me = $_POST["remember_me"];
 
@@ -534,12 +534,12 @@ class Handler_Public extends Handler {
 
 				if ($_POST["profile"]) {
 
-					$profile = db_escape_string($_POST["profile"]);
+					$profile = $this->dbh->escape_string($_POST["profile"]);
 
-					$result = db_query("SELECT id FROM ttrss_settings_profiles
+					$result = $this->dbh->query("SELECT id FROM ttrss_settings_profiles
 						WHERE id = '$profile' AND owner_uid = " . $_SESSION["uid"]);
 
-					if (db_num_rows($result) != 0) {
+					if ($this->dbh->num_rows($result) != 0) {
 						$_SESSION["profile"] = $profile;
 						$_SESSION["prefs_cache"] = array();
 					}
@@ -563,7 +563,7 @@ class Handler_Public extends Handler {
 
 		if ($_SESSION["uid"]) {
 
-			$feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
+			$feed_url = $this->dbh->escape_string(trim($_REQUEST["feed_url"]));
 
 			header('Content-Type: text/html; charset=utf-8');
 			print "<html>
@@ -625,10 +625,10 @@ class Handler_Public extends Handler {
 			$tt_uri = get_self_url_prefix();
 
 			if ($rc['code'] <= 2){
-				$result = db_query("SELECT id FROM ttrss_feeds WHERE
+				$result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
 					feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
-				$feed_id = db_fetch_result($result, 0, "id");
+				$feed_id = $this->dbh->fetch_result($result, 0, "id");
 			} else {
 				$feed_id = 0;
 			}
@@ -656,14 +656,14 @@ class Handler_Public extends Handler {
 	}
 
 	function subscribe2() {
-		$feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
-		$cat_id = db_escape_string($_REQUEST["cat_id"]);
-		$from = db_escape_string($_REQUEST["from"]);
+		$feed_url = $this->dbh->escape_string(trim($_REQUEST["feed_url"]));
+		$cat_id = $this->dbh->escape_string($_REQUEST["cat_id"]);
+		$from = $this->dbh->escape_string($_REQUEST["from"]);
 
 		/* only read authentication information from POST */
 
-		$auth_login = db_escape_string(trim($_POST["auth_login"]));
-		$auth_pass = db_escape_string(trim($_POST["auth_pass"]));
+		$auth_login = $this->dbh->escape_string(trim($_POST["auth_login"]));
+		$auth_pass = $this->dbh->escape_string(trim($_POST["auth_pass"]));
 
 		$rc = subscribe_to_feed($feed_url, $cat_id, $auth_login, $auth_pass);
 
@@ -712,10 +712,10 @@ class Handler_Public extends Handler {
 		$tt_uri = get_self_url_prefix();
 
 		if ($rc <= 2){
-			$result = db_query("SELECT id FROM ttrss_feeds WHERE
+			$result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
 				feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
-			$feed_id = db_fetch_result($result, 0, "id");
+			$feed_id = $this->dbh->fetch_result($result, 0, "id");
 		} else {
 			$feed_id = 0;
 		}
@@ -788,9 +788,9 @@ class Handler_Public extends Handler {
 			print "</form>";
 		} else if ($method == 'do') {
 
-			$login = db_escape_string($_POST["login"]);
-			$email = db_escape_string($_POST["email"]);
-			$test = db_escape_string($_POST["test"]);
+			$login = $this->dbh->escape_string($_POST["login"]);
+			$email = $this->dbh->escape_string($_POST["email"]);
+			$test = $this->dbh->escape_string($_POST["test"]);
 
 			if (($test != 4 && $test != 'four') || !$email || !$login) {
 				print_error(__('Some of the required form parameters are missing or incorrect.'));
@@ -802,11 +802,11 @@ class Handler_Public extends Handler {
 
 			} else {
 
-				$result = db_query("SELECT id FROM ttrss_users
+				$result = $this->dbh->query("SELECT id FROM ttrss_users
 					WHERE login = '$login' AND email = '$email'");
 
-				if (db_num_rows($result) != 0) {
-					$id = db_fetch_result($result, 0, "id");
+				if ($this->dbh->num_rows($result) != 0) {
+					$id = $this->dbh->fetch_result($result, 0, "id");
 
 					Pref_Users::resetUserPassword($id, false);
 
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index 888ef67dd..4d1f12065 100644
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -12,7 +12,7 @@ class Logger_SQL {
 			$file = Db::get()->escape_string($file);
 			$line = Db::get()->escape_string($line);
 			$context = ''; // backtrace is a lot of data which is not really critical to store
-			//$context = db_escape_string(serialize($context));
+			//$context = $this->dbh->escape_string(serialize($context));
 
 			$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : "NULL";
 
diff --git a/classes/opml.php b/classes/opml.php
index 986386378..3f4030dea 100644
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -66,27 +66,27 @@ class Opml extends Handler_Protected {
 		$out = "";
 
 		if ($cat_id) {
-			$result = db_query("SELECT title FROM ttrss_feed_categories WHERE id = '$cat_id'
+			$result = $this->dbh->query("SELECT title FROM ttrss_feed_categories WHERE id = '$cat_id'
 				AND owner_uid = '$owner_uid'");
-			$cat_title = htmlspecialchars(db_fetch_result($result, 0, "title"));
+			$cat_title = htmlspecialchars($this->dbh->fetch_result($result, 0, "title"));
 		}
 
 		if ($cat_title) $out .= "<outline text=\"$cat_title\">\n";
 
-		$result = db_query("SELECT id,title
+		$result = $this->dbh->query("SELECT id,title
 			FROM ttrss_feed_categories WHERE
 			$cat_qpart AND owner_uid = '$owner_uid' ORDER BY order_id, title");
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			$title = htmlspecialchars($line["title"]);
 			$out .= $this->opml_export_category($owner_uid, $line["id"], $hide_private_feeds);
 		}
 
-		$feeds_result = db_query("select title, feed_url, site_url
+		$feeds_result = $this->dbh->query("select title, feed_url, site_url
 				from ttrss_feeds where $feed_cat_qpart AND owner_uid = '$owner_uid' AND $hide_qpart
 				order by order_id, title");
 
-		while ($fline = db_fetch_assoc($feeds_result)) {
+		while ($fline = $this->dbh->fetch_assoc($feeds_result)) {
 			$title = htmlspecialchars($fline["title"]);
 			$url = htmlspecialchars($fline["feed_url"]);
 			$site_url = htmlspecialchars($fline["site_url"]);
@@ -131,10 +131,10 @@ class Opml extends Handler_Protected {
 		if ($include_settings) {
 			$out .= "<outline text=\"tt-rss-prefs\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$result = db_query("SELECT pref_name, value FROM ttrss_user_prefs WHERE
+			$result = $this->dbh->query("SELECT pref_name, value FROM ttrss_user_prefs WHERE
 			   profile IS NULL AND owner_uid = " . $_SESSION["uid"] . " ORDER BY pref_name");
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 				$name = $line["pref_name"];
 				$value = htmlspecialchars($line["value"]);
 
@@ -145,10 +145,10 @@ class Opml extends Handler_Protected {
 
 			$out .= "<outline text=\"tt-rss-labels\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$result = db_query("SELECT * FROM ttrss_labels2 WHERE
+			$result = $this->dbh->query("SELECT * FROM ttrss_labels2 WHERE
 				owner_uid = " . $_SESSION['uid']);
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 				$name = htmlspecialchars($line['caption']);
 				$fg_color = htmlspecialchars($line['fg_color']);
 				$bg_color = htmlspecialchars($line['bg_color']);
@@ -161,10 +161,10 @@ class Opml extends Handler_Protected {
 
 			$out .= "<outline text=\"tt-rss-filters\" schema-version=\"".SCHEMA_VERSION."\">";
 
-			$result = db_query("SELECT * FROM ttrss_filters2
+			$result = $this->dbh->query("SELECT * FROM ttrss_filters2
 				WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY id");
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 				foreach (array('enabled', 'match_any_rule') as $b) {
 					$line[$b] = sql_bool_to_bool($line[$b]);
 				}
@@ -172,10 +172,10 @@ class Opml extends Handler_Protected {
 				$line["rules"] = array();
 				$line["actions"] = array();
 
-				$tmp_result = db_query("SELECT * FROM ttrss_filters2_rules
+				$tmp_result = $this->dbh->query("SELECT * FROM ttrss_filters2_rules
 					WHERE filter_id = ".$line["id"]);
 
-				while ($tmp_line = db_fetch_assoc($tmp_result)) {
+				while ($tmp_line = $this->dbh->fetch_assoc($tmp_result)) {
 					unset($tmp_line["id"]);
 					unset($tmp_line["filter_id"]);
 
@@ -197,10 +197,10 @@ class Opml extends Handler_Protected {
 					array_push($line["rules"], $tmp_line);
 				}
 
-				$tmp_result = db_query("SELECT * FROM ttrss_filters2_actions
+				$tmp_result = $this->dbh->query("SELECT * FROM ttrss_filters2_actions
 					WHERE filter_id = ".$line["id"]);
 
-				while ($tmp_line = db_fetch_assoc($tmp_result)) {
+				while ($tmp_line = $this->dbh->fetch_assoc($tmp_result)) {
 					unset($tmp_line["id"]);
 					unset($tmp_line["filter_id"]);
 
@@ -253,19 +253,19 @@ class Opml extends Handler_Protected {
 	private function opml_import_feed($doc, $node, $cat_id, $owner_uid) {
 		$attrs = $node->attributes;
 
-		$feed_title = db_escape_string(mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250));
-		if (!$feed_title) $feed_title = db_escape_string(mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250));
+		$feed_title = $this->dbh->escape_string(mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250));
+		if (!$feed_title) $feed_title = $this->dbh->escape_string(mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250));
 
-		$feed_url = db_escape_string(mb_substr($attrs->getNamedItem('xmlUrl')->nodeValue, 0, 250));
-		if (!$feed_url) $feed_url = db_escape_string(mb_substr($attrs->getNamedItem('xmlURL')->nodeValue, 0, 250));
+		$feed_url = $this->dbh->escape_string(mb_substr($attrs->getNamedItem('xmlUrl')->nodeValue, 0, 250));
+		if (!$feed_url) $feed_url = $this->dbh->escape_string(mb_substr($attrs->getNamedItem('xmlURL')->nodeValue, 0, 250));
 
-		$site_url = db_escape_string(mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250));
+		$site_url = $this->dbh->escape_string(mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250));
 
 		if ($feed_url && $feed_title) {
-			$result = db_query("SELECT id FROM ttrss_feeds WHERE
+			$result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
 				feed_url = '$feed_url' AND owner_uid = '$owner_uid'");
 
-			if (db_num_rows($result) == 0) {
+			if ($this->dbh->num_rows($result) == 0) {
 				#$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
 				$this->opml_notice(T_sprintf("Adding feed: %s", $feed_title));
 
@@ -275,7 +275,7 @@ class Opml extends Handler_Protected {
 					(title, feed_url, owner_uid, cat_id, site_url, order_id) VALUES
 					('$feed_title', '$feed_url', '$owner_uid',
 					$cat_id, '$site_url', 0)";
-				db_query($query);
+				$this->dbh->query($query);
 
 			} else {
 				$this->opml_notice(T_sprintf("Duplicate feed: %s", $feed_title));
@@ -285,11 +285,11 @@ class Opml extends Handler_Protected {
 
 	private function opml_import_label($doc, $node, $owner_uid) {
 		$attrs = $node->attributes;
-		$label_name = db_escape_string($attrs->getNamedItem('label-name')->nodeValue);
+		$label_name = $this->dbh->escape_string($attrs->getNamedItem('label-name')->nodeValue);
 
 		if ($label_name) {
-			$fg_color = db_escape_string($attrs->getNamedItem('label-fg-color')->nodeValue);
-			$bg_color = db_escape_string($attrs->getNamedItem('label-bg-color')->nodeValue);
+			$fg_color = $this->dbh->escape_string($attrs->getNamedItem('label-fg-color')->nodeValue);
+			$bg_color = $this->dbh->escape_string($attrs->getNamedItem('label-bg-color')->nodeValue);
 
 			if (!label_find_id($label_name, $_SESSION['uid'])) {
 				$this->opml_notice(T_sprintf("Adding label %s", htmlspecialchars($label_name)));
@@ -302,10 +302,10 @@ class Opml extends Handler_Protected {
 
 	private function opml_import_preference($doc, $node, $owner_uid) {
 		$attrs = $node->attributes;
-		$pref_name = db_escape_string($attrs->getNamedItem('pref-name')->nodeValue);
+		$pref_name = $this->dbh->escape_string($attrs->getNamedItem('pref-name')->nodeValue);
 
 		if ($pref_name) {
-			$pref_value = db_escape_string($attrs->getNamedItem('value')->nodeValue);
+			$pref_value = $this->dbh->escape_string($attrs->getNamedItem('value')->nodeValue);
 
 			$this->opml_notice(T_sprintf("Setting preference key %s to %s",
 				$pref_name, $pref_value));
@@ -317,7 +317,7 @@ class Opml extends Handler_Protected {
 	private function opml_import_filter($doc, $node, $owner_uid) {
 		$attrs = $node->attributes;
 
-		$filter_type = db_escape_string($attrs->getNamedItem('filter-type')->nodeValue);
+		$filter_type = $this->dbh->escape_string($attrs->getNamedItem('filter-type')->nodeValue);
 
 		if ($filter_type == '2') {
 			$filter = json_decode($node->nodeValue, true);
@@ -326,14 +326,14 @@ class Opml extends Handler_Protected {
 				$match_any_rule = bool_to_sql_bool($filter["match_any_rule"]);
 				$enabled = bool_to_sql_bool($filter["enabled"]);
 
-				db_query("BEGIN");
+				$this->dbh->query("BEGIN");
 
-				db_query("INSERT INTO ttrss_filters2 (match_any_rule,enabled,owner_uid)
+				$this->dbh->query("INSERT INTO ttrss_filters2 (match_any_rule,enabled,owner_uid)
 					VALUES ($match_any_rule, $enabled,".$_SESSION["uid"].")");
 
-				$result = db_query("SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
+				$result = $this->dbh->query("SELECT MAX(id) AS id FROM ttrss_filters2 WHERE
 					owner_uid = ".$_SESSION["uid"]);
-				$filter_id = db_fetch_result($result, 0, "id");
+				$filter_id = $this->dbh->fetch_result($result, 0, "id");
 
 				if ($filter_id) {
 					$this->opml_notice(T_sprintf("Adding filter..."));
@@ -343,39 +343,39 @@ class Opml extends Handler_Protected {
 						$cat_id = "NULL";
 
 						if (!$rule["cat_filter"]) {
-							$tmp_result = db_query("SELECT id FROM ttrss_feeds
-								WHERE title = '".db_escape_string($rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
-							if (db_num_rows($tmp_result) > 0) {
-								$feed_id = db_fetch_result($tmp_result, 0, "id");
+							$tmp_result = $this->dbh->query("SELECT id FROM ttrss_feeds
+								WHERE title = '".$this->dbh->escape_string($rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
+							if ($this->dbh->num_rows($tmp_result) > 0) {
+								$feed_id = $this->dbh->fetch_result($tmp_result, 0, "id");
 							}
 						} else {
-							$tmp_result = db_query("SELECT id FROM ttrss_feed_categories
-								WHERE title = '".db_escape_string($rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
+							$tmp_result = $this->dbh->query("SELECT id FROM ttrss_feed_categories
+								WHERE title = '".$this->dbh->escape_string($rule["feed"])."' AND owner_uid = ".$_SESSION["uid"]);
 
-							if (db_num_rows($tmp_result) > 0) {
-								$cat_id = db_fetch_result($tmp_result, 0, "id");
+							if ($this->dbh->num_rows($tmp_result) > 0) {
+								$cat_id = $this->dbh->fetch_result($tmp_result, 0, "id");
 							}
 						}
 
 						$cat_filter = bool_to_sql_bool($rule["cat_filter"]);
-						$reg_exp = db_escape_string($rule["reg_exp"]);
+						$reg_exp = $this->dbh->escape_string($rule["reg_exp"]);
 						$filter_type = (int)$rule["filter_type"];
 
-						db_query("INSERT INTO ttrss_filters2_rules (feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter)
+						$this->dbh->query("INSERT INTO ttrss_filters2_rules (feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter)
 							VALUES ($feed_id, $cat_id, $filter_id, $filter_type, '$reg_exp', $cat_filter)");
 					}
 
 					foreach ($filter["actions"] as $action) {
 
 						$action_id = (int)$action["action_id"];
-						$action_param = db_escape_string($action["action_param"]);
+						$action_param = $this->dbh->escape_string($action["action_param"]);
 
-						db_query("INSERT INTO ttrss_filters2_actions (filter_id,action_id,action_param)
+						$this->dbh->query("INSERT INTO ttrss_filters2_actions (filter_id,action_id,action_param)
 							VALUES ($filter_id, $action_id, '$action_param')");
 					}
 				}
 
-				db_query("COMMIT");
+				$this->dbh->query("COMMIT");
 			}
 		}
 	}
@@ -386,19 +386,19 @@ class Opml extends Handler_Protected {
 		$default_cat_id = (int) get_feed_category('Imported feeds', false);
 
 		if ($root_node) {
-			$cat_title = db_escape_string(mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250));
+			$cat_title = $this->dbh->escape_string(mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250));
 
 			if (!$cat_title)
-				$cat_title = db_escape_string(mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250));
+				$cat_title = $this->dbh->escape_string(mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250));
 
 			if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
 				$cat_id = get_feed_category($cat_title, $parent_id);
-				db_query("BEGIN");
+				$this->dbh->query("BEGIN");
 				if ($cat_id === false) {
 					add_feed_category($cat_title, $parent_id);
 					$cat_id = get_feed_category($cat_title, $parent_id);
 				}
-				db_query("COMMIT");
+				$this->dbh->query("COMMIT");
 			} else {
 				$cat_id = 0;
 			}
@@ -418,12 +418,12 @@ class Opml extends Handler_Protected {
 		foreach ($outlines as $node) {
 			if ($node->hasAttributes() && strtolower($node->tagName) == "outline") {
 				$attrs = $node->attributes;
-				$node_cat_title = db_escape_string($attrs->getNamedItem('text')->nodeValue);
+				$node_cat_title = $this->dbh->escape_string($attrs->getNamedItem('text')->nodeValue);
 
 				if (!$node_cat_title)
-					$node_cat_title = db_escape_string($attrs->getNamedItem('title')->nodeValue);
+					$node_cat_title = $this->dbh->escape_string($attrs->getNamedItem('title')->nodeValue);
 
-				$node_feed_url = db_escape_string($attrs->getNamedItem('xmlUrl')->nodeValue);
+				$node_feed_url = $this->dbh->escape_string($attrs->getNamedItem('xmlUrl')->nodeValue);
 
 				if ($node_cat_title && !$node_feed_url) {
 					$this->opml_import_category($doc, $node, $owner_uid, $cat_id);
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 0fbf0422e..c10f789b5 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -222,12 +222,12 @@ class PluginHost {
 
 	function load_data($force = false) {
 		if ($this->owner_uid && (!$_SESSION["plugin_storage"] || $force))  {
-			$plugin = db_escape_string($plugin);
+			$plugin = $this->dbh->escape_string($plugin);
 
-			$result = db_query("SELECT name, content FROM ttrss_plugin_storage
+			$result = $this->dbh->query("SELECT name, content FROM ttrss_plugin_storage
 				WHERE owner_uid = '".$this->owner_uid."'");
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 				$this->storage[$line["name"]] = unserialize($line["content"]);
 			}
 
@@ -237,29 +237,29 @@ class PluginHost {
 
 	private function save_data($plugin) {
 		if ($this->owner_uid) {
-			$plugin = db_escape_string($plugin);
+			$plugin = $this->dbh->escape_string($plugin);
 
-			db_query("BEGIN");
+			$this->dbh->query("BEGIN");
 
-			$result = db_query("SELECT id FROM ttrss_plugin_storage WHERE
+			$result = $this->dbh->query("SELECT id FROM ttrss_plugin_storage WHERE
 				owner_uid= '".$this->owner_uid."' AND name = '$plugin'");
 
 			if (!isset($this->storage[$plugin]))
 				$this->storage[$plugin] = array();
 
-			$content = db_escape_string(serialize($this->storage[$plugin]));
+			$content = $this->dbh->escape_string(serialize($this->storage[$plugin]));
 
-			if (db_num_rows($result) != 0) {
-				db_query("UPDATE ttrss_plugin_storage SET content = '$content'
+			if ($this->dbh->num_rows($result) != 0) {
+				$this->dbh->query("UPDATE ttrss_plugin_storage SET content = '$content'
 					WHERE owner_uid= '".$this->owner_uid."' AND name = '$plugin'");
 
 			} else {
-				db_query("INSERT INTO ttrss_plugin_storage
+				$this->dbh->query("INSERT INTO ttrss_plugin_storage
 					(name,owner_uid,content) VALUES
 					('$plugin','".$this->owner_uid."','$content')");
 			}
 
-			db_query("COMMIT");
+			$this->dbh->query("COMMIT");
 		}
 	}
 
@@ -298,7 +298,7 @@ class PluginHost {
 
 			unset($this->storage[$idx]);
 
-			db_query("DELETE FROM ttrss_plugin_storage WHERE name = '$idx'
+			$this->dbh->query("DELETE FROM ttrss_plugin_storage WHERE name = '$idx'
 				AND owner_uid = " . $this->owner_uid);
 
 			$_SESSION["plugin_storage"] = $this->storage;
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 970b88822..054ea4e8c 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -15,11 +15,11 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function renamecat() {
-		$title = db_escape_string($_REQUEST['title']);
-		$id = db_escape_string($_REQUEST['id']);
+		$title = $this->dbh->escape_string($_REQUEST['title']);
+		$id = $this->dbh->escape_string($_REQUEST['id']);
 
 		if ($title) {
-			db_query("UPDATE ttrss_feed_categories SET
+			$this->dbh->query("UPDATE ttrss_feed_categories SET
 				title = '$title' WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 		}
 		return;
@@ -41,10 +41,10 @@ class Pref_Feeds extends Handler_Protected {
 
 		$items = array();
 
-		$result = db_query("SELECT id, title FROM ttrss_feed_categories
+		$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");
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 
 			$cat = array();
 			$cat['id'] = 'CAT:' . $line['id'];
@@ -65,13 +65,13 @@ class Pref_Feeds extends Handler_Protected {
 
 		}
 
-		$feed_result = db_query("SELECT id, title, last_error,
+		$feed_result = $this->dbh->query("SELECT id, title, last_error,
 			".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 			FROM ttrss_feeds
 			WHERE cat_id = '$cat_id' AND owner_uid = ".$_SESSION["uid"].
 			"$search_qpart ORDER BY order_id, title");
 
-		while ($feed_line = db_fetch_assoc($feed_result)) {
+		while ($feed_line = $this->dbh->fetch_assoc($feed_result)) {
 			$feed = array();
 			$feed['id'] = 'FEED:' . $feed_line['id'];
 			$feed['bare_id'] = (int)$feed_line['id'];
@@ -154,10 +154,10 @@ class Pref_Feeds extends Handler_Protected {
 				$root['items'] = array_merge($root['items'], $cat['items']);
 			}
 
-			$result = db_query("SELECT * FROM
+			$result = $this->dbh->query("SELECT * FROM
 				ttrss_labels2 WHERE owner_uid = ".$_SESSION['uid']." ORDER by caption");
 
-			if (db_num_rows($result) > 0) {
+			if ($this->dbh->num_rows($result) > 0) {
 
 				if (get_pref('ENABLE_FEED_CATS')) {
 					$cat = $this->feedlist_init_cat(-2);
@@ -165,7 +165,7 @@ class Pref_Feeds extends Handler_Protected {
 					$cat['items'] = array();
 				}
 
-				while ($line = db_fetch_assoc($result)) {
+				while ($line = $this->dbh->fetch_assoc($result)) {
 
 					$label_id = label_to_feed_id($line['id']);
 
@@ -190,10 +190,10 @@ class Pref_Feeds extends Handler_Protected {
 				($_REQUEST['mode'] != 2 && !$search &&
 				get_pref('_PREFS_SHOW_EMPTY_CATS'));
 
-			$result = db_query("SELECT id, title FROM ttrss_feed_categories
+			$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");
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 				$cat = array();
 				$cat['id'] = 'CAT:' . $line['id'];
 				$cat['bare_id'] = (int)$line['id'];
@@ -226,13 +226,13 @@ class Pref_Feeds extends Handler_Protected {
 			$cat['unread'] = 0;
 			$cat['child_unread'] = 0;
 
-			$feed_result = db_query("SELECT id, title,last_error,
+			$feed_result = $this->dbh->query("SELECT id, title,last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 				FROM ttrss_feeds
 				WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"].
 				"$search_qpart ORDER BY order_id, title");
 
-			while ($feed_line = db_fetch_assoc($feed_result)) {
+			while ($feed_line = $this->dbh->fetch_assoc($feed_result)) {
 				$feed = array();
 				$feed['id'] = 'FEED:' . $feed_line['id'];
 				$feed['bare_id'] = (int)$feed_line['id'];
@@ -257,13 +257,13 @@ class Pref_Feeds extends Handler_Protected {
 			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
 
 		} else {
-			$feed_result = db_query("SELECT id, title, last_error,
+			$feed_result = $this->dbh->query("SELECT id, title, last_error,
 				".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 				FROM ttrss_feeds
 				WHERE owner_uid = ".$_SESSION["uid"].
 				"$search_qpart ORDER BY order_id, title");
 
-			while ($feed_line = db_fetch_assoc($feed_result)) {
+			while ($feed_line = $this->dbh->fetch_assoc($feed_result)) {
 				$feed = array();
 				$feed['id'] = 'FEED:' . $feed_line['id'];
 				$feed['bare_id'] = (int)$feed_line['id'];
@@ -296,13 +296,13 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function catsortreset() {
-		db_query("UPDATE ttrss_feed_categories
+		$this->dbh->query("UPDATE ttrss_feed_categories
 				SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
 		return;
 	}
 
 	function feedsortreset() {
-		db_query("UPDATE ttrss_feeds
+		$this->dbh->query("UPDATE ttrss_feeds
 				SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
 		return;
 	}
@@ -326,12 +326,12 @@ class Pref_Feeds extends Handler_Protected {
 		if ($item_id != 'root') {
 			if ($parent_id && $parent_id != 'root') {
 				$parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
-				$parent_qpart = db_escape_string($parent_bare_id);
+				$parent_qpart = $this->dbh->escape_string($parent_bare_id);
 			} else {
 				$parent_qpart = 'NULL';
 			}
 
-			db_query("UPDATE ttrss_feed_categories
+			$this->dbh->query("UPDATE ttrss_feed_categories
 				SET parent_cat = $parent_qpart WHERE id = '$bare_item_id' AND
 				owner_uid = " . $_SESSION["uid"]);
 		}
@@ -352,12 +352,12 @@ class Pref_Feeds extends Handler_Protected {
 					if (strpos($id, "FEED") === 0) {
 
 						$cat_id = ($item_id != "root") ?
-							db_escape_string($bare_item_id) : "NULL";
+							$this->dbh->escape_string($bare_item_id) : "NULL";
 
 						$cat_qpart = ($cat_id != 0) ? "cat_id = '$cat_id'" :
 							"cat_id = NULL";
 
-						db_query("UPDATE ttrss_feeds
+						$this->dbh->query("UPDATE ttrss_feeds
 							SET order_id = $order_id, $cat_qpart
 							WHERE id = '$bare_id' AND
 								owner_uid = " . $_SESSION["uid"]);
@@ -367,12 +367,12 @@ class Pref_Feeds extends Handler_Protected {
 							$nest_level+1);
 
 						if ($item_id != 'root') {
-							$parent_qpart = db_escape_string($bare_id);
+							$parent_qpart = $this->dbh->escape_string($bare_id);
 						} else {
 							$parent_qpart = 'NULL';
 						}
 
-						db_query("UPDATE ttrss_feed_categories
+						$this->dbh->query("UPDATE ttrss_feed_categories
 								SET order_id = '$order_id' WHERE id = '$bare_id' AND
 								owner_uid = " . $_SESSION["uid"]);
 					}
@@ -424,7 +424,7 @@ class Pref_Feeds extends Handler_Protected {
 				++$cat_order_id;
 
 				if ($bare_id > 0) {
-					db_query("UPDATE ttrss_feed_categories
+					$this->dbh->query("UPDATE ttrss_feed_categories
 						SET order_id = '$cat_order_id' WHERE id = '$bare_id' AND
 						owner_uid = " . $_SESSION["uid"]);
 				}
@@ -441,7 +441,7 @@ class Pref_Feeds extends Handler_Protected {
 						else
 							$cat_query = "cat_id = NULL";
 
-						db_query("UPDATE ttrss_feeds
+						$this->dbh->query("UPDATE ttrss_feeds
 							SET order_id = '$feed_order_id',
 							$cat_query
 							WHERE id = '$feed_id' AND
@@ -457,15 +457,15 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function removeicon() {
-		$feed_id = db_escape_string($_REQUEST["feed_id"]);
+		$feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
 
-		$result = db_query("SELECT id FROM ttrss_feeds
+		$result = $this->dbh->query("SELECT id FROM ttrss_feeds
 			WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
 
-		if (db_num_rows($result) != 0) {
+		if ($this->dbh->num_rows($result) != 0) {
 			@unlink(ICONS_DIR . "/$feed_id.ico");
 
-			db_query("UPDATE ttrss_feeds SET favicon_avg_color = NULL
+			$this->dbh->query("UPDATE ttrss_feeds SET favicon_avg_color = NULL
 				where id = '$feed_id'");
 		}
 
@@ -491,24 +491,24 @@ class Pref_Feeds extends Handler_Protected {
 		}
 
 		$icon_file = $tmp_file;
-		$feed_id = db_escape_string($_REQUEST["feed_id"]);
+		$feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
 
 		if (is_file($icon_file) && $feed_id) {
 			if (filesize($icon_file) < 20000) {
 
-				$result = db_query("SELECT id FROM ttrss_feeds
+				$result = $this->dbh->query("SELECT id FROM ttrss_feeds
 					WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
 
-				if (db_num_rows($result) != 0) {
+				if ($this->dbh->num_rows($result) != 0) {
 					@unlink(ICONS_DIR . "/$feed_id.ico");
 					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
 
 						require_once "colors.php";
 
-						$favicon_color = db_escape_string(
+						$favicon_color = $this->dbh->escape_string(
 							calculate_avg_color(ICONS_DIR . "/$feed_id.ico"));
 
-						db_query("UPDATE ttrss_feeds SET
+						$this->dbh->query("UPDATE ttrss_feeds SET
 							favicon_avg_color = '$favicon_color'
 							WHERE id = '$feed_id'");
 
@@ -536,16 +536,16 @@ class Pref_Feeds extends Handler_Protected {
 		global $purge_intervals;
 		global $update_intervals;
 
-		$feed_id = db_escape_string($_REQUEST["id"]);
+		$feed_id = $this->dbh->escape_string($_REQUEST["id"]);
 
-		$result = db_query(
+		$result = $this->dbh->query(
 			"SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND
 				owner_uid = " . $_SESSION["uid"]);
 
-		$auth_pass_encrypted = sql_bool_to_bool(db_fetch_result($result, 0,
+		$auth_pass_encrypted = sql_bool_to_bool($this->dbh->fetch_result($result, 0,
 			"auth_pass_encrypted"));
 
-		$title = htmlspecialchars(db_fetch_result($result,
+		$title = htmlspecialchars($this->dbh->fetch_result($result,
 			0, "title"));
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$feed_id\">";
@@ -563,8 +563,8 @@ class Pref_Feeds extends Handler_Protected {
 
 		/* Feed URL */
 
-		$feed_url = db_fetch_result($result, 0, "feed_url");
-		$feed_url = htmlspecialchars(db_fetch_result($result,
+		$feed_url = $this->dbh->fetch_result($result, 0, "feed_url");
+		$feed_url = htmlspecialchars($this->dbh->fetch_result($result,
 			0, "feed_url"));
 
 		print "<hr/>";
@@ -575,7 +575,7 @@ class Pref_Feeds extends Handler_Protected {
 			regExp='^(http|https)://.*' style=\"width : 20em\"
 			name=\"feed_url\" value=\"$feed_url\">";
 
-		$last_error = db_fetch_result($result, 0, "last_error");
+		$last_error = $this->dbh->fetch_result($result, 0, "last_error");
 
 		if ($last_error) {
 			print "&nbsp;<span title=\"".htmlspecialchars($last_error)."\"
@@ -587,7 +587,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 
-			$cat_id = db_fetch_result($result, 0, "cat_id");
+			$cat_id = $this->dbh->fetch_result($result, 0, "cat_id");
 
 			print "<hr/>";
 
@@ -604,14 +604,14 @@ class Pref_Feeds extends Handler_Protected {
 
 		/* Update Interval */
 
-		$update_interval = db_fetch_result($result, 0, "update_interval");
+		$update_interval = $this->dbh->fetch_result($result, 0, "update_interval");
 
 		print_select_hash("update_interval", $update_interval, $update_intervals,
 			'dojoType="dijit.form.Select"');
 
 		/* Purge intl */
 
-		$purge_interval = db_fetch_result($result, 0, "purge_interval");
+		$purge_interval = $this->dbh->fetch_result($result, 0, "purge_interval");
 
 		print "<hr/>";
 		print __('Article purging:') . " ";
@@ -624,13 +624,13 @@ class Pref_Feeds extends Handler_Protected {
 		print "<div class=\"dlgSec\">".__("Authentication")."</div>";
 		print "<div class=\"dlgSecCont\">";
 
-		$auth_login = htmlspecialchars(db_fetch_result($result, 0, "auth_login"));
+		$auth_login = htmlspecialchars($this->dbh->fetch_result($result, 0, "auth_login"));
 
 		print "<input dojoType=\"dijit.form.TextBox\" id=\"feedEditDlg_login\"
 			placeHolder=\"".__("Login")."\"
 			name=\"auth_login\" value=\"$auth_login\"><hr/>";
 
-		$auth_pass = db_fetch_result($result, 0, "auth_pass");
+		$auth_pass = $this->dbh->fetch_result($result, 0, "auth_pass");
 
 		if ($auth_pass_encrypted) {
 			require_once "crypt.php";
@@ -651,7 +651,7 @@ class Pref_Feeds extends Handler_Protected {
 		print "<div class=\"dlgSec\">".__("Options")."</div>";
 		print "<div class=\"dlgSecCont\">";
 
-		$private = sql_bool_to_bool(db_fetch_result($result, 0, "private"));
+		$private = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "private"));
 
 		if ($private) {
 			$checked = "checked=\"1\"";
@@ -662,7 +662,7 @@ class Pref_Feeds extends Handler_Protected {
 		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(db_fetch_result($result, 0, "include_in_digest"));
+		$include_in_digest = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "include_in_digest"));
 
 		if ($include_in_digest) {
 			$checked = "checked=\"1\"";
@@ -675,7 +675,7 @@ class Pref_Feeds extends Handler_Protected {
 			$checked>&nbsp;<label for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
 
 
-		$always_display_enclosures = sql_bool_to_bool(db_fetch_result($result, 0, "always_display_enclosures"));
+		$always_display_enclosures = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "always_display_enclosures"));
 
 		if ($always_display_enclosures) {
 			$checked = "checked";
@@ -687,7 +687,7 @@ class Pref_Feeds extends Handler_Protected {
 			name=\"always_display_enclosures\"
 			$checked>&nbsp;<label for=\"always_display_enclosures\">".__('Always display image attachments')."</label>";
 
-		$hide_images = sql_bool_to_bool(db_fetch_result($result, 0, "hide_images"));
+		$hide_images = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "hide_images"));
 
 		if ($hide_images) {
 			$checked = "checked=\"1\"";
@@ -700,7 +700,7 @@ class Pref_Feeds extends Handler_Protected {
 			$checked>&nbsp;<label for=\"hide_images\">".
 		__('Do not embed images')."</label>";
 
-		$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
+		$cache_images = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "cache_images"));
 
 		if ($cache_images) {
 			$checked = "checked=\"1\"";
@@ -713,7 +713,7 @@ class Pref_Feeds extends Handler_Protected {
 			$checked>&nbsp;<label for=\"cache_images\">".
 		__('Cache images locally')."</label>";
 
-		$mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result, 0, "mark_unread_on_update"));
+		$mark_unread_on_update = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "mark_unread_on_update"));
 
 		if ($mark_unread_on_update) {
 			$checked = "checked";
@@ -758,7 +758,7 @@ class Pref_Feeds extends Handler_Protected {
 				__('Unsubscribe')."</button>";
 
 		if (PUBSUBHUBBUB_ENABLED) {
-			$pubsub_state = db_fetch_result($result, 0, "pubsub_state");
+			$pubsub_state = $this->dbh->fetch_result($result, 0, "pubsub_state");
 			$pubsub_btn_disabled = ($pubsub_state == 2) ? "" : "disabled=\"1\"";
 
 			print "<button dojoType=\"dijit.form.Button\" id=\"pubsubReset_Btn\" $pubsub_btn_disabled
@@ -782,7 +782,7 @@ class Pref_Feeds extends Handler_Protected {
 		global $purge_intervals;
 		global $update_intervals;
 
-		$feed_ids = db_escape_string($_REQUEST["ids"]);
+		$feed_ids = $this->dbh->escape_string($_REQUEST["ids"]);
 
 		print_notice("Enable the options you wish to apply using checkboxes on the right:");
 
@@ -938,27 +938,27 @@ class Pref_Feeds extends Handler_Protected {
 
 	function editsaveops($batch) {
 
-		$feed_title = db_escape_string(trim($_POST["title"]));
-		$feed_link = db_escape_string(trim($_POST["feed_url"]));
-		$upd_intl = (int) db_escape_string($_POST["update_interval"]);
-		$purge_intl = (int) db_escape_string($_POST["purge_interval"]);
-		$feed_id = (int) db_escape_string($_POST["id"]); /* editSave */
-		$feed_ids = db_escape_string($_POST["ids"]); /* batchEditSave */
-		$cat_id = (int) db_escape_string($_POST["cat_id"]);
-		$auth_login = db_escape_string(trim($_POST["auth_login"]));
+		$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(db_escape_string($_POST["private"]));
+		$private = checkbox_to_sql_bool($this->dbh->escape_string($_POST["private"]));
 		$include_in_digest = checkbox_to_sql_bool(
-			db_escape_string($_POST["include_in_digest"]));
+			$this->dbh->escape_string($_POST["include_in_digest"]));
 		$cache_images = checkbox_to_sql_bool(
-			db_escape_string($_POST["cache_images"]));
+			$this->dbh->escape_string($_POST["cache_images"]));
 		$hide_images = checkbox_to_sql_bool(
-			db_escape_string($_POST["hide_images"]));
+			$this->dbh->escape_string($_POST["hide_images"]));
 		$always_display_enclosures = checkbox_to_sql_bool(
-			db_escape_string($_POST["always_display_enclosures"]));
+			$this->dbh->escape_string($_POST["always_display_enclosures"]));
 
 		$mark_unread_on_update = checkbox_to_sql_bool(
-			db_escape_string($_POST["mark_unread_on_update"]));
+			$this->dbh->escape_string($_POST["mark_unread_on_update"]));
 
 		if (strlen(FEED_CRYPT_KEY) > 0) {
 			require_once "crypt.php";
@@ -968,7 +968,7 @@ class Pref_Feeds extends Handler_Protected {
 			$auth_pass_encrypted = 'false';
 		}
 
-		$auth_pass = db_escape_string($auth_pass);
+		$auth_pass = $this->dbh->escape_string($auth_pass);
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 			if ($cat_id && $cat_id != 0) {
@@ -985,7 +985,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		if (!$batch) {
 
-			$result = db_query("UPDATE ttrss_feeds SET
+			$result = $this->dbh->query("UPDATE ttrss_feeds SET
 				$category_qpart
 				title = '$feed_title', feed_url = '$feed_link',
 				update_interval = '$upd_intl',
@@ -1010,7 +1010,7 @@ class Pref_Feeds extends Handler_Protected {
 				}
 			}
 
-			db_query("BEGIN");
+			$this->dbh->query("BEGIN");
 
 			foreach (array_keys($feed_data) as $k) {
 
@@ -1073,23 +1073,23 @@ class Pref_Feeds extends Handler_Protected {
 				}
 
 				if ($qpart) {
-					db_query(
+					$this->dbh->query(
 						"UPDATE ttrss_feeds SET $qpart WHERE id IN ($feed_ids)
 						AND owner_uid = " . $_SESSION["uid"]);
 					print "<br/>";
 				}
 			}
 
-			db_query("COMMIT");
+			$this->dbh->query("COMMIT");
 		}
 		return;
 	}
 
 	function resetPubSub() {
 
-		$ids = db_escape_string($_REQUEST["ids"]);
+		$ids = $this->dbh->escape_string($_REQUEST["ids"]);
 
-		db_query("UPDATE ttrss_feeds SET pubsub_state = 0 WHERE id IN ($ids)
+		$this->dbh->query("UPDATE ttrss_feeds SET pubsub_state = 0 WHERE id IN ($ids)
 			AND owner_uid = " . $_SESSION["uid"]);
 
 		return;
@@ -1097,7 +1097,7 @@ class Pref_Feeds extends Handler_Protected {
 
 	function remove() {
 
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 			Pref_Feeds::remove_feed($id, $_SESSION["uid"]);
@@ -1107,20 +1107,20 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function clear() {
-		$id = db_escape_string($_REQUEST["id"]);
+		$id = $this->dbh->escape_string($_REQUEST["id"]);
 		$this->clear_feed_articles($id);
 	}
 
 	function rescore() {
 		require_once "rssfuncs.php";
 
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 
 			$filters = load_filters($id, $_SESSION["uid"], 6);
 
-			$result = db_query("SELECT
+			$result = $this->dbh->query("SELECT
 				title, content, link, ref_id, author,".
 				SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
 			  	FROM
@@ -1131,7 +1131,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			$scores = array();
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 
 				$tags = get_article_tags($line["ref_id"]);
 
@@ -1148,15 +1148,15 @@ class Pref_Feeds extends Handler_Protected {
 
 			foreach (array_keys($scores) as $s) {
 				if ($s > 1000) {
-					db_query("UPDATE ttrss_user_entries SET score = '$s',
+					$this->dbh->query("UPDATE ttrss_user_entries SET score = '$s',
 						marked = true WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				} else if ($s < -500) {
-					db_query("UPDATE ttrss_user_entries SET score = '$s',
+					$this->dbh->query("UPDATE ttrss_user_entries SET score = '$s',
 						unread = false WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				} else {
-					db_query("UPDATE ttrss_user_entries SET score = '$s' WHERE
+					$this->dbh->query("UPDATE ttrss_user_entries SET score = '$s' WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				}
 			}
@@ -1168,16 +1168,16 @@ class Pref_Feeds extends Handler_Protected {
 
 	function rescoreAll() {
 
-		$result = db_query(
+		$result = $this->dbh->query(
 			"SELECT id FROM ttrss_feeds WHERE owner_uid = " . $_SESSION['uid']);
 
-		while ($feed_line = db_fetch_assoc($result)) {
+		while ($feed_line = $this->dbh->fetch_assoc($result)) {
 
 			$id = $feed_line["id"];
 
 			$filters = load_filters($id, $_SESSION["uid"], 6);
 
-			$tmp_result = db_query("SELECT
+			$tmp_result = $this->dbh->query("SELECT
 				title, content, link, ref_id, author,".
 				  	SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
 					FROM
@@ -1188,7 +1188,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			$scores = array();
 
-			while ($line = db_fetch_assoc($tmp_result)) {
+			while ($line = $this->dbh->fetch_assoc($tmp_result)) {
 
 				$tags = get_article_tags($line["ref_id"]);
 
@@ -1205,11 +1205,11 @@ class Pref_Feeds extends Handler_Protected {
 
 			foreach (array_keys($scores) as $s) {
 				if ($s > 1000) {
-					db_query("UPDATE ttrss_user_entries SET score = '$s',
+					$this->dbh->query("UPDATE ttrss_user_entries SET score = '$s',
 						marked = true WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				} else {
-					db_query("UPDATE ttrss_user_entries SET score = '$s' WHERE
+					$this->dbh->query("UPDATE ttrss_user_entries SET score = '$s' WHERE
 						ref_id IN (" . join(',', $scores[$s]) . ")");
 				}
 			}
@@ -1220,9 +1220,9 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function categorize() {
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 
-		$cat_id = db_escape_string($_REQUEST["cat_id"]);
+		$cat_id = $this->dbh->escape_string($_REQUEST["cat_id"]);
 
 		if ($cat_id == 0) {
 			$cat_id_qpart = 'NULL';
@@ -1230,28 +1230,28 @@ class Pref_Feeds extends Handler_Protected {
 			$cat_id_qpart = "'$cat_id'";
 		}
 
-		db_query("BEGIN");
+		$this->dbh->query("BEGIN");
 
 		foreach ($ids as $id) {
 
-			db_query("UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
+			$this->dbh->query("UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
 				WHERE id = '$id'
 			  	AND owner_uid = " . $_SESSION["uid"]);
 
 		}
 
-		db_query("COMMIT");
+		$this->dbh->query("COMMIT");
 	}
 
 	function removeCat() {
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 		foreach ($ids as $id) {
 			$this->remove_feed_category($id, $_SESSION["uid"]);
 		}
 	}
 
 	function addCat() {
-		$feed_cat = db_escape_string(trim($_REQUEST["cat"]));
+		$feed_cat = $this->dbh->escape_string(trim($_REQUEST["cat"]));
 
 		add_feed_category($feed_cat);
 	}
@@ -1261,10 +1261,10 @@ 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 = db_query("SELECT COUNT(id) AS num_errors
+		$result = $this->dbh->query("SELECT COUNT(id) AS num_errors
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
-		$num_errors = db_fetch_result($result, 0, "num_errors");
+		$num_errors = $this->dbh->fetch_result($result, 0, "num_errors");
 
 		if ($num_errors > 0) {
 
@@ -1279,13 +1279,13 @@ class Pref_Feeds extends Handler_Protected {
 			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
 		}
 
-		$result = db_query("SELECT COUNT(*) AS num_inactive FROM ttrss_feeds WHERE
+		$result = $this->dbh->query("SELECT COUNT(*) 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"]);
 
-		$num_inactive = db_fetch_result($result, 0, "num_inactive");
+		$num_inactive = $this->dbh->fetch_result($result, 0, "num_inactive");
 
 		if ($num_inactive > 0) {
 			$inactive_button = "<button dojoType=\"dijit.form.Button\"
@@ -1293,7 +1293,7 @@ class Pref_Feeds extends Handler_Protected {
 					__("Inactive feeds") . "</button>";
 		}
 
-		$feed_search = db_escape_string($_REQUEST["search"]);
+		$feed_search = $this->dbh->escape_string($_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_feed_search"] = $feed_search;
@@ -1567,7 +1567,7 @@ class Pref_Feeds extends Handler_Protected {
 			$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
 		}
 
-		$result = db_query("SELECT ttrss_feeds.title, ttrss_feeds.site_url,
+		$result = $this->dbh->query("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
@@ -1598,7 +1598,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		$lnum = 1;
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 
 			$class = ($lnum % 2) ? "even" : "odd";
 			$feed_id = $line["id"];
@@ -1648,7 +1648,7 @@ class Pref_Feeds extends Handler_Protected {
 		print "<h2>" . __("These feeds have not been updated because of errors:") .
 			"</h2>";
 
-		$result = db_query("SELECT id,title,feed_url,last_error,site_url
+		$result = $this->dbh->query("SELECT id,title,feed_url,last_error,site_url
 		FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
 
 		print "<div dojoType=\"dijit.Toolbar\">";
@@ -1668,7 +1668,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		$lnum = 1;
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 
 			$class = ($lnum % 2) ? "even" : "odd";
 			$feed_id = $line["id"];
@@ -1725,14 +1725,14 @@ class Pref_Feeds extends Handler_Protected {
 	private function clear_feed_articles($id) {
 
 		if ($id != 0) {
-			$result = db_query("DELETE FROM ttrss_user_entries
+			$result = $this->dbh->query("DELETE FROM ttrss_user_entries
 			WHERE feed_id = '$id' AND marked = false AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			$result = db_query("DELETE FROM ttrss_user_entries
+			$result = $this->dbh->query("DELETE FROM ttrss_user_entries
 			WHERE feed_id IS NULL AND marked = false AND owner_uid = " . $_SESSION["uid"]);
 		}
 
-		$result = db_query("DELETE FROM ttrss_entries WHERE
+		$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']);
@@ -1740,7 +1740,7 @@ class Pref_Feeds extends Handler_Protected {
 
 	private function remove_feed_category($id, $owner_uid) {
 
-		db_query("DELETE FROM ttrss_feed_categories
+		$this->dbh->query("DELETE FROM ttrss_feed_categories
 			WHERE id = '$id' AND owner_uid = $owner_uid");
 
 		ccache_remove($id, $owner_uid, true);
@@ -1855,17 +1855,17 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function batchAddFeeds() {
-		$cat_id = db_escape_string($_REQUEST['cat']);
+		$cat_id = $this->dbh->escape_string($_REQUEST['cat']);
 		$feeds = explode("\n", $_REQUEST['feeds']);
-		$login = db_escape_string($_REQUEST['login']);
+		$login = $this->dbh->escape_string($_REQUEST['login']);
 		$pass = trim($_REQUEST['pass']);
 
 		foreach ($feeds as $feed) {
-			$feed = db_escape_string(trim($feed));
+			$feed = $this->dbh->escape_string(trim($feed));
 
 			if (validate_feed_url($feed)) {
 
-				db_query("BEGIN");
+				$this->dbh->query("BEGIN");
 
 				if ($cat_id == "0" || !$cat_id) {
 					$cat_qpart = "NULL";
@@ -1873,7 +1873,7 @@ class Pref_Feeds extends Handler_Protected {
 					$cat_qpart = "'$cat_id'";
 				}
 
-				$result = db_query(
+				$result = $this->dbh->query(
 					"SELECT id FROM ttrss_feeds
 					WHERE feed_url = '$feed' AND owner_uid = ".$_SESSION["uid"]);
 
@@ -1885,17 +1885,17 @@ class Pref_Feeds extends Handler_Protected {
 					$auth_pass_encrypted = 'false';
 				}
 
-				$pass = db_escape_string($pass);
+				$pass = $this->dbh->escape_string($pass);
 
-				if (db_num_rows($result) == 0) {
-					$result = db_query(
+				if ($this->dbh->num_rows($result) == 0) {
+					$result = $this->dbh->query(
 						"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)");
 				}
 
-				db_query("COMMIT");
+				$this->dbh->query("COMMIT");
 			}
 		}
 	}
@@ -1910,8 +1910,8 @@ class Pref_Feeds extends Handler_Protected {
 	}
 
 	function regenFeedKey() {
-		$feed_id = db_escape_string($_REQUEST['id']);
-		$is_cat = db_escape_string($_REQUEST['is_cat']) == "true";
+		$feed_id = $this->dbh->escape_string($_REQUEST['id']);
+		$is_cat = $this->dbh->escape_string($_REQUEST['is_cat']) == "true";
 
 		$new_key = $this->update_feed_access_key($feed_id, $is_cat);
 
@@ -1924,14 +1924,14 @@ class Pref_Feeds extends Handler_Protected {
 
 		$sql_is_cat = bool_to_sql_bool($is_cat);
 
-		$result = db_query("SELECT access_key FROM ttrss_access_keys
+		$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 (db_num_rows($result) == 1) {
-			$key = db_escape_string(sha1(uniqid(rand(), true)));
+		if ($this->dbh->num_rows($result) == 1) {
+			$key = $this->dbh->escape_string(sha1(uniqid(rand(), true)));
 
-			db_query("UPDATE ttrss_access_keys SET access_key = '$key'
+			$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);
 
@@ -1944,7 +1944,7 @@ class Pref_Feeds extends Handler_Protected {
 
 	// Silent
 	function clearKeys() {
-		db_query("DELETE FROM ttrss_access_keys WHERE
+		$this->dbh->query("DELETE FROM ttrss_access_keys WHERE
 			owner_uid = " . $_SESSION["uid"]);
 	}
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 18a830f4b..ec7fd0d51 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -9,7 +9,7 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	function filtersortreset() {
-		db_query("UPDATE ttrss_filters2
+		$this->dbh->query("UPDATE ttrss_filters2
 				SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
 		return;
 	}
@@ -31,7 +31,7 @@ class Pref_Filters extends Handler_Protected {
 
 				if ($filter_id > 0) {
 
-					db_query("UPDATE ttrss_filters2 SET
+					$this->dbh->query("UPDATE ttrss_filters2 SET
 						order_id = $index WHERE id = '$filter_id' AND
 						owner_uid = " .$_SESSION["uid"]);
 
@@ -49,16 +49,16 @@ class Pref_Filters extends Handler_Protected {
 
 		$filter["enabled"] = true;
 		$filter["match_any_rule"] = sql_bool_to_bool(
-			checkbox_to_sql_bool(db_escape_string($_REQUEST["match_any_rule"])));
+			checkbox_to_sql_bool($this->dbh->escape_string($_REQUEST["match_any_rule"])));
 		$filter["inverse"] = sql_bool_to_bool(
-			checkbox_to_sql_bool(db_escape_string($_REQUEST["inverse"])));
+			checkbox_to_sql_bool($this->dbh->escape_string($_REQUEST["inverse"])));
 
 		$filter["rules"] = array();
 
-		$result = db_query("SELECT id,name FROM ttrss_filter_types");
+		$result = $this->dbh->query("SELECT id,name FROM ttrss_filter_types");
 
 		$filter_types = array();
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			$filter_types[$line["id"]] = $line["name"];
 		}
 
@@ -98,7 +98,7 @@ class Pref_Filters extends Handler_Protected {
 		print "<div class=\"filterTestHolder\">";
 		print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">";
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 
 			$entry_timestamp = strtotime($line["updated"]);
 			$entry_tags = get_article_tags($line["id"], $_SESSION["uid"]);
@@ -158,7 +158,7 @@ class Pref_Filters extends Handler_Protected {
 
 		$filter_search = $_SESSION["prefs_filter_search"];
 
-		$result = db_query("SELECT *,
+		$result = $this->dbh->query("SELECT *,
 			(SELECT action_param FROM ttrss_filters2_actions
 				WHERE filter_id = ttrss_filters2.id ORDER BY id LIMIT 1) AS action_param,
 			(SELECT action_id FROM ttrss_filters2_actions
@@ -176,7 +176,7 @@ class Pref_Filters extends Handler_Protected {
 		$folder = array();
 		$folder['items'] = array();
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 
 			/* if ($action_id != $line["action_id"]) {
 				if (count($folder['items']) > 0) {
@@ -194,10 +194,10 @@ class Pref_Filters extends Handler_Protected {
 
 			$match_ok = false;
 			if ($filter_search) {
-				$rules_result = db_query(
+				$rules_result = $this->dbh->query(
 					"SELECT reg_exp FROM ttrss_filters2_rules WHERE filter_id = ".$line["id"]);
 
-				while ($rule_line = db_fetch_assoc($rules_result)) {
+				while ($rule_line = $this->dbh->fetch_assoc($rules_result)) {
 					if (mb_strpos($rule_line['reg_exp'], $filter_search) !== false) {
 						$match_ok = true;
 						break;
@@ -206,13 +206,13 @@ class Pref_Filters extends Handler_Protected {
 			}
 
 			if ($line['action_id'] == 7) {
-				$label_result = db_query("SELECT fg_color, bg_color
-					FROM ttrss_labels2 WHERE caption = '".db_escape_string($line['action_param'])."' AND
+				$label_result = $this->dbh->query("SELECT fg_color, bg_color
+					FROM ttrss_labels2 WHERE caption = '".$this->dbh->escape_string($line['action_param'])."' AND
 						owner_uid = " . $_SESSION["uid"]);
 
-				if (db_num_rows($label_result) > 0) {
-					$fg_color = db_fetch_result($label_result, 0, "fg_color");
-					$bg_color = db_fetch_result($label_result, 0, "bg_color");
+				if ($this->dbh->num_rows($label_result) > 0) {
+					$fg_color = $this->dbh->fetch_result($label_result, 0, "fg_color");
+					$bg_color = $this->dbh->fetch_result($label_result, 0, "bg_color");
 
 					$name[1] = "<span class=\"labelColorIndicator\" id=\"label-editor-indicator\" style='color : $fg_color; background-color : $bg_color; margin-right : 4px'>&alpha;</span>" . $name[1];
 				}
@@ -248,15 +248,15 @@ class Pref_Filters extends Handler_Protected {
 
 	function edit() {
 
-		$filter_id = db_escape_string($_REQUEST["id"]);
+		$filter_id = $this->dbh->escape_string($_REQUEST["id"]);
 
-		$result = db_query(
+		$result = $this->dbh->query(
 			"SELECT * FROM ttrss_filters2 WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]);
 
-		$enabled = sql_bool_to_bool(db_fetch_result($result, 0, "enabled"));
-		$match_any_rule = sql_bool_to_bool(db_fetch_result($result, 0, "match_any_rule"));
-		$inverse = sql_bool_to_bool(db_fetch_result($result, 0, "inverse"));
-		$title = htmlspecialchars(db_fetch_result($result, 0, "title"));
+		$enabled = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "enabled"));
+		$match_any_rule = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "match_any_rule"));
+		$inverse = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "inverse"));
+		$title = htmlspecialchars($this->dbh->fetch_result($result, 0, "title"));
 
 		print "<form id=\"filter_edit_form\" onsubmit='return false'>";
 
@@ -294,10 +294,10 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<ul id='filterDlg_Matches'>";
 
-		$rules_result = db_query("SELECT * FROM ttrss_filters2_rules
+		$rules_result = $this->dbh->query("SELECT * FROM ttrss_filters2_rules
 			WHERE filter_id = '$filter_id' ORDER BY reg_exp, id");
 
-		while ($line = db_fetch_assoc($rules_result)) {
+		while ($line = $this->dbh->fetch_assoc($rules_result)) {
 			if (sql_bool_to_bool($line["cat_filter"])) {
 				$line["feed_id"] = "CAT:" . (int)$line["cat_id"];
 			}
@@ -342,10 +342,10 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<ul id='filterDlg_Actions'>";
 
-		$actions_result = db_query("SELECT * FROM ttrss_filters2_actions
+		$actions_result = $this->dbh->query("SELECT * FROM ttrss_filters2_actions
 			WHERE filter_id = '$filter_id' ORDER BY id");
 
-		while ($line = db_fetch_assoc($actions_result)) {
+		while ($line = $this->dbh->fetch_assoc($actions_result)) {
 			$line["action_param_label"] = $line["action_param"];
 
 			unset($line["filter_id"]);
@@ -427,9 +427,9 @@ class Pref_Filters extends Handler_Protected {
 				$feed = __("All feeds");
 		}
 
-		$result = db_query("SELECT description FROM ttrss_filter_types
+		$result = $this->dbh->query("SELECT description FROM ttrss_filter_types
 			WHERE id = ".(int)$rule["filter_type"]);
-		$filter_type = db_fetch_result($result, 0, "description");
+		$filter_type = $this->dbh->fetch_result($result, 0, "description");
 
 		return T_sprintf("%s on %s in %s %s", strip_tags($rule["reg_exp"]),
 			$filter_type, $feed, isset($rule["inverse"]) ? __("(inverse)") : "");
@@ -440,10 +440,10 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	private function getActionName($action) {
-		$result = db_query("SELECT description FROM
+		$result = $this->dbh->query("SELECT description FROM
 			ttrss_filter_actions WHERE id = " .(int)$action["action_id"]);
 
-		$title = __(db_fetch_result($result, 0, "description"));
+		$title = __($this->dbh->fetch_result($result, 0, "description"));
 
 		if ($action["action_id"] == 4 || $action["action_id"] == 6 ||
 			$action["action_id"] == 7)
@@ -463,13 +463,13 @@ class Pref_Filters extends Handler_Protected {
 
 #		print_r($_REQUEST);
 
-		$filter_id = db_escape_string($_REQUEST["id"]);
-		$enabled = checkbox_to_sql_bool(db_escape_string($_REQUEST["enabled"]));
-		$match_any_rule = checkbox_to_sql_bool(db_escape_string($_REQUEST["match_any_rule"]));
-		$inverse = checkbox_to_sql_bool(db_escape_string($_REQUEST["inverse"]));
-		$title = db_escape_string($_REQUEST["title"]);
+		$filter_id = $this->dbh->escape_string($_REQUEST["id"]);
+		$enabled = checkbox_to_sql_bool($this->dbh->escape_string($_REQUEST["enabled"]));
+		$match_any_rule = checkbox_to_sql_bool($this->dbh->escape_string($_REQUEST["match_any_rule"]));
+		$inverse = checkbox_to_sql_bool($this->dbh->escape_string($_REQUEST["inverse"]));
+		$title = $this->dbh->escape_string($_REQUEST["title"]);
 
-		$result = db_query("UPDATE ttrss_filters2 SET enabled = $enabled,
+		$result = $this->dbh->query("UPDATE ttrss_filters2 SET enabled = $enabled,
 			match_any_rule = $match_any_rule,
 			inverse = $inverse,
 			title = '$title'
@@ -482,17 +482,17 @@ class Pref_Filters extends Handler_Protected {
 
 	function remove() {
 
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			db_query("DELETE FROM ttrss_filters2 WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
+			$this->dbh->query("DELETE FROM ttrss_filters2 WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
 		}
 	}
 
 	private function saveRulesAndActions($filter_id) {
 
-		db_query("DELETE FROM ttrss_filters2_rules WHERE filter_id = '$filter_id'");
-		db_query("DELETE FROM ttrss_filters2_actions WHERE filter_id = '$filter_id'");
+		$this->dbh->query("DELETE FROM ttrss_filters2_rules WHERE filter_id = '$filter_id'");
+		$this->dbh->query("DELETE FROM ttrss_filters2_actions WHERE filter_id = '$filter_id'");
 
 		if ($filter_id) {
 			/* create rules */
@@ -521,11 +521,11 @@ class Pref_Filters extends Handler_Protected {
 			foreach ($rules as $rule) {
 				if ($rule) {
 
-					$reg_exp = strip_tags(db_escape_string(trim($rule["reg_exp"])));
+					$reg_exp = strip_tags($this->dbh->escape_string(trim($rule["reg_exp"])));
 					$inverse = isset($rule["inverse"]) ? "true" : "false";
 
-					$filter_type = (int) db_escape_string(trim($rule["filter_type"]));
-					$feed_id = db_escape_string(trim($rule["feed_id"]));
+					$filter_type = (int) $this->dbh->escape_string(trim($rule["filter_type"]));
+					$feed_id = $this->dbh->escape_string(trim($rule["feed_id"]));
 
 					if (strpos($feed_id, "CAT:") === 0) {
 
@@ -546,16 +546,16 @@ class Pref_Filters extends Handler_Protected {
 						(filter_id, reg_exp,filter_type,feed_id,cat_id,cat_filter,inverse) VALUES
 						('$filter_id', '$reg_exp', '$filter_type', $feed_id, $cat_id, $cat_filter, $inverse)";
 
-					db_query($query);
+					$this->dbh->query($query);
 				}
 			}
 
 			foreach ($actions as $action) {
 				if ($action) {
 
-					$action_id = (int) db_escape_string($action["action_id"]);
-					$action_param = db_escape_string($action["action_param"]);
-					$action_param_label = db_escape_string($action["action_param_label"]);
+					$action_id = (int) $this->dbh->escape_string($action["action_id"]);
+					$action_param = $this->dbh->escape_string($action["action_param"]);
+					$action_param_label = $this->dbh->escape_string($action["action_param_label"]);
 
 					if ($action_id == 7) {
 						$action_param = $action_param_label;
@@ -569,7 +569,7 @@ class Pref_Filters extends Handler_Protected {
 						(filter_id, action_id, action_param) VALUES
 						('$filter_id', '$action_id', '$action_param')";
 
-					db_query($query);
+					$this->dbh->query($query);
 				}
 			}
 		}
@@ -586,35 +586,35 @@ class Pref_Filters extends Handler_Protected {
 
 		$enabled = checkbox_to_sql_bool($_REQUEST["enabled"]);
 		$match_any_rule = checkbox_to_sql_bool($_REQUEST["match_any_rule"]);
-		$title = db_escape_string($_REQUEST["title"]);
+		$title = $this->dbh->escape_string($_REQUEST["title"]);
 
-		db_query("BEGIN");
+		$this->dbh->query("BEGIN");
 
 		/* create base filter */
 
-		$result = db_query("INSERT INTO ttrss_filters2
+		$result = $this->dbh->query("INSERT INTO ttrss_filters2
 			(owner_uid, match_any_rule, enabled, title) VALUES
 			(".$_SESSION["uid"].",$match_any_rule,$enabled, '$title')");
 
-		$result = db_query("SELECT MAX(id) AS id FROM ttrss_filters2
+		$result = $this->dbh->query("SELECT MAX(id) AS id FROM ttrss_filters2
 			WHERE owner_uid = ".$_SESSION["uid"]);
 
-		$filter_id = db_fetch_result($result, 0, "id");
+		$filter_id = $this->dbh->fetch_result($result, 0, "id");
 
 		$this->saveRulesAndActions($filter_id);
 
-		db_query("COMMIT");
+		$this->dbh->query("COMMIT");
 	}
 
 	function index() {
 
-		$sort = db_escape_string($_REQUEST["sort"]);
+		$sort = $this->dbh->escape_string($_REQUEST["sort"]);
 
 		if (!$sort || $sort == "undefined") {
 			$sort = "reg_exp";
 		}
 
-		$filter_search = db_escape_string($_REQUEST["search"]);
+		$filter_search = $this->dbh->escape_string($_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_filter_search"] = $filter_search;
@@ -626,7 +626,7 @@ class Pref_Filters extends Handler_Protected {
 		print "<div id=\"pref-filter-header\" dojoType=\"dijit.layout.ContentPane\" region=\"top\">";
 		print "<div id=\"pref-filter-toolbar\" dojoType=\"dijit.Toolbar\">";
 
-		$filter_search = db_escape_string($_REQUEST["search"]);
+		$filter_search = $this->dbh->escape_string($_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_filter_search"] = $filter_search;
@@ -832,12 +832,12 @@ class Pref_Filters extends Handler_Protected {
 
 		print "<form name='filter_new_rule_form' id='filter_new_rule_form'>";
 
-		$result = db_query("SELECT id,description
+		$result = $this->dbh->query("SELECT id,description
 			FROM ttrss_filter_types WHERE id != 5 ORDER BY description");
 
 		$filter_types = array();
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			$filter_types[$line["id"]] = __($line["description"]);
 		}
 
@@ -888,7 +888,7 @@ class Pref_Filters extends Handler_Protected {
 		$action = json_decode($_REQUEST["action"], true);
 
 		if ($action) {
-			$action_param = db_escape_string($action["action_param"]);
+			$action_param = $this->dbh->escape_string($action["action_param"]);
 			$action_id = (int)$action["action_id"];
 		} else {
 			$action_param = "";
@@ -904,10 +904,10 @@ class Pref_Filters extends Handler_Protected {
 		print "<select name=\"action_id\" dojoType=\"dijit.form.Select\"
 			onchange=\"filterDlgCheckAction(this)\">";
 
-		$result = db_query("SELECT id,description FROM ttrss_filter_actions
+		$result = $this->dbh->query("SELECT id,description FROM ttrss_filter_actions
 			ORDER BY name");
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			$is_selected = ($line["id"] == $action_id) ? "selected='1'" : "";
 			printf("<option $is_selected value='%d'>%s</option>", $line["id"], __($line["description"]));
 		}
@@ -953,28 +953,28 @@ class Pref_Filters extends Handler_Protected {
 
 	private function getFilterName($id) {
 
-		$result = db_query(
+		$result = $this->dbh->query(
 			"SELECT title,COUNT(DISTINCT r.id) AS num_rules,COUNT(DISTINCT a.id) AS num_actions
 				FROM ttrss_filters2 AS f LEFT JOIN ttrss_filters2_rules AS r
 					ON (r.filter_id = f.id)
 						LEFT JOIN ttrss_filters2_actions AS a
 							ON (a.filter_id = f.id) WHERE f.id = '$id' GROUP BY f.title");
 
-		$title = db_fetch_result($result, 0, "title");
-		$num_rules = db_fetch_result($result, 0, "num_rules");
-		$num_actions = db_fetch_result($result, 0, "num_actions");
+		$title = $this->dbh->fetch_result($result, 0, "title");
+		$num_rules = $this->dbh->fetch_result($result, 0, "num_rules");
+		$num_actions = $this->dbh->fetch_result($result, 0, "num_actions");
 
 		if (!$title) $title = __("[No caption]");
 
 		$title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", $num_rules), $title, $num_rules);
 
-		$result = db_query(
+		$result = $this->dbh->query(
 			"SELECT * FROM ttrss_filters2_actions WHERE filter_id = '$id' ORDER BY id LIMIT 1");
 
 		$actions = "";
 
-		if (db_num_rows($result) > 0) {
-			$line = db_fetch_assoc($result);
+		if ($this->dbh->num_rows($result) > 0) {
+			$line = $this->dbh->fetch_assoc($result);
 			$actions = $this->getActionName($line);
 
 			$num_actions -= 1;
@@ -987,22 +987,22 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	function join() {
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 
 		if (count($ids) > 1) {
 			$base_id = array_shift($ids);
 			$ids_str = join(",", $ids);
 
-			db_query("BEGIN");
-			db_query("UPDATE ttrss_filters2_rules
+			$this->dbh->query("BEGIN");
+			$this->dbh->query("UPDATE ttrss_filters2_rules
 				SET filter_id = '$base_id' WHERE filter_id IN ($ids_str)");
-			db_query("UPDATE ttrss_filters2_actions
+			$this->dbh->query("UPDATE ttrss_filters2_actions
 				SET filter_id = '$base_id' WHERE filter_id IN ($ids_str)");
 
-			db_query("DELETE FROM ttrss_filters2 WHERE id IN ($ids_str)");
-			db_query("UPDATE ttrss_filters2 SET match_any_rule = true WHERE id = '$base_id'");
+			$this->dbh->query("DELETE FROM ttrss_filters2 WHERE id IN ($ids_str)");
+			$this->dbh->query("UPDATE ttrss_filters2 SET match_any_rule = true WHERE id = '$base_id'");
 
-			db_query("COMMIT");
+			$this->dbh->query("COMMIT");
 
 			$this->optimizeFilter($base_id);
 
@@ -1010,14 +1010,14 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	private function optimizeFilter($id) {
-		db_query("BEGIN");
-		$result = db_query("SELECT * FROM ttrss_filters2_actions
+		$this->dbh->query("BEGIN");
+		$result = $this->dbh->query("SELECT * FROM ttrss_filters2_actions
 			WHERE filter_id = '$id'");
 
 		$tmp = array();
 		$dupe_ids = array();
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			$id = $line["id"];
 			unset($line["id"]);
 
@@ -1030,17 +1030,17 @@ class Pref_Filters extends Handler_Protected {
 
 		if (count($dupe_ids) > 0) {
 			$ids_str = join(",", $dupe_ids);
-			db_query("DELETE FROM ttrss_filters2_actions
+			$this->dbh->query("DELETE FROM ttrss_filters2_actions
 				WHERE id IN ($ids_str)");
 		}
 
-		$result = db_query("SELECT * FROM ttrss_filters2_rules
+		$result = $this->dbh->query("SELECT * FROM ttrss_filters2_rules
 			WHERE filter_id = '$id'");
 
 		$tmp = array();
 		$dupe_ids = array();
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			$id = $line["id"];
 			unset($line["id"]);
 
@@ -1053,11 +1053,11 @@ class Pref_Filters extends Handler_Protected {
 
 		if (count($dupe_ids) > 0) {
 			$ids_str = join(",", $dupe_ids);
-			db_query("DELETE FROM ttrss_filters2_rules
+			$this->dbh->query("DELETE FROM ttrss_filters2_rules
 				WHERE id IN ($ids_str)");
 		}
 
-		db_query("COMMIT");
+		$this->dbh->query("COMMIT");
 	}
 }
 ?>
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 38056ed6c..a928dd017 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -8,12 +8,12 @@ class Pref_Labels extends Handler_Protected {
 	}
 
 	function edit() {
-		$label_id = db_escape_string($_REQUEST['id']);
+		$label_id = $this->dbh->escape_string($_REQUEST['id']);
 
-		$result = db_query("SELECT * FROM ttrss_labels2 WHERE
+		$result = $this->dbh->query("SELECT * FROM ttrss_labels2 WHERE
 			id = '$label_id' AND owner_uid = " . $_SESSION["uid"]);
 
-		$line = db_fetch_assoc($result);
+		$line = $this->dbh->fetch_assoc($result);
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$label_id\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-labels\">";
@@ -90,12 +90,12 @@ class Pref_Labels extends Handler_Protected {
 		$root['name'] = __('Labels');
 		$root['items'] = array();
 
-		$result = db_query("SELECT *
+		$result = $this->dbh->query("SELECT *
 			FROM ttrss_labels2
 			WHERE owner_uid = ".$_SESSION["uid"]."
 			ORDER BY caption");
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			$label = array();
 			$label['id'] = 'LABEL:' . $line['id'];
 			$label['bare_id'] = $line['id'];
@@ -118,29 +118,29 @@ class Pref_Labels extends Handler_Protected {
 	}
 
 	function colorset() {
-		$kind = db_escape_string($_REQUEST["kind"]);
-		$ids = explode(',', db_escape_string($_REQUEST["ids"]));
-		$color = db_escape_string($_REQUEST["color"]);
-		$fg = db_escape_string($_REQUEST["fg"]);
-		$bg = db_escape_string($_REQUEST["bg"]);
+		$kind = $this->dbh->escape_string($_REQUEST["kind"]);
+		$ids = explode(',', $this->dbh->escape_string($_REQUEST["ids"]));
+		$color = $this->dbh->escape_string($_REQUEST["color"]);
+		$fg = $this->dbh->escape_string($_REQUEST["fg"]);
+		$bg = $this->dbh->escape_string($_REQUEST["bg"]);
 
 		foreach ($ids as $id) {
 
 			if ($kind == "fg" || $kind == "bg") {
-				db_query("UPDATE ttrss_labels2 SET
+				$this->dbh->query("UPDATE ttrss_labels2 SET
 					${kind}_color = '$color' WHERE id = '$id'
 					AND owner_uid = " . $_SESSION["uid"]);
 			} else {
-				db_query("UPDATE ttrss_labels2 SET
+				$this->dbh->query("UPDATE ttrss_labels2 SET
 					fg_color = '$fg', bg_color = '$bg' WHERE id = '$id'
 					AND owner_uid = " . $_SESSION["uid"]);
 			}
 
-			$caption = db_escape_string(label_find_caption($id, $_SESSION["uid"]));
+			$caption = $this->dbh->escape_string(label_find_caption($id, $_SESSION["uid"]));
 
 			/* Remove cached data */
 
-			db_query("UPDATE ttrss_user_entries SET label_cache = ''
+			$this->dbh->query("UPDATE ttrss_user_entries SET label_cache = ''
 				WHERE label_cache LIKE '%$caption%' AND owner_uid = " . $_SESSION["uid"]);
 
 		}
@@ -149,18 +149,18 @@ class Pref_Labels extends Handler_Protected {
 	}
 
 	function colorreset() {
-		$ids = explode(',', db_escape_string($_REQUEST["ids"]));
+		$ids = explode(',', $this->dbh->escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			db_query("UPDATE ttrss_labels2 SET
+			$this->dbh->query("UPDATE ttrss_labels2 SET
 				fg_color = '', bg_color = '' WHERE id = '$id'
 				AND owner_uid = " . $_SESSION["uid"]);
 
-			$caption = db_escape_string(label_find_caption($id, $_SESSION["uid"]));
+			$caption = $this->dbh->escape_string(label_find_caption($id, $_SESSION["uid"]));
 
 			/* Remove cached data */
 
-			db_query("UPDATE ttrss_user_entries SET label_cache = ''
+			$this->dbh->query("UPDATE ttrss_user_entries SET label_cache = ''
 				WHERE label_cache LIKE '%$caption%' AND owner_uid = " . $_SESSION["uid"]);
 		}
 
@@ -168,31 +168,31 @@ class Pref_Labels extends Handler_Protected {
 
 	function save() {
 
-		$id = db_escape_string($_REQUEST["id"]);
-		$caption = db_escape_string(trim($_REQUEST["caption"]));
+		$id = $this->dbh->escape_string($_REQUEST["id"]);
+		$caption = $this->dbh->escape_string(trim($_REQUEST["caption"]));
 
-		db_query("BEGIN");
+		$this->dbh->query("BEGIN");
 
-		$result = db_query("SELECT caption FROM ttrss_labels2
+		$result = $this->dbh->query("SELECT caption FROM ttrss_labels2
 			WHERE id = '$id' AND owner_uid = ". $_SESSION["uid"]);
 
-		if (db_num_rows($result) != 0) {
-			$old_caption = db_fetch_result($result, 0, "caption");
+		if ($this->dbh->num_rows($result) != 0) {
+			$old_caption = $this->dbh->fetch_result($result, 0, "caption");
 
-			$result = db_query("SELECT id FROM ttrss_labels2
+			$result = $this->dbh->query("SELECT id FROM ttrss_labels2
 				WHERE caption = '$caption' AND owner_uid = ". $_SESSION["uid"]);
 
-			if (db_num_rows($result) == 0) {
+			if ($this->dbh->num_rows($result) == 0) {
 				if ($caption) {
-					$result = db_query("UPDATE ttrss_labels2 SET
+					$result = $this->dbh->query("UPDATE ttrss_labels2 SET
 						caption = '$caption' WHERE id = '$id' AND
 						owner_uid = " . $_SESSION["uid"]);
 
 					/* Update filters that reference label being renamed */
 
-					$old_caption = db_escape_string($old_caption);
+					$old_caption = $this->dbh->escape_string($old_caption);
 
-					db_query("UPDATE ttrss_filters2_actions SET
+					$this->dbh->query("UPDATE ttrss_filters2_actions SET
 						action_param = '$caption' WHERE action_param = '$old_caption'
 						AND action_id = 7
 						AND filter_id IN (SELECT id FROM ttrss_filters2 WHERE owner_uid = ".$_SESSION["uid"].")");
@@ -206,14 +206,14 @@ class Pref_Labels extends Handler_Protected {
 			}
 		}
 
-		db_query("COMMIT");
+		$this->dbh->query("COMMIT");
 
 		return;
 	}
 
 	function remove() {
 
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 			label_remove($id, $_SESSION["uid"]);
@@ -222,8 +222,8 @@ class Pref_Labels extends Handler_Protected {
 	}
 
 	function add() {
-		$caption = db_escape_string($_REQUEST["caption"]);
-		$output = db_escape_string($_REQUEST["output"]);
+		$caption = $this->dbh->escape_string($_REQUEST["caption"]);
+		$output = $this->dbh->escape_string($_REQUEST["output"]);
 
 		if ($caption) {
 
@@ -250,13 +250,13 @@ class Pref_Labels extends Handler_Protected {
 
 	function index() {
 
-		$sort = db_escape_string($_REQUEST["sort"]);
+		$sort = $this->dbh->escape_string($_REQUEST["sort"]);
 
 		if (!$sort || $sort == "undefined") {
 			$sort = "caption";
 		}
 
-		$label_search = db_escape_string($_REQUEST["search"]);
+		$label_search = $this->dbh->escape_string($_REQUEST["search"]);
 
 		if (array_key_exists("search", $_REQUEST)) {
 			$_SESSION["prefs_label_search"] = $label_search;
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 8e8abb5eb..b541ac875 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -103,13 +103,13 @@ class Pref_Prefs extends Handler_Protected {
 
 		foreach (array_keys($_POST) as $pref_name) {
 
-			$pref_name = db_escape_string($pref_name);
-			$value = db_escape_string($_POST[$pref_name]);
+			$pref_name = $this->dbh->escape_string($pref_name);
+			$value = $this->dbh->escape_string($_POST[$pref_name]);
 
 			if ($pref_name == 'DIGEST_PREFERRED_TIME') {
 				if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
 
-					db_query("UPDATE ttrss_users SET
+					$this->dbh->query("UPDATE ttrss_users SET
 						last_digest_sent = NULL WHERE id = " . $_SESSION['uid']);
 
 				}
@@ -138,13 +138,13 @@ class Pref_Prefs extends Handler_Protected {
 
 	function getHelp() {
 
-		$pref_name = db_escape_string($_REQUEST["pn"]);
+		$pref_name = $this->dbh->escape_string($_REQUEST["pn"]);
 
-		$result = db_query("SELECT help_text FROM ttrss_prefs
+		$result = $this->dbh->query("SELECT help_text FROM ttrss_prefs
 			WHERE pref_name = '$pref_name'");
 
-		if (db_num_rows($result) > 0) {
-			$help_text = db_fetch_result($result, 0, "help_text");
+		if ($this->dbh->num_rows($result) > 0) {
+			$help_text = $this->dbh->fetch_result($result, 0, "help_text");
 			print $help_text;
 		} else {
 			printf(__("Unknown option: %s"), $pref_name);
@@ -153,12 +153,12 @@ class Pref_Prefs extends Handler_Protected {
 
 	function changeemail() {
 
-		$email = db_escape_string($_POST["email"]);
-		$full_name = db_escape_string($_POST["full_name"]);
+		$email = $this->dbh->escape_string($_POST["email"]);
+		$full_name = $this->dbh->escape_string($_POST["full_name"]);
 
 		$active_uid = $_SESSION["uid"];
 
-		db_query("UPDATE ttrss_users SET email = '$email',
+		$this->dbh->query("UPDATE ttrss_users SET email = '$email',
 			full_name = '$full_name' WHERE id = '$active_uid'");
 
 		print __("Your personal data has been saved.");
@@ -176,7 +176,7 @@ class Pref_Prefs extends Handler_Protected {
 			$profile_qpart = "profile IS NULL";
 		}
 
-		db_query("DELETE FROM ttrss_user_prefs
+		$this->dbh->query("DELETE FROM ttrss_user_prefs
 			WHERE $profile_qpart AND owner_uid = ".$_SESSION["uid"]);
 
 		initialize_user_prefs($_SESSION["uid"], $_SESSION["profile"]);
@@ -225,13 +225,13 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "<h2>" . __("Personal data") . "</h2>";
 
-		$result = db_query("SELECT email,full_name,otp_enabled,
+		$result = $this->dbh->query("SELECT email,full_name,otp_enabled,
 			access_level FROM ttrss_users
 			WHERE id = ".$_SESSION["uid"]);
 
-		$email = htmlspecialchars(db_fetch_result($result, 0, "email"));
-		$full_name = htmlspecialchars(db_fetch_result($result, 0, "full_name"));
-		$otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "otp_enabled"));
+		$email = htmlspecialchars($this->dbh->fetch_result($result, 0, "email"));
+		$full_name = htmlspecialchars($this->dbh->fetch_result($result, 0, "full_name"));
+		$otp_enabled = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "otp_enabled"));
 
 		print "<tr><td width=\"40%\">".__('Full name')."</td>";
 		print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" name=\"full_name\" required=\"1\"
@@ -242,7 +242,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		if (!SINGLE_USER_MODE && !$_SESSION["hide_hello"]) {
 
-			$access_level = db_fetch_result($result, 0, "access_level");
+			$access_level = $this->dbh->fetch_result($result, 0, "access_level");
 			print "<tr><td width=\"40%\">".__('Access level')."</td>";
 			print "<td>" . $access_level_names[$access_level] . "</td></tr>";
 		}
@@ -270,11 +270,11 @@ class Pref_Prefs extends Handler_Protected {
 
 			print "<h2>" . __("Password") . "</h2>";
 
-			$result = db_query("SELECT id FROM ttrss_users
+			$result = $this->dbh->query("SELECT id FROM ttrss_users
 				WHERE id = ".$_SESSION["uid"]." AND pwd_hash
 				= 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'");
 
-			if (db_num_rows($result) != 0) {
+			if ($this->dbh->num_rows($result) != 0) {
 				print format_warning(__("Your password is at default value, please change it."), "default_pass_warning");
 			}
 
@@ -494,7 +494,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		$access_query = 'true';
 
-		$result = db_query("SELECT DISTINCT
+		$result = $this->dbh->query("SELECT DISTINCT
 			ttrss_user_prefs.pref_name,value,type_name,
 			ttrss_prefs_sections.order_id,
 			def_value,section_id
@@ -513,7 +513,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		$listed_boolean_prefs = array();
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 
 			if (in_array($line["pref_name"], $prefs_blacklist)) {
 				continue;
@@ -897,17 +897,17 @@ class Pref_Prefs extends Handler_Protected {
 		require_once "lib/otphp/lib/totp.php";
 		require_once "lib/phpqrcode/phpqrcode.php";
 
-		$result = db_query("SELECT login,salt,otp_enabled
+		$result = $this->dbh->query("SELECT login,salt,otp_enabled
 			FROM ttrss_users
 			WHERE id = ".$_SESSION["uid"]);
 
 		$base32 = new Base32();
 
-		$login = db_fetch_result($result, 0, "login");
-		$otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "otp_enabled"));
+		$login = $this->dbh->fetch_result($result, 0, "login");
+		$otp_enabled = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "otp_enabled"));
 
 		if (!$otp_enabled) {
-			$secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt")));
+			$secret = $base32->encode(sha1($this->dbh->fetch_result($result, 0, "salt")));
 			$topt = new \OTPHP\TOTP($secret);
 			print QRcode::png($topt->provisioning_uri($login));
 		}
@@ -926,19 +926,19 @@ class Pref_Prefs extends Handler_Protected {
 
 		if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-			$result = db_query("SELECT salt
+			$result = $this->dbh->query("SELECT salt
 				FROM ttrss_users
 				WHERE id = ".$_SESSION["uid"]);
 
 			$base32 = new Base32();
 
-			$secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt")));
+			$secret = $base32->encode(sha1($this->dbh->fetch_result($result, 0, "salt")));
 			$topt = new \OTPHP\TOTP($secret);
 
 			$otp_check = $topt->now();
 
 			if ($otp == $otp_check) {
-				db_query("UPDATE ttrss_users SET otp_enabled = true WHERE
+				$this->dbh->query("UPDATE ttrss_users SET otp_enabled = true WHERE
 					id = " . $_SESSION["uid"]);
 
 				print "OK";
@@ -952,14 +952,14 @@ class Pref_Prefs extends Handler_Protected {
 	}
 
 	function otpdisable() {
-		$password = db_escape_string($_REQUEST["password"]);
+		$password = $this->dbh->escape_string($_REQUEST["password"]);
 
 		global $pluginhost;
 		$authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
 
 		if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-			db_query("UPDATE ttrss_users SET otp_enabled = false WHERE
+			$this->dbh->query("UPDATE ttrss_users SET otp_enabled = false WHERE
 				id = " . $_SESSION["uid"]);
 
 			print "OK";
@@ -979,7 +979,7 @@ class Pref_Prefs extends Handler_Protected {
 	}
 
 	function clearplugindata() {
-		$name = db_escape_string($_REQUEST["name"]);
+		$name = $this->dbh->escape_string($_REQUEST["name"]);
 
 		global $pluginhost;
 		$pluginhost->clear_data($pluginhost->get_plugin($name));
@@ -1034,7 +1034,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "</div>";
 
-		$result = db_query("SELECT title,id FROM ttrss_settings_profiles
+		$result = $this->dbh->query("SELECT title,id FROM ttrss_settings_profiles
 			WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
 		print "<div class=\"prefProfileHolder\">";
@@ -1065,7 +1065,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		$lnum = 1;
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 
 			$class = ($lnum % 2) ? "even" : "odd";
 
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 23f5a4328..3d82b8fff 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -24,7 +24,7 @@ class Pref_System extends Handler_Protected {
 		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
 
-		$result = db_query("SELECT errno, errstr, filename, lineno,
+		$result = $this->dbh->query("SELECT errno, errstr, filename, lineno,
 			created_at, login FROM ttrss_error_log
 			LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
 			ORDER BY ttrss_error_log.id DESC
@@ -43,7 +43,7 @@ class Pref_System extends Handler_Protected {
 			<td width='5%'>".__("Date")."</td>
 			</tr>";
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			print "<tr class=\"errrow\">";
 
 			foreach ($line as $k => $v) {
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 7541625fd..d483c771b 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -21,7 +21,7 @@ class Pref_Users extends Handler_Protected {
 
 			$uid = sprintf("%d", $_REQUEST["id"]);
 
-			$result = db_query("SELECT login,
+			$result = $this->dbh->query("SELECT login,
 				".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
 				access_level,
 				(SELECT COUNT(int_id) FROM ttrss_user_entries
@@ -30,33 +30,33 @@ class Pref_Users extends Handler_Protected {
 				FROM ttrss_users
 				WHERE id = '$uid'");
 
-			if (db_num_rows($result) == 0) {
+			if ($this->dbh->num_rows($result) == 0) {
 				print "<h1>".__('User not found')."</h1>";
 				return;
 			}
 
 			// print "<h1>User Details</h1>";
 
-			$login = db_fetch_result($result, 0, "login");
+			$login = $this->dbh->fetch_result($result, 0, "login");
 
 			print "<table width='100%'>";
 
 			$last_login = make_local_datetime(
-				db_fetch_result($result, 0, "last_login"), true);
+				$this->dbh->fetch_result($result, 0, "last_login"), true);
 
 			$created = make_local_datetime(
-				db_fetch_result($result, 0, "created"), true);
+				$this->dbh->fetch_result($result, 0, "created"), true);
 
-			$access_level = db_fetch_result($result, 0, "access_level");
-			$stored_articles = db_fetch_result($result, 0, "stored_articles");
+			$access_level = $this->dbh->fetch_result($result, 0, "access_level");
+			$stored_articles = $this->dbh->fetch_result($result, 0, "stored_articles");
 
 			print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
 			print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
 
-			$result = db_query("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
+			$result = $this->dbh->query("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
 				WHERE owner_uid = '$uid'");
 
-			$num_feeds = db_fetch_result($result, 0, "num_feeds");
+			$num_feeds = $this->dbh->fetch_result($result, 0, "num_feeds");
 
 			print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
 
@@ -64,14 +64,14 @@ class Pref_Users extends Handler_Protected {
 
 			print "<h1>".__('Subscribed feeds')."</h1>";
 
-			$result = db_query("SELECT id,title,site_url FROM ttrss_feeds
+			$result = $this->dbh->query("SELECT id,title,site_url FROM ttrss_feeds
 				WHERE owner_uid = '$uid' ORDER BY title");
 
 			print "<ul class=\"userFeedList\">";
 
 			$row_class = "odd";
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 
 				$icon_file = ICONS_URL."/".$line["id"].".ico";
 
@@ -87,7 +87,7 @@ class Pref_Users extends Handler_Protected {
 
 			}
 
-			if (db_num_rows($result) < $num_feeds) {
+			if ($this->dbh->num_rows($result) < $num_feeds) {
 				// FIXME - add link to show ALL subscribed feeds here somewhere
 				print "<li><img
 					class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">&nbsp;...</li>";
@@ -105,18 +105,18 @@ class Pref_Users extends Handler_Protected {
 		function edit() {
 			global $access_level_names;
 
-			$id = db_escape_string($_REQUEST["id"]);
+			$id = $this->dbh->escape_string($_REQUEST["id"]);
 			print "<form id=\"user_edit_form\" onsubmit='return false'>";
 
 			print "<input type=\"hidden\" name=\"id\" value=\"$id\">";
 			print "<input type=\"hidden\" name=\"op\" value=\"pref-users\">";
 			print "<input type=\"hidden\" name=\"method\" value=\"editSave\">";
 
-			$result = db_query("SELECT * FROM ttrss_users WHERE id = '$id'");
+			$result = $this->dbh->query("SELECT * FROM ttrss_users WHERE id = '$id'");
 
-			$login = db_fetch_result($result, 0, "login");
-			$access_level = db_fetch_result($result, 0, "access_level");
-			$email = db_fetch_result($result, 0, "email");
+			$login = $this->dbh->fetch_result($result, 0, "login");
+			$access_level = $this->dbh->fetch_result($result, 0, "access_level");
+			$email = $this->dbh->fetch_result($result, 0, "email");
 
 			$sel_disabled = ($id == $_SESSION["uid"]) ? "disabled" : "";
 
@@ -181,10 +181,10 @@ class Pref_Users extends Handler_Protected {
 		}
 
 		function editSave() {
-			$login = db_escape_string(trim($_REQUEST["login"]));
-			$uid = db_escape_string($_REQUEST["id"]);
+			$login = $this->dbh->escape_string(trim($_REQUEST["login"]));
+			$uid = $this->dbh->escape_string($_REQUEST["id"]);
 			$access_level = (int) $_REQUEST["access_level"];
-			$email = db_escape_string(trim($_REQUEST["email"]));
+			$email = $this->dbh->escape_string(trim($_REQUEST["email"]));
 			$password = $_REQUEST["password"];
 
 			if ($password) {
@@ -195,47 +195,47 @@ class Pref_Users extends Handler_Protected {
 				$pass_query_part = "";
 			}
 
-			db_query("UPDATE ttrss_users SET $pass_query_part login = '$login',
+			$this->dbh->query("UPDATE ttrss_users SET $pass_query_part login = '$login',
 				access_level = '$access_level', email = '$email', otp_enabled = false
 				WHERE id = '$uid'");
 
 		}
 
 		function remove() {
-			$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+			$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 
 			foreach ($ids as $id) {
 				if ($id != $_SESSION["uid"] && $id != 1) {
-					db_query("DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
-					db_query("DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
-					db_query("DELETE FROM ttrss_users WHERE id = '$id'");
+					$this->dbh->query("DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
+					$this->dbh->query("DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
+					$this->dbh->query("DELETE FROM ttrss_users WHERE id = '$id'");
 				}
 			}
 		}
 
 		function add() {
 
-			$login = db_escape_string(trim($_REQUEST["login"]));
+			$login = $this->dbh->escape_string(trim($_REQUEST["login"]));
 			$tmp_user_pwd = make_password(8);
 			$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 			$pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
 
-			$result = db_query("SELECT id FROM ttrss_users WHERE
+			$result = $this->dbh->query("SELECT id FROM ttrss_users WHERE
 				login = '$login'");
 
-			if (db_num_rows($result) == 0) {
+			if ($this->dbh->num_rows($result) == 0) {
 
-				db_query("INSERT INTO ttrss_users
+				$this->dbh->query("INSERT INTO ttrss_users
 					(login,pwd_hash,access_level,last_login,created, salt)
 					VALUES ('$login', '$pwd_hash', 0, null, NOW(), '$salt')");
 
 
-				$result = db_query("SELECT id FROM ttrss_users WHERE
+				$result = $this->dbh->query("SELECT id FROM ttrss_users WHERE
 					login = '$login' AND pwd_hash = '$pwd_hash'");
 
-				if (db_num_rows($result) == 1) {
+				if ($this->dbh->num_rows($result) == 1) {
 
-					$new_uid = db_fetch_result($result, 0, "id");
+					$new_uid = $this->dbh->fetch_result($result, 0, "id");
 
 					print format_notice(T_sprintf("Added user <b>%s</b> with password <b>%s</b>",
 						$login, $tmp_user_pwd));
@@ -304,7 +304,7 @@ class Pref_Users extends Handler_Protected {
 		}
 
 		function resetPass() {
-			$uid = db_escape_string($_REQUEST["id"]);
+			$uid = $this->dbh->escape_string($_REQUEST["id"]);
 			Pref_Users::resetUserPassword($uid, true);
 		}
 
@@ -317,7 +317,7 @@ class Pref_Users extends Handler_Protected {
 
 			print "<div id=\"pref-user-toolbar\" dojoType=\"dijit.Toolbar\">";
 
-			$user_search = db_escape_string($_REQUEST["search"]);
+			$user_search = $this->dbh->escape_string($_REQUEST["search"]);
 
 			if (array_key_exists("search", $_REQUEST)) {
 				$_SESSION["prefs_user_search"] = $user_search;
@@ -332,7 +332,7 @@ class Pref_Users extends Handler_Protected {
 					__('Search')."</button>
 				</div>";
 
-			$sort = db_escape_string($_REQUEST["sort"]);
+			$sort = $this->dbh->escape_string($_REQUEST["sort"]);
 
 			if (!$sort || $sort == "undefined") {
 				$sort = "login";
@@ -381,7 +381,7 @@ class Pref_Users extends Handler_Protected {
 				$user_search_query = "";
 			}
 
-			$result = db_query("SELECT
+			$result = $this->dbh->query("SELECT
 					id,login,access_level,email,
 					".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login,
 					".SUBSTRING_FOR_DATE."(created,1,16) as created
@@ -392,7 +392,7 @@ class Pref_Users extends Handler_Protected {
 					id > 0
 				ORDER BY $sort");
 
-			if (db_num_rows($result) > 0) {
+			if ($this->dbh->num_rows($result) > 0) {
 
 			print "<p><table width=\"100%\" cellspacing=\"0\"
 				class=\"prefUserList\" id=\"prefUserList\">";
@@ -406,7 +406,7 @@ class Pref_Users extends Handler_Protected {
 
 			$lnum = 0;
 
-			while ($line = db_fetch_assoc($result)) {
+			while ($line = $this->dbh->fetch_assoc($result)) {
 
 				$class = ($lnum % 2) ? "even" : "odd";
 
diff --git a/classes/rpc.php b/classes/rpc.php
index 3b753f118..51c195f11 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -8,18 +8,18 @@ class RPC extends Handler_Protected {
 	}
 
 	function setprofile() {
-		$id = db_escape_string($_REQUEST["id"]);
+		$id = $this->dbh->escape_string($_REQUEST["id"]);
 
 		$_SESSION["profile"] = $id;
 		$_SESSION["prefs_cache"] = array();
 	}
 
 	function remprofiles() {
-		$ids = explode(",", db_escape_string(trim($_REQUEST["ids"])));
+		$ids = explode(",", $this->dbh->escape_string(trim($_REQUEST["ids"])));
 
 		foreach ($ids as $id) {
 			if ($_SESSION["profile"] != $id) {
-				db_query("DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
+				$this->dbh->query("DELETE FROM ttrss_settings_profiles WHERE id = '$id' AND
 							owner_uid = " . $_SESSION["uid"]);
 			}
 		}
@@ -27,23 +27,23 @@ class RPC extends Handler_Protected {
 
 	// Silent
 	function addprofile() {
-		$title = db_escape_string(trim($_REQUEST["title"]));
+		$title = $this->dbh->escape_string(trim($_REQUEST["title"]));
 		if ($title) {
-			db_query("BEGIN");
+			$this->dbh->query("BEGIN");
 
-			$result = db_query("SELECT id FROM ttrss_settings_profiles
+			$result = $this->dbh->query("SELECT id FROM ttrss_settings_profiles
 				WHERE title = '$title' AND owner_uid = " . $_SESSION["uid"]);
 
-			if (db_num_rows($result) == 0) {
+			if ($this->dbh->num_rows($result) == 0) {
 
-				db_query("INSERT INTO ttrss_settings_profiles (title, owner_uid)
+				$this->dbh->query("INSERT INTO ttrss_settings_profiles (title, owner_uid)
 							VALUES ('$title', ".$_SESSION["uid"] .")");
 
-				$result = db_query("SELECT id FROM ttrss_settings_profiles WHERE
+				$result = $this->dbh->query("SELECT id FROM ttrss_settings_profiles WHERE
 					title = '$title'");
 
-				if (db_num_rows($result) != 0) {
-					$profile_id = db_fetch_result($result, 0, "id");
+				if ($this->dbh->num_rows($result) != 0) {
+					$profile_id = $this->dbh->fetch_result($result, 0, "id");
 
 					if ($profile_id) {
 						initialize_user_prefs($_SESSION["uid"], $profile_id);
@@ -51,14 +51,14 @@ class RPC extends Handler_Protected {
 				}
 			}
 
-			db_query("COMMIT");
+			$this->dbh->query("COMMIT");
 		}
 	}
 
 	// Silent
 	function saveprofile() {
-		$id = db_escape_string($_REQUEST["id"]);
-		$title = db_escape_string(trim($_REQUEST["value"]));
+		$id = $this->dbh->escape_string($_REQUEST["id"]);
+		$title = $this->dbh->escape_string(trim($_REQUEST["value"]));
 
 		if ($id == 0) {
 			print __("Default profile");
@@ -66,44 +66,44 @@ class RPC extends Handler_Protected {
 		}
 
 		if ($title) {
-			db_query("BEGIN");
+			$this->dbh->query("BEGIN");
 
-			$result = db_query("SELECT id FROM ttrss_settings_profiles
+			$result = $this->dbh->query("SELECT id FROM ttrss_settings_profiles
 				WHERE title = '$title' AND owner_uid =" . $_SESSION["uid"]);
 
-			if (db_num_rows($result) == 0) {
-				db_query("UPDATE ttrss_settings_profiles
+			if ($this->dbh->num_rows($result) == 0) {
+				$this->dbh->query("UPDATE ttrss_settings_profiles
 							SET title = '$title' WHERE id = '$id' AND
 							owner_uid = " . $_SESSION["uid"]);
 				print $title;
 			} else {
-				$result = db_query("SELECT title FROM ttrss_settings_profiles
+				$result = $this->dbh->query("SELECT title FROM ttrss_settings_profiles
 							WHERE id = '$id' AND owner_uid =" . $_SESSION["uid"]);
-				print db_fetch_result($result, 0, "title");
+				print $this->dbh->fetch_result($result, 0, "title");
 			}
 
-			db_query("COMMIT");
+			$this->dbh->query("COMMIT");
 		}
 	}
 
 	// Silent
 	function remarchive() {
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
-			$result = db_query("DELETE FROM ttrss_archived_feeds WHERE
+			$result = $this->dbh->query("DELETE FROM ttrss_archived_feeds WHERE
 		(SELECT COUNT(*) FROM ttrss_user_entries
 							WHERE orig_feed_id = '$id') = 0 AND
 		id = '$id' AND owner_uid = ".$_SESSION["uid"]);
 
-			$rc = db_affected_rows($result);
+			$rc = $this->dbh->affected_rows($result);
 		}
 	}
 
 	function addfeed() {
-		$feed = db_escape_string($_REQUEST['feed']);
-		$cat = db_escape_string($_REQUEST['cat']);
-		$login = db_escape_string($_REQUEST['login']);
+		$feed = $this->dbh->escape_string($_REQUEST['feed']);
+		$cat = $this->dbh->escape_string($_REQUEST['cat']);
+		$login = $this->dbh->escape_string($_REQUEST['login']);
 		$pass = trim($_REQUEST['pass']); // escaped later
 
 		$rc = subscribe_to_feed($feed, $cat, $login, $pass);
@@ -112,7 +112,7 @@ class RPC extends Handler_Protected {
 	}
 
 	function togglepref() {
-		$key = db_escape_string($_REQUEST["key"]);
+		$key = $this->dbh->escape_string($_REQUEST["key"]);
 		set_pref($key, !get_pref($key));
 		$value = get_pref($key);
 
@@ -131,7 +131,7 @@ class RPC extends Handler_Protected {
 
 	function mark() {
 		$mark = $_REQUEST["mark"];
-		$id = db_escape_string($_REQUEST["id"]);
+		$id = $this->dbh->escape_string($_REQUEST["id"]);
 
 		if ($mark == "1") {
 			$mark = "true";
@@ -139,7 +139,7 @@ class RPC extends Handler_Protected {
 			$mark = "false";
 		}
 
-		$result = db_query("UPDATE ttrss_user_entries SET marked = $mark,
+		$result = $this->dbh->query("UPDATE ttrss_user_entries SET marked = $mark,
 					last_marked = NOW()
 					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
@@ -147,9 +147,9 @@ class RPC extends Handler_Protected {
 	}
 
 	function delete() {
-		$ids = db_escape_string($_REQUEST["ids"]);
+		$ids = $this->dbh->escape_string($_REQUEST["ids"]);
 
-		$result = db_query("DELETE FROM ttrss_user_entries
+		$result = $this->dbh->query("DELETE FROM ttrss_user_entries
 		WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
 		purge_orphans();
@@ -161,26 +161,26 @@ class RPC extends Handler_Protected {
 		$ids = explode(",", $_REQUEST["ids"]);
 
 		foreach ($ids as $id) {
-			$id = db_escape_string(trim($id));
-			db_query("BEGIN");
+			$id = $this->dbh->escape_string(trim($id));
+			$this->dbh->query("BEGIN");
 
-			$result = db_query("SELECT feed_url,site_url,title FROM ttrss_archived_feeds
+			$result = $this->dbh->query("SELECT feed_url,site_url,title FROM ttrss_archived_feeds
 				WHERE id = (SELECT orig_feed_id FROM ttrss_user_entries WHERE ref_id = $id
 				AND owner_uid = ".$_SESSION["uid"].")");
 
-			if (db_num_rows($result) != 0) {
-				$feed_url = db_escape_string(db_fetch_result($result, 0, "feed_url"));
-				$site_url = db_escape_string(db_fetch_result($result, 0, "site_url"));
-				$title = db_escape_string(db_fetch_result($result, 0, "title"));
+			if ($this->dbh->num_rows($result) != 0) {
+				$feed_url = $this->dbh->escape_string(db_fetch_result($result, 0, "feed_url"));
+				$site_url = $this->dbh->escape_string(db_fetch_result($result, 0, "site_url"));
+				$title = $this->dbh->escape_string(db_fetch_result($result, 0, "title"));
 
-				$result = db_query("SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
+				$result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
 					AND owner_uid = " .$_SESSION["uid"]);
 
-				if (db_num_rows($result) == 0) {
+				if ($this->dbh->num_rows($result) == 0) {
 
 					if (!$title) $title = '[Unknown]';
 
-					$result = db_query(
+					$result = $this->dbh->query(
 						"INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
 							VALUES (".$_SESSION["uid"].",
@@ -189,33 +189,33 @@ class RPC extends Handler_Protected {
 							'$title',
 							NULL, '', '', 0)");
 
-					$result = db_query(
+					$result = $this->dbh->query(
 						"SELECT id FROM ttrss_feeds WHERE feed_url = '$feed_url'
 						AND owner_uid = ".$_SESSION["uid"]);
 
-					if (db_num_rows($result) != 0) {
-						$feed_id = db_fetch_result($result, 0, "id");
+					if ($this->dbh->num_rows($result) != 0) {
+						$feed_id = $this->dbh->fetch_result($result, 0, "id");
 					}
 
 				} else {
-					$feed_id = db_fetch_result($result, 0, "id");
+					$feed_id = $this->dbh->fetch_result($result, 0, "id");
 				}
 
 				if ($feed_id) {
-					$result = db_query("UPDATE ttrss_user_entries
+					$result = $this->dbh->query("UPDATE ttrss_user_entries
 						SET feed_id = '$feed_id', orig_feed_id = NULL
 						WHERE ref_id = $id AND owner_uid = " . $_SESSION["uid"]);
 				}
 			}
 
-			db_query("COMMIT");
+			$this->dbh->query("COMMIT");
 		}
 
 		print json_encode(array("message" => "UPDATE_COUNTERS"));
 	}
 
 	function archive() {
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 
 		foreach ($ids as $id) {
 			$this->archive_article($id, $_SESSION["uid"]);
@@ -225,41 +225,41 @@ class RPC extends Handler_Protected {
 	}
 
 	private function archive_article($id, $owner_uid) {
-		db_query("BEGIN");
+		$this->dbh->query("BEGIN");
 
-		$result = db_query("SELECT feed_id FROM ttrss_user_entries
+		$result = $this->dbh->query("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = '$id' AND owner_uid = $owner_uid");
 
-		if (db_num_rows($result) != 0) {
+		if ($this->dbh->num_rows($result) != 0) {
 
 			/* prepare the archived table */
 
-			$feed_id = (int) db_fetch_result($result, 0, "feed_id");
+			$feed_id = (int) $this->dbh->fetch_result($result, 0, "feed_id");
 
 			if ($feed_id) {
-				$result = db_query("SELECT id FROM ttrss_archived_feeds
+				$result = $this->dbh->query("SELECT id FROM ttrss_archived_feeds
 					WHERE id = '$feed_id'");
 
-				if (db_num_rows($result) == 0) {
-					db_query("INSERT INTO ttrss_archived_feeds
+				if ($this->dbh->num_rows($result) == 0) {
+					$this->dbh->query("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url)
 					SELECT id, owner_uid, title, feed_url, site_url from ttrss_feeds
 				  	WHERE id = '$feed_id'");
 				}
 
-				db_query("UPDATE ttrss_user_entries
+				$this->dbh->query("UPDATE ttrss_user_entries
 					SET orig_feed_id = feed_id, feed_id = NULL
 					WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 			}
 		}
 
-		db_query("COMMIT");
+		$this->dbh->query("COMMIT");
 	}
 
 	function publ() {
 		$pub = $_REQUEST["pub"];
-		$id = db_escape_string($_REQUEST["id"]);
-		$note = trim(strip_tags(db_escape_string($_REQUEST["note"])));
+		$id = $this->dbh->escape_string($_REQUEST["id"]);
+		$note = trim(strip_tags($this->dbh->escape_string($_REQUEST["note"])));
 
 		if ($pub == "1") {
 			$pub = "true";
@@ -267,7 +267,7 @@ class RPC extends Handler_Protected {
 			$pub = "false";
 		}
 
-		$result = db_query("UPDATE ttrss_user_entries SET
+		$result = $this->dbh->query("UPDATE ttrss_user_entries SET
 			published = $pub, last_published = NOW()
 			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
@@ -305,7 +305,7 @@ class RPC extends Handler_Protected {
 
 	/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
 	function catchupSelected() {
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 		$cmode = sprintf("%d", $_REQUEST["cmode"]);
 
 		catchupArticlesById($ids, $cmode);
@@ -314,7 +314,7 @@ class RPC extends Handler_Protected {
 	}
 
 	function markSelected() {
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 		$cmode = sprintf("%d", $_REQUEST["cmode"]);
 
 		$this->markArticlesById($ids, $cmode);
@@ -323,7 +323,7 @@ class RPC extends Handler_Protected {
 	}
 
 	function publishSelected() {
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 		$cmode = sprintf("%d", $_REQUEST["cmode"]);
 
 		$this->publishArticlesById($ids, $cmode);
@@ -349,40 +349,40 @@ class RPC extends Handler_Protected {
 	}
 
 	function completeLabels() {
-		$search = db_escape_string($_REQUEST["search"]);
+		$search = $this->dbh->escape_string($_REQUEST["search"]);
 
-		$result = db_query("SELECT DISTINCT caption FROM
+		$result = $this->dbh->query("SELECT DISTINCT caption FROM
 				ttrss_labels2
 				WHERE owner_uid = '".$_SESSION["uid"]."' AND
 				LOWER(caption) LIKE LOWER('$search%') ORDER BY caption
 				LIMIT 5");
 
 		print "<ul>";
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			print "<li>" . $line["caption"] . "</li>";
 		}
 		print "</ul>";
 	}
 
 	function purge() {
-		$ids = explode(",", db_escape_string($_REQUEST["ids"]));
+		$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"]));
 		$days = sprintf("%d", $_REQUEST["days"]);
 
 		foreach ($ids as $id) {
 
-			$result = db_query("SELECT id FROM ttrss_feeds WHERE
+			$result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
 				id = '$id' AND owner_uid = ".$_SESSION["uid"]);
 
-			if (db_num_rows($result) == 1) {
+			if ($this->dbh->num_rows($result) == 1) {
 				purge_feed($id, $days);
 			}
 		}
 	}
 
 	function updateFeedBrowser() {
-		$search = db_escape_string($_REQUEST["search"]);
-		$limit = db_escape_string($_REQUEST["limit"]);
-		$mode = (int) db_escape_string($_REQUEST["mode"]);
+		$search = $this->dbh->escape_string($_REQUEST["search"]);
+		$limit = $this->dbh->escape_string($_REQUEST["limit"]);
+		$mode = (int) $this->dbh->escape_string($_REQUEST["mode"]);
 
 		require_once "feedbrowser.php";
 
@@ -402,14 +402,14 @@ class RPC extends Handler_Protected {
 		if ($mode == 1) {
 			foreach ($payload as $feed) {
 
-				$title = db_escape_string($feed[0]);
-				$feed_url = db_escape_string($feed[1]);
+				$title = $this->dbh->escape_string($feed[0]);
+				$feed_url = $this->dbh->escape_string($feed[1]);
 
-				$result = db_query("SELECT id FROM ttrss_feeds WHERE
+				$result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
 					feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
-				if (db_num_rows($result) == 0) {
-					$result = db_query("INSERT INTO ttrss_feeds
+				if ($this->dbh->num_rows($result) == 0) {
+					$result = $this->dbh->query("INSERT INTO ttrss_feeds
 									(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES ('".$_SESSION["uid"]."',
 									'$feed_url', '$title', NULL, '')");
@@ -418,19 +418,19 @@ class RPC extends Handler_Protected {
 		} else if ($mode == 2) {
 			// feed archive
 			foreach ($payload as $id) {
-				$result = db_query("SELECT * FROM ttrss_archived_feeds
+				$result = $this->dbh->query("SELECT * FROM ttrss_archived_feeds
 					WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
 
-				if (db_num_rows($result) != 0) {
-					$site_url = db_escape_string(db_fetch_result($result, 0, "site_url"));
-					$feed_url = db_escape_string(db_fetch_result($result, 0, "feed_url"));
-					$title = db_escape_string(db_fetch_result($result, 0, "title"));
+				if ($this->dbh->num_rows($result) != 0) {
+					$site_url = $this->dbh->escape_string(db_fetch_result($result, 0, "site_url"));
+					$feed_url = $this->dbh->escape_string(db_fetch_result($result, 0, "feed_url"));
+					$title = $this->dbh->escape_string(db_fetch_result($result, 0, "title"));
 
-					$result = db_query("SELECT id FROM ttrss_feeds WHERE
+					$result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
 						feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
 
-					if (db_num_rows($result) == 0) {
-						$result = db_query("INSERT INTO ttrss_feeds
+					if ($this->dbh->num_rows($result) == 0) {
+						$result = $this->dbh->query("INSERT INTO ttrss_feeds
 										(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES ('$id','".$_SESSION["uid"]."',
 									'$feed_url', '$title', NULL, '$site_url')");
@@ -441,9 +441,9 @@ class RPC extends Handler_Protected {
 	}
 
 	function catchupFeed() {
-		$feed_id = db_escape_string($_REQUEST['feed_id']);
-		$is_cat = db_escape_string($_REQUEST['is_cat']) == "true";
-		$mode = db_escape_string($_REQUEST['mode']);
+		$feed_id = $this->dbh->escape_string($_REQUEST['feed_id']);
+		$is_cat = $this->dbh->escape_string($_REQUEST['is_cat']) == "true";
+		$mode = $this->dbh->escape_string($_REQUEST['mode']);
 
 		catchup_feed($feed_id, $is_cat, false, false, $mode);
 
@@ -451,15 +451,15 @@ class RPC extends Handler_Protected {
 	}
 
 	function quickAddCat() {
-		$cat = db_escape_string($_REQUEST["cat"]);
+		$cat = $this->dbh->escape_string($_REQUEST["cat"]);
 
 		add_feed_category($cat);
 
-		$result = db_query("SELECT id FROM ttrss_feed_categories WHERE
+		$result = $this->dbh->query("SELECT id FROM ttrss_feed_categories WHERE
 			title = '$cat' AND owner_uid = " . $_SESSION["uid"]);
 
-		if (db_num_rows($result) == 1) {
-			$id = db_fetch_result($result, 0, "id");
+		if ($this->dbh->num_rows($result) == 1) {
+			$id = $this->dbh->fetch_result($result, 0, "id");
 		} else {
 			$id = 0;
 		}
@@ -469,7 +469,7 @@ class RPC extends Handler_Protected {
 
 	// Silent
 	function clearArticleKeys() {
-		db_query("UPDATE ttrss_user_entries SET uuid = '' WHERE
+		$this->dbh->query("UPDATE ttrss_user_entries SET uuid = '' WHERE
 			owner_uid = " . $_SESSION["uid"]);
 
 		return;
@@ -516,7 +516,7 @@ class RPC extends Handler_Protected {
 		$random_qpart = sql_random_function();
 
 		// We search for feed needing update.
-		$result = db_query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
+		$result = $this->dbh->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -535,7 +535,7 @@ class RPC extends Handler_Protected {
 
 		$tstart = time();
 
-		while ($line = db_fetch_assoc($result)) {
+		while ($line = $this->dbh->fetch_assoc($result)) {
 			$feed_id = $line["id"];
 
 			if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
@@ -570,15 +570,15 @@ class RPC extends Handler_Protected {
 		$ids_qpart = join(" OR ", $tmp_ids);
 
 		if ($cmode == 0) {
-			db_query("UPDATE ttrss_user_entries SET
+			$this->dbh->query("UPDATE ttrss_user_entries SET
 			marked = false, last_marked = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else if ($cmode == 1) {
-			db_query("UPDATE ttrss_user_entries SET
+			$this->dbh->query("UPDATE ttrss_user_entries SET
 			marked = true, last_marked = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			db_query("UPDATE ttrss_user_entries SET
+			$this->dbh->query("UPDATE ttrss_user_entries SET
 			marked = NOT marked,last_marked = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		}
@@ -595,15 +595,15 @@ class RPC extends Handler_Protected {
 		$ids_qpart = join(" OR ", $tmp_ids);
 
 		if ($cmode == 0) {
-			db_query("UPDATE ttrss_user_entries SET
+			$this->dbh->query("UPDATE ttrss_user_entries SET
 			published = false,last_published = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else if ($cmode == 1) {
-			db_query("UPDATE ttrss_user_entries SET
+			$this->dbh->query("UPDATE ttrss_user_entries SET
 			published = true,last_published = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		} else {
-			db_query("UPDATE ttrss_user_entries SET
+			$this->dbh->query("UPDATE ttrss_user_entries SET
 			published = NOT published,last_published = NOW()
 			WHERE ($ids_qpart) AND owner_uid = " . $_SESSION["uid"]);
 		}
@@ -620,14 +620,14 @@ class RPC extends Handler_Protected {
 	}
 
 	function getlinktitlebyid() {
-		$id = db_escape_string($_REQUEST['id']);
+		$id = $this->dbh->escape_string($_REQUEST['id']);
 
-		$result = db_query("SELECT link, title FROM ttrss_entries, ttrss_user_entries
+		$result = $this->dbh->query("SELECT link, title FROM ttrss_entries, ttrss_user_entries
 			WHERE ref_id = '$id' AND ref_id = id AND owner_uid = ". $_SESSION["uid"]);
 
-		if (db_num_rows($result) != 0) {
-			$link = db_fetch_result($result, 0, "link");
-			$title = db_fetch_result($result, 0, "title");
+		if ($this->dbh->num_rows($result) != 0) {
+			$link = $this->dbh->fetch_result($result, 0, "link");
+			$title = $this->dbh->fetch_result($result, 0, "title");
 
 			echo json_encode(array("link" => $link, "title" => $title));
 		} else {
-- 
cgit v1.2.3


From e441b5837b84f8313e506a3d1b087f269f4a9fb3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 21:19:00 +0400
Subject: initial

---
 classes/db.php     | 39 ++++++++++++++++--------
 classes/db/pdo.php | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 12 deletions(-)
 create mode 100644 classes/db/pdo.php

(limited to 'classes')

diff --git a/classes/db.php b/classes/db.php
index c9d9ad5ea..86d2ab897 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -5,22 +5,37 @@ class Db implements IDb {
 	private $link;
 
 	private function __construct() {
-		switch (DB_TYPE) {
-		case "mysql":
-			if (function_exists("mysqli_connect")) {
-				$this->adapter = new Db_Mysqli();
-			} else {
-				$this->adapter = new Db_Mysql();
+
+		$er = error_reporting(E_ALL);
+
+		if (class_exists("PDO")) {
+			$this->adapter = new Db_PDO();
+		} else {
+			switch (DB_TYPE) {
+			case "mysql":
+				if (function_exists("mysqli_connect")) {
+					$this->adapter = new Db_Mysqli();
+				} else {
+					$this->adapter = new Db_Mysql();
+				}
+				break;
+			case "pgsql":
+				$this->adapter = new Db_Pgsql();
+				break;
+			default:
+				die("Unknown DB_TYPE: " . DB_TYPE);
 			}
-			break;
-		case "pgsql":
-			$this->adapter = new Db_Pgsql();
-			break;
-		default:
-			die("Unknown DB_TYPE: " . DB_TYPE);
 		}
 
+		if (!$this->adapter) die("Error initializing database adapter for " . DB_TYPE);
+
 		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : false);
+
+		if (!$this->link) {
+			die("Error connecting through adapter: " . $this->adapter->last_error());
+		}
+
+		error_reporting($er);
 	}
 
 	private function __clone() {
diff --git a/classes/db/pdo.php b/classes/db/pdo.php
new file mode 100644
index 000000000..aaac892c6
--- /dev/null
+++ b/classes/db/pdo.php
@@ -0,0 +1,87 @@
+<?php
+class Db_PDO implements IDb {
+	private $pdo;
+
+	function connect($host, $user, $pass, $db, $port) {
+		$connstr = DB_TYPE . ":host=$host;dbname=$db;charset=utf8";
+
+		try {
+			$this->pdo = new PDO($connstr, $user, $pass);
+		} catch (PDOException $e) {
+			die($e->getMessage());
+		}
+
+		return $this->pdo;
+	}
+
+	function escape_string($s, $strip_tags = true) {
+		if ($strip_tags) $s = strip_tags($s);
+
+		$qs = $this->pdo->quote($s);
+
+		return mb_substr($qs, 1, mb_strlen($qs)-2);
+	}
+
+	function query($query, $die_on_error = true) {
+		try {
+			return $this->pdo->query($query);
+		} catch (PDOException $e) {
+			user_error($e->getMessage(), $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+		}
+	}
+
+	function fetch_assoc($result) {
+		try {
+			if ($result) {
+				return $result->fetch();
+			} else {
+				return null;
+			}
+		} catch (PDOException $e) {
+			user_error($e->getMessage(), E_USER_WARNING);
+		}
+	}
+
+	function num_rows($result) {
+		try {
+			if ($result) {
+				return $result->rowCount();
+			} else {
+				return false;
+			}
+		} catch (PDOException $e) {
+			user_error($e->getMessage(), E_USER_WARNING);
+		}
+	}
+
+	function fetch_result($result, $row, $param) {
+		$line = $this->fetch_assoc($result);
+
+		if ($line)
+			return $line[$param];
+		else
+			return null;
+
+	}
+
+	function close() {
+		$this->pdo = null;
+	}
+
+	function affected_rows($result) {
+		try {
+			if ($result) {
+				return $result->rowCount();
+			} else {
+				return null;
+			}
+		} catch (PDOException $e) {
+			user_error($e->getMessage(), E_USER_WARNING);
+		}
+	}
+
+	function last_error() {
+		return join(" ", $pdo->errorInfo());
+	}
+}
+?>
-- 
cgit v1.2.3


From 512b7793917230e37e47e9a68a243053189cb846 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 21:39:47 +0400
Subject: do not try to log to sql on old schema version

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

(limited to 'classes')

diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index 4d1f12065..50e5de9a6 100644
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -5,7 +5,7 @@ class Logger_SQL {
 
 		if ($errno == E_NOTICE) return false;
 
-		if (Db::get()) {
+		if (Db::get() && get_schema_version() > 117) {
 
 			$errno = Db::get()->escape_string($errno);
 			$errstr = Db::get()->escape_string($errstr);
-- 
cgit v1.2.3


From 0630a100d5f863ab7a3b04f7be7dcce5cafbaf8a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 21:40:04 +0400
Subject: revert OO-db access in dbupdater, create DbUpdater() correctly

---
 classes/dbupdater.php      | 24 ++++++++++++------------
 classes/handler/public.php |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'classes')

diff --git a/classes/dbupdater.php b/classes/dbupdater.php
index f157342d4..a319da03d 100644
--- a/classes/dbupdater.php
+++ b/classes/dbupdater.php
@@ -2,18 +2,18 @@
 class DbUpdater {
 
 	private $dbh;
-	private $$this->dbh->type;
+	private $db_type;
 	private $need_version;
 
-	function __construct($dbh, $$this->dbh->type, $need_version) {
+	function __construct($dbh, $db_type, $need_version) {
 		$this->dbh = $dbh;
-		$this->$this->dbh->type = $db_type;
+		$this->db_type = $db_type;
 		$this->need_version = (int) $need_version;
 	}
 
 	function getSchemaVersion() {
-		$result = $this->dbh->query("SELECT schema_version FROM ttrss_version");
-		return (int) $this->dbh->fetch_result($result, 0, "schema_version");
+		$result = db_query("SELECT schema_version FROM ttrss_version");
+		return (int) db_fetch_result($result, 0, "schema_version");
 	}
 
 	function isUpdateRequired() {
@@ -21,7 +21,7 @@ class DbUpdater {
 	}
 
 	function getSchemaLines($version) {
-		$filename = "schema/versions/".$this->$this->dbh->type."/$version.sql";
+		$filename = "schema/versions/".$this->db_type."/$version.sql";
 
 		if (file_exists($filename)) {
 			return explode(";", preg_replace("/[\r\n]/", "", file_get_contents($filename)));
@@ -37,21 +37,21 @@ class DbUpdater {
 
 			if (is_array($lines)) {
 
-				$this->dbh->query("BEGIN");
+				db_query("BEGIN");
 
 				foreach ($lines as $line) {
 					if (strpos($line, "--") !== 0 && $line) {
-						$this->dbh->query($line);
+						db_query($line);
 					}
 				}
 
-				$$this->dbh->version = $this->getSchemaVersion();
+				$db_version = $this->getSchemaVersion();
 
-				if ($$this->dbh->version == $version) {
-					$this->dbh->query("COMMIT");
+				if ($db_version == $version) {
+					db_query("COMMIT");
 					return true;
 				} else {
-					$this->dbh->query("ROLLBACK");
+					db_query("ROLLBACK");
 					return false;
 				}
 			} else {
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 439cc7d4d..16d628c80 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -869,7 +869,7 @@ class Handler_Public extends Handler {
 
 			<?php
 				@$op = $_REQUEST["subop"];
-				$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
+				$updater = new DbUpdater(Db::get(), DB_TYPE, SCHEMA_VERSION);
 
 				if ($op == "performupdate") {
 					if ($updater->isUpdateRequired()) {
-- 
cgit v1.2.3


From 9ee90455b85350e9f9cd04faf36bad8742141cd9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 18 Apr 2013 08:20:45 +0400
Subject: add experimental support for PDO (_ENABLE_PDO)

---
 classes/db.php      |  2 +-
 classes/db/pdo.php  | 10 ++--------
 classes/db/stmt.php | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 classes/db/stmt.php

(limited to 'classes')

diff --git a/classes/db.php b/classes/db.php
index 86d2ab897..f31a2a9a3 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -8,7 +8,7 @@ class Db implements IDb {
 
 		$er = error_reporting(E_ALL);
 
-		if (class_exists("PDO")) {
+		if (defined('_ENABLE_PDO') && _ENABLE_PDO && class_exists("PDO")) {
 			$this->adapter = new Db_PDO();
 		} else {
 			switch (DB_TYPE) {
diff --git a/classes/db/pdo.php b/classes/db/pdo.php
index aaac892c6..3020dea88 100644
--- a/classes/db/pdo.php
+++ b/classes/db/pdo.php
@@ -24,7 +24,7 @@ class Db_PDO implements IDb {
 
 	function query($query, $die_on_error = true) {
 		try {
-			return $this->pdo->query($query);
+			return new Db_Stmt($this->pdo->query($query));
 		} catch (PDOException $e) {
 			user_error($e->getMessage(), $die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
@@ -55,13 +55,7 @@ class Db_PDO implements IDb {
 	}
 
 	function fetch_result($result, $row, $param) {
-		$line = $this->fetch_assoc($result);
-
-		if ($line)
-			return $line[$param];
-		else
-			return null;
-
+		return $result->fetch_result($row, $param);
 	}
 
 	function close() {
diff --git a/classes/db/stmt.php b/classes/db/stmt.php
new file mode 100644
index 000000000..4d3596ef1
--- /dev/null
+++ b/classes/db/stmt.php
@@ -0,0 +1,32 @@
+<?php
+class Db_Stmt {
+	private $stmt;
+	private $cache;
+
+	function __construct($stmt) {
+		$this->stmt = $stmt;
+		$this->cache = false;
+	}
+
+	function fetch_result($row, $param) {
+		if (!$this->cache) {
+			$this->cache = $this->stmt->fetchAll();
+		}
+
+		if (isset($this->cache[$row])) {
+			return $this->cache[$row][$param];
+		} else {
+			user_error("Unable to jump to row $row", E_USER_WARNING);
+			return false;
+		}
+	}
+
+	function rowCount() {
+		return $this->stmt->rowCount();
+	}
+
+	function fetch() {
+		return $this->stmt->fetch();
+	}
+}
+?>
-- 
cgit v1.2.3


From 73663db316e5f64660cd64cca2233269c63d0661 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 18 Apr 2013 08:28:03 +0400
Subject: support pgsql in pdo

---
 classes/db/pdo.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/db/pdo.php b/classes/db/pdo.php
index 3020dea88..59499139d 100644
--- a/classes/db/pdo.php
+++ b/classes/db/pdo.php
@@ -3,10 +3,14 @@ class Db_PDO implements IDb {
 	private $pdo;
 
 	function connect($host, $user, $pass, $db, $port) {
-		$connstr = DB_TYPE . ":host=$host;dbname=$db;charset=utf8";
+		$connstr = DB_TYPE . ":host=$host;dbname=$db";
+
+		if (DB_TYPE == "mysql") $connstr .= ";charset=utf8";
 
 		try {
 			$this->pdo = new PDO($connstr, $user, $pass);
+			$this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+			$this->init();
 		} catch (PDOException $e) {
 			die($e->getMessage());
 		}
@@ -77,5 +81,20 @@ class Db_PDO implements IDb {
 	function last_error() {
 		return join(" ", $pdo->errorInfo());
 	}
+
+	function init() {
+		switch (DB_TYPE) {
+		case "pgsql":
+			$this->query("set client_encoding = 'UTF-8'");
+			$this->query("set datestyle = 'ISO, european'");
+			$this->query("set TIME ZONE 0");
+		case "mysql":
+			$this->query("SET time_zone = '+0:0'");
+			return;
+		}
+
+		return true;
+	}
+
 }
 ?>
-- 
cgit v1.2.3


From 52d88392dad52ec4d5607fef7479d74dee8b8be4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 12:00:01 +0400
Subject: move db-prefs to OO

---
 classes/db/prefs.php       | 190 +++++++++++++++++++++++++++++++++++++++++++++
 classes/handler/public.php |   3 -
 classes/pref/prefs.php     |   3 -
 classes/rpc.php            |   1 -
 4 files changed, 190 insertions(+), 7 deletions(-)
 create mode 100644 classes/db/prefs.php

(limited to 'classes')

diff --git a/classes/db/prefs.php b/classes/db/prefs.php
new file mode 100644
index 000000000..26fb4666b
--- /dev/null
+++ b/classes/db/prefs.php
@@ -0,0 +1,190 @@
+<?php
+class Db_Prefs {
+	private $dbh;
+	private static $instance;
+	private $cache;
+
+	function __construct() {
+		$this->dbh = Db::get();
+		$this->cache = array();
+
+		if ($_SESSION["uid"]) $this->cache();
+	}
+
+	private function __clone() {
+		//
+	}
+
+	public static function get() {
+		if (self::$instance == null)
+			self::$instance = new self();
+
+		return self::$instance;
+	}
+
+	function cache() {
+		$profile = false;
+
+		$user_id = $_SESSION["uid"];
+		@$profile = $_SESSION["profile"];
+
+		if ($profile) {
+			$profile_qpart = "profile = '$profile' AND";
+		} else {
+			$profile_qpart = "profile IS NULL AND";
+		}
+
+		if (get_schema_version() < 63) $profile_qpart = "";
+
+		$result = db_query("SELECT
+			value,ttrss_prefs_types.type_name as type_name,ttrss_prefs.pref_name AS pref_name
+			FROM
+				ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
+			WHERE
+				$profile_qpart
+				ttrss_prefs.pref_name NOT LIKE '_MOBILE%' AND
+				ttrss_prefs_types.id = type_id AND
+				owner_uid = '$user_id' AND
+				ttrss_user_prefs.pref_name = ttrss_prefs.pref_name");
+
+		while ($line = db_fetch_assoc($result)) {
+			if ($user_id == $_SESSION["uid"]) {
+				$pref_name = $line["pref_name"];
+
+				$this->cache[$pref_name]["type"] = $line["type_name"];
+				$this->cache[$pref_name]["value"] = $line["value"];
+			}
+		}
+	}
+
+	function read($pref_name, $user_id = false, $die_on_error = false) {
+
+		$pref_name = db_escape_string($pref_name);
+		$profile = false;
+
+		if (!$user_id) {
+			$user_id = $_SESSION["uid"];
+			@$profile = $_SESSION["profile"];
+		} else {
+			$user_id = sprintf("%d", $user_id);
+		}
+
+		if (isset($this->cache[$pref_name])) {
+			$tuple = $this->cache[$pref_name];
+			return $this->convert($tuple["value"], $tuple["type"]);
+		}
+
+		if ($profile) {
+			$profile_qpart = "profile = '$profile' AND";
+		} else {
+			$profile_qpart = "profile IS NULL AND";
+		}
+
+		if (get_schema_version() < 63) $profile_qpart = "";
+
+		$result = db_query("SELECT
+			value,ttrss_prefs_types.type_name as type_name
+			FROM
+				ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
+			WHERE
+				$profile_qpart
+				ttrss_user_prefs.pref_name = '$pref_name' AND
+				ttrss_prefs_types.id = type_id AND
+				owner_uid = '$user_id' AND
+				ttrss_user_prefs.pref_name = ttrss_prefs.pref_name");
+
+		if (db_num_rows($result) > 0) {
+			$value = db_fetch_result($result, 0, "value");
+			$type_name = db_fetch_result($result, 0, "type_name");
+
+			if ($user_id == $_SESSION["uid"]) {
+				$this->cache[$pref_name]["type"] = $type_name;
+				$this->cache[$pref_name]["value"] = $value;
+			}
+
+			return $this->convert($value, $type_name);
+
+		} else {
+			user_error("Fatal error, unknown preferences key: $pref_name", $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+			return null;
+		}
+	}
+
+	function convert($value, $type_name) {
+		if ($type_name == "bool") {
+			return $value == "true";
+		} else if ($type_name == "integer") {
+			return (int)$value;
+		} else {
+			return $value;
+		}
+	}
+
+	function write($pref_name, $value, $user_id = false, $strip_tags = true) {
+		$pref_name = db_escape_string($pref_name);
+		$value = db_escape_string($value, $strip_tags);
+
+		if (!$user_id) {
+			$user_id = $_SESSION["uid"];
+			@$profile = $_SESSION["profile"];
+		} else {
+			$user_id = sprintf("%d", $user_id);
+			$prefs_cache = false;
+		}
+
+		if ($profile) {
+			$profile_qpart = "AND profile = '$profile'";
+		} else {
+			$profile_qpart = "AND profile IS NULL";
+		}
+
+		if (get_schema_version() < 63) $profile_qpart = "";
+
+		$type_name = "";
+		$current_value = "";
+
+		if (isset($this->cache[$pref_name])) {
+			$type_name = $this->cache[$pref_name]["type"];
+			$current_value = $this->cache[$pref_name]["value"];
+		}
+
+		if (!$type_name) {
+			$result = db_query("SELECT type_name
+				FROM ttrss_prefs,ttrss_prefs_types
+				WHERE pref_name = '$pref_name' AND type_id = ttrss_prefs_types.id");
+
+			if (db_num_rows($result) > 0)
+				$type_name = db_fetch_result($result, 0, "type_name");
+		} else if ($current_value == $value) {
+			return;
+		}
+
+		if ($type_name) {
+			if ($type_name == "bool") {
+				if ($value == "1" || $value == "true") {
+					$value = "true";
+				} else {
+					$value = "false";
+				}
+			} else if ($type_name == "integer") {
+				$value = sprintf("%d", $value);
+			}
+
+			if ($pref_name == 'USER_TIMEZONE' && $value == '') {
+				$value = 'UTC';
+			}
+
+			db_query("UPDATE ttrss_user_prefs SET
+				value = '$value' WHERE pref_name = '$pref_name'
+					$profile_qpart
+					AND owner_uid = " . $_SESSION["uid"]);
+
+			if ($user_id == $_SESSION["uid"]) {
+				$this->cache[$pref_name]["type"] = $type_name;
+				$this->cache[$pref_name]["value"] = $value;
+			}
+		}
+	}
+
+}
+?>
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 16d628c80..ca5952bca 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -509,8 +509,6 @@ class Handler_Public extends Handler {
 	}
 
 	function login() {
-		$_SESSION["prefs_cache"] = array();
-
 		if (!SINGLE_USER_MODE) {
 
 			$login = $this->dbh->escape_string($_POST["login"]);
@@ -541,7 +539,6 @@ class Handler_Public extends Handler {
 
 					if ($this->dbh->num_rows($result) != 0) {
 						$_SESSION["profile"] = $profile;
-						$_SESSION["prefs_cache"] = array();
 					}
 				}
 			} else {
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index b541ac875..d8b8ecc75 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -90,9 +90,6 @@ class Pref_Prefs extends Handler_Protected {
 	}
 
 	function saveconfig() {
-
-		$_SESSION["prefs_cache"] = false;
-
 		$boolean_prefs = explode(",", $_POST["boolean_prefs"]);
 
 		foreach ($boolean_prefs as $pref) {
diff --git a/classes/rpc.php b/classes/rpc.php
index 51c195f11..61c815b36 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -11,7 +11,6 @@ class RPC extends Handler_Protected {
 		$id = $this->dbh->escape_string($_REQUEST["id"]);
 
 		$_SESSION["profile"] = $id;
-		$_SESSION["prefs_cache"] = array();
 	}
 
 	function remprofiles() {
-- 
cgit v1.2.3


From 1ffe3391f902c4baa984982f19e61a0e45de21ff Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 12:27:34 +0400
Subject: make pluginhost a singleton

---
 classes/api.php            | 10 +++-------
 classes/feeds.php          | 20 +++++++-------------
 classes/handler/public.php |  3 +--
 classes/pluginhandler.php  |  4 +---
 classes/pluginhost.php     | 16 ++++++++++++++--
 classes/pref/feeds.php     | 14 ++++----------
 classes/pref/filters.php   |  3 +--
 classes/pref/labels.php    |  3 +--
 classes/pref/prefs.php     | 29 +++++++++--------------------
 classes/pref/system.php    |  3 +--
 classes/pref/users.php     |  3 +--
 11 files changed, 43 insertions(+), 65 deletions(-)

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index 945496bcf..9e99ed007 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -341,8 +341,7 @@ class API extends Handler {
 					"score" => (int)$line["score"]
 				);
 
-				global $pluginhost;
-				foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_API) as $p) {
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
 					$article = $p->hook_render_article_api(array("article" => $article));
 				}
 
@@ -466,9 +465,7 @@ class API extends Handler {
 	}
 
 	function index($method) {
-		global $pluginhost;
-
-		$plugin = $pluginhost->get_api_method(strtolower($method));
+		$plugin = PluginHost::getInstance()->get_api_method(strtolower($method));
 
 		if ($plugin && method_exists($plugin, $method)) {
 			$reply = $plugin->$method();
@@ -697,8 +694,7 @@ class API extends Handler {
 				$headline_row["author"] = $line["author"];
 				$headline_row["score"] = (int)$line["score"];
 
-				global $pluginhost;
-				foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_API) as $p) {
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
 					$headline_row = $p->hook_render_article_api(array("headline" => $headline_row));
 				}
 
diff --git a/classes/feeds.php b/classes/feeds.php
index 969c25db1..bef759d36 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -108,14 +108,12 @@ class Feeds extends Handler_Protected {
 
 		}
 
-		global $pluginhost;
-
-		if ($pluginhost->get_plugin("mail")) {
+		if (PluginHost::getInstance()->get_plugin("mail")) {
 			$reply .= "<option value=\"emailArticle(false)\">".__('Forward by email').
 				"</option>";
 		}
 
-		if ($pluginhost->get_plugin("mailto")) {
+		if (PluginHost::getInstance()->get_plugin("mailto")) {
 			$reply .= "<option value=\"mailtoArticle(false)\">".__('Forward by email').
 				"</option>";
 		}
@@ -132,7 +130,7 @@ class Feeds extends Handler_Protected {
 
 		//$reply .= "</h2";
 
-		foreach ($pluginhost->get_hooks($pluginhost::HOOK_HEADLINE_TOOLBAR_BUTTON) as $p) {
+		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINE_TOOLBAR_BUTTON) as $p) {
 			 echo $p->hook_headline_toolbar_button($feed_id, $is_cat);
 		}
 
@@ -214,9 +212,7 @@ class Feeds extends Handler_Protected {
 //		error_log("search_mode: " . $search_mode);
 
 		if (!$cat_view && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX && $feed > LABEL_BASE_INDEX) {
-			global $pluginhost;
-
-			$handler = $pluginhost->get_feed_handler(
+			$handler = PluginHost::getInstance()->get_feed_handler(
 				PluginHost::feed_to_pfeed_id($feed));
 
 		//	function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false) {
@@ -273,8 +269,6 @@ class Feeds extends Handler_Protected {
 			}
 		} */
 
-		global $pluginhost;
-
 		if ($this->dbh->num_rows($result) > 0) {
 
 			$lnum = $offset;
@@ -521,7 +515,7 @@ class Feeds extends Handler_Protected {
 					$line["content"] = sanitize($line["content_preview"],
 							sql_bool_to_bool($line['hide_images']), false, $entry_site_url);
 
-					foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_CDM) as $p) {
+					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) {
 						$line = $p->hook_render_article_cdm($line);
 					}
 
@@ -679,7 +673,7 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "<div class=\"cdmFooter\">";
 
-					foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
+					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
 						$reply['content'] .= $p->hook_article_left_button($line);
 					}
 
@@ -713,7 +707,7 @@ class Feeds extends Handler_Protected {
 //					$reply['content'] .= "$marked_pic";
 //					$reply['content'] .= "$published_pic";
 
-					foreach ($pluginhost->get_hooks($pluginhost::HOOK_ARTICLE_BUTTON) as $p) {
+					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
 						$reply['content'] .= $p->hook_article_button($line);
 					}
 
diff --git a/classes/handler/public.php b/classes/handler/public.php
index ca5952bca..79ed9d0ae 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -377,8 +377,7 @@ class Handler_Public extends Handler {
 
 		cleanup_tags(14, 50000);
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 
 	}
 
diff --git a/classes/pluginhandler.php b/classes/pluginhandler.php
index eb859ab32..690305165 100644
--- a/classes/pluginhandler.php
+++ b/classes/pluginhandler.php
@@ -5,9 +5,7 @@ class PluginHandler extends Handler_Protected {
 	}
 
 	function catchall($method) {
-		global $pluginhost;
-
-		$plugin = $pluginhost->get_plugin($_REQUEST["plugin"]);
+		$plugin = PluginHost::getInstance()->get_plugin($_REQUEST["plugin"]);
 
 		if ($plugin) {
 			if (method_exists($plugin, $method)) {
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index c10f789b5..1c490b1ef 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -10,6 +10,7 @@ class PluginHost {
 	private $api_methods = array();
 	private $owner_uid;
 	private $debug;
+	private static $instance;
 
 	const HOOK_ARTICLE_BUTTON = 1;
 	const HOOK_ARTICLE_FILTER = 2;
@@ -35,13 +36,24 @@ class PluginHost {
 	const KIND_SYSTEM = 2;
 	const KIND_USER = 3;
 
-	function __construct($dbh) {
-		$this->dbh = $dbh;
+	function __construct($ignored = false) {
+		$this->dbh = Db::get();
 		$this->storage = $_SESSION["plugin_storage"];
 
 		if (!$this->storage) $this->storage = array();
 	}
 
+	private function __clone() {
+		//
+	}
+
+	public static function getInstance() {
+		if (self::$instance == null)
+			self::$instance = new self();
+
+		return self::$instance;
+	}
+
 	private function register_plugin($name, $plugin) {
 		//array_push($this->plugins, $plugin);
 		$this->plugins[$name] = $plugin;
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 054ea4e8c..2f5a0e499 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -124,9 +124,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			/* Plugin feeds for -1 */
 
-			global $pluginhost;
-
-			$feeds = $pluginhost->get_feeds(-1);
+			$feeds = PluginHost::getInstance()->get_feeds(-1);
 
 			if ($feeds) {
 				foreach ($feeds as $feed) {
@@ -1456,8 +1454,7 @@ class Pref_Feeds extends Handler_Protected {
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
 			__('Display published OPML URL')."</button> ";
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
 			"hook_prefs_tab_section", "prefFeedsOPML");
 
 		print "</div>"; # pane
@@ -1503,15 +1500,12 @@ class Pref_Feeds extends Handler_Protected {
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"return clearArticleAccessKeys()\">".
 			__('Unshare all articles')."</button> ";
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
 			"hook_prefs_tab_section", "prefFeedsPublishedGenerated");
 
 		print "</div>"; #pane
 
-		global $pluginhost;
-
-		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
 			"hook_prefs_tab", "prefFeeds");
 
 		print "</div>"; #container
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index ec7fd0d51..4dbee5906 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -706,8 +706,7 @@ class Pref_Filters extends Handler_Protected {
 
 		print "</div>"; #pane
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
 			"hook_prefs_tab", "prefFilters");
 
 		print "</div>"; #container
diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index a928dd017..2ad152c2d 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -319,8 +319,7 @@ class Pref_Labels extends Handler_Protected {
 
 		print "</div>"; #pane
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
 			"hook_prefs_tab", "prefLabels");
 
 		print "</div>"; #container
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index d8b8ecc75..b2e7edf03 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -79,8 +79,7 @@ class Pref_Prefs extends Handler_Protected {
 			return;
 		}
 
-		global $pluginhost;
-		$authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
+		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
 		if (method_exists($authenticator, "change_password")) {
 			print $authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw);
@@ -255,10 +254,7 @@ class Pref_Prefs extends Handler_Protected {
 		print "</form>";
 
 		if ($_SESSION["auth_module"]) {
-			global $pluginhost;
-
-			$authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
-
+			$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 		} else {
 			$authenticator = false;
 		}
@@ -436,8 +432,7 @@ class Pref_Prefs extends Handler_Protected {
 			}
 		}
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
 			"hook_prefs_tab_section", "prefPrefsAuth");
 
 		print "</div>"; #pane
@@ -675,8 +670,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"boolean_prefs\" value=\"$listed_boolean_prefs\">";
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
 			"hook_prefs_tab_section", "prefPrefsPrefsInside");
 
 		print '</div>'; # inside pane
@@ -712,8 +706,7 @@ class Pref_Prefs extends Handler_Protected {
 				<label for='prefs_show_advanced'>" .
 				__("Show additional preferences") . "</label>"; */
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
 			"hook_prefs_tab_section", "prefPrefsPrefsOutside");
 
 		print "</form>";
@@ -877,8 +870,7 @@ class Pref_Prefs extends Handler_Protected {
 
 		print "</div>"; #pane
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
 			"hook_prefs_tab", "prefPrefs");
 
 		print "</div>"; #container
@@ -918,8 +910,7 @@ class Pref_Prefs extends Handler_Protected {
 		$password = $_REQUEST["password"];
 		$otp = $_REQUEST["otp"];
 
-		global $pluginhost;
-		$authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
+		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
 		if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
@@ -951,8 +942,7 @@ class Pref_Prefs extends Handler_Protected {
 	function otpdisable() {
 		$password = $this->dbh->escape_string($_REQUEST["password"]);
 
-		global $pluginhost;
-		$authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
+		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
 		if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
@@ -978,8 +968,7 @@ class Pref_Prefs extends Handler_Protected {
 	function clearplugindata() {
 		$name = $this->dbh->escape_string($_REQUEST["name"]);
 
-		global $pluginhost;
-		$pluginhost->clear_data($pluginhost->get_plugin($name));
+		PluginHost::getInstance()->clear_data(PluginHost::getInstance()->get_plugin($name));
 	}
 
 	function customizeCSS() {
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 3d82b8fff..725c337dc 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -66,8 +66,7 @@ class Pref_System extends Handler_Protected {
 
 		print "</div>";
 
-		global $pluginhost;
-		$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
 			"hook_prefs_tab", "prefSystem");
 
 		print "</div>"; #container
diff --git a/classes/pref/users.php b/classes/pref/users.php
index d483c771b..4b7d2d69a 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -453,8 +453,7 @@ class Pref_Users extends Handler_Protected {
 
 			print "</div>"; #pane
 
-			global $pluginhost;
-			$pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
 				"hook_prefs_tab", "prefUsers");
 
 			print "</div>"; #container
-- 
cgit v1.2.3


From 6421b42963611ed807bfb2000694f2cce4b42611 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 12:36:27 +0400
Subject: api/getHeadlines: increase limit to 200

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

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index 9e99ed007..c2b7f2a8e 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -185,7 +185,7 @@ class API extends Handler {
 
 			$limit = (int)$this->dbh->escape_string($_REQUEST["limit"]);
 
-			if (!$limit || $limit >= 60) $limit = 60;
+			if (!$limit || $limit >= 200) $limit = 200;
 
 			$offset = (int)$this->dbh->escape_string($_REQUEST["skip"]);
 			$filter = $this->dbh->escape_string($_REQUEST["filter"]);
-- 
cgit v1.2.3


From 8cb5c64d6251718afd0f5ccb70f5040d9c3cb47a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 18 Apr 2013 15:36:54 +0400
Subject: fix auth_base referencing dbh which was not present

---
 classes/auth/base.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'classes')

diff --git a/classes/auth/base.php b/classes/auth/base.php
index 284ac1d38..83f99d109 100644
--- a/classes/auth/base.php
+++ b/classes/auth/base.php
@@ -1,5 +1,11 @@
 <?php
 class Auth_Base {
+	private $dbh;
+
+	function __construct() {
+		$this->dbh = Db::get();
+	}
+
 	function check_password($owner_uid, $password) {
 		return false;
 	}
-- 
cgit v1.2.3


From 1daf0f75faa32aff87db5ea5750aba33ec71c272 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 18 Apr 2013 15:44:25 +0400
Subject: pass DB_PORT as string

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

(limited to 'classes')

diff --git a/classes/db.php b/classes/db.php
index f31a2a9a3..9b800dc22 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -29,7 +29,7 @@ class Db implements IDb {
 
 		if (!$this->adapter) die("Error initializing database adapter for " . DB_TYPE);
 
-		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : false);
+		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
 
 		if (!$this->link) {
 			die("Error connecting through adapter: " . $this->adapter->last_error());
-- 
cgit v1.2.3


From 3c200461f81250f7e112149bf9b55245943b42c1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 22:27:05 +0400
Subject: more notice css tweaks

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

(limited to 'classes')

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 79ed9d0ae..3b373edf5 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -929,7 +929,7 @@ class Handler_Public extends Handler {
 
 					} else {
 
-						print "<h2>" . "Tiny Tiny RSS database is up to date." . "</h2>";
+						print_notice("Tiny Tiny RSS database is up to date.");
 
 						print "<p><form method=\"GET\" action=\"index.php\">
 							<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
-- 
cgit v1.2.3


From 1f294435307ef6cbbf3f35a22af9bf92131338ed Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 18 Apr 2013 23:19:14 +0400
Subject: fix missing DB object when instantiated to import opml

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

(limited to 'classes')

diff --git a/classes/handler.php b/classes/handler.php
index d8e2a3025..b20932045 100644
--- a/classes/handler.php
+++ b/classes/handler.php
@@ -3,8 +3,8 @@ class Handler implements IHandler {
 	protected $dbh;
 	protected $args;
 
-	function __construct($dbh, $args) {
-		$this->dbh = $dbh;
+	function __construct($args) {
+		$this->dbh = Db::get();
 		$this->args = $args;
 	}
 
-- 
cgit v1.2.3


From b20b6af0dc94c2e9ec7ad25f65ee1d88547d6c5c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 19 Apr 2013 07:58:27 +0400
Subject: only pass port to mysqli_connect when it is set

---
 classes/db/mysqli.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/db/mysqli.php b/classes/db/mysqli.php
index e82f66300..550df6f15 100644
--- a/classes/db/mysqli.php
+++ b/classes/db/mysqli.php
@@ -3,7 +3,10 @@ class Db_Mysqli implements IDb {
 	private $link;
 
 	function connect($host, $user, $pass, $db, $port) {
-		$this->link = mysqli_connect($host, $user, $pass, $db, $port);
+		if ($port)
+			$this->link = mysqli_connect($host, $user, $pass, $db, $port);
+		else
+			$this->link = mysqli_connect($host, $user, $pass, $db);
 
 		if ($this->link) {
 			$this->init();
-- 
cgit v1.2.3


From 48ed517e8dd52fdb8b00739808d0820cefc42e8d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 08:40:19 +0400
Subject: pref_prefs: remove second argument from the constructor

---
 classes/pluginhost.php | 2 +-
 classes/pref/prefs.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'classes')

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 1c490b1ef..44056d262 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -36,7 +36,7 @@ class PluginHost {
 	const KIND_SYSTEM = 2;
 	const KIND_USER = 3;
 
-	function __construct($ignored = false) {
+	function __construct() {
 		$this->dbh = Db::get();
 		$this->storage = $_SESSION["plugin_storage"];
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index b2e7edf03..8bc367201 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -11,8 +11,8 @@ class Pref_Prefs extends Handler_Protected {
 		return array_search($method, $csrf_ignored) !== false;
 	}
 
-	function __construct($link, $args) {
-		parent::__construct($link, $args);
+	function __construct($args) {
+		parent::__construct($args);
 
 		$this->pref_sections = array(
 			1 => __('General'),
-- 
cgit v1.2.3


From b367c951b990b38677e67f1a1756cd4d1eaee50b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 09:45:43 +0400
Subject: make logging configurable; add logging to syslog

---
 classes/logger.php        | 39 ++++++++++++++++++++++--
 classes/logger/sql.php    |  3 --
 classes/logger/syslog.php | 31 ++++++++++++++++++++
 classes/pref/system.php   | 75 ++++++++++++++++++++++++++---------------------
 4 files changed, 109 insertions(+), 39 deletions(-)
 create mode 100644 classes/logger/syslog.php

(limited to 'classes')

diff --git a/classes/logger.php b/classes/logger.php
index 3c501eb92..4a9c1df82 100644
--- a/classes/logger.php
+++ b/classes/logger.php
@@ -1,5 +1,7 @@
 <?php
 class Logger {
+	private static $instance;
+	private $adapter;
 
 	public static $errornames = array(
 		1			=> 'E_ERROR',
@@ -20,11 +22,44 @@ class Logger {
 		32767		=> 'E_ALL');
 
 	function log_error($errno, $errstr, $file, $line, $context) {
-		return false;
+		if ($errno == E_NOTICE) return false;
+
+		if ($this->adapter)
+			return $this->adapter->log_error($errno, $errstr, $file, $line, $context);
+		else
+			return false;
 	}
 
 	function log($string) {
-		return false;
+		if ($this->adapter)
+			return $this->adapter->log($string);
+		else
+			return false;
+	}
+
+	private function __clone() {
+		//
+	}
+
+	function __construct() {
+		switch (LOG_DESTINATION) {
+		case "sql":
+			$this->adapter = new Logger_SQL();
+			break;
+		case "syslog":
+			$this->adapter = new Logger_Syslog();
+			break;
+		default:
+			$this->adapter = false;
+		}
 	}
+
+	public static function get() {
+		if (self::$instance == null)
+			self::$instance = new self();
+
+		return self::$instance;
+	}
+
 }
 ?>
diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index 50e5de9a6..c0f8b4598 100644
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -2,9 +2,6 @@
 class Logger_SQL {
 
 	function log_error($errno, $errstr, $file, $line, $context) {
-
-		if ($errno == E_NOTICE) return false;
-
 		if (Db::get() && get_schema_version() > 117) {
 
 			$errno = Db::get()->escape_string($errno);
diff --git a/classes/logger/syslog.php b/classes/logger/syslog.php
new file mode 100644
index 000000000..b8b5260a0
--- /dev/null
+++ b/classes/logger/syslog.php
@@ -0,0 +1,31 @@
+<?php
+class Logger_Syslog {
+
+	function log_error($errno, $errstr, $file, $line, $context) {
+
+		switch ($errno) {
+		case E_ERROR:
+		case E_PARSE:
+		case E_CORE_ERROR:
+		case E_COMPILE_ERROR:
+		case E_USER_ERROR:
+			$priority = LOG_ERR;
+			break;
+		case E_WARNING:
+		case E_CORE_WARNING:
+		case E_COMPILE_WARNING:
+		case E_USER_WARNING:
+			$priority = LOG_WARNING;
+			break;
+		default:
+			$priority = LOG_INFO;
+		}
+
+		$errname = Logger::$errornames[$errno] . " ($errno)";
+
+		syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
+
+	}
+
+}
+?>
diff --git a/classes/pref/system.php b/classes/pref/system.php
index 725c337dc..d2b6cd746 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -24,46 +24,53 @@ class Pref_System extends Handler_Protected {
 		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
 
-		$result = $this->dbh->query("SELECT errno, errstr, filename, lineno,
-			created_at, login FROM ttrss_error_log
-			LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
-			ORDER BY ttrss_error_log.id DESC
-			LIMIT 100");
-
-		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"updateSystemList()\">".__('Refresh')."</button> ";
-
-		print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
-
-		print "<tr class=\"title\">
-			<td width='5%'>".__("Error")."</td>
-			<td>".__("Filename")."</td>
-			<td>".__("Message")."</td>
-			<td width='5%'>".__("User")."</td>
-			<td width='5%'>".__("Date")."</td>
-			</tr>";
-
-		while ($line = $this->dbh->fetch_assoc($result)) {
-			print "<tr class=\"errrow\">";
-
-			foreach ($line as $k => $v) {
-				$line[$k] = htmlspecialchars($v);
+		if (LOG_DESTINATION == "sql") {
+
+			$result = $this->dbh->query("SELECT errno, errstr, filename, lineno,
+				created_at, login FROM ttrss_error_log
+				LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
+				ORDER BY ttrss_error_log.id DESC
+				LIMIT 100");
+
+			print "<button dojoType=\"dijit.form.Button\"
+				onclick=\"updateSystemList()\">".__('Refresh')."</button> ";
+
+			print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
+
+			print "<tr class=\"title\">
+				<td width='5%'>".__("Error")."</td>
+				<td>".__("Filename")."</td>
+				<td>".__("Message")."</td>
+				<td width='5%'>".__("User")."</td>
+				<td width='5%'>".__("Date")."</td>
+				</tr>";
+
+			while ($line = $this->dbh->fetch_assoc($result)) {
+				print "<tr class=\"errrow\">";
+
+				foreach ($line as $k => $v) {
+					$line[$k] = htmlspecialchars($v);
+				}
+
+				print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
+				print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
+				print "<td class='errstr'>" . $line["errstr"] . "</td>";
+				print "<td class='login'>" . $line["login"] . "</td>";
+
+				print "<td class='timestamp'>" .
+					make_local_datetime(
+					$line["created_at"], false) . "</td>";
+
+				print "</tr>";
 			}
 
-			print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
-			print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
-			print "<td class='errstr'>" . $line["errstr"] . "</td>";
-			print "<td class='login'>" . $line["login"] . "</td>";
+			print "</table>";
+		} else {
 
-			print "<td class='timestamp'>" .
-				make_local_datetime(
-				$line["created_at"], false) . "</td>";
+			print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging.");
 
-			print "</tr>";
 		}
 
-		print "</table>";
-
 		print "</div>";
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-- 
cgit v1.2.3


From 726bd48e8c0e42d97270367c0c49a7ef0e6609b5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 19 Apr 2013 17:20:03 +0400
Subject: better handle get_link() enabled plugins crashing on load

---
 classes/pluginhost.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'classes')

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 44056d262..d51f70214 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -10,6 +10,7 @@ class PluginHost {
 	private $api_methods = array();
 	private $owner_uid;
 	private $debug;
+	private $last_registered;
 	private static $instance;
 
 	const HOOK_ARTICLE_BUTTON = 1;
@@ -59,6 +60,17 @@ class PluginHost {
 		$this->plugins[$name] = $plugin;
 	}
 
+	function get_link() {
+		header("Content-type: text/plain");
+
+		print "One of the plugins called obsolete host method get_link(). This plugin needs to be updated or removed.\n\n";
+
+		print "List of plugins loaded: " . join(" ,", array_keys($this->plugins)) . "\n\n";
+
+		print "Last plugin initialized (possible culprit): " . $this->last_registered . "\n";
+		die;
+	}
+
 	function get_dbh() {
 		return $this->dbh;
 	}
@@ -125,6 +137,8 @@ class PluginHost {
 				if (class_exists($class) && is_subclass_of($class, "Plugin")) {
 					$plugin = new $class($this);
 
+					$this->last_registered = $class;
+
 					switch ($kind) {
 					case $this::KIND_SYSTEM:
 						if ($this->is_system($plugin)) {
-- 
cgit v1.2.3


From ddf28801e4720b9d7888b9bca5daf6be14d3720c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 19 Apr 2013 17:26:22 +0400
Subject: implement plugin API version compatibility check

---
 classes/plugin.php     | 6 ++++++
 classes/pluginhost.php | 9 +++++++++
 2 files changed, 15 insertions(+)

(limited to 'classes')

diff --git a/classes/plugin.php b/classes/plugin.php
index 60f127633..8fbacf363 100644
--- a/classes/plugin.php
+++ b/classes/plugin.php
@@ -3,6 +3,8 @@ class Plugin {
 	private $dbh;
 	private $host;
 
+	const API_VERSION_COMPAT = 1;
+
 	function init($host) {
 		$this->dbh = $host->get_dbh();
 		$this->host = $host;
@@ -20,5 +22,9 @@ class Plugin {
 	function get_prefs_js() {
 		return "";
 	}
+
+	function api_version() {
+		return Plugin::API_VERSION_COMPAT;
+	}
 }
 ?>
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index d51f70214..dc75e31fb 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -13,6 +13,8 @@ class PluginHost {
 	private $last_registered;
 	private static $instance;
 
+	const API_VERSION = 1;
+
 	const HOOK_ARTICLE_BUTTON = 1;
 	const HOOK_ARTICLE_FILTER = 2;
 	const HOOK_PREFS_TAB = 3;
@@ -137,6 +139,13 @@ class PluginHost {
 				if (class_exists($class) && is_subclass_of($class, "Plugin")) {
 					$plugin = new $class($this);
 
+					$plugin_api = $plugin->api_version();
+
+					if ($plugin_api < PluginHost::API_VERSION) {
+						user_error("Plugin $class is not compatible with current API version (need: " . PluginHost::API_VERSION . ", got: $plugin_api)", E_USER_WARNING);
+						continue;
+					}
+
 					$this->last_registered = $class;
 
 					switch ($kind) {
-- 
cgit v1.2.3


From 106a3de91c7c8c6c275323152de414253f01127a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 19 Apr 2013 17:31:56 +0400
Subject: plugins: bump API version

---
 classes/pluginhost.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'classes')

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index dc75e31fb..9ebabeb8c 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -13,7 +13,7 @@ class PluginHost {
 	private $last_registered;
 	private static $instance;
 
-	const API_VERSION = 1;
+	const API_VERSION = 2;
 
 	const HOOK_ARTICLE_BUTTON = 1;
 	const HOOK_ARTICLE_FILTER = 2;
@@ -62,15 +62,9 @@ class PluginHost {
 		$this->plugins[$name] = $plugin;
 	}
 
+	// needed for compatibility with API 1
 	function get_link() {
-		header("Content-type: text/plain");
-
-		print "One of the plugins called obsolete host method get_link(). This plugin needs to be updated or removed.\n\n";
-
-		print "List of plugins loaded: " . join(" ,", array_keys($this->plugins)) . "\n\n";
-
-		print "Last plugin initialized (possible culprit): " . $this->last_registered . "\n";
-		die;
+		return false;
 	}
 
 	function get_dbh() {
-- 
cgit v1.2.3


From f66492d357010a2e5ec11e07fd6db9825184d37d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 20 Apr 2013 10:43:21 +0400
Subject: better javascript error reporting, save error reports in tt-rss log

---
 classes/rpc.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'classes')

diff --git a/classes/rpc.php b/classes/rpc.php
index 61c815b36..750aa2cb1 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -634,5 +634,16 @@ class RPC extends Handler_Protected {
 		}
 	}
 
+	function log() {
+		$logmsg = $this->dbh->escape_string($_REQUEST['logmsg']);
+
+		if ($logmsg) {
+			Logger::get()->log_error(E_USER_WARNING,
+				$logmsg, '[client-js]', 0, false);
+		}
+
+		echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
+
+	}
 }
 ?>
-- 
cgit v1.2.3


From 6704bb2cb9b3fd9f757b745d36d82d6790311097 Mon Sep 17 00:00:00 2001
From: supahgreg <greg.parris@gmail.com>
Date: Tue, 23 Apr 2013 07:54:41 -0500
Subject: minor: remove an unnecessary quotation mark

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index bef759d36..61836d20d 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -550,7 +550,7 @@ class Feeds extends Handler_Protected {
 					$expanded_class = $expand_cdm ? "expanded" : "expandable";
 
 					$reply['content'] .= "<div class=\"cdm $expanded_class $class\"
-						id=\"RROW-$id\" $mouseover_attrs'>";
+						id=\"RROW-$id\" $mouseover_attrs>";
 
 					$reply['content'] .= "<div class=\"cdmHeader\" style=\"$row_background\">";
 					$reply['content'] .= "<div style=\"vertical-align : middle\">";
-- 
cgit v1.2.3


From e2cf81e21406f0b507446cf369f7da172ce9da14 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 14:54:59 +0400
Subject: unify houskeeping stuff, increase spawn interval

---
 classes/db.php             | 4 ++++
 classes/handler/public.php | 9 +--------
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'classes')

diff --git a/classes/db.php b/classes/db.php
index 9b800dc22..695ca6ea2 100644
--- a/classes/db.php
+++ b/classes/db.php
@@ -53,6 +53,10 @@ class Db implements IDb {
 		return("'$str'");
 	}
 
+	function reconnect() {
+		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
+	}
+
 	function connect($host, $user, $pass, $db, $port) {
 		//return $this->adapter->connect($host, $user, $pass, $db, $port);
 		return ;
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 3b373edf5..0d9b04686 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -368,14 +368,7 @@ class Handler_Public extends Handler {
 		include "rssfuncs.php";
 		// Update all feeds needing a update.
 		update_daemon_common(0, true, false);
-
-		// Update feedbrowser
-		update_feedbrowser_cache();
-
-		// Purge orphans and cleanup tags
-		purge_orphans();
-
-		cleanup_tags(14, 50000);
+		housekeeping_common(false);
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 
-- 
cgit v1.2.3


From 7d90d06de0f56e7996ed3f1496598c8c91f7b799 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 15:07:23 +0400
Subject: do not try to draw a fail-gradient (faildient?)

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 61836d20d..8a2b4bca4 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -400,7 +400,7 @@ class Feeds extends Handler_Protected {
 
 				require_once "colors.php";
 
-				if ($fav_color) {
+				if ($fav_color && $fav_color != 'FAIL') {
 					if (!isset($rgba_cache[$feed_id])) {
 						$rgba_cache[$feed_id] = join(",", _color_unpack($fav_color));
 					}
-- 
cgit v1.2.3


From db29ea0d8da54513d2f66a03976d7aba7344e98a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 15:08:37 +0400
Subject: correct faildient case

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 8a2b4bca4..dd9864103 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -400,7 +400,7 @@ class Feeds extends Handler_Protected {
 
 				require_once "colors.php";
 
-				if ($fav_color && $fav_color != 'FAIL') {
+				if ($fav_color && $fav_color != 'fail') {
 					if (!isset($rgba_cache[$feed_id])) {
 						$rgba_cache[$feed_id] = join(",", _color_unpack($fav_color));
 					}
-- 
cgit v1.2.3


From 6e3e8db9155eed1c42deaa1ad9e9dbaf6f5d3f27 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 25 Apr 2013 16:27:33 +0400
Subject: subtoolbar: add last updated when hovering over originating site link

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index dd9864103..7ea4b23e8 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -11,7 +11,7 @@ class Feeds extends Handler_Protected {
 
 	private function format_headline_subtoolbar($feed_site_url, $feed_title,
 			$feed_id, $is_cat, $search,
-			$search_mode, $view_mode, $error) {
+			$search_mode, $view_mode, $error, $feed_last_updated) {
 
 		$page_prev_link = "viewFeedGoPage(-1)";
 		$page_next_link = "viewFeedGoPage(1)";
@@ -53,8 +53,11 @@ class Feeds extends Handler_Protected {
 		$reply .= "<span id='feed_title'>";
 
 		if ($feed_site_url) {
+			$last_updated = T_sprintf("Last updated: %s",
+				$feed_last_updated);
+
 			$target = "target=\"_blank\"";
-			$reply .= "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".
+			$reply .= "<a title=\"$last_updated\" $target href=\"$feed_site_url\">".
 				truncate_string($feed_title,30)."</a>";
 
 			if ($error) {
@@ -247,13 +250,14 @@ class Feeds extends Handler_Protected {
 		$feed_title = $qfh_ret[1];
 		$feed_site_url = $qfh_ret[2];
 		$last_error = $qfh_ret[3];
+		$last_updated = make_local_datetime($qfh_ret[4]);
 
 		$vgroup_last_feed = $vgr_last_feed;
 
 		$reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,
 			$feed_title,
 			$feed, $cat_view, $search, $search_mode, $view_mode,
-			$last_error);
+			$last_error, $last_updated);
 
 		$headlines_count = $this->dbh->num_rows($result);
 
-- 
cgit v1.2.3


From 90a372f51dba8c681b4e22fc4cb5239bc1d0d4cf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 25 Apr 2013 18:02:34 +0400
Subject: fix warning when creating feed last updated timestamp

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 7ea4b23e8..d2a41266f 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -250,7 +250,7 @@ class Feeds extends Handler_Protected {
 		$feed_title = $qfh_ret[1];
 		$feed_site_url = $qfh_ret[2];
 		$last_error = $qfh_ret[3];
-		$last_updated = make_local_datetime($qfh_ret[4]);
+		$last_updated = make_local_datetime($qfh_ret[4], false);
 
 		$vgroup_last_feed = $vgr_last_feed;
 
-- 
cgit v1.2.3


From 90e5f4f1de6219029466c32777e47dd2ffb61cdc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 25 Apr 2013 18:42:48 +0400
Subject: base if-modified-since on last received article, not feed update
 timestamp

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index d2a41266f..4b77f4ac4 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -250,7 +250,8 @@ class Feeds extends Handler_Protected {
 		$feed_title = $qfh_ret[1];
 		$feed_site_url = $qfh_ret[2];
 		$last_error = $qfh_ret[3];
-		$last_updated = make_local_datetime($qfh_ret[4], false);
+		$last_updated = strpos($qfh_ret[4], '1970-') === FALSE ?
+			make_local_datetime($qfh_ret[4], false) : __("Never");
 
 		$vgroup_last_feed = $vgr_last_feed;
 
-- 
cgit v1.2.3


From 6bfc97da869ca180d2f5fee01c9ff503cb47b1bd Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 26 Apr 2013 10:31:57 +0400
Subject: add automatic timezone (based on client tz offset)

---
 classes/rpc.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'classes')

diff --git a/classes/rpc.php b/classes/rpc.php
index 750aa2cb1..62d884673 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -334,6 +334,7 @@ class RPC extends Handler_Protected {
 		$_SESSION["hasAudio"] = $_REQUEST["hasAudio"] === "true";
 		$_SESSION["hasSandbox"] = $_REQUEST["hasSandbox"] === "true";
 		$_SESSION["hasMp3"] = $_REQUEST["hasMp3"] === "true";
+		$_SESSION["clientTzOffset"] = $_REQUEST["clientTzOffset"];
 
 		$reply = array();
 
-- 
cgit v1.2.3


From 057177eb2c38f62e384752ad06a9d59707dd3647 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 26 Apr 2013 14:21:08 +0400
Subject: add HOOK_PREFS_EDIT_FEED

---
 classes/pluginhost.php | 1 +
 classes/pref/feeds.php | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'classes')

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 9ebabeb8c..c70d23274 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -34,6 +34,7 @@ class PluginHost {
 	const HOOK_HEADLINE_TOOLBAR_BUTTON = 17;
 	const HOOK_HOTKEY_INFO = 18;
 	const HOOK_ARTICLE_LEFT_BUTTON = 19;
+	const HOOK_PREFS_EDIT_FEED = 20;
 
 	const KIND_ALL = 1;
 	const KIND_SYSTEM = 2;
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 2f5a0e499..6fd2ae42d 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -748,6 +748,9 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "</div>";
 
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED,
+			"hook_prefs_edit_feed", $feed_id);
+
 		$title = htmlspecialchars($title, ENT_QUOTES);
 
 		print "<div class='dlgButtons'>
-- 
cgit v1.2.3


From 8cefe38a0a1623db866cb9bf295fe8a591ad5488 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 26 Apr 2013 14:23:18 +0400
Subject: add HOOK_PREFS_SAVE_FEED

---
 classes/pluginhost.php | 1 +
 classes/pref/feeds.php | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'classes')

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index c70d23274..302fdbaeb 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -35,6 +35,7 @@ class PluginHost {
 	const HOOK_HOTKEY_INFO = 18;
 	const HOOK_ARTICLE_LEFT_BUTTON = 19;
 	const HOOK_PREFS_EDIT_FEED = 20;
+	const HOOK_PREFS_SAVE_FEED = 21;
 
 	const KIND_ALL = 1;
 	const KIND_SYSTEM = 2;
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 6fd2ae42d..ddfa56d01 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1002,6 +1002,9 @@ class Pref_Feeds extends Handler_Protected {
 				mark_unread_on_update = $mark_unread_on_update
 			WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
 
+			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED,
+				"hook_prefs_save_feed", $feed_id);
+
 		} else {
 			$feed_data = array();
 
-- 
cgit v1.2.3


From 2c8eed5395caf0d44acd3520a42832d94655b7bc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 27 Apr 2013 12:25:40 +0400
Subject: api: add feed_title to getArticle

---
 classes/api.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index c2b7f2a8e..2e243d025 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -309,7 +309,7 @@ class API extends Handler {
 		$query = "SELECT id,title,link,content,cached_content,feed_id,comments,int_id,
 			marked,unread,published,score,
 			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
-			author
+			author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title
 			FROM ttrss_entries,ttrss_user_entries
 			WHERE	id IN ($article_id) AND ref_id = id AND owner_uid = " .
 				$_SESSION["uid"] ;
@@ -338,7 +338,8 @@ class API extends Handler {
 					"content" => $line["cached_content"] != "" ? $line["cached_content"] : $line["content"],
 					"feed_id" => $line["feed_id"],
 					"attachments" => $attachments,
-					"score" => (int)$line["score"]
+					"score" => (int)$line["score"],
+					"feed_title" => $line["feed_title"]
 				);
 
 				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
-- 
cgit v1.2.3


From 38a8c22b9e24609c9067ba20a8693c363e1c7a6e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 27 Apr 2013 12:29:42 +0400
Subject: getHeadlines: return feed title for non-virtual feeds

---
 classes/api.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index 2e243d025..badd0b564 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -685,7 +685,8 @@ class API extends Handler {
 
 				$headline_row["labels"] = $labels;
 
-				$headline_row["feed_title"] = $line["feed_title"];
+				$headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] :
+					$feed_title;
 
 				$headline_row["comments_count"] = (int)$line["num_comments"];
 				$headline_row["comments_link"] = $line["comments"];
-- 
cgit v1.2.3


From 5e1f7be5f1b704f85114740372fa6e6aa4273446 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 27 Apr 2013 18:01:36 +0400
Subject: enlarge headline excerpt length

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 4b77f4ac4..567d13b25 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -362,7 +362,7 @@ class Feeds extends Handler_Protected {
 
 				if (get_pref('SHOW_CONTENT_PREVIEW')) {
 					$content_preview = truncate_string(strip_tags($line["content_preview"]),
-						100);
+						250);
 				}
 
 				$score = $line["score"];
-- 
cgit v1.2.3


From d48398e647e8d4425629c4a5ecb1193c15732924 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 28 Apr 2013 18:17:58 +0400
Subject: pluginhost: remove session cache for storage

---
 classes/pluginhost.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'classes')

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 302fdbaeb..8e2aefcf1 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -43,9 +43,8 @@ class PluginHost {
 
 	function __construct() {
 		$this->dbh = Db::get();
-		$this->storage = $_SESSION["plugin_storage"];
 
-		if (!$this->storage) $this->storage = array();
+		$this->storage = array();
 	}
 
 	private function __clone() {
@@ -252,7 +251,7 @@ class PluginHost {
 	}
 
 	function load_data($force = false) {
-		if ($this->owner_uid && (!$_SESSION["plugin_storage"] || $force))  {
+		if ($this->owner_uid)  {
 			$plugin = $this->dbh->escape_string($plugin);
 
 			$result = $this->dbh->query("SELECT name, content FROM ttrss_plugin_storage
@@ -261,8 +260,6 @@ class PluginHost {
 			while ($line = $this->dbh->fetch_assoc($result)) {
 				$this->storage[$line["name"]] = unserialize($line["content"]);
 			}
-
-			$_SESSION["plugin_storage"] = $this->storage;
 		}
 	}
 
@@ -302,8 +299,6 @@ class PluginHost {
 
 		$this->storage[$idx][$name] = $value;
 
-		$_SESSION["plugin_storage"] = $this->storage;
-
 		if ($sync) $this->save_data(get_class($sender));
 	}
 
@@ -331,8 +326,6 @@ class PluginHost {
 
 			$this->dbh->query("DELETE FROM ttrss_plugin_storage WHERE name = '$idx'
 				AND owner_uid = " . $this->owner_uid);
-
-			$_SESSION["plugin_storage"] = $this->storage;
 		}
 	}
 
-- 
cgit v1.2.3


From a845a3d5e5538fc63312b7f4e2e1475e568ab30b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 29 Apr 2013 09:20:30 +0400
Subject: otp: display notice if GD is missing

---
 classes/pref/prefs.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 8bc367201..47f47ae68 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -368,7 +368,7 @@ class Pref_Prefs extends Handler_Protected {
 
 				print "</form>";
 
-				} else {
+				} else if (function_exists("imagecreatefromstring")) {
 
 					print "<p>".__("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.") . "</p>";
 
@@ -427,6 +427,10 @@ class Pref_Prefs extends Handler_Protected {
 
 					print "</form>";
 
+				} else {
+
+					print_notice(__("PHP GD functions are required for OTP support."));
+
 				}
 
 			}
-- 
cgit v1.2.3


From e57a1507aeb349c9ba7d673048c5ccb43e2d639b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 29 Apr 2013 13:03:28 +0400
Subject: do not use session cookie lifetime for additional cookies

---
 classes/pref/prefs.php | 2 +-
 classes/rpc.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 47f47ae68..35065ea7b 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -114,7 +114,7 @@ class Pref_Prefs extends Handler_Protected {
 			if ($pref_name == "language") {
 				if ($_SESSION["language"] != $value) {
 					setcookie("ttrss_lang", $value,
-						time() + SESSION_COOKIE_LIFETIME);
+						time() + COOKIE_LIFETIME_LONG);
 					$_SESSION["language"] = $value;
 
 					$need_reload = true;
diff --git a/classes/rpc.php b/classes/rpc.php
index 62d884673..2b07bbf91 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -479,7 +479,7 @@ class RPC extends Handler_Protected {
 		$wide = (int) $_REQUEST["wide"];
 
 		setcookie("ttrss_widescreen", $wide,
-			time() + SESSION_COOKIE_LIFETIME);
+			time() + COOKIE_LIFETIME_LONG);
 
 		print json_encode(array("wide" => $wide));
 	}
-- 
cgit v1.2.3


From 7b149552cb99a44f1fbeef642ffc60e91b1f61a0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 29 Apr 2013 15:54:23 +0400
Subject: remove language selector from the login form, store language in the
 database per-user

---
 classes/handler/public.php | 10 +---------
 classes/pref/prefs.php     | 32 ++++++++------------------------
 2 files changed, 9 insertions(+), 33 deletions(-)

(limited to 'classes')

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 0d9b04686..2b5169ca7 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -478,14 +478,6 @@ class Handler_Public extends Handler {
 				<tr><td align="right"><?php echo __("Password:") ?></td>
 				<td align="right"><input type="password" name="password"
 				value="<?php echo $_SESSION["fake_password"] ?>"></td></tr>
-			<tr><td align="right"><?php echo __("Language:") ?></td>
-			<td align="right">
-			<?php
-				print_select_hash("language", $_COOKIE["ttrss_lang"], get_translations(),
-					"style='width : 100%''");
-
-			?>
-			</td></tr>
 			<tr><td colspan='2'>
 				<button type="submit">
 					<?php echo __('Log in') ?></button>
@@ -518,7 +510,7 @@ class Handler_Public extends Handler {
 			if (authenticate_user($login, $password)) {
 				$_POST["password"] = "";
 
-				$_SESSION["language"] = $_POST["language"];
+				$_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"], false);
 				$_SESSION["ref_schema_version"] = get_schema_version(true);
 				$_SESSION["bw_limit"] = !!$_POST["bw_limit"];
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 35065ea7b..157abb8bc 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -54,6 +54,7 @@ class Pref_Prefs extends Handler_Protected {
 			"USER_STYLESHEET" => array(__("Customize stylesheet"), __("Customize CSS stylesheet to your liking")),
 			"USER_TIMEZONE" => array(__("User timezone"), ""),
 			"VFEED_GROUP_BY_FEED" => array(__("Group headlines in virtual feeds"), __("Special feeds, labels, and categories are grouped by originating feeds")),
+			"USER_LANGUAGE" => array(__("Language")),
 			"USER_CSS_THEME" => array(__("Select theme"), __("Select one of the available CSS themes"))
 		);
 	}
@@ -111,18 +112,13 @@ class Pref_Prefs extends Handler_Protected {
 				}
 			}
 
-			if ($pref_name == "language") {
+			if ($pref_name == "USER_LANGUAGE") {
 				if ($_SESSION["language"] != $value) {
-					setcookie("ttrss_lang", $value,
-						time() + COOKIE_LIFETIME_LONG);
-					$_SESSION["language"] = $value;
-
 					$need_reload = true;
 				}
-			} else {
-				set_pref($pref_name, $value);
 			}
 
+			set_pref($pref_name, $value);
 		}
 
 		if ($need_reload) {
@@ -543,22 +539,6 @@ class Pref_Prefs extends Handler_Protected {
 				print "<tr><td colspan=\"3\"><h3>".$section_name."</h3></td></tr>";
 
 				$lnum = 0;
-
-				if ($active_section == 2) {
-					print "<tr>";
-
-					print "<td width=\"40%\" class=\"prefName\">";
-					print "<label>";
-					print __("Language:");
-					print "</label>";
-
-					print "<td>";
-					print_select_hash("language", $_COOKIE["ttrss_lang"], get_translations(),
-						"style='width : 220px; margin : 0px' dojoType='dijit.form.Select'");
-					print "</td>";
-					print "</tr>";
-				}
-
 			}
 
 			print "<tr>";
@@ -574,7 +554,11 @@ class Pref_Prefs extends Handler_Protected {
 
 			print "<td class=\"prefValue\">";
 
-			if ($pref_name == "USER_TIMEZONE") {
+			if ($pref_name == "USER_LANGUAGE") {
+				print_select_hash($pref_name, $value, get_translations(),
+					"style='width : 220px; margin : 0px' dojoType='dijit.form.Select'");
+
+			} else if ($pref_name == "USER_TIMEZONE") {
 
 				$timezones = explode("\n", file_get_contents("lib/timezones.txt"));
 
-- 
cgit v1.2.3


From bd02d29e1b0c80f399cd51f6c439bc0ce92368ac Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 29 Apr 2013 15:58:15 +0400
Subject: prefs: update some descriptions to be more consistent

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

(limited to 'classes')

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 157abb8bc..45715488a 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -52,10 +52,10 @@ class Pref_Prefs extends Handler_Protected {
 			"STRIP_IMAGES" => array(__("Do not embed images in articles"), ""),
 			"STRIP_UNSAFE_TAGS" => array(__("Strip unsafe tags from articles"), __("Strip all but most common HTML tags when reading articles.")),
 			"USER_STYLESHEET" => array(__("Customize stylesheet"), __("Customize CSS stylesheet to your liking")),
-			"USER_TIMEZONE" => array(__("User timezone"), ""),
+			"USER_TIMEZONE" => array(__("Time zone"), ""),
 			"VFEED_GROUP_BY_FEED" => array(__("Group headlines in virtual feeds"), __("Special feeds, labels, and categories are grouped by originating feeds")),
 			"USER_LANGUAGE" => array(__("Language")),
-			"USER_CSS_THEME" => array(__("Select theme"), __("Select one of the available CSS themes"))
+			"USER_CSS_THEME" => array(__("Theme"), __("Select one of the available CSS themes"))
 		);
 	}
 
-- 
cgit v1.2.3


From 258068b3793ff8b75cc1642d8fd77920ecb47a9c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 29 Apr 2013 16:08:40 +0400
Subject: do not calculate favicon color on manual icon replace

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

(limited to 'classes')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index ddfa56d01..e31725111 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -500,14 +500,8 @@ class Pref_Feeds extends Handler_Protected {
 				if ($this->dbh->num_rows($result) != 0) {
 					@unlink(ICONS_DIR . "/$feed_id.ico");
 					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
-
-						require_once "colors.php";
-
-						$favicon_color = $this->dbh->escape_string(
-							calculate_avg_color(ICONS_DIR . "/$feed_id.ico"));
-
 						$this->dbh->query("UPDATE ttrss_feeds SET
-							favicon_avg_color = '$favicon_color'
+							favicon_avg_color = ''
 							WHERE id = '$feed_id'");
 
 						$rc = 0;
-- 
cgit v1.2.3


From 52e7b5a096f5d0d7724b6f1731559b237b2c47ae Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 29 Apr 2013 23:12:54 +0400
Subject: add clear sql log button

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

(limited to 'classes')

diff --git a/classes/pref/system.php b/classes/pref/system.php
index d2b6cd746..7accb1f91 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -19,6 +19,10 @@ class Pref_System extends Handler_Protected {
 		return array_search($method, $csrf_ignored) !== false;
 	}
 
+	function clearLog() {
+		$this->dbh->query("DELETE FROM ttrss_error_log");
+	}
+
 	function index() {
 
 		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
@@ -35,6 +39,9 @@ class Pref_System extends Handler_Protected {
 			print "<button dojoType=\"dijit.form.Button\"
 				onclick=\"updateSystemList()\">".__('Refresh')."</button> ";
 
+			print "&nbsp;<button dojoType=\"dijit.form.Button\"
+				onclick=\"clearSqlLog()\">".__('Clear log')."</button> ";
+
 			print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
 
 			print "<tr class=\"title\">
-- 
cgit v1.2.3


From b18d109f22975e9313b7064d86417e213804ee80 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 30 Apr 2013 09:34:24 +0400
Subject: only get USER_LANGUAGE on schema 120 and up

---
 classes/handler/public.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 2b5169ca7..d5933a18c 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -510,7 +510,10 @@ class Handler_Public extends Handler {
 			if (authenticate_user($login, $password)) {
 				$_POST["password"] = "";
 
-				$_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"], false);
+				if (get_schema_version() >= 120) {
+					$_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
+				}
+
 				$_SESSION["ref_schema_version"] = get_schema_version(true);
 				$_SESSION["bw_limit"] = !!$_POST["bw_limit"];
 
-- 
cgit v1.2.3


From 27372ddac6b17ab2700ec2f9bc6bc1ac0ea153fe Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 30 Apr 2013 20:07:08 +0400
Subject: fix editArticleTags() call broken on archived feed

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 567d13b25..f21bb3ce5 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -687,7 +687,7 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "<img src='images/tag.png' alt='Tags' title='Tags'>
 						<span id=\"ATSTR-$id\">$tags_str</span>
 						<a title=\"".__('Edit tags for this article')."\"
-						href=\"#\" onclick=\"editArticleTags($id, $feed_id, true)\">(+)</a>";
+						href=\"#\" onclick=\"editArticleTags($id)\">(+)</a>";
 
 					$num_comments = $line["num_comments"];
 					$entry_comments = "";
-- 
cgit v1.2.3


From cd07592c29391ca374f78a75a10465f894d50042 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 1 May 2013 17:04:57 +0400
Subject: add basic tinyparser/atom

---
 classes/feedenclosure.php |   7 +++
 classes/feeditem.php      |  15 ++++++
 classes/feeditem/atom.php | 118 ++++++++++++++++++++++++++++++++++++++++++++++
 classes/feedparser.php    | 101 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 241 insertions(+)
 create mode 100644 classes/feedenclosure.php
 create mode 100644 classes/feeditem.php
 create mode 100644 classes/feeditem/atom.php
 create mode 100644 classes/feedparser.php

(limited to 'classes')

diff --git a/classes/feedenclosure.php b/classes/feedenclosure.php
new file mode 100644
index 000000000..d610dd7c8
--- /dev/null
+++ b/classes/feedenclosure.php
@@ -0,0 +1,7 @@
+<?php
+class FeedEnclosure {
+	public $link;
+	public $type;
+	public $length;
+}
+?>
diff --git a/classes/feeditem.php b/classes/feeditem.php
new file mode 100644
index 000000000..cc39fcee7
--- /dev/null
+++ b/classes/feeditem.php
@@ -0,0 +1,15 @@
+<?php
+class FeedItem {
+	abstract function get_id();
+	abstract function get_date();
+	abstract function get_link();
+	abstract function get_title();
+	abstract function get_description();
+	abstract function get_content();
+	abstract function get_comments_url();
+	abstract function get_comments_count();
+	abstract function get_categories();
+	abstract function get_enclosures();
+	abstract function get_author();
+}
+?>
diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
new file mode 100644
index 000000000..560484eda
--- /dev/null
+++ b/classes/feeditem/atom.php
@@ -0,0 +1,118 @@
+<?php
+class FeedItem_Atom {
+	private $elem;
+
+	function __construct($elem) {
+		$this->elem = $elem;
+	}
+
+	function get_id() {
+		$id = $this->elem->getElementsByTagName("id")->item(0);
+
+		if ($id) {
+			return $id->nodeValue;
+		} else {
+			return $this->get_link();
+		}
+	}
+
+	function get_date() {
+
+
+	}
+
+	function get_link() {
+		$links = $this->elem->getElementsByTagName("link");
+
+		foreach ($links as $link) {
+			if ($link && $link->hasAttribute("href") && !$link->hasAttribute("rel")) {
+				return $link->getAttribute("href");
+			}
+		}
+	}
+
+	function get_title() {
+		$title = $this->elem->getElementsByTagName("title")->item(0);
+
+		if ($title) {
+			return $title->nodeValue;
+		}
+	}
+
+	function get_content() {
+		$content = $this->elem->getElementsByTagName("content")->item(0);
+
+		if ($content) {
+			return $content->nodeValue;
+		}
+	}
+
+	function get_description() {
+		$summary = $this->elem->getElementsByTagName("summary")->item(0);
+
+		if ($summary) {
+			return $summary->nodeValue;
+		}
+	}
+
+	// todo
+	function get_comments_url() {
+
+	}
+
+	// todo
+	function get_comments_count() {
+
+	}
+
+	function get_categories() {
+		$categories = $this->elem->getElementsByTagName("category");
+		$cats = array();
+
+		foreach ($categories as $cat) {
+			if ($cat->hasAttribute("term"))
+				array_push($cats, $cat->getAttribute("term"));
+		}
+
+
+		return $cats;
+	}
+
+	function get_enclosures() {
+		$links = $this->elem->getElementsByTagName("link");
+
+		$encs = array();
+
+		foreach ($links as $link) {
+			if ($link && $link->hasAttribute("href") && $link->hasAttribute("rel")) {
+				if ($link->getAttribute("rel") == "enclosure") {
+					$enc = new FeedEnclosure();
+
+					$enc->type = $link->getAttribute("type");
+					$enc->link = $link->getAttribute("href");
+					$enc->length = $link->getAttribute("length");
+
+					array_push($encs, $enc);
+				}
+			}
+		}
+
+		return $encs;
+	}
+
+	function get_author() {
+		$author = $this->elem->getElementsByTagName("author")->item(0);
+
+		if ($author) {
+			$name = $author->getElementsByTagName("name")->item(0);
+
+			if ($name) return $name->nodeValue;
+
+			$email = $author->getElementsByTagName("email")->item(0);
+
+			if ($email) return $email->nodeValue;
+
+		}
+	}
+}
+?>
diff --git a/classes/feedparser.php b/classes/feedparser.php
new file mode 100644
index 000000000..274e871b9
--- /dev/null
+++ b/classes/feedparser.php
@@ -0,0 +1,101 @@
+<?php
+class FeedParser {
+	private $doc;
+	private $error;
+	private $items;
+	private $link;
+	private $title;
+	private $type;
+
+	const FEED_RDF = 0;
+	const FEED_RSS = 1;
+	const FEED_ATOM = 2;
+
+	function __construct($data) {
+		libxml_use_internal_errors(true);
+		libxml_clear_errors();
+		$this->doc = new DOMDocument();
+		$this->doc->loadXML($data);
+		$this->error = $this->format_error(libxml_get_last_error());
+		libxml_clear_errors();
+
+		$this->items = array();
+	}
+
+	function init() {
+		$root = $this->doc->firstChild;
+
+		if ($root) {
+			switch ($root->tagName) {
+			case "rss":
+				$this->type = $this::FEED_RSS;
+				break;
+			case "feed":
+				$this->type = $this::FEED_ATOM;
+				break;
+			default:
+				$this->error = "Unknown/unsupported feed type";
+				return;
+			}
+
+			$xpath = new DOMXPath($this->doc);
+
+			switch ($this->type) {
+			case $this::FEED_ATOM:
+				$xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+
+				$title = $xpath->query("//atom:feed/atom:title")->item(0);
+
+				if ($title) {
+					$this->title = $title->nodeValue;
+				}
+
+				$link = $xpath->query("//atom:feed/atom:link[not(@rel)]")->item(0);
+
+				if ($link && $link->hasAttributes()) {
+					$this->link = $link->getAttribute("href");
+				}
+
+				$articles = $xpath->query("//atom:entry");
+
+				foreach ($articles as $article) {
+					array_push($this->items, new FeedItem_Atom($article));
+				}
+
+				break;
+			case $this::FEED_RDF:
+
+				break;
+			case $this::FEED_RSS:
+				break;
+			}
+		}
+	}
+
+	function format_error($error) {
+		if ($error) {
+			return sprintf("LibXML error %s at line %d (column %d): %s",
+				$error->code, $error->line, $error->column,
+				$error->message);
+		} else {
+			return "";
+		}
+	}
+
+	function error() {
+		return $this->error;
+	}
+
+	function get_link() {
+		return $this->link;
+	}
+
+	function get_title() {
+		return $this->title;
+	}
+
+	function get_items() {
+		return $this->items;
+	}
+
+} ?>
-- 
cgit v1.2.3


From 04d2f9c831b14f7295a3475746b9096402a055f0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 1 May 2013 17:38:16 +0400
Subject: add basic rss support

---
 classes/feeditem/atom.php |   5 ++-
 classes/feeditem/rss.php  | 107 ++++++++++++++++++++++++++++++++++++++++++++++
 classes/feedparser.php    |  28 ++++++++++--
 3 files changed, 135 insertions(+), 5 deletions(-)
 create mode 100644 classes/feeditem/rss.php

(limited to 'classes')

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 560484eda..0d888c443 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -17,8 +17,11 @@ class FeedItem_Atom {
 	}
 
 	function get_date() {
+		$updated = $this->elem->getElementsByTagName("updated")->item(0);
 
-
+		if ($updated) {
+			return strtotime($updated->nodeValue);
+		}
 	}
 
 	function get_link() {
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
new file mode 100644
index 000000000..e7ea1df57
--- /dev/null
+++ b/classes/feeditem/rss.php
@@ -0,0 +1,107 @@
+<?php
+class FeedItem_RSS {
+	private $elem;
+
+	function __construct($elem) {
+		$this->elem = $elem;
+	}
+
+	function get_id() {
+		return $this->get_link();
+	}
+
+	function get_date() {
+		$pubDate = $this->elem->getElementsByTagName("pubDate")->item(0);
+
+		if ($pubDate) {
+			return strtotime($pubDate->nodeValue);
+		}
+	}
+
+	function get_link() {
+		$link = $this->elem->getElementsByTagName("link")->item(0);
+
+		if ($link) {
+			return $link->nodeValue;
+		}
+	}
+
+	function get_title() {
+		$title = $this->elem->getElementsByTagName("title")->item(0);
+
+		if ($title) {
+			return $title->nodeValue;
+		}
+	}
+
+	function get_content() {
+		$content = $this->elem->getElementsByTagName("description")->item(0);
+
+		if ($content) {
+			return $content->nodeValue;
+		}
+	}
+
+	function get_description() {
+		$summary = $this->elem->getElementsByTagName("description")->item(0);
+
+		if ($summary) {
+			return $summary->nodeValue;
+		}
+	}
+
+	// todo
+	function get_comments_url() {
+
+	}
+
+	// todo
+	function get_comments_count() {
+
+	}
+
+	function get_categories() {
+		$categories = $this->elem->getElementsByTagName("category");
+		$cats = array();
+
+		foreach ($categories as $cat) {
+			array_push($cats, $cat->nodeValue);
+		}
+
+		return $cats;
+	}
+
+	function get_enclosures() {
+		$enclosures = $this->elem->getElementsByTagName("enclosure");
+
+		$encs = array();
+
+		foreach ($enclosures as $enclosure) {
+			$enc = new FeedEnclosure();
+
+			$enc->type = $enclosure->getAttribute("type");
+			$enc->link = $enclosure->getAttribute("url");
+			$enc->length = $enclosure->getAttribute("length");
+
+			array_push($encs, $enc);
+		}
+
+		return $encs;
+	}
+
+	function get_author() {
+		$author = $this->elem->getElementsByTagName("author")->item(0);
+
+		if ($author) {
+			$name = $author->getElementsByTagName("name")->item(0);
+
+			if ($name) return $name->nodeValue;
+
+			$email = $author->getElementsByTagName("email")->item(0);
+
+			if ($email) return $email->nodeValue;
+
+		}
+	}
+}
+?>
diff --git a/classes/feedparser.php b/classes/feedparser.php
index 274e871b9..fb6344cc0 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -24,10 +24,14 @@ class FeedParser {
 
 	function init() {
 		$root = $this->doc->firstChild;
+		$xpath = new DOMXPath($this->doc);
+		$xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+
+		$root = $xpath->query("(//atom:feed|//channel)")->item(0);
 
 		if ($root) {
 			switch ($root->tagName) {
-			case "rss":
+			case "channel":
 				$this->type = $this::FEED_RSS;
 				break;
 			case "feed":
@@ -38,11 +42,8 @@ class FeedParser {
 				return;
 			}
 
-			$xpath = new DOMXPath($this->doc);
-
 			switch ($this->type) {
 			case $this::FEED_ATOM:
-				$xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
 
 				$title = $xpath->query("//atom:feed/atom:title")->item(0);
 
@@ -67,6 +68,25 @@ class FeedParser {
 
 				break;
 			case $this::FEED_RSS:
+
+				$title = $xpath->query("//channel/title")->item(0);
+
+				if ($title) {
+					$this->title = $title->nodeValue;
+				}
+
+				$link = $xpath->query("//channel/link")->item(0);
+
+				if ($link && $link->hasAttributes()) {
+					$this->link = $link->getAttribute("href");
+				}
+
+				$articles = $xpath->query("//channel/item");
+
+				foreach ($articles as $article) {
+					array_push($this->items, new FeedItem_RSS($article));
+				}
+
 				break;
 			}
 		}
-- 
cgit v1.2.3


From b8f316dc288d759938aaae1e49d4bd2093dc99a2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 1 May 2013 17:56:21 +0400
Subject: change caching to save xml data, remove RDF init section

---
 classes/feedparser.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'classes')

diff --git a/classes/feedparser.php b/classes/feedparser.php
index fb6344cc0..ed284a043 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -63,9 +63,6 @@ class FeedParser {
 					array_push($this->items, new FeedItem_Atom($article));
 				}
 
-				break;
-			case $this::FEED_RDF:
-
 				break;
 			case $this::FEED_RSS:
 
-- 
cgit v1.2.3


From b9eee80e08fab8ebcc1484e8d62cd646ac451f43 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 19:08:04 +0400
Subject: parser: add get_links()

---
 classes/feedparser.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'classes')

diff --git a/classes/feedparser.php b/classes/feedparser.php
index ed284a043..6d3a15802 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -6,6 +6,7 @@ class FeedParser {
 	private $link;
 	private $title;
 	private $type;
+	private $xpath;
 
 	const FEED_RDF = 0;
 	const FEED_RSS = 1;
@@ -26,6 +27,7 @@ class FeedParser {
 		$root = $this->doc->firstChild;
 		$xpath = new DOMXPath($this->doc);
 		$xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+		$this->xpath = $xpath;
 
 		$root = $xpath->query("(//atom:feed|//channel)")->item(0);
 
@@ -115,4 +117,27 @@ class FeedParser {
 		return $this->items;
 	}
 
+	function get_links($rel) {
+		$rv = array();
+
+		switch ($this->type) {
+		case $this::FEED_ATOM:
+			$links = $this->xpath->query("//atom:feed/atom:link");
+
+			foreach ($links as $link) {
+				if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
+					array_push($rv, $link->getAttribute('href'));
+				}
+			}
+			break;
+		case $this::FEED_RSS:
+			$links = $this->xpath->query("//channel/link");
+			if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
+				array_push($rv, $link->getAttribute('href'));
+			}
+			break;
+		}
+
+		return $rv;
+	}
 } ?>
-- 
cgit v1.2.3


From 3c8060aca07af57f97885466a369afdf4c2d79d5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 19:09:07 +0400
Subject: fix get_links() for RSS

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

(limited to 'classes')

diff --git a/classes/feedparser.php b/classes/feedparser.php
index 6d3a15802..f127ba73d 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -132,8 +132,10 @@ class FeedParser {
 			break;
 		case $this::FEED_RSS:
 			$links = $this->xpath->query("//channel/link");
-			if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
-				array_push($rv, $link->getAttribute('href'));
+			foreach ($links as $link) {
+				if (!$rel || $link->hasAttribute('rel') && $link->getAttribute('rel') == $rel) {
+					array_push($rv, $link->getAttribute('href'));
+				}
 			}
 			break;
 		}
-- 
cgit v1.2.3


From b09a4cdccc0d8c85af5d5a97be32536579b9db33 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 19:12:32 +0400
Subject: feeditem_rss: use guid element

---
 classes/feeditem/rss.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index e7ea1df57..d5667102d 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -7,7 +7,13 @@ class FeedItem_RSS {
 	}
 
 	function get_id() {
-		return $this->get_link();
+		$id = $this->elem->getElementsByTagName("guid")->item(0);
+
+		if ($id) {
+			return $id->nodeValue;
+		} else {
+			return $this->get_link();
+		}
 	}
 
 	function get_date() {
-- 
cgit v1.2.3


From fd0daa9b55b98b18b62f1eb710d5df197254ed04 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 19:14:48 +0400
Subject: remove simplepie

---
 classes/sanitizedummy.php | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 classes/sanitizedummy.php

(limited to 'classes')

diff --git a/classes/sanitizedummy.php b/classes/sanitizedummy.php
deleted file mode 100644
index 7182fb7f5..000000000
--- a/classes/sanitizedummy.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-class SanitizeDummy extends SimplePie_Sanitize {
-	function sanitize($data, $type, $base = '') {
-		return $data;
-	}
-}
-?>
-- 
cgit v1.2.3


From 4c00e15b5d05b0d137af9a33bf79172bfeb0df24 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 19:40:43 +0400
Subject: pass xpath object to feeditem, support media-rss objects

---
 classes/feeditem/atom.php |  2 +-
 classes/feeditem/rss.php  | 18 +++++++++++++++++-
 classes/feedparser.php    |  5 +++--
 3 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'classes')

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 0d888c443..7dc4ce5c1 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -2,7 +2,7 @@
 class FeedItem_Atom {
 	private $elem;
 
-	function __construct($elem) {
+	function __construct($elem, $doc, $xpath) {
 		$this->elem = $elem;
 	}
 
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index d5667102d..e5e2a8e56 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -1,9 +1,11 @@
 <?php
 class FeedItem_RSS {
 	private $elem;
+	private $xpath;
 
-	function __construct($elem) {
+	function __construct($elem, $doc, $xpath) {
 		$this->elem = $elem;
+		$this->xpath = $xpath;
 	}
 
 	function get_id() {
@@ -92,6 +94,20 @@ class FeedItem_RSS {
 			array_push($encs, $enc);
 		}
 
+		$enclosures = $this->xpath->query("media:content", $this->elem);
+
+		$encs = array();
+
+		foreach ($enclosures as $enclosure) {
+			$enc = new FeedEnclosure();
+
+			$enc->type = $enclosure->getAttribute("type");
+			$enc->link = $enclosure->getAttribute("url");
+			$enc->length = $enclosure->getAttribute("length");
+
+			array_push($encs, $enc);
+		}
+
 		return $encs;
 	}
 
diff --git a/classes/feedparser.php b/classes/feedparser.php
index f127ba73d..eabbb5b28 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -27,6 +27,7 @@ class FeedParser {
 		$root = $this->doc->firstChild;
 		$xpath = new DOMXPath($this->doc);
 		$xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
+		$xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/');
 		$this->xpath = $xpath;
 
 		$root = $xpath->query("(//atom:feed|//channel)")->item(0);
@@ -62,7 +63,7 @@ class FeedParser {
 				$articles = $xpath->query("//atom:entry");
 
 				foreach ($articles as $article) {
-					array_push($this->items, new FeedItem_Atom($article));
+					array_push($this->items, new FeedItem_Atom($article, $this->doc, $this->xpath));
 				}
 
 				break;
@@ -83,7 +84,7 @@ class FeedParser {
 				$articles = $xpath->query("//channel/item");
 
 				foreach ($articles as $article) {
-					array_push($this->items, new FeedItem_RSS($article));
+					array_push($this->items, new FeedItem_RSS($article, $this->doc, $this->xpath));
 				}
 
 				break;
-- 
cgit v1.2.3


From 852d4ac89084edbee98df89ab066266cd9df63c9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 20:30:52 +0400
Subject: support RDF-XML feeds

---
 classes/feedparser.php | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'classes')

diff --git a/classes/feedparser.php b/classes/feedparser.php
index eabbb5b28..8cb736a8b 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -28,12 +28,16 @@ class FeedParser {
 		$xpath = new DOMXPath($this->doc);
 		$xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
 		$xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/');
+		$xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
 		$this->xpath = $xpath;
 
-		$root = $xpath->query("(//atom:feed|//channel)")->item(0);
+		$root = $xpath->query("(//atom:feed|//channel|//rdf:rdf|//rdf:RDF)")->item(0);
 
 		if ($root) {
-			switch ($root->tagName) {
+			switch (mb_strtolower($root->tagName)) {
+			case "rdf:rdf":
+				$this->type = $this::FEED_RDF;
+				break;
 			case "channel":
 				$this->type = $this::FEED_RSS;
 				break;
@@ -88,7 +92,33 @@ class FeedParser {
 				}
 
 				break;
+			case $this::FEED_RDF:
+				$xpath->registerNamespace('rssfake', 'http://purl.org/rss/1.0/');
+
+				$title = $xpath->query("//rssfake:channel/rssfake:title")->item(0);
+
+				if ($title) {
+					$this->title = $title->nodeValue;
+				}
+
+				$link = $xpath->query("//rssfake:channel/rssfake:link")->item(0);
+
+				if ($link) {
+					$this->link = $link->nodeValue;
+				}
+
+				$articles = $xpath->query("//rssfake:item");
+
+				foreach ($articles as $article) {
+					array_push($this->items, new FeedItem_RSS($article, $this->doc, $this->xpath));
+				}
+
+				break;
+
 			}
+		} else {
+			$this->error = "Unknown/unsupported feed type";
+			return;
 		}
 	}
 
-- 
cgit v1.2.3


From d4992d6b48ed458ae3ff39c5cd5ac19244ccd6a8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 20:55:08 +0400
Subject: add support for dc:subject and slash:comments

---
 classes/feeditem/atom.php | 24 +++++++++++++++++++++++-
 classes/feeditem/rss.php  | 13 ++++++++++---
 classes/feedparser.php    |  3 +++
 3 files changed, 36 insertions(+), 4 deletions(-)

(limited to 'classes')

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 7dc4ce5c1..d21933897 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -1,9 +1,11 @@
 <?php
 class FeedItem_Atom {
 	private $elem;
+	private $xpath;
 
 	function __construct($elem, $doc, $xpath) {
 		$this->elem = $elem;
+		$this->xpath = $xpath;
 	}
 
 	function get_id() {
@@ -63,9 +65,12 @@ class FeedItem_Atom {
 
 	}
 
-	// todo
 	function get_comments_count() {
+		$comments = $this->xpath->query("slash:comments", $this->elem)->item(0);
 
+		if ($comments) {
+			return $comments->nodeValue;
+		}
 	}
 
 	function get_categories() {
@@ -77,6 +82,11 @@ class FeedItem_Atom {
 				array_push($cats, $cat->getAttribute("term"));
 		}
 
+		$categories = $this->xpath->query("dc:subject", $this->elem);
+
+		foreach ($categories as $cat) {
+			array_push($cats, $cat->nodeValue);
+		}
 
 		return $cats;
 	}
@@ -100,6 +110,18 @@ class FeedItem_Atom {
 			}
 		}
 
+		$enclosures = $this->xpath->query("media:content", $this->elem);
+
+		foreach ($enclosures as $enclosure) {
+			$enc = new FeedEnclosure();
+
+			$enc->type = $enclosure->getAttribute("type");
+			$enc->link = $enclosure->getAttribute("url");
+			$enc->length = $enclosure->getAttribute("length");
+
+			array_push($encs, $enc);
+		}
+
 		return $encs;
 	}
 
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index e5e2a8e56..7a3b0d342 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -63,9 +63,12 @@ class FeedItem_RSS {
 
 	}
 
-	// todo
 	function get_comments_count() {
+		$comments = $this->xpath->query("slash:comments", $this->elem)->item(0);
 
+		if ($comments) {
+			return $comments->nodeValue;
+		}
 	}
 
 	function get_categories() {
@@ -76,6 +79,12 @@ class FeedItem_RSS {
 			array_push($cats, $cat->nodeValue);
 		}
 
+		$categories = $this->xpath->query("dc:subject", $this->elem);
+
+		foreach ($categories as $cat) {
+			array_push($cats, $cat->nodeValue);
+		}
+
 		return $cats;
 	}
 
@@ -96,8 +105,6 @@ class FeedItem_RSS {
 
 		$enclosures = $this->xpath->query("media:content", $this->elem);
 
-		$encs = array();
-
 		foreach ($enclosures as $enclosure) {
 			$enc = new FeedEnclosure();
 
diff --git a/classes/feedparser.php b/classes/feedparser.php
index 8cb736a8b..f61c2a003 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -29,6 +29,9 @@ class FeedParser {
 		$xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom');
 		$xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/');
 		$xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+		$xpath->registerNamespace('slash', 'http://purl.org/rss/1.0/modules/slash/');
+		$xpath->registerNamespace('dc', 'http://purl.org/dc/elements/1.1/');
+
 		$this->xpath = $xpath;
 
 		$root = $xpath->query("(//atom:feed|//channel|//rdf:rdf|//rdf:RDF)")->item(0);
-- 
cgit v1.2.3


From f11015058d6e313d3cabc3d3edc0230a5b6b4c26 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 21:01:30 +0400
Subject: support dc:creator

---
 classes/feeditem/atom.php | 7 +++++++
 classes/feeditem/rss.php  | 6 ++++++
 2 files changed, 13 insertions(+)

(limited to 'classes')

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index d21933897..1a9db9020 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -138,6 +138,13 @@ class FeedItem_Atom {
 			if ($email) return $email->nodeValue;
 
 		}
+
+		$author = $this->xpath->query("dc:creator", $this->elem)->item(0);
+
+		if ($author) {
+			return $author->nodeValue;
+		}
+
 	}
 }
 ?>
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index 7a3b0d342..9e54a9c09 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -129,8 +129,14 @@ class FeedItem_RSS {
 			$email = $author->getElementsByTagName("email")->item(0);
 
 			if ($email) return $email->nodeValue;
+		}
+
+		$author = $this->xpath->query("dc:creator", $this->elem)->item(0);
 
+		if ($author) {
+			return $author->nodeValue;
 		}
+
 	}
 }
 ?>
-- 
cgit v1.2.3


From b4d1690097946bdf89dc88f218e7790126f4fd3b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 21:06:48 +0400
Subject: move common methods to feeditem_common

---
 classes/feeditem.php        |  2 +-
 classes/feeditem/atom.php   | 44 +----------------------------------------
 classes/feeditem/common.php | 48 +++++++++++++++++++++++++++++++++++++++++++++
 classes/feeditem/rss.php    | 43 +---------------------------------------
 4 files changed, 51 insertions(+), 86 deletions(-)
 create mode 100644 classes/feeditem/common.php

(limited to 'classes')

diff --git a/classes/feeditem.php b/classes/feeditem.php
index cc39fcee7..e64a13fdc 100644
--- a/classes/feeditem.php
+++ b/classes/feeditem.php
@@ -1,5 +1,5 @@
 <?php
-class FeedItem {
+abstract class FeedItem {
 	abstract function get_id();
 	abstract function get_date();
 	abstract function get_link();
diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 1a9db9020..df1c31d99 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -1,13 +1,5 @@
 <?php
-class FeedItem_Atom {
-	private $elem;
-	private $xpath;
-
-	function __construct($elem, $doc, $xpath) {
-		$this->elem = $elem;
-		$this->xpath = $xpath;
-	}
-
+class FeedItem_Atom extends FeedItem_Common {
 	function get_id() {
 		$id = $this->elem->getElementsByTagName("id")->item(0);
 
@@ -60,19 +52,6 @@ class FeedItem_Atom {
 		}
 	}
 
-	// todo
-	function get_comments_url() {
-
-	}
-
-	function get_comments_count() {
-		$comments = $this->xpath->query("slash:comments", $this->elem)->item(0);
-
-		if ($comments) {
-			return $comments->nodeValue;
-		}
-	}
-
 	function get_categories() {
 		$categories = $this->elem->getElementsByTagName("category");
 		$cats = array();
@@ -125,26 +104,5 @@ class FeedItem_Atom {
 		return $encs;
 	}
 
-	function get_author() {
-		$author = $this->elem->getElementsByTagName("author")->item(0);
-
-		if ($author) {
-			$name = $author->getElementsByTagName("name")->item(0);
-
-			if ($name) return $name->nodeValue;
-
-			$email = $author->getElementsByTagName("email")->item(0);
-
-			if ($email) return $email->nodeValue;
-
-		}
-
-		$author = $this->xpath->query("dc:creator", $this->elem)->item(0);
-
-		if ($author) {
-			return $author->nodeValue;
-		}
-
-	}
 }
 ?>
diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php
new file mode 100644
index 000000000..fca9433a4
--- /dev/null
+++ b/classes/feeditem/common.php
@@ -0,0 +1,48 @@
+<?php
+abstract class FeedItem_Common extends FeedItem {
+	protected $elem;
+	protected $xpath;
+	protected $doc;
+
+	function __construct($elem, $doc, $xpath) {
+		$this->elem = $elem;
+		$this->xpath = $xpath;
+		$this->doc = $doc;
+	}
+
+	function get_author() {
+		$author = $this->elem->getElementsByTagName("author")->item(0);
+
+		if ($author) {
+			$name = $author->getElementsByTagName("name")->item(0);
+
+			if ($name) return $name->nodeValue;
+
+			$email = $author->getElementsByTagName("email")->item(0);
+
+			if ($email) return $email->nodeValue;
+		}
+
+		$author = $this->xpath->query("dc:creator", $this->elem)->item(0);
+
+		if ($author) {
+			return $author->nodeValue;
+		}
+	}
+
+	// todo
+	function get_comments_url() {
+
+	}
+
+	function get_comments_count() {
+		$comments = $this->xpath->query("slash:comments", $this->elem)->item(0);
+
+		if ($comments) {
+			return $comments->nodeValue;
+		}
+	}
+
+
+}
+?>
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index 9e54a9c09..29c8cb6b4 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -1,13 +1,5 @@
 <?php
-class FeedItem_RSS {
-	private $elem;
-	private $xpath;
-
-	function __construct($elem, $doc, $xpath) {
-		$this->elem = $elem;
-		$this->xpath = $xpath;
-	}
-
+class FeedItem_RSS extends FeedItem_Common {
 	function get_id() {
 		$id = $this->elem->getElementsByTagName("guid")->item(0);
 
@@ -58,19 +50,6 @@ class FeedItem_RSS {
 		}
 	}
 
-	// todo
-	function get_comments_url() {
-
-	}
-
-	function get_comments_count() {
-		$comments = $this->xpath->query("slash:comments", $this->elem)->item(0);
-
-		if ($comments) {
-			return $comments->nodeValue;
-		}
-	}
-
 	function get_categories() {
 		$categories = $this->elem->getElementsByTagName("category");
 		$cats = array();
@@ -118,25 +97,5 @@ class FeedItem_RSS {
 		return $encs;
 	}
 
-	function get_author() {
-		$author = $this->elem->getElementsByTagName("author")->item(0);
-
-		if ($author) {
-			$name = $author->getElementsByTagName("name")->item(0);
-
-			if ($name) return $name->nodeValue;
-
-			$email = $author->getElementsByTagName("email")->item(0);
-
-			if ($email) return $email->nodeValue;
-		}
-
-		$author = $this->xpath->query("dc:creator", $this->elem)->item(0);
-
-		if ($author) {
-			return $author->nodeValue;
-		}
-
-	}
 }
 ?>
-- 
cgit v1.2.3


From 8a95d630a9183bf2c7b79f9e1f015eec328d8804 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 1 May 2013 22:05:59 +0400
Subject: fix rss content:encoded not used

---
 classes/feeditem/rss.php | 7 +++++++
 classes/feedparser.php   | 1 +
 2 files changed, 8 insertions(+)

(limited to 'classes')

diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index 29c8cb6b4..5b43d0e8c 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -40,6 +40,13 @@ class FeedItem_RSS extends FeedItem_Common {
 		if ($content) {
 			return $content->nodeValue;
 		}
+
+		$content = $this->xpath->query("content:encoded", $this->elem)->item(0);
+
+		if ($content) {
+			return $content->nodeValue;
+		}
+
 	}
 
 	function get_description() {
diff --git a/classes/feedparser.php b/classes/feedparser.php
index f61c2a003..d60db8a28 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -31,6 +31,7 @@ class FeedParser {
 		$xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
 		$xpath->registerNamespace('slash', 'http://purl.org/rss/1.0/modules/slash/');
 		$xpath->registerNamespace('dc', 'http://purl.org/dc/elements/1.1/');
+		$xpath->registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/');
 
 		$this->xpath = $xpath;
 
-- 
cgit v1.2.3


From f8a25082b39cc6ee2b0d82a42e46d4609b32ce6a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 2 May 2013 10:09:01 +0400
Subject: make tag cache processing faster in cdm

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

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index f21bb3ce5..31bcbac57 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -514,8 +514,10 @@ class Feeds extends Handler_Protected {
 
 				} else {
 
-					$line["tags"] = get_article_tags($id, $_SESSION["uid"], $line["tag_cache"]);
-					unset($line["tag_cache"]);
+					if ($line["tag_cache"])
+						$tags = explode(",", $line["tag_cache"]);
+					else
+						$tags = false;
 
 					$line["content"] = sanitize($line["content_preview"],
 							sql_bool_to_bool($line['hide_images']), false, $entry_site_url);
@@ -682,7 +684,7 @@ class Feeds extends Handler_Protected {
 						$reply['content'] .= $p->hook_article_left_button($line);
 					}
 
-					$tags_str = format_tags_string($line["tags"], $id);
+					$tags_str = format_tags_string($tags, $id);
 
 					$reply['content'] .= "<img src='images/tag.png' alt='Tags' title='Tags'>
 						<span id=\"ATSTR-$id\">$tags_str</span>
-- 
cgit v1.2.3


From 54b7590c7f4c071b86724ef0e77981c23874d40b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 2 May 2013 10:20:56 +0400
Subject: format_article_tags: improve performance

---
 classes/feeds.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 31bcbac57..1a1798151 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -629,7 +629,6 @@ class Feeds extends Handler_Protected {
 					}
 					$reply['content'] .= "</div>";
 
-
 					$reply['content'] .= "<div class=\"cdmContentInner\">";
 
 			if ($line["orig_feed_id"]) {
-- 
cgit v1.2.3


From 99b82567944a96afb70ab7af1f0bd344ac3ab95a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 10:30:41 +0400
Subject: feedparser: make content:encoded take precedence over description

---
 classes/feeditem/rss.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'classes')

diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index 5b43d0e8c..2f363b4f6 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -35,18 +35,17 @@ class FeedItem_RSS extends FeedItem_Common {
 	}
 
 	function get_content() {
-		$content = $this->elem->getElementsByTagName("description")->item(0);
+		$content = $this->xpath->query("content:encoded", $this->elem)->item(0);
 
 		if ($content) {
 			return $content->nodeValue;
 		}
 
-		$content = $this->xpath->query("content:encoded", $this->elem)->item(0);
+		$content = $this->elem->getElementsByTagName("description")->item(0);
 
 		if ($content) {
 			return $content->nodeValue;
 		}
-
 	}
 
 	function get_description() {
-- 
cgit v1.2.3


From 602fe53496fcc5c95983bebf0d789d01cdf3e5aa Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 10:36:05 +0400
Subject: fix atom <author>value</author> elements

---
 classes/feeditem/common.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'classes')

diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php
index fca9433a4..0787a42cb 100644
--- a/classes/feeditem/common.php
+++ b/classes/feeditem/common.php
@@ -21,6 +21,9 @@ abstract class FeedItem_Common extends FeedItem {
 			$email = $author->getElementsByTagName("email")->item(0);
 
 			if ($email) return $email->nodeValue;
+
+			if ($author->nodeValue)
+				return $author->nodeValue;
 		}
 
 		$author = $this->xpath->query("dc:creator", $this->elem)->item(0);
-- 
cgit v1.2.3


From 72c29b65d4494f6df83c558e3bd281ff440e20af Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 2 May 2013 10:40:59 +0400
Subject: atom: fix rel=alternate links

---
 classes/feeditem/atom.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index df1c31d99..b981dc319 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -22,7 +22,8 @@ class FeedItem_Atom extends FeedItem_Common {
 		$links = $this->elem->getElementsByTagName("link");
 
 		foreach ($links as $link) {
-			if ($link && $link->hasAttribute("href") && !$link->hasAttribute("rel")) {
+			if ($link && $link->hasAttribute("href") && (!$link->hasAttribute("rel")
+					|| $link->getAttribute("rel") == "alternate")) {
 				return $link->getAttribute("href");
 			}
 		}
-- 
cgit v1.2.3


From 233b74ad22395f02a245a4e3a3fc21c9101892f1 Mon Sep 17 00:00:00 2001
From: Trannie Carter <tcarter@nottwo.org>
Date: Fri, 3 May 2013 20:44:24 -0400
Subject: Remove obsolete $link parameter for password reset

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

(limited to 'classes')

diff --git a/classes/pref/users.php b/classes/pref/users.php
index 4b7d2d69a..3e8b2299d 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -252,9 +252,9 @@ class Pref_Users extends Handler_Protected {
 			}
 		}
 
-		static function resetUserPassword($link, $uid, $show_password) {
+		static function resetUserPassword($uid, $show_password) {
 
-			$result = db_query($link, "SELECT login,email
+			$result = db_query("SELECT login,email
 				FROM ttrss_users WHERE id = '$uid'");
 
 			$login = db_fetch_result($result, 0, "login");
@@ -266,7 +266,7 @@ class Pref_Users extends Handler_Protected {
 
 			$pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
 
-			db_query($link, "UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt'
+			db_query("UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt'
 				WHERE id = '$uid'");
 
 			if ($show_password) {
-- 
cgit v1.2.3


From 8d090a910b7e2d4d1b26e734c09eaa773b853804 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 4 May 2013 12:01:53 +0400
Subject: use css nth-child instead of old even/odd class hacks for normal mode

---
 classes/feeds.php      | 4 ++--
 classes/pref/feeds.php | 2 --
 classes/pref/prefs.php | 2 --
 classes/pref/users.php | 8 +-------
 4 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 1a1798151..f499fe9a6 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -288,8 +288,6 @@ class Feeds extends Handler_Protected {
 			$expand_cdm = get_pref('CDM_EXPANDED');
 
 			while ($line = $this->dbh->fetch_assoc($result)) {
-				$class = ($lnum % 2) ? "even" : "odd";
-
 				$id = $line["id"];
 				$feed_id = $line["feed_id"];
 				$label_cache = $line["label_cache"];
@@ -316,6 +314,8 @@ class Feeds extends Handler_Protected {
 					array_push($topmost_article_ids, $id);
 				}
 
+				$class = "";
+
 				if (sql_bool_to_bool($line["unread"])) {
 					$class .= " Unread";
 					++$num_unread;
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index e31725111..ab280a98e 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1594,7 +1594,6 @@ class Pref_Feeds extends Handler_Protected {
 
 		while ($line = $this->dbh->fetch_assoc($result)) {
 
-			$class = ($lnum % 2) ? "even" : "odd";
 			$feed_id = $line["id"];
 			$this_row_id = "id=\"FUPDD-$feed_id\"";
 
@@ -1664,7 +1663,6 @@ class Pref_Feeds extends Handler_Protected {
 
 		while ($line = $this->dbh->fetch_assoc($result)) {
 
-			$class = ($lnum % 2) ? "even" : "odd";
 			$feed_id = $line["id"];
 			$this_row_id = "id=\"FERDD-$feed_id\"";
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 45715488a..ba83a9900 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1041,8 +1041,6 @@ class Pref_Prefs extends Handler_Protected {
 
 		while ($line = $this->dbh->fetch_assoc($result)) {
 
-			$class = ($lnum % 2) ? "even" : "odd";
-
 			$profile_id = $line["id"];
 			$this_row_id = "id=\"FCATR-$profile_id\"";
 
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 4b7d2d69a..d97362f9f 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -69,8 +69,6 @@ class Pref_Users extends Handler_Protected {
 
 			print "<ul class=\"userFeedList\">";
 
-			$row_class = "odd";
-
 			while ($line = $this->dbh->fetch_assoc($result)) {
 
 				$icon_file = ICONS_URL."/".$line["id"].".ico";
@@ -81,9 +79,7 @@ class Pref_Users extends Handler_Protected {
 					$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
 				}
 
-				print "<li class=\"$row_class\">$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
-
-				$row_class = $row_class == "even" ? "odd" : "even";
+				print "<li>$feed_icon&nbsp;<a href=\"".$line["site_url"]."\">".$line["title"]."</a></li>";
 
 			}
 
@@ -408,8 +404,6 @@ class Pref_Users extends Handler_Protected {
 
 			while ($line = $this->dbh->fetch_assoc($result)) {
 
-				$class = ($lnum % 2) ? "even" : "odd";
-
 				$uid = $line["id"];
 
 				print "<tr id=\"UMRR-$uid\">";
-- 
cgit v1.2.3


From e5e6cde06a79551c42a7821722d33683e0a6829f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 6 May 2013 12:50:52 +0400
Subject: remove support for hiding empty categories in prefs editor because
 people are dumb

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

(limited to 'classes')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index ab280a98e..da3a96282 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -36,8 +36,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		// first one is set by API
 		$show_empty_cats = $_REQUEST['force_show_empty'] ||
-			($_REQUEST['mode'] != 2 && !$search &&
-				get_pref('_PREFS_SHOW_EMPTY_CATS'));
+			($_REQUEST['mode'] != 2 && !$search);
 
 		$items = array();
 
@@ -185,8 +184,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		if ($enable_cats) {
 			$show_empty_cats = $_REQUEST['force_show_empty'] ||
-				($_REQUEST['mode'] != 2 && !$search &&
-				get_pref('_PREFS_SHOW_EMPTY_CATS'));
+				($_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");
@@ -305,11 +303,6 @@ class Pref_Feeds extends Handler_Protected {
 		return;
 	}
 
-	function togglehiddenfeedcats() {
-		set_pref('_PREFS_SHOW_EMPTY_CATS',
-			(get_pref('_PREFS_SHOW_EMPTY_CATS') ? 'false' : 'true'));
-	}
-
 	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
 		$debug = isset($_REQUEST["debug"]);
 
@@ -1351,9 +1344,6 @@ class Pref_Feeds extends Handler_Protected {
 		print $error_button;
 		print $inactive_button;
 
-		print "<button onclick=\"toggleHiddenFeedCats()\"
-			dojoType=\"dijit.form.Button\">".__('(Un)hide empty categories')."</button>";
-
 		if (defined('_ENABLE_FEED_DEBUGGING')) {
 
 			print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
-- 
cgit v1.2.3


From 6f7798b6434f5ef6073447998c436901b507e3df Mon Sep 17 00:00:00 2001
From: Rasmus Lerdorf <rasmus@php.net>
Date: Tue, 7 May 2013 00:35:10 -0700
Subject: Fixing bugs found by static analysis

---
 classes/api.php            | 77 +++++++++++++++++++++++-----------------------
 classes/article.php        |  2 +-
 classes/auth/base.php      |  2 +-
 classes/db/pdo.php         |  2 +-
 classes/handler/public.php | 17 +++++-----
 classes/pluginhost.php     |  4 +--
 classes/pref/filters.php   |  2 --
 classes/pref/prefs.php     |  2 +-
 classes/rpc.php            |  4 +--
 classes/ttrssmailer.php    |  2 +-
 10 files changed, 56 insertions(+), 58 deletions(-)

(limited to 'classes')

diff --git a/classes/api.php b/classes/api.php
index badd0b564..f5e4a0c5c 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -14,12 +14,12 @@ class API extends Handler {
 			header("Content-Type: text/json");
 
 			if (!$_SESSION["uid"] && $method != "login" && $method != "isloggedin") {
-				print $this->wrap(self::STATUS_ERR, array("error" => 'NOT_LOGGED_IN'));
+				$this->wrap(self::STATUS_ERR, array("error" => 'NOT_LOGGED_IN'));
 				return false;
 			}
 
 			if ($_SESSION["uid"] && $method != "logout" && !get_pref('ENABLE_API_ACCESS')) {
-				print $this->wrap(self::STATUS_ERR, array("error" => 'API_DISABLED'));
+				$this->wrap(self::STATUS_ERR, array("error" => 'API_DISABLED'));
 				return false;
 			}
 
@@ -38,12 +38,12 @@ class API extends Handler {
 
 	function getVersion() {
 		$rv = array("version" => VERSION);
-		print $this->wrap(self::STATUS_OK, $rv);
+		$this->wrap(self::STATUS_OK, $rv);
 	}
 
 	function getApiLevel() {
 		$rv = array("level" => self::API_LEVEL);
-		print $this->wrap(self::STATUS_OK, $rv);
+		$this->wrap(self::STATUS_OK, $rv);
 	}
 
 	function login() {
@@ -65,33 +65,33 @@ class API extends Handler {
 		}
 
 		if (!$uid) {
-			print $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
+			$this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
 			return;
 		}
 
 		if (get_pref("ENABLE_API_ACCESS", $uid)) {
 			if (authenticate_user($login, $password)) {               // try login with normal password
-				print $this->wrap(self::STATUS_OK, array("session_id" => session_id(),
+				$this->wrap(self::STATUS_OK, array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
 			} else if (authenticate_user($login, $password_base64)) { // else try with base64_decoded password
-				print $this->wrap(self::STATUS_OK,	array("session_id" => session_id(),
+				$this->wrap(self::STATUS_OK,	array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
 			} else {                                                         // else we are not logged in
-				print $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
+				$this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
 			}
 		} else {
-			print $this->wrap(self::STATUS_ERR, array("error" => "API_DISABLED"));
+			$this->wrap(self::STATUS_ERR, array("error" => "API_DISABLED"));
 		}
 
 	}
 
 	function logout() {
 		logout_user();
-		print $this->wrap(self::STATUS_OK, array("status" => "OK"));
+		$this->wrap(self::STATUS_OK, array("status" => "OK"));
 	}
 
 	function isLoggedIn() {
-		print $this->wrap(self::STATUS_OK, array("status" => $_SESSION["uid"] != ''));
+		$this->wrap(self::STATUS_OK, array("status" => $_SESSION["uid"] != ''));
 	}
 
 	function getUnread() {
@@ -99,15 +99,15 @@ class API extends Handler {
 		$is_cat = $this->dbh->escape_string($_REQUEST["is_cat"]);
 
 		if ($feed_id) {
-			print $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
+			$this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
 		} else {
-			print $this->wrap(self::STATUS_OK, array("unread" => getGlobalUnread()));
+			$this->wrap(self::STATUS_OK, array("unread" => getGlobalUnread()));
 		}
 	}
 
 	/* Method added for ttrss-reader for Android */
 	function getCounters() {
-		print $this->wrap(self::STATUS_OK, getAllCounters());
+		$this->wrap(self::STATUS_OK, getAllCounters());
 	}
 
 	function getFeeds() {
@@ -119,7 +119,7 @@ class API extends Handler {
 
 		$feeds = $this->api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested);
 
-		print $this->wrap(self::STATUS_OK, $feeds);
+		$this->wrap(self::STATUS_OK, $feeds);
 	}
 
 	function getCategories() {
@@ -176,7 +176,7 @@ class API extends Handler {
 			}
 		}
 
-		print $this->wrap(self::STATUS_OK, $cats);
+		$this->wrap(self::STATUS_OK, $cats);
 	}
 
 	function getHeadlines() {
@@ -219,9 +219,9 @@ class API extends Handler {
 				$include_attachments, $since_id, $search, $search_mode,
 				$include_nested, $sanitize_content);
 
-			print $this->wrap(self::STATUS_OK, $headlines);
+			$this->wrap(self::STATUS_OK, $headlines);
 		} else {
-			print $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
 		}
 	}
 
@@ -293,11 +293,11 @@ class API extends Handler {
 				}
 			}
 
-			print $this->wrap(self::STATUS_OK, array("status" => "OK",
+			$this->wrap(self::STATUS_OK, array("status" => "OK",
 				"updated" => $num_updated));
 
 		} else {
-			print $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
 		}
 
 	}
@@ -352,7 +352,7 @@ class API extends Handler {
 			}
 		}
 
-		print $this->wrap(self::STATUS_OK, $articles);
+		$this->wrap(self::STATUS_OK, $articles);
 
 	}
 
@@ -370,7 +370,7 @@ class API extends Handler {
 
 		$config["num_feeds"] = (int)$num_feeds;
 
-		print $this->wrap(self::STATUS_OK, $config);
+		$this->wrap(self::STATUS_OK, $config);
 	}
 
 	function updateFeed() {
@@ -380,7 +380,7 @@ class API extends Handler {
 
 		update_rss_feed($feed_id, true);
 
-		print $this->wrap(self::STATUS_OK, array("status" => "OK"));
+		$this->wrap(self::STATUS_OK, array("status" => "OK"));
 	}
 
 	function catchupFeed() {
@@ -389,13 +389,13 @@ class API extends Handler {
 
 		catchup_feed($feed_id, $is_cat);
 
-		print $this->wrap(self::STATUS_OK, array("status" => "OK"));
+		$this->wrap(self::STATUS_OK, array("status" => "OK"));
 	}
 
 	function getPref() {
 		$pref_name = $this->dbh->escape_string($_REQUEST["pref_name"]);
 
-		print $this->wrap(self::STATUS_OK, array("value" => get_pref($pref_name)));
+		$this->wrap(self::STATUS_OK, array("value" => get_pref($pref_name)));
 	}
 
 	function getLabels() {
@@ -432,7 +432,7 @@ class API extends Handler {
 				"checked" => $checked));
 		}
 
-		print $this->wrap(self::STATUS_OK, $rv);
+		$this->wrap(self::STATUS_OK, $rv);
 	}
 
 	function setArticleLabel() {
@@ -460,7 +460,7 @@ class API extends Handler {
 			}
 		}
 
-		print $this->wrap(self::STATUS_OK, array("status" => "OK",
+		$this->wrap(self::STATUS_OK, array("status" => "OK",
 			"updated" => $num_updated));
 
 	}
@@ -471,10 +471,10 @@ class API extends Handler {
 		if ($plugin && method_exists($plugin, $method)) {
 			$reply = $plugin->$method();
 
-			print $this->wrap($reply[0], $reply[1]);
+			$this->wrap($reply[0], $reply[1]);
 
 		} else {
-			print $this->wrap(self::STATUS_ERR, array("error" => 'UNKNOWN_METHOD', "method" => $method));
+			$this->wrap(self::STATUS_ERR, array("error" => 'UNKNOWN_METHOD', "method" => $method));
 		}
 	}
 
@@ -484,9 +484,9 @@ class API extends Handler {
 		$content = $this->dbh->escape_string(strip_tags($_REQUEST["content"]));
 
 		if (Article::create_published_article($title, $url, $content, "", $_SESSION["uid"])) {
-			print $this->wrap(self::STATUS_OK, array("status" => 'OK'));
+			$this->wrap(self::STATUS_OK, array("status" => 'OK'));
 		} else {
-			print $this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
+			$this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
 		}
 	}
 
@@ -714,9 +714,9 @@ class API extends Handler {
 
 		if ($this->dbh->num_rows($result) != 0) {
 			Pref_Feeds::remove_feed($feed_id, $_SESSION["uid"]);
-			print $this->wrap(self::STATUS_OK, array("status" => "OK"));
+			$this->wrap(self::STATUS_OK, array("status" => "OK"));
 		} else {
-			print $this->wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
+			$this->wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
 		}
 	}
 
@@ -727,12 +727,11 @@ class API extends Handler {
 		$password = $this->dbh->escape_string($_REQUEST["password"]);
 
 		if ($feed_url) {
-			$rc = subscribe_to_feed($feed_url, $category_id,
-				$login, $password, false);
+			$rc = subscribe_to_feed($feed_url, $category_id, $login, $password);
 
-			print $this->wrap(self::STATUS_OK, array("status" => $rc));
+			$this->wrap(self::STATUS_OK, array("status" => $rc));
 		} else {
-			print $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
 		}
 	}
 
@@ -746,9 +745,9 @@ class API extends Handler {
 
 		if ($pf){
 			$data = $pf->makefeedtree();
-			print $this->wrap(self::STATUS_OK, array("categories" => $data));
+			$this->wrap(self::STATUS_OK, array("categories" => $data));
 		} else {
-			print $this->wrap(self::STATUS_ERR, array("error" =>
+			$this->wrap(self::STATUS_ERR, array("error" =>
 				'UNABLE_TO_INSTANTIATE_OBJECT'));
 		}
 
diff --git a/classes/article.php b/classes/article.php
index 1198eefa9..e9f86f298 100644
--- a/classes/article.php
+++ b/classes/article.php
@@ -215,7 +215,7 @@ class Article extends Handler_Protected {
 		$this->dbh->query("UPDATE ttrss_user_entries SET
 			score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
-		print json_encode(array("id" => $id,
+		print json_encode(array("id" => $ids,
 			"score_pic" => get_score_pic($score)));
 	}
 
diff --git a/classes/auth/base.php b/classes/auth/base.php
index 83f99d109..c77df5157 100644
--- a/classes/auth/base.php
+++ b/classes/auth/base.php
@@ -16,7 +16,7 @@ class Auth_Base {
 
 	// Auto-creates specified user if allowed by system configuration
 	// Can be used instead of find_user_by_login() by external auth modules
-	function auto_create_user($login) {
+	function auto_create_user($login, $password) {
 		if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
 			$user_id = $this->find_user_by_login($login);
 
diff --git a/classes/db/pdo.php b/classes/db/pdo.php
index 59499139d..126f5150a 100644
--- a/classes/db/pdo.php
+++ b/classes/db/pdo.php
@@ -79,7 +79,7 @@ class Db_PDO implements IDb {
 	}
 
 	function last_error() {
-		return join(" ", $pdo->errorInfo());
+		return join(" ", $this->pdo->errorInfo());
 	}
 
 	function init() {
diff --git a/classes/handler/public.php b/classes/handler/public.php
index d5933a18c..7fa744107 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -382,9 +382,9 @@ class Handler_Public extends Handler {
 		header('Content-Type: text/html; charset=utf-8');
 		print "<html><head><title>Tiny Tiny RSS</title>";
 
-		print stylesheet_tag("utility.css");
-		print javascript_tag("lib/prototype.js");
-		print javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
+		stylesheet_tag("utility.css");
+		javascript_tag("lib/prototype.js");
+		javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls");
 		print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
 			</head><body id='sharepopup'>";
 
@@ -643,6 +643,7 @@ class Handler_Public extends Handler {
 		$feed_url = $this->dbh->escape_string(trim($_REQUEST["feed_url"]));
 		$cat_id = $this->dbh->escape_string($_REQUEST["cat_id"]);
 		$from = $this->dbh->escape_string($_REQUEST["from"]);
+		$feed_urls = array();
 
 		/* only read authentication information from POST */
 
@@ -666,8 +667,10 @@ class Handler_Public extends Handler {
 			break;
 		case 4:
 			print_notice(__("Multiple feed URLs found."));
-
-			$feed_urls = get_feeds_from_html($feed_url);
+ 			$contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
+			if (is_html($contents)) {
+				$feed_urls = get_feeds_from_html($url, $contents);
+			}
 			break;
 		case 5:
 			print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
@@ -732,8 +735,8 @@ class Handler_Public extends Handler {
 		header('Content-Type: text/html; charset=utf-8');
 		print "<html><head><title>Tiny Tiny RSS</title>";
 
-		print stylesheet_tag("utility.css");
-		print javascript_tag("lib/prototype.js");
+		stylesheet_tag("utility.css");
+		javascript_tag("lib/prototype.js");
 
 		print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
 			</head><body id='forgotpass'>";
diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 8e2aefcf1..bc5dc96be 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -186,7 +186,7 @@ class PluginHost {
 		}
 	}
 
-	function del_handler($handler, $method) {
+	function del_handler($handler, $method, $sender) {
 		$handler = str_replace("-", "_", strtolower($handler));
 		$method = strtolower($method);
 
@@ -252,8 +252,6 @@ class PluginHost {
 
 	function load_data($force = false) {
 		if ($this->owner_uid)  {
-			$plugin = $this->dbh->escape_string($plugin);
-
 			$result = $this->dbh->query("SELECT name, content FROM ttrss_plugin_storage
 				WHERE owner_uid = '".$this->owner_uid."'");
 
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 4dbee5906..bcc7b5aec 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -83,8 +83,6 @@ class Pref_Filters extends Handler_Protected {
 			}
 		}
 
-		$feed_title = getFeedTitle($feed);
-
 		$qfh_ret = queryFeedHeadlines(-4, 30, "", false, false, false,
 			"date_entered DESC", 0, $_SESSION["uid"], $filter);
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index ba83a9900..fb6795957 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -747,7 +747,7 @@ class Pref_Prefs extends Handler_Protected {
 		$system_enabled = array_map("trim", explode(",", PLUGINS));
 		$user_enabled = array_map("trim", explode(",", get_pref("_ENABLED_PLUGINS")));
 
-		$tmppluginhost = new PluginHost(Db::get());
+		$tmppluginhost = new PluginHost();
 		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
 		$tmppluginhost->load_data(true);
 
diff --git a/classes/rpc.php b/classes/rpc.php
index 2b07bbf91..46583feb5 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -291,7 +291,7 @@ class RPC extends Handler_Protected {
 
 		$reply = array();
 
-		if ($seq) $reply['seq'] = $seq;
+		if (!empty($_REQUEST['seq'])) $reply['seq'] = (int) $_REQUEST['seq'];
 
 		if ($last_article_id != getLastArticleId()) {
 			$reply['counters'] = getAllCounters();
@@ -464,7 +464,7 @@ class RPC extends Handler_Protected {
 			$id = 0;
 		}
 
-		print_feed_cat_select("cat_id", $id);
+		print_feed_cat_select("cat_id", $id, '');
 	}
 
 	// Silent
diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index fd7f969aa..1e8d07723 100644
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -28,7 +28,7 @@ class ttrssMailer extends PHPMailer {
 			$this->Host = $pair[0];
 			$this->Port = $pair[1];
 
-			if (!$Port) $Port = 25;
+			if (!$this->Port) $this->Port = 25;
 		} else {
 			$this->Host = '';
 			$this->Port = '';
-- 
cgit v1.2.3


From ea46d90eee462d6fc7724340670550f7f5717372 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 7 May 2013 12:36:09 +0400
Subject: auth_base: choose random password if not supplied by auth module

---
 classes/auth/base.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/auth/base.php b/classes/auth/base.php
index c77df5157..69acd0985 100644
--- a/classes/auth/base.php
+++ b/classes/auth/base.php
@@ -16,10 +16,12 @@ class Auth_Base {
 
 	// Auto-creates specified user if allowed by system configuration
 	// Can be used instead of find_user_by_login() by external auth modules
-	function auto_create_user($login, $password) {
+	function auto_create_user($login, $password = false) {
 		if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
 			$user_id = $this->find_user_by_login($login);
 
+			if (!$password) $password = make_password();
+
 			if (!$user_id) {
 				$login = $this->dbh->escape_string($login);
 				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-- 
cgit v1.2.3


From d29357fa0267fd78794511e234d8278c89a6464e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 7 May 2013 15:18:37 +0400
Subject: fix more hphp detected issues

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

(limited to 'classes')

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index da3a96282..7d050f135 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -787,7 +787,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<input dojoType=\"dijit.form.ValidationTextBox\"
 			disabled=\"1\" style=\"font-size : 16px; width : 20em;\" required=\"1\"
-			name=\"title\" value=\"$title\">";
+			name=\"title\" value=\"\">";
 
 		$this->batch_edit_cbox("title");
 
@@ -798,7 +798,7 @@ class Pref_Feeds extends Handler_Protected {
 		print __('URL:') . " ";
 		print "<input dojoType=\"dijit.form.ValidationTextBox\" disabled=\"1\"
 			required=\"1\" regExp='^(http|https)://.*' style=\"width : 20em\"
-			name=\"feed_url\" value=\"$feed_url\">";
+			name=\"feed_url\" value=\"\">";
 
 		$this->batch_edit_cbox("feed_url");
 
@@ -810,7 +810,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print __('Place in category:') . " ";
 
-			print_feed_cat_select("cat_id", $cat_id,
+			print_feed_cat_select("cat_id", false,
 				'disabled="1" dojoType="dijit.form.Select"');
 
 			$this->batch_edit_cbox("cat_id");
@@ -824,7 +824,7 @@ class Pref_Feeds extends Handler_Protected {
 
 		/* Update Interval */
 
-		print_select_hash("update_interval", $update_interval, $update_intervals,
+		print_select_hash("update_interval", "", $update_intervals,
 			'disabled="1" dojoType="dijit.form.Select"');
 
 		$this->batch_edit_cbox("update_interval");
@@ -837,7 +837,7 @@ class Pref_Feeds extends Handler_Protected {
 
 			print __('Article purging:') . " ";
 
-			print_select_hash("purge_interval", $purge_interval, $purge_intervals,
+			print_select_hash("purge_interval", "", $purge_intervals,
 				'disabled="1" dojoType="dijit.form.Select"');
 
 			$this->batch_edit_cbox("purge_interval");
@@ -849,13 +849,13 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<input dojoType=\"dijit.form.TextBox\"
 			placeHolder=\"".__("Login")."\" disabled=\"1\"
-			name=\"auth_login\" value=\"$auth_login\">";
+			name=\"auth_login\" value=\"\">";
 
 		$this->batch_edit_cbox("auth_login");
 
 		print "<br/><input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
 			placeHolder=\"".__("Password")."\" disabled=\"1\"
-			value=\"$auth_pass\">";
+			value=\"\">";
 
 		$this->batch_edit_cbox("auth_pass");
 
-- 
cgit v1.2.3